From 00657aef09d854c74fb426a935a3e8b1fc390bb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Sun, 11 Jun 2017 20:56:30 +0100 Subject: [PATCH] migrate to boost::gettext * all .ui files go from to e.g. vcl * all .src files go away and the english source strings folded into the .hrc as NC_("context", "source string") * ResMgr is dropped in favour of std::locale imbued by boost::locale::generator pointed at matching MODULE .mo files * UIConfig translations are folded into the module .mo, so e.g. UIConfig_cui goes from l10n target to normal one, so the res/lang.zips of UI files go away * translation via Translation::get(hrc-define-key, imbued-std::locale) * python can now be translated with its inbuilt gettext support (we keep the name strings.hrc there to keep finding the .hrc file uniform) so magic numbers can go away there * java and starbasic components can be translated via the pre-existing css.resource.StringResourceWithLocation mechanism * en-US res files go away, their strings are now the .hrc keys in the source code * remaining .res files are replaced by .mo files * in .res/.ui-lang-zip files, the old scheme missing translations of strings results in inserting the english original so something can be found, now the standard fallback of using the english original from the source key is used, so partial translations shrink dramatically in size * extract .hrc strings with hrcex which backs onto xgettext -C --add-comments --keyword=NC_:1c,2 --from-code=UTF-8 --no-wrap * extract .ui strings with uiex which backs onto xgettext --add-comments --no-wrap * qtz for gettext translations is generated at runtime as ascii-ified crc32 of content + "|" + msgid * [API CHANGE] remove deprecated binary .res resouce loader related uno apis com::sun::star::resource::OfficeResourceLoader com::sun::star::resource::XResourceBundleLoader com::sun::star::resource::XResourceBundle when translating strings via uno apis com.sun.star.resource.StringResourceWithLocation can continue to be used Change-Id: Ia2594a2672b7301d9c3421fdf31b6cfe7f3f8d0a --- Makefile.in | 3 +- Repository.mk | 50 +- RepositoryExternal.mk | 3 +- RepositoryModule_build.mk | 1 - RepositoryModule_host.mk | 1 - accessibility/AllLangMoTarget_acc.mk | 13 + accessibility/AllLangResTarget_acc.mk | 29 - accessibility/Module_accessibility.mk | 2 +- .../inc/extended/textwindowaccessibility.hxx | 2 +- .../inc/helper/accessiblestrings.hrc | 42 - accessibility/inc/helper/accresmgr.hxx | 7 +- accessibility/inc/pch/precompiled_acc.hxx | 2 - accessibility/inc/strings.hrc | 39 + .../extended/accessibleeditbrowseboxcell.cxx | 2 +- .../extended/accessiblelistboxentry.cxx | 2 +- .../source/helper/accessiblestrings.src | 75 - accessibility/source/helper/accresmgr.cxx | 17 +- .../standard/accessiblemenuitemcomponent.cxx | 2 +- .../source/standard/vclxaccessiblebox.cxx | 2 +- .../source/standard/vclxaccessiblebutton.cxx | 2 +- .../standard/vclxaccessiblecheckbox.cxx | 2 +- .../vclxaccessibledropdowncombobox.cxx | 2 +- .../vclxaccessibledropdownlistbox.cxx | 2 +- .../source/standard/vclxaccessibleedit.cxx | 2 +- .../standard/vclxaccessiblemenuitem.cxx | 2 +- .../standard/vclxaccessibleradiobutton.cxx | 2 +- .../standard/vclxaccessiblescrollbar.cxx | 2 +- .../standard/vclxaccessibletoolboxitem.cxx | 2 +- .../AllLangMoTarget_avmedia.mk | 8 +- avmedia/AllLangResTarget_avmedia.mk | 30 - avmedia/Module_avmedia.mk | 2 +- avmedia/inc/strings.hrc | 48 + avmedia/source/framework/MediaControlBase.cxx | 2 +- avmedia/source/framework/mediacontrol.cxx | 2 +- avmedia/source/framework/mediacontrol.hrc | 37 - avmedia/source/framework/mediacontrol.src | 98 - avmedia/source/framework/mediamisc.cxx | 13 +- avmedia/source/framework/mediaplayer.cxx | 2 +- avmedia/source/inc/mediamisc.hxx | 22 +- avmedia/source/viewer/mediawindow.cxx | 2 +- avmedia/source/viewer/mediawindow.hrc | 26 - avmedia/source/viewer/mediawindow.src | 47 - avmedia/source/viewer/mediawindow_impl.cxx | 2 +- basctl/AllLangMoTarget_basctl.mk | 11 + basctl/AllLangResTarget_basctl.mk | 45 - basctl/Module_basctl.mk | 11 +- basctl/inc/basidesh.hrc | 118 - basctl/inc/pch/precompiled_basctl.hxx | 4 - basctl/inc/strings.hrc | 122 + basctl/source/basicide/basicbox.cxx | 3 +- basctl/source/basicide/basicmod.hxx | 7 +- basctl/source/basicide/basicprint.src | 35 - basctl/source/basicide/basicrenderable.cxx | 3 +- basctl/source/basicide/baside2.cxx | 17 +- basctl/source/basicide/baside2b.cxx | 3 +- basctl/source/basicide/baside3.cxx | 3 +- basctl/source/basicide/basides1.cxx | 3 +- basctl/source/basicide/basides2.cxx | 4 +- basctl/source/basicide/basidesh.cxx | 3 +- basctl/source/basicide/basidesh.src | 343 -- basctl/source/basicide/basobj2.cxx | 2 +- basctl/source/basicide/basobj3.cxx | 2 +- basctl/source/basicide/bastype2.cxx | 2 +- basctl/source/basicide/bastype3.cxx | 2 +- basctl/source/basicide/bastypes.cxx | 7 +- basctl/source/basicide/iderdll.cxx | 17 +- basctl/source/basicide/macrodlg.cxx | 3 +- basctl/source/basicide/macrodlg.hrc | 31 - basctl/source/basicide/macrodlg.src | 43 - basctl/source/basicide/moduldl2.cxx | 6 +- basctl/source/basicide/moduldlg.cxx | 4 +- basctl/source/basicide/objdlg.cxx | 2 +- basctl/source/basicide/objdlg.hrc | 29 - basctl/source/basicide/objdlg.src | 32 - basctl/source/basicide/scriptdocument.cxx | 2 +- basctl/source/dlged/dlgedobj.cxx | 3 +- basctl/source/dlged/dlgresid.src | 47 - basctl/source/dlged/managelang.cxx | 2 +- basctl/source/dlged/propbrw.cxx | 6 +- basctl/source/inc/dlgresid.hrc | 38 - basctl/source/inc/iderid.hxx | 8 +- .../uiconfig/basicide/ui/basicmacrodialog.ui | 24 +- .../uiconfig/basicide/ui/breakpointmenus.ui | 8 +- .../uiconfig/basicide/ui/defaultlanguage.ui | 14 +- .../uiconfig/basicide/ui/deletelangdialog.ui | 8 +- basctl/uiconfig/basicide/ui/dialogpage.ui | 14 +- basctl/uiconfig/basicide/ui/exportdialog.ui | 8 +- basctl/uiconfig/basicide/ui/gotolinedialog.ui | 6 +- .../uiconfig/basicide/ui/importlibdialog.ui | 10 +- basctl/uiconfig/basicide/ui/libpage.ui | 14 +- .../uiconfig/basicide/ui/managebreakpoints.ui | 10 +- .../uiconfig/basicide/ui/managelanguages.ui | 12 +- basctl/uiconfig/basicide/ui/modulepage.ui | 14 +- basctl/uiconfig/basicide/ui/newlibdialog.ui | 4 +- basctl/uiconfig/basicide/ui/organizedialog.ui | 10 +- .../AllLangMoTarget_sb.mk | 7 +- basic/AllLangResTarget_sb.mk | 39 - basic/Library_sb.mk | 3 - basic/Module_basic.mk | 2 +- basic/inc/basic.hrc | 161 + basic/inc/basrid.hxx | 8 +- basic/inc/pch/precompiled_sb.hxx | 1 - .../help/dp_help.hrc => basic/inc/strings.hrc | 18 +- basic/qa/cppunit/basictest.cxx | 1 - basic/source/basmgr/basmgr.cxx | 2 - basic/source/classes/sb.cxx | 26 +- basic/source/classes/sb.src | 191 - basic/source/runtime/basrdll.cxx | 14 +- basic/source/runtime/methods.cxx | 2 - basic/source/runtime/runtime.cxx | 2 - basic/source/sbx/format.src | 51 - basic/source/sbx/sbxscan.cxx | 20 +- bin/find-unused-defines-in-hrc-files.py | 19 - bin/lint-ui.py | 2 + bin/run | 18 +- chart2/AllLangMoTarget_chart.mk | 13 + chart2/AllLangResTarget_chartcontroller.mk | 35 - chart2/CppunitTest_chart2_import.mk | 3 - chart2/CppunitTest_chart2_trendcalculators.mk | 3 - chart2/Library_chartcontroller.mk | 3 - chart2/Module_chart2.mk | 4 +- .../inc/pch/precompiled_chartcontroller.hxx | 3 - chart2/inc/strings.hrc | 198 + .../accessibility/AccessibleChartView.cxx | 2 +- .../dialogs/ChartTypeDialogController.cxx | 4 +- .../source/controller/dialogs/DataBrowser.cxx | 2 +- .../source/controller/dialogs/DialogModel.cxx | 2 +- .../dialogs/GL3DBarChartDialogController.cxx | 3 +- .../controller/dialogs/ObjectNameProvider.cxx | 2 +- chart2/source/controller/dialogs/Strings.src | 586 -- .../controller/dialogs/Strings_ChartTypes.src | 155 - .../controller/dialogs/Strings_Scale.src | 46 - .../controller/dialogs/Strings_Statistic.src | 58 - .../dialogs/TextDirectionListBox.cxx | 2 +- .../controller/dialogs/dlg_ChartType.cxx | 2 +- .../controller/dialogs/dlg_CreationWizard.cxx | 16 +- .../controller/dialogs/dlg_DataEditor.cxx | 2 +- .../controller/dialogs/dlg_DataSource.cxx | 2 +- .../dialogs/dlg_ObjectProperties.cxx | 2 +- .../source/controller/dialogs/dlg_View3D.cxx | 2 +- .../controller/dialogs/res_DataLabel.cxx | 2 +- .../controller/dialogs/res_LegendPosition.cxx | 2 +- .../source/controller/dialogs/res_Titles.cxx | 2 +- .../controller/dialogs/res_Trendline.cxx | 2 +- .../dialogs/tp_3D_SceneIllumination.cxx | 1 + .../controller/dialogs/tp_AxisPositions.cxx | 4 +- .../controller/dialogs/tp_ChartType.cxx | 4 +- .../controller/dialogs/tp_DataSource.cxx | 2 +- .../controller/dialogs/tp_PolarOptions.cxx | 2 +- .../controller/dialogs/tp_RangeChooser.cxx | 2 +- chart2/source/controller/dialogs/tp_Scale.cxx | 36 +- chart2/source/controller/dialogs/tp_Scale.hxx | 6 +- .../controller/dialogs/tp_SeriesToAxis.cxx | 2 +- .../dialogs/tp_Wizard_TitlesAndObjects.cxx | 2 +- .../controller/main/ChartController.cxx | 2 +- .../main/ChartController_EditData.cxx | 2 +- .../main/ChartController_Insert.cxx | 2 +- .../main/ChartController_Position.cxx | 2 +- .../main/ChartController_Properties.cxx | 2 +- .../main/ChartController_TextEdit.cxx | 2 +- .../controller/main/ChartController_Tools.cxx | 15 +- .../main/ChartController_Window.cxx | 2 +- .../controller/main/DragMethod_Base.cxx | 2 +- .../controller/main/DragMethod_PieSegment.cxx | 2 +- .../controller/main/DrawCommandDispatch.cxx | 5 +- .../controller/main/ElementSelector.cxx | 2 +- .../controller/main/UndoCommandDispatch.cxx | 2 +- chart2/source/inc/ResId.hxx | 2 +- chart2/source/inc/ResourceManager.hxx | 6 +- chart2/source/inc/Strings.hrc | 265 - chart2/source/tools/InternalData.cxx | 2 +- ...MovingAverageRegressionCurveCalculator.cxx | 2 +- chart2/source/tools/RegressionCurveHelper.cxx | 2 +- chart2/source/tools/ResId.cxx | 6 +- chart2/source/tools/ResourceManager.cxx | 13 +- .../source/view/charttypes/VSeriesPlotter.cxx | 2 +- .../source/view/inc/AbstractShapeFactory.hxx | 2 +- chart2/uiconfig/ui/3dviewdialog.ui | 4 +- chart2/uiconfig/ui/attributedialog.ui | 2 +- chart2/uiconfig/ui/chardialog.ui | 10 +- chart2/uiconfig/ui/chartdatadialog.ui | 22 +- chart2/uiconfig/ui/charttypedialog.ui | 4 +- chart2/uiconfig/ui/datarangedialog.ui | 4 +- chart2/uiconfig/ui/dlg_DataLabel.ui | 68 +- chart2/uiconfig/ui/dlg_InsertErrorBars.ui | 48 +- chart2/uiconfig/ui/dlg_InsertLegend.ui | 16 +- chart2/uiconfig/ui/insertaxisdlg.ui | 20 +- chart2/uiconfig/ui/insertgriddlg.ui | 20 +- chart2/uiconfig/ui/inserttitledlg.ui | 22 +- chart2/uiconfig/ui/paradialog.ui | 12 +- chart2/uiconfig/ui/sidebaraxis.ui | 18 +- chart2/uiconfig/ui/sidebarelements.ui | 60 +- chart2/uiconfig/ui/sidebarerrorbar.ui | 34 +- chart2/uiconfig/ui/sidebarseries.ui | 34 +- chart2/uiconfig/ui/smoothlinesdlg.ui | 18 +- chart2/uiconfig/ui/steppedlinesdlg.ui | 12 +- chart2/uiconfig/ui/titlerotationtabpage.ui | 12 +- chart2/uiconfig/ui/tp_3D_SceneAppearance.ui | 16 +- chart2/uiconfig/ui/tp_3D_SceneGeometry.ui | 14 +- chart2/uiconfig/ui/tp_3D_SceneIllumination.ui | 28 +- chart2/uiconfig/ui/tp_AxisPositions.ui | 62 +- chart2/uiconfig/ui/tp_ChartType.ui | 44 +- chart2/uiconfig/ui/tp_DataLabel.ui | 66 +- chart2/uiconfig/ui/tp_DataSource.ui | 26 +- chart2/uiconfig/ui/tp_ErrorBars.ui | 46 +- chart2/uiconfig/ui/tp_LegendPosition.ui | 16 +- chart2/uiconfig/ui/tp_PolarOptions.ui | 14 +- chart2/uiconfig/ui/tp_RangeChooser.ui | 26 +- chart2/uiconfig/ui/tp_Scale.ui | 48 +- chart2/uiconfig/ui/tp_SeriesToAxis.ui | 30 +- chart2/uiconfig/ui/tp_Trendline.ui | 38 +- chart2/uiconfig/ui/tp_axisLabel.ui | 30 +- chart2/uiconfig/ui/wizelementspage.ui | 36 +- comphelper/Library_comphelper.mk | 1 - .../source/misc/officeresourcebundle.cxx | 208 - .../clang/constantparam.booleans.results | 4 - compilerplugins/clang/unusedenumconstants.py | 1 - config_host.mk.in | 2 + configure.ac | 13 + ...arget_sdberr.mk => AllLangMoTarget_cnr.mk} | 13 +- connectivity/AllLangResTarget_cnr.mk | 28 - connectivity/CppunitTest_connectivity_ado.mk | 1 + .../CppunitTest_connectivity_commontools.mk | 1 + connectivity/Library_ado.mk | 1 + connectivity/Library_dbtools.mk | 1 + connectivity/Library_evoab.mk | 1 + connectivity/Library_firebird_sdbc.mk | 1 + connectivity/Library_mork.mk | 1 + connectivity/Library_mysql.mk | 1 + connectivity/Module_connectivity.mk | 3 +- connectivity/inc/pch/precompiled_dbtools.hxx | 1 - connectivity/inc/strings.hrc | 148 + connectivity/inc/strings.hxx | 115 +- .../qa/connectivity/ado/DriverTest.cxx | 2 +- .../FDatabaseMetaDataResultSet.cxx | 2 +- .../source/commontools/TConnection.cxx | 7 +- .../commontools/TDatabaseMetaDataBase.cxx | 2 +- .../source/commontools/dbexception.cxx | 5 +- .../source/commontools/dbmetadata.cxx | 2 +- connectivity/source/commontools/dbtools.cxx | 2 +- connectivity/source/commontools/dbtools2.cxx | 2 +- connectivity/source/commontools/sqlerror.cxx | 83 +- connectivity/source/drivers/ado/AColumns.cxx | 2 +- .../source/drivers/ado/AConnection.cxx | 2 +- connectivity/source/drivers/ado/ADriver.cxx | 2 +- connectivity/source/drivers/ado/AGroups.cxx | 2 +- connectivity/source/drivers/ado/AIndexes.cxx | 3 +- connectivity/source/drivers/ado/AKeys.cxx | 2 +- .../source/drivers/ado/APreparedStatement.cxx | 2 +- connectivity/source/drivers/ado/ATables.cxx | 2 +- connectivity/source/drivers/ado/AUsers.cxx | 2 +- connectivity/source/drivers/ado/AViews.cxx | 2 +- .../source/drivers/ado/Aolevariant.cxx | 2 +- .../source/drivers/calc/CConnection.cxx | 2 +- connectivity/source/drivers/calc/CDriver.cxx | 2 +- connectivity/source/drivers/dbase/DDriver.cxx | 2 +- connectivity/source/drivers/dbase/DIndex.cxx | 6 +- .../source/drivers/dbase/DIndexes.cxx | 2 +- .../source/drivers/dbase/DResultSet.cxx | 2 +- connectivity/source/drivers/dbase/DTable.cxx | 6 +- connectivity/source/drivers/dbase/DTables.cxx | 2 +- .../source/drivers/evoab2/NDriver.cxx | 2 +- .../drivers/evoab2/NPreparedStatement.cxx | 2 +- .../source/drivers/evoab2/NResultSet.cxx | 2 +- .../drivers/evoab2/NResultSetMetaData.cxx | 2 +- .../source/drivers/evoab2/NStatement.cxx | 3 +- .../source/drivers/file/FConnection.cxx | 2 +- connectivity/source/drivers/file/FDriver.cxx | 2 +- .../drivers/file/FPreparedStatement.cxx | 2 +- .../source/drivers/file/FResultSet.cxx | 7 +- .../source/drivers/file/FStatement.cxx | 2 +- .../source/drivers/file/fanalyzer.cxx | 2 +- connectivity/source/drivers/file/fcomp.cxx | 2 +- .../source/drivers/firebird/Connection.cxx | 3 +- .../source/drivers/firebird/Driver.cxx | 3 +- connectivity/source/drivers/flat/EDriver.cxx | 2 +- .../source/drivers/hsqldb/HConnection.cxx | 2 +- .../source/drivers/hsqldb/HDriver.cxx | 2 +- connectivity/source/drivers/hsqldb/HUser.cxx | 2 +- .../source/drivers/jdbc/JConnection.cxx | 2 +- connectivity/source/drivers/jdbc/JDriver.cxx | 2 +- .../source/drivers/jdbc/PreparedStatement.cxx | 2 +- .../source/drivers/jdbc/ResultSet.cxx | 2 +- .../source/drivers/macab/MacabDriver.cxx | 2 +- .../drivers/macab/MacabPreparedStatement.cxx | 2 +- .../source/drivers/macab/MacabResultSet.cxx | 2 +- .../drivers/macab/MacabResultSetMetaData.cxx | 2 +- .../source/drivers/macab/MacabStatement.cxx | 6 +- .../source/drivers/macab/macabutilities.hxx | 2 +- .../source/drivers/mork/MConnection.cxx | 14 +- .../source/drivers/mork/MConnection.hxx | 2 +- .../source/drivers/mork/MDatabaseMetaData.cxx | 2 +- .../source/drivers/mork/MErrorResource.hxx | 14 +- .../source/drivers/mork/MQueryHelper.cxx | 2 +- .../source/drivers/mork/MResultSet.cxx | 3 +- .../source/drivers/mork/MStatement.cxx | 3 +- connectivity/source/drivers/mysql/YDriver.cxx | 3 +- connectivity/source/drivers/mysql/YUser.cxx | 2 +- connectivity/source/drivers/odbc/ODriver.cxx | 2 +- .../drivers/odbc/OPreparedStatement.cxx | 2 +- .../source/drivers/odbc/OStatement.cxx | 2 +- .../source/drivers/writer/WConnection.cxx | 2 +- .../source/drivers/writer/WDriver.cxx | 2 +- connectivity/source/inc/TConnection.hxx | 2 +- connectivity/source/inc/dbase/DIndex.hxx | 2 +- connectivity/source/inc/dbase/DTable.hxx | 2 +- connectivity/source/inc/resource/ado_res.hrc | 41 - connectivity/source/inc/resource/calc_res.hrc | 32 - .../source/inc/resource/common_res.hrc | 66 - .../source/inc/resource/dbase_res.hrc | 52 - .../source/inc/resource/evoab2_res.hrc | 33 - connectivity/source/inc/resource/file_res.hrc | 40 - .../source/inc/resource/hsqldb_res.hrc | 37 - .../source/inc/resource/macab_res.hrc | 33 - connectivity/source/inc/resource/mork_res.hrc | 41 - .../source/inc/resource/sharedresources.hxx | 20 +- .../source/resource/conn_error_message.src | 92 - .../source/resource/conn_shared_res.src | 493 -- .../source/resource/sharedresources.cxx | 57 +- connectivity/source/sdbcx/VCollection.cxx | 2 +- cppcanvas/CppunitTest_cppcanvas_emfplus.mk | 4 - cppcanvas/inc/pch/precompiled_cppcanvas.hxx | 2 - cui/AllLangMoTarget_cui.mk | 11 + cui/AllLangResTarget_cui.mk | 55 - cui/Library_cui.mk | 3 - cui/Module_cui.mk | 4 +- cui/inc/pch/precompiled_cui.hxx | 3 - .../personalization.hrc} | 48 +- cui/inc/strings.hrc | 385 ++ .../strings.hrc => cui/inc/strings.hxx | 12 +- cui/inc/treeopt.hrc | 155 + cui/source/customize/SvxMenuConfigPage.cxx | 1 + cui/source/customize/acccfg.cxx | 3 +- cui/source/customize/cfg.cxx | 1 + cui/source/customize/cfg.src | 145 - cui/source/customize/cfgutil.cxx | 1 + cui/source/customize/macropg.cxx | 3 +- cui/source/customize/macropg.src | 336 -- cui/source/dialogs/cuicharmap.cxx | 1 + cui/source/dialogs/cuifmsearch.cxx | 12 +- cui/source/dialogs/cuigaldlg.cxx | 3 +- cui/source/dialogs/cuihyperdlg.cxx | 1 + cui/source/dialogs/cuires.src | 133 - cui/source/dialogs/fmsearch.hrc | 38 - cui/source/dialogs/fmsearch.src | 77 - cui/source/dialogs/gallery.src | 46 - cui/source/dialogs/hangulhanjadlg.cxx | 1 + cui/source/dialogs/hldocntp.cxx | 1 + cui/source/dialogs/hlmarkwn.cxx | 1 + cui/source/dialogs/hltpbase.cxx | 1 + cui/source/dialogs/hyperdlg.src | 97 - cui/source/dialogs/insdlg.cxx | 23 +- cui/source/dialogs/insrc.cxx | 1 + cui/source/dialogs/linkdlg.cxx | 2 +- cui/source/dialogs/multipat.cxx | 1 + cui/source/dialogs/passwdomdlg.cxx | 1 + cui/source/dialogs/passwdomdlg.src | 42 - cui/source/dialogs/pastedlg.cxx | 7 +- .../dialogs/screenshotannotationdlg.cxx | 1 + .../dialogs/screenshotannotationdlg.src | 27 - cui/source/dialogs/scriptdlg.cxx | 1 + cui/source/dialogs/scriptdlg.src | 104 - cui/source/dialogs/showcols.cxx | 2 +- cui/source/dialogs/srchxtra.cxx | 7 +- cui/source/dialogs/svuidlg.hrc | 30 - cui/source/dialogs/thesdlg.cxx | 1 + cui/source/factory/cuiresmgr.cxx | 16 +- cui/source/factory/dlgfact.cxx | 1 - cui/source/inc/border.hxx | 4 +- cui/source/inc/cuires.hrc | 340 -- cui/source/inc/dialmgr.hxx | 16 +- cui/source/inc/gallery.hrc | 28 - cui/source/inc/macropg.hxx | 8 +- cui/source/inc/swpossizetabpage.hxx | 5 +- cui/source/inc/treeopt.hxx | 35 - cui/source/options/cfgchart.cxx | 1 + cui/source/options/connpooloptions.cxx | 1 + cui/source/options/connpooloptions.src | 43 - cui/source/options/dbregister.cxx | 2 +- cui/source/options/dbregister.src | 32 - cui/source/options/doclinkdialog.cxx | 1 + cui/source/options/doclinkdialog.src | 42 - cui/source/options/optchart.src | 32 - cui/source/options/optcolor.cxx | 2 +- cui/source/options/optcolor.src | 41 - cui/source/options/optdict.cxx | 3 +- cui/source/options/optdict.src | 38 - cui/source/options/optfltr.cxx | 1 + cui/source/options/optfltr.src | 51 - cui/source/options/optinet2.cxx | 1 + cui/source/options/optinet2.src | 29 - cui/source/options/optjava.cxx | 1 + cui/source/options/optjava.src | 43 - cui/source/options/optlingu.cxx | 1 + cui/source/options/optlingu.src | 87 - cui/source/options/optopencl.cxx | 1 + cui/source/options/optpath.cxx | 83 +- cui/source/options/optpath.src | 120 - cui/source/options/personalization.cxx | 10 +- cui/source/options/treeopt.cxx | 209 +- cui/source/options/treeopt.src | 177 - cui/source/tabpages/align.cxx | 1 + cui/source/tabpages/autocdlg.cxx | 1 + cui/source/tabpages/backgrnd.cxx | 9 +- cui/source/tabpages/border.cxx | 8 +- cui/source/tabpages/border.src | 95 - cui/source/tabpages/chardlg.cxx | 1 + cui/source/tabpages/connect.cxx | 1 + cui/source/tabpages/frmdirlbox.src | 61 - cui/source/tabpages/grfpage.cxx | 1 + cui/source/tabpages/measure.cxx | 10 +- cui/source/tabpages/numfmt.cxx | 1 + cui/source/tabpages/numpages.cxx | 10 +- cui/source/tabpages/page.cxx | 2 +- cui/source/tabpages/paragrph.cxx | 1 + cui/source/tabpages/strings.src | 195 - cui/source/tabpages/swpossizetabpage.cxx | 12 +- cui/source/tabpages/tpbitmap.cxx | 4 +- cui/source/tabpages/tpcolor.cxx | 2 + cui/source/tabpages/tpgradnt.cxx | 2 + cui/source/tabpages/tphatch.cxx | 2 + cui/source/tabpages/tpline.cxx | 2 + cui/source/tabpages/tplnedef.cxx | 17 +- cui/source/tabpages/tplneend.cxx | 10 +- cui/source/tabpages/tppattern.cxx | 7 +- cui/uiconfig/ui/aboutconfigdialog.ui | 18 +- cui/uiconfig/ui/aboutconfigvaluedialog.ui | 6 +- cui/uiconfig/ui/aboutdialog.ui | 30 +- cui/uiconfig/ui/accelconfigpage.ui | 24 +- cui/uiconfig/ui/acorexceptpage.ui | 22 +- cui/uiconfig/ui/acoroptionspage.ui | 2 +- cui/uiconfig/ui/acorreplacepage.ui | 10 +- cui/uiconfig/ui/agingdialog.ui | 8 +- cui/uiconfig/ui/applyautofmtpage.ui | 12 +- cui/uiconfig/ui/applylocalizedpage.ui | 46 +- cui/uiconfig/ui/areadialog.ui | 10 +- cui/uiconfig/ui/areatabpage.ui | 14 +- cui/uiconfig/ui/asiantypography.ui | 10 +- cui/uiconfig/ui/assigncomponentdialog.ui | 6 +- cui/uiconfig/ui/autocorrectdialog.ui | 20 +- cui/uiconfig/ui/backgroundpage.ui | 38 +- cui/uiconfig/ui/baselinksdialog.ui | 34 +- cui/uiconfig/ui/bitmaptabpage.ui | 66 +- .../ui/blackorwhitelistentrydialog.ui | 24 +- .../ui/borderareatransparencydialog.ui | 10 +- cui/uiconfig/ui/borderbackgrounddialog.ui | 8 +- cui/uiconfig/ui/borderpage.ui | 46 +- cui/uiconfig/ui/breaknumberoption.ui | 10 +- cui/uiconfig/ui/calloutdialog.ui | 10 +- cui/uiconfig/ui/calloutpage.ui | 42 +- cui/uiconfig/ui/cellalignment.ui | 64 +- cui/uiconfig/ui/certdialog.ui | 18 +- cui/uiconfig/ui/charnamepage.ui | 42 +- cui/uiconfig/ui/colorconfigwin.ui | 108 +- cui/uiconfig/ui/colorpage.ui | 64 +- cui/uiconfig/ui/colorpickerdialog.ui | 32 +- cui/uiconfig/ui/comment.ui | 16 +- cui/uiconfig/ui/connectortabpage.ui | 26 +- cui/uiconfig/ui/connpooloptions.ui | 14 +- cui/uiconfig/ui/croppage.ui | 30 +- cui/uiconfig/ui/cuiimapdlg.ui | 14 +- cui/uiconfig/ui/customizedialog.ui | 14 +- cui/uiconfig/ui/databaselinkdialog.ui | 12 +- cui/uiconfig/ui/dbregisterpage.ui | 10 +- cui/uiconfig/ui/dimensionlinestabpage.ui | 32 +- cui/uiconfig/ui/distributiondialog.ui | 4 +- cui/uiconfig/ui/distributionpage.ui | 26 +- cui/uiconfig/ui/editdictionarydialog.ui | 16 +- cui/uiconfig/ui/editmodulesdialog.ui | 16 +- cui/uiconfig/ui/effectspage.ui | 112 +- cui/uiconfig/ui/embossdialog.ui | 8 +- cui/uiconfig/ui/eventassigndialog.ui | 4 +- cui/uiconfig/ui/eventassignpage.ui | 16 +- cui/uiconfig/ui/eventsconfigpage.ui | 14 +- cui/uiconfig/ui/fmsearchdialog.ui | 54 +- cui/uiconfig/ui/formatcellsdialog.ui | 12 +- cui/uiconfig/ui/formatnumberdialog.ui | 4 +- cui/uiconfig/ui/galleryapplyprogress.ui | 6 +- cui/uiconfig/ui/galleryfilespage.ui | 14 +- cui/uiconfig/ui/gallerygeneralpage.ui | 12 +- cui/uiconfig/ui/gallerysearchprogress.ui | 8 +- cui/uiconfig/ui/gallerythemedialog.ui | 8 +- cui/uiconfig/ui/gallerythemeiddialog.ui | 6 +- cui/uiconfig/ui/gallerytitledialog.ui | 6 +- cui/uiconfig/ui/galleryupdateprogress.ui | 6 +- cui/uiconfig/ui/gradientpage.ui | 40 +- cui/uiconfig/ui/hangulhanjaadddialog.ui | 8 +- .../ui/hangulhanjaconversiondialog.ui | 46 +- cui/uiconfig/ui/hangulhanjaeditdictdialog.ui | 10 +- cui/uiconfig/ui/hangulhanjaoptdialog.ui | 18 +- cui/uiconfig/ui/hatchpage.ui | 28 +- cui/uiconfig/ui/hyperlinkdialog.ui | 8 +- cui/uiconfig/ui/hyperlinkdocpage.ui | 34 +- cui/uiconfig/ui/hyperlinkinternetpage.ui | 28 +- cui/uiconfig/ui/hyperlinkmailpage.ui | 24 +- cui/uiconfig/ui/hyperlinkmarkdialog.ui | 10 +- cui/uiconfig/ui/hyperlinknewdocpage.ui | 28 +- cui/uiconfig/ui/hyphenate.ui | 12 +- cui/uiconfig/ui/iconchangedialog.ui | 6 +- cui/uiconfig/ui/iconselectordialog.ui | 12 +- cui/uiconfig/ui/insertfloatingframe.ui | 34 +- cui/uiconfig/ui/insertoleobject.ui | 18 +- cui/uiconfig/ui/insertrowcolumn.ui | 14 +- cui/uiconfig/ui/javaclasspathdialog.ui | 12 +- cui/uiconfig/ui/javastartparametersdialog.ui | 16 +- cui/uiconfig/ui/linedialog.ui | 12 +- cui/uiconfig/ui/lineendstabpage.ui | 16 +- cui/uiconfig/ui/linestyletabpage.ui | 26 +- cui/uiconfig/ui/linetabpage.ui | 70 +- cui/uiconfig/ui/macroassigndialog.ui | 4 +- cui/uiconfig/ui/macroassignpage.ui | 16 +- cui/uiconfig/ui/macroselectordialog.ui | 20 +- cui/uiconfig/ui/menuassignpage.ui | 58 +- cui/uiconfig/ui/messbox.ui | 2 +- cui/uiconfig/ui/mosaicdialog.ui | 14 +- cui/uiconfig/ui/movemenu.ui | 12 +- cui/uiconfig/ui/multipathdialog.ui | 10 +- cui/uiconfig/ui/namedialog.ui | 4 +- cui/uiconfig/ui/newlibdialog.ui | 14 +- cui/uiconfig/ui/newtabledialog.ui | 8 +- cui/uiconfig/ui/newtoolbardialog.ui | 8 +- cui/uiconfig/ui/numberingformatpage.ui | 56 +- cui/uiconfig/ui/numberingoptionspage.ui | 74 +- cui/uiconfig/ui/numberingpositionpage.ui | 40 +- cui/uiconfig/ui/objectnamedialog.ui | 6 +- cui/uiconfig/ui/objecttitledescdialog.ui | 8 +- cui/uiconfig/ui/optaccessibilitypage.ui | 20 +- cui/uiconfig/ui/optadvancedpage.ui | 34 +- cui/uiconfig/ui/optappearancepage.ui | 16 +- cui/uiconfig/ui/optasianpage.ui | 28 +- cui/uiconfig/ui/optbasicidepage.ui | 20 +- cui/uiconfig/ui/optchartcolorspage.ui | 8 +- cui/uiconfig/ui/optctlpage.ui | 30 +- cui/uiconfig/ui/optemailpage.ui | 12 +- cui/uiconfig/ui/optfltrembedpage.ui | 16 +- cui/uiconfig/ui/optfltrpage.ui | 24 +- cui/uiconfig/ui/optfontspage.ui | 28 +- cui/uiconfig/ui/optgeneralpage.ui | 28 +- cui/uiconfig/ui/opthtmlpage.ui | 38 +- cui/uiconfig/ui/optionsdialog.ui | 4 +- cui/uiconfig/ui/optjsearchpage.ui | 44 +- cui/uiconfig/ui/optlanguagespage.ui | 30 +- cui/uiconfig/ui/optlingupage.ui | 28 +- cui/uiconfig/ui/optmemorypage.ui | 26 +- cui/uiconfig/ui/optnewdictionarydialog.ui | 12 +- cui/uiconfig/ui/optonlineupdatepage.ui | 32 +- cui/uiconfig/ui/optopenclpage.ui | 12 +- cui/uiconfig/ui/optpathspage.ui | 14 +- cui/uiconfig/ui/optproxypage.ui | 28 +- cui/uiconfig/ui/optsavepage.ui | 58 +- cui/uiconfig/ui/optsecuritypage.ui | 40 +- cui/uiconfig/ui/optuserpage.ui | 78 +- cui/uiconfig/ui/optviewpage.ui | 114 +- cui/uiconfig/ui/pageformatpage.ui | 62 +- cui/uiconfig/ui/paragalignpage.ui | 50 +- cui/uiconfig/ui/paraindentspacing.ui | 46 +- cui/uiconfig/ui/paratabspage.ui | 40 +- cui/uiconfig/ui/password.ui | 22 +- cui/uiconfig/ui/pastespecial.ui | 8 +- cui/uiconfig/ui/patterntabpage.ui | 20 +- cui/uiconfig/ui/percentdialog.ui | 6 +- cui/uiconfig/ui/personalization_tab.ui | 14 +- cui/uiconfig/ui/pickbulletpage.ui | 4 +- cui/uiconfig/ui/pickgraphicpage.ui | 8 +- cui/uiconfig/ui/picknumberingpage.ui | 4 +- cui/uiconfig/ui/pickoutlinepage.ui | 4 +- cui/uiconfig/ui/positionpage.ui | 36 +- cui/uiconfig/ui/positionsizedialog.ui | 12 +- cui/uiconfig/ui/possizetabpage.ui | 32 +- cui/uiconfig/ui/posterdialog.ui | 8 +- cui/uiconfig/ui/querychangelineenddialog.ui | 8 +- cui/uiconfig/ui/querydeletebitmapdialog.ui | 6 +- .../ui/querydeletechartcolordialog.ui | 8 +- cui/uiconfig/ui/querydeletecolordialog.ui | 6 +- .../ui/querydeletedictionarydialog.ui | 8 +- cui/uiconfig/ui/querydeletegradientdialog.ui | 6 +- cui/uiconfig/ui/querydeletehatchdialog.ui | 6 +- cui/uiconfig/ui/querydeletelineenddialog.ui | 8 +- cui/uiconfig/ui/querydeletelinestyledialog.ui | 6 +- cui/uiconfig/ui/queryduplicatedialog.ui | 8 +- cui/uiconfig/ui/querynoloadedfiledialog.ui | 6 +- cui/uiconfig/ui/querynosavefiledialog.ui | 6 +- cui/uiconfig/ui/querysavelistdialog.ui | 8 +- .../ui/queryupdategalleryfilelistdialog.ui | 6 +- cui/uiconfig/ui/recordnumberdialog.ui | 6 +- cui/uiconfig/ui/rotationtabpage.ui | 20 +- cui/uiconfig/ui/screenshotannotationdialog.ui | 10 +- cui/uiconfig/ui/scriptorganizer.ui | 14 +- cui/uiconfig/ui/searchattrdialog.ui | 4 +- cui/uiconfig/ui/searchformatdialog.ui | 22 +- cui/uiconfig/ui/securityoptionsdialog.ui | 26 +- cui/uiconfig/ui/select_persona_dialog.ui | 10 +- cui/uiconfig/ui/selectpathdialog.ui | 8 +- cui/uiconfig/ui/shadowtabpage.ui | 14 +- cui/uiconfig/ui/showcoldialog.ui | 6 +- cui/uiconfig/ui/similaritysearchdialog.ui | 12 +- cui/uiconfig/ui/slantcornertabpage.ui | 22 +- cui/uiconfig/ui/smarttagoptionspage.ui | 8 +- cui/uiconfig/ui/smoothdialog.ui | 8 +- cui/uiconfig/ui/solarizedialog.ui | 10 +- cui/uiconfig/ui/specialcharacters.ui | 16 +- cui/uiconfig/ui/spellingdialog.ui | 42 +- cui/uiconfig/ui/spelloptionsdialog.ui | 4 +- cui/uiconfig/ui/splitcellsdialog.ui | 16 +- cui/uiconfig/ui/storedwebconnectiondialog.ui | 14 +- cui/uiconfig/ui/swpossizepage.ui | 46 +- cui/uiconfig/ui/textanimtabpage.ui | 50 +- cui/uiconfig/ui/textattrtabpage.ui | 32 +- cui/uiconfig/ui/textdialog.ui | 8 +- cui/uiconfig/ui/textflowpage.ui | 48 +- cui/uiconfig/ui/thesaurus.ui | 12 +- cui/uiconfig/ui/transparencytabpage.ui | 40 +- cui/uiconfig/ui/tsaurldialog.ui | 14 +- cui/uiconfig/ui/twolinespage.ui | 38 +- cui/uiconfig/ui/wordcompletionpage.ui | 20 +- cui/uiconfig/ui/zoomdialog.ui | 30 +- dbaccess/AllLangMoTarget_dba.mk | 13 + dbaccess/AllLangResTarget_dba.mk | 29 - dbaccess/AllLangResTarget_dbmm.mk | 24 - dbaccess/AllLangResTarget_dbu.mk | 52 - dbaccess/AllLangResTarget_sdbt.mk | 29 - dbaccess/CppunitTest_dbaccess_RowSetClones.mk | 3 - dbaccess/CppunitTest_dbaccess_dialog_save.mk | 3 - .../CppunitTest_dbaccess_empty_stdlib_save.mk | 3 - dbaccess/CppunitTest_dbaccess_hsqldb_test.mk | 3 - dbaccess/CppunitTest_dbaccess_macros_test.mk | 3 - dbaccess/CppunitTest_dbaccess_nolib_save.mk | 3 - dbaccess/Library_dba.mk | 1 + dbaccess/Library_dbaxml.mk | 2 +- dbaccess/Library_dbmm.mk | 2 +- dbaccess/Library_dbu.mk | 1 - dbaccess/Library_sdbt.mk | 4 +- dbaccess/Module_dbaccess.mk | 11 +- .../{source/core => }/inc/core_resource.hxx | 32 +- dbaccess/{source => }/inc/dbadllapi.hxx | 0 dbaccess/inc/pch/precompiled_dba.hxx | 2 - dbaccess/inc/pch/precompiled_dbaxml.hxx | 2 - dbaccess/inc/pch/precompiled_dbmm.hxx | 2 - dbaccess/inc/pch/precompiled_dbu.hxx | 2 - .../swdialmgr.cxx => dbaccess/inc/query.hrc | 27 +- dbaccess/inc/strings.hrc | 495 ++ .../stringconstants.inc => inc/strings.hxx} | 85 +- dbaccess/source/core/api/BookmarkSet.cxx | 2 +- dbaccess/source/core/api/CIndexes.cxx | 2 +- dbaccess/source/core/api/CRowSetColumn.cxx | 2 +- .../source/core/api/CRowSetDataColumn.cxx | 2 +- dbaccess/source/core/api/CacheSet.cxx | 5 +- .../source/core/api/FilteredContainer.cxx | 3 +- .../source/core/api/HelperCollections.cxx | 3 +- dbaccess/source/core/api/KeySet.cxx | 4 +- dbaccess/source/core/api/OptimisticSet.cxx | 4 +- dbaccess/source/core/api/RowSet.cxx | 4 +- dbaccess/source/core/api/RowSetBase.cxx | 5 +- dbaccess/source/core/api/RowSetCache.cxx | 5 +- .../core/api/SingleSelectQueryComposer.cxx | 4 +- dbaccess/source/core/api/StaticSet.cxx | 2 +- dbaccess/source/core/api/TableDeco.cxx | 4 +- dbaccess/source/core/api/View.cxx | 3 +- dbaccess/source/core/api/WrappedResultSet.cxx | 2 +- .../source/core/api/callablestatement.cxx | 3 +- dbaccess/source/core/api/column.cxx | 4 +- dbaccess/source/core/api/columnsettings.cxx | 3 +- dbaccess/source/core/api/datacolumn.cxx | 3 +- dbaccess/source/core/api/datasettings.cxx | 2 +- dbaccess/source/core/api/definitioncolumn.cxx | 2 +- .../source/core/api/preparedstatement.cxx | 2 +- dbaccess/source/core/api/query.cxx | 4 +- dbaccess/source/core/api/querycomposer.cxx | 2 +- dbaccess/source/core/api/querycontainer.cxx | 2 +- dbaccess/source/core/api/querydescriptor.cxx | 2 +- dbaccess/source/core/api/resultcolumn.cxx | 2 +- dbaccess/source/core/api/resultset.cxx | 2 +- dbaccess/source/core/api/statement.cxx | 2 +- dbaccess/source/core/api/table.cxx | 4 +- dbaccess/source/core/api/tablecontainer.cxx | 4 +- dbaccess/source/core/api/viewcontainer.cxx | 4 +- .../core/dataaccess/ComponentDefinition.cxx | 2 +- .../source/core/dataaccess/ContentHelper.cxx | 2 +- dbaccess/source/core/dataaccess/ModelImpl.cxx | 4 +- .../core/dataaccess/bookmarkcontainer.cxx | 4 +- .../core/dataaccess/commandcontainer.cxx | 2 +- .../core/dataaccess/commanddefinition.cxx | 2 +- .../source/core/dataaccess/connection.cxx | 4 +- .../core/dataaccess/dataaccessdescriptor.cxx | 3 +- .../core/dataaccess/databasecontext.cxx | 4 +- .../core/dataaccess/databasedocument.cxx | 4 +- .../source/core/dataaccess/datasource.cxx | 12 +- .../core/dataaccess/definitioncontainer.cxx | 4 +- .../core/dataaccess/documentcontainer.cxx | 4 +- .../core/dataaccess/documentdefinition.cxx | 4 +- dbaccess/source/core/dataaccess/intercept.cxx | 2 +- dbaccess/source/core/inc/core_resource.hrc | 97 - .../source/core/misc/ContainerMediator.cxx | 2 +- .../source/core/misc/DatabaseDataProvider.cxx | 3 +- dbaccess/source/core/misc/PropertyForward.cxx | 2 +- dbaccess/source/core/misc/apitools.cxx | 2 +- dbaccess/source/core/misc/dsntypes.cxx | 5 +- dbaccess/source/core/misc/sdbcoretools.cxx | 2 +- .../source/core/recovery/dbdocrecovery.cxx | 2 +- .../source/core/resource/core_resource.cxx | 18 +- dbaccess/source/core/resource/strings.src | 338 -- .../source/ext/macromigration/dbmm_global.hrc | 55 - .../source/ext/macromigration/dbmm_module.cxx | 31 - .../source/ext/macromigration/dbmm_module.hxx | 34 - .../ext/macromigration/dbmm_services.cxx | 27 +- .../source/ext/macromigration/dbmm_types.cxx | 26 +- .../ext/macromigration/macromigration.hrc | 29 - .../ext/macromigration/macromigration.src | 149 - .../macromigration/macromigrationdialog.cxx | 19 +- .../macromigration/macromigrationpages.cxx | 4 +- .../macromigration/macromigrationwizard.cxx | 85 +- .../macromigration/macromigrationwizard.hxx | 79 +- .../ext/macromigration/migrationengine.cxx | 14 +- .../ext/macromigration/migrationlog.cxx | 19 +- .../ext/macromigration/migrationprogress.hxx | 3 + dbaccess/source/filter/xml/dbloader2.cxx | 3 +- dbaccess/source/filter/xml/xmlColumn.cxx | 3 +- dbaccess/source/filter/xml/xmlComponent.cxx | 3 +- .../source/filter/xml/xmlConnectionData.cxx | 2 +- .../filter/xml/xmlConnectionResource.cxx | 3 +- dbaccess/source/filter/xml/xmlDataSource.cxx | 3 +- .../source/filter/xml/xmlDataSourceInfo.cxx | 3 +- .../filter/xml/xmlDataSourceSetting.cxx | 2 +- .../filter/xml/xmlDataSourceSettings.cxx | 2 +- dbaccess/source/filter/xml/xmlDatabase.cxx | 3 +- .../filter/xml/xmlDatabaseDescription.cxx | 2 +- dbaccess/source/filter/xml/xmlDocuments.cxx | 2 +- dbaccess/source/filter/xml/xmlExport.cxx | 3 +- .../filter/xml/xmlFileBasedDatabase.cxx | 3 +- dbaccess/source/filter/xml/xmlHelper.cxx | 3 +- .../filter/xml/xmlHierarchyCollection.cxx | 2 +- dbaccess/source/filter/xml/xmlLogin.cxx | 3 +- dbaccess/source/filter/xml/xmlQuery.cxx | 3 +- .../source/filter/xml/xmlServerDatabase.cxx | 3 +- dbaccess/source/filter/xml/xmlTable.cxx | 3 +- .../source/filter/xml/xmlTableFilterList.cxx | 3 +- dbaccess/source/filter/xml/xmlfilter.cxx | 3 +- dbaccess/source/inc/apitools.hxx | 1 + dbaccess/source/inc/dbastrings.hrc | 37 - dbaccess/source/inc/dbustrings.hrc | 63 - ...tringconstants.hrc => stringconstants.hxx} | 4 - dbaccess/source/inc/xmlstrings.hrc | 31 - .../sdbtools/connection/connectiontools.cxx | 6 - .../sdbtools/connection/objectnames.cxx | 13 +- .../sdbtools/connection/objectnames.hxx | 4 - .../source/sdbtools/connection/tablename.cxx | 13 +- .../connectiondependent.hxx | 0 .../{connection => inc}/connectiontools.hxx | 5 - .../source/sdbtools/inc/sdbt_resource.hrc | 38 - dbaccess/source/sdbtools/misc/module_sdbt.cxx | 29 - .../source/sdbtools/misc/sdbt_services.cxx | 28 +- .../source/sdbtools/resource/sdbt_strings.src | 57 - dbaccess/source/shared/sdbtstrings.cxx | 27 - dbaccess/source/shared/xmlstrings.cxx | 27 - dbaccess/source/ui/app/AppController.cxx | 21 +- dbaccess/source/ui/app/AppController.hxx | 4 +- dbaccess/source/ui/app/AppControllerDnD.cxx | 11 +- dbaccess/source/ui/app/AppControllerGen.cxx | 13 +- .../source/ui/app/AppDetailPageHelper.cxx | 7 +- dbaccess/source/ui/app/AppDetailView.cxx | 41 +- dbaccess/source/ui/app/AppDetailView.hxx | 8 +- dbaccess/source/ui/app/AppIconControl.cxx | 8 +- dbaccess/source/ui/app/AppSwapWindow.cxx | 2 +- dbaccess/source/ui/app/AppTitleWindow.cxx | 13 +- dbaccess/source/ui/app/AppTitleWindow.hxx | 6 +- dbaccess/source/ui/app/AppView.cxx | 4 +- dbaccess/source/ui/app/app.src | 247 - dbaccess/source/ui/app/dbu_app.hrc | 62 - .../source/ui/app/subcomponentmanager.cxx | 3 +- dbaccess/source/ui/browser/brwctrlr.cxx | 20 +- dbaccess/source/ui/browser/brwview.cxx | 5 +- dbaccess/source/ui/browser/dbexchange.cxx | 2 +- dbaccess/source/ui/browser/dbloader.cxx | 3 +- dbaccess/source/ui/browser/dbtreemodel.cxx | 2 +- dbaccess/source/ui/browser/dsEntriesNoExp.cxx | 2 +- dbaccess/source/ui/browser/dsbrowserDnD.cxx | 4 +- dbaccess/source/ui/browser/exsrcbrw.cxx | 3 +- dbaccess/source/ui/browser/formadapter.cxx | 5 +- .../source/ui/browser/genericcontroller.cxx | 2 +- dbaccess/source/ui/browser/sbabrw.src | 103 - dbaccess/source/ui/browser/sbagrid.cxx | 20 +- dbaccess/source/ui/browser/sbagrid.src | 98 - dbaccess/source/ui/browser/unodatbr.cxx | 27 +- .../source/ui/control/ColumnControlWindow.cxx | 6 +- dbaccess/source/ui/control/FieldControls.cxx | 17 +- .../source/ui/control/FieldDescControl.cxx | 32 +- .../source/ui/control/RelationControl.cxx | 2 +- dbaccess/source/ui/control/TableGrantCtrl.cxx | 19 +- dbaccess/source/ui/control/TableGrantCtrl.src | 62 - dbaccess/source/ui/control/dbtreelistbox.cxx | 2 +- dbaccess/source/ui/control/marktree.cxx | 2 +- dbaccess/source/ui/control/tabletree.cxx | 14 +- dbaccess/source/ui/control/tabletree.src | 53 - dbaccess/source/ui/control/undosqledit.src | 27 - dbaccess/source/ui/dlg/AutoControls.src | 97 - dbaccess/source/ui/dlg/CollectionView.cxx | 10 +- dbaccess/source/ui/dlg/ConnectionHelper.cxx | 23 +- dbaccess/source/ui/dlg/ConnectionPage.cxx | 40 +- dbaccess/source/ui/dlg/ConnectionPage.src | 63 - .../source/ui/dlg/ConnectionPageSetup.cxx | 24 +- .../source/ui/dlg/ConnectionPageSetup.hxx | 2 +- .../source/ui/dlg/DBSetupConnectionPages.cxx | 28 +- .../source/ui/dlg/DBSetupConnectionPages.hxx | 8 +- dbaccess/source/ui/dlg/DbAdminImpl.cxx | 15 +- dbaccess/source/ui/dlg/RelationDlg.cxx | 2 +- dbaccess/source/ui/dlg/TablesSingleDlg.cxx | 2 +- .../source/ui/dlg/TextConnectionHelper.cxx | 33 +- dbaccess/source/ui/dlg/UserAdmin.cxx | 13 +- dbaccess/source/ui/dlg/UserAdmin.src | 38 - dbaccess/source/ui/dlg/UserAdminDlg.cxx | 8 +- dbaccess/source/ui/dlg/admincontrols.cxx | 4 +- dbaccess/source/ui/dlg/adminpages.cxx | 16 +- dbaccess/source/ui/dlg/adtabdlg.cxx | 10 +- dbaccess/source/ui/dlg/advancedsettings.cxx | 6 +- dbaccess/source/ui/dlg/dbadmin.cxx | 16 +- dbaccess/source/ui/dlg/dbadmin.src | 80 - dbaccess/source/ui/dlg/dbadmin2.src | 49 - dbaccess/source/ui/dlg/dbadminsetup.src | 218 - dbaccess/source/ui/dlg/dbfindex.cxx | 4 +- dbaccess/source/ui/dlg/dbwiz.cxx | 17 +- dbaccess/source/ui/dlg/dbwizsetup.cxx | 41 +- dbaccess/source/ui/dlg/detailpages.cxx | 10 +- dbaccess/source/ui/dlg/directsql.cxx | 8 +- dbaccess/source/ui/dlg/directsql.src | 32 - dbaccess/source/ui/dlg/dlgattr.cxx | 4 +- dbaccess/source/ui/dlg/dlgsave.cxx | 18 +- dbaccess/source/ui/dlg/dlgsize.cxx | 4 +- dbaccess/source/ui/dlg/dsselect.cxx | 5 +- dbaccess/source/ui/dlg/generalpage.cxx | 20 +- dbaccess/source/ui/dlg/indexdialog.cxx | 14 +- dbaccess/source/ui/dlg/indexdialog.src | 70 - dbaccess/source/ui/dlg/indexfieldscontrol.cxx | 12 +- dbaccess/source/ui/dlg/paramdialog.cxx | 11 +- dbaccess/source/ui/dlg/paramdialog.src | 27 - dbaccess/source/ui/dlg/queryfilter.cxx | 5 +- dbaccess/source/ui/dlg/queryorder.cxx | 10 +- dbaccess/source/ui/dlg/sqlmessage.cxx | 28 +- dbaccess/source/ui/dlg/sqlmessage.src | 58 - dbaccess/source/ui/dlg/tablespage.cxx | 5 +- .../source/ui/dlg/textconnectionsettings.cxx | 6 +- dbaccess/source/ui/inc/FieldControls.hxx | 14 +- dbaccess/source/ui/inc/FieldDescControl.hxx | 4 +- dbaccess/source/ui/inc/GeneralUndo.hxx | 6 +- dbaccess/source/ui/inc/JoinController.hxx | 4 +- dbaccess/source/ui/inc/RelationDlg.hxx | 4 +- dbaccess/source/ui/inc/TableController.hxx | 4 +- dbaccess/source/ui/inc/TableGrantCtrl.hxx | 4 +- dbaccess/source/ui/inc/TokenWriter.hxx | 4 +- dbaccess/source/ui/inc/UITools.hxx | 6 +- dbaccess/source/ui/inc/UserAdminDlg.hxx | 6 +- .../source/ui/inc/advancedsettingsdlg.hxx | 4 +- dbaccess/source/ui/inc/brwctrlr.hxx | 4 +- dbaccess/source/ui/inc/brwview.hxx | 2 - dbaccess/source/ui/inc/charsets.hxx | 4 +- dbaccess/source/ui/inc/dbadmin.hxx | 2 +- dbaccess/source/ui/inc/dbtreelistbox.hxx | 4 +- dbaccess/source/ui/inc/dbu_brw.hrc | 46 - dbaccess/source/ui/inc/dbu_control.hrc | 45 - dbaccess/source/ui/inc/dbu_dlg.hrc | 155 - .../inc/dbamiscres.hrc => ui/inc/dbu_dlg.hxx} | 13 +- dbaccess/source/ui/inc/dbu_misc.hrc | 53 - dbaccess/source/ui/inc/dbu_pageids.hxx | 38 + dbaccess/source/ui/inc/dbu_qry.hrc | 78 - dbaccess/source/ui/inc/dbu_rel.hrc | 39 - dbaccess/source/ui/inc/dbu_resource.hrc | 172 - dbaccess/source/ui/inc/dbu_tbl.hrc | 81 - dbaccess/source/ui/inc/dbu_uno.hrc | 45 - dbaccess/source/ui/inc/dbwiz.hxx | 6 +- dbaccess/source/ui/inc/dbwizsetup.hxx | 7 +- dbaccess/source/ui/inc/directsql.hxx | 4 +- dbaccess/source/ui/inc/formadapter.hxx | 4 +- dbaccess/source/ui/inc/indexfieldscontrol.hxx | 4 +- dbaccess/source/ui/inc/moduledbu.hxx | 85 - dbaccess/source/ui/inc/undosqledit.hxx | 2 +- dbaccess/source/ui/inc/unoadmin.hxx | 4 +- dbaccess/source/ui/inc/unosqlmessage.hxx | 4 +- dbaccess/source/ui/misc/DExport.cxx | 10 +- dbaccess/source/ui/misc/HtmlReader.cxx | 11 +- dbaccess/source/ui/misc/RowSetDrop.cxx | 10 +- dbaccess/source/ui/misc/RtfReader.cxx | 13 +- dbaccess/source/ui/misc/TableCopyHelper.cxx | 13 +- dbaccess/source/ui/misc/TokenWriter.cxx | 3 +- dbaccess/source/ui/misc/UITools.cxx | 25 +- dbaccess/source/ui/misc/WCPage.cxx | 19 +- dbaccess/source/ui/misc/WColumnSelect.cxx | 9 +- dbaccess/source/ui/misc/WCopyTable.cxx | 22 +- dbaccess/source/ui/misc/WNameMatch.cxx | 5 +- dbaccess/source/ui/misc/WTypeSelect.cxx | 9 +- dbaccess/source/ui/misc/WizardPages.src | 83 - dbaccess/source/ui/misc/charsets.cxx | 17 +- .../source/ui/misc/databaseobjectview.cxx | 3 +- .../source/ui/misc/datasourceconnector.cxx | 10 +- .../ui/misc/dbsubcomponentcontroller.cxx | 14 +- dbaccess/source/ui/misc/dbumiscres.src | 88 - .../source/ui/misc/defaultobjectnamecheck.cxx | 7 +- dbaccess/source/ui/misc/imageprovider.cxx | 6 +- dbaccess/source/ui/misc/linkeddocuments.cxx | 16 +- dbaccess/source/ui/misc/moduledbu.cxx | 101 - .../source/ui/misc/singledoccontroller.cxx | 11 +- .../source/ui/querydesign/JoinController.cxx | 4 +- .../source/ui/querydesign/JoinDesignView.cxx | 4 +- .../source/ui/querydesign/JoinTableView.cxx | 2 +- dbaccess/source/ui/querydesign/LimitBox.cxx | 7 +- .../source/ui/querydesign/QTableWindow.cxx | 5 +- .../querydesign/QueryDesignFieldUndoAct.hxx | 6 +- .../ui/querydesign/QueryDesignUndoAction.hxx | 2 +- .../source/ui/querydesign/QueryDesignView.cxx | 47 +- .../ui/querydesign/QueryMoveTabWinUndoAct.hxx | 2 +- .../ui/querydesign/QuerySizeTabWinUndoAct.hxx | 2 +- .../ui/querydesign/QueryTabConnUndoAction.cxx | 6 +- .../ui/querydesign/QueryTabConnUndoAction.hxx | 2 +- .../ui/querydesign/QueryTabWinUndoAct.cxx | 8 +- .../ui/querydesign/QueryTabWinUndoAct.hxx | 2 +- .../source/ui/querydesign/QueryTableView.cxx | 9 +- .../source/ui/querydesign/QueryTextView.cxx | 4 +- .../source/ui/querydesign/QueryViewSwitch.cxx | 2 +- .../ui/querydesign/SelectionBrowseBox.cxx | 27 +- .../source/ui/querydesign/TableWindow.cxx | 4 +- .../ui/querydesign/TableWindowAccess.cxx | 2 +- .../ui/querydesign/TableWindowTitle.cxx | 4 +- .../ui/querydesign/limitboxcontroller.cxx | 2 +- dbaccess/source/ui/querydesign/query.src | 241 - .../ui/querydesign/querycontainerwindow.cxx | 3 +- .../source/ui/querydesign/querycontroller.cxx | 40 +- dbaccess/source/ui/querydesign/querydlg.cxx | 19 +- dbaccess/source/ui/querydesign/querydlg.src | 47 - .../relationdesign/RTableConnectionData.cxx | 10 +- .../ui/relationdesign/RelationController.cxx | 12 +- .../ui/relationdesign/RelationDesignView.cxx | 4 +- .../ui/relationdesign/RelationTableView.cxx | 15 +- .../source/ui/relationdesign/relation.src | 58 - .../ui/tabledesign/FieldDescriptions.cxx | 5 +- .../source/ui/tabledesign/TEditControl.cxx | 27 +- .../source/ui/tabledesign/TableController.cxx | 39 +- .../ui/tabledesign/TableDesignControl.cxx | 2 +- .../ui/tabledesign/TableFieldControl.cxx | 3 +- .../ui/tabledesign/TableFieldDescWin.cxx | 7 +- dbaccess/source/ui/tabledesign/TableUndo.cxx | 13 +- dbaccess/source/ui/tabledesign/TableUndo.hxx | 4 +- dbaccess/source/ui/tabledesign/table.src | 306 -- dbaccess/source/ui/uno/ColumnControl.cxx | 2 +- dbaccess/source/ui/uno/ColumnModel.cxx | 2 +- dbaccess/source/ui/uno/ColumnPeer.cxx | 3 +- dbaccess/source/ui/uno/composerdialogs.cxx | 2 +- dbaccess/source/ui/uno/composerdialogs.hxx | 4 +- dbaccess/source/ui/uno/copytablewizard.cxx | 34 +- dbaccess/source/ui/uno/copytablewizard.src | 77 - dbaccess/source/ui/uno/dbinteraction.cxx | 2 +- dbaccess/source/ui/uno/dbinteraction.hxx | 4 +- .../ui/uno/textconnectionsettings_uno.cxx | 6 +- dbaccess/source/ui/uno/unoDirectSql.cxx | 2 +- dbaccess/source/ui/uno/unoDirectSql.hxx | 4 +- dbaccess/source/ui/uno/unoadmin.cxx | 2 +- dbaccess/source/ui/uno/unosqlmessage.cxx | 3 +- dbaccess/uiconfig/ui/admindialog.ui | 6 +- .../uiconfig/ui/advancedsettingsdialog.ui | 8 +- dbaccess/uiconfig/ui/applycolpage.ui | 4 +- dbaccess/uiconfig/ui/authentificationpage.ui | 12 +- dbaccess/uiconfig/ui/autocharsetpage.ui | 6 +- dbaccess/uiconfig/ui/backuppage.ui | 12 +- .../uiconfig/ui/choosedatasourcedialog.ui | 8 +- dbaccess/uiconfig/ui/collectionviewdialog.ui | 12 +- dbaccess/uiconfig/ui/colwidthdialog.ui | 8 +- dbaccess/uiconfig/ui/connectionpage.ui | 24 +- dbaccess/uiconfig/ui/copytablepage.ui | 22 +- dbaccess/uiconfig/ui/dbaseindexdialog.ui | 12 +- dbaccess/uiconfig/ui/dbasepage.ui | 14 +- dbaccess/uiconfig/ui/dbwizconnectionpage.ui | 10 +- dbaccess/uiconfig/ui/dbwizmysqlintropage.ui | 14 +- dbaccess/uiconfig/ui/dbwizmysqlnativepage.ui | 6 +- dbaccess/uiconfig/ui/dbwizspreadsheetpage.ui | 8 +- dbaccess/uiconfig/ui/dbwiztextpage.ui | 6 +- dbaccess/uiconfig/ui/deleteallrowsdialog.ui | 4 +- .../uiconfig/ui/designsavemodifieddialog.ui | 6 +- dbaccess/uiconfig/ui/directsqldialog.ui | 18 +- dbaccess/uiconfig/ui/emptypage.ui | 2 +- dbaccess/uiconfig/ui/fielddialog.ui | 10 +- dbaccess/uiconfig/ui/finalpagewizard.ui | 18 +- dbaccess/uiconfig/ui/generalpagedialog.ui | 8 +- dbaccess/uiconfig/ui/generalpagewizard.ui | 20 +- .../ui/generalspecialjdbcdetailspage.ui | 18 +- dbaccess/uiconfig/ui/generatedvaluespage.ui | 10 +- dbaccess/uiconfig/ui/indexdesigndialog.ui | 22 +- dbaccess/uiconfig/ui/jdbcconnectionpage.ui | 16 +- dbaccess/uiconfig/ui/joindialog.ui | 24 +- dbaccess/uiconfig/ui/jointablemenu.ui | 4 +- dbaccess/uiconfig/ui/joinviewmenu.ui | 6 +- dbaccess/uiconfig/ui/keymenu.ui | 4 +- dbaccess/uiconfig/ui/ldapconnectionpage.ui | 16 +- dbaccess/uiconfig/ui/ldappage.ui | 12 +- dbaccess/uiconfig/ui/migratepage.ui | 16 +- dbaccess/uiconfig/ui/mysqlnativepage.ui | 14 +- dbaccess/uiconfig/ui/mysqlnativesettings.ui | 16 +- dbaccess/uiconfig/ui/namematchingpage.ui | 10 +- dbaccess/uiconfig/ui/odbcpage.ui | 12 +- dbaccess/uiconfig/ui/parametersdialog.ui | 10 +- dbaccess/uiconfig/ui/password.ui | 12 +- dbaccess/uiconfig/ui/preparepage.ui | 8 +- dbaccess/uiconfig/ui/querycolmenu.ui | 6 +- dbaccess/uiconfig/ui/queryfilterdialog.ui | 48 +- dbaccess/uiconfig/ui/queryfuncmenu.ui | 10 +- dbaccess/uiconfig/ui/querypropertiesdialog.ui | 12 +- dbaccess/uiconfig/ui/relationdialog.ui | 38 +- dbaccess/uiconfig/ui/rowheightdialog.ui | 8 +- dbaccess/uiconfig/ui/rtfcopytabledialog.ui | 4 +- dbaccess/uiconfig/ui/savedialog.ui | 10 +- dbaccess/uiconfig/ui/saveindexdialog.ui | 6 +- dbaccess/uiconfig/ui/savemodifieddialog.ui | 6 +- dbaccess/uiconfig/ui/sortdialog.ui | 28 +- .../uiconfig/ui/specialjdbcconnectionpage.ui | 18 +- dbaccess/uiconfig/ui/specialsettingspage.ui | 46 +- dbaccess/uiconfig/ui/sqlexception.ui | 8 +- dbaccess/uiconfig/ui/summarypage.ui | 8 +- dbaccess/uiconfig/ui/tabledesignrowmenu.ui | 14 +- .../ui/tabledesignsavemodifieddialog.ui | 6 +- dbaccess/uiconfig/ui/tablesfilterdialog.ui | 4 +- dbaccess/uiconfig/ui/tablesfilterpage.ui | 6 +- dbaccess/uiconfig/ui/tablesjoindialog.ui | 10 +- .../uiconfig/ui/textconnectionsettings.ui | 4 +- dbaccess/uiconfig/ui/textpage.ui | 40 +- dbaccess/uiconfig/ui/typeselectpage.ui | 10 +- dbaccess/uiconfig/ui/useradmindialog.ui | 6 +- dbaccess/uiconfig/ui/useradminpage.ui | 14 +- dbaccess/uiconfig/ui/userdetailspage.ui | 16 +- desktop/AllLangMoTarget_dkt.mk | 13 + desktop/AllLangResTarget_deployment.mk | 40 - desktop/AllLangResTarget_deploymentgui.mk | 34 - desktop/AllLangResTarget_dkt.mk | 24 - desktop/Library_deployment.mk | 1 + desktop/Library_deploymentmisc.mk | 1 + desktop/Library_sofficeapp.mk | 1 - desktop/Module_desktop.mk | 6 +- desktop/inc/app.hxx | 3 - desktop/inc/deployment.hrc | 63 - desktop/inc/dp_gui.hrc | 90 - .../inc/{dp_gui_shared.hxx => dp_shared.hxx} | 24 +- desktop/inc/pch/precompiled_deploymentgui.hxx | 1 - desktop/inc/pch/precompiled_sofficeapp.hxx | 2 - desktop/inc/strings.hrc | 197 + desktop/source/app/app.cxx | 155 +- desktop/source/app/appinit.cxx | 14 +- desktop/source/app/desktop.hrc | 60 - desktop/source/app/desktop.src | 127 - desktop/source/app/desktopresid.cxx | 34 - desktop/source/app/lockfile2.cxx | 8 +- desktop/source/deployment/gui/dp_gui.h | 2 +- .../gui/dp_gui_dependencydialog.cxx | 5 +- .../source/deployment/gui/dp_gui_dialog.src | 164 - .../source/deployment/gui/dp_gui_dialog2.cxx | 77 +- .../source/deployment/gui/dp_gui_dialog2.hxx | 4 +- .../gui/dp_gui_extensioncmdqueue.cxx | 32 +- .../deployment/gui/dp_gui_extlistbox.cxx | 11 +- .../source/deployment/gui/dp_gui_service.cxx | 6 +- .../deployment/gui/dp_gui_updatedialog.cxx | 35 +- .../deployment/gui/dp_gui_updatedialog.src | 80 - .../gui/dp_gui_updateinstalldialog.cxx | 21 +- .../gui/dp_gui_updateinstalldialog.src | 54 - .../deployment/gui/dp_gui_versionboxes.src | 67 - .../source/deployment/gui/license_dialog.cxx | 4 +- desktop/source/deployment/inc/dp_resource.h | 17 +- .../manager/dp_extensionmanager.cxx | 14 +- .../manager/dp_extensionmanager.hxx | 6 +- .../source/deployment/manager/dp_manager.cxx | 11 +- .../source/deployment/manager/dp_manager.h | 2 +- .../source/deployment/manager/dp_manager.hrc | 33 - .../source/deployment/manager/dp_manager.src | 52 - .../deployment/misc/dp_dependencies.cxx | 16 +- desktop/source/deployment/misc/dp_misc.src | 38 - .../source/deployment/misc/dp_resource.cxx | 24 - desktop/source/deployment/misc/dp_ucb.cxx | 2 +- .../registry/component/dp_component.cxx | 19 +- .../registry/component/dp_component.hrc | 34 - .../registry/component/dp_component.src | 52 - .../configuration/dp_configuration.cxx | 9 +- .../configuration/dp_configuration.src | 32 - .../source/deployment/registry/dp_backend.cxx | 12 +- .../deployment/registry/dp_registry.cxx | 7 +- .../deployment/registry/dp_registry.src | 52 - .../registry/executable/dp_executable.cxx | 2 +- .../deployment/registry/help/dp_help.cxx | 22 +- .../deployment/registry/help/dp_help.src | 37 - .../deployment/registry/inc/dp_backend.h | 15 +- .../deployment/registry/inc/dp_registry.hrc | 34 - .../registry/package/dp_package.cxx | 8 +- .../registry/package/dp_package.hrc | 29 - .../registry/package/dp_package.src | 27 - .../registry/script/dp_lib_container.cxx | 9 +- .../deployment/registry/script/dp_script.cxx | 10 +- .../deployment/registry/script/dp_script.hrc | 32 - .../deployment/registry/script/dp_script.src | 37 - .../deployment/registry/sfwk/dp_sfwk.cxx | 8 +- .../deployment/registry/sfwk/dp_sfwk.hrc | 29 - .../deployment/registry/sfwk/dp_sfwk.src | 27 - desktop/source/deployment/unopkg/unopkg.src | 76 - desktop/source/lib/init.cxx | 3 +- .../source/pkgchk/unopkg/unopkg_cmdenv.cxx | 26 +- desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 11 +- desktop/source/pkgchk/unopkg/unopkg_shared.h | 9 +- desktop/uiconfig/ui/dependenciesdialog.ui | 6 +- desktop/uiconfig/ui/extensionmanager.ui | 26 +- desktop/uiconfig/ui/installforalldialog.ui | 10 +- desktop/uiconfig/ui/licensedialog.ui | 20 +- desktop/uiconfig/ui/showlicensedialog.ui | 4 +- desktop/uiconfig/ui/updatedialog.ui | 22 +- desktop/uiconfig/ui/updateinstalldialog.ui | 8 +- desktop/uiconfig/ui/updaterequireddialog.ui | 12 +- .../inc/pch/precompiled_drawinglayer.hxx | 2 - editeng/AllLangMoTarget_editeng.mk | 11 + editeng/AllLangResTarget_editeng.mk | 42 - editeng/Library_editeng.mk | 3 - editeng/Module_editeng.mk | 4 +- editeng/inc/{editeng.hrc => editeng.hxx} | 6 +- editeng/inc/pch/precompiled_editeng.hxx | 3 - .../AccessibleEditableTextPara.cxx | 2 +- .../accessibility/AccessibleImageBullet.cxx | 6 +- .../source/accessibility/accessibility.src | 37 - editeng/source/editeng/editeng.cxx | 21 +- editeng/source/editeng/editeng.src | 83 - editeng/source/editeng/editview.cxx | 7 +- editeng/source/editeng/eerdll.cxx | 14 +- editeng/source/items/borderline.cxx | 8 +- editeng/source/items/charhiddenitem.cxx | 6 +- editeng/source/items/frmitems.cxx | 177 +- editeng/source/items/itemtype.cxx | 52 +- editeng/source/items/justifyitem.cxx | 6 +- editeng/source/items/optitems.cxx | 5 +- editeng/source/items/page.src | 31 - editeng/source/items/paraitem.cxx | 87 +- editeng/source/items/svxitems.src | 1028 ---- editeng/source/items/textitem.cxx | 241 +- editeng/source/items/writingmodeitem.cxx | 4 +- editeng/source/misc/lingu.src | 43 - editeng/source/misc/splwrap.cxx | 4 +- editeng/source/misc/unolingu.cxx | 10 +- editeng/source/outliner/outleeng.cxx | 10 +- editeng/source/outliner/outliner.src | 43 - editeng/uiconfig/ui/spellmenu.ui | 14 +- embeddedobj/source/general/docholder.cxx | 6 +- extensions/AllLangMoTarget_pcr.mk | 13 + extensions/AllLangResTarget_abp.mk | 29 - extensions/AllLangResTarget_bib.mk | 28 - extensions/AllLangResTarget_dbp.mk | 31 - extensions/AllLangResTarget_pcr.mk | 35 - extensions/AllLangResTarget_scn.mk | 31 - .../CppunitTest_extensions_test_update.mk | 2 + extensions/Library_res.mk | 36 - extensions/Library_scn.mk | 5 + extensions/Library_updchk.mk | 2 + extensions/Module_extensions.mk | 17 +- .../inc/command.hrc | 20 +- .../inc/showhide.hrc | 16 +- extensions/inc/stringarrays.hrc | 263 + extensions/inc/strings.hrc | 402 ++ .../dialmgr.hxx => extensions/inc/yesno.hrc | 16 +- extensions/source/abpilot/abpresid.hrc | 64 - extensions/source/abpilot/abspage.hxx | 2 +- extensions/source/abpilot/abspilot.cxx | 25 +- extensions/source/abpilot/abspilot.src | 97 - .../source/abpilot/admininvokationimpl.cxx | 2 +- .../source/abpilot/datasourcehandling.cxx | 2 +- .../source/abpilot/fieldmappingimpl.cxx | 2 +- extensions/source/abpilot/unodialogabp.cxx | 2 - extensions/source/bibliography/bib.hrc | 61 - extensions/source/bibliography/bib.src | 35 - extensions/source/bibliography/bibload.cxx | 2 +- extensions/source/bibliography/bibmod.cxx | 9 +- extensions/source/bibliography/bibmod.hxx | 6 +- extensions/source/bibliography/bibresid.hxx | 2 +- extensions/source/bibliography/bibview.cxx | 2 +- extensions/source/bibliography/datman.cxx | 2 +- extensions/source/bibliography/framectr.cxx | 2 +- extensions/source/bibliography/general.cxx | 2 +- extensions/source/bibliography/sections.src | 118 - extensions/source/bibliography/toolbar.cxx | 2 +- extensions/source/dbpilots/commonpagesdbp.cxx | 2 +- extensions/source/dbpilots/commonpagesdbp.src | 42 - extensions/source/dbpilots/controlwizard.cxx | 13 +- extensions/source/dbpilots/controlwizard.hxx | 2 +- extensions/source/dbpilots/dbpilots.src | 47 - extensions/source/dbpilots/dbpresid.hrc | 70 - extensions/source/dbpilots/dbpservices.cxx | 1 - extensions/source/dbpilots/gridpages.src | 32 - extensions/source/dbpilots/groupboxpages.src | 27 - extensions/source/dbpilots/listcombopages.src | 37 - .../source/dbpilots/listcombowizard.cxx | 4 - extensions/source/inc/componentmodule.cxx | 52 +- extensions/source/inc/componentmodule.hxx | 24 +- .../source/propctrlr/browserlistbox.cxx | 2 +- extensions/source/propctrlr/browserview.hxx | 1 - .../propctrlr/defaultforminspection.cxx | 6 +- extensions/source/propctrlr/eformshelper.cxx | 4 +- extensions/source/propctrlr/eventhandler.cxx | 6 +- extensions/source/propctrlr/eventhandler.hxx | 2 +- extensions/source/propctrlr/fontdialog.cxx | 2 +- .../source/propctrlr/formbrowsertools.cxx | 3 +- .../source/propctrlr/formcomponenthandler.cxx | 49 +- .../source/propctrlr/formlinkdialog.cxx | 2 +- .../source/propctrlr/formlinkdialog.src | 39 - extensions/source/propctrlr/formmetadata.cxx | 85 +- extensions/source/propctrlr/formres.src | 1287 ----- extensions/source/propctrlr/formresid.hrc | 315 -- extensions/source/propctrlr/handlerhelper.cxx | 14 +- extensions/source/propctrlr/handlerhelper.hxx | 11 +- .../source/propctrlr/inspectorhelpwindow.cxx | 2 +- .../source/propctrlr/listselectiondlg.cxx | 2 +- extensions/source/propctrlr/modulepcr.cxx | 12 +- extensions/source/propctrlr/modulepcr.hxx | 8 +- extensions/source/propctrlr/newdatatype.cxx | 2 +- extensions/source/propctrlr/pcrcommon.cxx | 2 +- extensions/source/propctrlr/pcrmiscres.src | 108 - .../source/propctrlr/propcontroller.cxx | 4 +- extensions/source/propctrlr/propres.src | 57 - extensions/source/propctrlr/propresid.hrc | 40 - .../source/propctrlr/selectlabeldialog.cxx | 2 +- .../source/propctrlr/selectlabeldialog.src | 27 - .../source/propctrlr/sqlcommanddesign.cxx | 10 +- .../source/propctrlr/stringrepresentation.cxx | 12 +- extensions/source/propctrlr/taborder.cxx | 2 +- extensions/source/propctrlr/usercontrol.cxx | 2 +- .../xsdvalidationpropertyhandler.cxx | 2 +- .../source/resource/ResourceIndexAccess.cxx | 117 - .../source/resource/ResourceIndexAccess.hxx | 53 - .../source/resource/oooresourceloader.cxx | 313 -- .../source/resource/oooresourceloader.hxx | 75 - extensions/source/resource/res.component | 28 - .../source/resource/resourceservices.cxx | 39 - extensions/source/scanner/sanedlg.cxx | 9 +- extensions/source/scanner/strings.src | 34 - extensions/source/update/check/updatehdl.cxx | 137 +- extensions/source/update/check/updatehdl.hrc | 76 - extensions/source/update/check/updatehdl.hxx | 5 +- extensions/source/update/check/updatehdl.src | 257 - extensions/source/update/ui/updatecheckui.cxx | 13 +- .../uiconfig/sabpilot/ui/contentfieldpage.ui | 6 +- .../uiconfig/sabpilot/ui/contenttablepage.ui | 14 +- .../uiconfig/sabpilot/ui/datasourcepage.ui | 16 +- .../sabpilot/ui/defaultfieldselectionpage.ui | 8 +- .../uiconfig/sabpilot/ui/fieldassignpage.ui | 6 +- .../uiconfig/sabpilot/ui/fieldlinkpage.ui | 8 +- .../sabpilot/ui/gridfieldsselectionpage.ui | 26 +- .../sabpilot/ui/groupradioselectionpage.ui | 20 +- .../uiconfig/sabpilot/ui/invokeadminpage.ui | 8 +- .../uiconfig/sabpilot/ui/optiondbfieldpage.ui | 8 +- .../uiconfig/sabpilot/ui/optionsfinalpage.ui | 6 +- .../uiconfig/sabpilot/ui/optionvaluespage.ui | 8 +- .../uiconfig/sabpilot/ui/selecttablepage.ui | 4 +- .../uiconfig/sabpilot/ui/selecttypepage.ui | 22 +- .../sabpilot/ui/tableselectionpage.ui | 12 +- .../ui/choosedatasourcedialog.ui | 6 +- .../uiconfig/sbibliography/ui/generalpage.ui | 64 +- .../sbibliography/ui/mappingdialog.ui | 68 +- .../uiconfig/sbibliography/ui/toolbar.ui | 16 +- extensions/uiconfig/scanner/ui/griddialog.ui | 12 +- extensions/uiconfig/scanner/ui/sanedialog.ui | 34 +- .../spropctrlr/ui/controlfontdialog.ui | 8 +- .../uiconfig/spropctrlr/ui/datatypedialog.ui | 6 +- .../uiconfig/spropctrlr/ui/fieldlinkrow.ui | 2 +- .../uiconfig/spropctrlr/ui/formlinksdialog.ui | 12 +- .../spropctrlr/ui/labelselectiondialog.ui | 8 +- .../spropctrlr/ui/listselectdialog.ui | 2 +- extensions/uiconfig/spropctrlr/ui/taborder.ui | 12 +- filter/AllLangMoTarget_flt.mk | 13 + filter/AllLangResTarget_eps.mk | 31 - filter/AllLangResTarget_pdffilter.mk | 40 - filter/AllLangResTarget_t602filter.mk | 31 - filter/AllLangResTarget_xsltdlg.mk | 36 - filter/Library_gie.mk | 5 + filter/Library_graphicfilter.mk | 2 +- filter/Library_t602filter.mk | 5 + filter/Module_filter.mk | 7 +- filter/inc/strings.hrc | 83 + filter/inc/strings.hxx | 4 +- filter/source/flash/impswfdialog.hxx | 1 - filter/source/flash/swfdialog.hxx | 1 - filter/source/graphicfilter/eps/eps.cxx | 12 +- filter/source/graphicfilter/eps/epsstr.src | 27 - filter/source/graphicfilter/eps/strings.hrc | 22 - filter/source/pdf/impdialog.cxx | 23 +- filter/source/pdf/impdialog.hrc | 45 - filter/source/pdf/impdialog.hxx | 9 - filter/source/pdf/impdialog.src | 91 - filter/source/pdf/pdf.hrc | 22 - filter/source/pdf/pdf.src | 27 - filter/source/pdf/pdfexport.cxx | 16 +- filter/source/svg/impsvgdialog.hxx | 3 +- filter/source/svg/svgdialog.hxx | 2 - filter/source/t602/t602filter.cxx | 23 +- filter/source/t602/t602filter.hrc | 39 - filter/source/t602/t602filter.hxx | 7 +- filter/source/t602/t602filter.src | 77 - .../xsltdialog/xmlfilterdialogstrings.hrc | 55 - .../xsltdialog/xmlfilterdialogstrings.src | 132 - filter/source/xsltdialog/xmlfilterjar.cxx | 2 +- .../xsltdialog/xmlfiltersettingsdialog.cxx | 32 +- .../xsltdialog/xmlfiltersettingsdialog.hxx | 12 +- .../source/xsltdialog/xmlfiltertabdialog.cxx | 37 +- .../source/xsltdialog/xmlfiltertabdialog.hxx | 5 +- .../xsltdialog/xmlfiltertabpagebasic.cxx | 2 +- .../xsltdialog/xmlfiltertabpagebasic.hxx | 1 - .../xsltdialog/xmlfiltertabpagexslt.hxx | 1 - .../source/xsltdialog/xmlfiltertestdialog.cxx | 2 +- filter/uiconfig/ui/impswfdialog.ui | 20 +- filter/uiconfig/ui/pdfgeneralpage.ui | 90 +- filter/uiconfig/ui/pdflinkspage.ui | 18 +- filter/uiconfig/ui/pdfoptionsdialog.ui | 18 +- filter/uiconfig/ui/pdfsecuritypage.ui | 54 +- filter/uiconfig/ui/pdfsignpage.ui | 20 +- filter/uiconfig/ui/pdfuserinterfacepage.ui | 30 +- filter/uiconfig/ui/pdfviewpage.ui | 36 +- filter/uiconfig/ui/testxmlfilter.ui | 28 +- filter/uiconfig/ui/warnpdfdialog.ui | 6 +- filter/uiconfig/ui/xmlfiltersettings.ui | 18 +- filter/uiconfig/ui/xmlfiltertabpagegeneral.ui | 12 +- .../ui/xmlfiltertabpagetransformation.ui | 18 +- filter/uiconfig/ui/xsltfilterdialog.ui | 8 +- forms/AllLangMoTarget_frm.mk | 13 + forms/AllLangResTarget_frm.mk | 30 - forms/Library_frm.mk | 1 + forms/Module_forms.mk | 2 +- forms/inc/pch/precompiled_frm.hxx | 2 - forms/inc/strings.hrc | 87 + forms/source/component/Columns.cxx | 2 +- forms/source/component/ComboBox.cxx | 2 +- forms/source/component/DatabaseForm.cxx | 2 +- forms/source/component/EditBase.cxx | 2 +- forms/source/component/Filter.cxx | 2 +- forms/source/component/FormComponent.cxx | 2 +- forms/source/component/FormattedField.cxx | 2 +- forms/source/component/ImageControl.cxx | 2 +- forms/source/component/ListBox.cxx | 2 +- forms/source/inc/frm_resource.hrc | 94 - forms/source/inc/frm_resource.hxx | 30 +- forms/source/misc/InterfaceContainer.cxx | 2 +- forms/source/resource/frm_resource.cxx | 47 +- forms/source/resource/strings.src | 152 - forms/source/resource/xforms.src | 177 - forms/source/runtime/formoperations.cxx | 19 +- forms/source/runtime/formoperations.hxx | 4 +- forms/source/solar/control/navtoolbar.cxx | 6 +- forms/source/xforms/datatyperepository.cxx | 2 +- forms/source/xforms/datatypes.cxx | 176 +- forms/source/xforms/datatypes.hxx | 22 +- forms/source/xforms/resourcehelper.cxx | 28 +- forms/source/xforms/resourcehelper.hxx | 14 +- formula/AllLangMoTarget_for.mk | 13 + formula/AllLangResTarget_for.mk | 29 - formula/AllLangResTarget_forui.mk | 31 - formula/Library_for.mk | 4 +- formula/Module_formula.mk | 5 +- formula/inc/core_resource.hrc | 2702 +++++++++ .../label.hrc => formula/inc/strings.hrc | 22 +- formula/source/core/api/FormulaCompiler.cxx | 39 +- formula/source/core/inc/core_resource.hrc | 39 - formula/source/core/inc/core_resource.hxx | 6 +- .../source/core/resource/core_resource.cxx | 13 +- .../source/core/resource/core_resource.src | 2708 --------- formula/source/ui/dlg/formdlgs.hrc | 6 - formula/source/ui/dlg/formdlgs.src | 47 - formula/source/ui/dlg/formula.cxx | 2 +- formula/source/ui/dlg/funcpage.cxx | 2 - formula/source/ui/dlg/funcutl.cxx | 6 +- formula/source/ui/dlg/parawin.cxx | 2 +- formula/source/ui/dlg/structpg.cxx | 2 - formula/source/ui/inc/ForResId.hrc | 52 - formula/source/ui/inc/ModuleHelper.hxx | 16 +- formula/source/ui/resource/ModuleHelper.cxx | 25 +- formula/uiconfig/ui/formuladialog.ui | 20 +- formula/uiconfig/ui/functionpage.ui | 10 +- formula/uiconfig/ui/parameter.ui | 10 +- formula/uiconfig/ui/structpage.ui | 2 +- fpicker/AllLangMoTarget_fps.mk | 13 + fpicker/AllLangResTarget_fps_office.mk | 26 - fpicker/Library_fps.mk | 5 + fpicker/Library_fps_aqua.mk | 5 + fpicker/Module_fpicker.mk | 4 +- .../office => inc}/fpsofficeResMgr.hxx | 25 +- fpicker/inc/strings.hrc | 40 + fpicker/source/aqua/resourceprovider.hxx | 8 - fpicker/source/aqua/resourceprovider.mm | 100 +- fpicker/source/office/OfficeFilePicker.hrc | 19 - fpicker/source/office/OfficeFilePicker.src | 92 - fpicker/source/office/PlacesListBox.cxx | 2 +- fpicker/source/office/RemoteFilesDialog.hxx | 6 +- fpicker/source/office/iodlg.cxx | 24 +- fpicker/source/office/iodlg.hrc | 38 - fpicker/source/office/iodlg.src | 101 - fpicker/source/office/iodlgimp.cxx | 35 +- .../win32/filepicker/VistaFilePickerImpl.cxx | 16 +- .../win32/filepicker/VistaFilePickerImpl.hxx | 3 - fpicker/source/win32/folderpicker/MtaFop.cxx | 10 +- .../source/win32/misc/resourceprovider.cxx | 60 +- .../source/win32/misc/resourceprovider.hxx | 13 +- fpicker/uiconfig/ui/explorerfiledialog.ui | 24 +- fpicker/uiconfig/ui/foldernamedialog.ui | 8 +- fpicker/uiconfig/ui/remotefilesdialog.ui | 24 +- framework/AllLangMoTarget_fwk.mk | 13 + framework/AllLangResTarget_fwe.mk | 49 - framework/Library_fwe.mk | 3 - framework/Module_framework.mk | 4 +- framework/inc/classes/fwkresid.hxx | 15 +- framework/inc/classes/resource.hrc | 67 - .../inc/classes/resource.hxx | 17 +- framework/inc/pch/precompiled_fwe.hxx | 2 - framework/inc/pch/precompiled_fwi.hxx | 2 - framework/inc/pch/precompiled_fwk.hxx | 2 - framework/inc/pch/precompiled_fwl.hxx | 2 - framework/inc/strings.hrc | 58 + .../source/accelerators/presethandler.cxx | 2 +- framework/source/classes/resource.src | 168 - framework/source/fwe/classes/fwkresid.cxx | 27 +- framework/source/fwe/helper/titlehelper.cxx | 2 +- .../source/layoutmanager/layoutmanager.cxx | 2 +- .../layoutmanager/toolbarlayoutmanager.cxx | 2 +- framework/source/services/autorecovery.cxx | 2 +- framework/source/services/desktop.cxx | 2 +- .../source/uielement/addonstoolbarmanager.cxx | 3 +- .../uielement/controlmenucontroller.cxx | 1 - .../source/uielement/footermenucontroller.cxx | 2 +- .../uielement/generictoolbarcontroller.cxx | 2 +- .../source/uielement/headermenucontroller.cxx | 2 +- .../uielement/langselectionmenucontroller.cxx | 2 +- .../langselectionstatusbarcontroller.cxx | 2 +- .../source/uielement/macrosmenucontroller.cxx | 2 +- framework/source/uielement/menubarmanager.cxx | 2 +- .../source/uielement/newmenucontroller.cxx | 2 +- .../uielement/popuptoolbarcontroller.cxx | 2 +- .../uielement/recentfilesmenucontroller.cxx | 3 +- framework/source/uielement/toolbarmanager.cxx | 3 +- .../uielement/toolbarsmenucontroller.cxx | 2 +- i18nlangtag/Executable_localestr.mk | 29 + i18nlangtag/Module_i18nlangtag.mk | 1 + .../source/languagetag/languagetag.cxx | 32 +- i18nlangtag/source/localestr/localestr.cxx | 20 + include/LibreOfficeKit/LibreOfficeKit.hxx | 2 +- include/basic/basrdll.hxx | 8 +- include/basic/sbdef.hxx | 3 + include/comphelper/officeresourcebundle.hxx | 93 - include/editeng/editeng.hxx | 2 +- include/editeng/editobj.hxx | 2 +- include/editeng/editrids.hrc | 622 +-- include/editeng/editview.hxx | 2 +- include/editeng/eerdll.hxx | 12 +- include/editeng/frmdir.hxx | 1 + include/editeng/itemtype.hxx | 4 +- include/editeng/outliner.hxx | 2 +- include/editeng/outlobj.hxx | 2 +- include/formula/FormulaCompiler.hxx | 4 +- include/formula/formula.hxx | 5 - include/fpicker/fpicker.hrc | 37 + include/rsc/rsc-vcl-shared-types.hxx | 139 - include/sfx2/StyleManager.hxx | 2 +- include/sfx2/StylePreviewRenderer.hxx | 1 - include/sfx2/app.hxx | 5 +- include/sfx2/module.hxx | 8 +- include/sfx2/objface.hxx | 1 - include/sfx2/objsh.hxx | 2 +- include/sfx2/sfx.hrc | 52 +- include/sfx2/sfxresid.hxx | 14 +- include/sfx2/shell.hxx | 1 - include/sfx2/strings.hrc | 281 + include/sfx2/styfitem.hxx | 11 +- include/sfx2/templatelocnames.hrc | 24 - include/sfx2/templdlg.hxx | 2 +- include/sfx2/tplpitem.hxx | 2 +- include/svl/IndexedStyleSheets.hxx | 2 +- include/svl/srchitem.hxx | 2 +- include/svl/style.hrc | 34 - include/svl/style.hxx | 25 +- include/svl/svl.hrc | 150 +- include/svtools/DocumentInfoPreview.hxx | 2 - .../{controldims.hrc => controldims.hxx} | 0 include/svtools/ehdl.hxx | 22 +- include/svtools/filectrl.hxx | 4 +- include/svtools/filedlg2.hrc | 23 - include/svtools/foldertree.hxx | 2 +- include/svtools/soerr.hxx | 12 +- include/svtools/sores.hxx | 104 - include/svtools/strings.hrc | 357 ++ include/svtools/svtools.hrc | 247 - include/svtools/svtresid.hxx | 12 +- include/svx/DescriptionGenerator.hxx | 8 +- include/svx/dialmgr.hxx | 17 +- include/svx/dialogs.hrc | 794 --- include/svx/fmresids.hrc | 147 - include/svx/gallery.hxx | 57 +- include/svx/galmisc.hxx | 10 - include/svx/strarray.hxx | 38 +- include/svx/strings.hrc | 1261 +++++ include/svx/svddrgmt.hxx | 2 +- include/svx/svdetc.hxx | 4 +- include/svx/svdmrkv.hxx | 2 +- include/svx/svdobj.hxx | 2 +- include/svx/svdotext.hxx | 2 +- include/svx/svdstr.hrc | 583 -- include/svx/svdundo.hxx | 6 +- include/svx/svxerr.hxx | 4 +- include/svx/svxitems.hrc | 110 +- include/svx/swframeposstrings.hxx | 8 +- include/svx/tbcontrl.hxx | 2 +- include/svx/txencbox.hxx | 5 - include/svx/txenctab.hxx | 14 +- include/svx/ucsubset.hrc | 1 - include/svx/xit.hxx | 2 +- include/tools/rcid.h | 44 - include/tools/resary.hxx | 25 - include/tools/resid.hxx | 99 - include/tools/resmgr.hxx | 173 +- include/tools/simplerm.hxx | 83 - include/unotools/componentresmodule.hxx | 42 +- include/vcl/builder.hxx | 12 +- include/vcl/button.hxx | 2 +- include/vcl/decoview.hxx | 2 +- include/vcl/fpicker.hrc | 34 - include/vcl/image.hxx | 1 - include/vcl/keycod.hxx | 1 - include/vcl/keycodes.hxx | 2 +- include/vcl/menu.hxx | 2 +- include/vcl/toolbox.hxx | 2 +- include/vcl/vclenum.hxx | 114 +- include/vcl/window.hxx | 2 +- include/xmloff/xmlstyle.hxx | 2 +- instsetoo_native/CustomTarget_setup.mk | 1 + l10ntools/Executable_transex3.mk | 40 - l10ntools/Executable_uiex.mk | 36 - l10ntools/Module_l10ntools.mk | 2 - l10ntools/source/export.cxx | 1304 ----- l10ntools/source/gRun.sh | 4 - l10ntools/source/localize.cxx | 113 +- l10ntools/source/po.cxx | 11 +- l10ntools/source/uimerge.cxx | 215 - leak-suppress.txt | 3 - libreofficekit/source/gtk/lokdocview.cxx | 1 - odk/docs/idl/idl_chapter_refs.txt | 1 - offapi/UnoApi_offapi.mk | 3 - .../resource/MissingResourceException.idl | 2 +- .../star/resource/OfficeResourceLoader.idl | 69 - offapi/com/sun/star/resource/XLocale.idl | 2 +- .../com/sun/star/resource/XResourceBundle.idl | 226 - .../star/resource/XResourceBundleLoader.idl | 67 - offapi/type_reference/offapi.idl | 12 - oox/source/ppt/pptimport.cxx | 10 +- postprocess/Rdb_services.mk | 1 - .../AllLangMoTarget_rpt.mk | 17 +- reportdesign/AllLangResTarget_rpt.mk | 29 - reportdesign/AllLangResTarget_rptui.mk | 44 - reportdesign/Library_rpt.mk | 1 - reportdesign/Module_reportdesign.mk | 5 +- reportdesign/inc/ModuleHelper.hxx | 91 - reportdesign/inc/RptResId.hrc | 204 - reportdesign/inc/UndoActions.hxx | 9 +- .../inc/core_resource.hxx | 13 +- reportdesign/inc/pch/precompiled_rpt.hxx | 3 - reportdesign/inc/pch/precompiled_rptui.hxx | 4 - reportdesign/inc/stringarray.hrc | 83 + reportdesign/inc/strings.hrc | 189 + reportdesign/inc/strings.hxx | 269 +- reportdesign/source/core/api/FixedLine.cxx | 8 +- reportdesign/source/core/api/FixedText.cxx | 8 +- .../source/core/api/FormatCondition.cxx | 2 +- .../source/core/api/FormattedField.cxx | 8 +- reportdesign/source/core/api/Function.cxx | 2 +- reportdesign/source/core/api/Functions.cxx | 6 +- reportdesign/source/core/api/Group.cxx | 8 +- reportdesign/source/core/api/Groups.cxx | 6 +- reportdesign/source/core/api/ImageControl.cxx | 8 +- .../source/core/api/ReportComponent.cxx | 2 +- .../source/core/api/ReportDefinition.cxx | 24 +- .../source/core/api/ReportEngineJFree.cxx | 6 +- reportdesign/source/core/api/Section.cxx | 4 +- reportdesign/source/core/api/Shape.cxx | 8 +- reportdesign/source/core/api/Tools.cxx | 4 +- .../source/core/inc/ReportUndoFactory.hxx | 2 - reportdesign/source/core/inc/Tools.hxx | 2 +- .../source/core/inc/core_resource.hrc | 46 - .../source/core/inc/core_resource.hxx | 66 - .../source/core/resource/core_resource.cxx | 33 +- reportdesign/source/core/resource/strings.src | 97 - reportdesign/source/core/sdr/ModuleHelper.cxx | 124 - .../source/core/sdr/PropertyForward.cxx | 2 +- .../source/core/sdr/ReportDrawPage.cxx | 2 +- .../source/core/sdr/ReportUndoFactory.cxx | 8 +- reportdesign/source/core/sdr/RptModel.cxx | 4 +- reportdesign/source/core/sdr/RptObject.cxx | 5 +- reportdesign/source/core/sdr/UndoActions.cxx | 28 +- reportdesign/source/core/sdr/UndoEnv.cxx | 5 +- reportdesign/source/filter/xml/xmlCell.cxx | 2 +- reportdesign/source/filter/xml/xmlColumn.cxx | 2 +- .../source/filter/xml/xmlComponent.cxx | 2 +- .../source/filter/xml/xmlCondPrtExpr.cxx | 2 +- reportdesign/source/filter/xml/xmlExport.cxx | 2 +- .../source/filter/xml/xmlFixedContent.cxx | 2 +- .../source/filter/xml/xmlFormatCondition.cxx | 2 +- .../source/filter/xml/xmlFunction.cxx | 2 +- reportdesign/source/filter/xml/xmlHelper.cxx | 2 +- reportdesign/source/filter/xml/xmlRow.cxx | 2 +- reportdesign/source/filter/xml/xmlSection.cxx | 2 +- reportdesign/source/filter/xml/xmlTable.cxx | 2 +- reportdesign/source/filter/xml/xmlfilter.cxx | 2 +- reportdesign/source/inc/corestrings.hrc | 30 - reportdesign/source/inc/stringconstants.hrc | 257 - reportdesign/source/inc/uistrings.hrc | 57 - reportdesign/source/inc/xmlstrings.hrc | 42 - reportdesign/source/ui/dlg/AddField.cxx | 8 +- reportdesign/source/ui/dlg/CondFormat.cxx | 8 +- reportdesign/source/ui/dlg/CondFormat.src | 28 - reportdesign/source/ui/dlg/Condition.cxx | 6 +- reportdesign/source/ui/dlg/DateTime.cxx | 5 +- reportdesign/source/ui/dlg/GroupsSorting.cxx | 38 +- reportdesign/source/ui/dlg/GroupsSorting.src | 108 - reportdesign/source/ui/dlg/Navigator.cxx | 10 +- reportdesign/source/ui/dlg/Navigator.src | 35 - reportdesign/source/ui/dlg/PageNumber.cxx | 5 +- reportdesign/source/ui/dlg/PageNumber.src | 34 - reportdesign/source/ui/dlg/dlgpage.cxx | 3 +- reportdesign/source/ui/inc/ColorListener.hxx | 2 - reportdesign/source/ui/inc/CondFormat.hxx | 3 - .../source/ui/inc/GeometryHandler.hxx | 4 +- reportdesign/source/ui/inc/Navigator.hxx | 2 - .../source/ui/inc/ReportController.hxx | 12 +- reportdesign/source/ui/inc/RptUndo.hxx | 6 +- reportdesign/source/ui/inc/SectionWindow.hxx | 4 +- reportdesign/source/ui/inc/metadata.hxx | 4 +- reportdesign/source/ui/inc/propbrw.hxx | 2 - .../ui/inspection/DataProviderHandler.cxx | 11 +- .../ui/inspection/DefaultInspection.cxx | 8 +- .../source/ui/inspection/GeometryHandler.cxx | 106 +- .../ui/inspection/ReportComponentHandler.cxx | 2 +- .../source/ui/inspection/inspection.src | 348 -- .../source/ui/inspection/metadata.cxx | 10 +- reportdesign/source/ui/misc/ColorListener.cxx | 2 +- reportdesign/source/ui/misc/RptUndo.cxx | 16 +- reportdesign/source/ui/misc/UITools.cxx | 10 +- reportdesign/source/ui/report/DesignView.cxx | 2 +- .../source/ui/report/FixedTextColor.cxx | 2 +- .../ui/report/FormattedFieldBeautifier.cxx | 2 +- .../source/ui/report/ReportController.cxx | 66 +- .../source/ui/report/ReportSection.cxx | 4 +- .../source/ui/report/ReportWindow.cxx | 2 +- reportdesign/source/ui/report/SectionView.cxx | 2 +- .../source/ui/report/SectionWindow.cxx | 18 +- reportdesign/source/ui/report/StartMarker.cxx | 3 +- reportdesign/source/ui/report/ViewsWindow.cxx | 9 +- reportdesign/source/ui/report/dlgedfac.cxx | 2 +- reportdesign/source/ui/report/dlgedfunc.cxx | 2 +- reportdesign/source/ui/report/propbrw.cxx | 37 +- reportdesign/source/ui/report/report.src | 284 - .../uiconfig/dbreport/ui/backgrounddialog.ui | 6 +- .../uiconfig/dbreport/ui/chardialog.ui | 16 +- .../uiconfig/dbreport/ui/condformatdialog.ui | 4 +- .../uiconfig/dbreport/ui/conditionwin.ui | 44 +- .../uiconfig/dbreport/ui/datetimedialog.ui | 12 +- .../uiconfig/dbreport/ui/floatingfield.ui | 14 +- .../uiconfig/dbreport/ui/floatingnavigator.ui | 4 +- .../uiconfig/dbreport/ui/floatingsort.ui | 50 +- .../uiconfig/dbreport/ui/groupsortmenu.ui | 4 +- .../uiconfig/dbreport/ui/navigatormenu.ui | 14 +- .../uiconfig/dbreport/ui/pagedialog.ui | 8 +- .../uiconfig/dbreport/ui/pagenumberdialog.ui | 28 +- rsc/Executable_rsc.mk | 86 - rsc/Makefile | 7 - rsc/README | 32 - rsc/documentation/rsc.odt | Bin 34312 -> 0 bytes rsc/documentation/rscerror.odt | Bin 19538 -> 0 bytes rsc/documentation/rscinst.odt | Bin 32833 -> 0 bytes rsc/inc/rscall.h | 91 - rsc/inc/rscarray.hxx | 102 - rsc/inc/rscclass.hxx | 104 - rsc/inc/rscclobj.hxx | 90 - rsc/inc/rscconst.hxx | 93 - rsc/inc/rsccont.hxx | 120 - rsc/inc/rscdb.hxx | 112 - rsc/inc/rscdef.hxx | 282 - rsc/inc/rscerror.h | 149 - rsc/inc/rschash.hxx | 47 - rsc/inc/rsckey.hxx | 54 - rsc/inc/rsclex.hxx | 115 - rsc/inc/rscmgr.hxx | 67 - rsc/inc/rscpar.hxx | 77 - rsc/inc/rscrange.hxx | 75 - rsc/inc/rscrsc.hxx | 98 - rsc/inc/rscstr.hxx | 66 - rsc/inc/rsctools.hxx | 185 - rsc/inc/rsctop.hxx | 210 - rsc/inc/rsctree.hxx | 76 - rsc/source/parser/erscerr.cxx | 403 -- rsc/source/parser/rscdb.cxx | 456 -- rsc/source/parser/rscibas.cxx | 216 - rsc/source/parser/rscicpx.cxx | 74 - rsc/source/parser/rscinit.cxx | 106 - rsc/source/parser/rsckey.cxx | 138 - rsc/source/parser/rsclex.cxx | 432 -- rsc/source/parser/rscpar.cxx | 160 - rsc/source/parser/rscyacc.y | 1153 ---- rsc/source/prj/gui.cxx | 74 - rsc/source/prj/gui.hxx | 32 - rsc/source/prj/start.cxx | 350 -- rsc/source/res/rscall.cxx | 40 - rsc/source/res/rscarray.cxx | 426 -- rsc/source/res/rscclass.cxx | 672 --- rsc/source/res/rscclobj.cxx | 138 - rsc/source/res/rscconst.cxx | 186 - rsc/source/res/rsccont.cxx | 755 --- rsc/source/res/rscmgr.cxx | 346 -- rsc/source/res/rscrange.cxx | 139 - rsc/source/res/rscstr.cxx | 293 - rsc/source/res/rsctop.cxx | 410 -- rsc/source/rsc/rsc.cxx | 843 --- rsc/source/rscpp/cpp.h | 340 -- rsc/source/rscpp/cpp1.c | 574 -- rsc/source/rscpp/cpp2.c | 552 -- rsc/source/rscpp/cpp3.c | 428 -- rsc/source/rscpp/cpp4.c | 630 --- rsc/source/rscpp/cpp5.c | 949 ---- rsc/source/rscpp/cpp6.c | 1135 ---- rsc/source/rscpp/cppdef.h | 178 - rsc/source/tools/rscchar.cxx | 172 - rsc/source/tools/rscdef.cxx | 664 --- rsc/source/tools/rschash.cxx | 59 - rsc/source/tools/rsctools.cxx | 255 - rsc/source/tools/rsctree.cxx | 359 -- sal/rtl/bootstrap.cxx | 2 +- sc/AllLangMoTarget_sc.mk | 11 + sc/AllLangResTarget_sc.mk | 47 - sc/CppunitTest_sc_screenshots.mk | 2 - sc/CppunitTest_sc_tiledrendering.mk | 2 - sc/Library_sc.mk | 3 - sc/Module_sc.mk | 4 +- sc/inc/compiler.hrc | 42 + sc/inc/dpobject.hxx | 2 +- sc/inc/dpshttab.hxx | 4 +- sc/inc/funcdesc.hxx | 2 +- sc/inc/global.hxx | 5 +- sc/inc/globstr.hrc | 1130 ++-- sc/inc/pch/precompiled_sc.hxx | 3 - sc/inc/pch/precompiled_scfilt.hxx | 1 - sc/inc/pch/precompiled_scui.hxx | 2 - sc/inc/pvfundlg.hrc | 43 + sc/inc/sc.hrc | 4 +- sc/inc/scabstdlg.hxx | 2 +- sc/inc/scerrors.hrc | 111 + sc/inc/scfuncs.hrc | 4076 +++++++++++++- .../inc/module_sdbt.hxx => sc/inc/scfuncs.hxx | 26 +- sc/inc/scres.hrc | 356 +- sc/inc/scresid.hxx | 2 +- .../svuidlg.src => sc/inc/scstyles.hrc | 43 +- sc/inc/strings.hrc | 331 ++ sc/inc/styleuno.hxx | 2 +- include/rsc/rscsfx.hxx => sc/inc/units.hrc | 31 +- sc/qa/unit/ucalc_pivottable.cxx | 8 +- sc/sdi/scslots.hrc | 1 - sc/source/core/data/docpool.cxx | 8 +- sc/source/core/data/documen8.cxx | 3 +- sc/source/core/data/dpdimsave.cxx | 16 +- sc/source/core/data/dpobject.cxx | 10 +- sc/source/core/data/dpoutput.cxx | 38 +- sc/source/core/data/dpshttab.cxx | 8 +- sc/source/core/data/dptabres.cxx | 10 +- sc/source/core/data/dputil.cxx | 14 +- sc/source/core/data/funcdesc.cxx | 832 +-- sc/source/core/data/global.cxx | 152 +- sc/source/core/data/table3.cxx | 20 +- sc/source/core/src/compiler.src | 41 - sc/source/core/tool/addincol.cxx | 2 +- sc/source/core/tool/address.cxx | 6 +- sc/source/core/tool/autoform.cxx | 29 +- sc/source/core/tool/chgtrack.cxx | 25 +- sc/source/core/tool/compiler.cxx | 7 +- sc/source/core/tool/stylehelper.cxx | 2 +- sc/source/core/tool/token.cxx | 10 +- sc/source/filter/excel/xepivot.cxx | 28 +- sc/source/filter/ftools/fprogressbar.cxx | 8 +- sc/source/filter/html/htmlexp.cxx | 4 +- sc/source/filter/inc/fprogressbar.hxx | 8 +- sc/source/filter/xml/xmlimprt.hxx | 2 +- sc/source/filter/xml/xmlwrap.cxx | 2 +- .../ui/Accessibility/AccessibleCellBase.cxx | 2 +- .../ui/Accessibility/AccessibleCsvControl.cxx | 2 +- .../ui/Accessibility/AccessibleDocument.cxx | 2 +- .../AccessibleDocumentPagePreview.cxx | 2 +- .../ui/Accessibility/AccessiblePageHeader.cxx | 2 +- .../AccessiblePageHeaderArea.cxx | 2 +- .../AccessiblePreviewHeaderCell.cxx | 2 +- .../Accessibility/AccessiblePreviewTable.cxx | 2 +- .../Accessibility/AccessibleSpreadsheet.cxx | 2 +- .../ui/Accessibility/AccessibleTableBase.cxx | 2 +- .../AnalysisOfVarianceDialog.cxx | 32 +- .../StatisticsDialogs/ChiSquareTestDialog.cxx | 4 +- .../StatisticsDialogs/CorrelationDialog.cxx | 2 +- .../ui/StatisticsDialogs/CovarianceDialog.cxx | 4 +- .../DescriptiveStatisticsDialog.cxx | 8 +- .../ExponentialSmoothingDialog.cxx | 4 +- .../ui/StatisticsDialogs/FTestDialog.cxx | 4 +- .../MatrixComparisonGenerator.cxx | 4 +- .../StatisticsDialogs/MovingAverageDialog.cxx | 4 +- .../RandomNumberGeneratorDialog.cxx | 5 +- .../ui/StatisticsDialogs/RegressionDialog.cxx | 6 +- .../ui/StatisticsDialogs/SamplingDialog.cxx | 2 +- .../StatisticsDialogs/StatisticsDialogs.src | 478 -- .../ui/StatisticsDialogs/TTestDialog.cxx | 4 +- .../ui/StatisticsDialogs/ZTestDialog.cxx | 4 +- sc/source/ui/app/inputhdl.cxx | 2 +- sc/source/ui/app/inputwin.cxx | 25 +- sc/source/ui/app/scdll.cxx | 5 +- sc/source/ui/app/scmod.cxx | 21 +- sc/source/ui/attrdlg/scdlgfact.cxx | 2 + sc/source/ui/attrdlg/scuiexp.cxx | 2 - sc/source/ui/cctrl/checklistmenu.cxx | 2 +- sc/source/ui/cctrl/checklistmenu.src | 57 - .../ui/condformat/condformatdlgentry.cxx | 2 +- sc/source/ui/condformat/condformathelper.cxx | 21 +- sc/source/ui/dbgui/PivotLayoutDialog.cxx | 2 +- .../ui/dbgui/PivotLayoutTreeListData.cxx | 30 +- sc/source/ui/dbgui/asciiopt.cxx | 1 - sc/source/ui/dbgui/asciiopt.hrc | 24 - sc/source/ui/dbgui/consdlg.cxx | 2 +- sc/source/ui/dbgui/dpgroupdlg.cxx | 8 +- sc/source/ui/dbgui/filtdlg.cxx | 1 + sc/source/ui/dbgui/outline.src | 25 - sc/source/ui/dbgui/pfiltdlg.cxx | 3 +- sc/source/ui/dbgui/pvfundlg.cxx | 9 +- sc/source/ui/dbgui/pvfundlg.hrc | 26 - sc/source/ui/dbgui/pvfundlg.src | 41 - sc/source/ui/dbgui/scuiasciiopt.cxx | 2 +- sc/source/ui/dbgui/scuiimoptdlg.cxx | 2 +- sc/source/ui/dbgui/sfiltdlg.cxx | 1 + sc/source/ui/dbgui/tpsort.cxx | 3 +- sc/source/ui/dbgui/tpsubt.cxx | 3 +- sc/source/ui/dbgui/validate.cxx | 2 +- sc/source/ui/dialogs/searchresults.cxx | 3 +- sc/source/ui/docshell/dbdocfun.cxx | 4 +- sc/source/ui/docshell/dbdocimp.cxx | 12 +- sc/source/ui/docshell/docfunc.cxx | 7 +- sc/source/ui/docshell/docsh.cxx | 3 +- sc/source/ui/docshell/docsh4.cxx | 1 + sc/source/ui/docshell/docsh5.cxx | 10 +- sc/source/ui/docshell/docsh8.cxx | 4 +- sc/source/ui/docshell/documentlinkmgr.cxx | 2 +- sc/source/ui/docshell/editable.cxx | 4 +- sc/source/ui/drawfunc/drawsh.cxx | 3 +- sc/source/ui/drawfunc/fuconrec.cxx | 5 +- sc/source/ui/drawfunc/fuins1.cxx | 2 +- sc/source/ui/drawfunc/graphsh.cxx | 2 +- sc/source/ui/drawfunc/mediash.cxx | 2 +- sc/source/ui/inc/AnalysisOfVarianceDialog.hxx | 2 +- sc/source/ui/inc/ChiSquareTestDialog.hxx | 2 +- sc/source/ui/inc/CovarianceDialog.hxx | 2 +- .../ui/inc/DescriptiveStatisticsDialog.hxx | 2 +- .../ui/inc/ExponentialSmoothingDialog.hxx | 2 +- sc/source/ui/inc/FTestDialog.hxx | 2 +- .../ui/inc/MatrixComparisonGenerator.hxx | 2 +- sc/source/ui/inc/MovingAverageDialog.hxx | 2 +- .../ui/inc/RandomNumberGeneratorDialog.hxx | 2 +- sc/source/ui/inc/RegressionDialog.hxx | 2 +- .../ui/inc/StatisticsInputOutputDialog.hxx | 2 +- .../ui/inc/StatisticsTwoVariableDialog.hxx | 2 +- sc/source/ui/inc/TTestDialog.hxx | 2 +- sc/source/ui/inc/ZTestDialog.hxx | 2 +- sc/source/ui/inc/anyrefdg.hxx | 24 - sc/source/ui/inc/docfunc.hxx | 2 +- sc/source/ui/inc/docsh.hxx | 2 +- sc/source/ui/inc/editable.hxx | 2 +- sc/source/ui/inc/reffact.hxx | 2 +- sc/source/ui/inc/tabview.hxx | 2 +- sc/source/ui/inc/tpview.hxx | 2 - sc/source/ui/inc/undostyl.hxx | 2 +- sc/source/ui/inc/validate.hxx | 1 + sc/source/ui/miscdlgs/acredlin.cxx | 2 +- sc/source/ui/miscdlgs/acredlin.src | 86 - sc/source/ui/miscdlgs/autofmt.cxx | 2 +- sc/source/ui/miscdlgs/conflictsdlg.cxx | 2 +- sc/source/ui/miscdlgs/conflictsdlg.src | 42 - sc/source/ui/miscdlgs/crdlg.cxx | 2 +- sc/source/ui/miscdlgs/delcldlg.cxx | 2 +- sc/source/ui/miscdlgs/delcodlg.cxx | 2 +- sc/source/ui/miscdlgs/filldlg.cxx | 2 +- sc/source/ui/miscdlgs/inscldlg.cxx | 2 +- sc/source/ui/miscdlgs/inscodlg.cxx | 2 +- sc/source/ui/miscdlgs/lbseldlg.cxx | 2 +- sc/source/ui/miscdlgs/mtrindlg.cxx | 2 +- sc/source/ui/miscdlgs/mvtabdlg.cxx | 2 +- sc/source/ui/miscdlgs/retypepassdlg.cxx | 2 +- sc/source/ui/miscdlgs/retypepassdlg.src | 47 - sc/source/ui/miscdlgs/scuiautofmt.cxx | 4 +- sc/source/ui/miscdlgs/shtabdlg.cxx | 2 +- sc/source/ui/miscdlgs/tabbgcolordlg.cxx | 4 +- sc/source/ui/miscdlgs/tabopdlg.cxx | 1 + sc/source/ui/miscdlgs/textdlgs.cxx | 1 + sc/source/ui/miscdlgs/warnbox.cxx | 3 +- sc/source/ui/namedlg/namepast.cxx | 2 +- sc/source/ui/navipi/content.cxx | 17 +- sc/source/ui/navipi/navipi.cxx | 3 +- sc/source/ui/navipi/navipi.src | 109 - sc/source/ui/navipi/scenwnd.cxx | 3 +- sc/source/ui/optdlg/tpformula.cxx | 3 +- sc/source/ui/optdlg/tpview.cxx | 12 +- sc/source/ui/pagedlg/tphfedit.cxx | 1 + .../sidebar/CellAppearancePropertyPanel.cxx | 3 +- sc/source/ui/src/globstr.src | 1962 ------- sc/source/ui/src/sc.src | 27 - sc/source/ui/src/scerrors.src | 106 - sc/source/ui/src/scfuncs.src | 4875 ----------------- sc/source/ui/src/scstring.src | 605 -- sc/source/ui/src/toolbox.src | 67 - sc/source/ui/styleui/scstyles.src | 44 - sc/source/ui/styleui/styledlg.cxx | 1 + sc/source/ui/undo/undoblk.cxx | 4 +- sc/source/ui/undo/undocell.cxx | 14 +- sc/source/ui/undo/undodat.cxx | 10 +- sc/source/ui/undo/undostyl.cxx | 4 +- sc/source/ui/undo/undotab.cxx | 19 +- .../ui/unoobj/PivotTableDataProvider.cxx | 2 +- sc/source/ui/unoobj/docuno.cxx | 3 +- sc/source/ui/unoobj/styleuno.cxx | 10 +- sc/source/ui/unoobj/targuno.cxx | 8 +- sc/source/ui/view/cellsh1.cxx | 14 +- sc/source/ui/view/dbfunc3.cxx | 28 +- sc/source/ui/view/drawvie3.cxx | 2 +- sc/source/ui/view/formatsh.cxx | 1 + sc/source/ui/view/gridwin.cxx | 1 + sc/source/ui/view/gridwin2.cxx | 1 + sc/source/ui/view/olinewin.cxx | 2 +- sc/source/ui/view/reffact.cxx | 1 + sc/source/ui/view/tabview2.cxx | 10 +- sc/source/ui/view/tabvwsh3.cxx | 1 + sc/source/ui/view/tabvwsh4.cxx | 1 + sc/source/ui/view/tabvwsha.cxx | 20 +- sc/source/ui/view/tabvwshc.cxx | 1 + sc/source/ui/view/tabvwshf.cxx | 1 + sc/source/ui/view/viewfunc.cxx | 15 +- sc/uiconfig/scalc/ui/advancedfilterdialog.ui | 28 +- sc/uiconfig/scalc/ui/allheaderfooterdialog.ui | 12 +- .../scalc/ui/analysisofvariancedialog.ui | 30 +- sc/uiconfig/scalc/ui/autoformattable.ui | 22 +- sc/uiconfig/scalc/ui/cellprotectionpage.ui | 18 +- sc/uiconfig/scalc/ui/changesourcedialog.ui | 10 +- sc/uiconfig/scalc/ui/chardialog.ui | 10 +- sc/uiconfig/scalc/ui/chisquaretestdialog.ui | 16 +- sc/uiconfig/scalc/ui/colorrowdialog.ui | 10 +- sc/uiconfig/scalc/ui/colwidthdialog.ui | 8 +- sc/uiconfig/scalc/ui/condformatmanager.ui | 12 +- sc/uiconfig/scalc/ui/conditionalentry.ui | 188 +- .../scalc/ui/conditionalformatdialog.ui | 10 +- sc/uiconfig/scalc/ui/conditionaliconset.ui | 12 +- sc/uiconfig/scalc/ui/conflictsdialog.ui | 14 +- sc/uiconfig/scalc/ui/consolidatedialog.ui | 46 +- sc/uiconfig/scalc/ui/correlationdialog.ui | 16 +- sc/uiconfig/scalc/ui/covariancedialog.ui | 16 +- sc/uiconfig/scalc/ui/createnamesdialog.ui | 14 +- sc/uiconfig/scalc/ui/dapiservicedialog.ui | 16 +- sc/uiconfig/scalc/ui/databaroptions.ui | 72 +- sc/uiconfig/scalc/ui/datafielddialog.ui | 40 +- .../scalc/ui/datafieldoptionsdialog.ui | 44 +- sc/uiconfig/scalc/ui/dataform.ui | 18 +- sc/uiconfig/scalc/ui/datastreams.ui | 38 +- .../scalc/ui/definedatabaserangedialog.ui | 28 +- sc/uiconfig/scalc/ui/definename.ui | 22 +- sc/uiconfig/scalc/ui/deletecells.ui | 14 +- sc/uiconfig/scalc/ui/deletecontents.ui | 22 +- .../scalc/ui/descriptivestatisticsdialog.ui | 16 +- sc/uiconfig/scalc/ui/doubledialog.ui | 4 +- sc/uiconfig/scalc/ui/dropmenu.ui | 8 +- sc/uiconfig/scalc/ui/erroralerttabpage.ui | 22 +- .../scalc/ui/exponentialsmoothingdialog.ui | 20 +- sc/uiconfig/scalc/ui/externaldata.ui | 16 +- sc/uiconfig/scalc/ui/filldlg.ui | 40 +- sc/uiconfig/scalc/ui/floatingborderstyle.ui | 34 +- sc/uiconfig/scalc/ui/floatinglinestyle.ui | 4 +- sc/uiconfig/scalc/ui/footerdialog.ui | 8 +- sc/uiconfig/scalc/ui/formatcellsdialog.ui | 20 +- .../scalc/ui/formulacalculationoptions.ui | 24 +- sc/uiconfig/scalc/ui/functionpanel.ui | 32 +- sc/uiconfig/scalc/ui/goalseekdlg.ui | 12 +- sc/uiconfig/scalc/ui/groupbydate.ui | 22 +- sc/uiconfig/scalc/ui/groupbynumber.ui | 18 +- sc/uiconfig/scalc/ui/groupdialog.ui | 10 +- sc/uiconfig/scalc/ui/headerdialog.ui | 8 +- sc/uiconfig/scalc/ui/headerfootercontent.ui | 54 +- sc/uiconfig/scalc/ui/headerfooterdialog.ui | 8 +- sc/uiconfig/scalc/ui/imoptdialog.ui | 20 +- sc/uiconfig/scalc/ui/inputstringdialog.ui | 2 +- sc/uiconfig/scalc/ui/insertcells.ui | 14 +- sc/uiconfig/scalc/ui/insertname.ui | 6 +- sc/uiconfig/scalc/ui/insertsheet.ui | 28 +- sc/uiconfig/scalc/ui/integerdialog.ui | 4 +- sc/uiconfig/scalc/ui/leftfooterdialog.ui | 6 +- sc/uiconfig/scalc/ui/leftheaderdialog.ui | 6 +- sc/uiconfig/scalc/ui/managenamesdialog.ui | 24 +- sc/uiconfig/scalc/ui/mergecellsdialog.ui | 12 +- sc/uiconfig/scalc/ui/movecopysheet.ui | 28 +- sc/uiconfig/scalc/ui/movingaveragedialog.ui | 20 +- .../scalc/ui/multipleoperationsdialog.ui | 12 +- sc/uiconfig/scalc/ui/namerangesdialog.ui | 12 +- sc/uiconfig/scalc/ui/navigatorpanel.ui | 28 +- sc/uiconfig/scalc/ui/nosolutiondialog.ui | 6 +- sc/uiconfig/scalc/ui/notebookbar.ui | 42 +- sc/uiconfig/scalc/ui/notebookbar_groups.ui | 114 +- sc/uiconfig/scalc/ui/optcalculatepage.ui | 50 +- sc/uiconfig/scalc/ui/optchangespage.ui | 12 +- sc/uiconfig/scalc/ui/optcompatibilitypage.ui | 10 +- sc/uiconfig/scalc/ui/optdefaultpage.ui | 8 +- sc/uiconfig/scalc/ui/optdlg.ui | 12 +- sc/uiconfig/scalc/ui/optformula.ui | 44 +- sc/uiconfig/scalc/ui/optimalcolwidthdialog.ui | 8 +- .../scalc/ui/optimalrowheightdialog.ui | 8 +- sc/uiconfig/scalc/ui/optsortlists.ui | 20 +- sc/uiconfig/scalc/ui/pagetemplatedialog.ui | 18 +- sc/uiconfig/scalc/ui/paradialog.ui | 12 +- sc/uiconfig/scalc/ui/paratemplatedialog.ui | 24 +- sc/uiconfig/scalc/ui/pastespecial.ui | 56 +- sc/uiconfig/scalc/ui/pivotfielddialog.ui | 18 +- sc/uiconfig/scalc/ui/pivotfilterdialog.ui | 34 +- .../scalc/ui/pivottablelayoutdialog.ui | 46 +- sc/uiconfig/scalc/ui/printareasdialog.ui | 26 +- sc/uiconfig/scalc/ui/printeroptions.ui | 6 +- sc/uiconfig/scalc/ui/protectsheetdlg.ui | 24 +- .../scalc/ui/queryrunstreamscriptdialog.ui | 4 +- sc/uiconfig/scalc/ui/randomnumbergenerator.ui | 44 +- sc/uiconfig/scalc/ui/regressiondialog.ui | 26 +- sc/uiconfig/scalc/ui/retypepassdialog.ui | 14 +- sc/uiconfig/scalc/ui/retypepassworddialog.ui | 14 +- sc/uiconfig/scalc/ui/rightfooterdialog.ui | 6 +- sc/uiconfig/scalc/ui/rightheaderdialog.ui | 6 +- sc/uiconfig/scalc/ui/rowheightdialog.ui | 8 +- sc/uiconfig/scalc/ui/samplingdialog.ui | 20 +- sc/uiconfig/scalc/ui/scenariodialog.ui | 26 +- sc/uiconfig/scalc/ui/scenariomenu.ui | 6 +- sc/uiconfig/scalc/ui/scgeneralpage.ui | 46 +- sc/uiconfig/scalc/ui/searchresults.ui | 6 +- sc/uiconfig/scalc/ui/selectdatasource.ui | 20 +- sc/uiconfig/scalc/ui/selectrange.ui | 6 +- sc/uiconfig/scalc/ui/selectsource.ui | 14 +- sc/uiconfig/scalc/ui/sharedfooterdialog.ui | 10 +- sc/uiconfig/scalc/ui/sharedheaderdialog.ui | 10 +- sc/uiconfig/scalc/ui/sharedocumentdlg.ui | 20 +- sc/uiconfig/scalc/ui/sheetprintpage.ui | 46 +- sc/uiconfig/scalc/ui/showchangesdialog.ui | 12 +- sc/uiconfig/scalc/ui/showdetaildialog.ui | 6 +- sc/uiconfig/scalc/ui/showsheetdialog.ui | 6 +- sc/uiconfig/scalc/ui/sidebaralignment.ui | 34 +- sc/uiconfig/scalc/ui/sidebarcellappearance.ui | 20 +- sc/uiconfig/scalc/ui/sidebarnumberformat.ui | 56 +- sc/uiconfig/scalc/ui/simplerefdialog.ui | 6 +- sc/uiconfig/scalc/ui/solverdlg.ui | 100 +- sc/uiconfig/scalc/ui/solveroptionsdialog.ui | 10 +- sc/uiconfig/scalc/ui/solverprogressdialog.ui | 8 +- sc/uiconfig/scalc/ui/solversuccessdialog.ui | 14 +- sc/uiconfig/scalc/ui/sortcriteriapage.ui | 2 +- sc/uiconfig/scalc/ui/sortdialog.ui | 8 +- sc/uiconfig/scalc/ui/sortkey.ui | 8 +- sc/uiconfig/scalc/ui/sortoptionspage.ui | 34 +- sc/uiconfig/scalc/ui/sortwarning.ui | 12 +- sc/uiconfig/scalc/ui/standardfilterdialog.ui | 164 +- sc/uiconfig/scalc/ui/statisticsinfopage.ui | 12 +- sc/uiconfig/scalc/ui/subtotaldialog.ui | 12 +- sc/uiconfig/scalc/ui/subtotalgrppage.ui | 30 +- sc/uiconfig/scalc/ui/subtotaloptionspage.ui | 20 +- sc/uiconfig/scalc/ui/tabcolordialog.ui | 2 +- sc/uiconfig/scalc/ui/textimportcsv.ui | 46 +- sc/uiconfig/scalc/ui/textimportoptions.ui | 14 +- sc/uiconfig/scalc/ui/tpviewpage.ui | 70 +- sc/uiconfig/scalc/ui/ttestdialog.ui | 16 +- sc/uiconfig/scalc/ui/ungroupdialog.ui | 10 +- .../scalc/ui/validationcriteriapage.ui | 50 +- sc/uiconfig/scalc/ui/validationdialog.ui | 10 +- sc/uiconfig/scalc/ui/validationhelptabpage.ui | 10 +- sc/uiconfig/scalc/ui/xmlsourcedialog.ui | 16 +- sc/uiconfig/scalc/ui/ztestdialog.ui | 16 +- scaddins/AllLangMoTarget_sca.mk | 13 + scaddins/AllLangResTarget_analysis.mk | 38 - scaddins/AllLangResTarget_date.mk | 37 - scaddins/AllLangResTarget_pricing.mk | 37 - scaddins/Library_analysis.mk | 8 +- scaddins/Library_date.mk | 8 +- scaddins/Library_pricing.mk | 8 +- scaddins/Module_scaddins.mk | 4 +- scaddins/inc/analysis.hrc | 1106 ++++ scaddins/inc/datefunc.hrc | 95 + scaddins/inc/pricing.hrc | 124 + scaddins/inc/strings.hrc | 144 + scaddins/source/analysis/analysis.cxx | 34 +- scaddins/source/analysis/analysis.hrc | 234 - scaddins/source/analysis/analysis.hxx | 11 +- scaddins/source/analysis/analysis.src | 1404 ----- .../source/analysis/analysis_funcnames.src | 527 -- scaddins/source/analysis/analysishelper.cxx | 10 +- scaddins/source/analysis/analysishelper.hxx | 30 +- scaddins/source/datefunc/datefunc.cxx | 37 +- scaddins/source/datefunc/datefunc.hrc | 49 - scaddins/source/datefunc/datefunc.hxx | 28 +- scaddins/source/datefunc/datefunc.src | 154 - scaddins/source/pricing/pricing.cxx | 51 +- scaddins/source/pricing/pricing.hrc | 41 - scaddins/source/pricing/pricing.hxx | 36 +- scaddins/source/pricing/pricing.src | 153 - sccomp/AllLangMoTarget_scc.mk | 13 + sccomp/AllLangResTarget_solver.mk | 34 - sccomp/Library_solver.mk | 6 + sccomp/Module_sccomp.mk | 2 +- sccomp/inc/strings.hrc | 40 + sccomp/source/solver/CoinMPSolver.cxx | 2 +- sccomp/source/solver/LpsolveSolver.cxx | 2 +- sccomp/source/solver/SolverComponent.cxx | 30 +- sccomp/source/solver/SolverComponent.hxx | 6 +- sccomp/source/solver/solver.hrc | 39 - sccomp/source/solver/solver.src | 82 - scp2/InstallModule_ooo.mk | 1 - scp2/inc/macros.inc | 8 +- scp2/macros/macro.pl | 10 +- scp2/source/base/file_base.scp | 13 - scp2/source/base/module_base.scp | 9 +- scp2/source/calc/file_calc.scp | 13 - scp2/source/calc/module_calc.scp | 6 +- scp2/source/math/file_math.scp | 2 - scp2/source/math/module_math.scp | 2 +- scp2/source/ooo/common_brand.scp | 8 + scp2/source/ooo/file_ooo.scp | 61 +- scp2/source/ooo/file_resource_ooo.scp | 99 - scp2/source/ooo/module_lang_template.scp | 79 +- .../source/templates/module_langpack_root.sct | 11 - scp2/source/writer/module_writer.scp | 2 +- scripting/source/dlgprov/dlgevtatt.cxx | 26 +- sd/AllLangMoTarget_sd.mk | 11 + sd/AllLangResTarget_sd.mk | 39 - sd/CppunitTest_sd_export_ooxml1.mk | 4 - sd/CppunitTest_sd_export_ooxml2.mk | 4 - sd/CppunitTest_sd_export_tests.mk | 4 - sd/CppunitTest_sd_filters_test.mk | 1 - sd/CppunitTest_sd_html_export_tests.mk | 2 - sd/CppunitTest_sd_import_tests.mk | 2 - sd/CppunitTest_sd_misc_tests.mk | 2 - sd/CppunitTest_sd_svg_export_tests.mk | 2 - sd/CppunitTest_sd_tiledrendering.mk | 2 - sd/Library_sd.mk | 3 - sd/Module_sd.mk | 6 +- sd/inc/DocumentRenderer.hrc | 98 + sd/inc/drawdoc.hxx | 2 +- .../ui/app/res_bmp.src => inc/errhdl.hrc} | 37 +- .../dialog/templdlg.src => sd/inc/family.hrc | 38 +- sd/inc/glob.hrc | 85 - sd/inc/glob.hxx | 2 +- sd/inc/pch/precompiled_sd.hxx | 2 - sd/inc/pch/precompiled_sdui.hxx | 3 - sd/inc/sdresid.hxx | 6 +- sd/inc/strings.hrc | 473 ++ sd/inc/strings.hxx | 4 +- sd/qa/unit/export-tests-ooxml1.cxx | 2 +- sd/qa/unit/export-tests-ooxml2.cxx | 2 +- sd/qa/unit/export-tests.cxx | 2 +- sd/qa/unit/import-tests.cxx | 2 +- sd/source/core/drawdoc.cxx | 2 +- sd/source/core/drawdoc2.cxx | 2 +- sd/source/core/drawdoc3.cxx | 2 +- sd/source/core/drawdoc4.cxx | 4 +- sd/source/core/glob.src | 324 -- sd/source/core/sdpage.cxx | 2 +- sd/source/core/sdpage2.cxx | 2 +- sd/source/core/stlpool.cxx | 66 +- sd/source/core/stlsheet.cxx | 2 +- sd/source/core/undoanim.cxx | 2 +- sd/source/filter/grf/sdgrffilter.cxx | 24 +- sd/source/filter/html/htmlex.cxx | 20 +- sd/source/filter/html/htmlex.hxx | 6 +- sd/source/filter/ppt/pptin.cxx | 2 +- sd/source/filter/xml/sdxmlwrp.cxx | 3 +- .../AccessibleDrawDocumentView.cxx | 2 +- .../accessibility/AccessibleOutlineView.cxx | 2 +- .../AccessiblePresentationShape.cxx | 2 +- .../AccessibleSlideSorterObject.cxx | 2 +- .../AccessibleSlideSorterView.cxx | 2 +- sd/source/ui/accessibility/accessibility.hrc | 80 - sd/source/ui/accessibility/accessibility.src | 261 - sd/source/ui/animations/CustomAnimation.hrc | 63 - sd/source/ui/animations/CustomAnimation.src | 177 - .../ui/animations/CustomAnimationDialog.cxx | 3 +- .../ui/animations/CustomAnimationList.cxx | 6 +- .../ui/animations/CustomAnimationList.hxx | 2 +- .../ui/animations/CustomAnimationPane.cxx | 6 +- .../ui/animations/SlideTransitionPane.cxx | 4 +- .../ui/annotations/annotationmanager.cxx | 12 +- sd/source/ui/annotations/annotations.hrc | 41 - sd/source/ui/annotations/annotations.src | 85 - sd/source/ui/annotations/annotationtag.cxx | 2 +- sd/source/ui/annotations/annotationwindow.cxx | 2 +- sd/source/ui/app/sdmod.cxx | 18 +- sd/source/ui/app/sdmod1.cxx | 4 +- sd/source/ui/app/sdmod2.cxx | 8 +- sd/source/ui/app/sdstring.src | 42 - sd/source/ui/app/strings.src | 1090 ---- sd/source/ui/app/toolbox.src | 34 - .../ui/controller/displaymodecontroller.cxx | 10 +- .../ui/controller/slidelayoutcontroller.cxx | 18 +- sd/source/ui/dlg/LayerTabBar.cxx | 4 +- sd/source/ui/dlg/PaneChildWindows.cxx | 4 +- sd/source/ui/dlg/PaneDockingWindow.cxx | 2 +- sd/source/ui/dlg/PaneShells.cxx | 2 +- sd/source/ui/dlg/RemoteDialogClientBox.cxx | 4 +- sd/source/ui/dlg/TemplateScanner.cxx | 1 - sd/source/ui/dlg/animobjs.cxx | 2 +- sd/source/ui/dlg/copydlg.cxx | 2 +- sd/source/ui/dlg/diactrl.cxx | 2 +- sd/source/ui/dlg/dlgolbul.cxx | 2 +- sd/source/ui/dlg/inspagob.cxx | 2 +- sd/source/ui/dlg/navigatr.cxx | 14 +- sd/source/ui/dlg/paragr.cxx | 2 +- sd/source/ui/dlg/prltempl.cxx | 2 +- sd/source/ui/dlg/sdpreslt.cxx | 2 +- sd/source/ui/dlg/sdtreelb.cxx | 2 +- sd/source/ui/dlg/tpaction.cxx | 11 +- sd/source/ui/dlg/tpoption.cxx | 8 +- sd/source/ui/dlg/unchss.cxx | 2 +- sd/source/ui/docshell/docshel2.cxx | 2 +- sd/source/ui/docshell/docshel3.cxx | 4 +- sd/source/ui/docshell/docshel4.cxx | 2 +- sd/source/ui/docshell/docshell.cxx | 4 +- sd/source/ui/docshell/grdocsh.cxx | 2 +- sd/source/ui/func/fucon3d.cxx | 2 +- sd/source/ui/func/fuconarc.cxx | 2 +- sd/source/ui/func/fuconbez.cxx | 2 +- sd/source/ui/func/fuconcs.cxx | 4 +- sd/source/ui/func/fuconrec.cxx | 10 +- sd/source/ui/func/fuconstr.cxx | 2 +- sd/source/ui/func/fuconuno.cxx | 4 +- sd/source/ui/func/fudraw.cxx | 4 +- sd/source/ui/func/fuediglu.cxx | 2 +- sd/source/ui/func/fuinsert.cxx | 4 +- sd/source/ui/func/fuinsfil.cxx | 2 +- sd/source/ui/func/fuoaprms.cxx | 2 +- sd/source/ui/func/fuolbull.cxx | 2 +- sd/source/ui/func/fupage.cxx | 2 +- sd/source/ui/func/fuprlout.cxx | 2 +- sd/source/ui/func/fuprobjs.cxx | 4 +- sd/source/ui/func/fusel.cxx | 2 +- sd/source/ui/func/fusldlg.cxx | 2 +- sd/source/ui/func/futempl.cxx | 4 +- sd/source/ui/func/futext.cxx | 4 +- sd/source/ui/func/futhes.cxx | 2 +- sd/source/ui/inc/PaneChildWindows.hxx | 2 +- sd/source/ui/inc/cfgids.hxx | 4 - sd/source/ui/inc/navigatr.hxx | 2 +- sd/source/ui/inc/res_bmp.hrc | 25 - sd/source/ui/inc/sdstring.hrc | 28 - sd/source/ui/inc/strings.hrc | 392 -- sd/source/ui/inc/tpaction.hxx | 2 +- sd/source/ui/inc/view/viewoverlaymanager.hxx | 1 - sd/source/ui/presenter/PresenterHelper.cxx | 2 +- .../ui/sidebar/CurrentMasterPagesSelector.cxx | 2 +- sd/source/ui/sidebar/LayoutMenu.cxx | 16 +- sd/source/ui/sidebar/MasterPageContainer.cxx | 50 +- sd/source/ui/sidebar/MasterPagesSelector.cxx | 4 +- sd/source/ui/sidebar/SlideBackground.cxx | 5 +- sd/source/ui/slideshow/showwin.cxx | 2 +- sd/source/ui/slideshow/slideshowimpl.cxx | 4 +- .../controller/SlideSorterController.cxx | 4 +- .../slidesorter/controller/SlsClipboard.cxx | 4 +- .../ui/slidesorter/controller/SlsListener.cxx | 2 +- .../controller/SlsSelectionManager.cxx | 4 +- .../slidesorter/controller/SlsSlotManager.cxx | 2 +- .../ui/slidesorter/shell/SlideSorter.cxx | 2 +- .../shell/SlideSorterViewShell.cxx | 2 +- .../ui/slidesorter/view/SlideSorterView.cxx | 2 +- .../view/SlsPageObjectLayouter.cxx | 2 +- sd/source/ui/slidesorter/view/SlsTheme.cxx | 2 +- sd/source/ui/slidesorter/view/SlsToolTip.cxx | 2 +- sd/source/ui/table/TableDesignPane.cxx | 2 +- sd/source/ui/table/tablefunction.cxx | 2 +- sd/source/ui/table/tableobjectbar.cxx | 3 +- sd/source/ui/unoidl/unolayer.cxx | 2 +- sd/source/ui/unoidl/unomodel.cxx | 2 +- sd/source/ui/unoidl/unoobj.cxx | 2 +- sd/source/ui/unoidl/unopage.cxx | 4 +- sd/source/ui/view/DocumentRenderer.cxx | 31 +- sd/source/ui/view/DocumentRenderer.src | 181 - sd/source/ui/view/GraphicObjectBar.cxx | 4 +- sd/source/ui/view/MediaObjectBar.cxx | 4 +- sd/source/ui/view/Outliner.cxx | 9 +- sd/source/ui/view/ViewClipboard.cxx | 2 +- sd/source/ui/view/ViewShellBase.cxx | 2 +- sd/source/ui/view/ViewShellImplementation.cxx | 2 +- sd/source/ui/view/drawview.cxx | 4 +- sd/source/ui/view/drbezob.cxx | 4 +- sd/source/ui/view/drtxtob.cxx | 4 +- sd/source/ui/view/drtxtob1.cxx | 2 +- sd/source/ui/view/drviews1.cxx | 4 +- sd/source/ui/view/drviews2.cxx | 30 +- sd/source/ui/view/drviews3.cxx | 4 +- sd/source/ui/view/drviews4.cxx | 4 +- sd/source/ui/view/drviews5.cxx | 4 +- sd/source/ui/view/drviews7.cxx | 4 +- sd/source/ui/view/drviewsa.cxx | 2 +- sd/source/ui/view/drviewsb.cxx | 4 +- sd/source/ui/view/drviewse.cxx | 4 +- sd/source/ui/view/drvwshrg.cxx | 4 +- sd/source/ui/view/frmview.cxx | 2 +- sd/source/ui/view/outlnvsh.cxx | 4 +- sd/source/ui/view/outlview.cxx | 2 +- sd/source/ui/view/presvish.cxx | 2 +- sd/source/ui/view/sdview.cxx | 2 +- sd/source/ui/view/sdview2.cxx | 2 +- sd/source/ui/view/sdview4.cxx | 4 +- sd/source/ui/view/tabcontr.cxx | 4 +- sd/source/ui/view/unmodpg.cxx | 2 +- sd/source/ui/view/viewoverlaymanager.cxx | 8 +- sd/source/ui/view/viewshe2.cxx | 2 +- sd/source/ui/view/viewshe3.cxx | 6 +- sd/source/ui/view/viewshel.cxx | 4 +- sd/uiconfig/sdraw/ui/breakdialog.ui | 10 +- sd/uiconfig/sdraw/ui/bulletsandnumbering.ui | 16 +- sd/uiconfig/sdraw/ui/copydlg.ui | 32 +- sd/uiconfig/sdraw/ui/crossfadedialog.ui | 12 +- sd/uiconfig/sdraw/ui/dlgsnap.ui | 18 +- sd/uiconfig/sdraw/ui/drawchardialog.ui | 12 +- sd/uiconfig/sdraw/ui/drawpagedialog.ui | 10 +- sd/uiconfig/sdraw/ui/drawparadialog.ui | 14 +- sd/uiconfig/sdraw/ui/drawprtldialog.ui | 36 +- sd/uiconfig/sdraw/ui/insertlayer.ui | 16 +- sd/uiconfig/sdraw/ui/insertslidesdialog.ui | 8 +- sd/uiconfig/sdraw/ui/namedesign.ui | 4 +- sd/uiconfig/sdraw/ui/paranumberingtab.ui | 8 +- sd/uiconfig/sdraw/ui/printeroptions.ui | 26 +- .../sdraw/ui/queryunlinkimagedialog.ui | 8 +- sd/uiconfig/sdraw/ui/tabledesigndialog.ui | 16 +- sd/uiconfig/sdraw/ui/vectorize.ui | 18 +- sd/uiconfig/simpress/ui/annotationmenu.ui | 22 +- sd/uiconfig/simpress/ui/annotationtagmenu.ui | 10 +- sd/uiconfig/simpress/ui/currentmastermenu.ui | 14 +- .../simpress/ui/customanimationeffecttab.ui | 36 +- .../simpress/ui/customanimationproperties.ui | 10 +- .../simpress/ui/customanimationspanel.ui | 52 +- .../ui/customanimationspanelhorizontal.ui | 46 +- .../simpress/ui/customanimationtexttab.ui | 24 +- .../simpress/ui/customanimationtimingtab.ui | 26 +- sd/uiconfig/simpress/ui/customslideshows.ui | 10 +- .../simpress/ui/definecustomslideshow.ui | 14 +- sd/uiconfig/simpress/ui/dlgfield.ui | 14 +- sd/uiconfig/simpress/ui/dockinganimation.ui | 64 +- sd/uiconfig/simpress/ui/effectmenu.ui | 14 +- sd/uiconfig/simpress/ui/fontsizemenu.ui | 10 +- sd/uiconfig/simpress/ui/fontstylemenu.ui | 8 +- sd/uiconfig/simpress/ui/headerfooterdialog.ui | 10 +- sd/uiconfig/simpress/ui/headerfootertab.ui | 30 +- sd/uiconfig/simpress/ui/insertslides.ui | 10 +- sd/uiconfig/simpress/ui/interactiondialog.ui | 4 +- sd/uiconfig/simpress/ui/interactionpage.ui | 14 +- sd/uiconfig/simpress/ui/layoutmenu.ui | 6 +- sd/uiconfig/simpress/ui/masterlayoutdlg.ui | 16 +- sd/uiconfig/simpress/ui/mastermenu.ui | 10 +- sd/uiconfig/simpress/ui/navigatorpanel.ui | 18 +- sd/uiconfig/simpress/ui/notebookbar.ui | 42 +- sd/uiconfig/simpress/ui/notebookbar_groups.ui | 92 +- .../simpress/ui/optimpressgeneralpage.ui | 46 +- sd/uiconfig/simpress/ui/photoalbum.ui | 30 +- sd/uiconfig/simpress/ui/presentationdialog.ui | 54 +- sd/uiconfig/simpress/ui/printeroptions.ui | 28 +- sd/uiconfig/simpress/ui/prntopts.ui | 46 +- sd/uiconfig/simpress/ui/publishingdialog.ui | 118 +- sd/uiconfig/simpress/ui/remotedialog.ui | 6 +- sd/uiconfig/simpress/ui/rotatemenu.ui | 14 +- sd/uiconfig/simpress/ui/scalemenu.ui | 16 +- sd/uiconfig/simpress/ui/sdviewpage.ui | 12 +- .../simpress/ui/sidebarslidebackground.ui | 30 +- sd/uiconfig/simpress/ui/slidecontextmenu.ui | 40 +- sd/uiconfig/simpress/ui/slidedesigndialog.ui | 12 +- .../simpress/ui/slidetransitionspanel.ui | 32 +- .../ui/slidetransitionspanelhorizontal.ui | 28 +- sd/uiconfig/simpress/ui/tabledesignpanel.ui | 14 +- .../simpress/ui/tabledesignpanelhorizontal.ui | 14 +- sd/uiconfig/simpress/ui/templatedialog.ui | 36 +- .../source/packinfo/packinfo_brand.txt | 4 +- sfx2/AllLangMoTarget_sfx2.mk | 13 + sfx2/AllLangResTarget_sfx2.mk | 58 - sfx2/Library_sfx.mk | 3 - sfx2/Module_sfx2.mk | 4 +- sfx2/inc/app.hrc | 94 - sfx2/inc/dinfdlg.hrc | 79 + sfx2/inc/doc.hrc | 111 - .../srchdlg.src => sfx2/inc/doctempl.hrc | 54 +- sfx2/inc/filedlghelper.hrc | 31 - sfx2/inc/pch/precompiled_sfx.hxx | 4 - sfx2/inc/strings.hxx | 8 + sfx2/source/appl/app.cxx | 6 +- sfx2/source/appl/app.src | 365 -- sfx2/source/appl/appbas.cxx | 6 +- sfx2/source/appl/appcfg.cxx | 2 +- sfx2/source/appl/appdata.cxx | 6 +- sfx2/source/appl/appinit.cxx | 18 +- sfx2/source/appl/appmain.cxx | 2 +- sfx2/source/appl/appmisc.cxx | 5 +- sfx2/source/appl/appopen.cxx | 2 +- sfx2/source/appl/appquit.cxx | 13 +- sfx2/source/appl/appserv.cxx | 2 +- sfx2/source/appl/childwin.cxx | 1 - sfx2/source/appl/fileobj.cxx | 2 +- sfx2/source/appl/linkmgr2.cxx | 3 +- sfx2/source/appl/lnkbase2.cxx | 2 +- sfx2/source/appl/module.cxx | 21 +- sfx2/source/appl/newhelp.cxx | 2 +- sfx2/source/appl/newhelp.src | 99 - sfx2/source/appl/opengrf.cxx | 4 +- sfx2/source/appl/openuriexternally.cxx | 2 +- sfx2/source/appl/sfx.src | 42 - sfx2/source/appl/sfxhelp.cxx | 2 +- sfx2/source/appl/shutdownicon.cxx | 30 +- sfx2/source/appl/shutdownicon.hxx | 5 +- sfx2/source/appl/shutdowniconaqua.mm | 18 +- sfx2/source/appl/shutdowniconunx.cxx | 13 +- sfx2/source/appl/shutdowniconw32.cxx | 14 +- sfx2/source/appl/workwin.cxx | 1 - sfx2/source/bastyp/bastyp.hrc | 28 - sfx2/source/bastyp/fltfnc.cxx | 2 +- sfx2/source/bastyp/fltfnc.src | 33 - sfx2/source/bastyp/frmhtmlw.cxx | 4 +- sfx2/source/bastyp/progress.cxx | 2 +- sfx2/source/bastyp/sfxresid.cxx | 20 +- sfx2/source/control/emojiview.cxx | 2 +- sfx2/source/control/emojiviewitem.cxx | 2 +- sfx2/source/control/msgpool.cxx | 69 +- sfx2/source/control/recentdocsview.cxx | 4 +- sfx2/source/control/recentdocsviewitem.cxx | 2 +- sfx2/source/control/templatedefaultview.cxx | 2 +- sfx2/source/control/templatelocalview.cxx | 4 +- sfx2/source/control/templatesearchview.cxx | 2 +- sfx2/source/control/templateview.hrc | 13 - sfx2/source/control/templateview.src | 22 - sfx2/source/control/templateviewitem.cxx | 2 +- sfx2/source/dialog/basedlgs.cxx | 4 +- sfx2/source/dialog/dialog.hrc | 59 - sfx2/source/dialog/dialog.src | 83 - sfx2/source/dialog/dinfdlg.cxx | 23 +- sfx2/source/dialog/dinfdlg.hrc | 42 - sfx2/source/dialog/dinfdlg.src | 101 - sfx2/source/dialog/filedlghelper.cxx | 4 +- sfx2/source/dialog/filedlghelper.src | 65 - sfx2/source/dialog/filtergrouping.cxx | 1 + sfx2/source/dialog/mailmodel.cxx | 2 +- sfx2/source/dialog/mgetempl.cxx | 4 +- sfx2/source/dialog/navigat.cxx | 3 +- sfx2/source/dialog/newstyle.cxx | 2 +- sfx2/source/dialog/newstyle.src | 28 - sfx2/source/dialog/passwd.cxx | 2 +- sfx2/source/dialog/recfloat.cxx | 2 +- sfx2/source/dialog/recfloat.src | 33 - sfx2/source/dialog/securitypage.cxx | 2 +- sfx2/source/dialog/splitwin.cxx | 2 +- sfx2/source/dialog/srchdlg.cxx | 2 +- sfx2/source/dialog/styfitem.cxx | 13 +- sfx2/source/dialog/styledlg.cxx | 2 +- sfx2/source/dialog/tabdlg.cxx | 2 +- sfx2/source/dialog/taskpane.src | 33 - sfx2/source/dialog/templdlg.cxx | 2 +- sfx2/source/dialog/titledockwin.cxx | 2 +- sfx2/source/dialog/tplcitem.cxx | 2 +- sfx2/source/dialog/versdlg.cxx | 2 +- sfx2/source/dialog/versdlg.src | 32 - sfx2/source/doc/doc.src | 272 - sfx2/source/doc/docfac.cxx | 2 +- sfx2/source/doc/docfile.cxx | 3 +- sfx2/source/doc/doctempl.cxx | 32 +- sfx2/source/doc/doctempl.src | 68 - sfx2/source/doc/doctemplates.cxx | 35 +- sfx2/source/doc/doctemplateslocal.hxx | 2 + sfx2/source/doc/graphhelp.cxx | 2 +- sfx2/source/doc/guisaveas.cxx | 5 +- sfx2/source/doc/new.cxx | 3 +- sfx2/source/doc/objcont.cxx | 6 +- sfx2/source/doc/objmisc.cxx | 4 +- sfx2/source/doc/objserv.cxx | 6 +- sfx2/source/doc/objstor.cxx | 16 +- sfx2/source/doc/objxtor.cxx | 6 +- sfx2/source/doc/querytemplate.cxx | 2 +- sfx2/source/doc/saveastemplatedlg.cxx | 2 +- sfx2/source/doc/sfxbasemodel.cxx | 3 +- sfx2/source/doc/templatedlg.cxx | 2 +- sfx2/source/doc/templatelocnames.src | 62 - sfx2/source/inc/appdata.hxx | 5 +- sfx2/source/inc/sfxlocal.hrc | 44 - sfx2/source/inc/sfxtypes.hxx | 2 - sfx2/source/inc/templdgi.hxx | 2 +- sfx2/source/notify/eventsupplier.cxx | 2 +- sfx2/source/sidebar/DeckTitleBar.cxx | 3 +- sfx2/source/sidebar/PanelTitleBar.cxx | 4 +- sfx2/source/sidebar/Sidebar.hrc | 28 - sfx2/source/sidebar/Sidebar.src | 51 - sfx2/source/sidebar/SidebarController.cxx | 3 +- sfx2/source/sidebar/TabBar.cxx | 2 +- sfx2/source/view/classificationcontroller.cxx | 1 + sfx2/source/view/classificationhelper.cxx | 1 + sfx2/source/view/ipclient.cxx | 2 +- sfx2/source/view/printer.cxx | 1 - sfx2/source/view/sfxbasecontroller.cxx | 1 + sfx2/source/view/view.hrc | 40 - sfx2/source/view/view.src | 165 - sfx2/source/view/viewfrm.cxx | 5 +- sfx2/source/view/viewprn.cxx | 2 +- sfx2/source/view/viewsh.cxx | 3 +- sfx2/uiconfig/ui/alienwarndialog.ui | 14 +- sfx2/uiconfig/ui/bookmarkdialog.ui | 8 +- sfx2/uiconfig/ui/bookmarkmenu.ui | 8 +- sfx2/uiconfig/ui/charmapcontrol.ui | 4 +- sfx2/uiconfig/ui/checkin.ui | 8 +- sfx2/uiconfig/ui/cmisinfopage.ui | 8 +- sfx2/uiconfig/ui/cmisline.ui | 8 +- sfx2/uiconfig/ui/custominfopage.ui | 10 +- sfx2/uiconfig/ui/descriptioninfopage.ui | 10 +- sfx2/uiconfig/ui/documentfontspage.ui | 6 +- sfx2/uiconfig/ui/documentinfopage.ui | 36 +- sfx2/uiconfig/ui/documentpropertiesdialog.ui | 14 +- sfx2/uiconfig/ui/editdocumentdialog.ui | 12 +- sfx2/uiconfig/ui/editdurationdialog.ui | 22 +- sfx2/uiconfig/ui/emojicontrol.ui | 2 +- sfx2/uiconfig/ui/errorfindemaildialog.ui | 8 +- sfx2/uiconfig/ui/floatingrecord.ui | 4 +- sfx2/uiconfig/ui/helpbookmarkpage.ui | 6 +- sfx2/uiconfig/ui/helpcontentpage.ui | 2 +- sfx2/uiconfig/ui/helpcontrol.ui | 10 +- sfx2/uiconfig/ui/helpindexpage.ui | 6 +- sfx2/uiconfig/ui/helpmanual.ui | 10 +- sfx2/uiconfig/ui/helpsearchpage.ui | 10 +- sfx2/uiconfig/ui/inputdialog.ui | 4 +- sfx2/uiconfig/ui/licensedialog.ui | 8 +- sfx2/uiconfig/ui/linkeditdialog.ui | 10 +- sfx2/uiconfig/ui/loadtemplatedialog.ui | 24 +- sfx2/uiconfig/ui/managestylepage.ui | 20 +- sfx2/uiconfig/ui/newstyle.ui | 8 +- sfx2/uiconfig/ui/notebookbar.ui | 4 +- sfx2/uiconfig/ui/notebookbarpopup.ui | 2 +- sfx2/uiconfig/ui/optprintpage.ui | 56 +- sfx2/uiconfig/ui/password.ui | 20 +- sfx2/uiconfig/ui/printeroptionsdialog.ui | 4 +- sfx2/uiconfig/ui/querysavedialog.ui | 10 +- sfx2/uiconfig/ui/safemodequerydialog.ui | 8 +- sfx2/uiconfig/ui/saveastemplatedlg.ui | 12 +- sfx2/uiconfig/ui/searchdialog.ui | 16 +- sfx2/uiconfig/ui/securityinfopage.ui | 12 +- sfx2/uiconfig/ui/singletabdialog.ui | 2 +- sfx2/uiconfig/ui/startcenter.ui | 46 +- sfx2/uiconfig/ui/stylecontextmenu.ui | 12 +- sfx2/uiconfig/ui/templatecategorydlg.ui | 10 +- sfx2/uiconfig/ui/templatedlg.ui | 46 +- sfx2/uiconfig/ui/versioncommentdialog.ui | 8 +- sfx2/uiconfig/ui/versionscmis.ui | 14 +- sfx2/uiconfig/ui/versionsofdialog.ui | 22 +- slideshow/inc/pch/precompiled_slideshow.hxx | 2 - solenv/bin/hrcex | 35 + solenv/bin/uiex | 35 + solenv/bin/uilangfilter.xslt | 63 - solenv/doc/gbuild/solenv/gbuild/alllangres.mk | 108 - solenv/doc/gbuild/solenv/gbuild/types.mk | 9 - solenv/gbuild/AllLangMoTarget.mk | 105 + solenv/gbuild/AllLangResTarget.mk | 346 -- solenv/gbuild/CppunitTest.mk | 1 + solenv/gbuild/Helper.mk | 5 +- solenv/gbuild/Library.mk | 1 - solenv/gbuild/LinkTarget.mk | 11 - solenv/gbuild/Module.mk | 7 +- solenv/gbuild/TargetLocations.mk | 8 +- solenv/gbuild/UIConfig.mk | 144 - solenv/gbuild/extensions/post_GbuildToJson.mk | 1 - solenv/gbuild/extensions/post_PackageInfo.mk | 7 +- solenv/gbuild/extensions/pre_BuildTools.mk | 3 - solenv/gbuild/gbuild.help.txt | 2 +- solenv/gbuild/gbuild.mk | 2 +- solenv/qa/python/gbuildtojson.py | 2 +- starmath/AllLangMoTarget_sm.mk | 13 + starmath/AllLangResTarget_sm.mk | 32 - starmath/Library_sm.mk | 3 - starmath/Module_starmath.mk | 4 +- starmath/inc/ElementsDockingWindow.hxx | 26 +- starmath/inc/pch/precompiled_sm.hxx | 2 - starmath/inc/smmod.hrc | 92 + starmath/inc/smmod.hxx | 14 +- starmath/inc/starmath.hrc | 336 -- starmath/inc/strings.hrc | 341 ++ starmath/qa/cppunit/test_starmath.cxx | 1 + starmath/source/ElementsDockingWindow.cxx | 249 +- starmath/source/accessibility.cxx | 2 + starmath/source/action.cxx | 2 +- starmath/source/cfgitem.cxx | 1 + starmath/source/commands.src | 1062 ---- starmath/source/dialog.cxx | 12 +- starmath/source/document.cxx | 1 + starmath/source/edit.cxx | 3 +- starmath/source/mathmlexport.cxx | 1 + starmath/source/mathmlimport.cxx | 1 + starmath/source/parse.cxx | 34 +- starmath/source/smdll.cxx | 1 + starmath/source/smmod.cxx | 59 +- starmath/source/smres.src | 267 - starmath/source/symbol.cxx | 2 +- starmath/source/symbol.src | 187 - starmath/source/uiobject.cxx | 2 +- starmath/source/unomodel.cxx | 1 + starmath/source/utility.cxx | 2 +- starmath/source/view.cxx | 1 + starmath/uiconfig/smath/ui/alignmentdialog.ui | 14 +- starmath/uiconfig/smath/ui/catalogdialog.ui | 14 +- starmath/uiconfig/smath/ui/dockingelements.ui | 4 +- starmath/uiconfig/smath/ui/fontdialog.ui | 12 +- starmath/uiconfig/smath/ui/fontsizedialog.ui | 20 +- starmath/uiconfig/smath/ui/fonttypedialog.ui | 40 +- starmath/uiconfig/smath/ui/printeroptions.ui | 18 +- .../uiconfig/smath/ui/savedefaultsdialog.ui | 8 +- starmath/uiconfig/smath/ui/smathsettings.ui | 26 +- starmath/uiconfig/smath/ui/spacingdialog.ui | 100 +- starmath/uiconfig/smath/ui/symdefinedialog.ui | 20 +- svl/AllLangMoTarget_svl.mk | 11 + svl/AllLangResTarget_svl.mk | 32 - svl/Module_svl.mk | 2 +- svl/source/misc/getstringresource.cxx | 24 +- svl/source/misc/getstringresource.hxx | 3 +- svl/source/misc/inettype.cxx | 10 +- svl/source/misc/mediatyp.src | 369 -- svtools/AllLangMoTarget_svt.mk | 13 + svtools/AllLangResTarget_svt.mk | 59 - svtools/Library_svt.mk | 3 - svtools/Module_svtools.mk | 4 +- svtools/inc/errtxt.hrc | 158 + svtools/inc/langtab.hrc | 412 ++ svtools/inc/pch/precompiled_svt.hxx | 3 - svtools/inc/strings.hxx | 13 +- svtools/{source/contnr => inc}/templwin.hrc | 25 +- svtools/source/brwbox/editbrowsebox.cxx | 3 +- svtools/source/contnr/DocumentInfoPreview.cxx | 11 +- svtools/source/contnr/fileview.cxx | 2 +- svtools/source/contnr/fileview.src | 65 - svtools/source/contnr/svcontnr.src | 49 - svtools/source/contnr/svimpbox.cxx | 2 +- svtools/source/contnr/svtabbx.cxx | 2 +- svtools/source/contnr/templwin.cxx | 26 +- svtools/source/contnr/templwin.hxx | 9 +- svtools/source/contnr/templwin.src | 44 - svtools/source/control/calendar.cxx | 2 +- svtools/source/control/calendar.src | 38 - svtools/source/control/collatorres.cxx | 2 +- svtools/source/control/ctrlbox.cxx | 2 +- svtools/source/control/ctrlbox.src | 151 - svtools/source/control/ctrltool.cxx | 2 +- svtools/source/control/ctrltool.src | 146 - svtools/source/control/filectrl.cxx | 2 +- svtools/source/control/filectrl.src | 47 - svtools/source/control/indexentryres.cxx | 2 +- svtools/source/control/ruler.cxx | 2 +- svtools/source/control/ruler.src | 30 - svtools/source/control/tabbar.cxx | 3 +- svtools/source/dialogs/PlaceEditDialog.cxx | 2 +- svtools/source/dialogs/addresstemplate.cxx | 2 +- svtools/source/dialogs/addresstemplate.src | 153 - svtools/source/dialogs/filedlg2.src | 41 - svtools/source/dialogs/formats.src | 291 - svtools/source/dialogs/insdlg.cxx | 14 +- svtools/source/dialogs/prnsetup.cxx | 6 +- svtools/source/dialogs/roadmapwizard.cxx | 2 +- svtools/source/dialogs/so3res.src | 74 - svtools/source/dialogs/wizardmachine.cxx | 2 +- svtools/source/dialogs/wizardmachine.src | 42 - svtools/source/filter/exportdialog.cxx | 2 +- svtools/source/graphic/provider.cxx | 2 - svtools/source/graphic/transformer.cxx | 2 - svtools/source/inc/filectrl.hrc | 33 - svtools/source/java/javaerror.src | 67 - .../source/java/javainteractionhandler.cxx | 4 +- svtools/source/misc/ehdl.cxx | 136 +- svtools/source/misc/embedhlp.cxx | 2 +- svtools/source/misc/errtxt.src | 132 - svtools/source/misc/imagemgr.cxx | 90 +- svtools/source/misc/imagemgr.hrc | 71 - svtools/source/misc/imagemgr.src | 310 -- svtools/source/misc/langtab.cxx | 70 +- svtools/source/misc/langtab.src | 409 -- svtools/source/misc/svtools.src | 168 - svtools/source/misc/svtresid.cxx | 23 +- svtools/source/misc/undo.src | 35 - .../uiconfig/ui/GraphicExportOptionsDialog.ui | 18 +- svtools/uiconfig/ui/addresstemplatedialog.ui | 14 +- svtools/uiconfig/ui/fileviewmenu.ui | 6 +- svtools/uiconfig/ui/graphicexport.ui | 78 +- svtools/uiconfig/ui/javadisableddialog.ui | 6 +- svtools/uiconfig/ui/placeedit.ui | 34 +- svtools/uiconfig/ui/printersetupdialog.ui | 20 +- svtools/uiconfig/ui/querydeletedialog.ui | 14 +- svtools/uiconfig/ui/restartdialog.ui | 32 +- svtools/uiconfig/ui/wizarddialog.ui | 2 +- svx/AllLangMoTarget_svx.mk | 11 + svx/AllLangResTarget_gal.mk | 39 - svx/AllLangResTarget_svx.mk | 80 - svx/Library_svxcore.mk | 3 - svx/Module_svx.mk | 5 +- svx/inc/accessibility.hrc | 74 - svx/inc/fieldunit.hrc | 45 + svx/inc/fmstring.hrc | 55 + svx/inc/frmsel.hrc | 55 + svx/inc/gallery.hrc | 36 - svx/inc/galtheme.hrc | 80 - svx/inc/numberingtype.hrc | 61 + svx/inc/page.hrc | 99 + svx/inc/pch/precompiled_svx.hxx | 1 - svx/inc/pch/precompiled_svxcore.hxx | 3 - svx/inc/samecontent.hrc | 26 + svx/inc/spacing.hrc | 30 + svx/inc/strings.hxx | 218 +- svx/inc/svdglob.hxx | 7 +- svx/inc/svxerr.hrc | 96 + svx/inc/swframeposstrings.hrc | 74 + .../inc/tabwin.hrc | 14 +- svx/inc/txenctab.hrc | 114 + svx/inc/ucsubsetstruct.hrc | 312 ++ .../accessibility/AccessibleControlShape.cxx | 2 +- .../accessibility/AccessibleFrameSelector.cxx | 9 +- svx/source/accessibility/AccessibleShape.cxx | 3 +- .../accessibility/DescriptionGenerator.cxx | 11 +- .../GraphCtlAccessibleContext.cxx | 3 +- svx/source/accessibility/ShapeTypeHandler.cxx | 65 +- svx/source/accessibility/accessibility.src | 193 - svx/source/accessibility/charmapacc.cxx | 2 +- .../svxpixelctlaccessiblecontext.cxx | 3 +- .../svxrectctaccessiblecontext.cxx | 11 +- svx/source/core/graphichelper.cxx | 2 +- svx/source/core/graphichelper.src | 36 - svx/source/dialog/SafeModeDialog.cxx | 2 +- svx/source/dialog/_bmpmask.cxx | 3 +- svx/source/dialog/_contdlg.cxx | 2 +- svx/source/dialog/bmpmask.hrc | 22 - svx/source/dialog/bmpmask.src | 30 - svx/source/dialog/charmap.cxx | 560 +- svx/source/dialog/checklbx.cxx | 2 +- svx/source/dialog/compressgraphicdialog.cxx | 3 +- svx/source/dialog/compressgraphicdialog.hrc | 34 - svx/source/dialog/compressgraphicdialog.src | 87 - svx/source/dialog/contwnd.cxx | 2 +- svx/source/dialog/ctredlin.cxx | 2 +- svx/source/dialog/databaseregistrationui.cxx | 1 + svx/source/dialog/dialcontrol.cxx | 3 +- svx/source/dialog/dialmgr.cxx | 15 +- svx/source/dialog/dlgctl3d.cxx | 2 +- svx/source/dialog/dlgctrl.cxx | 3 +- svx/source/dialog/dlgctrl.src | 27 - svx/source/dialog/docrecovery.cxx | 20 +- svx/source/dialog/docrecovery.src | 28 - svx/source/dialog/fntctrl.cxx | 3 +- svx/source/dialog/fontwork.cxx | 3 +- svx/source/dialog/frmsel.cxx | 4 +- svx/source/dialog/frmsel.src | 54 - svx/source/dialog/grfflt.cxx | 3 +- svx/source/dialog/hdft.cxx | 2 +- svx/source/dialog/imapdlg.cxx | 2 +- svx/source/dialog/imapwnd.cxx | 2 +- svx/source/dialog/langbox.cxx | 2 +- svx/source/dialog/language.src | 29 - svx/source/dialog/numberingtype.src | 57 - svx/source/dialog/optgrid.cxx | 2 +- svx/source/dialog/page.src | 99 - svx/source/dialog/pagenumberlistbox.cxx | 13 +- svx/source/dialog/papersizelistbox.cxx | 16 +- svx/source/dialog/passwd.cxx | 2 +- svx/source/dialog/passwd.src | 32 - svx/source/dialog/prtqry.cxx | 2 +- svx/source/dialog/prtqry.src | 39 - svx/source/dialog/rlrcitem.cxx | 3 +- svx/source/dialog/rubydialog.cxx | 2 +- svx/source/dialog/ruler.src | 38 - svx/source/dialog/rulritem.cxx | 3 +- svx/source/dialog/samecontent.src | 12 - svx/source/dialog/samecontentlistbox.cxx | 13 +- svx/source/dialog/sdstring.src | 2288 -------- svx/source/dialog/spacing.src | 16 - svx/source/dialog/spacinglistbox.cxx | 13 +- svx/source/dialog/srchdlg.cxx | 11 +- svx/source/dialog/strarray.cxx | 92 +- svx/source/dialog/svxbmpnumvalueset.cxx | 44 +- svx/source/dialog/svxbmpnumvalueset.src | 121 - svx/source/dialog/svxruler.cxx | 14 +- svx/source/dialog/swframeposstrings.cxx | 18 +- svx/source/dialog/swframeposstrings.src | 71 - svx/source/dialog/txencbox.cxx | 21 +- svx/source/dialog/txenctab.cxx | 34 +- svx/source/dialog/txenctab.src | 110 - svx/source/dialog/ucsubset.src | 308 -- svx/source/engine3d/cube3d.cxx | 2 +- svx/source/engine3d/dragmt3d.cxx | 2 +- svx/source/engine3d/extrud3d.cxx | 2 +- svx/source/engine3d/float3d.cxx | 2 +- svx/source/engine3d/float3d.src | 44 - svx/source/engine3d/lathe3d.cxx | 2 +- svx/source/engine3d/obj3d.cxx | 2 +- svx/source/engine3d/scene3d.cxx | 2 +- svx/source/engine3d/sphere3d.cxx | 2 +- svx/source/engine3d/string3d.src | 44 - svx/source/engine3d/view3d.cxx | 2 +- svx/source/engine3d/view3d1.cxx | 2 +- svx/source/fmcomp/fmgridcl.cxx | 3 +- svx/source/fmcomp/gridcell.cxx | 2 +- svx/source/fmcomp/gridctrl.cxx | 3 +- svx/source/form/ParseContext.cxx | 10 +- svx/source/form/databaselocationinput.cxx | 2 +- svx/source/form/datanavi.cxx | 50 +- svx/source/form/datanavi.src | 209 - svx/source/form/filtnav.cxx | 2 +- svx/source/form/fmPropBrw.cxx | 54 +- svx/source/form/fmexpl.cxx | 2 +- svx/source/form/fmobj.cxx | 1 - svx/source/form/fmobjfac.cxx | 2 - svx/source/form/fmpage.cxx | 1 - svx/source/form/fmpgeimp.cxx | 3 +- svx/source/form/fmshell.cxx | 3 +- svx/source/form/fmshimp.cxx | 3 +- svx/source/form/fmsrcimp.cxx | 1 - svx/source/form/fmstring.src | 366 -- svx/source/form/fmtextcontroldialogs.cxx | 1 + svx/source/form/fmtextcontrolshell.cxx | 1 - svx/source/form/fmundo.cxx | 2 +- svx/source/form/fmvwimp.cxx | 2 +- svx/source/form/formcontrolfactory.cxx | 68 +- svx/source/form/formcontroller.cxx | 2 +- svx/source/form/navigatortree.cxx | 3 +- svx/source/form/navigatortreemodel.cxx | 2 +- svx/source/form/tabwin.cxx | 11 +- svx/source/form/tbxform.cxx | 4 +- svx/source/gallery2/GalleryControl.cxx | 2 +- svx/source/gallery2/galbrws1.cxx | 8 +- svx/source/gallery2/galbrws2.cxx | 9 +- svx/source/gallery2/galctrl.cxx | 5 +- svx/source/gallery2/gallery.src | 49 - svx/source/gallery2/gallery1.cxx | 138 +- svx/source/gallery2/galmisc.cxx | 18 +- svx/source/gallery2/galobj.cxx | 31 +- svx/source/gallery2/galtheme.cxx | 9 +- svx/source/gallery2/galtheme.src | 207 - svx/source/inc/AccessibleFrameSelector.hxx | 4 - svx/source/inc/datanavi.hxx | 3 +- svx/source/inc/docrecovery.hxx | 2 +- svx/source/items/algitem.cxx | 11 +- svx/source/items/pageitem.cxx | 22 +- svx/source/items/postattr.cxx | 2 +- svx/source/items/svxerr.cxx | 17 +- svx/source/items/svxerr.src | 98 - svx/source/items/svxitems.src | 192 - .../sdr/contact/viewcontactofgraphic.cxx | 2 +- .../sdr/contact/viewcontactofsdrpage.cxx | 2 +- svx/source/sidebar/EmptyPanel.cxx | 2 +- svx/source/sidebar/area/AreaPropertyPanel.cxx | 3 +- .../sidebar/area/AreaPropertyPanelBase.cxx | 3 +- .../sidebar/graphic/GraphicPropertyPanel.cxx | 3 +- svx/source/sidebar/line/LinePropertyPanel.cxx | 3 +- .../sidebar/line/LinePropertyPanelBase.cxx | 3 +- svx/source/sidebar/line/LineWidthPopup.cxx | 2 +- svx/source/sidebar/nbdtmg.cxx | 36 +- .../sidebar/paragraph/ParaPropertyPanel.cxx | 2 +- .../sidebar/possize/PosSizePropertyPanel.cxx | 3 +- .../sidebar/shadow/ShadowPropertyPanel.cxx | 3 +- .../text/TextCharacterSpacingControl.cxx | 2 +- .../sidebar/text/TextUnderlineControl.cxx | 2 +- .../sidebar/tools/ValueSetWithTextControl.cxx | 2 +- svx/source/stbctrls/insctrl.cxx | 2 +- svx/source/stbctrls/modctrl.cxx | 6 +- svx/source/stbctrls/pszctrl.cxx | 3 +- svx/source/stbctrls/selctrl.cxx | 2 +- svx/source/stbctrls/stbctrls.src | 153 - svx/source/stbctrls/xmlsecctrl.cxx | 14 +- svx/source/stbctrls/zoomctrl.cxx | 2 +- svx/source/stbctrls/zoomsliderctrl.cxx | 2 +- .../svdraw/ActionDescriptionProvider.cxx | 26 +- svx/source/svdraw/svdattr.cxx | 406 +- svx/source/svdraw/svddrgmt.cxx | 8 +- svx/source/svdraw/svddrgv.cxx | 2 +- svx/source/svdraw/svdedtv.cxx | 2 +- svx/source/svdraw/svdedtv1.cxx | 2 +- svx/source/svdraw/svdedtv2.cxx | 24 +- svx/source/svdraw/svdedxv.cxx | 2 +- svx/source/svdraw/svdetc.cxx | 28 +- svx/source/svdraw/svdglev.cxx | 2 +- svx/source/svdraw/svdhdl.cxx | 2 +- svx/source/svdraw/svdlayer.cxx | 2 +- svx/source/svdraw/svdmark.cxx | 2 +- svx/source/svdraw/svdmodel.cxx | 2 +- svx/source/svdraw/svdmrkv.cxx | 6 +- svx/source/svdraw/svdoashp.cxx | 2 +- svx/source/svdraw/svdobj.cxx | 6 +- svx/source/svdraw/svdocapt.cxx | 2 +- svx/source/svdraw/svdocirc.cxx | 42 +- svx/source/svdraw/svdoedge.cxx | 2 +- svx/source/svdraw/svdograf.cxx | 10 +- svx/source/svdraw/svdogrp.cxx | 2 +- svx/source/svdraw/svdomeas.cxx | 2 +- svx/source/svdraw/svdomedia.cxx | 2 +- svx/source/svdraw/svdoole2.cxx | 2 +- svx/source/svdraw/svdopage.cxx | 2 +- svx/source/svdraw/svdopath.cxx | 26 +- svx/source/svdraw/svdorect.cxx | 35 +- svx/source/svdraw/svdotext.cxx | 2 +- svx/source/svdraw/svdotxdr.cxx | 2 +- svx/source/svdraw/svdouno.cxx | 2 +- svx/source/svdraw/svdpoev.cxx | 2 +- svx/source/svdraw/svdstr.src | 2304 -------- svx/source/svdraw/svdundo.cxx | 14 +- svx/source/svdraw/svdview.cxx | 2 +- svx/source/svdraw/svdxcgv.cxx | 2 +- svx/source/table/cellcursor.cxx | 2 +- svx/source/table/svdotable.cxx | 2 +- svx/source/table/table.src | 27 - svx/source/table/tablecontroller.cxx | 2 +- svx/source/table/tabledesign.cxx | 2 +- svx/source/table/tablelayouter.cxx | 2 +- svx/source/table/tablemodel.cxx | 2 +- svx/source/tbxctrls/PaletteManager.cxx | 3 +- svx/source/tbxctrls/SvxColorChildWindow.cxx | 2 +- svx/source/tbxctrls/SvxPresetListBox.cxx | 2 +- svx/source/tbxctrls/bulletsnumbering.cxx | 2 +- svx/source/tbxctrls/colrctrl.cxx | 3 +- svx/source/tbxctrls/colrctrl.src | 28 - svx/source/tbxctrls/extrusioncontrols.cxx | 50 +- svx/source/tbxctrls/extrusioncontrols.hrc | 42 - svx/source/tbxctrls/extrusioncontrols.hxx | 20 + svx/source/tbxctrls/extrusioncontrols.src | 172 - svx/source/tbxctrls/fillctrl.cxx | 3 +- svx/source/tbxctrls/fontworkgallery.cxx | 2 +- svx/source/tbxctrls/fontworkgallery.src | 83 - svx/source/tbxctrls/grafctrl.cxx | 5 +- svx/source/tbxctrls/grafctrl.src | 59 - svx/source/tbxctrls/itemwin.cxx | 3 +- svx/source/tbxctrls/layctrl.cxx | 3 +- svx/source/tbxctrls/lboxctrl.cxx | 13 +- svx/source/tbxctrls/lboxctrl.src | 43 - svx/source/tbxctrls/linectrl.cxx | 3 +- svx/source/tbxctrls/tbcontrl.cxx | 8 +- svx/source/tbxctrls/tbcontrl.src | 109 - .../tbxctrls/tbunosearchcontrollers.cxx | 2 +- .../tbxctrls/tbunosearchcontrollers.src | 37 - svx/source/tbxctrls/tbxdrctl.cxx | 2 +- svx/source/tbxctrls/verttexttbxctrl.cxx | 3 +- svx/source/toolbars/extrusionbar.cxx | 55 +- svx/source/toolbars/extrusionbar.src | 77 - svx/source/toolbars/fontworkbar.cxx | 22 +- svx/source/toolbars/fontworkbar.src | 47 - svx/source/unodraw/unopage.cxx | 2 +- svx/source/unodraw/unoprov.cxx | 449 +- svx/source/unodraw/unoshap4.cxx | 2 +- svx/source/unodraw/unoshape.cxx | 4 +- svx/source/xoutdev/xattr.cxx | 46 +- svx/source/xoutdev/xattr2.cxx | 31 +- svx/source/xoutdev/xattrbmp.cxx | 2 +- svx/source/xoutdev/xtabbtmp.cxx | 2 +- svx/source/xoutdev/xtabcolr.cxx | 2 +- svx/source/xoutdev/xtabdash.cxx | 2 +- svx/source/xoutdev/xtabgrdt.cxx | 2 +- svx/source/xoutdev/xtabhtch.cxx | 2 +- svx/source/xoutdev/xtablend.cxx | 2 +- svx/source/xoutdev/xtabptrn.cxx | 2 +- svx/uiconfig/ui/acceptrejectchangesdialog.ui | 40 +- svx/uiconfig/ui/addconditiondialog.ui | 10 +- svx/uiconfig/ui/adddataitemdialog.ui | 34 +- svx/uiconfig/ui/addinstancedialog.ui | 14 +- svx/uiconfig/ui/addmodeldialog.ui | 10 +- svx/uiconfig/ui/addnamespacedialog.ui | 10 +- svx/uiconfig/ui/addsubmissiondialog.ui | 18 +- svx/uiconfig/ui/asianphoneticguidedialog.ui | 44 +- svx/uiconfig/ui/cellmenu.ui | 4 +- svx/uiconfig/ui/chineseconversiondialog.ui | 16 +- svx/uiconfig/ui/chinesedictionary.ui | 48 +- svx/uiconfig/ui/colorwindow.ui | 8 +- svx/uiconfig/ui/colsmenu.ui | 62 +- svx/uiconfig/ui/compressgraphicdialog.ui | 52 +- svx/uiconfig/ui/convertmenu.ui | 42 +- svx/uiconfig/ui/crashreportdlg.ui | 18 +- svx/uiconfig/ui/datanavigator.ui | 26 +- svx/uiconfig/ui/defaultshapespanel.ui | 22 +- svx/uiconfig/ui/deletefooterdialog.ui | 8 +- svx/uiconfig/ui/deleteheaderdialog.ui | 8 +- svx/uiconfig/ui/docking3deffects.ui | 174 +- svx/uiconfig/ui/dockingcolorreplace.ui | 42 +- svx/uiconfig/ui/dockingfontwork.ui | 44 +- svx/uiconfig/ui/docrecoverybrokendialog.ui | 14 +- svx/uiconfig/ui/docrecoveryprogressdialog.ui | 6 +- svx/uiconfig/ui/docrecoveryrecoverdialog.ui | 16 +- svx/uiconfig/ui/docrecoverysavedialog.ui | 8 +- svx/uiconfig/ui/extrustiondepthdialog.ui | 8 +- svx/uiconfig/ui/filtermenu.ui | 10 +- svx/uiconfig/ui/findreplacedialog.ui | 80 +- svx/uiconfig/ui/floatingareastyle.ui | 30 +- svx/uiconfig/ui/floatingcontour.ui | 34 +- svx/uiconfig/ui/floatinglineproperty.ui | 4 +- svx/uiconfig/ui/floatingundoredo.ui | 2 +- svx/uiconfig/ui/fontworkgallerydialog.ui | 6 +- svx/uiconfig/ui/fontworkspacingdialog.ui | 6 +- svx/uiconfig/ui/formdatamenu.ui | 12 +- svx/uiconfig/ui/formlinkwarndialog.ui | 8 +- svx/uiconfig/ui/formnavimenu.ui | 28 +- svx/uiconfig/ui/functionmenu.ui | 18 +- svx/uiconfig/ui/gallerymenu1.ui | 12 +- svx/uiconfig/ui/gallerymenu2.ui | 16 +- svx/uiconfig/ui/headfootformatpage.ui | 30 +- svx/uiconfig/ui/imapdialog.ui | 46 +- svx/uiconfig/ui/imapmenu.ui | 22 +- svx/uiconfig/ui/linkwarndialog.ui | 14 +- svx/uiconfig/ui/mediaplayback.ui | 10 +- svx/uiconfig/ui/namespacedialog.ui | 14 +- svx/uiconfig/ui/optgridpage.ui | 48 +- svx/uiconfig/ui/paralinespacingcontrol.ui | 32 +- svx/uiconfig/ui/paralrspacing.ui | 8 +- svx/uiconfig/ui/paraulspacing.ui | 6 +- svx/uiconfig/ui/passwd.ui | 14 +- svx/uiconfig/ui/presetmenu.ui | 6 +- svx/uiconfig/ui/profileexporteddialog.ui | 8 +- svx/uiconfig/ui/querydeletecontourdialog.ui | 8 +- svx/uiconfig/ui/querydeleteobjectdialog.ui | 6 +- svx/uiconfig/ui/querydeletethemedialog.ui | 6 +- .../ui/querymodifyimagemapchangesdialog.ui | 8 +- svx/uiconfig/ui/querynewcontourdialog.ui | 6 +- svx/uiconfig/ui/querysavecontchangesdialog.ui | 8 +- .../ui/querysaveimagemapchangesdialog.ui | 8 +- svx/uiconfig/ui/queryunlinkgraphicsdialog.ui | 8 +- svx/uiconfig/ui/redlinecontrol.ui | 6 +- svx/uiconfig/ui/redlinefilterpage.ui | 50 +- svx/uiconfig/ui/redlineviewpage.ui | 14 +- svx/uiconfig/ui/rowsmenu.ui | 8 +- svx/uiconfig/ui/rulermenu.ui | 24 +- svx/uiconfig/ui/safemodedialog.ui | 50 +- svx/uiconfig/ui/savemodifieddialog.ui | 6 +- svx/uiconfig/ui/selectionmenu.ui | 10 +- svx/uiconfig/ui/sidebararea.ui | 74 +- svx/uiconfig/ui/sidebargraphic.ui | 40 +- svx/uiconfig/ui/sidebarline.ui | 56 +- svx/uiconfig/ui/sidebarparagraph.ui | 46 +- svx/uiconfig/ui/sidebarpossize.ui | 42 +- svx/uiconfig/ui/sidebarshadow.ui | 12 +- svx/uiconfig/ui/sidebarstylespanel.ui | 2 +- svx/uiconfig/ui/sidebartextpanel.ui | 2 +- svx/uiconfig/ui/stylemenu.ui | 6 +- .../ui/textcharacterspacingcontrol.ui | 18 +- svx/uiconfig/ui/textcontrolchardialog.ui | 10 +- svx/uiconfig/ui/textcontrolparadialog.ui | 12 +- svx/uiconfig/ui/textunderlinecontrol.ui | 26 +- svx/uiconfig/ui/xformspage.ui | 12 +- svx/uiconfig/ui/xmlsecstatmenu.ui | 4 +- svx/uiconfig/ui/zoommenu.ui | 18 +- sw/AllLangMoTarget_sw.mk | 11 + sw/AllLangResTarget_sw.mk | 109 - sw/Library_sw.mk | 3 - sw/Library_swui.mk | 1 - sw/Module_sw.mk | 12 +- sw/inc/access.hrc | 63 - sw/inc/app.hrc | 93 + sw/inc/chrdlg.hrc | 9 - sw/inc/cnttab.hrc | 44 + sw/inc/comcore.hrc | 50 - sw/inc/dbui.hrc | 74 +- sw/inc/dialog.hrc | 24 - sw/inc/dochdl.hrc | 45 - sw/inc/envelp.hrc | 55 - sw/inc/error.hrc | 74 + sw/inc/fldui.hrc | 146 - sw/inc/globals.hrc | 143 - sw/inc/index.hrc | 45 - sw/inc/mdiexp.hxx | 4 +- .../inc/mmaddressblockpage.hrc | 33 +- .../ui/dlg/parawin.src => sw/inc/optload.hrc | 24 +- sw/inc/pch/precompiled_msword.hxx | 3 - sw/inc/pch/precompiled_sw.hxx | 3 - sw/inc/pch/precompiled_swui.hxx | 3 - sw/inc/pch/precompiled_vbaswobj.hxx | 2 - sw/inc/poolfmt.hrc | 288 - sw/inc/statstr.hrc | 41 - sw/inc/strings.hrc | 1347 +++++ sw/inc/swtypes.hxx | 11 +- sw/inc/swundo.hxx | 2 + sw/inc/unocore.hrc | 43 - sw/inc/utlui.hrc | 53 + sw/qa/core/test_ToxLinkProcessor.cxx | 2 +- sw/sdi/swslots.hrc | 1 - sw/source/core/access/acccontext.cxx | 13 +- sw/source/core/access/acccontext.hxx | 6 +- sw/source/core/access/accdoc.cxx | 2 +- sw/source/core/access/accfootnote.cxx | 10 +- sw/source/core/access/accheaderfooter.cxx | 6 +- sw/source/core/access/accmap.cxx | 2 +- sw/source/core/access/accpage.cxx | 2 +- sw/source/core/access/accpara.cxx | 2 +- sw/source/core/access/accportions.cxx | 3 +- sw/source/core/access/accpreview.cxx | 2 +- sw/source/core/access/acctable.cxx | 2 +- sw/source/core/bastyp/init.cxx | 3 +- sw/source/core/crsr/crsrsh.cxx | 2 +- sw/source/core/crsr/findcoll.cxx | 3 +- sw/source/core/crsr/swcrsr.cxx | 2 +- sw/source/core/crsr/viscrs.cxx | 2 +- sw/source/core/doc/DocumentFieldsManager.cxx | 2 +- sw/source/core/doc/DocumentRedlineManager.cxx | 2 +- .../core/doc/DocumentStylePoolManager.cxx | 449 +- sw/source/core/doc/SwStyleNameMapper.cxx | 128 +- sw/source/core/doc/doc.cxx | 4 +- sw/source/core/doc/docdesc.cxx | 2 +- sw/source/core/doc/docedt.cxx | 2 +- sw/source/core/doc/docfld.cxx | 2 +- sw/source/core/doc/doclay.cxx | 24 +- sw/source/core/doc/docnum.cxx | 3 +- sw/source/core/doc/docredln.cxx | 18 +- sw/source/core/doc/notxtfrm.cxx | 16 +- sw/source/core/doc/poolfmt.cxx | 2 +- sw/source/core/doc/tblafmt.cxx | 1 - sw/source/core/docnode/ndsect.cxx | 5 +- sw/source/core/docnode/ndtbl.cxx | 5 +- sw/source/core/edit/autofmt.cxx | 2 +- sw/source/core/edit/eddel.cxx | 2 +- sw/source/core/edit/edlingu.cxx | 4 +- sw/source/core/edit/edtox.cxx | 2 +- sw/source/core/fields/authfld.cxx | 3 +- sw/source/core/fields/docufld.cxx | 2 +- sw/source/core/fields/fldbas.cxx | 2 +- sw/source/core/fields/reffld.cxx | 18 +- sw/source/core/fields/scrptfld.cxx | 3 +- sw/source/core/frmedt/feshview.cxx | 8 +- sw/source/core/inc/pagefrm.hrc | 27 - sw/source/core/layout/atrfrm.cxx | 2 +- sw/source/core/layout/pagedesc.cxx | 23 +- sw/source/core/layout/pagefrm.src | 17 - sw/source/core/layout/paintfrm.cxx | 3 +- sw/source/core/ole/ndole.cxx | 2 +- sw/source/core/swg/swblocks.cxx | 2 +- sw/source/core/tox/ToxLinkProcessor.cxx | 2 +- sw/source/core/tox/tox.cxx | 128 +- sw/source/core/tox/txmsrt.cxx | 7 +- sw/source/core/txtnode/fntcache.cxx | 2 +- sw/source/core/undo/SwUndoFmt.cxx | 4 +- sw/source/core/undo/SwUndoPageDesc.cxx | 3 +- sw/source/core/undo/docundo.cxx | 4 +- sw/source/core/undo/rolbck.cxx | 3 +- sw/source/core/undo/unbkmk.cxx | 2 +- sw/source/core/undo/undel.cxx | 2 +- sw/source/core/undo/undo.hrc | 151 - sw/source/core/undo/undo.src | 681 --- sw/source/core/undo/undobj.cxx | 174 +- sw/source/core/undo/unins.cxx | 2 +- sw/source/core/undo/unovwr.cxx | 3 +- sw/source/core/undo/unredln.cxx | 2 +- sw/source/core/undo/untbl.cxx | 2 +- sw/source/core/unocore/unochart.cxx | 2 +- sw/source/core/unocore/unocore.src | 67 - sw/source/core/unocore/unofield.cxx | 2 +- sw/source/core/unocore/unoidx.cxx | 2 +- sw/source/core/unocore/unoobj2.cxx | 2 +- sw/source/core/unocore/unosett.cxx | 18 +- sw/source/core/unocore/unostyle.cxx | 35 +- sw/source/core/view/pagepreviewlayout.cxx | 2 +- sw/source/core/view/printdata.cxx | 2 +- sw/source/core/view/viewimp.cxx | 2 +- sw/source/core/view/viewpg.cxx | 4 +- sw/source/core/view/viewsh.cxx | 4 +- sw/source/core/view/vprint.cxx | 2 +- sw/source/filter/ascii/parasc.cxx | 2 +- sw/source/filter/ascii/wrtasc.cxx | 2 +- sw/source/filter/html/swhtml.cxx | 2 +- sw/source/filter/html/wrthtml.cxx | 2 +- sw/source/filter/ww8/wrtww8.cxx | 2 +- sw/source/filter/ww8/ww8par.cxx | 2 +- sw/source/filter/xml/swxml.cxx | 5 +- sw/source/filter/xml/wrtxml.cxx | 3 +- sw/source/filter/xml/xmlimp.cxx | 2 +- sw/source/filter/xml/xmlitemi.cxx | 2 +- sw/source/ui/app/app.src | 577 -- sw/source/ui/app/error.src | 86 - sw/source/ui/chrdlg/break.cxx | 1 + sw/source/ui/chrdlg/chardlg.cxx | 1 + sw/source/ui/chrdlg/chrdlg.src | 31 - sw/source/ui/chrdlg/drpcps.cxx | 1 + sw/source/ui/chrdlg/numpara.cxx | 1 + sw/source/ui/chrdlg/pardlg.cxx | 2 +- sw/source/ui/config/config.hrc | 35 - sw/source/ui/config/mailconfigpage.cxx | 1 - sw/source/ui/config/optdlg.src | 167 - sw/source/ui/config/optload.cxx | 30 +- sw/source/ui/config/optload.src | 40 - sw/source/ui/config/optpage.cxx | 11 +- sw/source/ui/dbui/createaddresslistdialog.cxx | 9 +- sw/source/ui/dbui/dbinsdlg.cxx | 1 + sw/source/ui/dbui/dbui.src | 106 - sw/source/ui/dbui/mailmergewizard.cxx | 1 + sw/source/ui/dbui/mailmergewizard.src | 67 - sw/source/ui/dbui/mmaddressblockpage.cxx | 28 +- sw/source/ui/dbui/mmaddressblockpage.src | 113 - sw/source/ui/dbui/mmlayoutpage.cxx | 14 +- sw/source/ui/dbui/mmoutputtypepage.cxx | 1 + sw/source/ui/dbui/mmresultdialogs.cxx | 6 +- sw/source/ui/dbui/selectdbtabledialog.cxx | 1 + sw/source/ui/dbui/selectdbtabledialog.src | 43 - sw/source/ui/dialog/dialog.src | 30 - sw/source/ui/dialog/macassgn.cxx | 1 + sw/source/ui/dialog/swdlgfact.cxx | 4 +- sw/source/ui/dialog/swuiexp.cxx | 3 - sw/source/ui/dialog/uiregionsw.cxx | 3 +- sw/source/ui/dochdl/dochdl.src | 65 - sw/source/ui/dochdl/selglos.cxx | 2 +- sw/source/ui/docvw/access.src | 104 - sw/source/ui/docvw/annotation.src | 53 - sw/source/ui/envelp/envelp.src | 28 - sw/source/ui/envelp/label.src | 29 - sw/source/ui/envelp/label1.cxx | 8 +- sw/source/ui/envelp/labfmt.cxx | 5 +- sw/source/ui/envelp/labfmt.hrc | 46 - sw/source/ui/envelp/labfmt.src | 55 - sw/source/ui/envelp/mailmrge.cxx | 1 - sw/source/ui/fldui/changedb.cxx | 2 +- sw/source/ui/fldui/flddinf.cxx | 3 +- sw/source/ui/fldui/flddok.cxx | 13 +- sw/source/ui/fldui/fldfunc.cxx | 12 +- sw/source/ui/fldui/fldref.cxx | 43 +- sw/source/ui/fldui/fldui.src | 609 -- sw/source/ui/fldui/fldvar.cxx | 1 + sw/source/ui/fldui/javaedit.cxx | 1 + sw/source/ui/frmdlg/column.cxx | 5 +- sw/source/ui/frmdlg/cption.cxx | 1 + sw/source/ui/frmdlg/frmdlg.cxx | 3 +- sw/source/ui/frmdlg/frmpage.cxx | 25 +- sw/source/ui/frmdlg/frmui.src | 69 - sw/source/ui/frmdlg/pattern.cxx | 1 + sw/source/ui/frmdlg/uiborder.cxx | 1 + sw/source/ui/globdoc/globdoc.src | 31 - sw/source/ui/index/cntex.cxx | 4 +- sw/source/ui/index/cnttab.cxx | 100 +- sw/source/ui/index/cnttab.src | 186 - sw/source/ui/index/idxmrk.src | 40 - sw/source/ui/index/swuiidxmrk.cxx | 46 +- sw/source/ui/misc/bookmark.cxx | 1 + sw/source/ui/misc/glosbib.cxx | 1 + sw/source/ui/misc/glossary.cxx | 2 +- sw/source/ui/misc/glossary.src | 59 - sw/source/ui/misc/linenum.cxx | 2 +- sw/source/ui/misc/outline.cxx | 1 + sw/source/ui/misc/pgfnote.cxx | 1 + sw/source/ui/misc/srtdlg.cxx | 1 + sw/source/ui/misc/swmodalredlineacceptdlg.cxx | 2 +- sw/source/ui/misc/swruler.src | 27 - sw/source/ui/shells/shells.src | 157 - sw/source/ui/sidebar/PagePropertyPanel.src | 48 - sw/source/ui/table/convert.cxx | 1 + sw/source/ui/table/tabledlg.cxx | 2 +- sw/source/ui/table/tautofmt.cxx | 1 + sw/source/ui/utlui/poolfmt.src | 834 --- sw/source/ui/utlui/swrenamexnameddlg.cxx | 3 +- sw/source/ui/utlui/utlui.src | 253 - sw/source/ui/web/web.src | 36 - sw/source/uibase/app/appenv.cxx | 3 +- sw/source/uibase/app/apphdl.cxx | 2 +- sw/source/uibase/app/applab.cxx | 3 +- sw/source/uibase/app/docsh.cxx | 1 + sw/source/uibase/app/docsh2.cxx | 10 +- sw/source/uibase/app/docshini.cxx | 1 - sw/source/uibase/app/docstyle.cxx | 1 + sw/source/uibase/app/mainwn.cxx | 9 +- sw/source/uibase/app/swdll.cxx | 2 +- sw/source/uibase/app/swmodul1.cxx | 1 + sw/source/uibase/app/swmodule.cxx | 27 +- sw/source/uibase/config/uinums.cxx | 1 - sw/source/uibase/dbui/dbmgr.cxx | 3 +- sw/source/uibase/dbui/dbtree.cxx | 2 +- .../uibase/dbui/mailmergechildwindow.src | 53 - sw/source/uibase/dbui/mailmergehelper.cxx | 9 +- .../uibase/dbui/mailmergetoolbarcontrols.cxx | 1 + sw/source/uibase/dbui/mmconfigitem.cxx | 38 +- .../dialog/SwSpellDialogChildWindow.cxx | 1 + sw/source/uibase/dialog/regionsw.cxx | 3 +- sw/source/uibase/dialog/regionsw.hrc | 32 - sw/source/uibase/dialog/regionsw.src | 40 - sw/source/uibase/dochdl/gloshdl.cxx | 2 +- sw/source/uibase/dochdl/swdtflvr.cxx | 47 +- .../uibase/docvw/AnnotationMenuButton.cxx | 3 +- sw/source/uibase/docvw/AnnotationWin.cxx | 2 +- sw/source/uibase/docvw/AnnotationWin2.cxx | 5 +- sw/source/uibase/docvw/HeaderFooterWin.cxx | 4 +- sw/source/uibase/docvw/PageBreakWin.cxx | 2 +- sw/source/uibase/docvw/PostItMgr.cxx | 4 +- sw/source/uibase/docvw/SidebarTxtControl.cxx | 14 +- sw/source/uibase/docvw/annotation.hrc | 41 - sw/source/uibase/docvw/docvw.hrc | 67 - sw/source/uibase/docvw/docvw.src | 159 - sw/source/uibase/docvw/edtwin.cxx | 2 +- sw/source/uibase/docvw/edtwin2.cxx | 46 +- sw/source/uibase/docvw/romenu.cxx | 2 +- sw/source/uibase/envelp/envimg.cxx | 3 +- sw/source/uibase/envelp/labimg.cxx | 1 - sw/source/uibase/envelp/syncbtn.cxx | 2 +- sw/source/uibase/fldui/fldmgr.cxx | 437 +- sw/source/uibase/globdoc/globdoc.cxx | 2 +- sw/source/uibase/inc/app.hrc | 107 - sw/source/uibase/inc/cnttab.hxx | 13 - sw/source/uibase/inc/frmpage.hxx | 5 +- sw/source/uibase/inc/frmui.hrc | 21 - sw/source/uibase/inc/globdoc.hrc | 36 - sw/source/uibase/inc/misc.hrc | 23 - sw/source/uibase/inc/mmconfigitem.hxx | 4 +- sw/source/uibase/inc/optload.hxx | 8 + sw/source/uibase/inc/ribbar.hrc | 100 - sw/source/uibase/inc/shells.hrc | 67 - sw/source/uibase/inc/swuiccoll.hxx | 2 - sw/source/uibase/inc/swuicnttab.hxx | 1 - sw/source/uibase/inc/unotools.hxx | 2 - sw/source/uibase/inc/utlui.hrc | 200 - sw/source/uibase/inc/web.hrc | 36 - sw/source/uibase/index/idxmrk.cxx | 2 +- sw/source/uibase/lingu/hyp.cxx | 1 + sw/source/uibase/lingu/olmenu.cxx | 2 +- sw/source/uibase/lingu/olmenu.hrc | 7 - sw/source/uibase/lingu/olmenu.src | 50 - sw/source/uibase/misc/glshell.cxx | 1 + .../uibase/misc/numberingtypelistbox.cxx | 9 +- sw/source/uibase/misc/redlndlg.cxx | 18 +- sw/source/uibase/misc/swruler.cxx | 9 +- sw/source/uibase/ribbar/drawbase.cxx | 2 +- sw/source/uibase/ribbar/inputwin.cxx | 3 +- sw/source/uibase/ribbar/inputwin.src | 63 - sw/source/uibase/ribbar/workctrl.cxx | 117 +- sw/source/uibase/ribbar/workctrl.src | 261 - sw/source/uibase/shells/annotsh.cxx | 2 +- sw/source/uibase/shells/basesh.cxx | 6 +- sw/source/uibase/shells/beziersh.cxx | 2 +- sw/source/uibase/shells/drawsh.cxx | 2 +- sw/source/uibase/shells/drformsh.cxx | 2 +- sw/source/uibase/shells/drwbassh.cxx | 2 +- sw/source/uibase/shells/drwtxtex.cxx | 2 +- sw/source/uibase/shells/drwtxtsh.cxx | 2 +- sw/source/uibase/shells/frmsh.cxx | 8 +- sw/source/uibase/shells/grfsh.cxx | 2 +- sw/source/uibase/shells/grfshex.cxx | 6 +- sw/source/uibase/shells/listsh.cxx | 2 +- sw/source/uibase/shells/mediash.cxx | 2 +- sw/source/uibase/shells/navsh.cxx | 2 +- sw/source/uibase/shells/olesh.cxx | 2 +- sw/source/uibase/shells/tabsh.cxx | 2 +- sw/source/uibase/shells/textdrw.cxx | 2 +- sw/source/uibase/shells/textfld.cxx | 16 +- sw/source/uibase/shells/textsh.cxx | 4 +- sw/source/uibase/shells/textsh1.cxx | 6 +- sw/source/uibase/shells/textsh2.cxx | 2 +- sw/source/uibase/shells/txtattr.cxx | 2 +- .../uibase/sidebar/PageMarginControl.cxx | 2 +- sw/source/uibase/sidebar/PropertyPanel.hrc | 33 - sw/source/uibase/uiview/pview.cxx | 2 +- sw/source/uibase/uiview/srcview.cxx | 8 +- sw/source/uibase/uiview/uivwimp.cxx | 2 +- sw/source/uibase/uiview/view.cxx | 4 +- sw/source/uibase/uiview/view.hrc | 60 - sw/source/uibase/uiview/view.src | 88 - sw/source/uibase/uiview/view0.cxx | 2 +- sw/source/uibase/uiview/view2.cxx | 31 +- sw/source/uibase/uiview/viewcoll.cxx | 2 +- sw/source/uibase/uiview/viewdlg2.cxx | 2 +- sw/source/uibase/uiview/viewling.cxx | 8 +- sw/source/uibase/uiview/viewmdi.cxx | 4 +- sw/source/uibase/uiview/viewprt.cxx | 6 +- sw/source/uibase/uiview/viewsrch.cxx | 4 +- sw/source/uibase/uno/unotxdoc.cxx | 2 +- sw/source/uibase/utlui/attrdesc.cxx | 150 +- sw/source/uibase/utlui/attrdesc.hrc | 112 - sw/source/uibase/utlui/attrdesc.src | 351 -- sw/source/uibase/utlui/bookctrl.cxx | 2 +- sw/source/uibase/utlui/content.cxx | 104 +- sw/source/uibase/utlui/glbltree.cxx | 72 +- sw/source/uibase/utlui/gloslst.cxx | 2 +- sw/source/uibase/utlui/initui.cxx | 101 +- sw/source/uibase/utlui/initui.src | 394 -- sw/source/uibase/utlui/navipi.cxx | 38 +- sw/source/uibase/utlui/navipi.src | 171 - sw/source/uibase/utlui/numfmtlb.cxx | 2 +- sw/source/uibase/utlui/statusbar.src | 43 - sw/source/uibase/utlui/tmplctrl.cxx | 2 +- sw/source/uibase/utlui/uiitems.cxx | 3 +- sw/source/uibase/utlui/uitool.cxx | 2 +- sw/source/uibase/utlui/unotools.cxx | 10 +- sw/source/uibase/utlui/unotools.hrc | 28 - sw/source/uibase/utlui/unotools.src | 39 - sw/source/uibase/utlui/viewlayoutctrl.cxx | 2 +- sw/source/uibase/utlui/wordcountctrl.cxx | 2 +- sw/source/uibase/web/wdocsh.cxx | 2 +- sw/source/uibase/web/wformsh.cxx | 4 +- sw/source/uibase/web/wfrmsh.cxx | 4 +- sw/source/uibase/web/wgrfsh.cxx | 4 +- sw/source/uibase/web/wlistsh.cxx | 2 +- sw/source/uibase/web/wolesh.cxx | 4 +- sw/source/uibase/web/wtabsh.cxx | 2 +- sw/source/uibase/web/wtextsh.cxx | 4 +- sw/source/uibase/web/wview.cxx | 4 +- sw/source/uibase/wrtsh/wrtsh.src | 21 - sw/source/uibase/wrtsh/wrtsh1.cxx | 2 +- sw/source/uibase/wrtsh/wrtundo.cxx | 11 +- sw/uiconfig/swriter/ui/abstractdialog.ui | 12 +- sw/uiconfig/swriter/ui/addentrydialog.ui | 6 +- sw/uiconfig/swriter/ui/addressblockdialog.ui | 24 +- sw/uiconfig/swriter/ui/alreadyexistsdialog.ui | 10 +- sw/uiconfig/swriter/ui/annotationmenu.ui | 12 +- sw/uiconfig/swriter/ui/asciifilterdialog.ui | 20 +- sw/uiconfig/swriter/ui/asksearchdialog.ui | 4 +- sw/uiconfig/swriter/ui/assignfieldsdialog.ui | 8 +- sw/uiconfig/swriter/ui/assignstylesdialog.ui | 12 +- sw/uiconfig/swriter/ui/attachnamedialog.ui | 10 +- .../ui/authenticationsettingsdialog.ui | 32 +- sw/uiconfig/swriter/ui/autoformattable.ui | 20 +- sw/uiconfig/swriter/ui/autotext.ui | 46 +- sw/uiconfig/swriter/ui/bibliographyentry.ui | 20 +- sw/uiconfig/swriter/ui/bulletsandnumbering.ui | 20 +- sw/uiconfig/swriter/ui/businessdatapage.ui | 46 +- .../swriter/ui/cannotsavelabeldialog.ui | 8 +- sw/uiconfig/swriter/ui/captiondialog.ui | 4 +- sw/uiconfig/swriter/ui/captionoptions.ui | 24 +- sw/uiconfig/swriter/ui/cardformatpage.ui | 6 +- sw/uiconfig/swriter/ui/cardmediumpage.ui | 26 +- sw/uiconfig/swriter/ui/ccdialog.ui | 12 +- sw/uiconfig/swriter/ui/characterproperties.ui | 18 +- sw/uiconfig/swriter/ui/charurlpage.ui | 22 +- sw/uiconfig/swriter/ui/columndialog.ui | 4 +- sw/uiconfig/swriter/ui/columnpage.ui | 56 +- sw/uiconfig/swriter/ui/columnwidth.ui | 10 +- sw/uiconfig/swriter/ui/conditionpage.ui | 68 +- sw/uiconfig/swriter/ui/converttexttable.ui | 36 +- sw/uiconfig/swriter/ui/createaddresslist.ui | 24 +- sw/uiconfig/swriter/ui/createauthorentry.ui | 6 +- .../swriter/ui/createautomarkdialog.ui | 24 +- .../swriter/ui/customizeaddrlistdialog.ui | 10 +- .../ui/datasourcesunavailabledialog.ui | 8 +- sw/uiconfig/swriter/ui/dropcapspage.ui | 20 +- sw/uiconfig/swriter/ui/dropdownfielddialog.ui | 6 +- sw/uiconfig/swriter/ui/editcategories.ui | 14 +- sw/uiconfig/swriter/ui/editfielddialog.ui | 6 +- sw/uiconfig/swriter/ui/editsectiondialog.ui | 40 +- sw/uiconfig/swriter/ui/endnotepage.ui | 24 +- sw/uiconfig/swriter/ui/envaddresspage.ui | 16 +- sw/uiconfig/swriter/ui/envdialog.ui | 16 +- sw/uiconfig/swriter/ui/envformatpage.ui | 40 +- sw/uiconfig/swriter/ui/envprinterpage.ui | 42 +- sw/uiconfig/swriter/ui/exchangedatabases.ui | 18 +- sw/uiconfig/swriter/ui/fielddialog.ui | 18 +- sw/uiconfig/swriter/ui/findentrydialog.ui | 8 +- sw/uiconfig/swriter/ui/flddbpage.ui | 20 +- sw/uiconfig/swriter/ui/flddocinfopage.ui | 18 +- sw/uiconfig/swriter/ui/flddocumentpage.ui | 18 +- sw/uiconfig/swriter/ui/fldfuncpage.ui | 36 +- sw/uiconfig/swriter/ui/fldrefpage.ui | 26 +- sw/uiconfig/swriter/ui/fldvarpage.ui | 36 +- sw/uiconfig/swriter/ui/floatingnavigation.ui | 4 +- sw/uiconfig/swriter/ui/floatingsync.ui | 6 +- sw/uiconfig/swriter/ui/footendnotedialog.ui | 8 +- sw/uiconfig/swriter/ui/footnoteareapage.ui | 30 +- sw/uiconfig/swriter/ui/footnotepage.ui | 44 +- .../swriter/ui/footnotesendnotestabpage.ui | 30 +- sw/uiconfig/swriter/ui/formatsectiondialog.ui | 12 +- sw/uiconfig/swriter/ui/formattablepage.ui | 44 +- sw/uiconfig/swriter/ui/framedialog.ui | 22 +- sw/uiconfig/swriter/ui/frmaddpage.ui | 54 +- sw/uiconfig/swriter/ui/frmtypepage.ui | 54 +- sw/uiconfig/swriter/ui/frmurlpage.ui | 18 +- sw/uiconfig/swriter/ui/gotopagedialog.ui | 8 +- sw/uiconfig/swriter/ui/headerfootermenu.ui | 4 +- sw/uiconfig/swriter/ui/indentpage.ui | 10 +- sw/uiconfig/swriter/ui/indexentry.ui | 36 +- sw/uiconfig/swriter/ui/infonotfounddialog.ui | 6 +- sw/uiconfig/swriter/ui/inforeadonlydialog.ui | 8 +- sw/uiconfig/swriter/ui/inputfielddialog.ui | 6 +- sw/uiconfig/swriter/ui/inputwinmenu.ui | 58 +- .../swriter/ui/insertautotextdialog.ui | 6 +- sw/uiconfig/swriter/ui/insertbookmark.ui | 12 +- sw/uiconfig/swriter/ui/insertbreak.ui | 20 +- sw/uiconfig/swriter/ui/insertcaption.ui | 30 +- .../swriter/ui/insertdbcolumnsdialog.ui | 34 +- sw/uiconfig/swriter/ui/insertfootnote.ui | 20 +- sw/uiconfig/swriter/ui/insertscript.ui | 14 +- sw/uiconfig/swriter/ui/insertsectiondialog.ui | 16 +- sw/uiconfig/swriter/ui/inserttable.ui | 28 +- sw/uiconfig/swriter/ui/labeldialog.ui | 20 +- sw/uiconfig/swriter/ui/labelformatpage.ui | 24 +- sw/uiconfig/swriter/ui/labeloptionspage.ui | 20 +- sw/uiconfig/swriter/ui/linenumbering.ui | 46 +- sw/uiconfig/swriter/ui/mailconfigpage.ui | 24 +- sw/uiconfig/swriter/ui/mailmerge.ui | 50 +- sw/uiconfig/swriter/ui/mailmergedialog.ui | 10 +- .../swriter/ui/managechangessidebar.ui | 24 +- sw/uiconfig/swriter/ui/mergeconnectdialog.ui | 12 +- sw/uiconfig/swriter/ui/mergetabledialog.ui | 10 +- sw/uiconfig/swriter/ui/mmaddressblockpage.ui | 38 +- sw/uiconfig/swriter/ui/mmcreatingdialog.ui | 12 +- sw/uiconfig/swriter/ui/mmlayoutpage.ui | 28 +- sw/uiconfig/swriter/ui/mmmailbody.ui | 26 +- sw/uiconfig/swriter/ui/mmoutputtypepage.ui | 12 +- sw/uiconfig/swriter/ui/mmresultemaildialog.ui | 38 +- sw/uiconfig/swriter/ui/mmresultprintdialog.ui | 20 +- sw/uiconfig/swriter/ui/mmresultsavedialog.ui | 16 +- sw/uiconfig/swriter/ui/mmsalutationpage.ui | 34 +- sw/uiconfig/swriter/ui/mmselectpage.ui | 18 +- sw/uiconfig/swriter/ui/mmsendmails.ui | 20 +- sw/uiconfig/swriter/ui/navigatorpanel.ui | 52 +- sw/uiconfig/swriter/ui/newuserindexdialog.ui | 8 +- sw/uiconfig/swriter/ui/notebookbar.ui | 104 +- .../ui/notebookbar_groupedbar_compact.ui | 90 +- .../swriter/ui/notebookbar_groupedbar_full.ui | 98 +- sw/uiconfig/swriter/ui/notebookbar_groups.ui | 132 +- sw/uiconfig/swriter/ui/notebookbar_single.ui | 8 +- sw/uiconfig/swriter/ui/numberingnamedialog.ui | 24 +- sw/uiconfig/swriter/ui/numparapage.ui | 48 +- sw/uiconfig/swriter/ui/objectdialog.ui | 20 +- sw/uiconfig/swriter/ui/optcaptionpage.ui | 40 +- sw/uiconfig/swriter/ui/optcomparison.ui | 18 +- sw/uiconfig/swriter/ui/optcompatpage.ui | 36 +- sw/uiconfig/swriter/ui/optfonttabpage.ui | 20 +- sw/uiconfig/swriter/ui/optformataidspage.ui | 46 +- sw/uiconfig/swriter/ui/optgeneralpage.ui | 34 +- sw/uiconfig/swriter/ui/optredlinepage.ui | 72 +- sw/uiconfig/swriter/ui/opttablepage.ui | 48 +- sw/uiconfig/swriter/ui/opttestpage.ui | 2 +- sw/uiconfig/swriter/ui/outlinenumbering.ui | 30 +- .../swriter/ui/outlinenumberingpage.ui | 22 +- sw/uiconfig/swriter/ui/outlinepositionpage.ui | 40 +- sw/uiconfig/swriter/ui/pagebreakmenu.ui | 6 +- sw/uiconfig/swriter/ui/pagecolumncontrol.ui | 26 +- sw/uiconfig/swriter/ui/pagefooterpanel.ui | 10 +- sw/uiconfig/swriter/ui/pageformatpanel.ui | 38 +- sw/uiconfig/swriter/ui/pageheaderpanel.ui | 10 +- sw/uiconfig/swriter/ui/pagemargincontrol.ui | 36 +- .../swriter/ui/pageorientationcontrol.ui | 6 +- sw/uiconfig/swriter/ui/pagesizecontrol.ui | 6 +- sw/uiconfig/swriter/ui/pagestylespanel.ui | 30 +- sw/uiconfig/swriter/ui/paradialog.ui | 24 +- sw/uiconfig/swriter/ui/picturedialog.ui | 24 +- sw/uiconfig/swriter/ui/picturepage.ui | 20 +- sw/uiconfig/swriter/ui/previewzoomdialog.ui | 8 +- sw/uiconfig/swriter/ui/printeroptions.ui | 22 +- sw/uiconfig/swriter/ui/printmergedialog.ui | 4 +- sw/uiconfig/swriter/ui/printmonitordialog.ui | 10 +- sw/uiconfig/swriter/ui/printoptionspage.ui | 46 +- sw/uiconfig/swriter/ui/privateuserpage.ui | 54 +- .../swriter/ui/querycontinuebegindialog.ui | 8 +- .../swriter/ui/querycontinueenddialog.ui | 8 +- .../swriter/ui/querydefaultcompatdialog.ui | 8 +- .../ui/queryrotateintostandarddialog.ui | 6 +- .../swriter/ui/querysavelabeldialog.ui | 8 +- .../swriter/ui/queryshowchangesdialog.ui | 8 +- sw/uiconfig/swriter/ui/readonlymenu.ui | 42 +- .../swriter/ui/renameautotextdialog.ui | 12 +- sw/uiconfig/swriter/ui/renameentrydialog.ui | 6 +- sw/uiconfig/swriter/ui/renameobjectdialog.ui | 8 +- sw/uiconfig/swriter/ui/rowheight.ui | 8 +- sw/uiconfig/swriter/ui/saveashtmldialog.ui | 8 +- sw/uiconfig/swriter/ui/savelabeldialog.ui | 10 +- sw/uiconfig/swriter/ui/sectionpage.ui | 36 +- sw/uiconfig/swriter/ui/selectaddressdialog.ui | 24 +- .../swriter/ui/selectautotextdialog.ui | 6 +- sw/uiconfig/swriter/ui/selectblockdialog.ui | 20 +- sw/uiconfig/swriter/ui/selectindexdialog.ui | 6 +- sw/uiconfig/swriter/ui/selecttabledialog.ui | 8 +- sw/uiconfig/swriter/ui/sidebarpage.ui | 10 +- sw/uiconfig/swriter/ui/sidebarstylepresets.ui | 2 +- sw/uiconfig/swriter/ui/sidebartheme.ui | 6 +- sw/uiconfig/swriter/ui/sidebarwrap.ui | 40 +- sw/uiconfig/swriter/ui/sortdialog.ui | 56 +- sw/uiconfig/swriter/ui/spellmenu.ui | 22 +- sw/uiconfig/swriter/ui/splittable.ui | 14 +- sw/uiconfig/swriter/ui/statisticsinfopage.ui | 22 +- sw/uiconfig/swriter/ui/stringinput.ui | 4 +- sw/uiconfig/swriter/ui/subjectdialog.ui | 10 +- sw/uiconfig/swriter/ui/tablecolumnpage.ui | 22 +- sw/uiconfig/swriter/ui/tablepreviewdialog.ui | 6 +- sw/uiconfig/swriter/ui/tableproperties.ui | 14 +- sw/uiconfig/swriter/ui/tabletextflowpage.ui | 50 +- sw/uiconfig/swriter/ui/templatedialog1.ui | 20 +- sw/uiconfig/swriter/ui/templatedialog16.ui | 18 +- sw/uiconfig/swriter/ui/templatedialog2.ui | 40 +- sw/uiconfig/swriter/ui/templatedialog4.ui | 24 +- sw/uiconfig/swriter/ui/templatedialog8.ui | 24 +- sw/uiconfig/swriter/ui/testmailsettings.ui | 18 +- sw/uiconfig/swriter/ui/textgridpage.ui | 38 +- sw/uiconfig/swriter/ui/titlepage.ui | 34 +- sw/uiconfig/swriter/ui/tocdialog.ui | 18 +- sw/uiconfig/swriter/ui/tocentriespage.ui | 90 +- sw/uiconfig/swriter/ui/tocindexpage.ui | 118 +- sw/uiconfig/swriter/ui/tocstylespage.ui | 12 +- sw/uiconfig/swriter/ui/tokenwidget.ui | 2 +- sw/uiconfig/swriter/ui/viewoptionspage.ui | 32 +- .../swriter/ui/warndatasourcedialog.ui | 10 +- sw/uiconfig/swriter/ui/warnemaildialog.ui | 8 +- sw/uiconfig/swriter/ui/watermarkdialog.ui | 14 +- sw/uiconfig/swriter/ui/wordcount.ui | 18 +- sw/uiconfig/swriter/ui/wrapdialog.ui | 4 +- sw/uiconfig/swriter/ui/wrappage.ui | 36 +- test/source/setupvcl.cxx | 1 - tools/Library_tl.mk | 3 +- tools/inc/pch/precompiled_tl.hxx | 1 - tools/source/rc/rc.cxx | 67 - tools/source/rc/resary.cxx | 107 - tools/source/rc/resmgr.cxx | 1350 +---- udkapi/com/sun/star/lang/Locale.idl | 5 - unotools/source/misc/componentresmodule.cxx | 66 +- uui/AllLangMoTarget_uui.mk | 11 + uui/AllLangResTarget_uui.mk | 36 - uui/Library_uui.mk | 6 + uui/Module_uui.mk | 4 +- uui/inc/ids.hrc | 174 + uui/{source/ids.hrc => inc/ids.hxx} | 55 +- uui/inc/strings.hrc | 80 + uui/source/alreadyopen.cxx | 15 +- uui/source/alreadyopen.hxx | 2 +- uui/source/alreadyopen.src | 51 - uui/source/filechanged.cxx | 11 +- uui/source/filechanged.hxx | 2 +- uui/source/filechanged.src | 35 - uui/source/fltdlg.cxx | 2 +- uui/source/iahndl-authentication.cxx | 21 +- uui/source/iahndl-errorhandler.cxx | 21 +- uui/source/iahndl-ioexceptions.cxx | 2 +- uui/source/iahndl-locking.cxx | 44 +- uui/source/iahndl-ssl.cxx | 50 +- uui/source/iahndl.cxx | 47 +- uui/source/iahndl.hxx | 11 +- uui/source/ids.src | 256 - uui/source/lockcorrupt.cxx | 15 +- uui/source/lockcorrupt.hxx | 2 +- uui/source/lockcorrupt.src | 35 - uui/source/lockfailed.cxx | 14 +- uui/source/lockfailed.hxx | 2 +- uui/source/lockfailed.src | 35 - uui/source/logindlg.cxx | 3 +- uui/source/masterpasscrtdlg.cxx | 10 +- uui/source/masterpasscrtdlg.hxx | 4 +- uui/source/masterpassworddlg.cxx | 10 +- uui/source/masterpassworddlg.hxx | 4 +- uui/source/nameclashdlg.cxx | 13 +- uui/source/nameclashdlg.hxx | 2 +- uui/source/nameclashdlg.src | 37 - uui/source/openlocked.cxx | 11 +- uui/source/openlocked.hxx | 2 +- uui/source/openlocked.src | 43 - uui/source/passworddlg.cxx | 27 +- uui/source/passworddlg.hxx | 6 +- uui/source/passworddlg.src | 57 - uui/source/passworderrs.src | 47 - uui/source/secmacrowarnings.cxx | 1 - uui/source/sslwarndlg.cxx | 2 +- uui/source/trylater.cxx | 13 +- uui/source/trylater.hxx | 2 +- uui/source/trylater.src | 39 - uui/source/unknownauthdlg.cxx | 2 +- uui/uiconfig/ui/authfallback.ui | 6 +- uui/uiconfig/ui/filterselect.ui | 4 +- uui/uiconfig/ui/logindialog.ui | 28 +- uui/uiconfig/ui/macrowarnmedium.ui | 18 +- uui/uiconfig/ui/masterpassworddlg.ui | 6 +- uui/uiconfig/ui/password.ui | 4 +- uui/uiconfig/ui/setmasterpassworddlg.ui | 12 +- uui/uiconfig/ui/simplenameclash.ui | 8 +- uui/uiconfig/ui/sslwarndialog.ui | 10 +- uui/uiconfig/ui/unknownauthdialog.ui | 10 +- vbahelper/inc/pch/precompiled_msforms.hxx | 3 - vbahelper/inc/pch/precompiled_vbahelper.hxx | 3 - vcl/AllLangMoTarget_vcl.mk | 11 + vcl/AllLangResTarget_vcl.mk | 47 - vcl/Library_vcl.mk | 3 - vcl/Module_vcl.mk | 4 +- vcl/inc/pch/precompiled_vcl.hxx | 2 - vcl/inc/print.hrc | 70 + .../inc/printaccessoryview.hrc | 23 +- vcl/inc/strings.hrc | 143 + .../SafeMode.src => vcl/inc/strings.hxx | 12 +- vcl/inc/svdata.hxx | 8 +- vcl/inc/svids.hrc | 140 - vcl/inc/units.hrc | 58 + vcl/osx/printaccessoryview.mm | 21 +- vcl/osx/salmenu.cxx | 174 +- vcl/osx/salsys.cxx | 2 +- vcl/qa/cppunit/builder/demo.ui | 2 +- vcl/source/app/stdtext.cxx | 5 +- vcl/source/app/svapp.cxx | 14 +- vcl/source/app/svdata.cxx | 53 +- vcl/source/app/svmain.cxx | 8 - vcl/source/bitmap/BitmapTools.cxx | 1 - vcl/source/control/button.cxx | 60 +- vcl/source/control/edit.cxx | 10 +- vcl/source/control/field.cxx | 2 +- vcl/source/control/imgctrl.cxx | 1 - vcl/source/control/spinbtn.cxx | 1 - vcl/source/control/tabctrl.cxx | 2 +- vcl/source/edit/textundo.cxx | 14 +- vcl/source/edit/textundo.hrc | 31 - vcl/source/edit/textundo.src | 43 - vcl/source/edit/vclmedit.cxx | 2 +- vcl/source/gdi/bitmapex.cxx | 1 - vcl/source/gdi/print.cxx | 34 +- vcl/source/gdi/print3.cxx | 2 +- vcl/source/outdev/font.cxx | 14 +- vcl/source/src/app.src | 42 - vcl/source/src/btntext.src | 194 - vcl/source/src/fpicker.src | 117 - vcl/source/src/helptext.src | 75 - vcl/source/src/menu.src | 52 - vcl/source/src/print.src | 113 - vcl/source/src/stdtext.src | 82 - vcl/source/src/units.src | 53 - vcl/source/window/brdwin.cxx | 20 +- vcl/source/window/builder.cxx | 242 +- vcl/source/window/layout.cxx | 2 +- vcl/source/window/menu.cxx | 24 +- vcl/source/window/menubarwindow.cxx | 35 +- vcl/source/window/menuitemlist.hxx | 2 +- vcl/source/window/msgbox.cxx | 34 +- vcl/source/window/printdlg.cxx | 5 +- vcl/source/window/scrwnd.cxx | 2 +- vcl/source/window/splitwin.cxx | 18 +- vcl/source/window/taskpanelist.cxx | 2 - vcl/uiconfig/ui/cupspassworddialog.ui | 10 +- vcl/uiconfig/ui/editmenu.ui | 16 +- vcl/uiconfig/ui/errornocontentdialog.ui | 8 +- vcl/uiconfig/ui/errornoprinterdialog.ui | 8 +- vcl/uiconfig/ui/printdialog.ui | 132 +- vcl/uiconfig/ui/printerdevicepage.ui | 34 +- vcl/uiconfig/ui/printerpaperpage.ui | 14 +- vcl/uiconfig/ui/printerpropertiesdialog.ui | 8 +- vcl/uiconfig/ui/printprogressdialog.ui | 6 +- vcl/uiconfig/ui/querydialog.ui | 4 +- vcl/unx/generic/print/genprnpsp.cxx | 2 +- vcl/unx/generic/print/prtsetup.cxx | 2 +- vcl/unx/generic/window/salframe.cxx | 2 +- vcl/unx/gtk/fpicker/resourceprovider.cxx | 23 +- vcl/unx/gtk/gtksalframe.cxx | 16 +- vcl/unx/gtk/gtksalmenu.cxx | 2 +- vcl/unx/gtk3/gtk3gtkframe.cxx | 16 +- vcl/unx/kde4/KDE4FilePicker.cxx | 20 +- vcl/unx/kde4/KDE4FilePicker.hxx | 2 +- vcl/win/window/keynames.cxx | 2 +- winaccessibility/Library_winaccessibility.mk | 1 - winaccessibility/inc/AccResource.hxx | 66 - winaccessibility/source/service/AccObject.cxx | 1 - .../source/service/AccResource.cxx | 74 - wizards/AllLangMoTarget_wiz.mk | 13 + wizards/AllLangResTarget_dbw.mk | 32 - wizards/Module_wizards.mk | 2 +- wizards/Pyuno_commonwizards.mk | 2 +- .../star/wizards/agenda/AgendaWizardDialog.py | 2 +- .../agenda/AgendaWizardDialogResources.py | 291 +- .../wizards/common/NoValidPathException.py | 6 +- .../com/sun/star/wizards/common/Resource.py | 55 - .../sun/star/wizards/common/SystemDialog.py | 6 +- .../com/sun/star/wizards/common/strings.hrc | 312 ++ .../sun/star/wizards/fax/FaxWizardDialog.py | 2 +- .../wizards/fax/FaxWizardDialogResources.py | 215 +- .../star/wizards/letter/LetterWizardDialog.py | 2 +- .../letter/LetterWizardDialogResources.py | 304 +- wizards/com/sun/star/wizards/ui/UIConsts.py | 1 - .../com/sun/star/wizards/ui/WizardDialog.py | 25 +- wizards/source/formwizard/dbwizres.src | 1351 ----- wizards/source/tools/Misc.xba | 2 +- .../source/dmapper/GraphicHelpers.cxx | 6 +- .../source/ooxml/OOXMLDocumentImpl.cxx | 6 +- writerfilter/source/rtftok/rtftokenizer.cxx | 6 +- writerperfect/AllLangMoTarget_wpt.mk | 13 + .../AllLangResTarget_writerperfect.mk | 29 - .../CppunitTest_writerperfect_draw.mk | 3 - .../CppunitTest_writerperfect_impress.mk | 3 - writerperfect/Module_writerperfect.mk | 4 +- writerperfect/inc/WPFTResMgr.hxx | 10 +- writerperfect/inc/strings.hrc | 16 +- writerperfect/source/common/WPFTResMgr.cxx | 7 +- writerperfect/source/common/strings.src | 47 - .../uiconfig/ui/wpftencodingdialog.ui | 4 +- xmlsecurity/AllLangMoTarget_xsc.mk | 13 + xmlsecurity/AllLangResTarget_xsec.mk | 32 - xmlsecurity/Module_xmlsecurity.mk | 4 +- xmlsecurity/inc/global.hrc | 29 - .../inc/pch/precompiled_xmlsecurity.hxx | 2 - xmlsecurity/inc/resourcemanager.hxx | 6 +- xmlsecurity/inc/strings.hrc | 58 + .../component/documentdigitalsignatures.cxx | 2 +- xmlsecurity/source/component/warnbox.src | 27 - .../source/dialogs/certificateviewer.cxx | 3 +- .../source/dialogs/certificateviewer.src | 92 - xmlsecurity/source/dialogs/dialogs.hrc | 45 - .../dialogs/digitalsignaturesdialog.cxx | 3 +- .../dialogs/digitalsignaturesdialog.hrc | 34 - .../dialogs/digitalsignaturesdialog.src | 59 - xmlsecurity/source/dialogs/macrosecurity.cxx | 2 +- .../source/dialogs/resourcemanager.cxx | 9 +- xmlsecurity/uiconfig/ui/certdetails.ui | 2 +- xmlsecurity/uiconfig/ui/certgeneral.ui | 16 +- xmlsecurity/uiconfig/ui/certpage.ui | 12 +- .../uiconfig/ui/digitalsignaturesdialog.ui | 38 +- .../uiconfig/ui/macrosecuritydialog.ui | 8 +- xmlsecurity/uiconfig/ui/securitylevelpage.ui | 10 +- xmlsecurity/uiconfig/ui/securitytrustpage.ui | 18 +- .../uiconfig/ui/selectcertificatedialog.ui | 36 +- xmlsecurity/uiconfig/ui/viewcertdialog.ui | 10 +- 3781 files changed, 42957 insertions(+), 112045 deletions(-) create mode 100644 accessibility/AllLangMoTarget_acc.mk delete mode 100644 accessibility/AllLangResTarget_acc.mk delete mode 100644 accessibility/inc/helper/accessiblestrings.hrc create mode 100644 accessibility/inc/strings.hrc delete mode 100644 accessibility/source/helper/accessiblestrings.src rename bin/count-src-resources => avmedia/AllLangMoTarget_avmedia.mk (54%) mode change 100755 => 100644 delete mode 100644 avmedia/AllLangResTarget_avmedia.mk create mode 100644 avmedia/inc/strings.hrc delete mode 100644 avmedia/source/framework/mediacontrol.hrc delete mode 100644 avmedia/source/framework/mediacontrol.src delete mode 100644 avmedia/source/viewer/mediawindow.hrc delete mode 100644 avmedia/source/viewer/mediawindow.src create mode 100644 basctl/AllLangMoTarget_basctl.mk delete mode 100644 basctl/AllLangResTarget_basctl.mk delete mode 100644 basctl/inc/basidesh.hrc create mode 100644 basctl/inc/strings.hrc delete mode 100644 basctl/source/basicide/basicprint.src delete mode 100644 basctl/source/basicide/basidesh.src delete mode 100644 basctl/source/basicide/macrodlg.hrc delete mode 100644 basctl/source/basicide/macrodlg.src delete mode 100644 basctl/source/basicide/objdlg.hrc delete mode 100644 basctl/source/basicide/objdlg.src delete mode 100644 basctl/source/dlged/dlgresid.src delete mode 100644 basctl/source/inc/dlgresid.hrc rename rsc/Module_rsc.mk => basic/AllLangMoTarget_sb.mk (75%) delete mode 100644 basic/AllLangResTarget_sb.mk create mode 100644 basic/inc/basic.hrc rename desktop/source/deployment/registry/help/dp_help.hrc => basic/inc/strings.hrc (53%) delete mode 100644 basic/source/classes/sb.src delete mode 100644 basic/source/sbx/format.src create mode 100644 chart2/AllLangMoTarget_chart.mk delete mode 100644 chart2/AllLangResTarget_chartcontroller.mk create mode 100644 chart2/inc/strings.hrc delete mode 100644 chart2/source/controller/dialogs/Strings.src delete mode 100644 chart2/source/controller/dialogs/Strings_ChartTypes.src delete mode 100644 chart2/source/controller/dialogs/Strings_Scale.src delete mode 100644 chart2/source/controller/dialogs/Strings_Statistic.src delete mode 100644 chart2/source/inc/Strings.hrc delete mode 100644 comphelper/source/misc/officeresourcebundle.cxx rename connectivity/{AllLangResTarget_sdberr.mk => AllLangMoTarget_cnr.mk} (54%) delete mode 100644 connectivity/AllLangResTarget_cnr.mk create mode 100644 connectivity/inc/strings.hrc delete mode 100644 connectivity/source/inc/resource/ado_res.hrc delete mode 100644 connectivity/source/inc/resource/calc_res.hrc delete mode 100644 connectivity/source/inc/resource/common_res.hrc delete mode 100644 connectivity/source/inc/resource/dbase_res.hrc delete mode 100644 connectivity/source/inc/resource/evoab2_res.hrc delete mode 100644 connectivity/source/inc/resource/file_res.hrc delete mode 100644 connectivity/source/inc/resource/hsqldb_res.hrc delete mode 100644 connectivity/source/inc/resource/macab_res.hrc delete mode 100644 connectivity/source/inc/resource/mork_res.hrc delete mode 100644 connectivity/source/resource/conn_error_message.src delete mode 100644 connectivity/source/resource/conn_shared_res.src create mode 100644 cui/AllLangMoTarget_cui.mk delete mode 100644 cui/AllLangResTarget_cui.mk rename cui/{source/options/personalization.src => inc/personalization.hrc} (62%) create mode 100644 cui/inc/strings.hrc rename extensions/source/scanner/strings.hrc => cui/inc/strings.hxx (56%) create mode 100644 cui/inc/treeopt.hrc delete mode 100644 cui/source/customize/cfg.src delete mode 100644 cui/source/customize/macropg.src delete mode 100644 cui/source/dialogs/cuires.src delete mode 100644 cui/source/dialogs/fmsearch.hrc delete mode 100644 cui/source/dialogs/fmsearch.src delete mode 100644 cui/source/dialogs/gallery.src delete mode 100644 cui/source/dialogs/hyperdlg.src delete mode 100644 cui/source/dialogs/passwdomdlg.src delete mode 100644 cui/source/dialogs/screenshotannotationdlg.src delete mode 100644 cui/source/dialogs/scriptdlg.src delete mode 100644 cui/source/dialogs/svuidlg.hrc delete mode 100644 cui/source/inc/gallery.hrc delete mode 100644 cui/source/options/connpooloptions.src delete mode 100644 cui/source/options/dbregister.src delete mode 100644 cui/source/options/doclinkdialog.src delete mode 100644 cui/source/options/optchart.src delete mode 100644 cui/source/options/optcolor.src delete mode 100644 cui/source/options/optdict.src delete mode 100644 cui/source/options/optfltr.src delete mode 100644 cui/source/options/optinet2.src delete mode 100644 cui/source/options/optjava.src delete mode 100644 cui/source/options/optlingu.src delete mode 100644 cui/source/options/optpath.src delete mode 100644 cui/source/options/treeopt.src delete mode 100644 cui/source/tabpages/border.src delete mode 100644 cui/source/tabpages/frmdirlbox.src delete mode 100644 cui/source/tabpages/strings.src create mode 100644 dbaccess/AllLangMoTarget_dba.mk delete mode 100644 dbaccess/AllLangResTarget_dba.mk delete mode 100644 dbaccess/AllLangResTarget_dbmm.mk delete mode 100644 dbaccess/AllLangResTarget_dbu.mk delete mode 100644 dbaccess/AllLangResTarget_sdbt.mk rename dbaccess/{source/core => }/inc/core_resource.hxx (81%) rename dbaccess/{source => }/inc/dbadllapi.hxx (100%) rename sw/source/ui/dialog/swdialmgr.cxx => dbaccess/inc/query.hrc (73%) create mode 100644 dbaccess/inc/strings.hrc rename dbaccess/{source/inc/stringconstants.inc => inc/strings.hxx} (81%) delete mode 100644 dbaccess/source/core/inc/core_resource.hrc delete mode 100644 dbaccess/source/core/resource/strings.src delete mode 100644 dbaccess/source/ext/macromigration/dbmm_global.hrc delete mode 100644 dbaccess/source/ext/macromigration/dbmm_module.cxx delete mode 100644 dbaccess/source/ext/macromigration/dbmm_module.hxx delete mode 100644 dbaccess/source/ext/macromigration/macromigration.hrc delete mode 100644 dbaccess/source/ext/macromigration/macromigration.src delete mode 100644 dbaccess/source/inc/dbastrings.hrc delete mode 100644 dbaccess/source/inc/dbustrings.hrc rename dbaccess/source/inc/{stringconstants.hrc => stringconstants.hxx} (98%) delete mode 100644 dbaccess/source/inc/xmlstrings.hrc rename dbaccess/source/sdbtools/{connection => inc}/connectiondependent.hxx (100%) rename dbaccess/source/sdbtools/{connection => inc}/connectiontools.hxx (97%) delete mode 100644 dbaccess/source/sdbtools/inc/sdbt_resource.hrc delete mode 100644 dbaccess/source/sdbtools/misc/module_sdbt.cxx delete mode 100644 dbaccess/source/sdbtools/resource/sdbt_strings.src delete mode 100644 dbaccess/source/shared/sdbtstrings.cxx delete mode 100644 dbaccess/source/shared/xmlstrings.cxx delete mode 100644 dbaccess/source/ui/app/app.src delete mode 100644 dbaccess/source/ui/app/dbu_app.hrc delete mode 100644 dbaccess/source/ui/browser/sbabrw.src delete mode 100644 dbaccess/source/ui/browser/sbagrid.src delete mode 100644 dbaccess/source/ui/control/TableGrantCtrl.src delete mode 100644 dbaccess/source/ui/control/tabletree.src delete mode 100644 dbaccess/source/ui/control/undosqledit.src delete mode 100644 dbaccess/source/ui/dlg/AutoControls.src delete mode 100644 dbaccess/source/ui/dlg/ConnectionPage.src delete mode 100644 dbaccess/source/ui/dlg/UserAdmin.src delete mode 100644 dbaccess/source/ui/dlg/dbadmin.src delete mode 100644 dbaccess/source/ui/dlg/dbadmin2.src delete mode 100644 dbaccess/source/ui/dlg/dbadminsetup.src delete mode 100644 dbaccess/source/ui/dlg/directsql.src delete mode 100644 dbaccess/source/ui/dlg/indexdialog.src delete mode 100644 dbaccess/source/ui/dlg/paramdialog.src delete mode 100644 dbaccess/source/ui/dlg/sqlmessage.src delete mode 100644 dbaccess/source/ui/inc/dbu_brw.hrc delete mode 100644 dbaccess/source/ui/inc/dbu_control.hrc delete mode 100644 dbaccess/source/ui/inc/dbu_dlg.hrc rename dbaccess/source/{core/inc/dbamiscres.hrc => ui/inc/dbu_dlg.hxx} (75%) delete mode 100644 dbaccess/source/ui/inc/dbu_misc.hrc create mode 100644 dbaccess/source/ui/inc/dbu_pageids.hxx delete mode 100644 dbaccess/source/ui/inc/dbu_qry.hrc delete mode 100644 dbaccess/source/ui/inc/dbu_rel.hrc delete mode 100644 dbaccess/source/ui/inc/dbu_resource.hrc delete mode 100644 dbaccess/source/ui/inc/dbu_tbl.hrc delete mode 100644 dbaccess/source/ui/inc/dbu_uno.hrc delete mode 100644 dbaccess/source/ui/inc/moduledbu.hxx delete mode 100644 dbaccess/source/ui/misc/WizardPages.src delete mode 100644 dbaccess/source/ui/misc/dbumiscres.src delete mode 100644 dbaccess/source/ui/misc/moduledbu.cxx delete mode 100644 dbaccess/source/ui/querydesign/query.src delete mode 100644 dbaccess/source/ui/querydesign/querydlg.src delete mode 100644 dbaccess/source/ui/relationdesign/relation.src delete mode 100644 dbaccess/source/ui/tabledesign/table.src delete mode 100644 dbaccess/source/ui/uno/copytablewizard.src create mode 100644 desktop/AllLangMoTarget_dkt.mk delete mode 100644 desktop/AllLangResTarget_deployment.mk delete mode 100644 desktop/AllLangResTarget_deploymentgui.mk delete mode 100644 desktop/AllLangResTarget_dkt.mk delete mode 100644 desktop/inc/deployment.hrc delete mode 100644 desktop/inc/dp_gui.hrc rename desktop/inc/{dp_gui_shared.hxx => dp_shared.hxx} (72%) create mode 100644 desktop/inc/strings.hrc delete mode 100644 desktop/source/app/desktop.hrc delete mode 100644 desktop/source/app/desktop.src delete mode 100644 desktop/source/app/desktopresid.cxx delete mode 100644 desktop/source/deployment/gui/dp_gui_dialog.src delete mode 100644 desktop/source/deployment/gui/dp_gui_updatedialog.src delete mode 100644 desktop/source/deployment/gui/dp_gui_updateinstalldialog.src delete mode 100644 desktop/source/deployment/gui/dp_gui_versionboxes.src delete mode 100644 desktop/source/deployment/manager/dp_manager.hrc delete mode 100644 desktop/source/deployment/manager/dp_manager.src delete mode 100644 desktop/source/deployment/misc/dp_misc.src delete mode 100644 desktop/source/deployment/registry/component/dp_component.hrc delete mode 100644 desktop/source/deployment/registry/component/dp_component.src delete mode 100644 desktop/source/deployment/registry/configuration/dp_configuration.src delete mode 100644 desktop/source/deployment/registry/dp_registry.src delete mode 100644 desktop/source/deployment/registry/help/dp_help.src delete mode 100644 desktop/source/deployment/registry/inc/dp_registry.hrc delete mode 100644 desktop/source/deployment/registry/package/dp_package.hrc delete mode 100644 desktop/source/deployment/registry/package/dp_package.src delete mode 100644 desktop/source/deployment/registry/script/dp_script.hrc delete mode 100644 desktop/source/deployment/registry/script/dp_script.src delete mode 100644 desktop/source/deployment/registry/sfwk/dp_sfwk.hrc delete mode 100644 desktop/source/deployment/registry/sfwk/dp_sfwk.src delete mode 100644 desktop/source/deployment/unopkg/unopkg.src create mode 100644 editeng/AllLangMoTarget_editeng.mk delete mode 100644 editeng/AllLangResTarget_editeng.mk rename editeng/inc/{editeng.hrc => editeng.hxx} (90%) delete mode 100644 editeng/source/accessibility/accessibility.src delete mode 100644 editeng/source/editeng/editeng.src delete mode 100644 editeng/source/items/page.src delete mode 100644 editeng/source/items/svxitems.src delete mode 100644 editeng/source/misc/lingu.src delete mode 100644 editeng/source/outliner/outliner.src create mode 100644 extensions/AllLangMoTarget_pcr.mk delete mode 100644 extensions/AllLangResTarget_abp.mk delete mode 100644 extensions/AllLangResTarget_bib.mk delete mode 100644 extensions/AllLangResTarget_dbp.mk delete mode 100644 extensions/AllLangResTarget_pcr.mk delete mode 100644 extensions/AllLangResTarget_scn.mk delete mode 100644 extensions/Library_res.mk rename desktop/source/app/desktopresid.hxx => extensions/inc/command.hrc (73%) rename dbaccess/source/sdbtools/inc/sdbt_services.hxx => extensions/inc/showhide.hrc (76%) create mode 100644 extensions/inc/stringarrays.hrc create mode 100644 extensions/inc/strings.hrc rename sw/source/uibase/inc/dialmgr.hxx => extensions/inc/yesno.hrc (78%) delete mode 100644 extensions/source/abpilot/abpresid.hrc delete mode 100644 extensions/source/abpilot/abspilot.src delete mode 100644 extensions/source/bibliography/bib.hrc delete mode 100644 extensions/source/bibliography/bib.src delete mode 100644 extensions/source/bibliography/sections.src delete mode 100644 extensions/source/dbpilots/commonpagesdbp.src delete mode 100644 extensions/source/dbpilots/dbpilots.src delete mode 100644 extensions/source/dbpilots/dbpresid.hrc delete mode 100644 extensions/source/dbpilots/gridpages.src delete mode 100644 extensions/source/dbpilots/groupboxpages.src delete mode 100644 extensions/source/dbpilots/listcombopages.src delete mode 100644 extensions/source/propctrlr/formlinkdialog.src delete mode 100644 extensions/source/propctrlr/formres.src delete mode 100644 extensions/source/propctrlr/formresid.hrc delete mode 100644 extensions/source/propctrlr/pcrmiscres.src delete mode 100644 extensions/source/propctrlr/propres.src delete mode 100644 extensions/source/propctrlr/propresid.hrc delete mode 100644 extensions/source/propctrlr/selectlabeldialog.src delete mode 100644 extensions/source/resource/ResourceIndexAccess.cxx delete mode 100644 extensions/source/resource/ResourceIndexAccess.hxx delete mode 100644 extensions/source/resource/oooresourceloader.cxx delete mode 100644 extensions/source/resource/oooresourceloader.hxx delete mode 100644 extensions/source/resource/res.component delete mode 100644 extensions/source/resource/resourceservices.cxx delete mode 100644 extensions/source/scanner/strings.src delete mode 100644 extensions/source/update/check/updatehdl.hrc delete mode 100644 extensions/source/update/check/updatehdl.src create mode 100644 filter/AllLangMoTarget_flt.mk delete mode 100644 filter/AllLangResTarget_eps.mk delete mode 100644 filter/AllLangResTarget_pdffilter.mk delete mode 100644 filter/AllLangResTarget_t602filter.mk delete mode 100644 filter/AllLangResTarget_xsltdlg.mk create mode 100644 filter/inc/strings.hrc delete mode 100644 filter/source/graphicfilter/eps/epsstr.src delete mode 100644 filter/source/graphicfilter/eps/strings.hrc delete mode 100644 filter/source/pdf/impdialog.hrc delete mode 100644 filter/source/pdf/impdialog.src delete mode 100644 filter/source/pdf/pdf.hrc delete mode 100644 filter/source/pdf/pdf.src delete mode 100644 filter/source/t602/t602filter.hrc delete mode 100644 filter/source/t602/t602filter.src delete mode 100644 filter/source/xsltdialog/xmlfilterdialogstrings.hrc delete mode 100644 filter/source/xsltdialog/xmlfilterdialogstrings.src create mode 100644 forms/AllLangMoTarget_frm.mk delete mode 100644 forms/AllLangResTarget_frm.mk create mode 100644 forms/inc/strings.hrc delete mode 100644 forms/source/inc/frm_resource.hrc delete mode 100644 forms/source/resource/strings.src delete mode 100644 forms/source/resource/xforms.src create mode 100644 formula/AllLangMoTarget_for.mk delete mode 100644 formula/AllLangResTarget_for.mk delete mode 100644 formula/AllLangResTarget_forui.mk create mode 100644 formula/inc/core_resource.hrc rename sw/source/uibase/envelp/label.hrc => formula/inc/strings.hrc (63%) delete mode 100644 formula/source/core/inc/core_resource.hrc delete mode 100644 formula/source/core/resource/core_resource.src delete mode 100644 formula/source/ui/dlg/formdlgs.src delete mode 100644 formula/source/ui/inc/ForResId.hrc create mode 100644 fpicker/AllLangMoTarget_fps.mk delete mode 100644 fpicker/AllLangResTarget_fps_office.mk rename fpicker/{source/office => inc}/fpsofficeResMgr.hxx (61%) create mode 100644 fpicker/inc/strings.hrc delete mode 100644 fpicker/source/office/OfficeFilePicker.hrc delete mode 100644 fpicker/source/office/OfficeFilePicker.src delete mode 100644 fpicker/source/office/iodlg.hrc delete mode 100644 fpicker/source/office/iodlg.src create mode 100644 framework/AllLangMoTarget_fwk.mk delete mode 100644 framework/AllLangResTarget_fwe.mk delete mode 100644 framework/inc/classes/resource.hrc rename basic/inc/sb.hrc => framework/inc/classes/resource.hxx (70%) create mode 100644 framework/inc/strings.hrc delete mode 100644 framework/source/classes/resource.src create mode 100644 i18nlangtag/Executable_localestr.mk create mode 100644 i18nlangtag/source/localestr/localestr.cxx delete mode 100644 include/comphelper/officeresourcebundle.hxx create mode 100644 include/fpicker/fpicker.hrc delete mode 100644 include/rsc/rsc-vcl-shared-types.hxx create mode 100644 include/sfx2/strings.hrc delete mode 100644 include/sfx2/templatelocnames.hrc delete mode 100644 include/svl/style.hrc rename include/svtools/{controldims.hrc => controldims.hxx} (100%) delete mode 100644 include/svtools/filedlg2.hrc delete mode 100644 include/svtools/sores.hxx create mode 100644 include/svtools/strings.hrc delete mode 100644 include/svtools/svtools.hrc delete mode 100644 include/svx/fmresids.hrc create mode 100644 include/svx/strings.hrc delete mode 100644 include/svx/svdstr.hrc delete mode 100644 include/tools/rcid.h delete mode 100644 include/tools/resid.hxx delete mode 100644 include/tools/simplerm.hxx delete mode 100644 include/vcl/fpicker.hrc delete mode 100644 l10ntools/Executable_transex3.mk delete mode 100644 l10ntools/Executable_uiex.mk delete mode 100644 l10ntools/source/export.cxx delete mode 100644 l10ntools/source/uimerge.cxx delete mode 100644 offapi/com/sun/star/resource/OfficeResourceLoader.idl delete mode 100644 offapi/com/sun/star/resource/XResourceBundle.idl delete mode 100644 offapi/com/sun/star/resource/XResourceBundleLoader.idl rename extensions/AllLangResTarget_upd.mk => reportdesign/AllLangMoTarget_rpt.mk (52%) delete mode 100644 reportdesign/AllLangResTarget_rpt.mk delete mode 100644 reportdesign/AllLangResTarget_rptui.mk delete mode 100644 reportdesign/inc/ModuleHelper.hxx delete mode 100644 reportdesign/inc/RptResId.hrc rename dbaccess/source/inc/sdbtstrings.hrc => reportdesign/inc/core_resource.hxx (78%) create mode 100644 reportdesign/inc/stringarray.hrc create mode 100644 reportdesign/inc/strings.hrc delete mode 100644 reportdesign/source/core/inc/core_resource.hrc delete mode 100644 reportdesign/source/core/inc/core_resource.hxx delete mode 100644 reportdesign/source/core/resource/strings.src delete mode 100644 reportdesign/source/core/sdr/ModuleHelper.cxx delete mode 100644 reportdesign/source/inc/corestrings.hrc delete mode 100644 reportdesign/source/inc/stringconstants.hrc delete mode 100644 reportdesign/source/inc/uistrings.hrc delete mode 100644 reportdesign/source/inc/xmlstrings.hrc delete mode 100644 reportdesign/source/ui/dlg/CondFormat.src delete mode 100644 reportdesign/source/ui/dlg/GroupsSorting.src delete mode 100644 reportdesign/source/ui/dlg/Navigator.src delete mode 100644 reportdesign/source/ui/dlg/PageNumber.src delete mode 100644 reportdesign/source/ui/inspection/inspection.src delete mode 100644 reportdesign/source/ui/report/report.src delete mode 100644 rsc/Executable_rsc.mk delete mode 100644 rsc/Makefile delete mode 100644 rsc/README delete mode 100644 rsc/documentation/rsc.odt delete mode 100644 rsc/documentation/rscerror.odt delete mode 100644 rsc/documentation/rscinst.odt delete mode 100644 rsc/inc/rscall.h delete mode 100644 rsc/inc/rscarray.hxx delete mode 100644 rsc/inc/rscclass.hxx delete mode 100644 rsc/inc/rscclobj.hxx delete mode 100644 rsc/inc/rscconst.hxx delete mode 100644 rsc/inc/rsccont.hxx delete mode 100644 rsc/inc/rscdb.hxx delete mode 100644 rsc/inc/rscdef.hxx delete mode 100644 rsc/inc/rscerror.h delete mode 100644 rsc/inc/rschash.hxx delete mode 100644 rsc/inc/rsckey.hxx delete mode 100644 rsc/inc/rsclex.hxx delete mode 100644 rsc/inc/rscmgr.hxx delete mode 100644 rsc/inc/rscpar.hxx delete mode 100644 rsc/inc/rscrange.hxx delete mode 100644 rsc/inc/rscrsc.hxx delete mode 100644 rsc/inc/rscstr.hxx delete mode 100644 rsc/inc/rsctools.hxx delete mode 100644 rsc/inc/rsctop.hxx delete mode 100644 rsc/inc/rsctree.hxx delete mode 100644 rsc/source/parser/erscerr.cxx delete mode 100644 rsc/source/parser/rscdb.cxx delete mode 100644 rsc/source/parser/rscibas.cxx delete mode 100644 rsc/source/parser/rscicpx.cxx delete mode 100644 rsc/source/parser/rscinit.cxx delete mode 100644 rsc/source/parser/rsckey.cxx delete mode 100644 rsc/source/parser/rsclex.cxx delete mode 100644 rsc/source/parser/rscpar.cxx delete mode 100644 rsc/source/parser/rscyacc.y delete mode 100644 rsc/source/prj/gui.cxx delete mode 100644 rsc/source/prj/gui.hxx delete mode 100644 rsc/source/prj/start.cxx delete mode 100644 rsc/source/res/rscall.cxx delete mode 100644 rsc/source/res/rscarray.cxx delete mode 100644 rsc/source/res/rscclass.cxx delete mode 100644 rsc/source/res/rscclobj.cxx delete mode 100644 rsc/source/res/rscconst.cxx delete mode 100644 rsc/source/res/rsccont.cxx delete mode 100644 rsc/source/res/rscmgr.cxx delete mode 100644 rsc/source/res/rscrange.cxx delete mode 100644 rsc/source/res/rscstr.cxx delete mode 100644 rsc/source/res/rsctop.cxx delete mode 100644 rsc/source/rsc/rsc.cxx delete mode 100644 rsc/source/rscpp/cpp.h delete mode 100644 rsc/source/rscpp/cpp1.c delete mode 100644 rsc/source/rscpp/cpp2.c delete mode 100644 rsc/source/rscpp/cpp3.c delete mode 100644 rsc/source/rscpp/cpp4.c delete mode 100644 rsc/source/rscpp/cpp5.c delete mode 100644 rsc/source/rscpp/cpp6.c delete mode 100644 rsc/source/rscpp/cppdef.h delete mode 100644 rsc/source/tools/rscchar.cxx delete mode 100644 rsc/source/tools/rscdef.cxx delete mode 100644 rsc/source/tools/rschash.cxx delete mode 100644 rsc/source/tools/rsctools.cxx delete mode 100644 rsc/source/tools/rsctree.cxx create mode 100644 sc/AllLangMoTarget_sc.mk delete mode 100644 sc/AllLangResTarget_sc.mk create mode 100644 sc/inc/compiler.hrc create mode 100644 sc/inc/pvfundlg.hrc create mode 100644 sc/inc/scerrors.hrc rename dbaccess/source/sdbtools/inc/module_sdbt.hxx => sc/inc/scfuncs.hxx (68%) rename cui/source/dialogs/svuidlg.src => sc/inc/scstyles.hrc (53%) create mode 100644 sc/inc/strings.hrc rename include/rsc/rscsfx.hxx => sc/inc/units.hrc (60%) delete mode 100644 sc/source/core/src/compiler.src delete mode 100644 sc/source/ui/StatisticsDialogs/StatisticsDialogs.src delete mode 100644 sc/source/ui/cctrl/checklistmenu.src delete mode 100644 sc/source/ui/dbgui/asciiopt.hrc delete mode 100644 sc/source/ui/dbgui/outline.src delete mode 100644 sc/source/ui/dbgui/pvfundlg.hrc delete mode 100644 sc/source/ui/dbgui/pvfundlg.src delete mode 100644 sc/source/ui/miscdlgs/acredlin.src delete mode 100644 sc/source/ui/miscdlgs/conflictsdlg.src delete mode 100644 sc/source/ui/miscdlgs/retypepassdlg.src delete mode 100644 sc/source/ui/navipi/navipi.src delete mode 100644 sc/source/ui/src/globstr.src delete mode 100644 sc/source/ui/src/sc.src delete mode 100644 sc/source/ui/src/scerrors.src delete mode 100644 sc/source/ui/src/scfuncs.src delete mode 100644 sc/source/ui/src/scstring.src delete mode 100644 sc/source/ui/src/toolbox.src delete mode 100644 sc/source/ui/styleui/scstyles.src create mode 100644 scaddins/AllLangMoTarget_sca.mk delete mode 100644 scaddins/AllLangResTarget_analysis.mk delete mode 100644 scaddins/AllLangResTarget_date.mk delete mode 100644 scaddins/AllLangResTarget_pricing.mk create mode 100644 scaddins/inc/analysis.hrc create mode 100644 scaddins/inc/datefunc.hrc create mode 100644 scaddins/inc/pricing.hrc create mode 100644 scaddins/inc/strings.hrc delete mode 100644 scaddins/source/analysis/analysis.hrc delete mode 100644 scaddins/source/analysis/analysis.src delete mode 100644 scaddins/source/analysis/analysis_funcnames.src delete mode 100644 scaddins/source/datefunc/datefunc.hrc delete mode 100644 scaddins/source/datefunc/datefunc.src delete mode 100644 scaddins/source/pricing/pricing.hrc delete mode 100644 scaddins/source/pricing/pricing.src create mode 100644 sccomp/AllLangMoTarget_scc.mk delete mode 100644 sccomp/AllLangResTarget_solver.mk create mode 100644 sccomp/inc/strings.hrc delete mode 100644 sccomp/source/solver/solver.hrc delete mode 100644 sccomp/source/solver/solver.src delete mode 100644 scp2/source/ooo/file_resource_ooo.scp create mode 100644 sd/AllLangMoTarget_sd.mk delete mode 100644 sd/AllLangResTarget_sd.mk create mode 100644 sd/inc/DocumentRenderer.hrc rename sd/{source/ui/app/res_bmp.src => inc/errhdl.hrc} (52%) rename sfx2/source/dialog/templdlg.src => sd/inc/family.hrc (55%) create mode 100644 sd/inc/strings.hrc delete mode 100644 sd/source/core/glob.src delete mode 100644 sd/source/ui/accessibility/accessibility.hrc delete mode 100644 sd/source/ui/accessibility/accessibility.src delete mode 100644 sd/source/ui/animations/CustomAnimation.hrc delete mode 100644 sd/source/ui/animations/CustomAnimation.src delete mode 100644 sd/source/ui/annotations/annotations.hrc delete mode 100644 sd/source/ui/annotations/annotations.src delete mode 100644 sd/source/ui/app/sdstring.src delete mode 100644 sd/source/ui/app/strings.src delete mode 100644 sd/source/ui/app/toolbox.src delete mode 100644 sd/source/ui/inc/res_bmp.hrc delete mode 100644 sd/source/ui/inc/sdstring.hrc delete mode 100644 sd/source/ui/inc/strings.hrc delete mode 100644 sd/source/ui/view/DocumentRenderer.src create mode 100644 sfx2/AllLangMoTarget_sfx2.mk delete mode 100644 sfx2/AllLangResTarget_sfx2.mk delete mode 100644 sfx2/inc/app.hrc create mode 100644 sfx2/inc/dinfdlg.hrc delete mode 100644 sfx2/inc/doc.hrc rename svx/source/dialog/srchdlg.src => sfx2/inc/doctempl.hrc (54%) delete mode 100644 sfx2/inc/filedlghelper.hrc delete mode 100644 sfx2/source/appl/app.src delete mode 100644 sfx2/source/appl/newhelp.src delete mode 100644 sfx2/source/appl/sfx.src delete mode 100644 sfx2/source/bastyp/bastyp.hrc delete mode 100644 sfx2/source/bastyp/fltfnc.src delete mode 100644 sfx2/source/control/templateview.hrc delete mode 100644 sfx2/source/control/templateview.src delete mode 100644 sfx2/source/dialog/dialog.hrc delete mode 100644 sfx2/source/dialog/dialog.src delete mode 100644 sfx2/source/dialog/dinfdlg.hrc delete mode 100644 sfx2/source/dialog/dinfdlg.src delete mode 100644 sfx2/source/dialog/filedlghelper.src delete mode 100644 sfx2/source/dialog/newstyle.src delete mode 100644 sfx2/source/dialog/recfloat.src delete mode 100644 sfx2/source/dialog/taskpane.src delete mode 100644 sfx2/source/dialog/versdlg.src delete mode 100644 sfx2/source/doc/doc.src delete mode 100644 sfx2/source/doc/doctempl.src delete mode 100644 sfx2/source/doc/templatelocnames.src delete mode 100644 sfx2/source/inc/sfxlocal.hrc delete mode 100644 sfx2/source/sidebar/Sidebar.hrc delete mode 100644 sfx2/source/sidebar/Sidebar.src delete mode 100644 sfx2/source/view/view.hrc delete mode 100644 sfx2/source/view/view.src create mode 100755 solenv/bin/hrcex create mode 100755 solenv/bin/uiex delete mode 100644 solenv/bin/uilangfilter.xslt delete mode 100644 solenv/doc/gbuild/solenv/gbuild/alllangres.mk create mode 100644 solenv/gbuild/AllLangMoTarget.mk delete mode 100644 solenv/gbuild/AllLangResTarget.mk create mode 100644 starmath/AllLangMoTarget_sm.mk delete mode 100644 starmath/AllLangResTarget_sm.mk create mode 100644 starmath/inc/smmod.hrc create mode 100644 starmath/inc/strings.hrc delete mode 100644 starmath/source/commands.src delete mode 100644 starmath/source/smres.src delete mode 100644 starmath/source/symbol.src create mode 100644 svl/AllLangMoTarget_svl.mk delete mode 100644 svl/AllLangResTarget_svl.mk delete mode 100644 svl/source/misc/mediatyp.src create mode 100644 svtools/AllLangMoTarget_svt.mk delete mode 100644 svtools/AllLangResTarget_svt.mk create mode 100644 svtools/inc/errtxt.hrc create mode 100644 svtools/inc/langtab.hrc rename svtools/{source/contnr => inc}/templwin.hrc (58%) delete mode 100644 svtools/source/contnr/fileview.src delete mode 100644 svtools/source/contnr/svcontnr.src delete mode 100644 svtools/source/contnr/templwin.src delete mode 100644 svtools/source/control/calendar.src delete mode 100644 svtools/source/control/ctrlbox.src delete mode 100644 svtools/source/control/ctrltool.src delete mode 100644 svtools/source/control/filectrl.src delete mode 100644 svtools/source/control/ruler.src delete mode 100644 svtools/source/dialogs/addresstemplate.src delete mode 100644 svtools/source/dialogs/filedlg2.src delete mode 100644 svtools/source/dialogs/formats.src delete mode 100644 svtools/source/dialogs/so3res.src delete mode 100644 svtools/source/dialogs/wizardmachine.src delete mode 100644 svtools/source/inc/filectrl.hrc delete mode 100644 svtools/source/java/javaerror.src delete mode 100644 svtools/source/misc/errtxt.src delete mode 100644 svtools/source/misc/imagemgr.src delete mode 100644 svtools/source/misc/langtab.src delete mode 100644 svtools/source/misc/svtools.src delete mode 100644 svtools/source/misc/undo.src create mode 100644 svx/AllLangMoTarget_svx.mk delete mode 100644 svx/AllLangResTarget_gal.mk delete mode 100644 svx/AllLangResTarget_svx.mk delete mode 100644 svx/inc/accessibility.hrc create mode 100644 svx/inc/fieldunit.hrc create mode 100644 svx/inc/fmstring.hrc create mode 100644 svx/inc/frmsel.hrc delete mode 100644 svx/inc/gallery.hrc delete mode 100644 svx/inc/galtheme.hrc create mode 100644 svx/inc/numberingtype.hrc create mode 100644 svx/inc/page.hrc create mode 100644 svx/inc/samecontent.hrc create mode 100644 svx/inc/spacing.hrc create mode 100644 svx/inc/svxerr.hrc create mode 100644 svx/inc/swframeposstrings.hrc rename desktop/source/deployment/registry/configuration/dp_configuration.hrc => svx/inc/tabwin.hrc (76%) create mode 100644 svx/inc/txenctab.hrc create mode 100644 svx/inc/ucsubsetstruct.hrc delete mode 100644 svx/source/accessibility/accessibility.src delete mode 100644 svx/source/core/graphichelper.src delete mode 100644 svx/source/dialog/bmpmask.hrc delete mode 100644 svx/source/dialog/bmpmask.src delete mode 100644 svx/source/dialog/compressgraphicdialog.hrc delete mode 100644 svx/source/dialog/compressgraphicdialog.src delete mode 100644 svx/source/dialog/dlgctrl.src delete mode 100644 svx/source/dialog/docrecovery.src delete mode 100644 svx/source/dialog/frmsel.src delete mode 100644 svx/source/dialog/language.src delete mode 100644 svx/source/dialog/numberingtype.src delete mode 100644 svx/source/dialog/page.src delete mode 100644 svx/source/dialog/passwd.src delete mode 100644 svx/source/dialog/prtqry.src delete mode 100644 svx/source/dialog/ruler.src delete mode 100644 svx/source/dialog/samecontent.src delete mode 100644 svx/source/dialog/sdstring.src delete mode 100644 svx/source/dialog/spacing.src delete mode 100644 svx/source/dialog/svxbmpnumvalueset.src delete mode 100644 svx/source/dialog/swframeposstrings.src delete mode 100644 svx/source/dialog/txenctab.src delete mode 100644 svx/source/dialog/ucsubset.src delete mode 100644 svx/source/engine3d/float3d.src delete mode 100644 svx/source/engine3d/string3d.src delete mode 100644 svx/source/form/datanavi.src delete mode 100644 svx/source/form/fmstring.src delete mode 100644 svx/source/gallery2/gallery.src delete mode 100644 svx/source/gallery2/galtheme.src delete mode 100644 svx/source/items/svxerr.src delete mode 100644 svx/source/items/svxitems.src delete mode 100644 svx/source/stbctrls/stbctrls.src delete mode 100644 svx/source/svdraw/svdstr.src delete mode 100644 svx/source/table/table.src delete mode 100644 svx/source/tbxctrls/colrctrl.src delete mode 100644 svx/source/tbxctrls/extrusioncontrols.hrc delete mode 100644 svx/source/tbxctrls/extrusioncontrols.src delete mode 100644 svx/source/tbxctrls/fontworkgallery.src delete mode 100644 svx/source/tbxctrls/grafctrl.src delete mode 100644 svx/source/tbxctrls/lboxctrl.src delete mode 100644 svx/source/tbxctrls/tbcontrl.src delete mode 100644 svx/source/tbxctrls/tbunosearchcontrollers.src delete mode 100644 svx/source/toolbars/extrusionbar.src delete mode 100644 svx/source/toolbars/fontworkbar.src create mode 100644 sw/AllLangMoTarget_sw.mk delete mode 100644 sw/AllLangResTarget_sw.mk delete mode 100644 sw/inc/access.hrc create mode 100644 sw/inc/app.hrc create mode 100644 sw/inc/cnttab.hrc delete mode 100644 sw/inc/dochdl.hrc delete mode 100644 sw/inc/envelp.hrc create mode 100644 sw/inc/error.hrc rename cui/source/dialogs/multipat.src => sw/inc/mmaddressblockpage.hrc (68%) rename formula/source/ui/dlg/parawin.src => sw/inc/optload.hrc (57%) delete mode 100644 sw/inc/poolfmt.hrc delete mode 100644 sw/inc/statstr.hrc create mode 100644 sw/inc/strings.hrc delete mode 100644 sw/inc/unocore.hrc create mode 100644 sw/inc/utlui.hrc delete mode 100644 sw/source/core/inc/pagefrm.hrc delete mode 100644 sw/source/core/layout/pagefrm.src delete mode 100644 sw/source/core/undo/undo.src delete mode 100644 sw/source/core/unocore/unocore.src delete mode 100644 sw/source/ui/app/app.src delete mode 100644 sw/source/ui/app/error.src delete mode 100644 sw/source/ui/chrdlg/chrdlg.src delete mode 100644 sw/source/ui/config/config.hrc delete mode 100644 sw/source/ui/config/optdlg.src delete mode 100644 sw/source/ui/config/optload.src delete mode 100644 sw/source/ui/dbui/dbui.src delete mode 100644 sw/source/ui/dbui/mailmergewizard.src delete mode 100644 sw/source/ui/dbui/mmaddressblockpage.src delete mode 100644 sw/source/ui/dbui/selectdbtabledialog.src delete mode 100644 sw/source/ui/dialog/dialog.src delete mode 100644 sw/source/ui/dochdl/dochdl.src delete mode 100644 sw/source/ui/docvw/access.src delete mode 100644 sw/source/ui/docvw/annotation.src delete mode 100644 sw/source/ui/envelp/envelp.src delete mode 100644 sw/source/ui/envelp/label.src delete mode 100644 sw/source/ui/envelp/labfmt.hrc delete mode 100644 sw/source/ui/envelp/labfmt.src delete mode 100644 sw/source/ui/fldui/fldui.src delete mode 100644 sw/source/ui/frmdlg/frmui.src delete mode 100644 sw/source/ui/globdoc/globdoc.src delete mode 100644 sw/source/ui/index/cnttab.src delete mode 100644 sw/source/ui/index/idxmrk.src delete mode 100644 sw/source/ui/misc/glossary.src delete mode 100644 sw/source/ui/misc/swruler.src delete mode 100644 sw/source/ui/shells/shells.src delete mode 100644 sw/source/ui/sidebar/PagePropertyPanel.src delete mode 100644 sw/source/ui/utlui/poolfmt.src delete mode 100644 sw/source/ui/utlui/utlui.src delete mode 100644 sw/source/ui/web/web.src delete mode 100644 sw/source/uibase/dbui/mailmergechildwindow.src delete mode 100644 sw/source/uibase/dialog/regionsw.hrc delete mode 100644 sw/source/uibase/dialog/regionsw.src delete mode 100644 sw/source/uibase/docvw/annotation.hrc delete mode 100644 sw/source/uibase/docvw/docvw.hrc delete mode 100644 sw/source/uibase/docvw/docvw.src delete mode 100644 sw/source/uibase/inc/app.hrc delete mode 100644 sw/source/uibase/inc/globdoc.hrc delete mode 100644 sw/source/uibase/inc/ribbar.hrc delete mode 100644 sw/source/uibase/inc/shells.hrc delete mode 100644 sw/source/uibase/inc/utlui.hrc delete mode 100644 sw/source/uibase/inc/web.hrc delete mode 100644 sw/source/uibase/lingu/olmenu.src delete mode 100644 sw/source/uibase/ribbar/inputwin.src delete mode 100644 sw/source/uibase/ribbar/workctrl.src delete mode 100644 sw/source/uibase/sidebar/PropertyPanel.hrc delete mode 100644 sw/source/uibase/uiview/view.hrc delete mode 100644 sw/source/uibase/uiview/view.src delete mode 100644 sw/source/uibase/utlui/attrdesc.hrc delete mode 100644 sw/source/uibase/utlui/attrdesc.src delete mode 100644 sw/source/uibase/utlui/initui.src delete mode 100644 sw/source/uibase/utlui/navipi.src delete mode 100644 sw/source/uibase/utlui/statusbar.src delete mode 100644 sw/source/uibase/utlui/unotools.hrc delete mode 100644 sw/source/uibase/utlui/unotools.src delete mode 100644 sw/source/uibase/wrtsh/wrtsh.src delete mode 100644 tools/source/rc/rc.cxx delete mode 100644 tools/source/rc/resary.cxx create mode 100644 uui/AllLangMoTarget_uui.mk delete mode 100644 uui/AllLangResTarget_uui.mk create mode 100644 uui/inc/ids.hrc rename uui/{source/ids.hrc => inc/ids.hxx} (68%) create mode 100644 uui/inc/strings.hrc delete mode 100644 uui/source/alreadyopen.src delete mode 100644 uui/source/filechanged.src delete mode 100644 uui/source/ids.src delete mode 100644 uui/source/lockcorrupt.src delete mode 100644 uui/source/lockfailed.src delete mode 100644 uui/source/nameclashdlg.src delete mode 100644 uui/source/openlocked.src delete mode 100644 uui/source/passworddlg.src delete mode 100644 uui/source/passworderrs.src delete mode 100644 uui/source/trylater.src create mode 100644 vcl/AllLangMoTarget_vcl.mk delete mode 100644 vcl/AllLangResTarget_vcl.mk create mode 100644 vcl/inc/print.hrc rename basctl/source/basicide/moduldlg.src => vcl/inc/printaccessoryview.hrc (65%) create mode 100644 vcl/inc/strings.hrc rename svx/source/dialog/SafeMode.src => vcl/inc/strings.hxx (73%) delete mode 100644 vcl/inc/svids.hrc create mode 100644 vcl/inc/units.hrc delete mode 100644 vcl/source/edit/textundo.hrc delete mode 100644 vcl/source/edit/textundo.src delete mode 100644 vcl/source/src/app.src delete mode 100644 vcl/source/src/btntext.src delete mode 100644 vcl/source/src/fpicker.src delete mode 100644 vcl/source/src/helptext.src delete mode 100644 vcl/source/src/menu.src delete mode 100644 vcl/source/src/print.src delete mode 100644 vcl/source/src/stdtext.src delete mode 100644 vcl/source/src/units.src delete mode 100644 winaccessibility/inc/AccResource.hxx delete mode 100644 winaccessibility/source/service/AccResource.cxx create mode 100644 wizards/AllLangMoTarget_wiz.mk delete mode 100644 wizards/AllLangResTarget_dbw.mk delete mode 100644 wizards/com/sun/star/wizards/common/Resource.py create mode 100644 wizards/com/sun/star/wizards/common/strings.hrc delete mode 100644 wizards/source/formwizard/dbwizres.src create mode 100644 writerperfect/AllLangMoTarget_wpt.mk delete mode 100644 writerperfect/AllLangResTarget_writerperfect.mk delete mode 100644 writerperfect/source/common/strings.src create mode 100644 xmlsecurity/AllLangMoTarget_xsc.mk delete mode 100644 xmlsecurity/AllLangResTarget_xsec.mk delete mode 100644 xmlsecurity/inc/global.hrc create mode 100644 xmlsecurity/inc/strings.hrc delete mode 100644 xmlsecurity/source/component/warnbox.src delete mode 100644 xmlsecurity/source/dialogs/certificateviewer.src delete mode 100644 xmlsecurity/source/dialogs/dialogs.hrc delete mode 100644 xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc delete mode 100644 xmlsecurity/source/dialogs/digitalsignaturesdialog.src diff --git a/Makefile.in b/Makefile.in index e1c4c857e911..0f75925e0e49 100644 --- a/Makefile.in +++ b/Makefile.in @@ -116,7 +116,6 @@ $(eval $(call gb_Top_GbuildModulesRules,$(gbuild_modules))) gbuild_TARGETS := AllLangHelp \ AllLangPackage \ - AllLangResTarget \ AutoInstall \ CliLibrary \ CliNativeLibrary \ @@ -470,7 +469,7 @@ $(foreach ide,\ eclipsecdt,\ $(eval $(call gb_Top_GbuildToIdeIntegrationNS,$(ide)))) -fuzzers: Library_sal Library_salhelper Library_reg Library_store Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper Library_comphelper StaticLibrary_ulingu StaticLibrary_findsofficepath Library_tl Library_basegfx Library_canvastools Library_cppcanvas Library_dbtools Library_deploymentmisc Library_deploymentmisc Library_editeng Library_fwe Library_fwi Library_i18nutil Library_localebe1 Library_sax Library_sofficeapp Library_ucbhelper Library_opencl Rdb_services udkapi offapi Library_clew Library_gie Library_icg Library_reflection Library_invocadapt Library_bootstrap Library_introspection Library_stocservices Library_xmlreader Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_fuzzerstubs StaticLibrary_fuzzer_core StaticLibrary_fuzzer_calc StaticLibrary_fuzzer_draw StaticLibrary_fuzzer_writer Library_forui Executable_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer Executable_xbmfuzzer Executable_xpmfuzzer Executable_pngfuzzer Executable_bmpfuzzer Executable_svmfuzzer Executable_pcdfuzzer Executable_dxffuzzer Executable_metfuzzer Executable_ppmfuzzer Executable_psdfuzzer Executable_epsfuzzer Executable_pctfuzzer Executable_pcxfuzzer Executable_rasfuzzer Executable_tgafuzzer Executable_tiffuzzer Executable_hwpfuzzer Executable_602fuzzer Executable_lwpfuzzer Executable_olefuzzer AllLangResTarget_sd Executable_pptfuzzer Executable_rtffuzzer Executable_cgmfuzzer Executable_ww2fuzzer Executable_ww6fuzzer Executable_ww8fuzzer Executable_qpwfuzzer +fuzzers: Library_sal Library_salhelper Library_reg Library_store Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper Library_comphelper StaticLibrary_ulingu StaticLibrary_findsofficepath Library_tl Library_basegfx Library_canvastools Library_cppcanvas Library_dbtools Library_deploymentmisc Library_deploymentmisc Library_editeng Library_fwe Library_fwi Library_i18nutil Library_localebe1 Library_sax Library_sofficeapp Library_ucbhelper Library_opencl Rdb_services udkapi offapi Library_clew Library_gie Library_icg Library_reflection Library_invocadapt Library_bootstrap Library_introspection Library_stocservices Library_xmlreader Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_fuzzerstubs StaticLibrary_fuzzer_core StaticLibrary_fuzzer_calc StaticLibrary_fuzzer_draw StaticLibrary_fuzzer_writer Library_forui Executable_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer Executable_xbmfuzzer Executable_xpmfuzzer Executable_pngfuzzer Executable_bmpfuzzer Executable_svmfuzzer Executable_pcdfuzzer Executable_dxffuzzer Executable_metfuzzer Executable_ppmfuzzer Executable_psdfuzzer Executable_epsfuzzer Executable_pctfuzzer Executable_pcxfuzzer Executable_rasfuzzer Executable_tgafuzzer Executable_tiffuzzer Executable_hwpfuzzer Executable_602fuzzer Executable_lwpfuzzer Executable_olefuzzer Executable_pptfuzzer Executable_rtffuzzer Executable_cgmfuzzer Executable_ww2fuzzer Executable_ww6fuzzer Executable_ww8fuzzer Executable_qpwfuzzer endif # MAKE_RESTARTS diff --git a/Repository.mk b/Repository.mk index 6329a4eac6a5..c4d89a7c19f0 100644 --- a/Repository.mk +++ b/Repository.mk @@ -42,6 +42,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \ libtest \ lngconvex \ localize \ + localestr \ makedepend \ mbsdiff \ mork_helper \ @@ -52,14 +53,11 @@ $(eval $(call gb_Helper_register_executables,NONE, \ pocheck \ propex \ regsvrex \ - rsc \ saxparser \ sp2bv \ svg2odf \ svidl \ - transex3 \ treex \ - uiex \ ulfex \ unoidl-read \ unoidl-write \ @@ -388,7 +386,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ pcr \ pdffilter \ $(call gb_Helper_optional,SCRIPTING,protocolhandler) \ - res \ sax \ sb \ $(call gb_Helper_optional,DBCONNECTIVITY,sdbt) \ @@ -1057,60 +1054,39 @@ $(eval $(call gb_ExternalExecutable_register_executables,\ )) # Resources -$(eval $(call gb_Helper_register_resources,\ - abp \ +$(eval $(call gb_Helper_register_mos,\ acc \ - analysis \ avmedia \ $(call gb_Helper_optional,SCRIPTING,basctl) \ - $(call gb_Helper_optional,DBCONNECTIVITY,bib) \ - chartcontroller \ + chart \ cnr \ cui \ - date \ - $(call gb_Helper_optional,DBCONNECTIVITY,\ - dba \ - dbmm \ - dbp \ - dbu \ - ) \ - dbw \ - deployment \ - deploymentgui \ + $(call gb_Helper_optional,DBCONNECTIVITY,dba) \ dkt \ editeng \ - eps \ + flt \ for \ - forui \ - $(call gb_Helper_optional,DESKTOP,fps_office) \ + $(call gb_Helper_optional,DESKTOP,fps) \ frm \ - fwe \ - gal \ - $(call gb_Helper_optional,DBCONNECTIVITY,pcr) \ - pdffilter \ - pricing \ + fwk \ + pcr \ rpt \ - rptui \ $(call gb_Helper_optional,SCRIPTING,sb) \ sc \ - scn \ + sca \ + $(if $(ENABLE_COINMP)$(ENABLE_LPSOLVE),scc) \ sd \ - sdberr \ - $(call gb_Helper_optional,DBCONNECTIVITY,sdbt) \ sfx \ sm \ - $(if $(ENABLE_COINMP)$(ENABLE_LPSOLVE),solver) \ svl \ svt \ svx \ sw \ - t602filter \ - upd \ uui \ vcl \ - writerperfect \ - $(if $(ENABLE_NSS),xmlsec) \ - xsltdlg \ + wiz \ + wpt \ + $(if $(ENABLE_NSS),xsc) \ )) # UI configuration diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 67c078345d4d..2cd7d824fabb 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3778,7 +3778,6 @@ endef # FIXME: the library target should be for build too define gb_Executable__register_gengal $(call gb_Executable_add_runtime_dependencies,gengal,\ - $(call gb_AllLangResTarget_get_target,ofa) \ $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \ $(call gb_Package_get_target_for_build,postprocess_images) \ $(call gb_Package_get_target_for_build,postprocess_registry) \ @@ -3811,7 +3810,7 @@ endef define gb_Executable__register_localize $(call gb_Executable_add_runtime_dependencies,localize,\ - $(foreach exec,cfgex helpex propex transex3 treex uiex ulfex xrmex,\ + $(foreach exec,cfgex helpex propex treex ulfex xrmex,\ $(call gb_Executable_get_runtime_dependencies,$(exec)) \ ) \ ) diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk index 5f8cd46e68de..541940515eba 100644 --- a/RepositoryModule_build.mk +++ b/RepositoryModule_build.mk @@ -37,7 +37,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\ registry \ remotebridges \ ridljar \ - rsc \ sal \ salhelper \ sax \ diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 58aa6959c6b7..3b530286114e 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -101,7 +101,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ reportbuilder \ $(call gb_Helper_optional,DBCONNECTIVITY,reportdesign) \ ridljar \ - rsc \ sal \ salhelper \ sax \ diff --git a/accessibility/AllLangMoTarget_acc.mk b/accessibility/AllLangMoTarget_acc.mk new file mode 100644 index 000000000000..a45cee50ebcf --- /dev/null +++ b/accessibility/AllLangMoTarget_acc.mk @@ -0,0 +1,13 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# 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/. + +$(eval $(call gb_AllLangMoTarget_AllLangMoTarget,acc)) + +$(eval $(call gb_AllLangMoTarget_set_polocation,acc,accessibility)) + +# vim: set noet sw=4 ts=4: diff --git a/accessibility/AllLangResTarget_acc.mk b/accessibility/AllLangResTarget_acc.mk deleted file mode 100644 index 450a7f2cdd86..000000000000 --- a/accessibility/AllLangResTarget_acc.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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/. -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,acc)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,acc,accessibility)) - -$(eval $(call gb_AllLangResTarget_add_srs,acc,\ - acc/res \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,acc/res)) - -$(eval $(call gb_SrsTarget_set_include,acc/res,\ - $$(INCLUDE) \ - -I$(SRCDIR)/accessibility/inc \ -)) - -$(eval $(call gb_SrsTarget_add_files,acc/res,\ - accessibility/source/helper/accessiblestrings.src \ -)) - -# vim:set noet sw=4 ts=4: diff --git a/accessibility/Module_accessibility.mk b/accessibility/Module_accessibility.mk index 1c565a5d7234..de252a36d5ea 100644 --- a/accessibility/Module_accessibility.mk +++ b/accessibility/Module_accessibility.mk @@ -14,7 +14,7 @@ $(eval $(call gb_Module_add_targets,accessibility,\ )) $(eval $(call gb_Module_add_l10n_targets,accessibility,\ - AllLangResTarget_acc \ + AllLangMoTarget_acc \ )) # vim:set noet sw=4 ts=4: diff --git a/accessibility/inc/extended/textwindowaccessibility.hxx b/accessibility/inc/extended/textwindowaccessibility.hxx index b77173398a92..b5eaec4568b5 100644 --- a/accessibility/inc/extended/textwindowaccessibility.hxx +++ b/accessibility/inc/extended/textwindowaccessibility.hxx @@ -49,7 +49,7 @@ #include #include -#include +#include #include #include #include diff --git a/accessibility/inc/helper/accessiblestrings.hrc b/accessibility/inc/helper/accessiblestrings.hrc deleted file mode 100644 index 2af826891527..000000000000 --- a/accessibility/inc/helper/accessiblestrings.hrc +++ /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 . - */ - -#ifndef ACCESSIBILITY_HELPER_ACCESSIBLESTRINGS_HRC_ -#define ACCESSIBILITY_HELPER_ACCESSIBLESTRINGS_HRC_ - -#define RID_TK_ACC_START 1000 - -#define STR_SVT_ACC_ACTION_EXPAND ( RID_TK_ACC_START + 8 ) -#define STR_SVT_ACC_ACTION_COLLAPSE ( RID_TK_ACC_START + 9 ) -#define STR_SVT_ACC_LISTENTRY_SELCTED_STATE ( RID_TK_ACC_START + 10 ) - -#define RID_STR_ACC_ACTION_CHECK ( RID_TK_ACC_START + 11 ) -#define RID_STR_ACC_ACTION_UNCHECK ( RID_TK_ACC_START + 12 ) -#define RID_STR_ACC_SCROLLBAR_NAME_VERTICAL ( RID_TK_ACC_START + 14 ) -#define RID_STR_ACC_SCROLLBAR_NAME_HORIZONTAL ( RID_TK_ACC_START + 15 ) -#define RID_STR_ACC_PANEL_DESCRIPTION ( RID_TK_ACC_START + 16 ) - -#define RID_STR_ACC_COLUMN_NUM ( RID_TK_ACC_START + 17 ) -#define RID_STR_ACC_ROW_NUM ( RID_TK_ACC_START + 18 ) - -#define RID_STR_ACC_NAME_BROWSEBUTTON ( RID_TK_ACC_START + 100 ) - -#endif // ACCESSIBILITY_HELPER_ACCESSIBLESTRINGS_HRC_ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/inc/helper/accresmgr.hxx b/accessibility/inc/helper/accresmgr.hxx index 38ceaa172abd..24fa1cfa4721 100644 --- a/accessibility/inc/helper/accresmgr.hxx +++ b/accessibility/inc/helper/accresmgr.hxx @@ -22,11 +22,8 @@ #include -class SimpleResMgr; - #define TK_RES_STRING(id) ::accessibility::TkResMgr::loadString(id) - // TkResMgr namespace accessibility @@ -34,7 +31,7 @@ namespace accessibility class TkResMgr { - static SimpleResMgr* m_pImpl; + static std::locale* m_pImpl; private: // no instantiation allowed @@ -56,7 +53,7 @@ protected: public: // loads the string with the specified resource id - static OUString loadString( sal_uInt16 nResId ); + static OUString loadString(const char *pResId); }; } diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx index 791b194aa1af..7377c61a4f1b 100644 --- a/accessibility/inc/pch/precompiled_acc.hxx +++ b/accessibility/inc/pch/precompiled_acc.hxx @@ -283,7 +283,6 @@ #include #include #include -#include #include #include #include @@ -317,7 +316,6 @@ #include #include #include -#include #include #include #include diff --git a/accessibility/inc/strings.hrc b/accessibility/inc/strings.hrc new file mode 100644 index 000000000000..6e713e15d6b8 --- /dev/null +++ b/accessibility/inc/strings.hrc @@ -0,0 +1,39 @@ +/* -*- 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 ACCESSIBILITY_HELPER_ACCESSIBLESTRINGS_HRC_ +#define ACCESSIBILITY_HELPER_ACCESSIBLESTRINGS_HRC_ + +#define NC_(Context, String) (Context "\004" u8##String) + +#define RID_STR_ACC_NAME_BROWSEBUTTON NC_("RID_STR_ACC_NAME_BROWSEBUTTON", "Browse") +#define STR_SVT_ACC_ACTION_EXPAND NC_("STR_SVT_ACC_ACTION_EXPAND", "Expand" ) +#define STR_SVT_ACC_ACTION_COLLAPSE NC_("STR_SVT_ACC_ACTION_COLLAPSE", "Collapse") +#define STR_SVT_ACC_LISTENTRY_SELCTED_STATE NC_("STR_SVT_ACC_LISTENTRY_SELCTED_STATE", "(Selected)") +#define RID_STR_ACC_ACTION_CHECK NC_("RID_STR_ACC_ACTION_CHECK", "Check") +#define RID_STR_ACC_ACTION_UNCHECK NC_("RID_STR_ACC_ACTION_UNCHECK", "Uncheck") +#define RID_STR_ACC_SCROLLBAR_NAME_VERTICAL NC_("RID_STR_ACC_SCROLLBAR_NAME_VERTICAL", "Vertical scroll bar") +#define RID_STR_ACC_SCROLLBAR_NAME_HORIZONTAL NC_("RID_STR_ACC_SCROLLBAR_NAME_HORIZONTAL", "Horizontal scroll bar") +#define RID_STR_ACC_PANEL_DESCRIPTION NC_("RID_STR_ACC_PANEL_DESCRIPTION", "Please press enter to go into child control for more operations") +#define RID_STR_ACC_COLUMN_NUM NC_("RID_STR_ACC_COLUMN_NUM", "Column %COLUMNNUMBER") +#define RID_STR_ACC_ROW_NUM NC_("RID_STR_ACC_ROW_NUM", "Row %ROWNUMBER") + +#endif // ACCESSIBILITY_HELPER_ACCESSIBLESTRINGS_HRC_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx index 8f240b20795f..b2741e246df1 100644 --- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx +++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx @@ -18,7 +18,7 @@ */ #include -#include +#include #include #include diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index 3c17f1675909..2eef354aa240 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.cxx @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #define ACCESSIBLE_ACTION_COUNT 1 diff --git a/accessibility/source/helper/accessiblestrings.src b/accessibility/source/helper/accessiblestrings.src deleted file mode 100644 index 127c336ff1b8..000000000000 --- a/accessibility/source/helper/accessiblestrings.src +++ /dev/null @@ -1,75 +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 - -String RID_STR_ACC_NAME_BROWSEBUTTON -{ - Text [ en-US ] = "Browse"; -}; - -String STR_SVT_ACC_ACTION_EXPAND -{ - Text [ en-US ] = "Expand" ; -}; - -String STR_SVT_ACC_ACTION_COLLAPSE -{ - Text [ en-US ] = "Collapse"; -}; - -String STR_SVT_ACC_LISTENTRY_SELCTED_STATE -{ - Text [ en-US ] = "(Selected)"; -}; - -String RID_STR_ACC_ACTION_CHECK -{ - Text [ en-US ] = "Check"; -}; -String RID_STR_ACC_ACTION_UNCHECK -{ - Text [ en-US ] = "Uncheck"; -}; - -String RID_STR_ACC_SCROLLBAR_NAME_VERTICAL -{ - Text [ en-US ] = "Vertical scroll bar"; -}; -String RID_STR_ACC_SCROLLBAR_NAME_HORIZONTAL -{ - Text [ en-US ] = "Horizontal scroll bar"; -}; - -String RID_STR_ACC_PANEL_DESCRIPTION -{ - Text [ en-US ] = "Please press enter to go into child control for more operations"; -}; - -String RID_STR_ACC_COLUMN_NUM -{ - Text [ en-US ] = "Column %COLUMNNUMBER"; -}; - -String RID_STR_ACC_ROW_NUM -{ - Text [ en-US ] = "Row %ROWNUMBER"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/helper/accresmgr.cxx b/accessibility/source/helper/accresmgr.cxx index ca09872bc8c3..a7d57156df95 100644 --- a/accessibility/source/helper/accresmgr.cxx +++ b/accessibility/source/helper/accresmgr.cxx @@ -19,7 +19,7 @@ #include -#include +#include #include #include @@ -27,22 +27,19 @@ using namespace accessibility; // TkResMgr - -SimpleResMgr* TkResMgr::m_pImpl = nullptr; - +std::locale* TkResMgr::m_pImpl = nullptr; TkResMgr::EnsureDelete::~EnsureDelete() { delete TkResMgr::m_pImpl; } - void TkResMgr::ensureImplExists() { if (m_pImpl) return; - m_pImpl = SimpleResMgr::Create("acc", Application::GetSettings().GetUILanguageTag() ); + m_pImpl = new std::locale(Translate::Create("acc", Application::GetSettings().GetUILanguageTag())); if (m_pImpl) { @@ -51,17 +48,15 @@ void TkResMgr::ensureImplExists() } } - -OUString TkResMgr::loadString( sal_uInt16 nResId ) +OUString TkResMgr::loadString(const char *pResId) { OUString sReturn; ensureImplExists(); - if ( m_pImpl ) - sReturn = m_pImpl->ReadString( nResId ); + if (m_pImpl) + sReturn = Translate::get(pResId, *m_pImpl); return sReturn; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx index 32fec8247a8c..8e6f69423af3 100644 --- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx +++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx @@ -21,7 +21,7 @@ #include -#include +#include #include #include diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx index b5a4a168ed48..c1df7719f323 100644 --- a/accessibility/source/standard/vclxaccessiblebox.cxx +++ b/accessibility/source/standard/vclxaccessiblebox.cxx @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include "strings.hxx" using namespace ::com::sun::star; diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx index 2bfa5611d2d3..f26e56d972cb 100644 --- a/accessibility/source/standard/vclxaccessiblebutton.cxx +++ b/accessibility/source/standard/vclxaccessiblebutton.cxx @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx b/accessibility/source/standard/vclxaccessiblecheckbox.cxx index 5e4adfc6d6c4..0e01a6680e82 100644 --- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx +++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx index e8aa7e599b2c..fd8a3599d48e 100644 --- a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx +++ b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include diff --git a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx index ca8ae7ee981b..c61cd74fdab3 100644 --- a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx +++ b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx index fb4aa77132ea..005ddac8e4d6 100644 --- a/accessibility/source/standard/vclxaccessibleedit.cxx +++ b/accessibility/source/standard/vclxaccessibleedit.cxx @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx index 70ade57c927f..60de73778696 100644 --- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx +++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx index 576f03fb75df..9606092e92f4 100644 --- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx +++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx b/accessibility/source/standard/vclxaccessiblescrollbar.cxx index 9de2f42e1477..8624de5b6c4d 100644 --- a/accessibility/source/standard/vclxaccessiblescrollbar.cxx +++ b/accessibility/source/standard/vclxaccessiblescrollbar.cxx @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx index 325db82a8891..2a575760dd12 100644 --- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx +++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/bin/count-src-resources b/avmedia/AllLangMoTarget_avmedia.mk old mode 100755 new mode 100644 similarity index 54% rename from bin/count-src-resources rename to avmedia/AllLangMoTarget_avmedia.mk index 01fbdfc7e440..564b9ab94b43 --- a/bin/count-src-resources +++ b/avmedia/AllLangMoTarget_avmedia.mk @@ -1,11 +1,11 @@ -#!/bin/sh +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # 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/. -# -# Run this from the source root dir to count the number of remaining .src resources -git ls-files *.src | xargs grep -ohE '^[a-zA-Z]+[ ]+[a-zA-Z_0-9]+' | cut -f 1 -d ' ' | sort | uniq -c | sort -n +$(eval $(call gb_AllLangMoTarget_AllLangMoTarget,avmedia)) + +# vim: set noet sw=4 ts=4: diff --git a/avmedia/AllLangResTarget_avmedia.mk b/avmedia/AllLangResTarget_avmedia.mk deleted file mode 100644 index 3ffd6e0771c2..000000000000 --- a/avmedia/AllLangResTarget_avmedia.mk +++ /dev/null @@ -1,30 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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/. -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,avmedia)) - -$(eval $(call gb_AllLangResTarget_add_srs,avmedia,\ - avmedia/res \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,avmedia/res)) - -$(eval $(call gb_SrsTarget_set_include,avmedia/res,\ - $$(INCLUDE) \ - -I$(SRCDIR)/avmedia/inc \ - -I$(SRCDIR)/avmedia/source/framework \ - -I$(SRCDIR)/avmedia/source/viewer \ -)) - -$(eval $(call gb_SrsTarget_add_files,avmedia/res,\ - avmedia/source/framework/mediacontrol.src \ - avmedia/source/viewer/mediawindow.src \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk index d7625c86447c..deeae3979bef 100644 --- a/avmedia/Module_avmedia.mk +++ b/avmedia/Module_avmedia.mk @@ -14,7 +14,7 @@ $(eval $(call gb_Module_add_targets,avmedia,\ )) $(eval $(call gb_Module_add_l10n_targets,avmedia,\ - AllLangResTarget_avmedia \ + AllLangMoTarget_avmedia \ )) ifeq ($(ENABLE_GSTREAMER_1_0),TRUE) diff --git a/avmedia/inc/strings.hrc b/avmedia/inc/strings.hrc new file mode 100644 index 000000000000..b4e260ad4363 --- /dev/null +++ b/avmedia/inc/strings.hrc @@ -0,0 +1,48 @@ +/* -*- 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_AVMEDIA_INC_STRINGS_HRC +#define INCLUDED_AVMEDIA_INC_STRINGS_HRC + +#define NC_(Context, String) (Context "\004" u8##String) + +#define AVMEDIA_STR_OPEN NC_("AVMEDIA_STR_OPEN", "Open") +#define AVMEDIA_STR_INSERT NC_("AVMEDIA_STR_INSERT", "Apply") +#define AVMEDIA_STR_PLAY NC_("AVMEDIA_STR_PLAY", "Play") +#define AVMEDIA_STR_PAUSE NC_("AVMEDIA_STR_PAUSE", "Pause") +#define AVMEDIA_STR_STOP NC_("AVMEDIA_STR_STOP", "Stop") +#define AVMEDIA_STR_LOOP NC_("AVMEDIA_STR_LOOP", "Repeat") +#define AVMEDIA_STR_MUTE NC_("AVMEDIA_STR_MUTE", "Mute") +#define AVMEDIA_STR_ZOOM NC_("AVMEDIA_STR_ZOOM", "View") +#define AVMEDIA_STR_ZOOM_50 NC_("AVMEDIA_STR_ZOOM_50", "50%") +#define AVMEDIA_STR_ZOOM_100 NC_("AVMEDIA_STR_ZOOM_100", "100%") +#define AVMEDIA_STR_ZOOM_200 NC_("AVMEDIA_STR_ZOOM_200", "200%") +#define AVMEDIA_STR_ZOOM_FIT NC_("AVMEDIA_STR_ZOOM_FIT", "Scaled") +#define AVMEDIA_STR_MEDIAPLAYER NC_("AVMEDIA_STR_MEDIAPLAYER", "Media Player") +#define AVMEDIA_MEDIA_PATH NC_("AVMEDIA_MEDIA_PATH", "Media Path") +#define AVMEDIA_MEDIA_PATH_DEFAULT NC_("AVMEDIA_MEDIA_PATH_DEFAULT", "No Media Selected") +#define AVMEDIA_STR_INSERTMEDIA_DLG NC_("AVMEDIA_STR_INSERTMEDIA_DLG", "Insert Audio or Video") +#define AVMEDIA_STR_OPENMEDIA_DLG NC_("AVMEDIA_STR_OPENMEDIA_DLG", "Open Audio or Video") +#define AVMEDIA_STR_ALL_MEDIAFILES NC_("AVMEDIA_STR_ALL_MEDIAFILES", "All audio and video files") +#define AVMEDIA_STR_ALL_FILES NC_("AVMEDIA_STR_ALL_FILES", "All files") +#define AVMEDIA_STR_ERR_URL NC_("AVMEDIA_STR_ERR_URL", "The format of the selected file is not supported.") + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ + +#endif diff --git a/avmedia/source/framework/MediaControlBase.cxx b/avmedia/source/framework/MediaControlBase.cxx index 390f08ff6dbc..ba848c050915 100644 --- a/avmedia/source/framework/MediaControlBase.cxx +++ b/avmedia/source/framework/MediaControlBase.cxx @@ -27,7 +27,7 @@ #include #include #include "bitmaps.hlst" -#include "mediacontrol.hrc" +#include "strings.hrc" #include "helpids.hrc" #include "mediamisc.hxx" diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index 6c1f77ba7d43..c5695c4f185a 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -18,7 +18,7 @@ */ #include "mediacontrol.hxx" -#include "mediacontrol.hrc" +#include "strings.hrc" #include "mediamisc.hxx" #include #include diff --git a/avmedia/source/framework/mediacontrol.hrc b/avmedia/source/framework/mediacontrol.hrc deleted file mode 100644 index 3086496eb214..000000000000 --- a/avmedia/source/framework/mediacontrol.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 . - */ - -#define AVMEDIA_STR_PLAY 1024 -#define AVMEDIA_STR_PAUSE 1025 -#define AVMEDIA_STR_STOP 1026 -#define AVMEDIA_STR_LOOP 1027 -#define AVMEDIA_STR_ZOOM 1028 -#define AVMEDIA_STR_ZOOM_50 1029 -#define AVMEDIA_STR_ZOOM_100 1030 -#define AVMEDIA_STR_ZOOM_200 1031 -#define AVMEDIA_STR_ZOOM_FIT 1032 -#define AVMEDIA_STR_MUTE 1033 -#define AVMEDIA_STR_OPEN 1034 -#define AVMEDIA_STR_INSERT 1035 -#define AVMEDIA_STR_MEDIAPLAYER 1036 - -#define AVMEDIA_MEDIA_PATH 4076 -#define AVMEDIA_MEDIA_PATH_DEFAULT 4078 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/framework/mediacontrol.src b/avmedia/source/framework/mediacontrol.src deleted file mode 100644 index e62c43a27b4c..000000000000 --- a/avmedia/source/framework/mediacontrol.src +++ /dev/null @@ -1,98 +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 "mediacontrol.hrc" - -String AVMEDIA_STR_OPEN -{ - Text[en-US] = "Open"; -}; - -String AVMEDIA_STR_INSERT -{ - Text [ en-US ] = "Apply" ; -}; - -String AVMEDIA_STR_PLAY -{ - Text[en-US] = "Play"; -}; - -String AVMEDIA_STR_PAUSE -{ - Text[en-US] = "Pause"; -}; - -String AVMEDIA_STR_STOP -{ - Text[en-US] = "Stop"; -}; - -String AVMEDIA_STR_LOOP -{ - Text[en-US] = "Repeat"; -}; - -String AVMEDIA_STR_MUTE -{ - Text[en-US] = "Mute"; -}; - -String AVMEDIA_STR_ZOOM -{ - Text[en-US] = "View"; -}; - -String AVMEDIA_STR_ZOOM_50 -{ - Text[en-US] = "50%"; -}; - -String AVMEDIA_STR_ZOOM_100 -{ - Text[en-US] = "100%"; -}; - -String AVMEDIA_STR_ZOOM_200 -{ - Text[en-US] = "200%"; -}; - -String AVMEDIA_STR_ZOOM_FIT -{ - Text[en-US] = "Scaled"; -}; - -String AVMEDIA_STR_MEDIAPLAYER -{ - Text[en-US] = "Media Player"; -}; - -String AVMEDIA_MEDIA_PATH -{ - Text[en-US] = "Media Path"; -}; - -String AVMEDIA_MEDIA_PATH_DEFAULT -{ - Text[en-US] = "No Media Selected"; -}; - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/framework/mediamisc.cxx b/avmedia/source/framework/mediamisc.cxx index af9ce1b48b4e..50dd7687a0c0 100644 --- a/avmedia/source/framework/mediamisc.cxx +++ b/avmedia/source/framework/mediamisc.cxx @@ -18,7 +18,6 @@ */ #include -#include #include #include @@ -26,16 +25,10 @@ namespace avmedia { -ResMgr* GetResMgr() +const std::locale& GetResLocale() { - static ResMgr* pResMgr = nullptr; - - if( !pResMgr ) - { - pResMgr = ResMgr::CreateResMgr("avmedia", Application::GetSettings().GetUILanguageTag()); - } - - return pResMgr; + static std::locale loc = Translate::Create("avmedia", Application::GetSettings().GetUILanguageTag()); + return loc; } } // namespace avmedia diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx index a2e18fe50116..6cce70f2e026 100644 --- a/avmedia/source/framework/mediaplayer.cxx +++ b/avmedia/source/framework/mediaplayer.cxx @@ -21,7 +21,7 @@ #include #include #include "mediamisc.hxx" -#include "mediacontrol.hrc" +#include "strings.hrc" #include "helpids.hrc" #include diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx index aefc6ac49c0b..0a75833d3f92 100644 --- a/avmedia/source/inc/mediamisc.hxx +++ b/avmedia/source/inc/mediamisc.hxx @@ -21,17 +21,7 @@ #define INCLUDED_AVMEDIA_SOURCE_INC_MEDIAMISC_HXX #include -#include - -namespace avmedia -{ - ResMgr* GetResMgr(); -} - -inline OUString AvmResId(sal_uInt16 nId) -{ - return ResId(nId, * ::avmedia::GetResMgr()); -} +#include #define AVMEDIA_MANAGER_SERVICE_PREFERRED "com.sun.star.comp.avmedia.Manager_VLC" #ifdef _WIN32 @@ -55,6 +45,16 @@ inline OUString AvmResId(sal_uInt16 nId) #define AVMEDIA_MIMETYPE_JSON "model/vnd.gltf+json" #endif +namespace avmedia +{ + const std::locale& GetResLocale(); +} + +inline OUString AvmResId(const char* pId) +{ + return Translate::get(pId, ::avmedia::GetResLocale()); +} + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx index 8145cea56b32..62fd5ee9349e 100644 --- a/avmedia/source/viewer/mediawindow.cxx +++ b/avmedia/source/viewer/mediawindow.cxx @@ -21,7 +21,7 @@ #include "mediawindow_impl.hxx" #include "mediamisc.hxx" #include "bitmaps.hlst" -#include "mediawindow.hrc" +#include "strings.hrc" #include #include #include diff --git a/avmedia/source/viewer/mediawindow.hrc b/avmedia/source/viewer/mediawindow.hrc deleted file mode 100644 index b4ec26c6e357..000000000000 --- a/avmedia/source/viewer/mediawindow.hrc +++ /dev/null @@ -1,26 +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 . - */ - -#define AVMEDIA_STR_OPENMEDIA_DLG 16384 -#define AVMEDIA_STR_INSERTMEDIA_DLG 16385 -#define AVMEDIA_STR_ALL_MEDIAFILES 16386 -#define AVMEDIA_STR_ALL_FILES 16387 -#define AVMEDIA_STR_ERR_URL 16388 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/viewer/mediawindow.src b/avmedia/source/viewer/mediawindow.src deleted file mode 100644 index 9c753a6f5b57..000000000000 --- a/avmedia/source/viewer/mediawindow.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 "mediawindow.hrc" - -String AVMEDIA_STR_INSERTMEDIA_DLG -{ - Text[en-US] = "Insert Audio or Video"; -}; - -String AVMEDIA_STR_OPENMEDIA_DLG -{ - Text[en-US] = "Open Audio or Video"; -}; - -String AVMEDIA_STR_ALL_MEDIAFILES -{ - Text[en-US] = "All audio and video files"; -}; - -String AVMEDIA_STR_ALL_FILES -{ - Text[en-US] = "All files"; -}; - -String AVMEDIA_STR_ERR_URL -{ - Text[en-US] = "The format of the selected file is not supported."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index d362a5b7e0c0..13eb6626774f 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -23,8 +23,8 @@ #include "mediawindow_impl.hxx" #include "mediaevent_impl.hxx" #include "mediamisc.hxx" +#include "strings.hrc" #include "bitmaps.hlst" -#include "mediawindow.hrc" #include "helpids.hrc" #include diff --git a/basctl/AllLangMoTarget_basctl.mk b/basctl/AllLangMoTarget_basctl.mk new file mode 100644 index 000000000000..4c9a27bfdb9c --- /dev/null +++ b/basctl/AllLangMoTarget_basctl.mk @@ -0,0 +1,11 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# 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/. + +$(eval $(call gb_AllLangMoTarget_AllLangMoTarget,basctl)) + +# vim: set noet sw=4 ts=4: diff --git a/basctl/AllLangResTarget_basctl.mk b/basctl/AllLangResTarget_basctl.mk deleted file mode 100644 index b2d6f0f130af..000000000000 --- a/basctl/AllLangResTarget_basctl.mk +++ /dev/null @@ -1,45 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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 . -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,basctl)) - -$(eval $(call gb_AllLangResTarget_add_srs,basctl,\ - basctl/res \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,basctl/res)) - -$(eval $(call gb_SrsTarget_set_include,basctl/res,\ - -I$(SRCDIR)/basctl/inc \ - -I$(SRCDIR)/basctl/source/inc \ - -I$(SRCDIR)/basctl/source/basicide \ - -I$(SRCDIR)/basctl/source/dlged \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_SrsTarget_add_files,basctl/res,\ - basctl/source/basicide/basicprint.src \ - basctl/source/basicide/basidesh.src \ - basctl/source/basicide/macrodlg.src \ - basctl/source/basicide/moduldlg.src \ - basctl/source/basicide/objdlg.src \ - basctl/source/dlged/dlgresid.src \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/basctl/Module_basctl.mk b/basctl/Module_basctl.mk index 5fcc49fbec26..304a81dc9f63 100644 --- a/basctl/Module_basctl.mk +++ b/basctl/Module_basctl.mk @@ -23,16 +23,13 @@ ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),) $(eval $(call gb_Module_add_targets,basctl,\ Library_basctl \ -)) - -$(eval $(call gb_Module_add_l10n_targets,basctl,\ - AllLangResTarget_basctl \ -)) - -$(eval $(call gb_Module_add_l10n_targets,basctl,\ UIConfig_basicide \ )) +$(eval $(call gb_Module_add_l10n_targets,basctl,\ + AllLangMoTarget_basctl \ +)) + endif # screenshots diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc deleted file mode 100644 index 1c58557dddcc..000000000000 --- a/basctl/inc/basidesh.hrc +++ /dev/null @@ -1,118 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef BASCTL_INC_BASIDESH_HRC -#define BASCTL_INC_BASIDESH_HRC - -#include - -#define RID_STR_SEARCHALLMODULES ( RID_BASICIDE_START + 1 ) -#define RID_STR_SEARCHFROMSTART ( RID_BASICIDE_START + 2 ) -#define RID_STR_NOMODULE ( RID_BASICIDE_START + 3 ) -#define RID_STR_FILTER_ALLFILES ( RID_BASICIDE_START + 4 ) -// free -#define RID_STR_CANNOTCLOSE ( RID_BASICIDE_START + 13 ) -// free -#define RID_STR_STACKNAME ( RID_BASICIDE_START + 16 ) -#define RID_STR_WATCHNAME ( RID_BASICIDE_START + 17 ) -#define RID_STR_REMOVEWATCH ( RID_BASICIDE_START + 18 ) -#define RID_STR_CANNOTRUNMACRO ( RID_BASICIDE_START + 19 ) -#define RID_STR_STDDIALOGNAME ( RID_BASICIDE_START + 24 ) - -#define RID_STR_ALL ( RID_BASICIDE_START + 28 ) - -#define RID_STR_PAGE ( RID_BASICIDE_START + 30 ) -#define RID_STR_BADSBXNAME ( RID_BASICIDE_START + 31 ) -#define RID_STR_NOLIBINSTORAGE ( RID_BASICIDE_START + 34 ) -#define RID_STR_SBXNAMEALLREADYUSED ( RID_BASICIDE_START + 35 ) -#define RID_STR_SIGNED ( RID_BASICIDE_START + 36 ) -#define RID_STR_WATCHVARIABLE ( RID_BASICIDE_START + 37 ) -#define RID_STR_WATCHVALUE ( RID_BASICIDE_START + 38 ) -#define RID_STR_WATCHTYPE ( RID_BASICIDE_START + 39 ) -// free -#define RID_STR_REPLACESTDLIB ( RID_BASICIDE_START + 41 ) -#define RID_STR_SBXNAMEALLREADYUSED2 ( RID_BASICIDE_START + 42 ) -#define RID_STR_SEARCHNOTFOUND ( RID_BASICIDE_START + 43 ) -#define RID_STR_SEARCHREPLACES ( RID_BASICIDE_START + 44 ) -#define RID_STR_CANNOTCHANGENAMESTDLIB ( RID_BASICIDE_START + 45 ) -#define RID_STR_GENERATESOURCE ( RID_BASICIDE_START + 48 ) -#define RID_STR_REFNOTPOSSIBLE ( RID_BASICIDE_START + 49 ) -// free -#define RID_STR_NEWLIB ( RID_BASICIDE_START + 57 ) -#define RID_STR_NEWMOD ( RID_BASICIDE_START + 58 ) -#define RID_STR_NEWDLG ( RID_BASICIDE_START + 59 ) -#define RID_STR_LIBNAMETOLONG ( RID_BASICIDE_START + 60 ) -#define RID_STR_ERRORCHOOSEMACRO ( RID_BASICIDE_START + 61 ) -//free slot -#define RID_STR_LIBISREADONLY ( RID_BASICIDE_START + 63 ) -#define RID_STR_REPLACELIB ( RID_BASICIDE_START + 64 ) -// free -#define RID_STR_IMPORTNOTPOSSIBLE ( RID_BASICIDE_START + 67 ) -#define RID_STR_NOIMPORT ( RID_BASICIDE_START + 68 ) -#define RID_STR_ENTERPASSWORD ( RID_BASICIDE_START + 69 ) - -// free -#define RID_STR_USERMACROS ( RID_BASICIDE_START + 72 ) -#define RID_STR_USERDIALOGS ( RID_BASICIDE_START + 73 ) -#define RID_STR_USERMACROSDIALOGS ( RID_BASICIDE_START + 74 ) -#define RID_STR_SHAREMACROS ( RID_BASICIDE_START + 75 ) -#define RID_STR_SHAREDIALOGS ( RID_BASICIDE_START + 76 ) -#define RID_STR_SHAREMACROSDIALOGS ( RID_BASICIDE_START + 77 ) -//free slot -#define RID_STR_REMOVEWATCHTIP ( RID_BASICIDE_START + 79 ) -#define RID_STR_QUERYREPLACEMACRO ( RID_BASICIDE_START + 80 ) -#define RID_STR_FILENAME ( RID_BASICIDE_START + 81 ) -#define RID_STR_APPENDLIBS ( RID_BASICIDE_START + 82 ) -#define RID_STR_QUERYDELMACRO ( RID_BASICIDE_START + 83 ) -#define RID_STR_QUERYDELDIALOG ( RID_BASICIDE_START + 84 ) -#define RID_STR_QUERYDELLIB ( RID_BASICIDE_START + 85 ) -#define RID_STR_QUERYDELLIBREF ( RID_BASICIDE_START + 86 ) -#define RID_STR_QUERYDELMODULE ( RID_BASICIDE_START + 87 ) -#define RID_STR_BASIC ( RID_BASICIDE_START + 88 ) -#define RID_STR_WILLSTOPPRG ( RID_BASICIDE_START + 91 ) -#define RID_STR_STACK ( RID_BASICIDE_START + 92 ) -#define RID_STR_COULDNTREAD ( RID_BASICIDE_START + 94 ) -#define RID_STR_COULDNTWRITE ( RID_BASICIDE_START + 95 ) -#define RID_STR_WRONGPASSWORD ( RID_BASICIDE_START + 96 ) -#define RID_STR_LINE ( RID_BASICIDE_START + 97 ) -#define RID_STR_COLUMN ( RID_BASICIDE_START + 98 ) -#define RID_STR_EXPORTPACKAGE ( RID_BASICIDE_START + 100 ) -#define RID_STR_EXPORTBASIC ( RID_BASICIDE_START + 101 ) -#define RID_STR_PACKAGE_BUNDLE ( RID_BASICIDE_START + 102 ) - -#define RID_STR_DLGIMP_CLASH_RENAME ( RID_BASICIDE_START + 110 ) -#define RID_STR_DLGIMP_CLASH_REPLACE ( RID_BASICIDE_START + 111 ) -#define RID_STR_DLGIMP_CLASH_TITLE ( RID_BASICIDE_START + 112 ) -#define RID_STR_DLGIMP_CLASH_TEXT ( RID_BASICIDE_START + 113 ) -#define RID_STR_DLGIMP_MISMATCH_ADD ( RID_BASICIDE_START + 114 ) -#define RID_STR_DLGIMP_MISMATCH_OMIT ( RID_BASICIDE_START + 115 ) -#define RID_STR_DLGIMP_MISMATCH_TITLE ( RID_BASICIDE_START + 116 ) -#define RID_STR_DLGIMP_MISMATCH_TEXT ( RID_BASICIDE_START + 117 ) -#define RID_STR_DOCUMENT_OBJECTS ( RID_BASICIDE_START + 118 ) -#define RID_STR_USERFORMS ( RID_BASICIDE_START + 119 ) -#define RID_STR_NORMAL_MODULES ( RID_BASICIDE_START + 120 ) -#define RID_STR_CLASS_MODULES ( RID_BASICIDE_START + 121 ) -//free slots -#define RID_STR_PRINTDLG_RANGE ( RID_BASICIDE_START + 130 ) -#define RID_STR_PRINTDLG_ALLPAGES ( RID_BASICIDE_START + 131 ) -#define RID_STR_PRINTDLG_PAGES ( RID_BASICIDE_START + 132 ) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx index 393f02def886..69b2ecdd34c3 100644 --- a/basctl/inc/pch/precompiled_basctl.hxx +++ b/basctl/inc/pch/precompiled_basctl.hxx @@ -383,8 +383,6 @@ #include #include #include -#include -#include #include #include #include @@ -545,8 +543,6 @@ #include #include #include -#include -#include #include #include #include diff --git a/basctl/inc/strings.hrc b/basctl/inc/strings.hrc new file mode 100644 index 000000000000..aa9ebb37f7c5 --- /dev/null +++ b/basctl/inc/strings.hrc @@ -0,0 +1,122 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef BASCTL_INC_BASIDESH_HRC +#define BASCTL_INC_BASIDESH_HRC + +#define NC_(Context, String) (Context "\004" u8##String) + +#define RID_STR_FILTER_ALLFILES NC_("RID_STR_FILTER_ALLFILES", "") +#define RID_STR_NOMODULE NC_("RID_STR_NOMODULE", "< No Module >") +#define RID_STR_WRONGPASSWORD NC_("RID_STR_WRONGPASSWORD", "Incorrect Password") +#define RID_STR_NOLIBINSTORAGE NC_("RID_STR_NOLIBINSTORAGE", "The file does not contain any BASIC libraries") +#define RID_STR_BADSBXNAME NC_("RID_STR_BADSBXNAME", "Invalid Name") +#define RID_STR_LIBNAMETOLONG NC_("RID_STR_LIBNAMETOLONG", "A library name can have up to 30 characters.") +#define RID_STR_ERRORCHOOSEMACRO NC_("RID_STR_ERRORCHOOSEMACRO", "Macros from other documents are not accessible.") +#define RID_STR_LIBISREADONLY NC_("RID_STR_LIBISREADONLY", "This library is read-only.") +#define RID_STR_REPLACELIB NC_("RID_STR_REPLACELIB", "'XX' cannot be replaced.") +#define RID_STR_IMPORTNOTPOSSIBLE NC_("RID_STR_IMPORTNOTPOSSIBLE", "'XX' cannot be added.") +#define RID_STR_NOIMPORT NC_("RID_STR_NOIMPORT", "'XX' was not added.") +#define RID_STR_ENTERPASSWORD NC_("RID_STR_ENTERPASSWORD", "Enter password for 'XX'") +#define RID_STR_SBXNAMEALLREADYUSED NC_("RID_STR_SBXNAMEALLREADYUSED", "Name already exists") +#define RID_STR_SIGNED NC_("RID_STR_SIGNED", "(Signed)") +#define RID_STR_SBXNAMEALLREADYUSED2 NC_("RID_STR_SBXNAMEALLREADYUSED2", "Object with same name already exists") +#define RID_STR_CANNOTRUNMACRO NC_("RID_STR_CANNOTRUNMACRO", "For security reasons, you cannot run this macro.\n\nFor more information, check the security settings.") +#define RID_STR_SEARCHNOTFOUND NC_("RID_STR_SEARCHNOTFOUND", "Search key not found") +#define RID_STR_SEARCHFROMSTART NC_("RID_STR_SEARCHFROMSTART", "Search to last module complete. Continue at first module?") +#define RID_STR_SEARCHREPLACES NC_("RID_STR_SEARCHREPLACES", "Search key replaced XX times") +#define RID_STR_COULDNTREAD NC_("RID_STR_COULDNTREAD", "The file could not be read") +#define RID_STR_COULDNTWRITE NC_("RID_STR_COULDNTWRITE", "The file could not be saved") +#define RID_STR_CANNOTCHANGENAMESTDLIB NC_("RID_STR_CANNOTCHANGENAMESTDLIB", "The name of the default library cannot be changed.") +#define RID_STR_GENERATESOURCE NC_("RID_STR_GENERATESOURCE", "Generating source") +#define RID_STR_FILENAME NC_("RID_STR_FILENAME", "File name:") +#define RID_STR_APPENDLIBS NC_("RID_STR_APPENDLIBS", "Import Libraries") +#define RID_STR_QUERYDELMACRO NC_("RID_STR_QUERYDELMACRO", "Do you want to delete the macro XX?") +#define RID_STR_QUERYDELDIALOG NC_("RID_STR_QUERYDELDIALOG", "Do you want to delete the XX dialog?") +#define RID_STR_QUERYDELLIB NC_("RID_STR_QUERYDELLIB", "Do you want to delete the XX library?") +#define RID_STR_QUERYDELLIBREF NC_("RID_STR_QUERYDELLIBREF", "Do you want to delete the reference to the XX library?") +#define RID_STR_QUERYDELMODULE NC_("RID_STR_QUERYDELMODULE", "Do you want to delete the XX module?") +#define RID_STR_BASIC NC_("RID_STR_BASIC", "BASIC") +// Abbreviation for 'line' +#define RID_STR_LINE NC_("RID_STR_LINE", "Ln") +// Abbreviation for 'column' +#define RID_STR_COLUMN NC_("RID_STR_COLUMN", "Col") +#define RID_STR_CANNOTCLOSE NC_("RID_STR_CANNOTCLOSE", "The window cannot be closed while BASIC is running.") +#define RID_STR_REPLACESTDLIB NC_("RID_STR_REPLACESTDLIB", "The default library cannot be replaced.") +#define RID_STR_REFNOTPOSSIBLE NC_("RID_STR_REFNOTPOSSIBLE", "Reference to 'XX' not possible.") +#define RID_STR_WATCHNAME NC_("RID_STR_WATCHNAME", "Watch") +#define RID_STR_WATCHVARIABLE NC_("RID_STR_WATCHVARIABLE", "Variable") +#define RID_STR_WATCHVALUE NC_("RID_STR_WATCHVALUE", "Value") +#define RID_STR_WATCHTYPE NC_("RID_STR_WATCHTYPE", "Type") +#define RID_STR_STACKNAME NC_("RID_STR_STACKNAME", "Call Stack") +#define RID_STR_STDDIALOGNAME NC_("RID_STR_STDDIALOGNAME", "Dialog") +#define RID_STR_NEWLIB NC_("RID_STR_NEWLIB", "New Library") +#define RID_STR_NEWMOD NC_("RID_STR_NEWMOD", "New Module") +#define RID_STR_NEWDLG NC_("RID_STR_NEWDLG", "New Dialog") +#define RID_STR_ALL NC_("RID_STR_ALL", "All") +#define RID_STR_PAGE NC_("RID_STR_PAGE", "Page") +#define RID_STR_WILLSTOPPRG NC_("RID_STR_WILLSTOPPRG", "You will have to restart the program after this edit.\nContinue?") +#define RID_STR_SEARCHALLMODULES NC_("RID_STR_SEARCHALLMODULES", "Do you want to replace the text in all active modules?") +#define RID_STR_REMOVEWATCH NC_("RID_STR_REMOVEWATCH", "Watch:") +#define RID_STR_STACK NC_("RID_STR_STACK", "Calls: ") +#define RID_STR_USERMACROS NC_("RID_STR_USERMACROS", "My Macros") +#define RID_STR_USERDIALOGS NC_("RID_STR_USERDIALOGS", "My Dialogs") +#define RID_STR_USERMACROSDIALOGS NC_("RID_STR_USERMACROSDIALOGS", "My Macros & Dialogs") +#define RID_STR_SHAREMACROS NC_("RID_STR_SHAREMACROS", "%PRODUCTNAME Macros") +#define RID_STR_SHAREDIALOGS NC_("RID_STR_SHAREDIALOGS", "%PRODUCTNAME Dialogs") +#define RID_STR_SHAREMACROSDIALOGS NC_("RID_STR_SHAREMACROSDIALOGS", "%PRODUCTNAME Macros & Dialogs") +#define RID_STR_REMOVEWATCHTIP NC_("RID_STR_REMOVEWATCHTIP", "Remove Watch") +#define RID_STR_QUERYREPLACEMACRO NC_("RID_STR_QUERYREPLACEMACRO", "Do you want to overwrite the XX macro?") +#define RID_STR_TRANSLATION_NOTLOCALIZED NC_("RID_STR_TRANSLATION_NOTLOCALIZED", "") +#define RID_STR_TRANSLATION_DEFAULT NC_("RID_STR_TRANSLATION_DEFAULT", "[Default Language]") +#define RID_STR_DOCUMENT_OBJECTS NC_("RID_STR_DOCUMENT_OBJECTS", "Document Objects") +#define RID_STR_USERFORMS NC_("RID_STR_USERFORMS", "Forms") +#define RID_STR_NORMAL_MODULES NC_("RID_STR_NORMAL_MODULES", "Modules") +#define RID_STR_CLASS_MODULES NC_("RID_STR_CLASS_MODULES", "Class Modules") +#define RID_STR_DLGIMP_CLASH_RENAME NC_("RID_STR_DLGIMP_CLASH_RENAME", "Rename") +#define RID_STR_DLGIMP_CLASH_REPLACE NC_("RID_STR_DLGIMP_CLASH_REPLACE", "Replace") +#define RID_STR_DLGIMP_CLASH_TITLE NC_("RID_STR_DLGIMP_CLASH_TITLE", "Dialog Import - Name already used") +#define RID_STR_DLGIMP_CLASH_TEXT NC_("RID_STR_DLGIMP_CLASH_TEXT", "The library already contains a dialog with the name:\n\n$(ARG1)\n\nRename dialog to keep current dialog or replace existing dialog.\n ") +#define RID_STR_DLGIMP_MISMATCH_ADD NC_("RID_STR_DLGIMP_MISMATCH_ADD", "Add") +#define RID_STR_DLGIMP_MISMATCH_OMIT NC_("RID_STR_DLGIMP_MISMATCH_OMIT", "Omit") +#define RID_STR_DLGIMP_MISMATCH_TITLE NC_("RID_STR_DLGIMP_MISMATCH_TITLE", "Dialog Import - Language Mismatch") +#define RID_STR_DLGIMP_MISMATCH_TEXT NC_("RID_STR_DLGIMP_MISMATCH_TEXT", "The dialog to be imported supports other languages than the target library.\n\nAdd these languages to the library to keep additional language resources provided by the dialog or omit them to stay with the current library languages.\n\nNote: For languages not supported by the dialog the resources of the dialog's default language will be used.\n ") +#define RID_STR_PRINTDLG_RANGE NC_("RID_STR_PRINTDLG_RANGE", "Print range") +#define RID_STR_PRINTDLG_ALLPAGES NC_("RID_STR_PRINTDLG_ALLPAGES", "All ~Pages") +#define RID_STR_PRINTDLG_PAGES NC_("RID_STR_PRINTDLG_PAGES", "Pa~ges") +#define RID_STR_BTNDEL NC_("RID_STR_BTNDEL", "~Delete") +#define RID_STR_BTNNEW NC_("RID_STR_BTNNEW", "~New") +#define RID_STR_CHOOSE NC_("RID_STR_CHOOSE", "Choose") +#define RID_STR_RUN NC_("RID_STR_RUN", "Run") +#define RID_STR_RECORD NC_("RID_STR_RECORD", "~Save") +#define RID_BASICIDE_OBJCAT NC_("RID_BASICIDE_OBJCAT", "Object Catalog") +#define RID_STR_TLB_MACROS NC_("RID_STR_TLB_MACROS", "Objects Tree") +// Property Browser Headline ---------------------------------------------------------------- +#define RID_STR_BRWTITLE_PROPERTIES NC_("RID_STR_BRWTITLE_PROPERTIES", "Properties: ") +#define RID_STR_BRWTITLE_NO_PROPERTIES NC_("RID_STR_BRWTITLE_NO_PROPERTIES", "No Control marked") +#define RID_STR_BRWTITLE_MULTISELECT NC_("RID_STR_BRWTITLE_MULTISELECT", "Multiselection") +#define RID_STR_DEF_LANG NC_("RID_STR_DEF_LANG", "[Default Language]") +#define RID_STR_CREATE_LANG NC_("RID_STR_CREATE_LANG", "") +#define RID_STR_EXPORTPACKAGE NC_("RID_STR_EXPORTPACKAGE", "Export library as extension") +#define RID_STR_EXPORTBASIC NC_("RID_STR_EXPORTBASIC", "Export as BASIC library") +#define RID_STR_PACKAGE_BUNDLE NC_("RID_STR_PACKAGE_BUNDLE", "Extension") + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx index b048169038a0..9ce006ac6532 100644 --- a/basctl/source/basicide/basicbox.cxx +++ b/basctl/source/basicide/basicbox.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include +#include #include #include @@ -25,7 +25,6 @@ #include "localizationmgr.hxx" #include "managelang.hxx" -#include "dlgresid.hrc" #include #include diff --git a/basctl/source/basicide/basicmod.hxx b/basctl/source/basicide/basicmod.hxx index ffc960cea598..7dcee5a16420 100644 --- a/basctl/source/basicide/basicmod.hxx +++ b/basctl/source/basicide/basicmod.hxx @@ -29,9 +29,10 @@ namespace basctl class Module : public SfxModule { public: - Module ( ResMgr *pMgr, SfxObjectFactory *pObjFact) : - SfxModule( pMgr, {pObjFact} ) - { } + Module(const std::locale& rResLocale, SfxObjectFactory *pObjFact) + : SfxModule(rResLocale, {pObjFact}) + { + } }; } // namespace basctl diff --git a/basctl/source/basicide/basicprint.src b/basctl/source/basicide/basicprint.src deleted file mode 100644 index 7eb01d2ea2cc..000000000000 --- a/basctl/source/basicide/basicprint.src +++ /dev/null @@ -1,35 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include - -String RID_STR_PRINTDLG_RANGE -{ - Text [ en-US ] = "Print range"; -}; -String RID_STR_PRINTDLG_ALLPAGES -{ - Text [ en-US ] = "All ~Pages"; -}; -String RID_STR_PRINTDLG_PAGES -{ - Text [ en-US ] = "Pa~ges"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/basicide/basicrenderable.cxx b/basctl/source/basicide/basicrenderable.cxx index f6f2b5a9649e..1e51245735b1 100644 --- a/basctl/source/basicide/basicrenderable.cxx +++ b/basctl/source/basicide/basicrenderable.cxx @@ -19,11 +19,10 @@ #include "basicrenderable.hxx" #include "bastypes.hxx" -#include "basidesh.hrc" +#include "strings.hrc" #include #include -#include #include #include diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index e40583f82e80..b8bfd80a0970 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -26,7 +26,7 @@ #include "officecfg/Office/BasicIDE.hxx" #include "helpid.hrc" -#include +#include #include #include @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -134,7 +135,7 @@ void lcl_PrintHeader( Printer* pPrinter, sal_uInt16 nPages, sal_uInt16 nCurPage, if( bOutput ) { - OUString aPageStr = " [" + OUString(IDEResId(RID_STR_PAGE)) + " " + OUString::number( nCurPage ) + "]"; + OUString aPageStr = " [" + IDEResId(RID_STR_PAGE) + " " + OUString::number( nCurPage ) + "]"; pPrinter->DrawText( aPos, aPageStr ); } } @@ -1066,11 +1067,11 @@ void ModulWindow::GetState( SfxItemSet &rSet ) if ( pView ) { TextSelection aSel = pView->GetSelection(); - OUString aPos = OUString( IDEResId( RID_STR_LINE ) ) + + OUString aPos = IDEResId( RID_STR_LINE ) + " " + OUString::number(aSel.GetEnd().GetPara()+1) + ", " + - OUString( IDEResId( RID_STR_COLUMN ) ) + + IDEResId( RID_STR_COLUMN ) + " " + OUString::number(aSel.GetEnd().GetIndex()+1); SfxStringItem aItem( SID_BASICIDE_STAT_POS, aPos ); @@ -1302,7 +1303,7 @@ EntryDescriptor ModulWindow::CreateEntryDescriptor() { case script::ModuleType::DOCUMENT: { - aLibSubName = OUString( IDEResId( RID_STR_DOCUMENT_OBJECTS ) ); + aLibSubName = IDEResId( RID_STR_DOCUMENT_OBJECTS ); uno::Reference< container::XNameContainer > xLib = aDocument.getOrCreateLibrary( E_SCRIPTS, aLibName ); if( xLib.is() ) { @@ -1316,13 +1317,13 @@ EntryDescriptor ModulWindow::CreateEntryDescriptor() break; } case script::ModuleType::FORM: - aLibSubName = OUString( IDEResId( RID_STR_USERFORMS ) ); + aLibSubName = IDEResId( RID_STR_USERFORMS ); break; case script::ModuleType::NORMAL: - aLibSubName = OUString( IDEResId( RID_STR_NORMAL_MODULES ) ); + aLibSubName = IDEResId( RID_STR_NORMAL_MODULES ); break; case script::ModuleType::CLASS: - aLibSubName = OUString( IDEResId( RID_STR_CLASS_MODULES ) ); + aLibSubName = IDEResId( RID_STR_CLASS_MODULES ); break; } } diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index bfc655b9bb30..330feefdfd8c 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -22,7 +22,7 @@ #include #include "helpid.hrc" -#include +#include #include "bitmaps.hlst" #include "baside2.hxx" @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index d42b183eaa54..4fe135056e02 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "basidesh.hrc" +#include "strings.hrc" #include "helpid.hrc" #include "accessibledialogwindow.hxx" @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index 2a015cc7cce2..000a43cdeecc 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -18,7 +18,7 @@ */ #include -#include "basidesh.hrc" +#include "strings.hrc" #include "helpid.hrc" #include "baside2.hxx" @@ -41,6 +41,7 @@ #include #include #include +#include #include #include #include diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx index 82c4e1a261c1..1de2e0564747 100644 --- a/basctl/source/basicide/basides2.cxx +++ b/basctl/source/basicide/basides2.cxx @@ -23,7 +23,7 @@ #include -#include +#include #include #include #include @@ -108,7 +108,7 @@ void Shell::SetMDITitle() DocumentSignature aCurSignature( m_aCurDocument ); if ( aCurSignature.getScriptingSignatureState() == SignatureState::OK ) { - aTitle += " " + OUString(IDEResId(RID_STR_SIGNED)) + " "; + aTitle += " " + IDEResId(RID_STR_SIGNED) + " "; } SfxViewFrame* pViewFrame = GetViewFrame(); diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index e9d2f5b0acda..8ef3742d6222 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -21,7 +21,8 @@ #include #include -#include +#include +#include "strings.hrc" #include "baside2.hxx" #include "baside3.hxx" #include diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src deleted file mode 100644 index 3986ae749737..000000000000 --- a/basctl/source/basicide/basidesh.src +++ /dev/null @@ -1,343 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include -#include -#include "dlgresid.hrc" - -String RID_STR_FILTER_ALLFILES -{ - Text [ en-US ] = "" ; -}; -String RID_STR_NOMODULE -{ - Text [ en-US ] = "< No Module >" ; -}; -String RID_STR_WRONGPASSWORD -{ - Text [ en-US ] = "Incorrect Password" ; -}; -String RID_STR_NOLIBINSTORAGE -{ - Text [ en-US ] = "The file does not contain any BASIC libraries" ; -}; -String RID_STR_BADSBXNAME -{ - Text [ en-US ] = "Invalid Name" ; -}; -String RID_STR_LIBNAMETOLONG -{ - Text [ en-US ] = "A library name can have up to 30 characters."; -}; -String RID_STR_ERRORCHOOSEMACRO -{ - Text [ en-US ] = "Macros from other documents are not accessible."; -}; -String RID_STR_LIBISREADONLY -{ - Text [ en-US ] = "This library is read-only."; -}; -String RID_STR_REPLACELIB -{ - Text [ en-US ] = "'XX' cannot be replaced."; -}; -String RID_STR_IMPORTNOTPOSSIBLE -{ - Text [ en-US ] = "'XX' cannot be added."; -}; -String RID_STR_NOIMPORT -{ - Text [ en-US ] = "'XX' was not added."; -}; -String RID_STR_ENTERPASSWORD -{ - Text [ en-US ] = "Enter password for 'XX'"; -}; -String RID_STR_SBXNAMEALLREADYUSED -{ - Text [ en-US ] = "Name already exists" ; -}; -String RID_STR_SIGNED -{ - Text [ en-US ] = "(Signed)" ; -}; -String RID_STR_SBXNAMEALLREADYUSED2 -{ - Text [ en-US ] = "Object with same name already exists" ; -}; -String RID_STR_CANNOTRUNMACRO -{ - Text [ en-US ] = "For security reasons, you cannot run this macro.\n\nFor more information, check the security settings." ; -}; -String RID_STR_SEARCHNOTFOUND -{ - Text [ en-US ] = "Search key not found" ; -}; -String RID_STR_SEARCHFROMSTART -{ - Text [ en-US ] = "Search to last module complete. Continue at first module?" ; -}; -String RID_STR_SEARCHREPLACES -{ - Text [ en-US ] = "Search key replaced XX times" ; -}; -String RID_STR_COULDNTREAD -{ - Text [ en-US ] = "The file could not be read" ; -}; -String RID_STR_COULDNTWRITE -{ - Text [ en-US ] = "The file could not be saved" ; -}; -String RID_STR_CANNOTCHANGENAMESTDLIB -{ - Text [ en-US ] = "The name of the default library cannot be changed." ; -}; -String RID_STR_GENERATESOURCE -{ - Text [ en-US ] = "Generating source" ; -}; -String RID_STR_FILENAME -{ - Text [ en-US ] = "File name:" ; -}; -String RID_STR_APPENDLIBS -{ - Text [ en-US ] = "Import Libraries" ; -}; -String RID_STR_QUERYDELMACRO -{ - Text [ en-US ] = "Do you want to delete the macro XX?" ; -}; -String RID_STR_QUERYDELDIALOG -{ - Text [ en-US ] = "Do you want to delete the XX dialog?" ; -}; -String RID_STR_QUERYDELLIB -{ - Text [ en-US ] = "Do you want to delete the XX library?" ; -}; -String RID_STR_QUERYDELLIBREF -{ - Text [ en-US ] = "Do you want to delete the reference to the XX library?" ; -}; -String RID_STR_QUERYDELMODULE -{ - Text [ en-US ] = "Do you want to delete the XX module?" ; -}; -String RID_STR_BASIC -{ - Text [ en-US ] = "BASIC" ; -}; -String RID_STR_LINE -{ - // Abbreviation for 'line' - Text [ en-US ] = "Ln" ; -}; -String RID_STR_COLUMN -{ - // Abbreviation for 'column' - Text [ en-US ] = "Col" ; -}; -String RID_STR_CANNOTCLOSE -{ - Text [ en-US ] = "The window cannot be closed while BASIC is running." ; -}; -String RID_STR_REPLACESTDLIB -{ - Text [ en-US ] = "The default library cannot be replaced." ; -}; -String RID_STR_REFNOTPOSSIBLE -{ - Text [ en-US ] = "Reference to 'XX' not possible." ; -}; -String RID_STR_WATCHNAME -{ - Text [ en-US ] = "Watch" ; -}; -String RID_STR_WATCHVARIABLE -{ - Text [ en-US ] = "Variable" ; -}; -String RID_STR_WATCHVALUE -{ - Text [ en-US ] = "Value" ; -}; -String RID_STR_WATCHTYPE -{ - Text [ en-US ] = "Type" ; -}; -String RID_STR_STACKNAME -{ - Text [ en-US ] = "Call Stack" ; -}; -String RID_STR_STDDIALOGNAME -{ - Text [ en-US ] = "Dialog" ; -}; -String RID_STR_NEWLIB -{ - Text [ en-US ] = "New Library" ; -}; -String RID_STR_NEWMOD -{ - Text [ en-US ] = "New Module" ; -}; -String RID_STR_NEWDLG -{ - Text [ en-US ] = "New Dialog" ; -}; -String RID_STR_ALL -{ - Text [ en-US ] = "All" ; -}; -String RID_STR_PAGE -{ - Text [ en-US ] = "Page" ; -}; -String RID_STR_WILLSTOPPRG -{ - Text [ en-US ] = "You will have to restart the program after this edit.\nContinue?" ; -}; -String RID_STR_SEARCHALLMODULES -{ - Text [ en-US ] = "Do you want to replace the text in all active modules?" ; -}; - -String RID_STR_REMOVEWATCH -{ - Text [ en-US ] = "Watch:" ; -}; - -String RID_STR_STACK -{ - Text [ en-US ] = "Calls: " ; -}; - -String RID_STR_USERMACROS -{ - Text [ en-US ] = "My Macros" ; -}; - -String RID_STR_USERDIALOGS -{ - Text [ en-US ] = "My Dialogs" ; -}; - -String RID_STR_USERMACROSDIALOGS -{ - Text [ en-US ] = "My Macros & Dialogs" ; -}; - -String RID_STR_SHAREMACROS -{ - Text [ en-US ] = "%PRODUCTNAME Macros" ; -}; - -String RID_STR_SHAREDIALOGS -{ - Text [ en-US ] = "%PRODUCTNAME Dialogs" ; -}; - -String RID_STR_SHAREMACROSDIALOGS -{ - Text [ en-US ] = "%PRODUCTNAME Macros & Dialogs" ; -}; - -String RID_STR_REMOVEWATCHTIP -{ - Text [ en-US ] = "Remove Watch" ; -}; - -String RID_STR_QUERYREPLACEMACRO -{ - Text [ en-US ] = "Do you want to overwrite the XX macro?" ; -}; - -String RID_STR_TRANSLATION_NOTLOCALIZED -{ - Text [ en-US ] = "" ; -}; - -String RID_STR_TRANSLATION_DEFAULT -{ - Text [ en-US ] = "[Default Language]" ; -}; - -String RID_STR_DOCUMENT_OBJECTS -{ - Text [ en-US ] = "Document Objects" ; -}; - -String RID_STR_USERFORMS -{ - Text [ en-US ] = "Forms" ; -}; - -String RID_STR_NORMAL_MODULES -{ - Text [ en-US ] = "Modules" ; -}; - -String RID_STR_CLASS_MODULES -{ - Text [ en-US ] = "Class Modules" ; -}; - -String RID_STR_DLGIMP_CLASH_RENAME -{ - Text [ en-US ] = "Rename" ; -}; - -String RID_STR_DLGIMP_CLASH_REPLACE -{ - Text [ en-US ] = "Replace" ; -}; - -String RID_STR_DLGIMP_CLASH_TITLE -{ - Text [ en-US ] = "Dialog Import - Name already used" ; -}; - -String RID_STR_DLGIMP_CLASH_TEXT -{ - Text [ en-US ] = "The library already contains a dialog with the name:\n\n$(ARG1)\n\nRename dialog to keep current dialog or replace existing dialog.\n " ; -}; - -String RID_STR_DLGIMP_MISMATCH_ADD -{ - Text [ en-US ] = "Add" ; -}; - -String RID_STR_DLGIMP_MISMATCH_OMIT -{ - Text [ en-US ] = "Omit" ; -}; - -String RID_STR_DLGIMP_MISMATCH_TITLE -{ - Text [ en-US ] = "Dialog Import - Language Mismatch" ; -}; - -String RID_STR_DLGIMP_MISMATCH_TEXT -{ - Text [ en-US ] = "The dialog to be imported supports other languages than the target library.\n\nAdd these languages to the library to keep additional language resources provided by the dialog or omit them to stay with the current library languages.\n\nNote: For languages not supported by the dialog the resources of the dialog's default language will be used.\n " ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx index 13b84b029ff0..f9ee4ffb6400 100644 --- a/basctl/source/basicide/basobj2.cxx +++ b/basctl/source/basicide/basobj2.cxx @@ -21,7 +21,7 @@ #include "iderdll2.hxx" #include "macrodlg.hxx" #include "moduldlg.hxx" -#include "basidesh.hrc" +#include "strings.hrc" #include "baside2.hxx" #include diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx index 48edafe675e4..4b4128cab931 100644 --- a/basctl/source/basicide/basobj3.cxx +++ b/basctl/source/basicide/basobj3.cxx @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx index 56ff853e79a2..f85b8ce5a113 100644 --- a/basctl/source/basicide/bastype2.cxx +++ b/basctl/source/basicide/bastype2.cxx @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx index cf588e5d18bd..56c1ae7d2d96 100644 --- a/basctl/source/basicide/bastype3.cxx +++ b/basctl/source/basicide/bastype3.cxx @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include "bitmaps.hlst" #include #include diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index 9750d2490b00..27f852cd7b46 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "basidesh.hrc" +#include "strings.hrc" #include "helpid.hrc" #include "baside2.hxx" @@ -707,13 +707,12 @@ LibInfo::Item::Item ( LibInfo::Item::~Item () { } -bool QueryDel( const OUString& rName, const ResId& rId, vcl::Window* pParent ) +bool QueryDel(const OUString& rName, const OUString &rStr, vcl::Window* pParent) { - OUString aQuery(rId); OUStringBuffer aNameBuf( rName ); aNameBuf.append('\''); aNameBuf.insert(0, '\''); - aQuery = aQuery.replaceAll("XX", aNameBuf.makeStringAndClear()); + OUString aQuery = rStr.replaceAll("XX", aNameBuf.makeStringAndClear()); ScopedVclPtrInstance< MessageDialog > aQueryBox(pParent, aQuery, VclMessageType::Question, VclButtonsType::YesNo); return ( aQueryBox->Execute() == RET_YES ); } diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx index fc890c3aee0f..0773338a8537 100644 --- a/basctl/source/basicide/iderdll.cxx +++ b/basctl/source/basicide/iderdll.cxx @@ -25,13 +25,15 @@ #include #include #include -#include +#include #include #include #include +#include #include #include +#include #include #include @@ -103,10 +105,10 @@ ExtraData* GetExtraData() return nullptr; } - -IDEResId::IDEResId( sal_uInt16 nId ): - ResId(nId, *SfxApplication::GetModule(SfxToolsModule::Basic)->GetResMgr()) -{ } +OUString IDEResId(const char *pId) +{ + return Translate::get(pId, SfxApplication::GetModule(SfxToolsModule::Basic)->GetResLocale()); +} namespace { @@ -116,10 +118,9 @@ Dll::Dll () : { SfxObjectFactory& rFactory = DocShell::Factory(); - ResMgr* pMgr = ResMgr::CreateResMgr( - "basctl", Application::GetSettings().GetUILanguageTag()); + std::locale loc = Translate::Create("basctl", Application::GetSettings().GetUILanguageTag()); - auto pModule = o3tl::make_unique( pMgr, &rFactory ); + auto pModule = o3tl::make_unique(loc, &rFactory); SfxModule* pMod = pModule.get(); SfxApplication::SetModule(SfxToolsModule::Basic, std::move(pModule)); diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx index f5a593b2bde9..0b02ee3b903c 100644 --- a/basctl/source/basicide/macrodlg.cxx +++ b/basctl/source/basicide/macrodlg.cxx @@ -19,9 +19,8 @@ #include -#include #include -#include +#include #include #include diff --git a/basctl/source/basicide/macrodlg.hrc b/basctl/source/basicide/macrodlg.hrc deleted file mode 100644 index b61af05c4731..000000000000 --- a/basctl/source/basicide/macrodlg.hrc +++ /dev/null @@ -1,31 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef BASCTL_MACRODLG_HRC -#define BASCTL_MACRODLG_HRC - - -#define RID_STR_BTNDEL ( RID_BASICIDE_START + 51 ) -#define RID_STR_BTNNEW ( RID_BASICIDE_START + 52 ) -#define RID_STR_CHOOSE ( RID_BASICIDE_START + 53 ) -#define RID_STR_RUN ( RID_BASICIDE_START + 54 ) -#define RID_STR_RECORD ( RID_BASICIDE_START + 56 ) - -#endif // BASCTL_MACRODLG_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/basicide/macrodlg.src b/basctl/source/basicide/macrodlg.src deleted file mode 100644 index f9ff3de552bd..000000000000 --- a/basctl/source/basicide/macrodlg.src +++ /dev/null @@ -1,43 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include -#include -String RID_STR_BTNDEL -{ - Text [ en-US ] = "~Delete" ; -}; -String RID_STR_BTNNEW -{ - Text [ en-US ] = "~New" ; -}; -String RID_STR_CHOOSE -{ - Text [ en-US ] = "Choose" ; -}; -String RID_STR_RUN -{ - Text [ en-US ] = "Run" ; -}; -String RID_STR_RECORD -{ - Text [ en-US ] = "~Save" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index 897771d895ea..778c38e5e96c 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include @@ -883,7 +883,7 @@ void LibPage::InsertLib() ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aLibName ) && xDlgLibContainer->isLibraryReadOnly( aLibName ) && !xDlgLibContainer->isLibraryLink( aLibName ) ) ) { OUString aErrStr( IDEResId(RID_STR_REPLACELIB) ); - aErrStr = aErrStr.replaceAll("XX", aLibName) + "\n" + OUString(IDEResId(RID_STR_LIBISREADONLY)); + aErrStr = aErrStr.replaceAll("XX", aLibName) + "\n" + IDEResId(RID_STR_LIBISREADONLY); ScopedVclPtrInstance(this, aErrStr)->Execute(); continue; } @@ -898,7 +898,7 @@ void LibPage::InsertLib() aErrStr = IDEResId(RID_STR_REFNOTPOSSIBLE); else aErrStr = IDEResId(RID_STR_IMPORTNOTPOSSIBLE); - aErrStr = aErrStr.replaceAll("XX", aLibName) + "\n" + OUString(IDEResId(RID_STR_SBXNAMEALLREADYUSED)); + aErrStr = aErrStr.replaceAll("XX", aLibName) + "\n" +IDEResId(RID_STR_SBXNAMEALLREADYUSED); ScopedVclPtrInstance(this, aErrStr)->Execute(); continue; } diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx index c5e5a54380d2..81b7a6e79868 100644 --- a/basctl/source/basicide/moduldlg.cxx +++ b/basctl/source/basicide/moduldlg.cxx @@ -19,7 +19,7 @@ #include -#include "basidesh.hrc" +#include "strings.hrc" #include "bitmaps.hlst" #include "moduldlg.hxx" @@ -942,7 +942,7 @@ void LibDialog::dispose() void LibDialog::SetStorageName( const OUString& rName ) { - OUString aName = OUString(IDEResId(RID_STR_FILENAME)) + rName; + OUString aName = IDEResId(RID_STR_FILENAME) + rName; m_pStorageFrame->set_label(aName); } diff --git a/basctl/source/basicide/objdlg.cxx b/basctl/source/basicide/objdlg.cxx index 31fe7a1c9208..292ff3bf000c 100644 --- a/basctl/source/basicide/objdlg.cxx +++ b/basctl/source/basicide/objdlg.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "objdlg.hrc" +#include "strings.hrc" #include "objdlg.hxx" #include "helpid.hrc" diff --git a/basctl/source/basicide/objdlg.hrc b/basctl/source/basicide/objdlg.hrc deleted file mode 100644 index 8b8a969fc165..000000000000 --- a/basctl/source/basicide/objdlg.hrc +++ /dev/null @@ -1,29 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef BASCTL_OBJDLG_HRC -#define BASCTL_OBJDLG_HRC - -#include - -#define RID_BASICIDE_OBJCAT ( RID_BASICIDE_START + 70 ) -#define RID_STR_TLB_MACROS ( RID_BASICIDE_START + 71 ) - -#endif // BASCTL_OBJDLG_HRR - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/basicide/objdlg.src b/basctl/source/basicide/objdlg.src deleted file mode 100644 index d66422c95a81..000000000000 --- a/basctl/source/basicide/objdlg.src +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include - -String RID_BASICIDE_OBJCAT -{ - Text [en-US] = "Object Catalog"; -}; - -String RID_STR_TLB_MACROS -{ - Text [ en-US ] = "Objects Tree"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx index f5fed7d1ad59..9078948e4d2b 100644 --- a/basctl/source/basicide/scriptdocument.cxx +++ b/basctl/source/basicide/scriptdocument.cxx @@ -20,7 +20,7 @@ #include #include "scriptdocument.hxx" #include "basobj.hxx" -#include "basidesh.hrc" +#include "strings.hrc" #include "iderid.hxx" #include "dlgeddef.hxx" #include "doceventnotifier.hxx" diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx index 4d71d4070022..bead2801ebe8 100644 --- a/basctl/source/dlged/dlgedobj.cxx +++ b/basctl/source/dlged/dlgedobj.cxx @@ -29,9 +29,8 @@ #include "dlgedview.hxx" #include "iderid.hxx" #include "localizationmgr.hxx" - -#include "dlgresid.hrc" #include "strings.hxx" +#include "strings.hrc" #include #include diff --git a/basctl/source/dlged/dlgresid.src b/basctl/source/dlged/dlgresid.src deleted file mode 100644 index 445250513f53..000000000000 --- a/basctl/source/dlged/dlgresid.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 "dlgresid.hrc" - -// Property Browser Headline ---------------------------------------------------------------- - -String RID_STR_BRWTITLE_PROPERTIES -{ - Text [ en-US ] = "Properties: "; -}; -String RID_STR_BRWTITLE_NO_PROPERTIES -{ - Text [ en-US ] = "No Control marked"; -}; -String RID_STR_BRWTITLE_MULTISELECT -{ - Text [ en-US ] = "Multiselection"; -}; - -String RID_STR_DEF_LANG -{ - Text [ en-US ] = "[Default Language]" ; -}; - -String RID_STR_CREATE_LANG -{ - Text [ en-US ] = "" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx index 439731afaacb..ba6912605404 100644 --- a/basctl/source/dlged/managelang.cxx +++ b/basctl/source/dlged/managelang.cxx @@ -24,8 +24,8 @@ #include "localizationmgr.hxx" #include "managelang.hxx" -#include "dlgresid.hrc" #include "helpid.hrc" +#include "strings.hrc" #include #include diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx index 0d89250911d2..9adcf984116a 100644 --- a/basctl/source/dlged/propbrw.cxx +++ b/basctl/source/dlged/propbrw.cxx @@ -23,8 +23,8 @@ #include "dlgedobj.hxx" #include "iderid.hxx" #include "baside3.hxx" +#include "strings.hrc" -#include "dlgresid.hrc" #include "strings.hxx" #include @@ -285,8 +285,8 @@ void PropBrw::implSetNewObjectSequence { xObjectInspector->inspect( _rObjectSeq ); - OUString aText = OUString(IDEResId(RID_STR_BRWTITLE_PROPERTIES)) - + OUString(IDEResId(RID_STR_BRWTITLE_MULTISELECT)); + OUString aText = IDEResId(RID_STR_BRWTITLE_PROPERTIES) + + IDEResId(RID_STR_BRWTITLE_MULTISELECT); SetText( aText ); } } diff --git a/basctl/source/inc/dlgresid.hrc b/basctl/source/inc/dlgresid.hrc deleted file mode 100644 index 3dc8a184920b..000000000000 --- a/basctl/source/inc/dlgresid.hrc +++ /dev/null @@ -1,38 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef BASCTL_DLGRESID_HRC -#define BASCTL_DLGRESID_HRC - -#include - -#define RID_STR_TRANSLATION_NOTLOCALIZED ( RID_DLG_START + 21 ) -#define RID_STR_TRANSLATION_DEFAULT ( RID_DLG_START + 22 ) -#define RID_STR_DEF_LANG ( RID_DLG_START + 25 ) -#define RID_STR_CREATE_LANG ( RID_DLG_START + 26 ) - -// Property Browser Headline Id's ----------------------------------------------------------- - -#define RID_STR_BRWTITLE_PROPERTIES ( RID_DLG_START + 60 ) -#define RID_STR_BRWTITLE_NO_PROPERTIES ( RID_DLG_START + 61 ) -#define RID_STR_BRWTITLE_MULTISELECT ( RID_DLG_START + 62 ) - -#endif // BASCTL_DLGRESID_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/inc/iderid.hxx b/basctl/source/inc/iderid.hxx index 2658a2585333..8724ccbb1891 100644 --- a/basctl/source/inc/iderid.hxx +++ b/basctl/source/inc/iderid.hxx @@ -20,16 +20,12 @@ #ifndef INCLUDED_BASCTL_SOURCE_INC_IDERID_HXX #define INCLUDED_BASCTL_SOURCE_INC_IDERID_HXX -#include +#include namespace basctl { -class IDEResId: public ResId -{ -public: - IDEResId( sal_uInt16 nId ); -}; +OUString IDEResId(const char *pId); } // namespace basctl diff --git a/basctl/uiconfig/basicide/ui/basicmacrodialog.ui b/basctl/uiconfig/basicide/ui/basicmacrodialog.ui index a8c265e542d5..248fef505f96 100644 --- a/basctl/uiconfig/basicide/ui/basicmacrodialog.ui +++ b/basctl/uiconfig/basicide/ui/basicmacrodialog.ui @@ -1,12 +1,12 @@ - + False 6 - %PRODUCTNAME Basic Macros + %PRODUCTNAME Basic Macros dialog @@ -19,7 +19,7 @@ start - Run + Run True True True @@ -35,7 +35,7 @@ - Assign... + Assign... True True True @@ -49,7 +49,7 @@ - Edit + Edit True True True @@ -78,7 +78,7 @@ - Organizer... + Organizer... True True True @@ -92,7 +92,7 @@ - New Library + New Library True True True @@ -106,7 +106,7 @@ - New Module + New Module True True True @@ -195,7 +195,7 @@ True False - Existing Macros In: + Existing Macros In: False @@ -249,7 +249,7 @@ True False 0 - Macro From + Macro From @@ -265,7 +265,7 @@ True False 0 - Save Macro In + Save Macro In @@ -311,7 +311,7 @@ True False - Macro Name + Macro Name diff --git a/basctl/uiconfig/basicide/ui/breakpointmenus.ui b/basctl/uiconfig/basicide/ui/breakpointmenus.ui index 710ab214ea3c..0949b5778726 100644 --- a/basctl/uiconfig/basicide/ui/breakpointmenus.ui +++ b/basctl/uiconfig/basicide/ui/breakpointmenus.ui @@ -1,6 +1,6 @@ - + True @@ -9,7 +9,7 @@ True False - Manage Breakpoints... + Manage Breakpoints... @@ -20,7 +20,7 @@ True False - _Active + _Active True @@ -34,7 +34,7 @@ True False - _Properties... + _Properties... True diff --git a/basctl/uiconfig/basicide/ui/defaultlanguage.ui b/basctl/uiconfig/basicide/ui/defaultlanguage.ui index e1ff4ba689a2..d4a1092fd062 100644 --- a/basctl/uiconfig/basicide/ui/defaultlanguage.ui +++ b/basctl/uiconfig/basicide/ui/defaultlanguage.ui @@ -1,12 +1,12 @@ - + False 6 - Set Default User Interface Language + Set Default User Interface Language False dialog @@ -90,7 +90,7 @@ True False 0 - Default language: + Default language: True entries:border @@ -132,7 +132,7 @@ False True 0 - Available languages: + Available languages: True checkedentries:border @@ -152,7 +152,7 @@ True False 0 - Select a language to define the default user interface language. All currently present strings will be assigned to the resources created for the selected language. + Select a language to define the default user interface language. All currently present strings will be assigned to the resources created for the selected language. True word-char 72 @@ -167,7 +167,7 @@ False True 0 - Select languages to be added. Resources for these languages will be created in the library. Strings of the current default user interface language will be copied to these new resources by default. + Select languages to be added. Resources for these languages will be created in the library. Strings of the current default user interface language will be copied to these new resources by default. True word-char 72 @@ -181,7 +181,7 @@ False True - Add User Interface Languages + Add User Interface Languages 0 diff --git a/basctl/uiconfig/basicide/ui/deletelangdialog.ui b/basctl/uiconfig/basicide/ui/deletelangdialog.ui index 2aa1f4b39dfe..7b91b3014903 100644 --- a/basctl/uiconfig/basicide/ui/deletelangdialog.ui +++ b/basctl/uiconfig/basicide/ui/deletelangdialog.ui @@ -1,18 +1,18 @@ - + False 6 - Delete Language Resources + Delete Language Resources False dialog True question ok-cancel - Do you want to delete the resources of the selected language(s)? - You are about to delete the resources for the selected language(s). All user interface strings for this language(s) will be deleted. + Do you want to delete the resources of the selected language(s)? + You are about to delete the resources for the selected language(s). All user interface strings for this language(s) will be deleted. False diff --git a/basctl/uiconfig/basicide/ui/dialogpage.ui b/basctl/uiconfig/basicide/ui/dialogpage.ui index 8095d81ea034..3314506b9b9f 100644 --- a/basctl/uiconfig/basicide/ui/dialogpage.ui +++ b/basctl/uiconfig/basicide/ui/dialogpage.ui @@ -1,6 +1,6 @@ - + @@ -27,7 +27,7 @@ True False 0 - Dialog: + Dialog: True library:border @@ -81,7 +81,7 @@ - _New... + _New... True True True @@ -96,7 +96,7 @@ - _New... + _New... True True True @@ -127,7 +127,7 @@ - _Password... + _Password... True True True @@ -141,7 +141,7 @@ - _Import... + _Import... True True True @@ -155,7 +155,7 @@ - _Export... + _Export... True True True diff --git a/basctl/uiconfig/basicide/ui/exportdialog.ui b/basctl/uiconfig/basicide/ui/exportdialog.ui index 26ea224854c4..bde36452b236 100644 --- a/basctl/uiconfig/basicide/ui/exportdialog.ui +++ b/basctl/uiconfig/basicide/ui/exportdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Export Basic library + Export Basic library False dialog @@ -80,7 +80,7 @@ 6 - Export as _extension + Export as _extension True True False @@ -97,7 +97,7 @@ - Export as BASIC library + Export as BASIC library True True False diff --git a/basctl/uiconfig/basicide/ui/gotolinedialog.ui b/basctl/uiconfig/basicide/ui/gotolinedialog.ui index dbdda2e58315..dbcaa4bb2d32 100644 --- a/basctl/uiconfig/basicide/ui/gotolinedialog.ui +++ b/basctl/uiconfig/basicide/ui/gotolinedialog.ui @@ -1,11 +1,11 @@ - + False 6 - Go to Line + Go to Line dialog @@ -82,7 +82,7 @@ True False 0 - _Line number: + _Line number: True entry diff --git a/basctl/uiconfig/basicide/ui/importlibdialog.ui b/basctl/uiconfig/basicide/ui/importlibdialog.ui index 074af3e91bc9..d042366c6533 100644 --- a/basctl/uiconfig/basicide/ui/importlibdialog.ui +++ b/basctl/uiconfig/basicide/ui/importlibdialog.ui @@ -1,12 +1,12 @@ - + False 6 - Import Libraries + Import Libraries False dialog @@ -95,7 +95,7 @@ 6 - Insert as reference (read-only) + Insert as reference (read-only) True True False @@ -110,7 +110,7 @@ - Replace existing libraries + Replace existing libraries True True False @@ -131,7 +131,7 @@ True False - Options + Options diff --git a/basctl/uiconfig/basicide/ui/libpage.ui b/basctl/uiconfig/basicide/ui/libpage.ui index e1579b88af58..ca3ade5a7c67 100644 --- a/basctl/uiconfig/basicide/ui/libpage.ui +++ b/basctl/uiconfig/basicide/ui/libpage.ui @@ -1,6 +1,6 @@ - + @@ -28,7 +28,7 @@ True False 0 - L_ocation: + L_ocation: True location @@ -67,7 +67,7 @@ True False 0 - _Library: + _Library: True library:border @@ -121,7 +121,7 @@ - _Password... + _Password... True True True @@ -135,7 +135,7 @@ - _New... + _New... True True True @@ -150,7 +150,7 @@ - _Import... + _Import... True True True @@ -165,7 +165,7 @@ - _Export... + _Export... True True True diff --git a/basctl/uiconfig/basicide/ui/managebreakpoints.ui b/basctl/uiconfig/basicide/ui/managebreakpoints.ui index 86a7eb42338e..51171b020ea8 100644 --- a/basctl/uiconfig/basicide/ui/managebreakpoints.ui +++ b/basctl/uiconfig/basicide/ui/managebreakpoints.ui @@ -1,12 +1,12 @@ - + False 6 - Manage Breakpoints + Manage Breakpoints dialog @@ -126,7 +126,7 @@ 6 - Active + Active True True False @@ -179,7 +179,7 @@ True False - Pass count: + Pass count: True pass-nospin @@ -202,7 +202,7 @@ True False - Breakpoints + Breakpoints diff --git a/basctl/uiconfig/basicide/ui/managelanguages.ui b/basctl/uiconfig/basicide/ui/managelanguages.ui index cde60b85a9f1..004c845454a6 100644 --- a/basctl/uiconfig/basicide/ui/managelanguages.ui +++ b/basctl/uiconfig/basicide/ui/managelanguages.ui @@ -1,11 +1,11 @@ - + False 6 - Manage User Interface Languages [$1] + Manage User Interface Languages [$1] False normal @@ -66,7 +66,7 @@ True False 0 - Present languages: + Present languages: True treeview:border @@ -80,7 +80,7 @@ True False 0 - The default language is used if no localization for a user interface locale is present. Furthermore all strings from the default language are copied to resources of newly added languages. + The default language is used if no localization for a user interface locale is present. Furthermore all strings from the default language are copied to resources of newly added languages. True 68 @@ -105,7 +105,7 @@ start - Add... + Add... True True True @@ -133,7 +133,7 @@ - Default + Default True True True diff --git a/basctl/uiconfig/basicide/ui/modulepage.ui b/basctl/uiconfig/basicide/ui/modulepage.ui index 2e59073bdfc0..523205cc9a3c 100644 --- a/basctl/uiconfig/basicide/ui/modulepage.ui +++ b/basctl/uiconfig/basicide/ui/modulepage.ui @@ -1,6 +1,6 @@ - + @@ -27,7 +27,7 @@ True False 0 - M_odule: + M_odule: True library:border @@ -81,7 +81,7 @@ - _New... + _New... True True True @@ -96,7 +96,7 @@ - _New... + _New... True True True @@ -127,7 +127,7 @@ - _Password... + _Password... True True True @@ -141,7 +141,7 @@ - _Import... + _Import... True True True @@ -155,7 +155,7 @@ - _Export... + _Export... True True True diff --git a/basctl/uiconfig/basicide/ui/newlibdialog.ui b/basctl/uiconfig/basicide/ui/newlibdialog.ui index 1329bb8b3e28..bafce4555917 100644 --- a/basctl/uiconfig/basicide/ui/newlibdialog.ui +++ b/basctl/uiconfig/basicide/ui/newlibdialog.ui @@ -1,6 +1,6 @@ - + False @@ -81,7 +81,7 @@ True False 0 - _Name: + _Name: True entry diff --git a/basctl/uiconfig/basicide/ui/organizedialog.ui b/basctl/uiconfig/basicide/ui/organizedialog.ui index c683c49b3d0b..fcb89bac70ff 100644 --- a/basctl/uiconfig/basicide/ui/organizedialog.ui +++ b/basctl/uiconfig/basicide/ui/organizedialog.ui @@ -1,11 +1,11 @@ - + False 6 - %PRODUCTNAME Basic Macro Organizer + %PRODUCTNAME Basic Macro Organizer False dialog @@ -69,7 +69,7 @@ True False - Modules + Modules False @@ -82,7 +82,7 @@ True False - Dialogs + Dialogs 1 @@ -96,7 +96,7 @@ True False - Libraries + Libraries 2 diff --git a/rsc/Module_rsc.mk b/basic/AllLangMoTarget_sb.mk similarity index 75% rename from rsc/Module_rsc.mk rename to basic/AllLangMoTarget_sb.mk index 40e7f03fbc28..90ece5be32da 100644 --- a/rsc/Module_rsc.mk +++ b/basic/AllLangMoTarget_sb.mk @@ -5,12 +5,9 @@ # 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/. -# -$(eval $(call gb_Module_Module,rsc)) +$(eval $(call gb_AllLangMoTarget_AllLangMoTarget,sb)) -$(eval $(call gb_Module_add_targets_for_build,rsc,\ - Executable_rsc \ -)) +$(eval $(call gb_AllLangMoTarget_set_polocation,sb,basic)) # vim: set noet sw=4 ts=4: diff --git a/basic/AllLangResTarget_sb.mk b/basic/AllLangResTarget_sb.mk deleted file mode 100644 index fa792286d626..000000000000 --- a/basic/AllLangResTarget_sb.mk +++ /dev/null @@ -1,39 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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 . -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,sb)) - - -$(eval $(call gb_AllLangResTarget_add_srs,sb,\ - sb/res \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,sb/res)) - -$(eval $(call gb_SrsTarget_set_include,sb/res,\ - $$(INCLUDE) \ - -I$(SRCDIR)/basic/inc \ -)) - -$(eval $(call gb_SrsTarget_add_files,sb/res,\ - basic/source/classes/sb.src \ - basic/source/sbx/format.src \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk index e2ed084131f0..f866a3bbd347 100644 --- a/basic/Library_sb.mk +++ b/basic/Library_sb.mk @@ -158,7 +158,4 @@ $(eval $(call gb_Library_add_exception_objects,sb,\ endif endif -# Runtime dependency for unit-tests -$(eval $(call gb_Library_use_restarget,sb,sb)) - # vim: set noet sw=4 ts=4: diff --git a/basic/Module_basic.mk b/basic/Module_basic.mk index 10fcbfd36990..a01c883268bc 100644 --- a/basic/Module_basic.mk +++ b/basic/Module_basic.mk @@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,basic)) ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),) $(eval $(call gb_Module_add_l10n_targets,basic,\ - AllLangResTarget_sb \ + AllLangMoTarget_sb \ )) $(eval $(call gb_Module_add_check_targets,basic,\ diff --git a/basic/inc/basic.hrc b/basic/inc/basic.hrc new file mode 100644 index 000000000000..c0824802a979 --- /dev/null +++ b/basic/inc/basic.hrc @@ -0,0 +1,161 @@ +/* -*- 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 N_("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_BASIC_INC_STRINGS_HRC +#define INCLUDED_BASIC_INC_STRINGS_HRC + +#define NC_(Context, String) (Context "\004" u8##String) + +std::pair RID_BASIC_START[] = +{ + { NC_("RID_BASIC_START", "Syntax error."), ErrCode(sal_uInt32(ERRCODE_BASIC_SYNTAX) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Return without Gosub."), ErrCode(sal_uInt32(ERRCODE_BASIC_NO_GOSUB) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Incorrect entry; please retry."), ErrCode(sal_uInt32(ERRCODE_BASIC_REDO_FROM_START) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Invalid procedure call."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_ARGUMENT) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Overflow."), ErrCode(sal_uInt32(ERRCODE_BASIC_MATH_OVERFLOW) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Not enough memory."), ErrCode(sal_uInt32(ERRCODE_BASIC_NO_MEMORY) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Array already dimensioned."), ErrCode(sal_uInt32(ERRCODE_BASIC_ALREADY_DIM) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Index out of defined range."), ErrCode(sal_uInt32(ERRCODE_BASIC_OUT_OF_RANGE) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Duplicate definition."), ErrCode(sal_uInt32(ERRCODE_BASIC_DUPLICATE_DEF) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Division by zero."), ErrCode(sal_uInt32(ERRCODE_BASIC_ZERODIV) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Variable not defined."), ErrCode(sal_uInt32(ERRCODE_BASIC_VAR_UNDEFINED) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Data type mismatch."), ErrCode(sal_uInt32(ERRCODE_BASIC_CONVERSION) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Invalid parameter."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_PARAMETER) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Process interrupted by user."), ErrCode(sal_uInt32(ERRCODE_BASIC_USER_ABORT) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Resume without error."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_RESUME) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Not enough stack memory."), ErrCode(sal_uInt32(ERRCODE_BASIC_STACK_OVERFLOW) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Sub-procedure or function procedure not defined."), ErrCode(sal_uInt32(ERRCODE_BASIC_PROC_UNDEFINED) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Error loading DLL file."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_DLL_LOAD) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Wrong DLL call convention."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_DLL_CALL) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Internal error $(ARG1)."), ErrCode(sal_uInt32(ERRCODE_BASIC_INTERNAL_ERROR) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Invalid file name or file number."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_CHANNEL) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "File not found."), ErrCode(sal_uInt32(ERRCODE_BASIC_FILE_NOT_FOUND) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Incorrect file mode."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_FILE_MODE) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "File already open."), ErrCode(sal_uInt32(ERRCODE_BASIC_FILE_ALREADY_OPEN) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Device I/O error."), ErrCode(sal_uInt32(ERRCODE_BASIC_IO_ERROR) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "File already exists."), ErrCode(sal_uInt32(ERRCODE_BASIC_FILE_EXISTS) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Incorrect record length."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_RECORD_LENGTH) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Disk or hard drive full."), ErrCode(sal_uInt32(ERRCODE_BASIC_DISK_FULL) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Reading exceeds EOF."), ErrCode(sal_uInt32(ERRCODE_BASIC_READ_PAST_EOF) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Incorrect record number."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_RECORD_NUMBER) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Too many files."), ErrCode(sal_uInt32(ERRCODE_BASIC_TOO_MANY_FILES) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Device not available."), ErrCode(sal_uInt32(ERRCODE_BASIC_NO_DEVICE) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Access denied."), ErrCode(sal_uInt32(ERRCODE_BASIC_ACCESS_DENIED) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Disk not ready."), ErrCode(sal_uInt32(ERRCODE_BASIC_NOT_READY) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Not implemented."), ErrCode(sal_uInt32(ERRCODE_BASIC_NOT_IMPLEMENTED) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Renaming on different drives impossible."), ErrCode(sal_uInt32(ERRCODE_BASIC_DIFFERENT_DRIVE) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Path/File access error."), ErrCode(sal_uInt32(ERRCODE_BASIC_ACCESS_ERROR) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Path not found."), ErrCode(sal_uInt32(ERRCODE_BASIC_PATH_NOT_FOUND) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Object variable not set."), ErrCode(sal_uInt32(ERRCODE_BASIC_NO_OBJECT) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Invalid string pattern."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_PATTERN) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Use of zero not permitted."), ErrCode(sal_uInt32(ERRCODE_BASIC_IS_NULL) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "DDE Error."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_ERROR) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Awaiting response to DDE connection."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_WAITINGACK) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "No DDE channels available."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_OUTOFCHANNELS) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "No application responded to DDE connect initiation."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_NO_RESPONSE) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Too many applications responded to DDE connect initiation."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_MULT_RESPONSES) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "DDE channel locked."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_CHANNEL_LOCKED) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "External application cannot execute DDE operation."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_NOTPROCESSED) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Timeout while waiting for DDE response."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_TIMEOUT) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "User pressed ESCAPE during DDE operation."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_USER_INTERRUPT) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "External application busy."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_BUSY) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "DDE operation without data."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_NO_DATA) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Data are in wrong format."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_WRONG_DATA_FORMAT) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "External application has been terminated."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_PARTNER_QUIT) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "DDE connection interrupted or modified."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_CONV_CLOSED) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "DDE method invoked with no channel open."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_NO_CHANNEL) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Invalid DDE link format."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_INVALID_LINK) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "DDE message has been lost."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_QUEUE_OVERFLOW) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Paste link already performed."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_LINK_ALREADY_EST) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Link mode cannot be set due to invalid link topic."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_LINK_INV_TOPIC) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "DDE requires the DDEML.DLL file."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_DLL_NOT_FOUND) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Module cannot be loaded; invalid format."), ErrCode(sal_uInt32(ERRCODE_BASIC_CANNOT_LOAD) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Invalid object index."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_INDEX) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Object is not available."), ErrCode(sal_uInt32(ERRCODE_BASIC_NO_ACTIVE_OBJECT) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Incorrect property value."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_PROP_VALUE) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "This property is read-only."), ErrCode(sal_uInt32(ERRCODE_BASIC_PROP_READONLY) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "This property is write only."), ErrCode(sal_uInt32(ERRCODE_BASIC_PROP_WRITEONLY) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Invalid object reference."), ErrCode(sal_uInt32(ERRCODE_BASIC_INVALID_OBJECT) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Property or method not found: $(ARG1)."), ErrCode(sal_uInt32(ERRCODE_BASIC_NO_METHOD) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Object required."), ErrCode(sal_uInt32(ERRCODE_BASIC_NEEDS_OBJECT) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Invalid use of an object."), ErrCode(sal_uInt32(ERRCODE_BASIC_INVALID_USAGE_OBJECT) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "OLE Automation is not supported by this object."), ErrCode(sal_uInt32(ERRCODE_BASIC_NO_OLE) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "This property or method is not supported by the object."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_METHOD) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "OLE Automation Error."), ErrCode(sal_uInt32(ERRCODE_BASIC_OLE_ERROR) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "This action is not supported by given object."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_ACTION) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Named arguments are not supported by given object."), ErrCode(sal_uInt32(ERRCODE_BASIC_NO_NAMED_ARGS) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "The current locale setting is not supported by the given object."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_LOCALE) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Named argument not found."), ErrCode(sal_uInt32(ERRCODE_BASIC_NAMED_NOT_FOUND) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Argument is not optional."), ErrCode(sal_uInt32(ERRCODE_BASIC_NOT_OPTIONAL) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Invalid number of arguments."), ErrCode(sal_uInt32(ERRCODE_BASIC_WRONG_ARGS) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Object is not a list."), ErrCode(sal_uInt32(ERRCODE_BASIC_NOT_A_COLL) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Invalid ordinal number."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_ORDINAL) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Specified DLL function not found."), ErrCode(sal_uInt32(ERRCODE_BASIC_DLLPROC_NOT_FOUND) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Invalid clipboard format."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_CLIPBD_FORMAT) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Object does not have this property."), ErrCode(sal_uInt32(ERRCODE_BASIC_PROPERTY_NOT_FOUND) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Object does not have this method."), ErrCode(sal_uInt32(ERRCODE_BASIC_METHOD_NOT_FOUND) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Required argument lacking."), ErrCode(sal_uInt32(ERRCODE_BASIC_ARG_MISSING) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Invalid number of arguments."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_NUMBER_OF_ARGS) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Error executing a method."), ErrCode(sal_uInt32(ERRCODE_BASIC_METHOD_FAILED) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Unable to set property."), ErrCode(sal_uInt32(ERRCODE_BASIC_SETPROP_FAILED) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Unable to determine property."), ErrCode(sal_uInt32(ERRCODE_BASIC_GETPROP_FAILED) & ERRCODE_RES_MASK) }, + // Compiler errors. These are not runtime errors. + { NC_("RID_BASIC_START", "Unexpected symbol: $(ARG1)."), ErrCode(sal_uInt32(ERRCODE_BASIC_UNEXPECTED) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Expected: $(ARG1)."), ErrCode(sal_uInt32(ERRCODE_BASIC_EXPECTED) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Symbol expected."), ErrCode(sal_uInt32(ERRCODE_BASIC_SYMBOL_EXPECTED) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Variable expected."), ErrCode(sal_uInt32(ERRCODE_BASIC_VAR_EXPECTED) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Label expected."), ErrCode(sal_uInt32(ERRCODE_BASIC_LABEL_EXPECTED) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Value cannot be applied."), ErrCode(sal_uInt32(ERRCODE_BASIC_LVALUE_EXPECTED) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Variable $(ARG1) already defined."), ErrCode(sal_uInt32(ERRCODE_BASIC_VAR_DEFINED) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Sub procedure or function procedure $(ARG1) already defined."), ErrCode(sal_uInt32(ERRCODE_BASIC_PROC_DEFINED) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Label $(ARG1) already defined."), ErrCode(sal_uInt32(ERRCODE_BASIC_LABEL_DEFINED) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Variable $(ARG1) not found."), ErrCode(sal_uInt32(ERRCODE_BASIC_UNDEF_VAR) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Array or procedure $(ARG1) not found."), ErrCode(sal_uInt32(ERRCODE_BASIC_UNDEF_ARRAY) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Procedure $(ARG1) not found."), ErrCode(sal_uInt32(ERRCODE_BASIC_UNDEF_PROC) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Label $(ARG1) undefined."), ErrCode(sal_uInt32(ERRCODE_BASIC_UNDEF_LABEL) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Unknown data type $(ARG1)."), ErrCode(sal_uInt32(ERRCODE_BASIC_UNDEF_TYPE) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Exit $(ARG1) expected."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_EXIT) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Statement block still open: $(ARG1) missing."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_BLOCK) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Parentheses do not match."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_BRACKETS) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Symbol $(ARG1) already defined differently."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_DECLARATION) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Parameters do not correspond to procedure."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_PARAMETERS) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Invalid character in number."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_CHAR_IN_NUMBER) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Array must be dimensioned."), ErrCode(sal_uInt32(ERRCODE_BASIC_MUST_HAVE_DIMS) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Else/Endif without If."), ErrCode(sal_uInt32(ERRCODE_BASIC_NO_IF) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "$(ARG1) not allowed within a procedure."), ErrCode(sal_uInt32(ERRCODE_BASIC_NOT_IN_SUBR) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "$(ARG1) not allowed outside a procedure."), ErrCode(sal_uInt32(ERRCODE_BASIC_NOT_IN_MAIN) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Dimension specifications do not match."), ErrCode(sal_uInt32(ERRCODE_BASIC_WRONG_DIMS) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Unknown option: $(ARG1)."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_OPTION) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Constant $(ARG1) redefined."), ErrCode(sal_uInt32(ERRCODE_BASIC_CONSTANT_REDECLARED) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Program too large."), ErrCode(sal_uInt32(ERRCODE_BASIC_PROG_TOO_LARGE) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Strings or arrays not permitted."), ErrCode(sal_uInt32(ERRCODE_BASIC_NO_STRINGS_ARRAYS) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "An exception occurred $(ARG1)."), ErrCode(sal_uInt32(ERRCODE_BASIC_EXCEPTION) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "This array is fixed or temporarily locked."), ErrCode(sal_uInt32(ERRCODE_BASIC_ARRAY_FIX) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Out of string space."), ErrCode(sal_uInt32(ERRCODE_BASIC_STRING_OVERFLOW) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Expression Too Complex."), ErrCode(sal_uInt32(ERRCODE_BASIC_EXPR_TOO_COMPLEX) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Can't perform requested operation."), ErrCode(sal_uInt32(ERRCODE_BASIC_OPER_NOT_PERFORM) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "Too many DLL application clients."), ErrCode(sal_uInt32(ERRCODE_BASIC_TOO_MANY_DLL) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "For loop not initialized."), ErrCode(sal_uInt32(ERRCODE_BASIC_LOOP_NOT_INIT) & ERRCODE_RES_MASK) }, + { NC_("RID_BASIC_START", "$(ARG1)"), ErrCode(sal_uInt32(ERRCODE_BASIC_COMPAT) & ERRCODE_RES_MASK) }, + { nullptr, ERRCODE_NONE } +}; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basic/inc/basrid.hxx b/basic/inc/basrid.hxx index 203c28162748..e6fd817afb23 100644 --- a/basic/inc/basrid.hxx +++ b/basic/inc/basrid.hxx @@ -20,13 +20,7 @@ #ifndef INCLUDED_BASIC_INC_BASRID_HXX #define INCLUDED_BASIC_INC_BASRID_HXX -#include - -class BasResId : public ResId -{ - public: - BasResId( sal_uInt32 nId ); -}; +OUString BasResId(const char* pId); #endif // INCLUDED_BASIC_INC_BASRID_HXX diff --git a/basic/inc/pch/precompiled_sb.hxx b/basic/inc/pch/precompiled_sb.hxx index 85d74021de78..a277651d7c50 100644 --- a/basic/inc/pch/precompiled_sb.hxx +++ b/basic/inc/pch/precompiled_sb.hxx @@ -59,7 +59,6 @@ #include #include #include -#include #include #include #include diff --git a/desktop/source/deployment/registry/help/dp_help.hrc b/basic/inc/strings.hrc similarity index 53% rename from desktop/source/deployment/registry/help/dp_help.hrc rename to basic/inc/strings.hrc index 59cb6136c458..deab90a91eb5 100644 --- a/desktop/source/deployment/registry/help/dp_help.hrc +++ b/basic/inc/strings.hrc @@ -17,15 +17,21 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DP_HELP_HRC -#define INCLUDED_DP_HELP_HRC +#ifndef INCLUDED_BASIC_INC_STRINGS_HRC +#define INCLUDED_BASIC_INC_STRINGS_HRC -#include "deployment.hrc" +#define NC_(Context, String) (Context "\004" u8##String) -#define RID_STR_HELP (RID_DEPLOYMENT_HELP_START+2) +#define STR_BASICKEY_FORMAT_ON NC_("STR_BASICKEY_FORMAT_ON", "On") +#define STR_BASICKEY_FORMAT_OFF NC_("STR_BASICKEY_FORMAT_OFF", "Off") +#define STR_BASICKEY_FORMAT_TRUE NC_("STR_BASICKEY_FORMAT_TRUE", "True") +#define STR_BASICKEY_FORMAT_FALSE NC_("STR_BASICKEY_FORMAT_FALSE", "False") +#define STR_BASICKEY_FORMAT_YES NC_("STR_BASICKEY_FORMAT_YES", "Yes") +#define STR_BASICKEY_FORMAT_NO NC_("STR_BASICKEY_FORMAT_NO", "No") +//format currency +#define STR_BASICKEY_FORMAT_CURRENCY NC_("STR_BASICKEY_FORMAT_CURRENCY", "@0.00 $;@(0.00 $)") -#define RID_STR_HELPPROCESSING_GENERAL_ERROR (RID_DEPLOYMENT_HELP_START+3) -#define RID_STR_HELPPROCESSING_XMLPARSING_ERROR (RID_DEPLOYMENT_HELP_START+4) +#define IDS_SBERR_TERMINATED NC_("IDS_SBERR_TERMINATED", "The macro running has been interrupted") #endif diff --git a/basic/qa/cppunit/basictest.cxx b/basic/qa/cppunit/basictest.cxx index bedd89e5dacf..9622a2867242 100644 --- a/basic/qa/cppunit/basictest.cxx +++ b/basic/qa/cppunit/basictest.cxx @@ -20,7 +20,6 @@ void MacroSnippet::InitSnippet() { - CPPUNIT_ASSERT_MESSAGE( "No resource manager", maDll.GetBasResMgr() != nullptr ); mpBasic = new StarBASIC(); StarBASIC::SetGlobalErrorHdl( LINK( this, MacroSnippet, BasicErrorHdl ) ); } diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index cc1e3d340503..9189d7538df8 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -41,9 +41,7 @@ #include #include "global.hxx" #include -#include "basrid.hxx" #include "sbintern.hxx" -#include #include #include diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index d04e6c3f0b73..45b85dc6b83a 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -18,8 +18,6 @@ */ #include "sb.hxx" -#include -#include #include #include #include @@ -36,7 +34,7 @@ #include "sbobjmod.hxx" #include "stdobj.hxx" #include "filefmt.hxx" -#include "sb.hrc" +#include "basic.hrc" #include #include #include @@ -1576,18 +1574,30 @@ void StarBASIC::SetErrorData( ErrCode nCode, sal_uInt16 nLine, aGlobals.nCol2 = nCol2; } +const ErrMsgCode* getRID_BASIC_START() +{ + return RID_BASIC_START; +} + void StarBASIC::MakeErrorText( ErrCode nId, const OUString& aMsg ) { SolarMutexGuard aSolarGuard; sal_uInt16 nOldID = GetVBErrorCode( nId ); - // instantiate the help class - ResStringArray aMyStringList(BasResId(RID_BASIC_START)); - sal_uInt32 nErrIdx = aMyStringList.FindIndex(nId.GetRest()); - if (nErrIdx != RESARRAY_INDEX_NOTFOUND) + const char* pErrorMsg = nullptr; + for (ErrMsgCode* pItem = RID_BASIC_START; pItem->second; ++pItem) + { + if (ErrCode(nId.GetRest()) == pItem->second) + { + pErrorMsg = pItem->first; + break; + } + } + + if (pErrorMsg) { // merge message with additional text - OUString sError = aMyStringList.GetString(nErrIdx); + OUString sError = BasResId(pErrorMsg); OUStringBuffer aMsg1(sError); // replace argument placeholder with %s OUString aSrgStr( "$(ARG1)" ); diff --git a/basic/source/classes/sb.src b/basic/source/classes/sb.src deleted file mode 100644 index 634dcab034bd..000000000000 --- a/basic/source/classes/sb.src +++ /dev/null @@ -1,191 +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 -#include - -#include "sb.hrc" - -StringArray RID_BASIC_START -{ - ItemList [ en-US ] = - { - < "Syntax error." ; ERRCODE_BASIC_SYNTAX & ERRCODE_RES_MASK ; >; - < "Return without Gosub." ; ERRCODE_BASIC_NO_GOSUB & ERRCODE_RES_MASK ; >; - < "Incorrect entry; please retry." ; ERRCODE_BASIC_REDO_FROM_START & ERRCODE_RES_MASK ; >; - < "Invalid procedure call." ; ERRCODE_BASIC_BAD_ARGUMENT & ERRCODE_RES_MASK ; >; - < "Overflow." ; ERRCODE_BASIC_MATH_OVERFLOW & ERRCODE_RES_MASK ; >; - < "Not enough memory." ; ERRCODE_BASIC_NO_MEMORY & ERRCODE_RES_MASK ; >; - < "Array already dimensioned." ; ERRCODE_BASIC_ALREADY_DIM & ERRCODE_RES_MASK ; >; - < "Index out of defined range." ; ERRCODE_BASIC_OUT_OF_RANGE & ERRCODE_RES_MASK ; >; - < "Duplicate definition." ; ERRCODE_BASIC_DUPLICATE_DEF & ERRCODE_RES_MASK ; >; - < "Division by zero." ; ERRCODE_BASIC_ZERODIV & ERRCODE_RES_MASK ; >; - < "Variable not defined." ; ERRCODE_BASIC_VAR_UNDEFINED & ERRCODE_RES_MASK ; >; - < "Data type mismatch." ; ERRCODE_BASIC_CONVERSION & ERRCODE_RES_MASK ; >; - < "Invalid parameter." ; ERRCODE_BASIC_BAD_PARAMETER & ERRCODE_RES_MASK ; >; - < "Process interrupted by user." ; ERRCODE_BASIC_USER_ABORT & ERRCODE_RES_MASK ; >; - < "Resume without error." ; ERRCODE_BASIC_BAD_RESUME & ERRCODE_RES_MASK ; >; - < "Not enough stack memory." ; ERRCODE_BASIC_STACK_OVERFLOW & ERRCODE_RES_MASK ; >; - < "Sub-procedure or function procedure not defined." ; ERRCODE_BASIC_PROC_UNDEFINED & ERRCODE_RES_MASK ; >; - < "Error loading DLL file." ; ERRCODE_BASIC_BAD_DLL_LOAD & ERRCODE_RES_MASK ; >; - < "Wrong DLL call convention." ; ERRCODE_BASIC_BAD_DLL_CALL & ERRCODE_RES_MASK ; >; - < "Internal error $(ARG1)." ; ERRCODE_BASIC_INTERNAL_ERROR & ERRCODE_RES_MASK ; >; - < "Invalid file name or file number." ; ERRCODE_BASIC_BAD_CHANNEL & ERRCODE_RES_MASK ; >; - < "File not found." ; ERRCODE_BASIC_FILE_NOT_FOUND & ERRCODE_RES_MASK ; >; - < "Incorrect file mode." ; ERRCODE_BASIC_BAD_FILE_MODE & ERRCODE_RES_MASK ; >; - < "File already open." ; ERRCODE_BASIC_FILE_ALREADY_OPEN & ERRCODE_RES_MASK ; >; - < "Device I/O error." ; ERRCODE_BASIC_IO_ERROR & ERRCODE_RES_MASK ; >; - < "File already exists." ; ERRCODE_BASIC_FILE_EXISTS & ERRCODE_RES_MASK ; >; - < "Incorrect record length." ; ERRCODE_BASIC_BAD_RECORD_LENGTH & ERRCODE_RES_MASK ; >; - < "Disk or hard drive full." ; ERRCODE_BASIC_DISK_FULL & ERRCODE_RES_MASK ; >; - < "Reading exceeds EOF." ; ERRCODE_BASIC_READ_PAST_EOF & ERRCODE_RES_MASK ; >; - < "Incorrect record number." ; ERRCODE_BASIC_BAD_RECORD_NUMBER & ERRCODE_RES_MASK ; >; - < "Too many files." ; ERRCODE_BASIC_TOO_MANY_FILES & ERRCODE_RES_MASK ; >; - < "Device not available." ; ERRCODE_BASIC_NO_DEVICE & ERRCODE_RES_MASK ; >; - < "Access denied." ; ERRCODE_BASIC_ACCESS_DENIED & ERRCODE_RES_MASK ; >; - < "Disk not ready." ; ERRCODE_BASIC_NOT_READY & ERRCODE_RES_MASK ; >; - < "Not implemented." ; ERRCODE_BASIC_NOT_IMPLEMENTED & ERRCODE_RES_MASK ; >; - < "Renaming on different drives impossible." ; ERRCODE_BASIC_DIFFERENT_DRIVE & ERRCODE_RES_MASK ; >; - < "Path/File access error." ; ERRCODE_BASIC_ACCESS_ERROR & ERRCODE_RES_MASK ; >; - < "Path not found." ; ERRCODE_BASIC_PATH_NOT_FOUND & ERRCODE_RES_MASK ; >; - < "Object variable not set." ; ERRCODE_BASIC_NO_OBJECT & ERRCODE_RES_MASK ; >; - < "Invalid string pattern." ; ERRCODE_BASIC_BAD_PATTERN & ERRCODE_RES_MASK ; >; - < "Use of zero not permitted." ; ERRCODE_BASIC_IS_NULL & ERRCODE_RES_MASK ; >; - < "DDE Error." ; ERRCODE_BASIC_DDE_ERROR & ERRCODE_RES_MASK ; >; - < "Awaiting response to DDE connection." ; ERRCODE_BASIC_DDE_WAITINGACK & ERRCODE_RES_MASK ; >; - < "No DDE channels available." ; ERRCODE_BASIC_DDE_OUTOFCHANNELS & ERRCODE_RES_MASK ; >; - < "No application responded to DDE connect initiation." ; ERRCODE_BASIC_DDE_NO_RESPONSE & ERRCODE_RES_MASK ; >; - < "Too many applications responded to DDE connect initiation." ; ERRCODE_BASIC_DDE_MULT_RESPONSES & ERRCODE_RES_MASK ; >; - < "DDE channel locked." ; ERRCODE_BASIC_DDE_CHANNEL_LOCKED & ERRCODE_RES_MASK ; >; - < "External application cannot execute DDE operation." ; ERRCODE_BASIC_DDE_NOTPROCESSED & ERRCODE_RES_MASK ; >; - < "Timeout while waiting for DDE response." ; ERRCODE_BASIC_DDE_TIMEOUT & ERRCODE_RES_MASK ; >; - < "User pressed ESCAPE during DDE operation." ; ERRCODE_BASIC_DDE_USER_INTERRUPT & ERRCODE_RES_MASK ; >; - < "External application busy." ; ERRCODE_BASIC_DDE_BUSY & ERRCODE_RES_MASK ; >; - < "DDE operation without data." ; ERRCODE_BASIC_DDE_NO_DATA & ERRCODE_RES_MASK ; >; - < "Data are in wrong format." ; ERRCODE_BASIC_DDE_WRONG_DATA_FORMAT & ERRCODE_RES_MASK ; >; - < "External application has been terminated." ; ERRCODE_BASIC_DDE_PARTNER_QUIT & ERRCODE_RES_MASK ; >; - < "DDE connection interrupted or modified." ; ERRCODE_BASIC_DDE_CONV_CLOSED & ERRCODE_RES_MASK ; >; - < "DDE method invoked with no channel open." ; ERRCODE_BASIC_DDE_NO_CHANNEL & ERRCODE_RES_MASK ; >; - < "Invalid DDE link format." ; ERRCODE_BASIC_DDE_INVALID_LINK & ERRCODE_RES_MASK ; >; - < "DDE message has been lost." ; ERRCODE_BASIC_DDE_QUEUE_OVERFLOW & ERRCODE_RES_MASK ; >; - < "Paste link already performed." ; ERRCODE_BASIC_DDE_LINK_ALREADY_EST & ERRCODE_RES_MASK ; >; - < "Link mode cannot be set due to invalid link topic." ; ERRCODE_BASIC_DDE_LINK_INV_TOPIC & ERRCODE_RES_MASK ; >; - < "DDE requires the DDEML.DLL file." ; ERRCODE_BASIC_DDE_DLL_NOT_FOUND & ERRCODE_RES_MASK ; >; - < "Module cannot be loaded; invalid format." ; ERRCODE_BASIC_CANNOT_LOAD & ERRCODE_RES_MASK ; >; - < "Invalid object index." ; ERRCODE_BASIC_BAD_INDEX & ERRCODE_RES_MASK ; >; - < "Object is not available." ; ERRCODE_BASIC_NO_ACTIVE_OBJECT & ERRCODE_RES_MASK ; >; - < "Incorrect property value." ; ERRCODE_BASIC_BAD_PROP_VALUE & ERRCODE_RES_MASK ; >; - < "This property is read-only." ; ERRCODE_BASIC_PROP_READONLY & ERRCODE_RES_MASK ; >; - < "This property is write only." ; ERRCODE_BASIC_PROP_WRITEONLY & ERRCODE_RES_MASK ; >; - < "Invalid object reference." ; ERRCODE_BASIC_INVALID_OBJECT & ERRCODE_RES_MASK ; >; - < "Property or method not found: $(ARG1)." ; ERRCODE_BASIC_NO_METHOD & ERRCODE_RES_MASK ; >; - < "Object required." ; ERRCODE_BASIC_NEEDS_OBJECT & ERRCODE_RES_MASK ; >; - < "Invalid use of an object." ; ERRCODE_BASIC_INVALID_USAGE_OBJECT & ERRCODE_RES_MASK ; >; - < "OLE Automation is not supported by this object." ; ERRCODE_BASIC_NO_OLE & ERRCODE_RES_MASK ; >; - < "This property or method is not supported by the object." ; ERRCODE_BASIC_BAD_METHOD & ERRCODE_RES_MASK ; >; - < "OLE Automation Error." ; ERRCODE_BASIC_OLE_ERROR & ERRCODE_RES_MASK ; >; - < "This action is not supported by given object." ; ERRCODE_BASIC_BAD_ACTION & ERRCODE_RES_MASK ; >; - < "Named arguments are not supported by given object." ; ERRCODE_BASIC_NO_NAMED_ARGS & ERRCODE_RES_MASK ; >; - < "The current locale setting is not supported by the given object." ; ERRCODE_BASIC_BAD_LOCALE & ERRCODE_RES_MASK ; >; - < "Named argument not found." ; ERRCODE_BASIC_NAMED_NOT_FOUND & ERRCODE_RES_MASK ; >; - < "Argument is not optional." ; ERRCODE_BASIC_NOT_OPTIONAL & ERRCODE_RES_MASK ; >; - < "Invalid number of arguments." ; ERRCODE_BASIC_WRONG_ARGS & ERRCODE_RES_MASK ; >; - < "Object is not a list." ; ERRCODE_BASIC_NOT_A_COLL & ERRCODE_RES_MASK ; >; - < "Invalid ordinal number." ; ERRCODE_BASIC_BAD_ORDINAL & ERRCODE_RES_MASK ; >; - < "Specified DLL function not found." ; ERRCODE_BASIC_DLLPROC_NOT_FOUND & ERRCODE_RES_MASK ; >; - < "Invalid clipboard format." ; ERRCODE_BASIC_BAD_CLIPBD_FORMAT & ERRCODE_RES_MASK ; >; - < "Object does not have this property." ; ERRCODE_BASIC_PROPERTY_NOT_FOUND & ERRCODE_RES_MASK ; >; - < "Object does not have this method." ; ERRCODE_BASIC_METHOD_NOT_FOUND & ERRCODE_RES_MASK ; >; - < "Required argument lacking." ; ERRCODE_BASIC_ARG_MISSING & ERRCODE_RES_MASK ; >; - < "Invalid number of arguments." ; ERRCODE_BASIC_BAD_NUMBER_OF_ARGS & ERRCODE_RES_MASK ; >; - < "Error executing a method." ; ERRCODE_BASIC_METHOD_FAILED & ERRCODE_RES_MASK ; >; - < "Unable to set property." ; ERRCODE_BASIC_SETPROP_FAILED & ERRCODE_RES_MASK ; >; - < "Unable to determine property." ; ERRCODE_BASIC_GETPROP_FAILED & ERRCODE_RES_MASK ; >; - // Compiler errors. These are not runtime errors. - < "Unexpected symbol: $(ARG1)." ; ERRCODE_BASIC_UNEXPECTED & ERRCODE_RES_MASK ; >; - < "Expected: $(ARG1)." ; ERRCODE_BASIC_EXPECTED & ERRCODE_RES_MASK ; >; - < "Symbol expected." ; ERRCODE_BASIC_SYMBOL_EXPECTED & ERRCODE_RES_MASK ; >; - < "Variable expected." ; ERRCODE_BASIC_VAR_EXPECTED & ERRCODE_RES_MASK ; >; - < "Label expected." ; ERRCODE_BASIC_LABEL_EXPECTED & ERRCODE_RES_MASK ; >; - < "Value cannot be applied." ; ERRCODE_BASIC_LVALUE_EXPECTED & ERRCODE_RES_MASK ; >; - < "Variable $(ARG1) already defined." ; ERRCODE_BASIC_VAR_DEFINED & ERRCODE_RES_MASK ; >; - < "Sub procedure or function procedure $(ARG1) already defined." ; ERRCODE_BASIC_PROC_DEFINED & ERRCODE_RES_MASK ; >; - < "Label $(ARG1) already defined." ; ERRCODE_BASIC_LABEL_DEFINED & ERRCODE_RES_MASK ; >; - < "Variable $(ARG1) not found." ; ERRCODE_BASIC_UNDEF_VAR & ERRCODE_RES_MASK ; >; - < "Array or procedure $(ARG1) not found." ; ERRCODE_BASIC_UNDEF_ARRAY & ERRCODE_RES_MASK ; >; - < "Procedure $(ARG1) not found." ; ERRCODE_BASIC_UNDEF_PROC & ERRCODE_RES_MASK ; >; - < "Label $(ARG1) undefined." ; ERRCODE_BASIC_UNDEF_LABEL & ERRCODE_RES_MASK ; >; - < "Unknown data type $(ARG1)." ; ERRCODE_BASIC_UNDEF_TYPE & ERRCODE_RES_MASK ; >; - < "Exit $(ARG1) expected." ; ERRCODE_BASIC_BAD_EXIT & ERRCODE_RES_MASK ; >; - < "Statement block still open: $(ARG1) missing." ; ERRCODE_BASIC_BAD_BLOCK & ERRCODE_RES_MASK ; >; - < "Parentheses do not match." ; ERRCODE_BASIC_BAD_BRACKETS & ERRCODE_RES_MASK ; >; - < "Symbol $(ARG1) already defined differently." ; ERRCODE_BASIC_BAD_DECLARATION & ERRCODE_RES_MASK ; >; - < "Parameters do not correspond to procedure." ; ERRCODE_BASIC_BAD_PARAMETERS & ERRCODE_RES_MASK ; >; - < "Invalid character in number." ; ERRCODE_BASIC_BAD_CHAR_IN_NUMBER & ERRCODE_RES_MASK ; >; - < "Array must be dimensioned." ; ERRCODE_BASIC_MUST_HAVE_DIMS & ERRCODE_RES_MASK ; >; - < "Else/Endif without If." ; ERRCODE_BASIC_NO_IF & ERRCODE_RES_MASK ; >; - < "$(ARG1) not allowed within a procedure." ; ERRCODE_BASIC_NOT_IN_SUBR & ERRCODE_RES_MASK ; >; - < "$(ARG1) not allowed outside a procedure." ; ERRCODE_BASIC_NOT_IN_MAIN & ERRCODE_RES_MASK ; >; - < "Dimension specifications do not match." ; ERRCODE_BASIC_WRONG_DIMS & ERRCODE_RES_MASK ; >; - < "Unknown option: $(ARG1)." ; ERRCODE_BASIC_BAD_OPTION & ERRCODE_RES_MASK ; >; - < "Constant $(ARG1) redefined." ; ERRCODE_BASIC_CONSTANT_REDECLARED & ERRCODE_RES_MASK ; >; - < "Program too large." ; ERRCODE_BASIC_PROG_TOO_LARGE & ERRCODE_RES_MASK ; >; - < "Strings or arrays not permitted." ; ERRCODE_BASIC_NO_STRINGS_ARRAYS & ERRCODE_RES_MASK ; >; - < "An exception occurred $(ARG1)." ; ERRCODE_BASIC_EXCEPTION & ERRCODE_RES_MASK ; >; - < "This array is fixed or temporarily locked." ; ERRCODE_BASIC_ARRAY_FIX & ERRCODE_RES_MASK ; >; - < "Out of string space." ; ERRCODE_BASIC_STRING_OVERFLOW & ERRCODE_RES_MASK ; >; - < "Expression Too Complex." ; ERRCODE_BASIC_EXPR_TOO_COMPLEX & ERRCODE_RES_MASK ; >; - < "Can't perform requested operation." ; ERRCODE_BASIC_OPER_NOT_PERFORM & ERRCODE_RES_MASK ; >; - < "Too many DLL application clients." ; ERRCODE_BASIC_TOO_MANY_DLL & ERRCODE_RES_MASK ; >; - < "For loop not initialized." ; ERRCODE_BASIC_LOOP_NOT_INIT & ERRCODE_RES_MASK ; >; - < "$(ARG1)" ; ERRCODE_BASIC_COMPAT & ERRCODE_RES_MASK ; >; - }; -}; - - // Hinweis: IDS_SBERR_TERMINATED = IDS_SBERR_START+2000. -String IDS_SBERR_TERMINATED -{ - Text [ en-US ] = "The macro running has been interrupted" ; -}; -String ERRCODE_BASMGR_LIBLOAD & ERRCODE_RES_MASK -{ - Text [ en-US ] = "Error loading library '$(ARG1)'." ; -}; -String ERRCODE_BASMGR_LIBSAVE & ERRCODE_RES_MASK -{ - Text [ en-US ] = "Error saving library: '$(ARG1)'." ; -}; -String ERRCODE_BASMGR_MGROPEN & ERRCODE_RES_MASK -{ - Text [ en-US ] = "The BASIC from the file '$(ARG1)' could not be initialized." ; -}; -String ERRCODE_BASMGR_MGRSAVE & ERRCODE_RES_MASK -{ - Text [ en-US ] = "Error saving BASIC: '$(ARG1)'." ; -}; -String ERRCODE_BASMGR_REMOVELIB & ERRCODE_RES_MASK -{ - Text [ en-US ] = "Error removing library." ; -}; -String ERRCODE_BASMGR_UNLOADLIB & ERRCODE_RES_MASK -{ - Text [ en-US ] = "The library could not be removed from memory." ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basic/source/runtime/basrdll.cxx b/basic/source/runtime/basrdll.cxx index c9e4a153338d..e7f228060293 100644 --- a/basic/source/runtime/basrdll.cxx +++ b/basic/source/runtime/basrdll.cxx @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include "strings.hrc" #include struct BasicDLL::Impl @@ -35,13 +35,13 @@ struct BasicDLL::Impl bool bDebugMode; bool bBreakEnabled; - std::unique_ptr xBasResMgr; + std::locale aBasResLocale; std::unique_ptr xSbxAppData; Impl() : bDebugMode(false) , bBreakEnabled(true) - , xBasResMgr(ResMgr::CreateResMgr("sb", Application::GetSettings().GetUILanguageTag())) + , aBasResLocale(Translate::Create("sb", Application::GetSettings().GetUILanguageTag())) , xSbxAppData(new SbxAppData) { } }; @@ -52,9 +52,9 @@ BasicDLL * BASIC_DLL; } -BasResId::BasResId( sal_uInt32 nId ) : - ResId( nId, *(BASIC_DLL->GetBasResMgr()) ) +OUString BasResId(const char* pId) { + return Translate::get(pId, BASIC_DLL->GetBasResLocale()); } BasicDLL::BasicDLL() @@ -67,7 +67,7 @@ BasicDLL::~BasicDLL() { } -ResMgr* BasicDLL::GetBasResMgr() const { return m_xImpl->xBasResMgr.get(); } +const std::locale& BasicDLL::GetBasResLocale() const { return m_xImpl->aBasResLocale; } void BasicDLL::EnableBreak( bool bEnable ) { diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index f9f7d53597e3..56fa68c2aa52 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -72,9 +72,7 @@ using namespace com::sun::star::uno; #include "stdobj.hxx" #include "sbstdobj.hxx" #include "rtlproto.hxx" -#include "basrid.hxx" #include "image.hxx" -#include "sb.hrc" #include "iosys.hxx" #include "ddectrl.hxx" #include diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index 8f7342b84aee..5d9764fa7581 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -53,7 +53,6 @@ #include -#include "basrid.hxx" #include "codegen.hxx" #include "comenumwrapper.hxx" #include "ddectrl.hxx" @@ -63,7 +62,6 @@ #include "iosys.hxx" #include "opcodes.hxx" #include "runtime.hxx" -#include "sb.hrc" #include "sb.hxx" #include "sbintern.hxx" #include "sbunoobj.hxx" diff --git a/basic/source/sbx/format.src b/basic/source/sbx/format.src deleted file mode 100644 index 432da3ffe2cd..000000000000 --- a/basic/source/sbx/format.src +++ /dev/null @@ -1,51 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include - -String STR_BASICKEY_FORMAT_ON -{ - Text [ en-US ] = "On" ; -}; -String STR_BASICKEY_FORMAT_OFF -{ - Text [ en-US ] = "Off" ; -}; -String STR_BASICKEY_FORMAT_TRUE -{ - Text [ en-US ] = "True" ; -}; -String STR_BASICKEY_FORMAT_FALSE -{ - Text [ en-US ] = "False" ; -}; -String STR_BASICKEY_FORMAT_YES -{ - Text [ en-US ] = "Yes" ; -}; -String STR_BASICKEY_FORMAT_NO -{ - Text [ en-US ] = "No" ; -}; -String STR_BASICKEY_FORMAT_CURRENCY -{ - Text [ en-US ] = "@0.00 $;@(0.00 $)" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx index eff6720951f5..8be89826439b 100644 --- a/basic/source/sbx/sbxscan.cxx +++ b/basic/source/sbx/sbxscan.cxx @@ -38,11 +38,10 @@ #include "sbxbase.hxx" #include #include -#include -#include "basrid.hxx" #include "date.hxx" #include "runtime.hxx" +#include "strings.hrc" #include #include @@ -584,21 +583,16 @@ bool SbxValue::Scan( const OUString& rSrc, sal_uInt16* pLen ) namespace { -ResMgr& implGetResMgr() +const std::locale& implGetResLocale() { - static ResMgr* const pResMgr( ResMgr::CreateResMgr( - "sb", Application::GetSettings().GetUILanguageTag() )); - - return *pResMgr; + static std::locale loc(Translate::Create("sb", Application::GetSettings().GetUILanguageTag())); + return loc; } -class SbxValueFormatResId : public ResId +OUString SbxValueFormatResId(const char *pId) { -public: - explicit SbxValueFormatResId( sal_uInt32 nId ) - : ResId( nId, implGetResMgr() ) - {} -}; + return Translate::get(pId, implGetResLocale()); +} enum class VbaFormatType { diff --git a/bin/find-unused-defines-in-hrc-files.py b/bin/find-unused-defines-in-hrc-files.py index a7adbf29fa20..c28fe545578a 100755 --- a/bin/find-unused-defines-in-hrc-files.py +++ b/bin/find-unused-defines-in-hrc-files.py @@ -14,23 +14,6 @@ exclusionSet = set([ # List of RID constants where we compute a value using a base before calling one of the RESSTR methods # Found with: git grep -P 'RID_\w+\s*\+' -- :/ ':!*.hrc' ':!*.src' ':!*.java' ':!*.py' ':!*.xba' "RID_SVXSTR_KEY_", - "RID_SVXITEMS_SHADOW_", - "RID_SVXITEMS_BREAK_", - "RID_SVXITEMS_FRMDIR_", - "RID_SVXITEMS_COLOR", - "RID_SVXITEMS_HORJUST_", - "RID_SVXITEMS_VERJUST_", - "RID_SVXITEMS_JUSTMETHOD_", - "RID_SVXITEMS_ADJUST_", - "RID_SVXITEMS_WEIGHT_", - "RID_SVXITEMS_UL_", - "RID_SVXITEMS_OL_", - "RID_SVXITEMS_STRIKEOUT_", - "RID_SVXITEMS_CASEMAP_", - "RID_SVXITEMS_ESCAPEMENT_", - "RID_SVXITEMS_EMPHASIS_", - "RID_SVXITEMS_RELIEF_", - "RID_SVXITEMS_FRMDIR_", "RID_UPDATE_BUBBLE_TEXT_", "RID_UPDATE_BUBBLE_T_TEXT_", "RID_SVXSTR_TBLAFMT_", @@ -42,8 +25,6 @@ exclusionSet = set([ "RID_SVXSTR_OUTLINENUM_DESCRIPTION", "RID_SVXSTR_RULER_", "RID_GALLERYSTR_THEME_", - "RID_SVXITEMS_ORI_", - "RID_SVXITEMS_PAGE_NUM_", "RID_SVXSTR_BULLET_DESCRIPTION", "RID_SVXSTR_SINGLENUM_DESCRIPTION", "RID_SVXSTR_OUTLINENUM_DESCRIPTION", diff --git a/bin/lint-ui.py b/bin/lint-ui.py index 2ed80c2523fb..88fb2cc460a1 100755 --- a/bin/lint-ui.py +++ b/bin/lint-ui.py @@ -98,6 +98,8 @@ def main(): tree = ET.parse(sys.argv[1]) root = tree.getroot() + lint_assert('domain' in root.attrib, "interface needs to specific translation domain") + top_level_widgets = [element for element in root.findall('object') if element.attrib['class'] not in IGNORED_TOP_LEVEL_WIDGETS] assert len(top_level_widgets) == 1 diff --git a/bin/run b/bin/run index 7823861d4a3b..7055ffe177b3 100755 --- a/bin/run +++ b/bin/run @@ -25,9 +25,9 @@ if uname | grep -i CYGWIN >/dev/null; then export URE_BOOTSTRAP=file:///$(cygpath -m "${dir}")/instdir/program/fundamental.ini export PATH=${PATH:+$PATH:}"${dir}"/instdir/program - echo "setting URE_BOOTSTRAP to: ${URE_BOOTSTRAP}" - echo "setting search path to: ${PATH}" - echo "execing: ${exedir}/$1" +# echo "setting URE_BOOTSTRAP to: ${URE_BOOTSTRAP}" +# echo "setting search path to: ${PATH}" +# echo "execing: ${exedir}/$1" exec ${LO_TRACE} "${exedir}/$@" @@ -47,9 +47,9 @@ elif [ $(uname) = Darwin ]; then export URE_BOOTSTRAP=file://"${dir}"/instdir/$PRODUCTNAME.app/Contents/Resources/fundamentalrc export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+$DYLD_LIBRARY_PATH:}"${dir}"/instdir/$PRODUCTNAME.app/Contents/Frameworks - echo "setting URE_BOOTSTRAP to: ${URE_BOOTSTRAP}" - echo "setting search path to: ${DYLD_LIBRARY_PATH}" - echo "execing: ${exedir}/$1" +# echo "setting URE_BOOTSTRAP to: ${URE_BOOTSTRAP}" +# echo "setting search path to: ${DYLD_LIBRARY_PATH}" +# echo "execing: ${exedir}/$1" exec ${LO_TRACE} "${exedir}/$@" @@ -69,9 +69,9 @@ else export URE_BOOTSTRAP=file://"${dir}"/instdir/program/fundamentalrc export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${dir}"/instdir/program - echo "setting URE_BOOTSTRAP to: ${URE_BOOTSTRAP}" - echo "setting search path to: ${LD_LIBRARY_PATH}" - echo "execing: ${exedir}/$1" +# echo "setting URE_BOOTSTRAP to: ${URE_BOOTSTRAP}" +# echo "setting search path to: ${LD_LIBRARY_PATH}" +# echo "execing: ${exedir}/$1" exec ${LO_TRACE} "${exedir}/$@" diff --git a/chart2/AllLangMoTarget_chart.mk b/chart2/AllLangMoTarget_chart.mk new file mode 100644 index 000000000000..bf3b19b3876b --- /dev/null +++ b/chart2/AllLangMoTarget_chart.mk @@ -0,0 +1,13 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# 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/. + +$(eval $(call gb_AllLangMoTarget_AllLangMoTarget,chart)) + +$(eval $(call gb_AllLangMoTarget_set_polocation,chart,chart2)) + +# vim: set noet sw=4 ts=4: diff --git a/chart2/AllLangResTarget_chartcontroller.mk b/chart2/AllLangResTarget_chartcontroller.mk deleted file mode 100644 index 9d9cddb3f974..000000000000 --- a/chart2/AllLangResTarget_chartcontroller.mk +++ /dev/null @@ -1,35 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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/. -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,chartcontroller)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,chartcontroller,chart2)) - -$(eval $(call gb_AllLangResTarget_add_srs,chartcontroller,\ - chart2/res \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,chart2/res)) - -$(eval $(call gb_SrsTarget_set_include,chart2/res,\ - $$(INCLUDE) \ - -I$(SRCDIR)/chart2/source/controller/dialogs \ - -I$(SRCDIR)/chart2/source/controller/inc \ - -I$(SRCDIR)/chart2/source/controller/main \ - -I$(SRCDIR)/chart2/source/inc \ -)) - -$(eval $(call gb_SrsTarget_add_files,chart2/res,\ - chart2/source/controller/dialogs/Strings_ChartTypes.src \ - chart2/source/controller/dialogs/Strings_Scale.src \ - chart2/source/controller/dialogs/Strings.src \ - chart2/source/controller/dialogs/Strings_Statistic.src \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/chart2/CppunitTest_chart2_import.mk b/chart2/CppunitTest_chart2_import.mk index af8619454f8d..17769c6e5173 100644 --- a/chart2/CppunitTest_chart2_import.mk +++ b/chart2/CppunitTest_chart2_import.mk @@ -128,7 +128,4 @@ $(eval $(call gb_CppunitTest_use_components,chart2_import,\ $(eval $(call gb_CppunitTest_use_configuration,chart2_import)) -$(call gb_CppunitTest_get_target,chart2_import): \ - $(call gb_AllLangResTarget_get_target,sd) - # vim: set noet sw=4 ts=4: diff --git a/chart2/CppunitTest_chart2_trendcalculators.mk b/chart2/CppunitTest_chart2_trendcalculators.mk index de8b20e1ec42..aa9a6d6b037e 100644 --- a/chart2/CppunitTest_chart2_trendcalculators.mk +++ b/chart2/CppunitTest_chart2_trendcalculators.mk @@ -127,7 +127,4 @@ $(eval $(call gb_CppunitTest_use_components,chart2_trendcalculators,\ $(eval $(call gb_CppunitTest_use_configuration,chart2_trendcalculators)) -$(call gb_CppunitTest_get_target,chart2_trendcalculators): \ - $(call gb_AllLangResTarget_get_target,sd) - # vim: set noet sw=4 ts=4: diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk index ee4dc2ea5328..7c0cc90a1d14 100644 --- a/chart2/Library_chartcontroller.mk +++ b/chart2/Library_chartcontroller.mk @@ -201,7 +201,4 @@ $(eval $(call gb_Library_add_exception_objects,chartcontroller,\ chart2/source/controller/uitest/uiobject \ )) -# Runtime dependency for unit-tests -$(eval $(call gb_Library_use_restarget,chartcontroller,chartcontroller)) - # vim: set noet sw=4 ts=4: diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk index 5e2d820bd7b9..c044d016a91a 100644 --- a/chart2/Module_chart2.mk +++ b/chart2/Module_chart2.mk @@ -12,6 +12,7 @@ $(eval $(call gb_Module_Module,chart2)) $(eval $(call gb_Module_add_targets,chart2,\ Library_chartcontroller \ Library_chartcore \ + UIConfig_chart2 \ )) ifeq ($(ENABLE_HEADLESS),) $(eval $(call gb_Module_add_targets,chart2,\ @@ -21,8 +22,7 @@ $(eval $(call gb_Module_add_targets,chart2,\ endif $(eval $(call gb_Module_add_l10n_targets,chart2,\ - AllLangResTarget_chartcontroller \ - UIConfig_chart2 \ + AllLangMoTarget_chart \ )) ifneq ($(OS),IOS) diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx b/chart2/inc/pch/precompiled_chartcontroller.hxx index 337b33a35b9f..f85aafda5899 100644 --- a/chart2/inc/pch/precompiled_chartcontroller.hxx +++ b/chart2/inc/pch/precompiled_chartcontroller.hxx @@ -361,8 +361,6 @@ #include #include #include -#include -#include #include #include #include @@ -498,7 +496,6 @@ #include #include #include -#include #include #include #include diff --git a/chart2/inc/strings.hrc b/chart2/inc/strings.hrc new file mode 100644 index 000000000000..fac728c6e4dd --- /dev/null +++ b/chart2/inc/strings.hrc @@ -0,0 +1,198 @@ +/* -*- 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 CHART_STRINGS_HRC +#define CHART_STRINGS_HRC + +#define NC_(Context, String) (Context "\004" u8##String) + +#define STR_DLG_CHART_WIZARD NC_("STR_DLG_CHART_WIZARD", "Chart Wizard") +#define STR_DLG_SMOOTH_LINE_PROPERTIES NC_("STR_DLG_SMOOTH_LINE_PROPERTIES", "Smooth Lines") +#define STR_DLG_STEPPED_LINE_PROPERTIES NC_("STR_DLG_STEPPED_LINE_PROPERTIES", "Stepped Lines") +#define STR_PAGE_CHARTTYPE NC_("STR_PAGE_CHARTTYPE", "Chart Type") +#define STR_PAGE_DATA_RANGE NC_("STR_PAGE_DATA_RANGE", "Data Range") +#define STR_PAGE_CHART_ELEMENTS NC_("STR_PAGE_CHART_ELEMENTS", "Chart Elements") +#define STR_PAGE_LINE NC_("STR_PAGE_LINE", "Line") +#define STR_PAGE_BORDER NC_("STR_PAGE_BORDER", "Borders") +#define STR_PAGE_AREA NC_("STR_PAGE_AREA", "Area") +#define STR_PAGE_TRANSPARENCY NC_("STR_PAGE_TRANSPARENCY", "Transparency") +#define STR_PAGE_FONT NC_("STR_PAGE_FONT", "Font") +#define STR_PAGE_FONT_EFFECTS NC_("STR_PAGE_FONT_EFFECTS", "Font Effects") +#define STR_PAGE_NUMBERS NC_("STR_PAGE_NUMBERS", "Numbers") +#define STR_PAGE_POSITION NC_("STR_PAGE_POSITION", "Position") +#define STR_PAGE_LAYOUT NC_("STR_PAGE_LAYOUT", "Layout") +#define STR_PAGE_OPTIONS NC_("STR_PAGE_OPTIONS", "Options") +#define STR_PAGE_SCALE NC_("STR_PAGE_SCALE", "Scale") +#define STR_PAGE_POSITIONING NC_("STR_PAGE_POSITIONING", "Positioning") +#define STR_PAGE_TRENDLINE_TYPE NC_("STR_PAGE_TRENDLINE_TYPE", "Type") +#define STR_PAGE_XERROR_BARS NC_("STR_PAGE_XERROR_BARS", "X Error Bars") +#define STR_PAGE_YERROR_BARS NC_("STR_PAGE_YERROR_BARS", "Y Error Bars") +#define STR_PAGE_ALIGNMENT NC_("STR_PAGE_ALIGNMENT", "Alignment") +#define STR_PAGE_PERSPECTIVE NC_("STR_PAGE_PERSPECTIVE", "Perspective") +#define STR_PAGE_APPEARANCE NC_("STR_PAGE_APPEARANCE", "Appearance") +#define STR_PAGE_ILLUMINATION NC_("STR_PAGE_ILLUMINATION", "Illumination") +#define STR_PAGE_ASIAN NC_("STR_PAGE_ASIAN", "Asian Typography") +#define STR_OBJECT_AVERAGE_LINE_WITH_PARAMETERS NC_("STR_OBJECT_AVERAGE_LINE_WITH_PARAMETERS", "Mean value line with value %AVERAGE_VALUE and standard deviation %STD_DEVIATION") +#define STR_OBJECT_AXIS NC_("STR_OBJECT_AXIS", "Axis") +#define STR_OBJECT_AXIS_X NC_("STR_OBJECT_AXIS_X", "X Axis") +#define STR_OBJECT_AXIS_Y NC_("STR_OBJECT_AXIS_Y", "Y Axis") +#define STR_OBJECT_AXIS_Z NC_("STR_OBJECT_AXIS_Z", "Z Axis") +#define STR_OBJECT_SECONDARY_X_AXIS NC_("STR_OBJECT_SECONDARY_X_AXIS", "Secondary X Axis") +#define STR_OBJECT_SECONDARY_Y_AXIS NC_("STR_OBJECT_SECONDARY_Y_AXIS", "Secondary Y Axis") +#define STR_OBJECT_AXES NC_("STR_OBJECT_AXES", "Axes") +#define STR_OBJECT_GRIDS NC_("STR_OBJECT_GRIDS", "Grids") +#define STR_OBJECT_GRID NC_("STR_OBJECT_GRID", "Grid") +#define STR_OBJECT_GRID_MAJOR_X NC_("STR_OBJECT_GRID_MAJOR_X", "X Axis Major Grid") +#define STR_OBJECT_GRID_MAJOR_Y NC_("STR_OBJECT_GRID_MAJOR_Y", "Y Axis Major Grid") +#define STR_OBJECT_GRID_MAJOR_Z NC_("STR_OBJECT_GRID_MAJOR_Z", "Z Axis Major Grid") +#define STR_OBJECT_GRID_MINOR_X NC_("STR_OBJECT_GRID_MINOR_X", "X Axis Minor Grid") +#define STR_OBJECT_GRID_MINOR_Y NC_("STR_OBJECT_GRID_MINOR_Y", "Y Axis Minor Grid") +#define STR_OBJECT_GRID_MINOR_Z NC_("STR_OBJECT_GRID_MINOR_Z", "Z Axis Minor Grid") +#define STR_OBJECT_LEGEND NC_("STR_OBJECT_LEGEND", "Legend") +#define STR_OBJECT_TITLE NC_("STR_OBJECT_TITLE", "Title") +#define STR_OBJECT_TITLES NC_("STR_OBJECT_TITLES", "Titles") +#define STR_OBJECT_TITLE_MAIN NC_("STR_OBJECT_TITLE_MAIN", "Main Title") +#define STR_OBJECT_TITLE_SUB NC_("STR_OBJECT_TITLE_SUB", "Subtitle") +#define STR_OBJECT_TITLE_X_AXIS NC_("STR_OBJECT_TITLE_X_AXIS", "X Axis Title") +#define STR_OBJECT_TITLE_Y_AXIS NC_("STR_OBJECT_TITLE_Y_AXIS", "Y Axis Title") +#define STR_OBJECT_TITLE_Z_AXIS NC_("STR_OBJECT_TITLE_Z_AXIS", "Z Axis Title") +#define STR_OBJECT_TITLE_SECONDARY_X_AXIS NC_("STR_OBJECT_TITLE_SECONDARY_X_AXIS", "Secondary X Axis Title") +#define STR_OBJECT_TITLE_SECONDARY_Y_AXIS NC_("STR_OBJECT_TITLE_SECONDARY_Y_AXIS", "Secondary Y Axis Title") +#define STR_OBJECT_LABEL NC_("STR_OBJECT_LABEL", "Label") +#define STR_OBJECT_DATALABELS NC_("STR_OBJECT_DATALABELS", "Data Labels") +#define STR_OBJECT_DATAPOINT NC_("STR_OBJECT_DATAPOINT", "Data Point") +#define STR_OBJECT_DATAPOINTS NC_("STR_OBJECT_DATAPOINTS", "Data Points") +#define STR_OBJECT_LEGEND_SYMBOL NC_("STR_OBJECT_LEGEND_SYMBOL", "Legend Key") +#define STR_OBJECT_DATASERIES NC_("STR_OBJECT_DATASERIES", "Data Series") +#define STR_OBJECT_DATASERIES_PLURAL NC_("STR_OBJECT_DATASERIES_PLURAL", "Data Series") +#define STR_OBJECT_CURVE NC_("STR_OBJECT_CURVE", "Trend Line") +#define STR_OBJECT_CURVES NC_("STR_OBJECT_CURVES", "Trend Lines") +#define STR_OBJECT_CURVE_WITH_PARAMETERS NC_("STR_OBJECT_CURVE_WITH_PARAMETERS", "Trend line %FORMULA with accuracy R² = %RSQUARED") +#define STR_OBJECT_MOVING_AVERAGE_WITH_PARAMETERS NC_("STR_OBJECT_MOVING_AVERAGE_WITH_PARAMETERS", "Moving average trend line with period = %PERIOD") +#define STR_OBJECT_AVERAGE_LINE NC_("STR_OBJECT_AVERAGE_LINE", "Mean Value Line") +#define STR_OBJECT_CURVE_EQUATION NC_("STR_OBJECT_CURVE_EQUATION", "Equation") +#define STR_OBJECT_ERROR_BARS_X NC_("STR_OBJECT_ERROR_BARS_X", "X Error Bars") +#define STR_OBJECT_ERROR_BARS_Y NC_("STR_OBJECT_ERROR_BARS_Y", "Y Error Bars") +#define STR_OBJECT_ERROR_BARS_Z NC_("STR_OBJECT_ERROR_BARS_Z", "Z Error Bars") +#define STR_OBJECT_STOCK_LOSS NC_("STR_OBJECT_STOCK_LOSS", "Stock Loss") +#define STR_OBJECT_STOCK_GAIN NC_("STR_OBJECT_STOCK_GAIN", "Stock Gain") +#define STR_OBJECT_PAGE NC_("STR_OBJECT_PAGE", "Chart Area") +#define STR_OBJECT_DIAGRAM NC_("STR_OBJECT_DIAGRAM", "Chart") +#define STR_OBJECT_DIAGRAM_WALL NC_("STR_OBJECT_DIAGRAM_WALL", "Chart Wall") +#define STR_OBJECT_DIAGRAM_FLOOR NC_("STR_OBJECT_DIAGRAM_FLOOR", "Chart Floor") +#define STR_OBJECT_SHAPE NC_("STR_OBJECT_SHAPE", "Drawing Object") +#define STR_TIP_DATASERIES NC_("STR_TIP_DATASERIES", "Data Series '%SERIESNAME'") +#define STR_TIP_DATAPOINT_INDEX NC_("STR_TIP_DATAPOINT_INDEX", "Data Point %POINTNUMBER") +#define STR_TIP_DATAPOINT_VALUES NC_("STR_TIP_DATAPOINT_VALUES", "Values: %POINTVALUES") +#define STR_TIP_DATAPOINT NC_("STR_TIP_DATAPOINT", "Data Point %POINTNUMBER, data series %SERIESNUMBER, values: %POINTVALUES") +#define STR_STATUS_DATAPOINT_MARKED NC_("STR_STATUS_DATAPOINT_MARKED", "Data point %POINTNUMBER in data series %SERIESNUMBER selected, values: %POINTVALUES") +#define STR_STATUS_OBJECT_MARKED NC_("STR_STATUS_OBJECT_MARKED", "%OBJECTNAME selected") +#define STR_STATUS_PIE_SEGMENT_EXPLODED NC_("STR_STATUS_PIE_SEGMENT_EXPLODED", "Pie exploded by %PERCENTVALUE percent") +#define STR_OBJECT_FOR_SERIES NC_("STR_OBJECT_FOR_SERIES", "%OBJECTNAME for Data Series '%SERIESNAME'") +#define STR_OBJECT_FOR_ALL_SERIES NC_("STR_OBJECT_FOR_ALL_SERIES", "%OBJECTNAME for all Data Series") +#define STR_ACTION_EDIT_CHARTTYPE NC_("STR_ACTION_EDIT_CHARTTYPE", "Edit chart type") +#define STR_ACTION_EDIT_DATA_RANGES NC_("STR_ACTION_EDIT_DATA_RANGES", "Edit data ranges") +#define STR_ACTION_EDIT_3D_VIEW NC_("STR_ACTION_EDIT_3D_VIEW", "Edit 3D view") +#define STR_ACTION_EDIT_CHART_DATA NC_("STR_ACTION_EDIT_CHART_DATA", "Edit chart data") +#define STR_ACTION_TOGGLE_LEGEND NC_("STR_ACTION_TOGGLE_LEGEND", "Legend on/off") +#define STR_ACTION_TOGGLE_GRID_HORZ NC_("STR_ACTION_TOGGLE_GRID_HORZ", "Horizontal grid major/major&minor/off") +#define STR_ACTION_TOGGLE_GRID_VERTICAL NC_("STR_ACTION_TOGGLE_GRID_VERTICAL", "Vertical grid major/major&minor/off") +#define STR_ACTION_SCALE_TEXT NC_("STR_ACTION_SCALE_TEXT", "Scale Text") +#define STR_ACTION_REARRANGE_CHART NC_("STR_ACTION_REARRANGE_CHART", "Automatic Layout") +#define STR_ACTION_NOTPOSSIBLE NC_("STR_ACTION_NOTPOSSIBLE", "This function cannot be completed with the selected objects.") +#define STR_ACTION_EDIT_TEXT NC_("STR_ACTION_EDIT_TEXT", "Edit text") +#define STR_COLUMN_LABEL NC_("STR_COLUMN_LABEL", "Column %COLUMNNUMBER") +#define STR_ROW_LABEL NC_("STR_ROW_LABEL", "Row %ROWNUMBER") +#define STR_DATA_ROLE_LABEL NC_("STR_DATA_ROLE_LABEL", "Name") +#define STR_DATA_ROLE_X NC_("STR_DATA_ROLE_X", "X-Values") +#define STR_DATA_ROLE_Y NC_("STR_DATA_ROLE_Y", "Y-Values") +#define STR_DATA_ROLE_SIZE NC_("STR_DATA_ROLE_SIZE", "Bubble Sizes") +#define STR_DATA_ROLE_X_ERROR NC_("STR_DATA_ROLE_X_ERROR", "X-Error-Bars") +#define STR_DATA_ROLE_X_ERROR_POSITIVE NC_("STR_DATA_ROLE_X_ERROR_POSITIVE", "Positive X-Error-Bars") +#define STR_DATA_ROLE_X_ERROR_NEGATIVE NC_("STR_DATA_ROLE_X_ERROR_NEGATIVE", "Negative X-Error-Bars") +#define STR_DATA_ROLE_Y_ERROR NC_("STR_DATA_ROLE_Y_ERROR", "Y-Error-Bars") +#define STR_DATA_ROLE_Y_ERROR_POSITIVE NC_("STR_DATA_ROLE_Y_ERROR_POSITIVE", "Positive Y-Error-Bars") +#define STR_DATA_ROLE_Y_ERROR_NEGATIVE NC_("STR_DATA_ROLE_Y_ERROR_NEGATIVE", "Negative Y-Error-Bars") +#define STR_DATA_ROLE_FIRST NC_("STR_DATA_ROLE_FIRST", "Open Values") +#define STR_DATA_ROLE_LAST NC_("STR_DATA_ROLE_LAST", "Close Values") +#define STR_DATA_ROLE_MIN NC_("STR_DATA_ROLE_MIN", "Low Values") +#define STR_DATA_ROLE_MAX NC_("STR_DATA_ROLE_MAX", "High Values") +#define STR_DATA_ROLE_CATEGORIES NC_("STR_DATA_ROLE_CATEGORIES", "Categories") +#define STR_DATA_UNNAMED_SERIES NC_("STR_DATA_UNNAMED_SERIES", "Unnamed Series") +#define STR_DATA_UNNAMED_SERIES_WITH_INDEX NC_("STR_DATA_UNNAMED_SERIES_WITH_INDEX", "Unnamed Series %NUMBER") +#define STR_DATA_SELECT_RANGE_FOR_SERIES NC_("STR_DATA_SELECT_RANGE_FOR_SERIES", "Select Range for %VALUETYPE of %SERIESNAME") +#define STR_DATA_SELECT_RANGE_FOR_CATEGORIES NC_("STR_DATA_SELECT_RANGE_FOR_CATEGORIES", "Select Range for Categories") +#define STR_DATA_SELECT_RANGE_FOR_DATALABELS NC_("STR_DATA_SELECT_RANGE_FOR_DATALABELS", "Select Range for data labels") +#define STR_DATA_EDITOR_INCORRECT_INPUT NC_("STR_DATA_EDITOR_INCORRECT_INPUT", "Your last input is incorrect.\nIgnore this change and close the dialog?") +#define STR_TEXT_DIRECTION_LTR NC_("STR_TEXT_DIRECTION_LTR", "Left-to-right") +#define STR_TEXT_DIRECTION_RTL NC_("STR_TEXT_DIRECTION_RTL", "Right-to-left") +#define STR_TEXT_DIRECTION_SUPER NC_("STR_TEXT_DIRECTION_SUPER", "Use superordinate object settings") +#define STR_PROPERTY_ROLE_FILLCOLOR NC_("STR_PROPERTY_ROLE_FILLCOLOR", "Fill Color") +#define STR_PROPERTY_ROLE_BORDERCOLOR NC_("STR_PROPERTY_ROLE_BORDERCOLOR", "Border Color") + +#define STR_CONTROLTEXT_ERROR_BARS_FROM_DATA NC_("STR_CONTROLTEXT_ERROR_BARS_FROM_DATA", "From Data Table") +#define STR_REGRESSION_LINEAR NC_("STR_REGRESSION_LINEAR", "Linear") +#define STR_REGRESSION_LOG NC_("STR_REGRESSION_LOG", "Logarithmic") +#define STR_REGRESSION_EXP NC_("STR_REGRESSION_EXP", "Exponential") +#define STR_REGRESSION_POWER NC_("STR_REGRESSION_POWER", "Power") +#define STR_REGRESSION_POLYNOMIAL NC_("STR_REGRESSION_POLYNOMIAL", "Polynomial") +#define STR_REGRESSION_MOVING_AVERAGE NC_("STR_REGRESSION_MOVING_AVERAGE", "Moving average") +#define STR_REGRESSION_MEAN NC_("STR_REGRESSION_MEAN", "Mean") + +#define STR_TYPE_COLUMN NC_("STR_TYPE_COLUMN", "Column") +#define STR_TYPE_BAR NC_("STR_TYPE_BAR", "Bar") +#define STR_TYPE_AREA NC_("STR_TYPE_AREA", "Area") +#define STR_TYPE_PIE NC_("STR_TYPE_PIE", "Pie") +#define STR_PIE_EXPLODED NC_("STR_PIE_EXPLODED", "Exploded Pie Chart") +#define STR_DONUT_EXPLODED NC_("STR_DONUT_EXPLODED", "Exploded Donut Chart") +#define STR_DONUT NC_("STR_DONUT", "Donut") +#define STR_TYPE_LINE NC_("STR_TYPE_LINE", "Line") +#define STR_TYPE_XY NC_("STR_TYPE_XY", "XY (Scatter)") +#define STR_POINTS_AND_LINES NC_("STR_POINTS_AND_LINES", "Points and Lines") +#define STR_POINTS_ONLY NC_("STR_POINTS_ONLY", "Points Only") +#define STR_LINES_ONLY NC_("STR_LINES_ONLY", "Lines Only") +#define STR_LINES_3D NC_("STR_LINES_3D", "3D Lines") +#define STR_TYPE_COMBI_COLUMN_LINE NC_("STR_TYPE_COMBI_COLUMN_LINE", "Column and Line") +#define STR_LINE_COLUMN NC_("STR_LINE_COLUMN", "Columns and Lines") +#define STR_LINE_STACKEDCOLUMN NC_("STR_LINE_STACKEDCOLUMN", "Stacked Columns and Lines") +#define STR_TYPE_NET NC_("STR_TYPE_NET", "Net") +#define STR_TYPE_STOCK NC_("STR_TYPE_STOCK", "Stock") +#define STR_STOCK_1 NC_("STR_STOCK_1", "Stock Chart 1") +#define STR_STOCK_2 NC_("STR_STOCK_2", "Stock Chart 2") +#define STR_STOCK_3 NC_("STR_STOCK_3", "Stock Chart 3") +#define STR_STOCK_4 NC_("STR_STOCK_4", "Stock Chart 4") +#define STR_NORMAL NC_("STR_NORMAL", "Normal") +#define STR_STACKED NC_("STR_STACKED", "Stacked") +#define STR_PERCENT NC_("STR_PERCENT", "Percent Stacked") +#define STR_DEEP NC_("STR_DEEP", "Deep") +#define STR_FILLED NC_("STR_FILLED", "Filled") +#define STR_TYPE_BUBBLE NC_("STR_TYPE_BUBBLE", "Bubble") +#define STR_BUBBLE_1 NC_("STR_BUBBLE_1", "Bubble Chart") +#define STR_TYPE_GL3D_BAR NC_("STR_TYPE_GL3D_BAR", "GL3D Bar") +#define STR_GL3D_BAR NC_("STR_GL3D_BAR", "GL3D Bar Chart") + +#define STR_INVALID_NUMBER NC_("STR_INVALID_NUMBER", "Numbers are required. Check your input.") +#define STR_STEP_GT_ZERO NC_("STR_STEP_GT_ZERO", "The major interval requires a positive number. Check your input.") +#define STR_BAD_LOGARITHM NC_("STR_BAD_LOGARITHM", "The logarithmic scale requires positive numbers. Check your input.") +#define STR_MIN_GREATER_MAX NC_("STR_MIN_GREATER_MAX", "The minimum must be lower than the maximum. Check your input.") +#define STR_INVALID_INTERVALS NC_("STR_INVALID_INTERVALS", "The major interval needs to be greater than the minor interval. Check your input.") +#define STR_INVALID_TIME_UNIT NC_("STR_INVALID_TIME_UNIT", "The major and minor interval need to be greater or equal to the resolution. Check your input.") + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx index 064384a87fe3..7e5657799227 100644 --- a/chart2/source/controller/accessibility/AccessibleChartView.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx @@ -24,7 +24,7 @@ #include "ObjectHierarchy.hxx" #include "ObjectIdentifier.hxx" #include "ResId.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "AccessibleViewForwarder.hxx" #include diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index 6bf6c25ef928..9fa2399a1695 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -20,7 +20,7 @@ #include "ChartTypeDialogController.hxx" #include "ResId.hxx" #include "HelpIds.hrc" -#include "Strings.hrc" +#include "strings.hrc" #include "bitmaps.hlst" #include "macros.hxx" #include "ChartModelHelper.hxx" @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include #include diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 3c659927f8e0..c371944f2a3f 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -22,7 +22,7 @@ #include "DataBrowser.hxx" #include "DataBrowserModel.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "DataSeriesHelper.hxx" #include "DiagramHelper.hxx" #include "ChartModelHelper.hxx" diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx index ffceca3ccc00..f361a432ee64 100644 --- a/chart2/source/controller/dialogs/DialogModel.cxx +++ b/chart2/source/controller/dialogs/DialogModel.cxx @@ -24,7 +24,7 @@ #include "DataSourceHelper.hxx" #include "DiagramHelper.hxx" #include "macros.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "ResId.hxx" #include "ContainerHelper.hxx" #include "CommonFunctors.hxx" diff --git a/chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx b/chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx index db613c24105f..a1f568ae083d 100644 --- a/chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx +++ b/chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx @@ -8,10 +8,9 @@ */ #include "GL3DBarChartDialogController.hxx" -#include +#include #include #include - #include namespace chart { diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx index 6ea99ad1f155..d61da98eab4b 100644 --- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx +++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx @@ -19,7 +19,7 @@ #include "ObjectNameProvider.hxx" #include "ResId.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "macros.hxx" #include "AxisHelper.hxx" #include "ChartModelHelper.hxx" diff --git a/chart2/source/controller/dialogs/Strings.src b/chart2/source/controller/dialogs/Strings.src deleted file mode 100644 index 4c9b40da141f..000000000000 --- a/chart2/source/controller/dialogs/Strings.src +++ /dev/null @@ -1,586 +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 "Strings.hrc" - -String STR_DLG_CHART_WIZARD -{ - Text [ en-US ] = "Chart Wizard" ; -}; - -String STR_DLG_SMOOTH_LINE_PROPERTIES -{ - Text [ en-US ] = "Smooth Lines" ; -}; - -String STR_DLG_STEPPED_LINE_PROPERTIES -{ - Text [ en-US ] = "Stepped Lines" ; -}; - -String STR_PAGE_CHARTTYPE -{ - Text [ en-US ] = "Chart Type" ; -}; - -String STR_PAGE_DATA_RANGE -{ - Text [ en-US ] = "Data Range"; -}; - -String STR_PAGE_CHART_ELEMENTS -{ - Text [ en-US ] = "Chart Elements"; -}; - -String STR_PAGE_LINE -{ - Text [ en-US ] = "Line" ; -}; - -String STR_PAGE_BORDER -{ - Text [ en-US ] = "Borders" ; -}; - -String STR_PAGE_AREA -{ - Text [ en-US ] = "Area" ; -}; - -String STR_PAGE_TRANSPARENCY -{ - Text [ en-US ] = "Transparency"; -}; - -String STR_PAGE_FONT -{ - Text [ en-US ] = "Font" ; -}; - -String STR_PAGE_FONT_EFFECTS -{ - Text [ en-US ] = "Font Effects" ; -}; - -String STR_PAGE_NUMBERS -{ - Text [ en-US ] = "Numbers" ; -}; - -String STR_PAGE_POSITION -{ - Text [ en-US ] = "Position" ; -}; - -String STR_PAGE_LAYOUT -{ - Text [ en-US ] = "Layout"; -}; - -String STR_PAGE_OPTIONS -{ - Text [ en-US ] = "Options"; -}; - -String STR_PAGE_SCALE -{ - Text [ en-US ] = "Scale" ; -}; - -String STR_PAGE_POSITIONING -{ - Text [ en-US ] = "Positioning" ; -}; - -String STR_PAGE_TRENDLINE_TYPE -{ - Text[ en-US ] = "Type"; -}; - -String STR_PAGE_XERROR_BARS -{ - Text[ en-US ] = "X Error Bars"; -}; - -String STR_PAGE_YERROR_BARS -{ - Text[ en-US ] = "Y Error Bars"; -}; - -String STR_PAGE_ALIGNMENT -{ - Text [ en-US ] = "Alignment" ; -}; - -String STR_PAGE_PERSPECTIVE -{ - Text [ en-US ] = "Perspective" ; -}; -String STR_PAGE_APPEARANCE -{ - Text [ en-US ] = "Appearance" ; -}; -String STR_PAGE_ILLUMINATION -{ - Text [ en-US ] = "Illumination" ; -}; - -String STR_PAGE_ASIAN -{ - Text [ en-US ] = "Asian Typography" ; -}; - -String STR_OBJECT_AVERAGE_LINE_WITH_PARAMETERS -{ - Text [ en-US ] = "Mean value line with value %AVERAGE_VALUE and standard deviation %STD_DEVIATION"; -}; - -String STR_OBJECT_AXIS -{ - Text [ en-US ] = "Axis" ; -}; -String STR_OBJECT_AXIS_X -{ - Text [ en-US ] = "X Axis" ; -}; -String STR_OBJECT_AXIS_Y -{ - Text [ en-US ] = "Y Axis" ; -}; -String STR_OBJECT_AXIS_Z -{ - Text [ en-US ] = "Z Axis" ; -}; -String STR_OBJECT_SECONDARY_X_AXIS -{ - Text [ en-US ] = "Secondary X Axis" ; -}; -String STR_OBJECT_SECONDARY_Y_AXIS -{ - Text [ en-US ] = "Secondary Y Axis" ; -}; - -String STR_OBJECT_AXES -{ - Text [ en-US ] = "Axes" ; -}; -String STR_OBJECT_GRIDS -{ - Text [ en-US ] = "Grids" ; -}; -String STR_OBJECT_GRID -{ - Text [ en-US ] = "Grid" ; -}; -String STR_OBJECT_GRID_MAJOR_X -{ - Text [ en-US ] = "X Axis Major Grid" ; -}; -String STR_OBJECT_GRID_MAJOR_Y -{ - Text [ en-US ] = "Y Axis Major Grid" ; -}; -String STR_OBJECT_GRID_MAJOR_Z -{ - Text [ en-US ] = "Z Axis Major Grid" ; -}; -String STR_OBJECT_GRID_MINOR_X -{ - Text [ en-US ] = "X Axis Minor Grid" ; -}; -String STR_OBJECT_GRID_MINOR_Y -{ - Text [ en-US ] = "Y Axis Minor Grid" ; -}; -String STR_OBJECT_GRID_MINOR_Z -{ - Text [ en-US ] = "Z Axis Minor Grid" ; -}; - -String STR_OBJECT_LEGEND -{ - Text [ en-US ] = "Legend" ; -}; - -String STR_OBJECT_TITLE -{ - Text [ en-US ] = "Title" ; -}; -String STR_OBJECT_TITLES -{ - Text [ en-US ] = "Titles" ; -}; -String STR_OBJECT_TITLE_MAIN -{ - Text [ en-US ] = "Main Title" ; -}; -String STR_OBJECT_TITLE_SUB -{ - Text [ en-US ] = "Subtitle" ; -}; -String STR_OBJECT_TITLE_X_AXIS -{ - Text [ en-US ] = "X Axis Title" ; -}; -String STR_OBJECT_TITLE_Y_AXIS -{ - Text [ en-US ] = "Y Axis Title" ; -}; -String STR_OBJECT_TITLE_Z_AXIS -{ - Text [ en-US ] = "Z Axis Title" ; -}; -String STR_OBJECT_TITLE_SECONDARY_X_AXIS -{ - Text [ en-US ] = "Secondary X Axis Title" ; -}; -String STR_OBJECT_TITLE_SECONDARY_Y_AXIS -{ - Text [ en-US ] = "Secondary Y Axis Title" ; -}; -String STR_OBJECT_LABEL -{ - Text [ en-US ] = "Label" ; -}; - -String STR_OBJECT_DATALABELS -{ - Text [ en-US ] = "Data Labels" ; -}; -String STR_OBJECT_DATAPOINT -{ - Text [ en-US ] = "Data Point" ; -}; -String STR_OBJECT_DATAPOINTS -{ - Text [ en-US ] = "Data Points" ; -}; -String STR_OBJECT_LEGEND_SYMBOL -{ - Text [ en-US ] = "Legend Key" ; -}; -String STR_OBJECT_DATASERIES -{ - Text [ en-US ] = "Data Series" ; -}; -String STR_OBJECT_DATASERIES_PLURAL -{ - Text [ en-US ] = "Data Series" ; -}; -String STR_OBJECT_CURVE -{ - Text [ en-US ] = "Trend Line"; -}; -String STR_OBJECT_CURVES -{ - Text [ en-US ] = "Trend Lines"; -}; -String STR_OBJECT_CURVE_WITH_PARAMETERS -{ - Text [ en-US ] = "Trend line %FORMULA with accuracy R² = %RSQUARED"; -}; -String STR_OBJECT_MOVING_AVERAGE_WITH_PARAMETERS -{ - Text [ en-US ] = "Moving average trend line with period = %PERIOD"; -}; -String STR_OBJECT_AVERAGE_LINE -{ - Text [ en-US ] = "Mean Value Line"; -}; -String STR_OBJECT_CURVE_EQUATION -{ - Text[ en-US ] = "Equation"; -}; - -String STR_OBJECT_ERROR_BARS_X -{ - Text [ en-US ] = "X Error Bars"; -}; - -String STR_OBJECT_ERROR_BARS_Y -{ - Text [ en-US ] = "Y Error Bars"; -}; - -String STR_OBJECT_ERROR_BARS_Z -{ - Text [ en-US ] = "Z Error Bars"; -}; -String STR_OBJECT_STOCK_LOSS -{ - Text [ en-US ] = "Stock Loss"; -}; - -String STR_OBJECT_STOCK_GAIN -{ - Text [ en-US ] = "Stock Gain"; -}; - -String STR_OBJECT_PAGE -{ - Text [ en-US ] = "Chart Area" ; -}; -String STR_OBJECT_DIAGRAM -{ - Text [ en-US ] = "Chart" ; -}; -String STR_OBJECT_DIAGRAM_WALL -{ - Text [ en-US ] = "Chart Wall" ; -}; -String STR_OBJECT_DIAGRAM_FLOOR -{ - Text [ en-US ] = "Chart Floor" ; -}; - -String STR_OBJECT_SHAPE -{ - Text [ en-US ] = "Drawing Object" ; -}; - -String STR_TIP_DATASERIES -{ - Text [ en-US ] = "Data Series '%SERIESNAME'" ; -}; - -String STR_TIP_DATAPOINT_INDEX -{ - Text [ en-US ] = "Data Point %POINTNUMBER"; -}; - -String STR_TIP_DATAPOINT_VALUES -{ - Text [ en-US ] = "Values: %POINTVALUES"; -}; - -String STR_TIP_DATAPOINT -{ - Text [ en-US ] = "Data Point %POINTNUMBER, data series %SERIESNUMBER, values: %POINTVALUES"; -}; - -String STR_STATUS_DATAPOINT_MARKED -{ - Text [ en-US ] = "Data point %POINTNUMBER in data series %SERIESNUMBER selected, values: %POINTVALUES"; -}; - -String STR_STATUS_OBJECT_MARKED -{ - Text [ en-US ] = "%OBJECTNAME selected" ; -}; - -String STR_STATUS_PIE_SEGMENT_EXPLODED -{ - Text [ en-US ] = "Pie exploded by %PERCENTVALUE percent"; -}; - -String STR_OBJECT_FOR_SERIES -{ - Text [ en-US ] = "%OBJECTNAME for Data Series '%SERIESNAME'" ; -}; - -String STR_OBJECT_FOR_ALL_SERIES -{ - Text [ en-US ] = "%OBJECTNAME for all Data Series" ; -}; - -String STR_ACTION_EDIT_CHARTTYPE -{ - Text [ en-US ] = "Edit chart type" ; -}; -String STR_ACTION_EDIT_DATA_RANGES -{ - Text [ en-US ] = "Edit data ranges" ; -}; -String STR_ACTION_EDIT_3D_VIEW -{ - Text [ en-US ] = "Edit 3D view" ; -}; -String STR_ACTION_EDIT_CHART_DATA -{ - Text [ en-US ] = "Edit chart data"; -}; -String STR_ACTION_TOGGLE_LEGEND -{ - Text [ en-US ] = "Legend on/off" ; -}; -String STR_ACTION_TOGGLE_GRID_HORZ -{ - Text [ en-US ] = "Horizontal grid major/major&minor/off" ; -}; -String STR_ACTION_TOGGLE_GRID_VERTICAL -{ - Text [ en-US ] = "Vertical grid major/major&minor/off" ; -}; -String STR_ACTION_SCALE_TEXT -{ - Text [ en-US ] = "Scale Text" ; -}; -String STR_ACTION_REARRANGE_CHART -{ - Text [ en-US ] = "Automatic Layout" ; -}; -String STR_ACTION_NOTPOSSIBLE -{ - Text [ en-US ] = "This function cannot be completed with the selected objects." ; -}; -String STR_ACTION_EDIT_TEXT -{ - Text [ en-US ] = "Edit text"; -}; - -String STR_COLUMN_LABEL -{ - Text [ en-US ] = "Column %COLUMNNUMBER" ; -}; -String STR_ROW_LABEL -{ - Text [ en-US ] = "Row %ROWNUMBER" ; -}; - -//for range dialog -String STR_DATA_ROLE_LABEL -{ - Text [ en-US ] = "Name" ; -}; - -String STR_DATA_ROLE_X -{ - Text [ en-US ] = "X-Values" ; -}; - -String STR_DATA_ROLE_Y -{ - Text [ en-US ] = "Y-Values" ; -}; - -String STR_DATA_ROLE_SIZE -{ - Text [ en-US ] = "Bubble Sizes" ; -}; - -String STR_DATA_ROLE_X_ERROR -{ - Text [ en-US ] = "X-Error-Bars" ; -}; -String STR_DATA_ROLE_X_ERROR_POSITIVE -{ - Text [ en-US ] = "Positive X-Error-Bars" ; -}; -String STR_DATA_ROLE_X_ERROR_NEGATIVE -{ - Text [ en-US ] = "Negative X-Error-Bars" ; -}; - -String STR_DATA_ROLE_Y_ERROR -{ - Text [ en-US ] = "Y-Error-Bars" ; -}; -String STR_DATA_ROLE_Y_ERROR_POSITIVE -{ - Text [ en-US ] = "Positive Y-Error-Bars" ; -}; -String STR_DATA_ROLE_Y_ERROR_NEGATIVE -{ - Text [ en-US ] = "Negative Y-Error-Bars" ; -}; - -String STR_DATA_ROLE_FIRST -{ - Text [ en-US ] = "Open Values" ; -}; - -String STR_DATA_ROLE_LAST -{ - Text [ en-US ] = "Close Values" ; -}; - -String STR_DATA_ROLE_MIN -{ - Text [ en-US ] = "Low Values" ; -}; - -String STR_DATA_ROLE_MAX -{ - Text [ en-US ] = "High Values" ; -}; - -String STR_DATA_ROLE_CATEGORIES -{ - Text [ en-US ] = "Categories"; -}; - -String STR_DATA_UNNAMED_SERIES -{ - Text [ en-US ] = "Unnamed Series"; -}; - -String STR_DATA_UNNAMED_SERIES_WITH_INDEX -{ - Text [ en-US ] = "Unnamed Series %NUMBER" ; -}; - -String STR_DATA_SELECT_RANGE_FOR_SERIES -{ - Text [ en-US ] = "Select Range for %VALUETYPE of %SERIESNAME" ; -}; - -String STR_DATA_SELECT_RANGE_FOR_CATEGORIES -{ - Text [ en-US ] = "Select Range for Categories" ; -}; - -String STR_DATA_SELECT_RANGE_FOR_DATALABELS -{ - Text [ en-US ] = "Select Range for data labels" ; -}; - -String STR_DATA_EDITOR_INCORRECT_INPUT -{ - Text [ en-US ] = "Your last input is incorrect.\nIgnore this change and close the dialog?" ; -}; - -// frame direction ------------------------------------------------------------ - -String STR_TEXT_DIRECTION_LTR -{ - Text [ en-US ] = "Left-to-right"; -}; - -String STR_TEXT_DIRECTION_RTL -{ - Text [ en-US ] = "Right-to-left"; -}; - -String STR_TEXT_DIRECTION_SUPER -{ - Text [ en-US ] = "Use superordinate object settings"; -}; - -String STR_PROPERTY_ROLE_FILLCOLOR -{ - Text [ en-US ] = "Fill Color"; -}; - -String STR_PROPERTY_ROLE_BORDERCOLOR -{ - Text [ en-US ] = "Border Color"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/Strings_ChartTypes.src b/chart2/source/controller/dialogs/Strings_ChartTypes.src deleted file mode 100644 index 88717805f0d8..000000000000 --- a/chart2/source/controller/dialogs/Strings_ChartTypes.src +++ /dev/null @@ -1,155 +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 "Strings.hrc" - -String STR_TYPE_COLUMN -{ - Text [ en-US ] = "Column" ; -}; -String STR_TYPE_BAR -{ - Text [ en-US ] = "Bar" ; -}; -String STR_TYPE_AREA -{ - Text [ en-US ] = "Area" ; -}; -String STR_TYPE_PIE -{ - Text [ en-US ] = "Pie" ; -}; -String STR_PIE_EXPLODED -{ - Text [ en-US ] = "Exploded Pie Chart" ; -}; -String STR_DONUT_EXPLODED -{ - Text [ en-US ] = "Exploded Donut Chart" ; -}; -String STR_DONUT -{ - Text [ en-US ] = "Donut" ; -}; -String STR_TYPE_LINE -{ - Text [ en-US ] = "Line" ; -}; -String STR_TYPE_XY -{ - Text [ en-US ] = "XY (Scatter)" ; -}; -String STR_POINTS_AND_LINES -{ - Text [ en-US ] = "Points and Lines" ; -}; -String STR_POINTS_ONLY -{ - //@todo or symbols instead of points?? - Text [ en-US ] = "Points Only" ; -}; -String STR_LINES_ONLY -{ - Text [ en-US ] = "Lines Only" ; -}; -String STR_LINES_3D -{ - Text [ en-US ] = "3D Lines" ; -}; - -String STR_TYPE_COMBI_COLUMN_LINE -{ - Text [ en-US ] = "Column and Line" ; -}; -String STR_LINE_COLUMN -{ - Text [ en-US ] = "Columns and Lines" ; -}; -String STR_LINE_STACKEDCOLUMN -{ - Text [ en-US ] = "Stacked Columns and Lines" ; -}; - -String STR_TYPE_NET -{ - Text [ en-US ] = "Net" ; -}; - -String STR_TYPE_STOCK -{ - Text [ en-US ] = "Stock"; -}; -String STR_STOCK_1 -{ - Text [ en-US ] = "Stock Chart 1"; -}; -String STR_STOCK_2 -{ - Text [ en-US ] = "Stock Chart 2"; -}; -String STR_STOCK_3 -{ - Text [ en-US ] = "Stock Chart 3"; -}; -String STR_STOCK_4 -{ - Text [ en-US ] = "Stock Chart 4"; -}; - -String STR_NORMAL -{ - Text [ en-US ] = "Normal" ; -}; -String STR_STACKED -{ - Text [ en-US ] = "Stacked" ; -}; -String STR_PERCENT -{ - Text [ en-US ] = "Percent Stacked" ; -}; - -String STR_DEEP -{ - Text [ en-US ] = "Deep" ; -}; -String STR_FILLED -{ - Text [ en-US ] = "Filled" ; -}; - -String STR_TYPE_BUBBLE -{ - Text [ en-US ] = "Bubble" ; -}; -String STR_BUBBLE_1 -{ - Text [ en-US ] = "Bubble Chart" ; -}; - -String STR_TYPE_GL3D_BAR -{ - Text [ en-US ] = "GL3D Bar"; -}; - -String STR_GL3D_BAR -{ - Text [ en-US ] = "GL3D Bar Chart"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/Strings_Scale.src b/chart2/source/controller/dialogs/Strings_Scale.src deleted file mode 100644 index 80b1f4a8b669..000000000000 --- a/chart2/source/controller/dialogs/Strings_Scale.src +++ /dev/null @@ -1,46 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#include "Strings.hrc" - -String STR_INVALID_NUMBER -{ - Text [ en-US ] = "Numbers are required. Check your input." ; -}; -String STR_STEP_GT_ZERO -{ - Text [ en-US ] = "The major interval requires a positive number. Check your input." ; -}; -String STR_BAD_LOGARITHM -{ - Text [ en-US ] = "The logarithmic scale requires positive numbers. Check your input." ; -}; -String STR_MIN_GREATER_MAX -{ - Text [ en-US ] = "The minimum must be lower than the maximum. Check your input." ; -}; -String STR_INVALID_INTERVALS -{ - Text [ en-US ] = "The major interval needs to be greater than the minor interval. Check your input." ; -}; -String STR_INVALID_TIME_UNIT -{ - Text [ en-US ] = "The major and minor interval need to be greater or equal to the resolution. Check your input." ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/Strings_Statistic.src b/chart2/source/controller/dialogs/Strings_Statistic.src deleted file mode 100644 index e375cb179d81..000000000000 --- a/chart2/source/controller/dialogs/Strings_Statistic.src +++ /dev/null @@ -1,58 +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 "Strings.hrc" - -// used for own data in error bar dialog -//TODO: ohallot: String inserted into tp_ErrorBars.ui -String STR_CONTROLTEXT_ERROR_BARS_FROM_DATA -{ - Text [ en-US ] = "From Data Table" ; -}; - -String STR_REGRESSION_LINEAR -{ - Text [ en-US ] = "Linear" ; -}; -String STR_REGRESSION_LOG -{ - Text [ en-US ] = "Logarithmic" ; -}; -String STR_REGRESSION_EXP -{ - Text [ en-US ] = "Exponential" ; -}; -String STR_REGRESSION_POWER -{ - Text [ en-US ] = "Power" ; -}; -String STR_REGRESSION_POLYNOMIAL -{ - Text [ en-US ] = "Polynomial" ; -}; -String STR_REGRESSION_MOVING_AVERAGE -{ - Text [ en-US ] = "Moving average" ; -}; - -String STR_REGRESSION_MEAN -{ - Text [ en-US ] = "Mean" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/TextDirectionListBox.cxx b/chart2/source/controller/dialogs/TextDirectionListBox.cxx index de52f69443c0..9a6e28bba418 100644 --- a/chart2/source/controller/dialogs/TextDirectionListBox.cxx +++ b/chart2/source/controller/dialogs/TextDirectionListBox.cxx @@ -19,7 +19,7 @@ #include "TextDirectionListBox.hxx" #include "ResId.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include #include #include diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx index 96c10ebc9710..95875642303a 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx @@ -20,7 +20,7 @@ #include "dlg_ChartType.hxx" #include "ResId.hxx" #include "ResourceIds.hrc" -#include "Strings.hrc" +#include "strings.hrc" #include "tp_ChartType.hxx" #include "macros.hxx" #include diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx index 151d2c8321d2..d2198e8653e9 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx @@ -20,7 +20,7 @@ #include "dlg_CreationWizard.hxx" #include "ResId.hxx" #include "macros.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "HelpIds.hrc" #include "tp_ChartType.hxx" @@ -169,25 +169,27 @@ void CreationWizard::setValidPage( TabPage * /* pTabPage */ ) OUString CreationWizard::getStateDisplayName( WizardState nState ) const { - sal_uInt16 nResId = 0; + const char* pResId = nullptr; switch( nState ) { case STATE_CHARTTYPE: - nResId = STR_PAGE_CHARTTYPE; + pResId = STR_PAGE_CHARTTYPE; break; case STATE_SIMPLE_RANGE: - nResId = STR_PAGE_DATA_RANGE; + pResId = STR_PAGE_DATA_RANGE; break; case STATE_DATA_SERIES: - nResId = STR_OBJECT_DATASERIES_PLURAL; + pResId = STR_OBJECT_DATASERIES_PLURAL; break; case STATE_OBJECTS: - nResId = STR_PAGE_CHART_ELEMENTS; + pResId = STR_PAGE_CHART_ELEMENTS; break; default: break; } - return SchResId(nResId); + if (!pResId) + return OUString(); + return SchResId(pResId); } } //namespace chart diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx index 8b7f777f6411..441b62e774ef 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx +++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx @@ -18,7 +18,7 @@ */ #include "dlg_DataEditor.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "DataBrowser.hxx" #include "ResId.hxx" diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx index 8c1566310a9a..28c5383915ec 100644 --- a/chart2/source/controller/dialogs/dlg_DataSource.cxx +++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx @@ -18,7 +18,7 @@ */ #include "dlg_DataSource.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "ResId.hxx" #include "ChartTypeTemplateProvider.hxx" #include "DiagramHelper.hxx" diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index e1fbd2aac208..ff2ca208628a 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -20,7 +20,7 @@ #include #include "dlg_ObjectProperties.hxx" #include "ResourceIds.hrc" -#include "Strings.hrc" +#include "strings.hrc" #include "tp_AxisLabel.hxx" #include "tp_DataLabel.hxx" #include "tp_LegendPosition.hxx" diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx index 196a6fb17f94..a1988be2c8da 100644 --- a/chart2/source/controller/dialogs/dlg_View3D.cxx +++ b/chart2/source/controller/dialogs/dlg_View3D.cxx @@ -18,7 +18,7 @@ */ #include "dlg_View3D.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "ResourceIds.hrc" #include "ResId.hxx" #include "tp_3D_SceneGeometry.hxx" diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx index 433d3ce1ce21..ea48698aadb1 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.cxx +++ b/chart2/source/controller/dialogs/res_DataLabel.cxx @@ -32,7 +32,7 @@ #include #include #include -#include +#include namespace chart { diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx index 0589039c5eb3..2d9f912f007c 100644 --- a/chart2/source/controller/dialogs/res_LegendPosition.cxx +++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx @@ -23,7 +23,7 @@ #include "LegendHelper.hxx" #include "ChartModel.hxx" -#include +#include #include #include diff --git a/chart2/source/controller/dialogs/res_Titles.cxx b/chart2/source/controller/dialogs/res_Titles.cxx index 4998e849fdc6..dae07506e76e 100644 --- a/chart2/source/controller/dialogs/res_Titles.cxx +++ b/chart2/source/controller/dialogs/res_Titles.cxx @@ -20,7 +20,7 @@ #include "res_Titles.hxx" #include "ResId.hxx" #include "TitleDialogData.hxx" -#include +#include namespace chart { diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx index e09db092fece..d25e5518794d 100644 --- a/chart2/source/controller/dialogs/res_Trendline.cxx +++ b/chart2/source/controller/dialogs/res_Trendline.cxx @@ -19,7 +19,7 @@ #include "res_Trendline.hxx" #include "ResId.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "bitmaps.hlst" #include "chartview/ChartSfxItemIds.hxx" diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx index c091fa701007..f691d7cc5f68 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx @@ -24,6 +24,7 @@ #include #include "svx/dialogs.hrc" +#include "svx/strings.hrc" #include #include #include diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx index 76d86aeb7eec..2ec01fff1e0c 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx @@ -21,7 +21,7 @@ #include "ResId.hxx" #include "ResourceIds.hrc" -#include "Strings.hrc" +#include "strings.hrc" #include "chartview/ChartSfxItemIds.hxx" #include "AxisHelper.hxx" @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index d2f979596417..7228effb0e49 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -18,7 +18,7 @@ */ #include "tp_ChartType.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "ResId.hxx" #include "ChartModelHelper.hxx" #include "DiagramHelper.hxx" @@ -28,7 +28,7 @@ #include "GL3DBarChartDialogController.hxx" #include -#include +#include #include #include diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index 102832e8300d..0d0e1cdef9d7 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -18,7 +18,7 @@ */ #include "tp_DataSource.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "ResId.hxx" #include "chartview/ChartSfxItemIds.hxx" #include "macros.hxx" diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx index 69de86ab9798..0b86d2a021f2 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx +++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx @@ -23,7 +23,7 @@ #include #include -#include +#include namespace chart { diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx index b06a5fe3bdea..6879b87c34fb 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx @@ -18,7 +18,7 @@ */ #include "tp_RangeChooser.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "ResId.hxx" #include "macros.hxx" #include "DataSourceHelper.hxx" diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index d16c5f3de50c..caaf1d7eb19b 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -20,7 +20,7 @@ #include "tp_Scale.hxx" #include "ResId.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "chartview/ChartSfxItemIds.hxx" #include "AxisHelper.hxx" @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include @@ -430,7 +430,7 @@ DeactivateRC ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet) nStepFmt = 0; Control* pControl = nullptr; - sal_uInt16 nErrStrId = 0; + const char* pErrStrId = nullptr; double fDummy; fMax = m_pFmtFldMax->GetValue(); @@ -452,7 +452,7 @@ DeactivateRC ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet) || ( !m_pCbxAutoMax->IsChecked() && fMax <= 0.0 ) ) ) { pControl = m_pFmtFldMin; - nErrStrId = STR_BAD_LOGARITHM; + pErrStrId = STR_BAD_LOGARITHM; } // check for entries that cannot be parsed for the current number format else if ( m_pFmtFldMin->IsModified() @@ -460,38 +460,38 @@ DeactivateRC ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet) && !pNumFormatter->IsNumberFormat( m_pFmtFldMin->GetText(), nMinMaxOriginFmt, fDummy)) { pControl = m_pFmtFldMin; - nErrStrId = STR_INVALID_NUMBER; + pErrStrId = STR_INVALID_NUMBER; } else if ( m_pFmtFldMax->IsModified() && !m_pCbxAutoMax->IsChecked() && !pNumFormatter->IsNumberFormat( m_pFmtFldMax->GetText(), nMinMaxOriginFmt, fDummy)) { pControl = m_pFmtFldMax; - nErrStrId = STR_INVALID_NUMBER; + pErrStrId = STR_INVALID_NUMBER; } else if ( !bDateAxis && m_pFmtFldStepMain->IsModified() && !m_pCbxAutoStepMain->IsChecked() && !pNumFormatter->IsNumberFormat( m_pFmtFldStepMain->GetText(), nStepFmt, fDummy)) { pControl = m_pFmtFldStepMain; - nErrStrId = STR_INVALID_NUMBER; + pErrStrId = STR_INVALID_NUMBER; } else if (m_pFmtFldOrigin->IsModified() && !m_pCbxAutoOrigin->IsChecked() && !pNumFormatter->IsNumberFormat( m_pFmtFldOrigin->GetText(), nMinMaxOriginFmt, fDummy)) { pControl = m_pFmtFldOrigin; - nErrStrId = STR_INVALID_NUMBER; + pErrStrId = STR_INVALID_NUMBER; } else if (!m_pCbxAutoStepMain->IsChecked() && fStepMain <= 0.0) { pControl = m_pFmtFldStepMain; - nErrStrId = STR_STEP_GT_ZERO; + pErrStrId = STR_STEP_GT_ZERO; } else if (!m_pCbxAutoMax->IsChecked() && !m_pCbxAutoMin->IsChecked() && fMin >= fMax) { pControl = m_pFmtFldMin; - nErrStrId = STR_MIN_GREATER_MAX; + pErrStrId = STR_MIN_GREATER_MAX; } else if( bDateAxis ) { @@ -500,15 +500,15 @@ DeactivateRC ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet) if( m_nHelpTimeUnit > m_nMainTimeUnit ) { pControl = m_pLB_MainTimeUnit; - nErrStrId = STR_INVALID_INTERVALS; + pErrStrId = STR_INVALID_INTERVALS; } else if( m_nHelpTimeUnit == m_nMainTimeUnit && nStepHelp > fStepMain ) { pControl = m_pLB_MainTimeUnit; - nErrStrId = STR_INVALID_INTERVALS; + pErrStrId = STR_INVALID_INTERVALS; } } - if( !nErrStrId && !m_pCbx_AutoTimeResolution->IsChecked() ) + if( !pErrStrId && !m_pCbx_AutoTimeResolution->IsChecked() ) { if( (!m_pCbxAutoStepMain->IsChecked() && m_nTimeResolution > m_nMainTimeUnit ) || @@ -516,12 +516,12 @@ DeactivateRC ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet) ) { pControl = m_pLB_TimeResolution; - nErrStrId = STR_INVALID_TIME_UNIT; + pErrStrId = STR_INVALID_TIME_UNIT; } } } - if( ShowWarning( nErrStrId, pControl ) ) + if( ShowWarning( pErrStrId, pControl ) ) return DeactivateRC::KeepPage; if( pItemSet ) @@ -609,12 +609,12 @@ void ScaleTabPage::ShowAxisOrigin( bool bShowOrigin ) m_bShowAxisOrigin = true; } -bool ScaleTabPage::ShowWarning( sal_uInt16 nResIdMessage, Control* pControl /* = NULL */ ) +bool ScaleTabPage::ShowWarning(const char* pResIdMessage, Control* pControl /* = NULL */ ) { - if( nResIdMessage == 0 ) + if (pResIdMessage == nullptr) return false; - ScopedVclPtrInstance(this, WinBits( WB_OK ), SchResId(nResIdMessage))->Execute(); + ScopedVclPtrInstance(this, WinBits( WB_OK ), SchResId(pResIdMessage))->Execute(); if( pControl ) { pControl->GrabFocus(); diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx index 33a58582a508..75c869d23141 100644 --- a/chart2/source/controller/dialogs/tp_Scale.hxx +++ b/chart2/source/controller/dialogs/tp_Scale.hxx @@ -103,9 +103,9 @@ private: /** shows a warning window due to an invalid input. - @param nResIdMessage + @param pResIdMessage The resource identifier that represents the localized warning text. - If this is 0, no warning is shown and false is returned. + If this is nullptr, no warning is shown and false is returned. @param pControl If non-NULL, contains a pointer to the control in which the @@ -114,7 +114,7 @@ private: @return false, if nResIdMessage was 0, true otherwise */ - bool ShowWarning( sal_uInt16 nResIdMessage, Control* pControl ); + bool ShowWarning(const char* pResIdMessage, Control* pControl); void HideAllControls(); }; diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx index bc7122cdb9d0..d022f12d6306 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx index be85cacf6647..beeedc457cd0 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx @@ -18,7 +18,7 @@ */ #include "tp_Wizard_TitlesAndObjects.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "res_Titles.hxx" #include "res_LegendPosition.hxx" #include "ResId.hxx" diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index 307a2a6d27ed..2e822ceea120 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -28,7 +28,7 @@ #include "dlg_DataSource.hxx" #include "ChartModelHelper.hxx" #include "ControllerCommandDispatch.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "chartview/ExplicitValueProvider.hxx" #include "ChartViewHelper.hxx" diff --git a/chart2/source/controller/main/ChartController_EditData.cxx b/chart2/source/controller/main/ChartController_EditData.cxx index ffab4b3a90d1..949700b82138 100644 --- a/chart2/source/controller/main/ChartController_EditData.cxx +++ b/chart2/source/controller/main/ChartController_EditData.cxx @@ -26,7 +26,7 @@ #include "ControllerLockGuard.hxx" #include "UndoGuard.hxx" #include "ResId.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include #include diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx index 27ff61e1772b..eceb5af49d6d 100644 --- a/chart2/source/controller/main/ChartController_Insert.cxx +++ b/chart2/source/controller/main/ChartController_Insert.cxx @@ -40,7 +40,7 @@ #include "ControllerLockGuard.hxx" #include "UndoGuard.hxx" #include "ResId.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "ReferenceSizeProvider.hxx" #include "ObjectIdentifier.hxx" #include "RegressionCurveHelper.hxx" diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx index 1e0762bdfc92..532a8cbd8c19 100644 --- a/chart2/source/controller/main/ChartController_Position.cxx +++ b/chart2/source/controller/main/ChartController_Position.cxx @@ -25,7 +25,7 @@ #include "PositionAndSizeHelper.hxx" #include "ChartModelHelper.hxx" #include "UndoGuard.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "ObjectNameProvider.hxx" #include "DiagramHelper.hxx" #include "chartview/ExplicitValueProvider.hxx" diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index 6da7736eea60..fcbfc3073f06 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -48,7 +48,7 @@ #include "UndoGuard.hxx" #include "ObjectNameProvider.hxx" #include "ResId.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "ReferenceSizeProvider.hxx" #include "RegressionCurveHelper.hxx" #include diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx index 3fb555bace30..ab8189642b36 100644 --- a/chart2/source/controller/main/ChartController_TextEdit.cxx +++ b/chart2/source/controller/main/ChartController_TextEdit.cxx @@ -28,7 +28,7 @@ #include "macros.hxx" #include "ControllerLockGuard.hxx" #include "AccessibleTextHelper.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "chartview/DrawModelWrapper.hxx" #include diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index 240ab15f6952..38772a491eea 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -27,7 +27,7 @@ #include "ControllerLockGuard.hxx" #include "macros.hxx" #include "ResId.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "ObjectIdentifier.hxx" #include "ReferenceSizeProvider.hxx" #include "chartview/ExplicitValueProvider.hxx" @@ -62,6 +62,7 @@ #include #include #include +#include #include #include #include @@ -724,20 +725,20 @@ bool ChartController::executeDispatch_Delete() ObjectIdentifier::getObjectPropertySet( aCID, getModel() )); if( xErrorBarProp.is()) { - sal_Int16 nId; + const char* pId; if ( aObjectType == OBJECTTYPE_DATA_ERRORS_X ) - nId = STR_OBJECT_ERROR_BARS_X; + pId = STR_OBJECT_ERROR_BARS_X; else if ( aObjectType == OBJECTTYPE_DATA_ERRORS_Y ) - nId = STR_OBJECT_ERROR_BARS_Y; + pId = STR_OBJECT_ERROR_BARS_Y; else - nId = STR_OBJECT_ERROR_BARS_Z; + pId = STR_OBJECT_ERROR_BARS_Z; uno::Reference< frame::XModel > xModel( getModel() ); UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( - ActionDescriptionProvider::ActionType::Delete, SchResId( nId )), - m_xUndoManager ); + ActionDescriptionProvider::ActionType::Delete, SchResId(pId)), + m_xUndoManager); { ControllerLockGuardUNO aCtlLockGuard( xModel ); xErrorBarProp->setPropertyValue( diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 83e0bb7d76a8..e33db229fc59 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -29,7 +29,7 @@ #include "UndoGuard.hxx" #include "ControllerLockGuard.hxx" #include "ObjectNameProvider.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "macros.hxx" #include "DragMethod_PieSegment.hxx" #include "DragMethod_RotateDiagram.hxx" diff --git a/chart2/source/controller/main/DragMethod_Base.cxx b/chart2/source/controller/main/DragMethod_Base.cxx index d333197f695a..dc65a7d5862e 100644 --- a/chart2/source/controller/main/DragMethod_Base.cxx +++ b/chart2/source/controller/main/DragMethod_Base.cxx @@ -19,7 +19,7 @@ #include "DragMethod_Base.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "ResId.hxx" #include "macros.hxx" #include "ObjectNameProvider.hxx" diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx index 331a506a1840..8271118a2e6f 100644 --- a/chart2/source/controller/main/DragMethod_PieSegment.cxx +++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx @@ -19,7 +19,7 @@ #include "DragMethod_PieSegment.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "ResId.hxx" #include "macros.hxx" #include "ObjectIdentifier.hxx" diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx index d990e351bbd1..b68d2b7c0737 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.cxx +++ b/chart2/source/controller/main/DrawCommandDispatch.cxx @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -74,13 +75,13 @@ bool DrawCommandDispatch::isFeatureSupported( const OUString& rCommandURL ) return parseCommandURL( rCommandURL, &nFeatureId, &aBaseCommand, &aCustomShapeType ); } -::basegfx::B2DPolyPolygon getPolygon( sal_uInt16 nResId, SdrModel& rModel ) +::basegfx::B2DPolyPolygon getPolygon(const char* pResId, SdrModel& rModel) { ::basegfx::B2DPolyPolygon aReturn; XLineEndListRef pLineEndList = rModel.GetLineEndList(); if ( pLineEndList.is() ) { - OUString aName( SvxResId( nResId ) ); + OUString aName(SvxResId(pResId)); long nCount = pLineEndList->Count(); for ( long nIndex = 0; nIndex < nCount; ++nIndex ) { diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index 9a4436197a97..c4d1ef375c2b 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -25,7 +25,7 @@ #include #include "DrawViewWrapper.hxx" #include "ResId.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "ObjectIdentifier.hxx" #include diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx index 459ac3eb79b8..96fd0de5e90d 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.cxx +++ b/chart2/source/controller/main/UndoCommandDispatch.cxx @@ -28,7 +28,7 @@ #include #include -#include +#include #include using namespace ::com::sun::star; diff --git a/chart2/source/inc/ResId.hxx b/chart2/source/inc/ResId.hxx index 0eefc83d5362..31d96d155b91 100644 --- a/chart2/source/inc/ResId.hxx +++ b/chart2/source/inc/ResId.hxx @@ -25,7 +25,7 @@ namespace chart { -OUString OOO_DLLPUBLIC_CHARTTOOLS SchResId(sal_uInt16 nId); +OUString OOO_DLLPUBLIC_CHARTTOOLS SchResId(const char *pId); } // namespace chart diff --git a/chart2/source/inc/ResourceManager.hxx b/chart2/source/inc/ResourceManager.hxx index d5c3272db684..afb1e76f9165 100644 --- a/chart2/source/inc/ResourceManager.hxx +++ b/chart2/source/inc/ResourceManager.hxx @@ -20,16 +20,14 @@ #define INCLUDED_CHART2_SOURCE_INC_RESOURCEMANAGER_HXX #include "charttoolsdllapi.hxx" - -// defined in -class ResMgr; +#include namespace chart { namespace ResourceManager { - ::ResMgr & getResourceManager(); + const std::locale& getResourceLocale(); } } // namespace chart diff --git a/chart2/source/inc/Strings.hrc b/chart2/source/inc/Strings.hrc deleted file mode 100644 index d3b45f0e4907..000000000000 --- a/chart2/source/inc/Strings.hrc +++ /dev/null @@ -1,265 +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 CHART_STRINGS_HRC -#define CHART_STRINGS_HRC - -// this includes no link dependency -#include - -//next free is 305 - -//chart types -//see Strings_ChartTypes.src - -#define STR_NORMAL (RID_APP_START + 10) -#define STR_STACKED (RID_APP_START + 11) -#define STR_PERCENT (RID_APP_START + 12) -#define STR_DEEP (RID_APP_START + 13) -#define STR_FILLED (RID_APP_START + 285) - -#define STR_DONUT (RID_APP_START + 8) -#define STR_TYPE_PIE (RID_APP_START + 187) -#define STR_PIE_EXPLODED (RID_APP_START + 188) -#define STR_DONUT_EXPLODED (RID_APP_START + 189) - -#define STR_TYPE_COLUMN (RID_APP_START + 190) -#define STR_TYPE_BAR (RID_APP_START + 191) -#define STR_TYPE_AREA (RID_APP_START + 192) - -#define STR_LINES_3D (RID_APP_START + 193) -#define STR_POINTS_ONLY (RID_APP_START + 194) -#define STR_LINES_ONLY (RID_APP_START + 116) -#define STR_POINTS_AND_LINES (RID_APP_START + 124) -#define STR_TYPE_LINE (RID_APP_START + 125) -#define STR_TYPE_XY (RID_APP_START + 240) - -#define STR_LINE_COLUMN (RID_APP_START + 22) -#define STR_LINE_STACKEDCOLUMN (RID_APP_START + 23) -#define STR_TYPE_COMBI_COLUMN_LINE (RID_APP_START + 24) - -#define STR_TYPE_NET (RID_APP_START + 52) - -#define STR_TYPE_STOCK (RID_APP_START + 126) -#define STR_STOCK_1 (RID_APP_START + 143) -#define STR_STOCK_2 (RID_APP_START + 144) -#define STR_STOCK_3 (RID_APP_START + 145) -#define STR_STOCK_4 (RID_APP_START + 146) - -#define STR_TYPE_BUBBLE (RID_APP_START + 282) -#define STR_BUBBLE_1 (RID_APP_START + 283) - -#define STR_TYPE_GL3D_BAR (RID_APP_START + 127) -#define STR_GL3D_BAR (RID_APP_START + 128) - -//SchStatisticTabPage and SchDataStatisticsDlg -//see Strings_Statistic.src - -#define STR_REGRESSION_LINEAR (RID_APP_START + 135) -#define STR_REGRESSION_LOG (RID_APP_START + 136) -#define STR_REGRESSION_EXP (RID_APP_START + 137) -#define STR_REGRESSION_POWER (RID_APP_START + 138) -#define STR_REGRESSION_MEAN (RID_APP_START + 180) -#define STR_REGRESSION_POLYNOMIAL (RID_APP_START + 300) -#define STR_REGRESSION_MOVING_AVERAGE (RID_APP_START + 301) - -//for scale tab page -//see Strings_Scale.src - -#define STR_INVALID_NUMBER (RID_APP_START + 100) -#define STR_STEP_GT_ZERO (RID_APP_START + 102) -#define STR_BAD_LOGARITHM (RID_APP_START + 111) -#define STR_MIN_GREATER_MAX (RID_APP_START + 101) -#define STR_INVALID_INTERVALS (RID_APP_START + 291) -#define STR_INVALID_TIME_UNIT (RID_APP_START + 292) - -//for range dialog -#define STR_DATA_ROLE_LABEL (RID_APP_START + 241) -#define STR_DATA_ROLE_X (RID_APP_START + 242) -#define STR_DATA_ROLE_Y (RID_APP_START + 243) -#define STR_DATA_ROLE_X_ERROR (RID_APP_START + 244) -#define STR_DATA_ROLE_X_ERROR_POSITIVE (RID_APP_START + 272) -#define STR_DATA_ROLE_X_ERROR_NEGATIVE (RID_APP_START + 273) -#define STR_DATA_ROLE_Y_ERROR (RID_APP_START + 245) -#define STR_DATA_ROLE_Y_ERROR_POSITIVE (RID_APP_START + 274) -#define STR_DATA_ROLE_Y_ERROR_NEGATIVE (RID_APP_START + 275) -#define STR_DATA_ROLE_FIRST (RID_APP_START + 246) -#define STR_DATA_ROLE_LAST (RID_APP_START + 247) -#define STR_DATA_ROLE_MIN (RID_APP_START + 248) -#define STR_DATA_ROLE_MAX (RID_APP_START + 249) -#define STR_DATA_ROLE_CATEGORIES (RID_APP_START + 260) -#define STR_DATA_ROLE_SIZE (RID_APP_START + 284) -#define STR_PROPERTY_ROLE_FILLCOLOR (RID_APP_START + 303) -#define STR_PROPERTY_ROLE_BORDERCOLOR (RID_APP_START + 304) - -#define STR_DATA_UNNAMED_SERIES (RID_APP_START + 250) -#define STR_DATA_UNNAMED_SERIES_WITH_INDEX (RID_APP_START + 251) - -#define STR_DATA_SELECT_RANGE_FOR_SERIES (RID_APP_START + 252) -#define STR_DATA_SELECT_RANGE_FOR_CATEGORIES (RID_APP_START + 253) -#define STR_DATA_SELECT_RANGE_FOR_DATALABELS (RID_APP_START + 195) - -//chart objects -//e.g. used as titles for insert dialogs and object properties dialog -//also used in tip help, in status descriptions e.g. '%object% marked' or in undo action e.g. 'moved %object%' - -#define STR_PAGE_CHARTTYPE (RID_APP_START + 197) -#define STR_PAGE_DATA_RANGE (RID_APP_START + 238) -#define STR_ACTION_EDIT_CHART_DATA (RID_APP_START + 198) - -#define STR_OBJECT_PAGE (RID_APP_START + 30) -#define STR_OBJECT_DIAGRAM (RID_APP_START + 31) -#define STR_OBJECT_DIAGRAM_WALL (RID_APP_START + 32) -#define STR_OBJECT_DIAGRAM_FLOOR (RID_APP_START + 33) -#define STR_OBJECT_LEGEND (RID_APP_START + 48) -#define STR_OBJECT_LEGEND_SYMBOL (RID_APP_START + 49) - -#define STR_OBJECT_DATALABELS (RID_APP_START + 45) -#define STR_OBJECT_LABEL (RID_APP_START + 199) - -#define STR_OBJECT_TITLE (RID_APP_START + 200) -#define STR_OBJECT_TITLES (RID_APP_START + 201) - -#define STR_OBJECT_TITLE_MAIN (RID_APP_START + 254) -#define STR_OBJECT_TITLE_SUB (RID_APP_START + 255) -#define STR_OBJECT_TITLE_X_AXIS (RID_APP_START + 256) -#define STR_OBJECT_TITLE_Y_AXIS (RID_APP_START + 257) -#define STR_OBJECT_TITLE_Z_AXIS (RID_APP_START + 258) -#define STR_OBJECT_TITLE_SECONDARY_X_AXIS (RID_APP_START + 87) -#define STR_OBJECT_TITLE_SECONDARY_Y_AXIS (RID_APP_START + 88) - -#define STR_OBJECT_DATAPOINT (RID_APP_START + 202) -#define STR_OBJECT_DATAPOINTS (RID_APP_START + 203) -#define STR_OBJECT_DATASERIES (RID_APP_START + 204) -#define STR_OBJECT_DATASERIES_PLURAL (RID_APP_START + 205) - -#define STR_OBJECT_FOR_SERIES (RID_APP_START + 288) -#define STR_OBJECT_FOR_ALL_SERIES (RID_APP_START + 289) - -#define STR_OBJECT_AVERAGE_LINE (RID_APP_START + 174) -#define STR_OBJECT_ERROR_BARS_X (RID_APP_START + 175) -#define STR_OBJECT_ERROR_BARS_Y (RID_APP_START + 295) -#define STR_OBJECT_ERROR_BARS_Z (RID_APP_START + 296) -#define STR_OBJECT_CURVE (RID_APP_START + 176) -#define STR_OBJECT_CURVES (RID_APP_START + 130) - -#define STR_OBJECT_STOCK_LOSS (RID_APP_START + 207) -#define STR_OBJECT_STOCK_GAIN (RID_APP_START + 208) - -#define STR_OBJECT_AXES (RID_APP_START + 209) -#define STR_OBJECT_AXIS (RID_APP_START + 210) -#define STR_OBJECT_AXIS_X (RID_APP_START + 211) -#define STR_OBJECT_AXIS_Y (RID_APP_START + 212) -#define STR_OBJECT_AXIS_Z (RID_APP_START + 213) - -#define STR_OBJECT_SECONDARY_X_AXIS (RID_APP_START + 286) -#define STR_OBJECT_SECONDARY_Y_AXIS (RID_APP_START + 287) - -#define STR_OBJECT_GRID (RID_APP_START + 214) -#define STR_OBJECT_GRIDS (RID_APP_START + 215) - -#define STR_OBJECT_GRID_MAJOR_X (RID_APP_START + 37) -#define STR_OBJECT_GRID_MAJOR_Y (RID_APP_START + 38) -#define STR_OBJECT_GRID_MAJOR_Z (RID_APP_START + 39) -#define STR_OBJECT_GRID_MINOR_X (RID_APP_START + 40) -#define STR_OBJECT_GRID_MINOR_Y (RID_APP_START + 41) -#define STR_OBJECT_GRID_MINOR_Z (RID_APP_START + 42) - -#define STR_OBJECT_CURVE_WITH_PARAMETERS (RID_APP_START + 264) -#define STR_OBJECT_AVERAGE_LINE_WITH_PARAMETERS (RID_APP_START + 265) -#define STR_OBJECT_MOVING_AVERAGE_WITH_PARAMETERS (RID_APP_START + 302) - -#define STR_OBJECT_CURVE_EQUATION (RID_APP_START + 268) -#define STR_OBJECT_SHAPE (RID_APP_START + 290) - -//Titles for tabpages and dialogs - -#define STR_PAGE_LINE (RID_APP_START + 216) -#define STR_PAGE_BORDER (RID_APP_START + 217) -#define STR_PAGE_AREA (RID_APP_START + 218) -#define STR_PAGE_TRANSPARENCY (RID_APP_START + 219) -#define STR_PAGE_FONT (RID_APP_START + 220) -#define STR_PAGE_FONT_EFFECTS (RID_APP_START + 221) -#define STR_PAGE_LAYOUT (RID_APP_START + 222) -#define STR_PAGE_OPTIONS (RID_APP_START + 223) -#define STR_PAGE_SCALE (RID_APP_START + 224) -#define STR_PAGE_NUMBERS (RID_APP_START + 225) -#define STR_PAGE_ALIGNMENT (RID_APP_START + 226) -#define STR_PAGE_POSITION (RID_APP_START + 227) - -#define STR_PAGE_PERSPECTIVE (RID_APP_START + 235) -#define STR_PAGE_APPEARANCE (RID_APP_START + 236) -#define STR_PAGE_ILLUMINATION (RID_APP_START + 237) - -#define STR_PAGE_TRENDLINE_TYPE (RID_APP_START + 89) -#define STR_PAGE_XERROR_BARS (RID_APP_START + 293) -#define STR_PAGE_YERROR_BARS (RID_APP_START + 206) -#define STR_CONTROLTEXT_ERROR_BARS_FROM_DATA (RID_APP_START + 276) - -#define STR_DLG_CHART_WIZARD (RID_APP_START + 228) -#define STR_PAGE_CHART_ELEMENTS (RID_APP_START + 229) - -#define STR_DLG_SMOOTH_LINE_PROPERTIES (RID_APP_START + 239) -#define STR_DLG_STEPPED_LINE_PROPERTIES (RID_APP_START + 270) - -#define STR_PAGE_POSITIONING (RID_APP_START + 277) -#define STR_PAGE_ASIAN (RID_APP_START + 281) - -//strings used as description for actions on toolbar icons, as tip help or for undo - -#define STR_ACTION_EDIT_CHARTTYPE (RID_APP_START + 78) -#define STR_ACTION_EDIT_DATA_RANGES (RID_APP_START + 64) -#define STR_ACTION_EDIT_3D_VIEW (RID_APP_START + 80) -#define STR_ACTION_TOGGLE_LEGEND (RID_APP_START + 83) -#define STR_ACTION_TOGGLE_GRID_HORZ (RID_APP_START + 86) -#define STR_ACTION_TOGGLE_GRID_VERTICAL (RID_APP_START + 139) -#define STR_ACTION_SCALE_TEXT (RID_APP_START + 93) -#define STR_ACTION_REARRANGE_CHART (RID_APP_START + 94) -#define STR_ACTION_EDIT_TEXT (RID_APP_START + 95) - -//statusbar strings and balloon help - -#define STR_STATUS_PIE_SEGMENT_EXPLODED (RID_APP_START + 179) -#define STR_STATUS_OBJECT_MARKED (RID_APP_START + 51) -#define STR_STATUS_DATAPOINT_MARKED (RID_APP_START + 44) -#define STR_TIP_DATASERIES (RID_APP_START + 43) -#define STR_TIP_DATAPOINT (RID_APP_START + 140) -#define STR_TIP_DATAPOINT_INDEX (RID_APP_START + 141) -#define STR_TIP_DATAPOINT_VALUES (RID_APP_START + 142) - -//warning and info boxes -#define STR_ACTION_NOTPOSSIBLE (RID_APP_START + 107) - -#define STR_COLUMN_LABEL (RID_APP_START + 262) -#define STR_ROW_LABEL (RID_APP_START + 263) - -#define STR_DATA_EDITOR_INCORRECT_INPUT (RID_APP_START + 269) - -// frame direction ------------------------------------------------------------ - -#define STR_TEXT_DIRECTION_LTR (RID_APP_START + 278) -#define STR_TEXT_DIRECTION_RTL (RID_APP_START + 279) -#define STR_TEXT_DIRECTION_SUPER (RID_APP_START + 280) - -// There is a gap here due to removed strings -// RID_APP_START + 500 and RID_APP_START + 501 are removed - -// CHART_STRINGS_HRC -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx index 59d5cb1b6dee..54d4f5c61567 100644 --- a/chart2/source/tools/InternalData.cxx +++ b/chart2/source/tools/InternalData.cxx @@ -19,7 +19,7 @@ #include "InternalData.hxx" #include "ResId.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include #include diff --git a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx index 60ee6b10c0fa..3624e9d1a749 100644 --- a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx +++ b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx @@ -20,7 +20,7 @@ #include "MovingAverageRegressionCurveCalculator.hxx" #include "RegressionCalculationHelper.hxx" #include "ResId.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "macros.hxx" #include diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx index da43fee9b0c6..4a3558d6a38e 100644 --- a/chart2/source/tools/RegressionCurveHelper.cxx +++ b/chart2/source/tools/RegressionCurveHelper.cxx @@ -32,7 +32,7 @@ #include "macros.hxx" #include "PropertyHelper.hxx" #include "ResId.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "DiagramHelper.hxx" #include diff --git a/chart2/source/tools/ResId.cxx b/chart2/source/tools/ResId.cxx index 6bff5b7efc0e..68ea0df902f7 100644 --- a/chart2/source/tools/ResId.cxx +++ b/chart2/source/tools/ResId.cxx @@ -19,13 +19,13 @@ #include "ResId.hxx" #include "ResourceManager.hxx" -#include +#include namespace chart { - OUString SchResId(sal_uInt16 nId) + OUString SchResId(const char *pId) { - return ResId(nId, ResourceManager::getResourceManager()); + return Translate::get(pId, ResourceManager::getResourceLocale()); } } // namespace chart diff --git a/chart2/source/tools/ResourceManager.cxx b/chart2/source/tools/ResourceManager.cxx index 3f3fb615697a..3cd51d70c7a7 100644 --- a/chart2/source/tools/ResourceManager.cxx +++ b/chart2/source/tools/ResourceManager.cxx @@ -18,20 +18,17 @@ */ #include "ResourceManager.hxx" - #include +#include +#include namespace chart { -ResMgr & ResourceManager::getResourceManager() +const std::locale& ResourceManager::getResourceLocale() { - // not threadsafe - static ResMgr * pResourceManager = nullptr; - if( ! pResourceManager ) - pResourceManager = ResMgr::CreateResMgr("chartcontroller"); - OSL_ASSERT( pResourceManager ); - return *pResourceManager; + static std::locale loc = Translate::Create("chart", Application::GetSettings().GetUILanguageTag()); + return loc; } } // namespace chart diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 0cd1aa8d8896..3697f9456601 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -39,7 +39,7 @@ #include "VLegendSymbolFactory.hxx" #include "FormattedStringHelper.hxx" #include "ResId.hxx" -#include "Strings.hrc" +#include "strings.hrc" #include "RelativePositionHelper.hxx" #include "DateHelper.hxx" #include "DiagramHelper.hxx" diff --git a/chart2/source/view/inc/AbstractShapeFactory.hxx b/chart2/source/view/inc/AbstractShapeFactory.hxx index be0ceb56dbc3..ca735afaec73 100644 --- a/chart2/source/view/inc/AbstractShapeFactory.hxx +++ b/chart2/source/view/inc/AbstractShapeFactory.hxx @@ -34,7 +34,7 @@ class OpenGLWindow; namespace chart { // Be careful here not to clash with the SYMBOL_FOO #defines in -// +// enum SymbolEnum { Symbol_Square=0 , Symbol_Diamond , Symbol_DownArrow diff --git a/chart2/uiconfig/ui/3dviewdialog.ui b/chart2/uiconfig/ui/3dviewdialog.ui index a448519819e0..0410f04661e7 100644 --- a/chart2/uiconfig/ui/3dviewdialog.ui +++ b/chart2/uiconfig/ui/3dviewdialog.ui @@ -1,11 +1,11 @@ - + False 6 - 3D View + 3D View dialog diff --git a/chart2/uiconfig/ui/attributedialog.ui b/chart2/uiconfig/ui/attributedialog.ui index cac251fdf5b2..c45fe71965d3 100644 --- a/chart2/uiconfig/ui/attributedialog.ui +++ b/chart2/uiconfig/ui/attributedialog.ui @@ -1,6 +1,6 @@ - + False diff --git a/chart2/uiconfig/ui/chardialog.ui b/chart2/uiconfig/ui/chardialog.ui index 0f6b1382fda7..7461a6e8d808 100644 --- a/chart2/uiconfig/ui/chardialog.ui +++ b/chart2/uiconfig/ui/chardialog.ui @@ -1,11 +1,11 @@ - + False 6 - Character + Character dialog @@ -96,7 +96,7 @@ True False - Font + Font False @@ -109,7 +109,7 @@ True False - Font Effects + Font Effects 1 @@ -123,7 +123,7 @@ True False - Position + Position 2 diff --git a/chart2/uiconfig/ui/chartdatadialog.ui b/chart2/uiconfig/ui/chartdatadialog.ui index f5c3f2b15897..c275737119fb 100644 --- a/chart2/uiconfig/ui/chartdatadialog.ui +++ b/chart2/uiconfig/ui/chartdatadialog.ui @@ -1,11 +1,11 @@ - + False 6 - Data Table + Data Table dialog @@ -85,7 +85,7 @@ True False InsertRow - Insert Row + Insert Row True chart2/res/dataeditor_icon01.png @@ -99,7 +99,7 @@ True False InsertColumn - Insert Series + Insert Series True chart2/res/dataeditor_icon02.png @@ -113,7 +113,7 @@ True False InsertTextColumn - Insert Text Column + Insert Text Column True chart2/res/dataeditor_icon07.png @@ -127,7 +127,7 @@ True False RemoveRow - Delete Row + Delete Row True chart2/res/dataeditor_icon03.png @@ -141,7 +141,7 @@ True False RemoveColumn - Delete Series + Delete Series True chart2/res/dataeditor_icon04.png @@ -165,7 +165,7 @@ True False MoveLeftColumn - Move Series Left + Move Series Left True chart2/res/dataeditor_icon08.png @@ -179,7 +179,7 @@ True False MoveRightColumn - Move Series Right + Move Series Right True chart2/res/dataeditor_icon05.png @@ -193,7 +193,7 @@ True False MoveUpRow - Move Row Up + Move Row Up True chart2/res/dataeditor_icon09.png @@ -207,7 +207,7 @@ True False MoveDownRow - Move Row Down + Move Row Down True chart2/res/dataeditor_icon06.png diff --git a/chart2/uiconfig/ui/charttypedialog.ui b/chart2/uiconfig/ui/charttypedialog.ui index 6cc181c91ecd..4a5e085b9b00 100644 --- a/chart2/uiconfig/ui/charttypedialog.ui +++ b/chart2/uiconfig/ui/charttypedialog.ui @@ -1,11 +1,11 @@ - + False 6 - Chart Type + Chart Type dialog diff --git a/chart2/uiconfig/ui/datarangedialog.ui b/chart2/uiconfig/ui/datarangedialog.ui index 184546b5737f..a977a9df6aa2 100644 --- a/chart2/uiconfig/ui/datarangedialog.ui +++ b/chart2/uiconfig/ui/datarangedialog.ui @@ -1,11 +1,11 @@ - + False 6 - Data Ranges + Data Ranges dialog diff --git a/chart2/uiconfig/ui/dlg_DataLabel.ui b/chart2/uiconfig/ui/dlg_DataLabel.ui index 51f38590950c..093bec57d65b 100644 --- a/chart2/uiconfig/ui/dlg_DataLabel.ui +++ b/chart2/uiconfig/ui/dlg_DataLabel.ui @@ -1,6 +1,6 @@ - + @@ -17,55 +17,55 @@ - Best fit + Best fit 0 - Center + Center 1 - Above + Above 2 - Top left + Top left 3 - Left + Left 4 - Bottom left + Bottom left 5 - Below + Below 6 - Bottom right + Bottom right 7 - Right + Right 8 - Top right + Top right 9 - Inside + Inside 10 - Outside + Outside 11 - Near origin + Near origin 12 @@ -79,19 +79,19 @@ - Space + Space 0 - Comma + Comma 1 - Semicolon + Semicolon 2 - New line + New line 3 @@ -99,7 +99,7 @@ False 6 - Data Labels for all Data Series + Data Labels for all Data Series dialog @@ -191,7 +191,7 @@ True - Show value as _number + Show value as _number True False False @@ -206,7 +206,7 @@ - Show value as _percentage + Show value as _percentage True False False @@ -221,7 +221,7 @@ - Show _category + Show _category True False False @@ -236,7 +236,7 @@ - Show _legend key + Show _legend key True False False @@ -251,7 +251,7 @@ - Auto text _wrap + Auto text _wrap True False False @@ -266,7 +266,7 @@ - Number _format... + Number _format... True False True @@ -280,7 +280,7 @@ - Percentage f_ormat... + Percentage f_ormat... True False True @@ -296,7 +296,7 @@ False True - ABCD + ABCD @@ -316,7 +316,7 @@ True False 0 - _Separator + _Separator True LB_TEXT_SEPARATOR @@ -356,7 +356,7 @@ True False 0 - Place_ment + Place_ment True LB_LABEL_PLACEMENT @@ -389,7 +389,7 @@ False - Number Format for Percentage Value + Number Format for Percentage Value 1 @@ -405,7 +405,7 @@ True False 0 - Text Attributes + Text Attributes @@ -471,7 +471,7 @@ True False - _Degrees + _Degrees True @@ -496,7 +496,7 @@ True False - Te_xt direction + Te_xt direction True LB_LABEL_TEXTDIR @@ -533,7 +533,7 @@ True False 0 - Rotate Text + Rotate Text diff --git a/chart2/uiconfig/ui/dlg_InsertErrorBars.ui b/chart2/uiconfig/ui/dlg_InsertErrorBars.ui index b39ea0cbcc0f..80115208e25f 100644 --- a/chart2/uiconfig/ui/dlg_InsertErrorBars.ui +++ b/chart2/uiconfig/ui/dlg_InsertErrorBars.ui @@ -1,6 +1,6 @@ - + 100 @@ -26,19 +26,19 @@ - Standard Error + Standard Error 0 - Standard Deviation + Standard Deviation 1 - Variance + Variance 2 - Error Margin + Error Margin 3 @@ -46,7 +46,7 @@ False 6 - Legend + Legend dialog @@ -143,7 +143,7 @@ 6 - _None + _None True False False @@ -160,7 +160,7 @@ - _Constant Value + _Constant Value True False False @@ -177,7 +177,7 @@ - _Percentage + _Percentage True False False @@ -233,7 +233,7 @@ - Cell _Range + Cell _Range True False False @@ -256,7 +256,7 @@ True False - Error Category + Error Category @@ -289,7 +289,7 @@ 12 - Positive _and Negative + Positive _and Negative True False False @@ -305,7 +305,7 @@ - Pos_itive + Pos_itive True False False @@ -321,7 +321,7 @@ - Ne_gative + Ne_gative True False False @@ -377,7 +377,7 @@ True False 0 - Error Indicator + Error Indicator @@ -424,7 +424,7 @@ True False - P_ositive (+) + P_ositive (+) True MF_POSITIVE:0 @@ -465,7 +465,7 @@ True False True - Select data range + Select data range imageRANGE_SELECT_POSITIVE @@ -490,7 +490,7 @@ True False - _Negative (-) + _Negative (-) True MF_NEGATIVE:0 @@ -532,7 +532,7 @@ False True True - Select data range + Select data range imageRANGE_SELECT_NEG @@ -550,7 +550,7 @@ - Same value for both + Same value for both True False False @@ -572,7 +572,7 @@ True False 0 - Parameters + Parameters @@ -588,7 +588,7 @@ False - Select Range for Positive Error Bars + Select Range for Positive Error Bars False @@ -599,7 +599,7 @@ False - Select Range for Negative Error Bars + Select Range for Negative Error Bars False @@ -610,7 +610,7 @@ False - From Data Table + From Data Table False diff --git a/chart2/uiconfig/ui/dlg_InsertLegend.ui b/chart2/uiconfig/ui/dlg_InsertLegend.ui index 34364f4063bd..45463bcd8782 100644 --- a/chart2/uiconfig/ui/dlg_InsertLegend.ui +++ b/chart2/uiconfig/ui/dlg_InsertLegend.ui @@ -1,11 +1,11 @@ - + False 6 - Legend + Legend dialog @@ -97,7 +97,7 @@ 6 - _Display legend + _Display legend True False False @@ -119,7 +119,7 @@ 6 - _Left + _Left True True False @@ -135,7 +135,7 @@ - _Right + _Right True True False @@ -151,7 +151,7 @@ - _Top + _Top True True False @@ -167,7 +167,7 @@ - _Bottom + _Bottom True True False @@ -197,7 +197,7 @@ True False 0 - Position + Position diff --git a/chart2/uiconfig/ui/insertaxisdlg.ui b/chart2/uiconfig/ui/insertaxisdlg.ui index fdbd609bbf33..563532abf41e 100644 --- a/chart2/uiconfig/ui/insertaxisdlg.ui +++ b/chart2/uiconfig/ui/insertaxisdlg.ui @@ -1,11 +1,11 @@ - + False 6 - Axes + Axes dialog @@ -101,7 +101,7 @@ 6 - _X axis + _X axis True True False @@ -117,7 +117,7 @@ - _Y axis + _Y axis True True False @@ -133,7 +133,7 @@ - _Z axis + _Z axis True True False @@ -156,7 +156,7 @@ True False True - Axes + Axes @@ -191,7 +191,7 @@ 6 - X _axis + X _axis True True False @@ -207,7 +207,7 @@ - Y ax_is + Y ax_is True True False @@ -223,7 +223,7 @@ - Z axi_s + Z axi_s True True False @@ -246,7 +246,7 @@ True False True - Secondary Axes + Secondary Axes diff --git a/chart2/uiconfig/ui/insertgriddlg.ui b/chart2/uiconfig/ui/insertgriddlg.ui index 0472f480f576..5d2a32d17c87 100644 --- a/chart2/uiconfig/ui/insertgriddlg.ui +++ b/chart2/uiconfig/ui/insertgriddlg.ui @@ -1,11 +1,11 @@ - + False 6 - Grids + Grids dialog @@ -101,7 +101,7 @@ 6 - _X axis + _X axis True True False @@ -117,7 +117,7 @@ - _Y axis + _Y axis True True False @@ -133,7 +133,7 @@ - _Z axis + _Z axis True True False @@ -156,7 +156,7 @@ True False True - Major Grids + Major Grids @@ -191,7 +191,7 @@ 6 - X _axis + X _axis True True False @@ -207,7 +207,7 @@ - Y ax_is + Y ax_is True True False @@ -223,7 +223,7 @@ - Z axi_s + Z axi_s True True False @@ -246,7 +246,7 @@ True False True - Minor Grids + Minor Grids diff --git a/chart2/uiconfig/ui/inserttitledlg.ui b/chart2/uiconfig/ui/inserttitledlg.ui index ce93162c27a5..fb94ec727a4c 100644 --- a/chart2/uiconfig/ui/inserttitledlg.ui +++ b/chart2/uiconfig/ui/inserttitledlg.ui @@ -1,11 +1,11 @@ - + False 6 - Titles + Titles dialog @@ -86,7 +86,7 @@ True False 0 - _Title + _Title True maintitle @@ -100,7 +100,7 @@ True False 0 - _Subtitle + _Subtitle True subtitle @@ -163,7 +163,7 @@ True False 0 - _X axis + _X axis True primaryXaxis @@ -177,7 +177,7 @@ True False 0 - _Y axis + _Y axis True primaryYaxis @@ -191,7 +191,7 @@ True False 0 - _Z axis + _Z axis True primaryZaxis @@ -244,7 +244,7 @@ True False - Axes + Axes @@ -280,7 +280,7 @@ True False 0 - X _axis + X _axis True secondaryXaxis @@ -294,7 +294,7 @@ True False 0 - Y ax_is + Y ax_is True secondaryYaxis @@ -335,7 +335,7 @@ True False - Secondary Axes + Secondary Axes diff --git a/chart2/uiconfig/ui/paradialog.ui b/chart2/uiconfig/ui/paradialog.ui index 4b1e3ca3ef75..aef016979345 100644 --- a/chart2/uiconfig/ui/paradialog.ui +++ b/chart2/uiconfig/ui/paradialog.ui @@ -1,11 +1,11 @@ - + False 6 - Paragraph + Paragraph dialog @@ -96,7 +96,7 @@ True False - Indents & Spacing + Indents & Spacing False @@ -110,7 +110,7 @@ True False 0.4699999988079071 - Alignment + Alignment 1 @@ -124,7 +124,7 @@ True False - Asian Typography + Asian Typography 2 @@ -138,7 +138,7 @@ True False - Tabs + Tabs 3 diff --git a/chart2/uiconfig/ui/sidebaraxis.ui b/chart2/uiconfig/ui/sidebaraxis.ui index b758e317136f..cba9421b4a11 100644 --- a/chart2/uiconfig/ui/sidebaraxis.ui +++ b/chart2/uiconfig/ui/sidebaraxis.ui @@ -1,6 +1,6 @@ - + True @@ -15,7 +15,7 @@ 6 - Show labels + Show labels True True False @@ -29,7 +29,7 @@ - Reverse direction + Reverse direction True True False @@ -53,7 +53,7 @@ True False end - _Label position: + _Label position: True comboboxtext_label_position @@ -67,10 +67,10 @@ True False - Near Axis - Near Axis (other side) - Outside start - Outside end + Near Axis + Near Axis (other side) + Outside start + Outside end @@ -84,7 +84,7 @@ False end center - _Text orientation: + _Text orientation: True spinbutton1:0degrees diff --git a/chart2/uiconfig/ui/sidebarelements.ui b/chart2/uiconfig/ui/sidebarelements.ui index 9ee199e26ba4..1c2912b4459a 100644 --- a/chart2/uiconfig/ui/sidebarelements.ui +++ b/chart2/uiconfig/ui/sidebarelements.ui @@ -1,6 +1,6 @@ - + True @@ -32,7 +32,7 @@ 6 - Subtitle + Subtitle True True False @@ -46,7 +46,7 @@ - Title + Title True True False @@ -66,7 +66,7 @@ True False - Titles + Titles @@ -97,7 +97,7 @@ False - Show Legend + Show Legend True True False @@ -120,7 +120,7 @@ True False end - _Placement: + _Placement: True end @@ -136,11 +136,11 @@ True False - Right - Top - Bottom - Left - Manual + Right + Top + Bottom + Left + Manual @@ -163,7 +163,7 @@ True False - Legend + Legend @@ -196,7 +196,7 @@ 6 - X axis + X axis True True False @@ -210,7 +210,7 @@ - X axis title + X axis title True True False @@ -224,7 +224,7 @@ - Y axis + Y axis True True False @@ -238,7 +238,7 @@ - Y axis title + Y axis title True True False @@ -252,7 +252,7 @@ - Z axis + Z axis True True False @@ -266,7 +266,7 @@ - Z axis title + Z axis title True True False @@ -280,7 +280,7 @@ - 2nd X axis + 2nd X axis True False 0 @@ -293,7 +293,7 @@ - 2nd X axis title + 2nd X axis title True False 0 @@ -306,7 +306,7 @@ - 2nd Y axis + 2nd Y axis True False 0 @@ -319,7 +319,7 @@ - 2nd Y axis title + 2nd Y axis title True False 0 @@ -338,7 +338,7 @@ True False - Axes + Axes @@ -371,7 +371,7 @@ 6 - Horizontal major + Horizontal major True True False @@ -385,7 +385,7 @@ - Vertical major + Vertical major True True False @@ -399,7 +399,7 @@ - Horizontal minor + Horizontal minor True True False @@ -413,7 +413,7 @@ - Vertical minor + Vertical minor True True False @@ -433,7 +433,7 @@ True False - Gridlines + Gridlines @@ -452,7 +452,7 @@ False - Title + Title 0 @@ -462,7 +462,7 @@ False - Subtitle + Subtitle 1 diff --git a/chart2/uiconfig/ui/sidebarerrorbar.ui b/chart2/uiconfig/ui/sidebarerrorbar.ui index 43a7db9a3245..d71c944ec8a3 100644 --- a/chart2/uiconfig/ui/sidebarerrorbar.ui +++ b/chart2/uiconfig/ui/sidebarerrorbar.ui @@ -1,6 +1,6 @@ - + True @@ -45,7 +45,7 @@ True False start - Category: + Category: True comboboxtext_type @@ -61,13 +61,13 @@ True False - Constant - Percentage - Cell Range or Data Table - Standard deviation - Standard error - Variance - Error margin + Constant + Percentage + Cell Range or Data Table + Standard deviation + Standard error + Variance + Error margin @@ -82,7 +82,7 @@ True False start - Positive (+): + Positive (+): 0 @@ -96,7 +96,7 @@ True False start - Negative (-): + Negative (-): 0 @@ -110,7 +110,7 @@ True True start - 0.00 + 0.00 1 2 @@ -126,7 +126,7 @@ True True start - 0.00 + 0.00 alpha 1 2 @@ -148,7 +148,7 @@ True True False - Positive and Negative + Positive and Negative image2 0 True @@ -164,7 +164,7 @@ True True False - Positive + Positive image1 0 True @@ -180,7 +180,7 @@ True True False - Negative + Negative image3 0 True @@ -202,7 +202,7 @@ True False start - Indicator + Indicator 0 diff --git a/chart2/uiconfig/ui/sidebarseries.ui b/chart2/uiconfig/ui/sidebarseries.ui index 4dfee96a0649..a10820882e47 100644 --- a/chart2/uiconfig/ui/sidebarseries.ui +++ b/chart2/uiconfig/ui/sidebarseries.ui @@ -1,6 +1,6 @@ - + True @@ -41,7 +41,7 @@ 6 - Show data labels + Show data labels True True False @@ -64,7 +64,7 @@ True False - P_lacement: + P_lacement: True comboboxtext_label @@ -79,12 +79,12 @@ True False - Above - Below - Center - Outside - Inside - Near origin + Above + Below + Center + Outside + Inside + Near origin @@ -109,7 +109,7 @@ - Show trendline + Show trendline True True False @@ -144,7 +144,7 @@ 6 - Y error bars + Y error bars True True False @@ -159,7 +159,7 @@ - X error bars + X error bars True True False @@ -180,7 +180,7 @@ True False - Error Bars + Error Bars @@ -213,7 +213,7 @@ 6 - Primary Y axis + Primary Y axis True True False @@ -229,7 +229,7 @@ - Secondary Y axis + Secondary Y axis True True False @@ -251,7 +251,7 @@ True False - Align Series to Axis + Align Series to Axis @@ -267,7 +267,7 @@ False - Data series '%1' + Data series '%1' False diff --git a/chart2/uiconfig/ui/smoothlinesdlg.ui b/chart2/uiconfig/ui/smoothlinesdlg.ui index a2d65da501ad..472d8be91c8f 100644 --- a/chart2/uiconfig/ui/smoothlinesdlg.ui +++ b/chart2/uiconfig/ui/smoothlinesdlg.ui @@ -1,6 +1,6 @@ - + 1 @@ -19,7 +19,7 @@ False 6 - Smooth Lines + Smooth Lines True dialog @@ -101,7 +101,7 @@ True False 0 - Line _Type: + Line _Type: True @@ -116,8 +116,8 @@ False 0 - Cubic spline - B-spline + Cubic spline + B-spline @@ -150,7 +150,7 @@ True False start - _Resolution: + _Resolution: True ResolutionSpinbutton @@ -164,7 +164,7 @@ True False start - _Degree of polynomials: + _Degree of polynomials: True PolynomialsSpinButton @@ -232,11 +232,11 @@ - Cubic Spline + Cubic Spline 0 - B-Spline + B-Spline 1 diff --git a/chart2/uiconfig/ui/steppedlinesdlg.ui b/chart2/uiconfig/ui/steppedlinesdlg.ui index cf7ee627df2d..79bcc121ea9b 100644 --- a/chart2/uiconfig/ui/steppedlinesdlg.ui +++ b/chart2/uiconfig/ui/steppedlinesdlg.ui @@ -1,6 +1,6 @@ - + @@ -122,7 +122,7 @@ - _Start with horizontal line + _Start with horizontal line True True False @@ -139,7 +139,7 @@ - Step at the _horizontal mean + Step at the _horizontal mean True True False @@ -156,7 +156,7 @@ - _End with horizontal line + _End with horizontal line True True False @@ -173,7 +173,7 @@ - Step to the _vertical mean + Step to the _vertical mean True True False @@ -207,7 +207,7 @@ True False - Type of Stepping + Type of Stepping diff --git a/chart2/uiconfig/ui/titlerotationtabpage.ui b/chart2/uiconfig/ui/titlerotationtabpage.ui index 6e0eb4356e5e..ee79d52aa349 100644 --- a/chart2/uiconfig/ui/titlerotationtabpage.ui +++ b/chart2/uiconfig/ui/titlerotationtabpage.ui @@ -1,5 +1,5 @@ - + @@ -55,7 +55,7 @@ True False 40 - _Degrees + _Degrees True @@ -108,7 +108,7 @@ 12 - Ve_rtically stacked + Ve_rtically stacked True True False @@ -127,7 +127,7 @@ False - ABCD + ABCD 0 @@ -148,7 +148,7 @@ True False - Te_xt direction: + Te_xt direction: True @@ -178,7 +178,7 @@ True False - Text Orientation + Text Orientation diff --git a/chart2/uiconfig/ui/tp_3D_SceneAppearance.ui b/chart2/uiconfig/ui/tp_3D_SceneAppearance.ui index e9347bd7f29e..93d0f6c02c3e 100644 --- a/chart2/uiconfig/ui/tp_3D_SceneAppearance.ui +++ b/chart2/uiconfig/ui/tp_3D_SceneAppearance.ui @@ -1,5 +1,5 @@ - + @@ -10,15 +10,15 @@ - Simple + Simple 0 - Realistic + Realistic 1 - Custom + Custom 2 @@ -39,7 +39,7 @@ True False 0 - Sche_me + Sche_me True LB_SCHEME @@ -87,7 +87,7 @@ - _Shading + _Shading True False False @@ -103,7 +103,7 @@ - _Object borders + _Object borders True False False @@ -119,7 +119,7 @@ - _Rounded edges + _Rounded edges True False False diff --git a/chart2/uiconfig/ui/tp_3D_SceneGeometry.ui b/chart2/uiconfig/ui/tp_3D_SceneGeometry.ui index f89fc13a726f..36ef02f1fb16 100644 --- a/chart2/uiconfig/ui/tp_3D_SceneGeometry.ui +++ b/chart2/uiconfig/ui/tp_3D_SceneGeometry.ui @@ -1,6 +1,6 @@ - + 100 @@ -21,7 +21,7 @@ 12 - _Right-angled axes + _Right-angled axes True False False @@ -39,7 +39,7 @@ True False - _X rotation + _X rotation True MTR_FLD_X_ROTATION:0degrees 0 @@ -53,7 +53,7 @@ True False - _Y rotation + _Y rotation True MTR_FLD_Y_ROTATION:0degrees 0 @@ -67,7 +67,7 @@ True False - _Z rotation + _Z rotation True MTR_FLD_Z_ROTATION:0degrees 0 @@ -79,7 +79,7 @@ - _Perspective + _Perspective True False False @@ -106,7 +106,7 @@ - Perspective + Perspective diff --git a/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui b/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui index 626124a9c580..128472e0e2f5 100644 --- a/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui +++ b/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui @@ -1,5 +1,5 @@ - + @@ -101,7 +101,7 @@ True True True - Light source 1 + Light source 1 IMG_LIGHT_1 @@ -117,7 +117,7 @@ True True True - Light source 2 + Light source 2 IMG_LIGHT_2 @@ -133,7 +133,7 @@ True True True - Light source 3 + Light source 3 IMG_LIGHT_3 @@ -149,7 +149,7 @@ True True True - Light source 4 + Light source 4 IMG_LIGHT_4 @@ -165,7 +165,7 @@ True True True - Light source 5 + Light source 5 IMG_LIGHT_5 @@ -181,7 +181,7 @@ True True True - Light source 6 + Light source 6 IMG_LIGHT_6 @@ -197,7 +197,7 @@ True True True - Light source 7 + Light source 7 IMG_LIGHT_7 @@ -213,7 +213,7 @@ True True True - Light source 8 + Light source 8 IMG_LIGHT_8 @@ -252,7 +252,7 @@ True True True - Select a color using the color dialog + Select a color using the color dialog IMG_LIGHTSOURCE_COLOR @@ -277,7 +277,7 @@ True False 0 - _Light source + _Light source True BTN_LIGHT_1 @@ -326,7 +326,7 @@ True True True - Select a color using the color dialog + Select a color using the color dialog IMG_AMBIENT_COLOR @@ -344,7 +344,7 @@ True False 0 - _Ambient light + _Ambient light True LB_AMBIENTLIGHT @@ -370,7 +370,7 @@ True False - Light Preview + Light Preview True True diff --git a/chart2/uiconfig/ui/tp_AxisPositions.ui b/chart2/uiconfig/ui/tp_AxisPositions.ui index 9d502484034a..43c48e0aa1e2 100644 --- a/chart2/uiconfig/ui/tp_AxisPositions.ui +++ b/chart2/uiconfig/ui/tp_AxisPositions.ui @@ -1,5 +1,5 @@ - + @@ -36,7 +36,7 @@ True False 0 - _Cross other axis at + _Cross other axis at True LB_CROSSES_OTHER_AXIS_AT @@ -54,10 +54,10 @@ 0 1 - Start - End - Value - Category + Start + End + Value + Category @@ -104,7 +104,7 @@ - Axis _between categories + Axis _between categories False False True @@ -126,7 +126,7 @@ True False 0 - Axis Line + Axis Line @@ -167,7 +167,7 @@ True False 0 - _Place labels + _Place labels True LB_PLACE_LABELS @@ -184,10 +184,10 @@ 0 1 - Near axis - Near axis (other side) - Outside start - Outside end + Near axis + Near axis (other side) + Outside start + Outside end @@ -212,7 +212,7 @@ False 0 - _Distance + _Distance True EDT_AXIS_LABEL_DISTANCE @@ -249,7 +249,7 @@ True False 0 - Labels + Labels @@ -291,7 +291,7 @@ True False 0 - Major: + Major: @@ -309,7 +309,7 @@ True False 0 - Minor: + Minor: @@ -324,7 +324,7 @@ - _Inner + _Inner True False False @@ -344,7 +344,7 @@ - _Outer + _Outer True False False @@ -364,7 +364,7 @@ - I_nner + I_nner True False False @@ -384,7 +384,7 @@ - O_uter + O_uter True False False @@ -419,7 +419,7 @@ True False 0 - Place _marks + Place _marks True LB_PLACE_TICKS @@ -436,9 +436,9 @@ 0 1 - At labels - At axis - At axis and labels + At labels + At axis + At axis and labels @@ -463,7 +463,7 @@ True False 0 - Interval Marks + Interval Marks @@ -495,7 +495,7 @@ 6 - Show major _grid + Show major _grid True False False @@ -513,7 +513,7 @@ - _Show minor grid + _Show minor grid True False False @@ -530,7 +530,7 @@ - Mo_re... + Mo_re... True False True @@ -545,7 +545,7 @@ - Mor_e... + Mor_e... True False True @@ -568,7 +568,7 @@ True False 0 - Grids + Grids diff --git a/chart2/uiconfig/ui/tp_ChartType.ui b/chart2/uiconfig/ui/tp_ChartType.ui index 242cd629a693..72a50e8f5d08 100644 --- a/chart2/uiconfig/ui/tp_ChartType.ui +++ b/chart2/uiconfig/ui/tp_ChartType.ui @@ -1,6 +1,6 @@ - + @@ -17,16 +17,16 @@ - Bar + Bar - Cylinder + Cylinder - Cone + Cone - Pyramid + Pyramid @@ -50,7 +50,7 @@ False False 0 - Choose a Chart Type + Choose a Chart Type @@ -99,7 +99,7 @@ 12 - _3D Look + _3D Look False True False @@ -122,8 +122,8 @@ False False - Simple - Realistic + Simple + Realistic @@ -149,7 +149,7 @@ True False 0 - Sh_ape + Sh_ape True shape:border 0.02 @@ -192,7 +192,7 @@ 6 - _Stack series + _Stack series False True False @@ -219,7 +219,7 @@ 6 - On top + On top False True False @@ -238,7 +238,7 @@ - Percent + Percent False True False @@ -256,7 +256,7 @@ - Deep + Deep False True False @@ -292,7 +292,7 @@ False False 0 - _Line type + _Line type True linetype end @@ -309,9 +309,9 @@ False False - Straight - Smooth - Stepped + Straight + Smooth + Stepped @@ -323,7 +323,7 @@ - Properties... + Properties... False True True @@ -346,7 +346,7 @@ - _Sort by X values + _Sort by X values False True False @@ -371,7 +371,7 @@ False True 0 - _Number of lines + _Number of lines True nolines end @@ -418,7 +418,7 @@ False - Rounded edge + Rounded edge False True True diff --git a/chart2/uiconfig/ui/tp_DataLabel.ui b/chart2/uiconfig/ui/tp_DataLabel.ui index 476a2ec3d809..76597cd9acca 100644 --- a/chart2/uiconfig/ui/tp_DataLabel.ui +++ b/chart2/uiconfig/ui/tp_DataLabel.ui @@ -1,6 +1,6 @@ - + @@ -17,55 +17,55 @@ - Best fit + Best fit 0 - Center + Center 1 - Above + Above 2 - Top left + Top left 3 - Left + Left 4 - Bottom left + Bottom left 5 - Below + Below 6 - Bottom right + Bottom right 7 - Right + Right 8 - Top right + Top right 9 - Inside + Inside 10 - Outside + Outside 11 - Near origin + Near origin 12 @@ -79,19 +79,19 @@ - Space + Space 0 - Comma + Comma 1 - Semicolon + Semicolon 2 - New line + New line 3 @@ -123,7 +123,7 @@ True - Show value as _number + Show value as _number True False False @@ -140,7 +140,7 @@ - Show value as _percentage + Show value as _percentage True False False @@ -157,7 +157,7 @@ - Show _category + Show _category True False False @@ -174,7 +174,7 @@ - Show _legend key + Show _legend key True False False @@ -191,7 +191,7 @@ - Auto text _wrap + Auto text _wrap True False False @@ -208,7 +208,7 @@ - Number _format... + Number _format... True False True @@ -224,7 +224,7 @@ - Percentage f_ormat... + Percentage f_ormat... True False True @@ -242,7 +242,7 @@ False True - ABCD + ABCD @@ -264,7 +264,7 @@ True False 0 - _Separator + _Separator True LB_TEXT_SEPARATOR @@ -305,7 +305,7 @@ True False 0 - Place_ment + Place_ment True LB_LABEL_PLACEMENT @@ -339,7 +339,7 @@ False - Number Format for Percentage Value + Number Format for Percentage Value 1 @@ -357,7 +357,7 @@ True False 0 - Text Attributes + Text Attributes @@ -423,7 +423,7 @@ True False - _Degrees + _Degrees True @@ -448,7 +448,7 @@ True False - Te_xt direction + Te_xt direction True LB_LABEL_TEXTDIR @@ -485,7 +485,7 @@ True False 0 - Rotate Text + Rotate Text diff --git a/chart2/uiconfig/ui/tp_DataSource.ui b/chart2/uiconfig/ui/tp_DataSource.ui index 55918aaab42c..71b9bbc39cce 100644 --- a/chart2/uiconfig/ui/tp_DataSource.ui +++ b/chart2/uiconfig/ui/tp_DataSource.ui @@ -1,18 +1,18 @@ - + True False - Select data range + Select data range chart2/res/selectrange.png True False - Select data range + Select data range chart2/res/selectrange.png @@ -25,7 +25,7 @@ True False - Customize Data Ranges for Individual Data Series + Customize Data Ranges for Individual Data Series 0 @@ -55,7 +55,7 @@ True False - Data _series: + Data _series: True LB_SERIES:border 0 @@ -92,7 +92,7 @@ 12 - _Add + _Add False True False @@ -113,7 +113,7 @@ True - Up + Up @@ -124,7 +124,7 @@ - _Remove + _Remove False True False @@ -145,7 +145,7 @@ True - Down + Down @@ -180,7 +180,7 @@ True False - _Data ranges: + _Data ranges: True LB_ROLE:border 0 @@ -211,7 +211,7 @@ True False - Ran_ge for %VALUETYPE + Ran_ge for %VALUETYPE True EDT_RANGE 0 @@ -269,7 +269,7 @@ True False - _Categories + _Categories True EDT_CATEGORIES 0 @@ -284,7 +284,7 @@ True False - Data _labels + Data _labels True 0 diff --git a/chart2/uiconfig/ui/tp_ErrorBars.ui b/chart2/uiconfig/ui/tp_ErrorBars.ui index 9e1d058056ae..075c3719e70b 100644 --- a/chart2/uiconfig/ui/tp_ErrorBars.ui +++ b/chart2/uiconfig/ui/tp_ErrorBars.ui @@ -1,5 +1,5 @@ - + 100 @@ -25,19 +25,19 @@ - Standard Error + Standard Error 0 - Standard Deviation + Standard Deviation 1 - Variance + Variance 2 - Error Margin + Error Margin 3 @@ -74,7 +74,7 @@ 6 - _None + _None True False False @@ -92,7 +92,7 @@ - _Constant Value + _Constant Value True False False @@ -110,7 +110,7 @@ - _Percentage + _Percentage True False False @@ -168,7 +168,7 @@ - Cell _Range + Cell _Range True False False @@ -192,7 +192,7 @@ True False - Error Category + Error Category @@ -225,7 +225,7 @@ 12 - Positive _and Negative + Positive _and Negative True False False @@ -244,7 +244,7 @@ - Pos_itive + Pos_itive True False False @@ -263,7 +263,7 @@ - Ne_gative + Ne_gative True False False @@ -328,7 +328,7 @@ True False 0 - Error Indicator + Error Indicator @@ -375,7 +375,7 @@ True False - P_ositive (+) + P_ositive (+) True MF_POSITIVE:0 @@ -416,7 +416,7 @@ True False True - Select data range + Select data range imageRANGE_SELECT_POSITIVE @@ -441,7 +441,7 @@ True False - _Negative (-) + _Negative (-) True MF_NEGATIVE:0 @@ -482,7 +482,7 @@ True False True - Select data range + Select data range imageRANGE_SELECT_NEG @@ -500,7 +500,7 @@ - Same value for both + Same value for both True False False @@ -522,7 +522,7 @@ True False 0 - Parameters + Parameters @@ -538,7 +538,7 @@ False - Select Range for Positive Error Bars + Select Range for Positive Error Bars False @@ -549,7 +549,7 @@ False - Select Range for Negative Error Bars + Select Range for Negative Error Bars False @@ -560,7 +560,7 @@ False - From Data Table + From Data Table False diff --git a/chart2/uiconfig/ui/tp_LegendPosition.ui b/chart2/uiconfig/ui/tp_LegendPosition.ui index 8d4d72ef3136..18db310c701d 100644 --- a/chart2/uiconfig/ui/tp_LegendPosition.ui +++ b/chart2/uiconfig/ui/tp_LegendPosition.ui @@ -1,5 +1,5 @@ - + @@ -27,7 +27,7 @@ 6 - _Left + _Left True True False @@ -46,7 +46,7 @@ - _Right + _Right True True False @@ -64,7 +64,7 @@ - _Top + _Top True True False @@ -82,7 +82,7 @@ - _Bottom + _Bottom True True False @@ -107,7 +107,7 @@ True False 0 - Position + Position @@ -142,7 +142,7 @@ True False 0 - Te_xt direction + Te_xt direction True @@ -171,7 +171,7 @@ True False 0 - Text Orientation + Text Orientation diff --git a/chart2/uiconfig/ui/tp_PolarOptions.ui b/chart2/uiconfig/ui/tp_PolarOptions.ui index 6f5d8d85ebc9..eb41d2723bf8 100644 --- a/chart2/uiconfig/ui/tp_PolarOptions.ui +++ b/chart2/uiconfig/ui/tp_PolarOptions.ui @@ -1,6 +1,6 @@ - + @@ -28,7 +28,7 @@ 12 - _Clockwise direction + _Clockwise direction True False False @@ -44,7 +44,7 @@ True False 0 - Orientation + Orientation @@ -105,7 +105,7 @@ True False 0 - _Degrees + _Degrees True NF_STARTING_ANGLE @@ -124,7 +124,7 @@ True False 0 - Starting Angle + Starting Angle @@ -151,7 +151,7 @@ 12 - Include _values from hidden cells + Include _values from hidden cells True False False @@ -167,7 +167,7 @@ True False 0 - Plot Options + Plot Options diff --git a/chart2/uiconfig/ui/tp_RangeChooser.ui b/chart2/uiconfig/ui/tp_RangeChooser.ui index ac472b67a8a5..9b2ff0bad36e 100644 --- a/chart2/uiconfig/ui/tp_RangeChooser.ui +++ b/chart2/uiconfig/ui/tp_RangeChooser.ui @@ -1,11 +1,11 @@ - + True False - Select data range + Select data range chart2/res/selectrange.png @@ -25,7 +25,7 @@ True False 0 - Choose a Data Range + Choose a Data Range @@ -47,7 +47,7 @@ True False 0 - _Data range: + _Data range: True ED_RANGE @@ -76,7 +76,7 @@ True False True - Select data range + Select data range imageIB_RANGE @@ -94,7 +94,7 @@ - Data series in _rows + Data series in _rows False True False @@ -113,7 +113,7 @@ - Data series in _columns + Data series in _columns False True False @@ -132,7 +132,7 @@ - _First row as label + _First row as label False True False @@ -149,7 +149,7 @@ - F_irst column as label + F_irst column as label False True False @@ -177,7 +177,7 @@ - Time based charting + Time based charting False True True @@ -232,7 +232,7 @@ True False 4 - Start Table Index + Start Table Index True ED_TIME_BASED_START @@ -248,7 +248,7 @@ True False 8 - End Table Index + End Table Index True ED_TIME_BASED_END @@ -269,7 +269,7 @@ False - Data Range + Data Range False diff --git a/chart2/uiconfig/ui/tp_Scale.ui b/chart2/uiconfig/ui/tp_Scale.ui index 286b6df8b876..8e763accb74d 100644 --- a/chart2/uiconfig/ui/tp_Scale.ui +++ b/chart2/uiconfig/ui/tp_Scale.ui @@ -1,5 +1,5 @@ - + @@ -17,15 +17,15 @@ - Days + Days 0 - Months + Months 1 - Years + Years 2 @@ -56,7 +56,7 @@ 6 - _Reverse direction + _Reverse direction True False False @@ -72,7 +72,7 @@ - _Logarithmic scale + _Logarithmic scale True False False @@ -96,7 +96,7 @@ True False 0 - T_ype + T_ype True LB_AXIS_TYPE @@ -113,9 +113,9 @@ 0 1 - Automatic - Text - Date + Automatic + Text + Date @@ -149,7 +149,7 @@ True False 0 - _Minimum + _Minimum True EDT_MIN @@ -165,7 +165,7 @@ True False 0 - Ma_ximum + Ma_ximum True EDT_MAX @@ -178,7 +178,7 @@ - _Automatic + _Automatic True False False @@ -195,7 +195,7 @@ - A_utomatic + A_utomatic True False False @@ -253,7 +253,7 @@ True False 0 - R_esolution + R_esolution True LB_TIME_RESOLUTION @@ -277,7 +277,7 @@ - Automat_ic + Automat_ic True False False @@ -308,7 +308,7 @@ True False 0 - Ma_jor interval + Ma_jor interval True @@ -380,7 +380,7 @@ - Au_tomatic + Au_tomatic True False False @@ -416,7 +416,7 @@ True False 0 - Minor inter_val + Minor inter_val True @@ -430,7 +430,7 @@ True False 0 - Minor inter_val count + Minor inter_val count True @@ -474,7 +474,7 @@ - Aut_omatic + Aut_omatic True False False @@ -505,7 +505,7 @@ True False 0 - Re_ference value + Re_ference value True @@ -528,7 +528,7 @@ - Automat_ic + Automat_ic True False False @@ -558,7 +558,7 @@ True False 0 - Scale + Scale diff --git a/chart2/uiconfig/ui/tp_SeriesToAxis.ui b/chart2/uiconfig/ui/tp_SeriesToAxis.ui index 4f9738840b74..f922a1a7367f 100644 --- a/chart2/uiconfig/ui/tp_SeriesToAxis.ui +++ b/chart2/uiconfig/ui/tp_SeriesToAxis.ui @@ -1,5 +1,5 @@ - + 600 @@ -38,7 +38,7 @@ 6 - Primary Y axis + Primary Y axis True False False @@ -55,7 +55,7 @@ - Secondary Y axis + Secondary Y axis True False False @@ -79,7 +79,7 @@ True False 0 - Align Data Series to + Align Data Series to @@ -120,7 +120,7 @@ True False - _Spacing + _Spacing True MT_GAP:0% @@ -135,7 +135,7 @@ True False - _Overlap + _Overlap True MT_OVERLAP:0% @@ -183,7 +183,7 @@ - Show _bars side by side + Show _bars side by side True False False @@ -199,7 +199,7 @@ - Connection lines + Connection lines True False False @@ -221,7 +221,7 @@ True False - Settings + Settings @@ -263,7 +263,7 @@ True False 0 - Plot missing values + Plot missing values 0 @@ -274,7 +274,7 @@ - _Leave gap + _Leave gap True False False @@ -293,7 +293,7 @@ - _Assume zero + _Assume zero True False False @@ -312,7 +312,7 @@ - _Continue line + _Continue line True False False @@ -344,7 +344,7 @@ - Include _values from hidden cells + Include _values from hidden cells True False False @@ -367,7 +367,7 @@ True False 0 - Plot Options + Plot Options diff --git a/chart2/uiconfig/ui/tp_Trendline.ui b/chart2/uiconfig/ui/tp_Trendline.ui index fb1904b05c9c..5411a470e35e 100644 --- a/chart2/uiconfig/ui/tp_Trendline.ui +++ b/chart2/uiconfig/ui/tp_Trendline.ui @@ -1,5 +1,5 @@ - + 2 @@ -49,7 +49,7 @@ True - _Linear + _Linear True True False @@ -68,7 +68,7 @@ - L_ogarithmic + L_ogarithmic True True False @@ -87,7 +87,7 @@ - _Exponential + _Exponential True True False @@ -106,7 +106,7 @@ - Po_wer + Po_wer True True False @@ -125,7 +125,7 @@ - _Polynomial + _Polynomial True True False @@ -144,7 +144,7 @@ - _Moving Average + _Moving Average True True False @@ -170,7 +170,7 @@ True False - Degree + Degree 0 @@ -210,7 +210,7 @@ True False - Period + Period 0 @@ -333,7 +333,7 @@ True False - Regression Type + Regression Type @@ -370,7 +370,7 @@ True False 0 - Extrapolate Forward + Extrapolate Forward True extrapolateForward @@ -386,7 +386,7 @@ True False 0 - Extrapolate Backward + Extrapolate Backward True extrapolateBackward @@ -427,7 +427,7 @@ - Force _Intercept + Force _Intercept True True False @@ -444,7 +444,7 @@ - Show E_quation + Show E_quation True True False @@ -461,7 +461,7 @@ - Show _Coefficient of Determination (R²) + Show _Coefficient of Determination (R²) True True False @@ -481,7 +481,7 @@ True False 0 - Trendline _Name + Trendline _Name True entry_name @@ -526,7 +526,7 @@ True False 0 - _X Variable Name + _X Variable Name True entry_Xname @@ -555,7 +555,7 @@ True False 0 - _Y Variable Name + _Y Variable Name True entry_Yname @@ -587,7 +587,7 @@ True False - Options + Options diff --git a/chart2/uiconfig/ui/tp_axisLabel.ui b/chart2/uiconfig/ui/tp_axisLabel.ui index 74d6fa5f315c..e13fff3faa16 100644 --- a/chart2/uiconfig/ui/tp_axisLabel.ui +++ b/chart2/uiconfig/ui/tp_axisLabel.ui @@ -1,6 +1,6 @@ - + @@ -17,7 +17,7 @@ 12 - Sho_w labels + Sho_w labels True True False @@ -60,7 +60,7 @@ 6 - _Tile + _Tile True True False @@ -78,7 +78,7 @@ - St_agger odd + St_agger odd True True False @@ -95,7 +95,7 @@ - Stagger _even + Stagger _even True True False @@ -112,7 +112,7 @@ - A_utomatic + A_utomatic True True False @@ -135,7 +135,7 @@ True False - Order + Order @@ -170,7 +170,7 @@ 6 - O_verlap + O_verlap True True False @@ -186,7 +186,7 @@ - _Break + _Break True True False @@ -208,7 +208,7 @@ True False - Text Flow + Text Flow @@ -277,7 +277,7 @@ True False 40 - _Degrees + _Degrees True @@ -330,7 +330,7 @@ 12 - Ve_rtically stacked + Ve_rtically stacked True True False @@ -349,7 +349,7 @@ False - ABCD + ABCD 0 @@ -370,7 +370,7 @@ True False - Te_xt direction: + Te_xt direction: True @@ -400,7 +400,7 @@ True False - Text Orientation + Text Orientation diff --git a/chart2/uiconfig/ui/wizelementspage.ui b/chart2/uiconfig/ui/wizelementspage.ui index 05450cbf439d..9fb6651f87f0 100644 --- a/chart2/uiconfig/ui/wizelementspage.ui +++ b/chart2/uiconfig/ui/wizelementspage.ui @@ -1,5 +1,5 @@ - + True @@ -36,7 +36,7 @@ True False 0 - _X axis + _X axis True primaryXaxis @@ -52,7 +52,7 @@ True False 0 - _Y axis + _Y axis True primaryYaxis @@ -68,7 +68,7 @@ True False 0 - _Z axis + _Z axis True primaryZaxis @@ -129,7 +129,7 @@ True False 0 - _Title + _Title True maintitle @@ -145,7 +145,7 @@ True False 0 - _Subtitle + _Subtitle True subtitle @@ -191,7 +191,7 @@ False True 0 - X _axis + X _axis True secondaryXaxis @@ -207,7 +207,7 @@ False True 0 - Y ax_is + Y ax_is True secondaryYaxis @@ -263,7 +263,7 @@ 6 - _Display legend + _Display legend True True False @@ -290,7 +290,7 @@ 6 - _Left + _Left True True False @@ -308,7 +308,7 @@ - _Right + _Right True True False @@ -326,7 +326,7 @@ - _Top + _Top True True False @@ -344,7 +344,7 @@ - _Bottom + _Bottom True True False @@ -386,7 +386,7 @@ True False - Choose Titles, Legend, and Grid Settings + Choose Titles, Legend, and Grid Settings @@ -419,7 +419,7 @@ 12 - X axis + X axis True True False @@ -436,7 +436,7 @@ - Y ax_is + Y ax_is True True False @@ -453,7 +453,7 @@ - Z axi_s + Z axi_s True True False @@ -476,7 +476,7 @@ True False - Display Grids + Display Grids diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk index ec5ac9d3240c..6f8b9d07a83a 100644 --- a/comphelper/Library_comphelper.mk +++ b/comphelper/Library_comphelper.mk @@ -116,7 +116,6 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\ comphelper/source/misc/namedvaluecollection \ comphelper/source/misc/numberedcollection \ comphelper/source/misc/numbers \ - comphelper/source/misc/officeresourcebundle \ comphelper/source/misc/officerestartmanager \ comphelper/source/misc/profilezone \ comphelper/source/misc/proxyaggregation \ diff --git a/comphelper/source/misc/officeresourcebundle.cxx b/comphelper/source/misc/officeresourcebundle.cxx deleted file mode 100644 index 1e7b54433dee..000000000000 --- a/comphelper/source/misc/officeresourcebundle.cxx +++ /dev/null @@ -1,208 +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 - -#include -#include -#include -#include -#include -#include - - -namespace comphelper -{ - - - using ::com::sun::star::uno::Reference; - using com::sun::star::resource::XResourceBundle; - using com::sun::star::resource::XResourceBundleLoader; - using com::sun::star::resource::MissingResourceException; - using ::com::sun::star::uno::XComponentContext; - using ::com::sun::star::uno::Exception; - using ::com::sun::star::uno::Any; - - class ResourceBundle_Impl - { - private: - Reference< XComponentContext > m_xContext; - OUString m_sBaseName; - Reference< XResourceBundle > m_xBundle; - bool m_bAttemptedCreate; - mutable ::osl::Mutex m_aMutex; - - public: - ResourceBundle_Impl( const Reference< XComponentContext >& _context, const OUString& _baseName ) - :m_xContext( _context ) - ,m_sBaseName( _baseName ) - ,m_bAttemptedCreate( false ) - { - } - - public: - /** loads the string with the given resource id from the resource bundle - @param _resourceId - the id of the string to load - @return - the requested resource string. If no string with the given id exists in the resource bundle, - an empty string is returned. In a non-product version, an OSL_ENSURE will notify you of this - then. - */ - OUString loadString( sal_Int32 _resourceId ) const; - - /** determines whether the resource bundle has a string with the given id - @param _resourceId - the id of the string whose existence is to be checked - @return - if and only if a string with the given ID exists in the resource - bundle. - */ - bool hasString( sal_Int32 _resourceId ) const; - - private: - /** loads the bundle represented by the instance - - The method is safe against multiple calls: If a previous call succeeded or failed, the - previous result will be returned, without any other processing. - - @precond - Our mutex is locked. - */ - bool impl_loadBundle_nothrow(); - - /** returns the resource bundle key for a string with a given resource id - */ - static OUString - impl_getStringResourceKey( sal_Int32 _resourceId ); - }; - - - OUString ResourceBundle_Impl::impl_getStringResourceKey( sal_Int32 _resourceId ) - { - OUStringBuffer key; - key.append( "string:" ); - key.append( _resourceId ); - return key.makeStringAndClear(); - } - - - OUString ResourceBundle_Impl::loadString( sal_Int32 _resourceId ) const - { - ::osl::MutexGuard aGuard( m_aMutex ); - - OUString sString; - - if ( const_cast< ResourceBundle_Impl* >( this )->impl_loadBundle_nothrow() ) - { - try - { - OSL_VERIFY( m_xBundle->getByName( impl_getStringResourceKey( _resourceId ) ) >>= sString ); - } - catch( const Exception& ) - { - OSL_FAIL( "ResourceBundle_Impl::loadString: caught an exception!" ); - } - } - return sString; - } - - - bool ResourceBundle_Impl::hasString( sal_Int32 _resourceId ) const - { - ::osl::MutexGuard aGuard( m_aMutex ); - - bool has = false; - - if ( const_cast< ResourceBundle_Impl* >( this )->impl_loadBundle_nothrow() ) - { - try - { - has = m_xBundle->hasByName( impl_getStringResourceKey( _resourceId ) ); - } - catch( const Exception& ) - { - OSL_FAIL( "ResourceBundle_Impl::hasString: caught an exception!" ); - } - } - return has; - } - - - bool ResourceBundle_Impl::impl_loadBundle_nothrow() - { - if ( m_bAttemptedCreate ) - return m_xBundle.is(); - - m_bAttemptedCreate = true; - - Reference< XResourceBundleLoader > xLoader; - try - { - Any aValue( m_xContext->getValueByName( "/singletons/com.sun.star.resource.OfficeResourceLoader" ) ); - OSL_VERIFY( aValue >>= xLoader ); - } - catch( const Exception& ) - { - OSL_FAIL( "ResourceBundle_Impl::impl_loadBundle_nopthrow: could not create the resource loader!" ); - } - - if ( !xLoader.is() ) - return false; - - try - { - m_xBundle = xLoader->loadBundle_Default( m_sBaseName ); - } - catch( const MissingResourceException& ) - { - OSL_FAIL( "ResourceBundle_Impl::impl_loadBundle_nopthrow: missing the given resource bundle!" ); - } - - return m_xBundle.is(); - } - - - OfficeResourceBundle::OfficeResourceBundle( const Reference< XComponentContext >& _context, const sal_Char* _bundleBaseAsciiName ) - :m_pImpl( new ResourceBundle_Impl( _context, OUString::createFromAscii( _bundleBaseAsciiName ) ) ) - { - } - - - OfficeResourceBundle::~OfficeResourceBundle() - { - } - - - OUString OfficeResourceBundle::loadString( sal_Int32 _resourceId ) const - { - return m_pImpl->loadString( _resourceId ); - } - - - bool OfficeResourceBundle::hasString( sal_Int32 _resourceId ) const - { - return m_pImpl->hasString( _resourceId ); - } - - -} // namespace comphelper - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/compilerplugins/clang/constantparam.booleans.results b/compilerplugins/clang/constantparam.booleans.results index 86ec39a2fca1..1a2dd6fc110f 100644 --- a/compilerplugins/clang/constantparam.booleans.results +++ b/compilerplugins/clang/constantparam.booleans.results @@ -1074,10 +1074,6 @@ include/tools/datetime.hxx:43 void DateTime::DateTime(enum DateTime::DateTimeInitSystem) enum DateTime::DateTimeInitSystem 0 -include/tools/resid.hxx:54 - void ResId::ImplInit(unsigned int,class ResMgr &,struct RSHEADER_TYPE *) - struct RSHEADER_TYPE * pRes - 0 include/tools/stream.hxx:583 _Bool SvFileStream::LockRange(unsigned long,unsigned long) unsigned long nBytes diff --git a/compilerplugins/clang/unusedenumconstants.py b/compilerplugins/clang/unusedenumconstants.py index 033a9e7320ff..184a3fc0d57b 100755 --- a/compilerplugins/clang/unusedenumconstants.py +++ b/compilerplugins/clang/unusedenumconstants.py @@ -136,7 +136,6 @@ def is_ignore(srcLoc): "include/svtools/htmltokn.h", "include/sfx2/sidebar/Theme.hxx", # ThemeItem "sc/source/ui/docshell/impex.cxx", # SylkVersion - "include/rsc/rsc-vcl-shared-types.hxx", # KeyFuncType "include/i18nutil/paper.hxx", # Paper "cppcanvas/source/mtfrenderer/emfplus.cxx", # EmfPlusCombineMode "cppcanvas/source/mtfrenderer/emfpbrush.hxx", # EmfPlusHatchStyle diff --git a/config_host.mk.in b/config_host.mk.in index 2643035f7886..674db3cd98aa 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -380,6 +380,8 @@ export MINGWSTRIP=@MINGWSTRIP@ export ML_EXE=@ML_EXE@ export MOC4=@MOC4@ export MPL_SUBSET=@MPL_SUBSET@ +export MSGFMT=@MSGFMT@ +export MSGUNIQ=@MSGUNIQ@ export MSM_PATH=@MSM_PATH@ export MSPUB_CFLAGS=$(gb_SPACE)@MSPUB_CFLAGS@ export MSPUB_LIBS=$(gb_SPACE)@MSPUB_LIBS@ diff --git a/configure.ac b/configure.ac index 119cdea487ae..d0e4c9b80d29 100644 --- a/configure.ac +++ b/configure.ac @@ -11589,7 +11589,20 @@ if test -z "$WITH_LANG" -o "$WITH_LANG" = "en-US"; then else AC_MSG_RESULT([$WITH_LANG]) GIT_NEEDED_SUBMODULES="translations $GIT_NEEDED_SUBMODULES" + if test -n "$LODE_HOME" -a -x "$LODE_HOME/opt/bin/msgfmt" ; then + MSGFMT="$LODE_HOME/opt/bin/msgfmt" + MSGUNIQ="$LODE_HOME/opt/bin/msguniq" + elif test -x "/opt/lo/bin/msgfmt"; then + MSGFMT="/opt/lo/bin/msgfmt" + MSGUNIQ="/opt/lo/bin/msguniq" + fi + if test -z "$MSGFMT"; then + AC_CHECK_PROGS(MSGFMT, [msgfmt]) + AC_CHECK_PROGS(MSGUNIQ, [msguniq]) + fi fi +AC_SUBST(MSGFMT) +AC_SUBST(MSGUNIQ) # check that the list is valid for lang in $WITH_LANG; do test "$lang" = "ALL" && continue diff --git a/connectivity/AllLangResTarget_sdberr.mk b/connectivity/AllLangMoTarget_cnr.mk similarity index 54% rename from connectivity/AllLangResTarget_sdberr.mk rename to connectivity/AllLangMoTarget_cnr.mk index fffbdc88a935..a960ce0b9bb1 100644 --- a/connectivity/AllLangResTarget_sdberr.mk +++ b/connectivity/AllLangMoTarget_cnr.mk @@ -5,18 +5,9 @@ # 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/. -# -$(eval $(call gb_AllLangResTarget_AllLangResTarget,sdberr)) +$(eval $(call gb_AllLangMoTarget_AllLangMoTarget,cnr)) -$(eval $(call gb_AllLangResTarget_add_srs,sdberr,\ - sdberr/res \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,sdberr/res)) - -$(eval $(call gb_SrsTarget_add_files,sdberr/res,\ - connectivity/source/resource/conn_error_message.src \ -)) +$(eval $(call gb_AllLangMoTarget_set_polocation,cnr,connectivity)) # vim: set noet sw=4 ts=4: diff --git a/connectivity/AllLangResTarget_cnr.mk b/connectivity/AllLangResTarget_cnr.mk deleted file mode 100644 index df94ae27b13d..000000000000 --- a/connectivity/AllLangResTarget_cnr.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# -# 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/. -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,cnr)) - -$(eval $(call gb_AllLangResTarget_add_srs,cnr,\ - cnr/res \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,cnr/res)) - -$(eval $(call gb_SrsTarget_set_include,cnr/res,\ - $$(INCLUDE) \ - -I$(SRCDIR)/connectivity/source/inc \ -)) - -$(eval $(call gb_SrsTarget_add_files,cnr/res,\ - connectivity/source/resource/conn_shared_res.src \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/connectivity/CppunitTest_connectivity_ado.mk b/connectivity/CppunitTest_connectivity_ado.mk index fcdaf2da8ebb..3dd95356195d 100644 --- a/connectivity/CppunitTest_connectivity_ado.mk +++ b/connectivity/CppunitTest_connectivity_ado.mk @@ -10,6 +10,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,connectivity_ado)) $(eval $(call gb_CppunitTest_set_include,connectivity_ado,\ + -I$(SRCDIR)/connectivity/inc \ -I$(SRCDIR)/connectivity/source/inc \ -I$(SRCDIR)/connectivity/source/drivers/ado \ $$(INCLUDE) \ diff --git a/connectivity/CppunitTest_connectivity_commontools.mk b/connectivity/CppunitTest_connectivity_commontools.mk index d197c94b237c..80e5d1ce5277 100644 --- a/connectivity/CppunitTest_connectivity_commontools.mk +++ b/connectivity/CppunitTest_connectivity_commontools.mk @@ -59,6 +59,7 @@ $(eval $(call gb_CppunitTest_use_libraries,connectivity_commontools, \ utl \ tl \ svt \ + vcl \ )) $(eval $(call gb_CppunitTest_use_components,connectivity_commontools,\ diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk index 4289a7fe6dc3..10d1d4f5f38c 100644 --- a/connectivity/Library_ado.mk +++ b/connectivity/Library_ado.mk @@ -13,6 +13,7 @@ $(eval $(call gb_Library_Library,ado)) $(eval $(call gb_Library_set_componentfile,ado,connectivity/source/drivers/ado/ado)) $(eval $(call gb_Library_set_include,ado,\ + -I$(SRCDIR)/connectivity/inc \ -I$(SRCDIR)/connectivity/source/inc \ $$(INCLUDE) \ -I$(WORKDIR)/YaccTarget/connectivity/source/parse \ diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk index eb6dda8cb157..3136a22c908b 100644 --- a/connectivity/Library_dbtools.mk +++ b/connectivity/Library_dbtools.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,dbtools,\ comphelper \ i18nlangtag \ svt \ + vcl \ )) ifeq ($(filter-out NETBSD MACOSX,$(OS)),) diff --git a/connectivity/Library_evoab.mk b/connectivity/Library_evoab.mk index 504eee47f45a..ee325f4464c6 100644 --- a/connectivity/Library_evoab.mk +++ b/connectivity/Library_evoab.mk @@ -11,6 +11,7 @@ $(eval $(call gb_Library_Library,evoab)) $(eval $(call gb_Library_set_include,evoab,\ + -I$(SRCDIR)/connectivity/inc \ -I$(SRCDIR)/connectivity/source/inc \ $$(INCLUDE) \ -I$(WORKDIR)/YaccTarget/connectivity/source/parse \ diff --git a/connectivity/Library_firebird_sdbc.mk b/connectivity/Library_firebird_sdbc.mk index 3f3ddc7fce10..aa79db0693fe 100644 --- a/connectivity/Library_firebird_sdbc.mk +++ b/connectivity/Library_firebird_sdbc.mk @@ -17,6 +17,7 @@ $(eval $(call gb_Library_use_externals,firebird_sdbc,\ )) $(eval $(call gb_Library_set_include,firebird_sdbc,\ + -I$(SRCDIR)/connectivity/inc \ -I$(SRCDIR)/connectivity/source/inc \ $$(INCLUDE) \ -I$(WORKDIR)/YaccTarget/connectivity/source/parse \ diff --git a/connectivity/Library_mork.mk b/connectivity/Library_mork.mk index 227d8438c43c..7c0a89b56a2c 100644 --- a/connectivity/Library_mork.mk +++ b/connectivity/Library_mork.mk @@ -16,6 +16,7 @@ $(eval $(call gb_Library_add_defs,mork,\ )) $(eval $(call gb_Library_set_include,mork,\ + -I$(SRCDIR)/connectivity/inc \ -I$(SRCDIR)/connectivity/source/inc \ $$(INCLUDE) \ -I$(WORKDIR)/YaccTarget/connectivity/source/parse \ diff --git a/connectivity/Library_mysql.mk b/connectivity/Library_mysql.mk index 4cb33107ce3b..ac3c0c2619e8 100644 --- a/connectivity/Library_mysql.mk +++ b/connectivity/Library_mysql.mk @@ -18,6 +18,7 @@ $(eval $(call gb_Library_use_sdk_api,mysql)) $(eval $(call gb_Library_set_include,mysql,\ $$(INCLUDE) \ + -I$(SRCDIR)/connectivity/inc \ -I$(SRCDIR)/connectivity/source/inc \ )) diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index 067d883a232b..3ba7ecf01d41 100644 --- a/connectivity/Module_connectivity.mk +++ b/connectivity/Module_connectivity.mk @@ -35,8 +35,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\ )) $(eval $(call gb_Module_add_l10n_targets,connectivity,\ - AllLangResTarget_cnr \ - AllLangResTarget_sdberr \ + AllLangMoTarget_cnr \ )) ifneq ($(ENABLE_JAVA),) diff --git a/connectivity/inc/pch/precompiled_dbtools.hxx b/connectivity/inc/pch/precompiled_dbtools.hxx index 2df126b08063..a4999e5f5083 100644 --- a/connectivity/inc/pch/precompiled_dbtools.hxx +++ b/connectivity/inc/pch/precompiled_dbtools.hxx @@ -132,7 +132,6 @@ #include #include #include -#include #include #include #include diff --git a/connectivity/inc/strings.hrc b/connectivity/inc/strings.hrc new file mode 100644 index 000000000000..dc769e1e3ee9 --- /dev/null +++ b/connectivity/inc/strings.hrc @@ -0,0 +1,148 @@ +/* -*- 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 CONNECTIVITY_STRINGS_HRC +#define CONNECTIVITY_STRINGS_HRC + +#define NC_(Context, String) (Context "\004" u8##String) + +// = the mozab driver's resource strings +#define STR_ERR_EXECUTING_QUERY NC_("STR_ERR_EXECUTING_QUERY", "An error occurred while executing the query.") +#define STR_QUERY_AT_LEAST_ONE_TABLES NC_("STR_QUERY_AT_LEAST_ONE_TABLES", "The query can not be executed. It needs at least one table.") +#define STR_NO_COUNT_SUPPORT NC_("STR_NO_COUNT_SUPPORT", "The driver does not support the 'COUNT' function.") +#define STR_STMT_TYPE_NOT_SUPPORTED NC_("STR_STMT_TYPE_NOT_SUPPORTED", "This statement type not supported by this database driver.") +#define STR_UNSPECIFIED_ERROR NC_("STR_UNSPECIFIED_ERROR", "An unknown error occurred.") +#define STR_ERROR_REFRESH_ROW NC_("STR_ERROR_REFRESH_ROW", "An error occurred while refreshing the current row.") +#define STR_ERROR_GET_ROW NC_("STR_ERROR_GET_ROW", "An error occurred while getting the current row.") +#define STR_QUERY_INVALID_IS_NULL_COLUMN NC_("STR_QUERY_INVALID_IS_NULL_COLUMN", "The query can not be executed. The 'IS NULL' can only be used with a column name.") +#define STR_ILLEGAL_MOVEMENT NC_("STR_ILLEGAL_MOVEMENT", "Illegal cursor movement occurred.") +#define STR_COMMIT_ROW NC_("STR_COMMIT_ROW", "Please commit row '$position$' before update rows or insert new rows.") +// = common strings +#define STR_NO_CONNECTION_GIVEN NC_("STR_NO_CONNECTION_GIVEN", "It doesn't exist a connection to the database.") +#define STR_WRONG_PARAM_INDEX NC_("STR_WRONG_PARAM_INDEX", "You tried to set a parameter at position '$pos$' but there is/are only '$count$' parameter(s) allowed. One reason may be that the property \"ParameterNameSubstitution\" is not set to TRUE in the data source.") +#define STR_NO_INPUTSTREAM NC_("STR_NO_INPUTSTREAM", "The input stream was not set.") +#define STR_NO_ELEMENT_NAME NC_("STR_NO_ELEMENT_NAME", "There is no element named '$name$'.") +#define STR_INVALID_BOOKMARK NC_("STR_INVALID_BOOKMARK", "Invalid bookmark value") +#define STR_PRIVILEGE_NOT_GRANTED NC_("STR_PRIVILEGE_NOT_GRANTED", "Privilege not granted: Only table privileges can be granted.") +#define STR_PRIVILEGE_NOT_REVOKED NC_("STR_PRIVILEGE_NOT_REVOKED", "Privilege not revoked: Only table privileges can be revoked.") +#define STR_ERRORMSG_SEQUENCE NC_("STR_ERRORMSG_SEQUENCE", "Function sequence error.") +#define STR_INVALID_INDEX NC_("STR_INVALID_INDEX", "Invalid descriptor index.") +#define STR_UNSUPPORTED_FUNCTION NC_("STR_UNSUPPORTED_FUNCTION", "The driver does not support the function '$functionname$'.") +#define STR_UNSUPPORTED_FEATURE NC_("STR_UNSUPPORTED_FEATURE", "The driver does not support the functionality for '$featurename$'. It is not implemented.") +#define STR_FORMULA_WRONG NC_("STR_FORMULA_WRONG", "The formula for TypeInfoSettings is wrong!") +#define STR_STRING_LENGTH_EXCEEDED NC_("STR_STRING_LENGTH_EXCEEDED", "The string '$string$' exceeds the maximum length of $maxlen$ characters when converted to the target character set '$charset$'.") +#define STR_CANNOT_CONVERT_STRING NC_("STR_CANNOT_CONVERT_STRING", "The string '$string$' cannot be converted using the encoding '$charset$'.") +#define STR_URI_SYNTAX_ERROR NC_("STR_URI_SYNTAX_ERROR", "The connection URL is invalid.") +#define STR_QUERY_TOO_COMPLEX NC_("STR_QUERY_TOO_COMPLEX", "The query can not be executed. It is too complex.") +#define STR_OPERATOR_TOO_COMPLEX NC_("STR_OPERATOR_TOO_COMPLEX", "The query can not be executed. The operator is too complex.") +#define STR_QUERY_INVALID_LIKE_COLUMN NC_("STR_QUERY_INVALID_LIKE_COLUMN", "The query can not be executed. You cannot use 'LIKE' with columns of this type.") +#define STR_QUERY_INVALID_LIKE_STRING NC_("STR_QUERY_INVALID_LIKE_STRING", "The query can not be executed. 'LIKE' can be used with a string argument only.") +#define STR_QUERY_NOT_LIKE_TOO_COMPLEX NC_("STR_QUERY_NOT_LIKE_TOO_COMPLEX", "The query can not be executed. The 'NOT LIKE' condition is too complex.") +#define STR_QUERY_LIKE_WILDCARD NC_("STR_QUERY_LIKE_WILDCARD", "The query can not be executed. The 'LIKE' condition contains wildcard in the middle.") +#define STR_QUERY_LIKE_WILDCARD_MANY NC_("STR_QUERY_LIKE_WILDCARD_MANY", "The query can not be executed. The 'LIKE' condition contains too many wildcards.") +#define STR_INVALID_COLUMNNAME NC_("STR_INVALID_COLUMNNAME", "The column name '$columnname$' is not valid.") +#define STR_INVALID_COLUMN_SELECTION NC_("STR_INVALID_COLUMN_SELECTION", "The statement contains an invalid selection of columns.") +#define STR_COLUMN_NOT_UPDATEABLE NC_("STR_COLUMN_NOT_UPDATEABLE", "The column at position '$position$' could not be updated.") +#define STR_COULD_NOT_LOAD_FILE NC_("STR_COULD_NOT_LOAD_FILE", "The file $filename$ could not be loaded.") +#define STR_LOAD_FILE_ERROR_MESSAGE NC_("STR_LOAD_FILE_ERROR_MESSAGE", "The attempt to load the file resulted in the following error message ($exception_type$):\n\n$error_message$") +// = the ado driver's resource strings +#define STR_TYPE_NOT_CONVERT NC_("STR_TYPE_NOT_CONVERT", "The type could not be converted.") +#define STR_INVALID_COLUMN_DESCRIPTOR_ERROR NC_("STR_INVALID_COLUMN_DESCRIPTOR_ERROR", "Could not append column: invalid column descriptor.") +#define STR_INVALID_GROUP_DESCRIPTOR_ERROR NC_("STR_INVALID_GROUP_DESCRIPTOR_ERROR", "Could not create group: invalid object descriptor.") +#define STR_INVALID_INDEX_DESCRIPTOR_ERROR NC_("STR_INVALID_INDEX_DESCRIPTOR_ERROR", "Could not create index: invalid object descriptor.") +#define STR_INVALID_KEY_DESCRIPTOR_ERROR NC_("STR_INVALID_KEY_DESCRIPTOR_ERROR", "Could not create key: invalid object descriptor.") +#define STR_INVALID_TABLE_DESCRIPTOR_ERROR NC_("STR_INVALID_TABLE_DESCRIPTOR_ERROR", "Could not create table: invalid object descriptor.") +#define STR_INVALID_USER_DESCRIPTOR_ERROR NC_("STR_INVALID_USER_DESCRIPTOR_ERROR", "Could not create user: invalid object descriptor.") +#define STR_INVALID_VIEW_DESCRIPTOR_ERROR NC_("STR_INVALID_VIEW_DESCRIPTOR_ERROR", "Could not create view: invalid object descriptor.") +#define STR_VIEW_NO_COMMAND_ERROR NC_("STR_VIEW_NO_COMMAND_ERROR", "Could not create view: no command object.") +#define STR_NO_CONNECTION NC_("STR_NO_CONNECTION", "The connection could not be created. May be the necessary data provider is not installed.") +// dbase +#define STR_COULD_NOT_DELETE_INDEX NC_("STR_COULD_NOT_DELETE_INDEX", "The index could not be deleted. An unknown error while accessing the file system occurred.") +#define STR_ONL_ONE_COLUMN_PER_INDEX NC_("STR_ONL_ONE_COLUMN_PER_INDEX", "The index could not be created. Only one column per index is allowed.") +#define STR_COULD_NOT_CREATE_INDEX_NOT_UNIQUE NC_("STR_COULD_NOT_CREATE_INDEX_NOT_UNIQUE", "The index could not be created. The values are not unique.") +#define STR_COULD_NOT_CREATE_INDEX NC_("STR_COULD_NOT_CREATE_INDEX", "The index could not be created. An unknown error appeared.") +#define STR_COULD_NOT_CREATE_INDEX_NAME NC_("STR_COULD_NOT_CREATE_INDEX_NAME", "The index could not be created. The file '$filename$' is used by an other index.") +#define STR_COULD_NOT_CREATE_INDEX_KEYSIZE NC_("STR_COULD_NOT_CREATE_INDEX_KEYSIZE", "The index could not be created. The size of the chosen column is too big.") +#define STR_SQL_NAME_ERROR NC_("STR_SQL_NAME_ERROR", "The name '$name$' doesn't match SQL naming constraints.") +#define STR_COULD_NOT_DELETE_FILE NC_("STR_COULD_NOT_DELETE_FILE", "The file $filename$ could not be deleted.") +#define STR_INVALID_COLUMN_TYPE NC_("STR_INVALID_COLUMN_TYPE", "Invalid column type for column '$columnname$'.") +#define STR_INVALID_COLUMN_PRECISION NC_("STR_INVALID_COLUMN_PRECISION", "Invalid precision for column '$columnname$'.") +#define STR_INVALID_PRECISION_SCALE NC_("STR_INVALID_PRECISION_SCALE", "Precision is less than scale for column '$columnname$'.") +#define STR_INVALID_COLUMN_NAME_LENGTH NC_("STR_INVALID_COLUMN_NAME_LENGTH", "Invalid column name length for column '$columnname$'.") +#define STR_DUPLICATE_VALUE_IN_COLUMN NC_("STR_DUPLICATE_VALUE_IN_COLUMN", "Duplicate value found in column '$columnname$'.") +#define STR_INVALID_COLUMN_DECIMAL_VALUE NC_("STR_INVALID_COLUMN_DECIMAL_VALUE", "The '$columnname$' column has been defined as a \"Decimal\" type, the max. length is $precision$ characters (with $scale$ decimal places).\n\nThe specified value \"$value$ is longer than the number of digits allowed.") +#define STR_COLUMN_NOT_ALTERABLE NC_("STR_COLUMN_NOT_ALTERABLE", "The column '$columnname$' could not be altered. May be the file system is write protected.") +#define STR_INVALID_COLUMN_VALUE NC_("STR_INVALID_COLUMN_VALUE", "The column '$columnname$' could not be updated. The value is invalid for that column.") +#define STR_COLUMN_NOT_ADDABLE NC_("STR_COLUMN_NOT_ADDABLE", "The column '$columnname$' could not be added. May be the file system is write protected.") +#define STR_COLUMN_NOT_DROP NC_("STR_COLUMN_NOT_DROP", "The column at position '$position$' could not be dropped. May be the file system is write protected.") +#define STR_TABLE_NOT_DROP NC_("STR_TABLE_NOT_DROP", "The table '$tablename$' could not be dropped. May be the file system is write protected.") +#define STR_COULD_NOT_ALTER_TABLE NC_("STR_COULD_NOT_ALTER_TABLE", "The table could not be altered.") +#define STR_INVALID_DBASE_FILE NC_("STR_INVALID_DBASE_FILE", "The file '$filename$' is an invalid (or unrecognized) dBase file.") +// Evoab2 +#define STR_CANNOT_OPEN_BOOK NC_("STR_CANNOT_OPEN_BOOK", "Cannot open Evolution address book.") +#define STR_SORT_BY_COL_ONLY NC_("STR_SORT_BY_COL_ONLY", "Can only sort by table columns.") +// File +#define STR_QUERY_COMPLEX_COUNT NC_("STR_QUERY_COMPLEX_COUNT", "The query can not be executed. It is too complex. Only \"COUNT(*)\" is supported.") +#define STR_QUERY_INVALID_BETWEEN NC_("STR_QUERY_INVALID_BETWEEN", "The query can not be executed. The 'BETWEEN' arguments are not correct.") +#define STR_QUERY_FUNCTION_NOT_SUPPORTED NC_("STR_QUERY_FUNCTION_NOT_SUPPORTED", "The query can not be executed. The function is not supported.") +#define STR_TABLE_READONLY NC_("STR_TABLE_READONLY", "The table can not be changed. It is read only.") +#define STR_DELETE_ROW NC_("STR_DELETE_ROW", "The row could not be deleted. The option \"Display inactive records\" is set.") +#define STR_ROW_ALREADY_DELETED NC_("STR_ROW_ALREADY_DELETED", "The row could not be deleted. It is already deleted.") +#define STR_QUERY_MORE_TABLES NC_("STR_QUERY_MORE_TABLES", "The query can not be executed. It contains more than one table.") +#define STR_QUERY_NO_TABLE NC_("STR_QUERY_NO_TABLE", "The query can not be executed. It contains no valid table.") +#define STR_QUERY_NO_COLUMN NC_("STR_QUERY_NO_COLUMN", "The query can not be executed. It contains no valid columns.") +#define STR_INVALID_PARA_COUNT NC_("STR_INVALID_PARA_COUNT", "The count of the given parameter values doesn't match the parameters.") +#define STR_NO_VALID_FILE_URL NC_("STR_NO_VALID_FILE_URL", "The URL '$URL$' is not valid. A connection can not be created.") +#define STR_NO_CLASSNAME NC_("STR_NO_CLASSNAME", "The driver class '$classname$' could not be loaded.") +#define STR_NO_JAVA NC_("STR_NO_JAVA", "No Java installation could be found. Please check your installation.") +#define STR_NO_RESULTSET NC_("STR_NO_RESULTSET", "The execution of the query doesn't return a valid result set.") +#define STR_NO_ROWCOUNT NC_("STR_NO_ROWCOUNT", "The execution of the update statement doesn't effect any rows.") +#define STR_NO_CLASSNAME_PATH NC_("STR_NO_CLASSNAME_PATH", "The additional driver class path is '$classpath$'.") +#define STR_UNKNOWN_PARA_TYPE NC_("STR_UNKNOWN_PARA_TYPE", "The type of parameter at position '$position$' is unknown.") +#define STR_UNKNOWN_COLUMN_TYPE NC_("STR_UNKNOWN_COLUMN_TYPE", "The type of column at position '$position$' is unknown.") +// KAB +#define STR_NO_KDE_INST NC_("STR_NO_KDE_INST", "No suitable KDE installation was found.") +#define STR_KDE_VERSION_TOO_OLD NC_("STR_KDE_VERSION_TOO_OLD", "KDE version $major$.$minor$ or higher is required to access the KDE Address Book.") +#define STR_KDE_VERSION_TOO_NEW NC_("STR_KDE_VERSION_TOO_NEW", "The found KDE version is too new. Only KDE up to version $major$.$minor$ is known to work with this product.\n") +#define STR_KDE_VERSION_TOO_NEW_WORK_AROUND NC_("STR_KDE_VERSION_TOO_NEW_WORK_AROUND", "If you are sure that your KDE version works, you might execute the following Basic macro to disable this version check:\n\n") +#define STR_PARA_ONLY_PREPARED NC_("STR_PARA_ONLY_PREPARED", "Parameters can appear only in prepared statements.") +// MACAB +#define STR_NO_TABLE NC_("STR_NO_TABLE", "No such table!") +#define STR_NO_MAC_OS_FOUND NC_("STR_NO_MAC_OS_FOUND", "No suitable Mac OS installation was found.") +// hsqldb +#define STR_NO_STORAGE NC_("STR_NO_STORAGE", "The connection can not be established. No storage or URL was given.") +#define STR_INVALID_FILE_URL NC_("STR_INVALID_FILE_URL", "The given URL contains no valid local file system path. Please check the location of your database file.") +#define STR_NO_TABLE_CONTAINER NC_("STR_NO_TABLE_CONTAINER", "An error occurred while obtaining the connection's table container.") +#define STR_NO_TABLENAME NC_("STR_NO_TABLENAME", "There is no table named '$tablename$'.") +#define STR_NO_DOCUMENTUI NC_("STR_NO_DOCUMENTUI", "The provided DocumentUI is not allowed to be NULL.") +#define STR_ERROR_NEW_VERSION NC_("STR_ERROR_NEW_VERSION", "The connection could not be established. The database was created by a newer version of %PRODUCTNAME.") + +#define STR_ROW_SET_OPERATION_VETOED NC_("STR_ROW_SET_OPERATION_VETOED", "The record operation has been vetoed.") +#define STR_PARSER_CYCLIC_SUB_QUERIES NC_("STR_PARSER_CYCLIC_SUB_QUERIES", "The statement contains a cyclic reference to one or more sub queries.") +#define STR_DB_OBJECT_NAME_WITH_SLASHES NC_("STR_DB_OBJECT_NAME_WITH_SLASHES", "The name must not contain any slashes ('/').") +#define STR_DB_INVALID_SQL_NAME NC_("STR_DB_INVALID_SQL_NAME", "$1$ is no SQL conform identifier.") +#define STR_DB_QUERY_NAME_WITH_QUOTES NC_("STR_DB_QUERY_NAME_WITH_QUOTES", "Query names must not contain quote characters.") +#define STR_DB_OBJECT_NAME_IS_USED NC_("STR_DB_OBJECT_NAME_IS_USED", "The name '$1$' is already in use in the database.") +#define STR_DB_NOT_CONNECTED NC_("STR_DB_NOT_CONNECTED", "No connection to the database exists.") +#define STR_AB_ADDRESSBOOK_NOT_FOUND NC_("STR_AB_ADDRESSBOOK_NOT_FOUND", "No $1$ exists.") +#define STR_DATA_CANNOT_SELECT_UNFILTERED NC_("STR_DATA_CANNOT_SELECT_UNFILTERED", "Unable to display the complete table content. Please apply a filter.") + +#endif // CONNECTIVITY_RESOURCE_MOZAB_HRC + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/strings.hxx b/connectivity/inc/strings.hxx index a514191d4488..c81b2a08b74b 100644 --- a/connectivity/inc/strings.hxx +++ b/connectivity/inc/strings.hxx @@ -12,62 +12,65 @@ // = log messages for the JDBC driver -#define STR_LOG_DRIVER_CONNECTING_URL "jdbcBridge: connecting to URL '$1$'" -#define STR_LOG_DRIVER_SUCCESS "jdbcBridge: success" -#define STR_LOG_CREATE_STATEMENT "c$1$: creating statement" -#define STR_LOG_CREATED_STATEMENT_ID "c$1$: created statement, statement id: s$2$" -#define STR_LOG_PREPARE_STATEMENT "c$1$: preparing statement: $2$" -#define STR_LOG_PREPARED_STATEMENT_ID "c$1$: prepared statement, statement id: s$2$" -#define STR_LOG_PREPARE_CALL "c$1$: preparing call: $2$" -#define STR_LOG_PREPARED_CALL_ID "c$1$: prepared call, statement id: s$2$" -#define STR_LOG_NATIVE_SQL "c$1$: native SQL: $2$ -> $3$" -#define STR_LOG_LOADING_DRIVER "c$1$: attempting to load driver class $2$" -#define STR_LOG_NO_DRIVER_CLASS "c$1$: no Java Driver Class was provided" -#define STR_LOG_CONN_SUCCESS "c$1$: success" -#define STR_LOG_NO_SYSTEM_CONNECTION "c$1$: JDBC driver did not provide a JDBC connection" -#define STR_LOG_GOT_JDBC_CONNECTION "c$1$: obtained a JDBC connection for $2$" -#define STR_LOG_SHUTDOWN_CONNECTION "c$1$: shutting down connection" -#define STR_LOG_GENERATED_VALUES "s$1$: retrieving generated values" -#define STR_LOG_GENERATED_VALUES_FALLBACK "s$1$: getGeneratedValues: falling back to statement: $2$" -#define STR_LOG_EXECUTE_STATEMENT "s$1$: going to execute: $2$" -#define STR_LOG_EXECUTE_QUERY "s$1$: going to execute query: $2$" -#define STR_LOG_CLOSING_STATEMENT "s$1$: closing/disposing statement" -#define STR_LOG_EXECUTE_UPDATE "s$1$: going to execute update: $2$" -#define STR_LOG_UPDATE_COUNT "s$1$: update count: $2$" -#define STR_LOG_RESULT_SET_CONCURRENCY "s$1$: going to set result set concurrency: $2$" -#define STR_LOG_RESULT_SET_TYPE "s$1$: going to set result set type: $2$" -#define STR_LOG_FETCH_DIRECTION "s$1$: fetch direction: $2$" -#define STR_LOG_FETCH_SIZE "s$1$: fetch size: $2$" -#define STR_LOG_SET_ESCAPE_PROCESSING "s$1$: going to set escape processing: $2$" -#define STR_LOG_EXECUTING_PREPARED "s$1$: executing previously prepared statement" -#define STR_LOG_EXECUTING_PREPARED_UPDATE "s$1$: executing previously prepared update statement" -#define STR_LOG_EXECUTING_PREPARED_QUERY "s$1$: executing previously prepared query" -#define STR_LOG_STRING_PARAMETER "s$1$: parameter no. $2$: type: string; value: $3$" -#define STR_LOG_BOOLEAN_PARAMETER "s$1$: parameter no. $2$: type: boolean; value: $3$" -#define STR_LOG_BYTE_PARAMETER "s$1$: parameter no. $2$: type: byte; value: $3$" -#define STR_LOG_DATE_PARAMETER "s$1$: parameter no. $2$: type: date; value: $3$" -#define STR_LOG_TIME_PARAMETER "s$1$: parameter no. $2$: type: time; value: $3$" -#define STR_LOG_TIMESTAMP_PARAMETER "s$1$: parameter no. $2$: type: timestamp; value: $3$" -#define STR_LOG_DOUBLE_PARAMETER "s$1$: parameter no. $2$: type: double; value: $3$" -#define STR_LOG_FLOAT_PARAMETER "s$1$: parameter no. $2$: type: float; value: $3$" -#define STR_LOG_INT_PARAMETER "s$1$: parameter no. $2$: type: int; value: $3$" -#define STR_LOG_LONG_PARAMETER "s$1$: parameter no. $2$: type: long; value: $3$" -#define STR_LOG_NULL_PARAMETER "s$1$: parameter no. $2$: sql-type: $3$; value: null" -#define STR_LOG_OBJECT_NULL_PARAMETER "s$1$: parameter no. $2$: setting to null" -#define STR_LOG_SHORT_PARAMETER "s$1$: parameter no. $2$: type: short; value: $3$" -#define STR_LOG_BYTES_PARAMETER "s$1$: parameter no. $2$: type: byte[]" -#define STR_LOG_CHARSTREAM_PARAMETER "s$1$: parameter no. $2$: type: character stream" -#define STR_LOG_BINARYSTREAM_PARAMETER "s$1$: parameter no. $2$: type: binary stream" -#define STR_LOG_CLEAR_PARAMETERS "s$1$: clearing all parameters" -#define STR_LOG_META_DATA_METHOD "c$1$: entering XDatabaseMetaData::$2$" -#define STR_LOG_META_DATA_METHOD_ARG1 "c$1$: entering XDatabaseMetaData::$2$( '$3$' )" -#define STR_LOG_META_DATA_METHOD_ARG2 "c$1$: entering XDatabaseMetaData::$2$( '$3$', '$4$' )" -#define STR_LOG_META_DATA_METHOD_ARG3 "c$1$: entering XDatabaseMetaData::$2$( '$3$', '$4$', '$5$' )" -#define STR_LOG_META_DATA_METHOD_ARG4 "c$1$: entering XDatabaseMetaData::$2$( '$3$', '$4$', '$5$', '$6$' )" -#define STR_LOG_META_DATA_RESULT "c$1$: leaving XDatabaseMetaData::$2$: success-with-result: $3$" -#define STR_LOG_META_DATA_SUCCESS "c$1$: leaving XDatabaseMetaData::$2$: success" -#define STR_LOG_THROWING_EXCEPTION "SQLException to be thrown: message: '$1$', SQLState: $2$, ErrorCode: $3$" -#define STR_LOG_SETTING_SYSTEM_PROPERTY "setting system property \"$1$\" to value \"$2$\"" +#define STR_LOG_DRIVER_CONNECTING_URL "jdbcBridge: connecting to URL '$1$'" +#define STR_LOG_DRIVER_SUCCESS "jdbcBridge: success" +#define STR_LOG_CREATE_STATEMENT "c$1$: creating statement" +#define STR_LOG_CREATED_STATEMENT_ID "c$1$: created statement, statement id: s$2$" +#define STR_LOG_PREPARE_STATEMENT "c$1$: preparing statement: $2$" +#define STR_LOG_PREPARED_STATEMENT_ID "c$1$: prepared statement, statement id: s$2$" +#define STR_LOG_PREPARE_CALL "c$1$: preparing call: $2$" +#define STR_LOG_PREPARED_CALL_ID "c$1$: prepared call, statement id: s$2$" +#define STR_LOG_NATIVE_SQL "c$1$: native SQL: $2$ -> $3$" +#define STR_LOG_LOADING_DRIVER "c$1$: attempting to load driver class $2$" +#define STR_LOG_NO_DRIVER_CLASS "c$1$: no Java Driver Class was provided" +#define STR_LOG_CONN_SUCCESS "c$1$: success" +#define STR_LOG_NO_SYSTEM_CONNECTION "c$1$: JDBC driver did not provide a JDBC connection" +#define STR_LOG_GOT_JDBC_CONNECTION "c$1$: obtained a JDBC connection for $2$" +#define STR_LOG_SHUTDOWN_CONNECTION "c$1$: shutting down connection" +#define STR_LOG_GENERATED_VALUES "s$1$: retrieving generated values" +#define STR_LOG_GENERATED_VALUES_FALLBACK "s$1$: getGeneratedValues: falling back to statement: $2$" +#define STR_LOG_EXECUTE_STATEMENT "s$1$: going to execute: $2$" +#define STR_LOG_EXECUTE_QUERY "s$1$: going to execute query: $2$" +#define STR_LOG_CLOSING_STATEMENT "s$1$: closing/disposing statement" +#define STR_LOG_EXECUTE_UPDATE "s$1$: going to execute update: $2$" +#define STR_LOG_UPDATE_COUNT "s$1$: update count: $2$" +#define STR_LOG_RESULT_SET_CONCURRENCY "s$1$: going to set result set concurrency: $2$" +#define STR_LOG_RESULT_SET_TYPE "s$1$: going to set result set type: $2$" +#define STR_LOG_FETCH_DIRECTION "s$1$: fetch direction: $2$" +#define STR_LOG_FETCH_SIZE "s$1$: fetch size: $2$" +#define STR_LOG_SET_ESCAPE_PROCESSING "s$1$: going to set escape processing: $2$" +#define STR_LOG_EXECUTING_PREPARED "s$1$: executing previously prepared statement" +#define STR_LOG_EXECUTING_PREPARED_UPDATE "s$1$: executing previously prepared update statement" +#define STR_LOG_EXECUTING_PREPARED_QUERY "s$1$: executing previously prepared query" +#define STR_LOG_STRING_PARAMETER "s$1$: parameter no. $2$: type: string; value: $3$" +#define STR_LOG_BOOLEAN_PARAMETER "s$1$: parameter no. $2$: type: boolean; value: $3$" +#define STR_LOG_BYTE_PARAMETER "s$1$: parameter no. $2$: type: byte; value: $3$" +#define STR_LOG_DATE_PARAMETER "s$1$: parameter no. $2$: type: date; value: $3$" +#define STR_LOG_TIME_PARAMETER "s$1$: parameter no. $2$: type: time; value: $3$" +#define STR_LOG_TIMESTAMP_PARAMETER "s$1$: parameter no. $2$: type: timestamp; value: $3$" +#define STR_LOG_DOUBLE_PARAMETER "s$1$: parameter no. $2$: type: double; value: $3$" +#define STR_LOG_FLOAT_PARAMETER "s$1$: parameter no. $2$: type: float; value: $3$" +#define STR_LOG_INT_PARAMETER "s$1$: parameter no. $2$: type: int; value: $3$" +#define STR_LOG_LONG_PARAMETER "s$1$: parameter no. $2$: type: long; value: $3$" +#define STR_LOG_NULL_PARAMETER "s$1$: parameter no. $2$: sql-type: $3$; value: null" +#define STR_LOG_OBJECT_NULL_PARAMETER "s$1$: parameter no. $2$: setting to null" +#define STR_LOG_SHORT_PARAMETER "s$1$: parameter no. $2$: type: short; value: $3$" +#define STR_LOG_BYTES_PARAMETER "s$1$: parameter no. $2$: type: byte[]" +#define STR_LOG_CHARSTREAM_PARAMETER "s$1$: parameter no. $2$: type: character stream" +#define STR_LOG_BINARYSTREAM_PARAMETER "s$1$: parameter no. $2$: type: binary stream" +#define STR_LOG_CLEAR_PARAMETERS "s$1$: clearing all parameters" +#define STR_LOG_META_DATA_METHOD "c$1$: entering XDatabaseMetaData::$2$" +#define STR_LOG_META_DATA_METHOD_ARG1 "c$1$: entering XDatabaseMetaData::$2$( '$3$' )" +#define STR_LOG_META_DATA_METHOD_ARG2 "c$1$: entering XDatabaseMetaData::$2$( '$3$', '$4$' )" +#define STR_LOG_META_DATA_METHOD_ARG3 "c$1$: entering XDatabaseMetaData::$2$( '$3$', '$4$', '$5$' )" +#define STR_LOG_META_DATA_METHOD_ARG4 "c$1$: entering XDatabaseMetaData::$2$( '$3$', '$4$', '$5$', '$6$' )" +#define STR_LOG_META_DATA_RESULT "c$1$: leaving XDatabaseMetaData::$2$: success-with-result: $3$" +#define STR_LOG_META_DATA_SUCCESS "c$1$: leaving XDatabaseMetaData::$2$: success" +#define STR_LOG_THROWING_EXCEPTION "SQLException to be thrown: message: '$1$', SQLState: $2$, ErrorCode: $3$" +#define STR_LOG_SETTING_SYSTEM_PROPERTY "setting system property \"$1$\" to value \"$2$\"" + +#define STR_DB_NOT_CONNECTED_STATE "08003" +#define STR_DATA_CANNOT_SELECT_UNFILTERED_STATE "IM001" #endif diff --git a/connectivity/qa/connectivity/ado/DriverTest.cxx b/connectivity/qa/connectivity/ado/DriverTest.cxx index 4c01fc73da1f..311ef6f11687 100644 --- a/connectivity/qa/connectivity/ado/DriverTest.cxx +++ b/connectivity/qa/connectivity/ado/DriverTest.cxx @@ -23,7 +23,7 @@ #include #include #include -#include "resource/ado_res.hrc" +#include "strings.hrc" using namespace ::com::sun::star::beans; diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx index d8e847711f8d..afc1a8bce50c 100644 --- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx +++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx @@ -38,7 +38,7 @@ #include #include #include -#include "resource/common_res.hrc" +#include "strings.hrc" #include "TConnection.hxx" using namespace connectivity; diff --git a/connectivity/source/commontools/TConnection.cxx b/connectivity/source/commontools/TConnection.cxx index febc53170355..15bcf67f4929 100644 --- a/connectivity/source/commontools/TConnection.cxx +++ b/connectivity/source/commontools/TConnection.cxx @@ -21,7 +21,6 @@ #include "TConnection.hxx" #include #include -#include #include using namespace connectivity; @@ -76,11 +75,11 @@ Sequence< sal_Int8 > OMetaConnection::getUnoTunnelImplementationId() return s_aPropertyNameMap; } -void OMetaConnection::throwGenericSQLException( sal_uInt16 _nErrorResourceId,const Reference< XInterface>& _xContext ) +void OMetaConnection::throwGenericSQLException(const char* pErrorResourceId, const Reference< XInterface>& _xContext ) { OUString sErrorMessage; - if ( _nErrorResourceId ) - sErrorMessage = m_aResources.getResourceString( _nErrorResourceId ); + if (pErrorResourceId) + sErrorMessage = m_aResources.getResourceString(pErrorResourceId); Reference< XInterface> xContext = _xContext; if ( !xContext.is() ) xContext = *this; diff --git a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx index 92728dfc1406..599f031dbc95 100644 --- a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx +++ b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx @@ -24,7 +24,7 @@ #include #include #include "resource/sharedresources.hxx" -#include "resource/common_res.hrc" +#include "strings.hrc" #include #include diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx index 85a9827cbc3a..e9cdce9c7ca4 100644 --- a/connectivity/source/commontools/dbexception.cxx +++ b/connectivity/source/commontools/dbexception.cxx @@ -26,14 +26,11 @@ #include #include #include "TConnection.hxx" -#include "resource/common_res.hrc" +#include "strings.hrc" #include "resource/sharedresources.hxx" - namespace dbtools { - - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdbc; diff --git a/connectivity/source/commontools/dbmetadata.cxx b/connectivity/source/commontools/dbmetadata.cxx index bdb7f033debb..27acbe743234 100644 --- a/connectivity/source/commontools/dbmetadata.cxx +++ b/connectivity/source/commontools/dbmetadata.cxx @@ -21,7 +21,7 @@ #include #include #include -#include "resource/common_res.hrc" +#include "strings.hrc" #include "resource/sharedresources.hxx" #include diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index 37e69c7f9d74..16c3d9b7782e 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -79,7 +79,7 @@ #include #include #include -#include "resource/common_res.hrc" +#include "strings.hrc" #include "resource/sharedresources.hxx" #include diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx index 6f829f4f272b..3db5b431bd35 100644 --- a/connectivity/source/commontools/dbtools2.cxx +++ b/connectivity/source/commontools/dbtools2.cxx @@ -23,7 +23,7 @@ #include #include #include "resource/sharedresources.hxx" -#include "resource/common_res.hrc" +#include "strings.hrc" #include #include #include diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx index bcb2fd2e5634..01e07b26721f 100644 --- a/connectivity/source/commontools/sqlerror.cxx +++ b/connectivity/source/commontools/sqlerror.cxx @@ -22,15 +22,19 @@ #include #include +#include -#include #include #include +#include +#include +#include #include +#include +#include #include - namespace connectivity { @@ -69,7 +73,7 @@ namespace connectivity impl_getErrorMessage( ErrorCondition _eCondition ); /// returns the SQLState associated with the given error condition - OUString + static OUString impl_getSQLState( ErrorCondition _eCondition ); /// returns an SQLException describing the given error condition @@ -83,13 +87,12 @@ namespace connectivity private: ::osl::Mutex m_aMutex; Reference m_aContext; - std::unique_ptr< ::comphelper::OfficeResourceBundle > m_pResources; + std::unique_ptr m_xResources; bool m_bAttemptedInit; }; SQLError_Impl::SQLError_Impl( const Reference & _rxContext ) :m_aContext( _rxContext ) - ,m_pResources( ) ,m_bAttemptedInit( false ) { } @@ -120,16 +123,45 @@ namespace connectivity _rMessage = _rMessage.replaceAt( nIndex, nPlaceholderLen, *rParamValue ); } - - sal_Int32 lcl_getResourceID( const ErrorCondition _eCondition, bool _bSQLState ) + const char* lcl_getResourceErrorID(const ErrorCondition _eCondition) { - return 256 - + 2 * ::sal::static_int_cast< sal_Int32, ErrorCondition >( _eCondition ) - + ( _bSQLState ? 1 : 0 ); + switch (_eCondition) + { + case css::sdb::ErrorCondition::ROW_SET_OPERATION_VETOED: + return STR_ROW_SET_OPERATION_VETOED; + case css::sdb::ErrorCondition::PARSER_CYCLIC_SUB_QUERIES: + return STR_PARSER_CYCLIC_SUB_QUERIES; + case css::sdb::ErrorCondition::DB_OBJECT_NAME_WITH_SLASHES: + return STR_DB_OBJECT_NAME_WITH_SLASHES; + case css::sdb::ErrorCondition::DB_INVALID_SQL_NAME: + return STR_DB_INVALID_SQL_NAME; + case css::sdb::ErrorCondition::DB_QUERY_NAME_WITH_QUOTES: + return STR_DB_QUERY_NAME_WITH_QUOTES; + case css::sdb::ErrorCondition::DB_OBJECT_NAME_IS_USED: + return STR_DB_OBJECT_NAME_IS_USED; + case css::sdb::ErrorCondition::DB_NOT_CONNECTED: + return STR_DB_NOT_CONNECTED; + case css::sdb::ErrorCondition::AB_ADDRESSBOOK_NOT_FOUND: + return STR_AB_ADDRESSBOOK_NOT_FOUND; + case css::sdb::ErrorCondition::DATA_CANNOT_SELECT_UNFILTERED: + return STR_DATA_CANNOT_SELECT_UNFILTERED; + } + return nullptr; + } + + OUString lcl_getResourceState(const ErrorCondition _eCondition) + { + switch (_eCondition) + { + case css::sdb::ErrorCondition::DB_NOT_CONNECTED: + return OUString(STR_DB_NOT_CONNECTED_STATE); + case css::sdb::ErrorCondition::DATA_CANNOT_SELECT_UNFILTERED: + return OUString(STR_DATA_CANNOT_SELECT_UNFILTERED_STATE); + } + return OUString(); } } - OUString SQLError_Impl::getErrorMessage( const ErrorCondition _eCondition, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 ) { OUString sErrorMessage( impl_getErrorMessage( _eCondition ) ); @@ -173,7 +205,6 @@ namespace connectivity ); } - void SQLError_Impl::raiseTypedException( const ErrorCondition _eCondition, const Reference< XInterface >& _rxContext, const Type& _rExceptionType, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 ) { @@ -191,14 +222,12 @@ namespace connectivity ::cppu::throwException( aException ); } - SQLException SQLError_Impl::getSQLException( const ErrorCondition _eCondition, const Reference< XInterface >& _rxContext, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 ) { return impl_buildSQLException( _eCondition, _rxContext, _rParamValue1, _rParamValue2, _rParamValue3 ); } - SQLException SQLError_Impl::impl_buildSQLException( const ErrorCondition _eCondition, const Reference< XInterface >& _rxContext, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 ) { @@ -211,14 +240,13 @@ namespace connectivity ); } - OUString SQLError_Impl::impl_getErrorMessage( ErrorCondition _eCondition ) { OUStringBuffer aMessage; if ( impl_initResources() ) { - OUString sResMessage( m_pResources->loadString( lcl_getResourceID( _eCondition, false ) ) ); + OUString sResMessage(Translate::get(lcl_getResourceErrorID(_eCondition), *m_xResources)); OSL_ENSURE( !sResMessage.isEmpty(), "SQLError_Impl::impl_getErrorMessage: illegal error condition, or invalid resource!" ); aMessage.append( getMessagePrefix() ).append( " " ).append( sResMessage ); } @@ -226,37 +254,26 @@ namespace connectivity return aMessage.makeStringAndClear(); } - OUString SQLError_Impl::impl_getSQLState( ErrorCondition _eCondition ) { - OUString sState; - - if ( impl_initResources() ) - { - sal_Int32 nResourceId( lcl_getResourceID( _eCondition, true ) ); - if ( m_pResources->hasString( nResourceId ) ) - sState = m_pResources->loadString( nResourceId ); - } - - if ( sState.isEmpty() ) + OUString sState = lcl_getResourceState(_eCondition); + if (sState.isEmpty()) sState = OUString::intern( RTL_CONSTASCII_USTRINGPARAM( "S1000" ) ); - return sState; } - bool SQLError_Impl::impl_initResources() { - if ( m_pResources.get() ) + if (m_xResources.get()) return true; - if ( m_bAttemptedInit ) + if (m_bAttemptedInit) return false; ::osl::MutexGuard aGuard( m_aMutex ); m_bAttemptedInit = true; - m_pResources.reset( new ::comphelper::OfficeResourceBundle( m_aContext, "sdberr" ) ); - return m_pResources.get() != nullptr; + m_xResources.reset(new std::locale(Translate::Create("cnr", Application::GetSettings().GetUILanguageTag()))); + return m_xResources.get() != nullptr; } SQLError::SQLError( const Reference & _rxContext ) diff --git a/connectivity/source/drivers/ado/AColumns.cxx b/connectivity/source/drivers/ado/AColumns.cxx index 9f5e819f022f..0361972e48a1 100644 --- a/connectivity/source/drivers/ado/AColumns.cxx +++ b/connectivity/source/drivers/ado/AColumns.cxx @@ -29,7 +29,7 @@ #include #include #include -#include "resource/ado_res.hrc" +#include "strings.hrc" using namespace connectivity::ado; using namespace connectivity; diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx index 8c1431cf6c01..b7c39c7e5550 100644 --- a/connectivity/source/drivers/ado/AConnection.cxx +++ b/connectivity/source/drivers/ado/AConnection.cxx @@ -31,7 +31,7 @@ #include #include #include -#include "resource/ado_res.hrc" +#include "strings.hrc" using namespace dbtools; using namespace connectivity::ado; diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx index efda9a97820d..741dc13878da 100644 --- a/connectivity/source/drivers/ado/ADriver.cxx +++ b/connectivity/source/drivers/ado/ADriver.cxx @@ -26,7 +26,7 @@ #include #include #include -#include "resource/ado_res.hrc" +#include "strings.hrc" #include #include "resource/sharedresources.hxx" diff --git a/connectivity/source/drivers/ado/AGroups.cxx b/connectivity/source/drivers/ado/AGroups.cxx index 2611ace16372..3b5df3c5e486 100644 --- a/connectivity/source/drivers/ado/AGroups.cxx +++ b/connectivity/source/drivers/ado/AGroups.cxx @@ -27,7 +27,7 @@ #include "TConnection.hxx" #include #include -#include "resource/ado_res.hrc" +#include "strings.hrc" using namespace comphelper; using namespace connectivity; diff --git a/connectivity/source/drivers/ado/AIndexes.cxx b/connectivity/source/drivers/ado/AIndexes.cxx index 5bf8937af21f..732c0a0b4ffe 100644 --- a/connectivity/source/drivers/ado/AIndexes.cxx +++ b/connectivity/source/drivers/ado/AIndexes.cxx @@ -26,7 +26,8 @@ #include "TConnection.hxx" #include #include -#include "resource/ado_res.hrc" +#include "strings.hrc" + using namespace ::comphelper; diff --git a/connectivity/source/drivers/ado/AKeys.cxx b/connectivity/source/drivers/ado/AKeys.cxx index 63a45cc6d31f..e12e7379c66f 100644 --- a/connectivity/source/drivers/ado/AKeys.cxx +++ b/connectivity/source/drivers/ado/AKeys.cxx @@ -28,7 +28,7 @@ #include "ado/Awrapado.hxx" #include #include -#include "resource/ado_res.hrc" +#include "strings.hrc" using namespace ::comphelper; using namespace connectivity; diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx index 4d8206a93508..497a721de03d 100644 --- a/connectivity/source/drivers/ado/APreparedStatement.cxx +++ b/connectivity/source/drivers/ado/APreparedStatement.cxx @@ -30,7 +30,7 @@ #include #include #include -#include "resource/ado_res.hrc" +#include "strings.hrc" #include diff --git a/connectivity/source/drivers/ado/ATables.cxx b/connectivity/source/drivers/ado/ATables.cxx index 6f0a502642fb..0c848f21de78 100644 --- a/connectivity/source/drivers/ado/ATables.cxx +++ b/connectivity/source/drivers/ado/ATables.cxx @@ -31,7 +31,7 @@ #include #include #include -#include "resource/ado_res.hrc" +#include "strings.hrc" using namespace ::cppu; using namespace connectivity; diff --git a/connectivity/source/drivers/ado/AUsers.cxx b/connectivity/source/drivers/ado/AUsers.cxx index 74c22bd520d5..d9948573a426 100644 --- a/connectivity/source/drivers/ado/AUsers.cxx +++ b/connectivity/source/drivers/ado/AUsers.cxx @@ -26,7 +26,7 @@ #include #include #include -#include "resource/ado_res.hrc" +#include "strings.hrc" using namespace comphelper; using namespace connectivity; diff --git a/connectivity/source/drivers/ado/AViews.cxx b/connectivity/source/drivers/ado/AViews.cxx index d15fbf631657..a67e072cc30b 100644 --- a/connectivity/source/drivers/ado/AViews.cxx +++ b/connectivity/source/drivers/ado/AViews.cxx @@ -26,7 +26,7 @@ #include "TConnection.hxx" #include #include -#include "resource/ado_res.hrc" +#include "strings.hrc" using namespace ::comphelper; diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx index f7ac7b5f5694..319b02ad6f52 100644 --- a/connectivity/source/drivers/ado/Aolevariant.cxx +++ b/connectivity/source/drivers/ado/Aolevariant.cxx @@ -25,7 +25,7 @@ #include #include #include "resource/sharedresources.hxx" -#include "resource/ado_res.hrc" +#include "strings.hrc" #include #include #include diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx index 52177bff82ac..e82aafc6df23 100644 --- a/connectivity/source/drivers/calc/CConnection.cxx +++ b/connectivity/source/drivers/calc/CConnection.cxx @@ -21,7 +21,6 @@ #include "calc/CDatabaseMetaData.hxx" #include "calc/CCatalog.hxx" #include "calc/CDriver.hxx" -#include "resource/calc_res.hrc" #include "resource/sharedresources.hxx" #include #include @@ -33,6 +32,7 @@ #include #include #include +#include "strings.hrc" using namespace connectivity::calc; using namespace connectivity::file; diff --git a/connectivity/source/drivers/calc/CDriver.cxx b/connectivity/source/drivers/calc/CDriver.cxx index 4ac9899e5042..67247c1e789d 100644 --- a/connectivity/source/drivers/calc/CDriver.cxx +++ b/connectivity/source/drivers/calc/CDriver.cxx @@ -22,8 +22,8 @@ #include #include #include "resource/sharedresources.hxx" -#include "resource/calc_res.hrc" #include +#include "strings.hrc" using namespace connectivity::calc; using namespace connectivity::file; diff --git a/connectivity/source/drivers/dbase/DDriver.cxx b/connectivity/source/drivers/dbase/DDriver.cxx index 39a672f35840..d99efd817622 100644 --- a/connectivity/source/drivers/dbase/DDriver.cxx +++ b/connectivity/source/drivers/dbase/DDriver.cxx @@ -21,7 +21,7 @@ #include "dbase/DConnection.hxx" #include #include -#include "resource/dbase_res.hrc" +#include "strings.hrc" #include using namespace connectivity::dbase; diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx index 4063c79576bb..0c80d1c82a59 100644 --- a/connectivity/source/drivers/dbase/DIndex.cxx +++ b/connectivity/source/drivers/dbase/DIndex.cxx @@ -36,7 +36,7 @@ #include #include #include "dbase/DResultSet.hxx" -#include "resource/dbase_res.hrc" +#include "strings.hrc" #include using namespace ::comphelper; @@ -475,12 +475,12 @@ bool ODbaseIndex::DropImpl() return true; } -void ODbaseIndex::impl_killFileAndthrowError_throw(sal_uInt16 _nErrorId,const OUString& _sFile) +void ODbaseIndex::impl_killFileAndthrowError_throw(const char* pErrorId, const OUString& _sFile) { closeImpl(); if(UCBContentHelper::Exists(_sFile)) UCBContentHelper::Kill(_sFile); - m_pTable->getConnection()->throwGenericSQLException(_nErrorId,*this); + m_pTable->getConnection()->throwGenericSQLException(pErrorId, *this); } bool ODbaseIndex::CreateImpl() diff --git a/connectivity/source/drivers/dbase/DIndexes.cxx b/connectivity/source/drivers/dbase/DIndexes.cxx index f1a722615335..aa772d66b5ab 100644 --- a/connectivity/source/drivers/dbase/DIndexes.cxx +++ b/connectivity/source/drivers/dbase/DIndexes.cxx @@ -22,7 +22,7 @@ #include #include #include -#include "resource/dbase_res.hrc" +#include "strings.hrc" using namespace ::comphelper; diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx index af17e616f5fa..0f544ed70cca 100644 --- a/connectivity/source/drivers/dbase/DResultSet.cxx +++ b/connectivity/source/drivers/dbase/DResultSet.cxx @@ -26,7 +26,7 @@ #include "dbase/DIndexIter.hxx" #include #include -#include "resource/dbase_res.hrc" +#include "strings.hrc" using namespace ::comphelper; diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 9d452e66b85b..d2a0476728f5 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -50,7 +50,7 @@ #include #include #include -#include "resource/dbase_res.hrc" +#include "strings.hrc" #include #include @@ -1106,7 +1106,7 @@ bool ODbaseTable::CreateImpl() return true; } -void ODbaseTable::throwInvalidColumnType(const sal_uInt16 _nErrorId, const OUString& _sColumnName) +void ODbaseTable::throwInvalidColumnType(const char* pErrorId, const OUString& _sColumnName) { try { @@ -1118,7 +1118,7 @@ void ODbaseTable::throwInvalidColumnType(const sal_uInt16 _nErrorId, const OUStr } const OUString sError( getConnection()->getResources().getResourceStringWithSubstitution( - _nErrorId, + pErrorId, "$columnname$", _sColumnName ) ); ::dbtools::throwGenericSQLException( sError, *this ); diff --git a/connectivity/source/drivers/dbase/DTables.cxx b/connectivity/source/drivers/dbase/DTables.cxx index 787226e2ed84..57e7abbd9878 100644 --- a/connectivity/source/drivers/dbase/DTables.cxx +++ b/connectivity/source/drivers/dbase/DTables.cxx @@ -32,7 +32,7 @@ #include #include "dbase/DCatalog.hxx" #include -#include "resource/dbase_res.hrc" +#include "strings.hrc" #include using namespace ::comphelper; diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx index 661071b3c773..2b661ac21663 100644 --- a/connectivity/source/drivers/evoab2/NDriver.cxx +++ b/connectivity/source/drivers/evoab2/NDriver.cxx @@ -29,7 +29,7 @@ #include #include #include -#include "resource/common_res.hrc" +#include "strings.hrc" #include "resource/sharedresources.hxx" using namespace osl; diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx index e656737eef90..aca19f300e72 100644 --- a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx +++ b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx @@ -27,7 +27,7 @@ #include #include -#include "resource/common_res.hrc" +#include "strings.hrc" using namespace connectivity::evoab; using namespace com::sun::star::uno; diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx index d33c8f2a4512..83b05ef3fb18 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.cxx +++ b/connectivity/source/drivers/evoab2/NResultSet.cxx @@ -22,7 +22,7 @@ #include "NConnection.hxx" #include "NResultSet.hxx" #include "propertyids.hxx" -#include "resource/evoab2_res.hrc" +#include "strings.hrc" #include "TSortIndex.hxx" #include diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx index 8e0fda36dcbc..5f7f297bb8ca 100644 --- a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx +++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx @@ -21,7 +21,7 @@ #include "NDatabaseMetaData.hxx" #include #include -#include "resource/evoab2_res.hrc" +#include "strings.hrc" using namespace connectivity::evoab; using namespace com::sun::star::uno; diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx index 361eafcfc1bf..58225437ace1 100644 --- a/connectivity/source/drivers/evoab2/NStatement.cxx +++ b/connectivity/source/drivers/evoab2/NStatement.cxx @@ -30,9 +30,8 @@ #include "NConnection.hxx" #include "NDatabaseMetaData.hxx" #include "NResultSet.hxx" -#include "resource/evoab2_res.hrc" #include "sqlbison.hxx" -#include +#include #include #include diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx index dfcfada4cbe8..84a56e529225 100644 --- a/connectivity/source/drivers/file/FConnection.cxx +++ b/connectivity/source/drivers/file/FConnection.cxx @@ -40,7 +40,7 @@ #include #include #include -#include "resource/file_res.hrc" +#include "strings.hrc" using namespace connectivity::file; using namespace dbtools; diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx index 2a99cb1b02ce..2fc1f1d7b1f3 100644 --- a/connectivity/source/drivers/file/FDriver.cxx +++ b/connectivity/source/drivers/file/FDriver.cxx @@ -24,7 +24,7 @@ #include #include #include -#include "resource/common_res.hrc" +#include "strings.hrc" #include "resource/sharedresources.hxx" diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx index c5382afe218d..d1d126bc8f7c 100644 --- a/connectivity/source/drivers/file/FPreparedStatement.cxx +++ b/connectivity/source/drivers/file/FPreparedStatement.cxx @@ -33,7 +33,7 @@ #include #include #include -#include "resource/file_res.hrc" +#include "strings.hrc" using namespace connectivity; using namespace comphelper; diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index 95d06a06fb3c..96ea61692aa8 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -46,9 +46,8 @@ #include #include #include -#include "resource/file_res.hrc" #include "resource/sharedresources.hxx" - +#include "strings.hrc" using namespace ::comphelper; using namespace connectivity; @@ -64,10 +63,10 @@ using namespace com::sun::star::container; namespace { - void lcl_throwError(sal_uInt16 _nErrorId,const css::uno::Reference< css::uno::XInterface>& _xContext) + void lcl_throwError(const char* pErrorId, const css::uno::Reference< css::uno::XInterface>& _xContext) { ::connectivity::SharedResources aResources; - const OUString sMessage = aResources.getResourceString(_nErrorId); + const OUString sMessage = aResources.getResourceString(pErrorId); ::dbtools::throwGenericSQLException(sMessage ,_xContext); } } diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index 8be612d01b1e..ec86d0a28603 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -34,7 +34,7 @@ #include #include #include -#include "resource/file_res.hrc" +#include "strings.hrc" #include namespace connectivity diff --git a/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx index 6aadc6319381..4e7d5f16175d 100644 --- a/connectivity/source/drivers/file/fanalyzer.cxx +++ b/connectivity/source/drivers/file/fanalyzer.cxx @@ -24,7 +24,7 @@ #include #include #include "file/FConnection.hxx" -#include "resource/file_res.hrc" +#include "strings.hrc" using namespace ::connectivity; using namespace ::connectivity::file; diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx index 65d6e400e1ca..1853b8caeca7 100644 --- a/connectivity/source/drivers/file/fcomp.cxx +++ b/connectivity/source/drivers/file/fcomp.cxx @@ -29,12 +29,12 @@ #include #include #include -#include "resource/file_res.hrc" #include "file/FStringFunctions.hxx" #include "file/FDateFunctions.hxx" #include "file/FNumericFunctions.hxx" #include "file/FConnection.hxx" #include "sqlbison.hxx" +#include "strings.hrc" using namespace connectivity; using namespace connectivity::file; diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx index 9ab99a1b530e..f6807cf2bbe1 100644 --- a/connectivity/source/drivers/firebird/Connection.cxx +++ b/connectivity/source/drivers/firebird/Connection.cxx @@ -43,8 +43,7 @@ #include #include -#include -#include +#include #include #include diff --git a/connectivity/source/drivers/firebird/Driver.cxx b/connectivity/source/drivers/firebird/Driver.cxx index 399afad3ddb5..99eafb987168 100644 --- a/connectivity/source/drivers/firebird/Driver.cxx +++ b/connectivity/source/drivers/firebird/Driver.cxx @@ -21,8 +21,7 @@ #include "Driver.hxx" #include -#include -#include +#include #include #include diff --git a/connectivity/source/drivers/flat/EDriver.cxx b/connectivity/source/drivers/flat/EDriver.cxx index 8c1681a8cd26..7f5c66f6b262 100644 --- a/connectivity/source/drivers/flat/EDriver.cxx +++ b/connectivity/source/drivers/flat/EDriver.cxx @@ -22,7 +22,7 @@ #include #include #include -#include "resource/common_res.hrc" +#include "strings.hrc" #include "resource/sharedresources.hxx" #include diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx index fbb86796442f..056b888d1fea 100644 --- a/connectivity/source/drivers/hsqldb/HConnection.cxx +++ b/connectivity/source/drivers/hsqldb/HConnection.cxx @@ -41,7 +41,7 @@ #include #include "resource/sharedresources.hxx" -#include "resource/hsqldb_res.hrc" +#include "strings.hrc" using ::com::sun::star::util::XFlushListener; using ::com::sun::star::lang::EventObject; diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index d86826fc6504..6acb9a6c35d9 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -49,7 +49,7 @@ #include #include #include -#include "resource/hsqldb_res.hrc" +#include "strings.hrc" #include "resource/sharedresources.hxx" #include #include diff --git a/connectivity/source/drivers/hsqldb/HUser.cxx b/connectivity/source/drivers/hsqldb/HUser.cxx index a73df49dec7a..55b636b48211 100644 --- a/connectivity/source/drivers/hsqldb/HUser.cxx +++ b/connectivity/source/drivers/hsqldb/HUser.cxx @@ -25,7 +25,7 @@ #include #include #include "TConnection.hxx" -#include "resource/hsqldb_res.hrc" +#include "strings.hrc" using namespace connectivity; using namespace connectivity::hsqldb; diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx index d451148fc988..0f9ba8fb8f9e 100644 --- a/connectivity/source/drivers/jdbc/JConnection.cxx +++ b/connectivity/source/drivers/jdbc/JConnection.cxx @@ -42,7 +42,7 @@ #include #include #include -#include "resource/common_res.hrc" +#include "strings.hrc" #include #include "strings.hxx" diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx index 6bd2dd22ebd1..74513dd5ed76 100644 --- a/connectivity/source/drivers/jdbc/JDriver.cxx +++ b/connectivity/source/drivers/jdbc/JDriver.cxx @@ -27,7 +27,7 @@ #include #include #include "resource/conn_shared_res.hrc" -#include "resource/common_res.hrc" +#include "strings.hrc" #include "resource/sharedresources.hxx" #include #include diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx index 2dab49c56ebb..6763c985283c 100644 --- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx +++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx @@ -31,7 +31,7 @@ #include #include #include "resource/conn_shared_res.hrc" -#include "resource/common_res.hrc" +#include "strings.hrc" #include "resource/sharedresources.hxx" #include "java/LocalRef.hxx" #include "strings.hxx" diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx index 9f64d1bd6680..94af450a1c2e 100644 --- a/connectivity/source/drivers/jdbc/ResultSet.cxx +++ b/connectivity/source/drivers/jdbc/ResultSet.cxx @@ -41,7 +41,7 @@ #include #include #include -#include "resource/common_res.hrc" +#include "strings.hrc" #include "resource/sharedresources.hxx" #include "java/LocalRef.hxx" diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx index 26d6dc812f1a..8b8e97c3fb20 100644 --- a/connectivity/source/drivers/macab/MacabDriver.cxx +++ b/connectivity/source/drivers/macab/MacabDriver.cxx @@ -26,7 +26,7 @@ #include #include #include -#include "resource/macab_res.hrc" +#include "strings.hrc" #include #include diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx index e7e770d2a8fe..49d5ec92cfd8 100644 --- a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx +++ b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx @@ -23,7 +23,7 @@ #include "propertyids.hxx" #include #include -#include "resource/macab_res.hrc" +#include "strings.hrc" #include "resource/sharedresources.hxx" using namespace connectivity::macab; diff --git a/connectivity/source/drivers/macab/MacabResultSet.cxx b/connectivity/source/drivers/macab/MacabResultSet.cxx index ec72d269a7a8..eaf74c2776b0 100644 --- a/connectivity/source/drivers/macab/MacabResultSet.cxx +++ b/connectivity/source/drivers/macab/MacabResultSet.cxx @@ -31,7 +31,7 @@ #include "TConnection.hxx" #include #include "resource/sharedresources.hxx" -#include "resource/macab_res.hrc" +#include "strings.hrc" using namespace connectivity::macab; using namespace cppu; diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx index 65ff01364635..6cdccdd9c460 100644 --- a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx +++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx @@ -23,7 +23,7 @@ #include "MacabRecords.hxx" #include "MacabAddressBook.hxx" #include "macabutilities.hxx" -#include "resource/macab_res.hrc" +#include "strings.hrc" using namespace connectivity::macab; using namespace com::sun::star::uno; diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx index 208c75cc0130..53a58d4950c8 100644 --- a/connectivity/source/drivers/macab/MacabStatement.cxx +++ b/connectivity/source/drivers/macab/MacabStatement.cxx @@ -30,7 +30,7 @@ #include "TConnection.hxx" #include #include "resource/sharedresources.hxx" -#include "resource/macab_res.hrc" +#include "strings.hrc" using namespace connectivity::macab; using namespace com::sun::star::uno; @@ -46,10 +46,10 @@ namespace connectivity { namespace macab { - void impl_throwError(sal_uInt16 _nErrorId) + void impl_throwError(const char* pErrorId) { ::connectivity::SharedResources aResources; - const OUString sError( aResources.getResourceString(_nErrorId) ); + const OUString sError( aResources.getResourceString(pErrorId) ); ::dbtools::throwGenericSQLException(sError,nullptr); } } diff --git a/connectivity/source/drivers/macab/macabutilities.hxx b/connectivity/source/drivers/macab/macabutilities.hxx index 6d401bc548ba..c384604e3514 100644 --- a/connectivity/source/drivers/macab/macabutilities.hxx +++ b/connectivity/source/drivers/macab/macabutilities.hxx @@ -134,7 +134,7 @@ namespace connectivity return dataType; } - void impl_throwError(sal_uInt16 _nErrorId); + void impl_throwError(const char* pErrorId); } } diff --git a/connectivity/source/drivers/mork/MConnection.cxx b/connectivity/source/drivers/mork/MConnection.cxx index 06f21b944074..9c421095232a 100644 --- a/connectivity/source/drivers/mork/MConnection.cxx +++ b/connectivity/source/drivers/mork/MConnection.cxx @@ -16,8 +16,7 @@ #include -#include "resource/mork_res.hrc" -#include "resource/common_res.hrc" +#include "strings.hrc" #include @@ -354,7 +353,6 @@ void OConnection::disposing() m_xCatalog.clear(); } - Reference< XTablesSupplier > SAL_CALL OConnection::createCatalog() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -368,10 +366,9 @@ Reference< XTablesSupplier > SAL_CALL OConnection::createCatalog() return xTab; } - void OConnection::throwSQLException( const ErrorDescriptor& _rError, const Reference< XInterface >& _rxContext ) { - if ( _rError.getResId() != 0 ) + if (_rError.getResId() != nullptr) { OSL_ENSURE( ( _rError.getErrorCondition() == 0 ), "OConnection::throwSQLException: unsupported error code combination!" ); @@ -405,12 +402,11 @@ void OConnection::throwSQLException( const ErrorDescriptor& _rError, const Refer throwGenericSQLException( STR_UNSPECIFIED_ERROR, _rxContext ); } - -void OConnection::throwSQLException( const sal_uInt16 _nErrorResourceId, const Reference< XInterface >& _rxContext ) +void OConnection::throwSQLException( const char* pErrorResourceId, const Reference< XInterface >& _rxContext ) { ErrorDescriptor aError; - aError.setResId( _nErrorResourceId ); - throwSQLException( aError, _rxContext ); + aError.setResId(pErrorResourceId); + throwSQLException(aError, _rxContext); } } } // namespace connectivity::mork diff --git a/connectivity/source/drivers/mork/MConnection.hxx b/connectivity/source/drivers/mork/MConnection.hxx index d53b5671cb99..7c30b17ae098 100644 --- a/connectivity/source/drivers/mork/MConnection.hxx +++ b/connectivity/source/drivers/mork/MConnection.hxx @@ -97,7 +97,7 @@ namespace connectivity css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL createCatalog(); void throwSQLException( const ErrorDescriptor& _rError, const css::uno::Reference< css::uno::XInterface >& _rxContext ); - void throwSQLException( const sal_uInt16 _nErrorResourceId, const css::uno::Reference< css::uno::XInterface >& _rxContext ); + void throwSQLException( const char* pErrorResourceId, const css::uno::Reference< css::uno::XInterface >& _rxContext ); }; } } diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx index 69f1fa1f9fbe..af42e314c41b 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx @@ -12,7 +12,7 @@ #include #include -#include "resource/common_res.hrc" +#include "strings.hrc" #include #include "MDatabaseMetaDataHelper.hxx" diff --git a/connectivity/source/drivers/mork/MErrorResource.hxx b/connectivity/source/drivers/mork/MErrorResource.hxx index 6c1e6596de29..aa4c7c201572 100644 --- a/connectivity/source/drivers/mork/MErrorResource.hxx +++ b/connectivity/source/drivers/mork/MErrorResource.hxx @@ -27,33 +27,33 @@ namespace connectivity class ErrorDescriptor { private: - sal_uInt16 m_nErrorResourceId; + const char* m_pErrorResourceId; sal_Int32 m_nErrorCondition; OUString m_sParameter; public: ErrorDescriptor() - :m_nErrorResourceId(0) + :m_pErrorResourceId(nullptr) ,m_nErrorCondition(0) ,m_sParameter() { } - void setResId( const sal_uInt16 _nErrorResourceId ) + void setResId(const char* pErrorResourceId) { - m_nErrorResourceId = _nErrorResourceId; + m_pErrorResourceId = pErrorResourceId; } void reset() { - m_nErrorResourceId = 0; + m_pErrorResourceId = nullptr; m_nErrorCondition = 0; } - sal_uInt16 getResId() const { return m_nErrorResourceId; } + const char* getResId() const { return m_pErrorResourceId; } sal_Int32 getErrorCondition() const { return m_nErrorCondition; } const OUString& getParameter() const { return m_sParameter; } - bool is() const { return ( m_nErrorResourceId != 0 ) || ( m_nErrorCondition != 0 ); } + bool is() const { return ( m_pErrorResourceId != nullptr ) || ( m_nErrorCondition != 0 ); } }; } } diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx b/connectivity/source/drivers/mork/MQueryHelper.cxx index 0d363249b63d..5e93429349b3 100644 --- a/connectivity/source/drivers/mork/MQueryHelper.cxx +++ b/connectivity/source/drivers/mork/MQueryHelper.cxx @@ -30,7 +30,7 @@ #include #include -#include "resource/mork_res.hrc" +#include "strings.hrc" #include diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx index d6edffaac63a..b3bf3b790fc4 100644 --- a/connectivity/source/drivers/mork/MResultSet.cxx +++ b/connectivity/source/drivers/mork/MResultSet.cxx @@ -30,8 +30,7 @@ #include "MResultSetMetaData.hxx" #include "FDatabaseMetaDataResultSet.hxx" -#include "resource/mork_res.hrc" -#include "resource/common_res.hrc" +#include "strings.hrc" using namespace ::comphelper; using namespace connectivity; diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx index 2a43e7b1323f..965fa5f2acc5 100644 --- a/connectivity/source/drivers/mork/MStatement.cxx +++ b/connectivity/source/drivers/mork/MStatement.cxx @@ -30,8 +30,7 @@ #include "sqlbison.hxx" #include "MResultSet.hxx" -#include "resource/mork_res.hrc" -#include "resource/common_res.hrc" +#include "strings.hrc" static ::osl::Mutex m_ThreadMutex; diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx index a23b2ccd1aeb..68a29c2e7c9b 100644 --- a/connectivity/source/drivers/mysql/YDriver.cxx +++ b/connectivity/source/drivers/mysql/YDriver.cxx @@ -27,10 +27,9 @@ #include #include #include "TConnection.hxx" -#include "resource/common_res.hrc" +#include "strings.hrc" #include "resource/sharedresources.hxx" - namespace connectivity { diff --git a/connectivity/source/drivers/mysql/YUser.cxx b/connectivity/source/drivers/mysql/YUser.cxx index 977b5bb0ea50..846f41ba8269 100644 --- a/connectivity/source/drivers/mysql/YUser.cxx +++ b/connectivity/source/drivers/mysql/YUser.cxx @@ -25,7 +25,7 @@ #include #include #include "TConnection.hxx" -#include "resource/common_res.hrc" +#include "strings.hrc" using namespace connectivity; using namespace connectivity::mysql; diff --git a/connectivity/source/drivers/odbc/ODriver.cxx b/connectivity/source/drivers/odbc/ODriver.cxx index 83b795fbbe4c..72ae9593c783 100644 --- a/connectivity/source/drivers/odbc/ODriver.cxx +++ b/connectivity/source/drivers/odbc/ODriver.cxx @@ -23,7 +23,7 @@ #include "odbc/OTools.hxx" #include #include -#include "resource/common_res.hrc" +#include "strings.hrc" #include "resource/sharedresources.hxx" using namespace connectivity::odbc; diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx b/connectivity/source/drivers/odbc/OPreparedStatement.cxx index ca487c78bcef..b5e9ed498f52 100644 --- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx +++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx @@ -35,7 +35,7 @@ #include #include #include -#include "resource/common_res.hrc" +#include "strings.hrc" #include #include #include diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx index 6a038b66c1a9..795aad1c51b0 100644 --- a/connectivity/source/drivers/odbc/OStatement.cxx +++ b/connectivity/source/drivers/odbc/OStatement.cxx @@ -35,7 +35,7 @@ #include #include #include -#include "resource/common_res.hrc" +#include "strings.hrc" #include using namespace ::comphelper; diff --git a/connectivity/source/drivers/writer/WConnection.cxx b/connectivity/source/drivers/writer/WConnection.cxx index 24963cce7f32..70fae3a0d04f 100644 --- a/connectivity/source/drivers/writer/WConnection.cxx +++ b/connectivity/source/drivers/writer/WConnection.cxx @@ -22,7 +22,7 @@ #include "writer/WCatalog.hxx" #include "writer/WDriver.hxx" #include "resource/sharedresources.hxx" -#include "resource/common_res.hrc" +#include "strings.hrc" #include #include #include diff --git a/connectivity/source/drivers/writer/WDriver.cxx b/connectivity/source/drivers/writer/WDriver.cxx index 3406d8589434..ae6a08157390 100644 --- a/connectivity/source/drivers/writer/WDriver.cxx +++ b/connectivity/source/drivers/writer/WDriver.cxx @@ -22,7 +22,7 @@ #include #include #include "resource/sharedresources.hxx" -#include "resource/common_res.hrc" +#include "strings.hrc" #include using namespace connectivity::file; diff --git a/connectivity/source/inc/TConnection.hxx b/connectivity/source/inc/TConnection.hxx index cc9ad49b1544..2a18da132d04 100644 --- a/connectivity/source/inc/TConnection.hxx +++ b/connectivity/source/inc/TConnection.hxx @@ -62,7 +62,7 @@ namespace connectivity rtl_TextEncoding getTextEncoding() const { return m_nTextEncoding; } const OUString& getURL() const { return m_sURL; } void setURL(const OUString& _rsUrl) { m_sURL = _rsUrl; } - void throwGenericSQLException( sal_uInt16 _nErrorResourceId,const css::uno::Reference< css::uno::XInterface>& _xContext ); + void throwGenericSQLException(const char* pErrorResourceId, const css::uno::Reference< css::uno::XInterface>& _xContext); const SharedResources& getResources() const { return m_aResources;} void setConnectionInfo(const css::uno::Sequence< css::beans::PropertyValue >& _aInfo) { m_aConnectionInfo = _aInfo; } diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx index 9753c05a617c..47b157e21cfd 100644 --- a/connectivity/source/inc/dbase/DIndex.hxx +++ b/connectivity/source/inc/dbase/DIndex.hxx @@ -86,7 +86,7 @@ namespace connectivity OUString getCompletePath(); void closeImpl(); // Closes and kills the index file and throws an error - void impl_killFileAndthrowError_throw(sal_uInt16 _nErrorId,const OUString& _sFile); + void impl_killFileAndthrowError_throw(const char* pErrorId, const OUString& _sFile); protected: virtual ~ODbaseIndex() override; public: diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx index 1166b691af1e..a80c0686c7d4 100644 --- a/connectivity/source/inc/dbase/DTable.hxx +++ b/connectivity/source/inc/dbase/DTable.hxx @@ -134,7 +134,7 @@ namespace connectivity /// @throws css::container::ElementExistException /// @throws css::uno::RuntimeException void SAL_CALL renameImpl( const OUString& newName ); - void throwInvalidColumnType(const sal_uInt16 _nErrorId,const OUString& _sColumnName); + void throwInvalidColumnType(const char* pErrorId, const OUString& _sColumnName); protected: virtual void FileClose() override; diff --git a/connectivity/source/inc/resource/ado_res.hrc b/connectivity/source/inc/resource/ado_res.hrc deleted file mode 100644 index 8144bce7ea3d..000000000000 --- a/connectivity/source/inc/resource/ado_res.hrc +++ /dev/null @@ -1,41 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef CONNECTIVITY_RESOURCE_ADO_HRC -#define CONNECTIVITY_RESOURCE_ADO_HRC - -#include "resource/conn_shared_res.hrc" -#include "resource/common_res.hrc" - -// = the ado driver's resource strings - -#define STR_INVALID_COLUMN_DESCRIPTOR_ERROR ( STR_ADO_BASE + 1 ) -#define STR_INVALID_GROUP_DESCRIPTOR_ERROR ( STR_ADO_BASE + 2 ) -#define STR_INVALID_INDEX_DESCRIPTOR_ERROR ( STR_ADO_BASE + 3 ) -#define STR_INVALID_KEY_DESCRIPTOR_ERROR ( STR_ADO_BASE + 4 ) -#define STR_INVALID_TABLE_DESCRIPTOR_ERROR ( STR_ADO_BASE + 5 ) -#define STR_INVALID_USER_DESCRIPTOR_ERROR ( STR_ADO_BASE + 6 ) -#define STR_INVALID_VIEW_DESCRIPTOR_ERROR ( STR_ADO_BASE + 7 ) -#define STR_VIEW_NO_COMMAND_ERROR ( STR_ADO_BASE + 8 ) -#define STR_TYPE_NOT_CONVERT ( STR_ADO_BASE + 9 ) -#define STR_NO_CONNECTION ( STR_ADO_BASE + 10 ) - -#endif // CONNECTIVITY_RESOURCE_ADO_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/inc/resource/calc_res.hrc b/connectivity/source/inc/resource/calc_res.hrc deleted file mode 100644 index 343c983a99a7..000000000000 --- a/connectivity/source/inc/resource/calc_res.hrc +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef CONNECTIVITY_RESOURCE_CALC_HRC -#define CONNECTIVITY_RESOURCE_CALC_HRC - -#include "resource/conn_shared_res.hrc" -#include "resource/common_res.hrc" - -// = the calc driver's resource strings - -#define STR_LOAD_FILE_ERROR_MESSAGE ( STR_CALC_BASE + 0 ) - -#endif // CONNECTIVITY_RESOURCE_CALC_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/inc/resource/common_res.hrc b/connectivity/source/inc/resource/common_res.hrc deleted file mode 100644 index 842e1cc4724a..000000000000 --- a/connectivity/source/inc/resource/common_res.hrc +++ /dev/null @@ -1,66 +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 CONNECTIVITY_RESOURCE_COMMON_HRC -#define CONNECTIVITY_RESOURCE_COMMON_HRC - -#include "resource/conn_shared_res.hrc" - -// = common strings - -#define STR_STRING_LENGTH_EXCEEDED ( STR_COMMON_BASE + 1 ) -#define STR_CANNOT_CONVERT_STRING ( STR_COMMON_BASE + 2 ) -#define STR_URI_SYNTAX_ERROR ( STR_COMMON_BASE + 3 ) -#define STR_COULD_NOT_LOAD_FILE ( STR_COMMON_BASE + 4 ) -#define STR_QUERY_TOO_COMPLEX ( STR_COMMON_BASE + 5 ) -#define STR_OPERATOR_TOO_COMPLEX ( STR_COMMON_BASE + 6 ) -#define STR_QUERY_INVALID_LIKE_COLUMN ( STR_COMMON_BASE + 7 ) -#define STR_QUERY_INVALID_LIKE_STRING ( STR_COMMON_BASE + 8 ) -#define STR_QUERY_NOT_LIKE_TOO_COMPLEX ( STR_COMMON_BASE + 9 ) -#define STR_QUERY_LIKE_WILDCARD ( STR_COMMON_BASE + 10 ) -#define STR_QUERY_LIKE_WILDCARD_MANY ( STR_COMMON_BASE + 11 ) -#define STR_INVALID_COLUMNNAME ( STR_COMMON_BASE + 12 ) -#define STR_NO_CLASSNAME ( STR_COMMON_BASE + 13 ) -#define STR_NO_CLASSNAME_PATH ( STR_COMMON_BASE + 14 ) -#define STR_UNKNOWN_PARA_TYPE ( STR_COMMON_BASE + 15 ) -#define STR_INVALID_COLUMN_SELECTION ( STR_COMMON_BASE + 16 ) -#define STR_PARA_ONLY_PREPARED ( STR_COMMON_BASE + 17 ) -#define STR_COLUMN_NOT_UPDATEABLE ( STR_COMMON_BASE + 18 ) -#define STR_ROW_ALREADY_DELETED ( STR_COMMON_BASE + 19 ) -#define STR_UNKNOWN_COLUMN_TYPE ( STR_COMMON_BASE + 20 ) -#define STR_FORMULA_WRONG ( STR_COMMON_BASE + 21 ) -#define STR_NO_JAVA ( STR_COMMON_BASE + 22 ) -#define STR_NO_RESULTSET ( STR_COMMON_BASE + 23 ) -#define STR_NO_ROWCOUNT ( STR_COMMON_BASE + 24 ) -#define STR_ERRORMSG_SEQUENCE ( STR_COMMON_BASE + 25 ) -#define STR_INVALID_INDEX ( STR_COMMON_BASE + 26 ) -#define STR_UNSUPPORTED_FUNCTION ( STR_COMMON_BASE + 27 ) -#define STR_UNSUPPORTED_FEATURE ( STR_COMMON_BASE + 28 ) -#define STR_INVALID_PARA_COUNT ( STR_COMMON_BASE + 30 ) -#define STR_PRIVILEGE_NOT_GRANTED ( STR_COMMON_BASE + 31 ) -#define STR_PRIVILEGE_NOT_REVOKED ( STR_COMMON_BASE + 32 ) -#define STR_INVALID_BOOKMARK ( STR_COMMON_BASE + 33 ) -#define STR_NO_ELEMENT_NAME ( STR_COMMON_BASE + 34 ) -#define STR_NO_INPUTSTREAM ( STR_COMMON_BASE + 35 ) -#define STR_WRONG_PARAM_INDEX ( STR_COMMON_BASE + 37 ) -#define STR_NO_CONNECTION_GIVEN ( STR_COMMON_BASE + 38 ) - -#endif // CONNECTIVITY_RESOURCE_COMMON_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/inc/resource/dbase_res.hrc b/connectivity/source/inc/resource/dbase_res.hrc deleted file mode 100644 index 54f0232825df..000000000000 --- a/connectivity/source/inc/resource/dbase_res.hrc +++ /dev/null @@ -1,52 +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 CONNECTIVITY_RESOURCE_DBASE_HRC -#define CONNECTIVITY_RESOURCE_DBASE_HRC - -#include "resource/conn_shared_res.hrc" -#include "resource/common_res.hrc" - -// = the calc driver's resource strings - -#define STR_COULD_NOT_DELETE_INDEX ( STR_DBASE_BASE + 0 ) -#define STR_COULD_NOT_CREATE_INDEX_NOT_UNIQUE ( STR_DBASE_BASE + 1 ) -#define STR_SQL_NAME_ERROR ( STR_DBASE_BASE + 2 ) -#define STR_COULD_NOT_DELETE_FILE ( STR_DBASE_BASE + 3 ) -#define STR_INVALID_COLUMN_TYPE ( STR_DBASE_BASE + 4 ) -#define STR_INVALID_COLUMN_PRECISION ( STR_DBASE_BASE + 5 ) -#define STR_INVALID_PRECISION_SCALE ( STR_DBASE_BASE + 6 ) -#define STR_INVALID_COLUMN_NAME_LENGTH ( STR_DBASE_BASE + 7 ) -#define STR_DUPLICATE_VALUE_IN_COLUMN ( STR_DBASE_BASE + 8 ) -#define STR_INVALID_COLUMN_DECIMAL_VALUE ( STR_DBASE_BASE + 9 ) -#define STR_COLUMN_NOT_ALTERABLE ( STR_DBASE_BASE + 10 ) -#define STR_COLUMN_NOT_ADDABLE ( STR_DBASE_BASE + 11 ) -#define STR_COLUMN_NOT_DROP ( STR_DBASE_BASE + 12 ) -#define STR_COULD_NOT_ALTER_TABLE ( STR_DBASE_BASE + 13 ) -#define STR_INVALID_DBASE_FILE ( STR_DBASE_BASE + 14 ) -#define STR_ONL_ONE_COLUMN_PER_INDEX ( STR_DBASE_BASE + 15 ) -#define STR_COULD_NOT_CREATE_INDEX ( STR_DBASE_BASE + 16 ) -#define STR_COULD_NOT_CREATE_INDEX_NAME ( STR_DBASE_BASE + 17 ) -#define STR_INVALID_COLUMN_VALUE ( STR_DBASE_BASE + 18 ) -#define STR_TABLE_NOT_DROP ( STR_DBASE_BASE + 19 ) -#define STR_COULD_NOT_CREATE_INDEX_KEYSIZE ( STR_DBASE_BASE + 20 ) - -#endif // CONNECTIVITY_RESOURCE_DBASE_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/inc/resource/evoab2_res.hrc b/connectivity/source/inc/resource/evoab2_res.hrc deleted file mode 100644 index 6cb16db7e14f..000000000000 --- a/connectivity/source/inc/resource/evoab2_res.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 CONNECTIVITY_RESOURCE_EVOAB2_HRC -#define CONNECTIVITY_RESOURCE_EVOAB2_HRC - -#include "resource/conn_shared_res.hrc" -#include "resource/common_res.hrc" - -// = the calc driver's resource strings - -#define STR_CANNOT_OPEN_BOOK ( STR_EVOAB2_BASE + 0 ) -#define STR_SORT_BY_COL_ONLY ( STR_EVOAB2_BASE + 1 ) - -#endif // CONNECTIVITY_RESOURCE_CALC_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/inc/resource/file_res.hrc b/connectivity/source/inc/resource/file_res.hrc deleted file mode 100644 index f7072f684974..000000000000 --- a/connectivity/source/inc/resource/file_res.hrc +++ /dev/null @@ -1,40 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef CONNECTIVITY_RESOURCE_FILE_HRC -#define CONNECTIVITY_RESOURCE_FILE_HRC - -#include "resource/conn_shared_res.hrc" -#include "resource/common_res.hrc" - -// = the file driver's resource strings - -#define STR_QUERY_COMPLEX_COUNT ( STR_FILE_BASE + 0 ) -#define STR_QUERY_INVALID_BETWEEN ( STR_FILE_BASE + 1 ) -#define STR_TABLE_READONLY ( STR_FILE_BASE + 2 ) -#define STR_DELETE_ROW ( STR_FILE_BASE + 3 ) -#define STR_NO_VALID_FILE_URL ( STR_FILE_BASE + 4 ) -#define STR_QUERY_MORE_TABLES ( STR_FILE_BASE + 5 ) -#define STR_QUERY_NO_TABLE ( STR_FILE_BASE + 6 ) -#define STR_QUERY_NO_COLUMN ( STR_FILE_BASE + 7 ) -#define STR_QUERY_FUNCTION_NOT_SUPPORTED ( STR_FILE_BASE + 8 ) - -#endif // CONNECTIVITY_RESOURCE_FILE_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/inc/resource/hsqldb_res.hrc b/connectivity/source/inc/resource/hsqldb_res.hrc deleted file mode 100644 index 6065e6f8fb03..000000000000 --- a/connectivity/source/inc/resource/hsqldb_res.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 CONNECTIVITY_RESOURCE_HSQLDB_HRC -#define CONNECTIVITY_RESOURCE_HSQLDB_HRC - -#include "resource/conn_shared_res.hrc" -#include "resource/common_res.hrc" - -// = the hsqldb driver's resource strings - -#define STR_NO_STORAGE ( STR_HSQLDB_BASE + 0 ) -#define STR_INVALID_FILE_URL ( STR_HSQLDB_BASE + 1 ) -#define STR_NO_TABLE_CONTAINER ( STR_HSQLDB_BASE + 2 ) -#define STR_NO_TABLENAME ( STR_HSQLDB_BASE + 4 ) -#define STR_NO_DOCUMENTUI ( STR_HSQLDB_BASE + 5 ) -#define STR_ERROR_NEW_VERSION ( STR_HSQLDB_BASE + 6 ) - -#endif // CONNECTIVITY_RESOURCE_HSQLDB_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/inc/resource/macab_res.hrc b/connectivity/source/inc/resource/macab_res.hrc deleted file mode 100644 index 188372b78512..000000000000 --- a/connectivity/source/inc/resource/macab_res.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 CONNECTIVITY_RESOURCE_MACAB_HRC -#define CONNECTIVITY_RESOURCE_MACAB_HRC - -#include "resource/conn_shared_res.hrc" -#include "resource/common_res.hrc" - -// = the macab driver's resource strings - -#define STR_NO_TABLE ( STR_MACAB_BASE + 0 ) -#define STR_NO_MAC_OS_FOUND ( STR_MACAB_BASE + 1 ) - -#endif // CONNECTIVITY_RESOURCE_MACAB_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/inc/resource/mork_res.hrc b/connectivity/source/inc/resource/mork_res.hrc deleted file mode 100644 index f69c136733be..000000000000 --- a/connectivity/source/inc/resource/mork_res.hrc +++ /dev/null @@ -1,41 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef CONNECTIVITY_RESOURCE_MORK_HRC -#define CONNECTIVITY_RESOURCE_MORK_HRC - -#include "resource/conn_shared_res.hrc" - -// = the mozab driver's resource strings - - // FREE -#define STR_ERR_EXECUTING_QUERY ( STR_MORK_BASE + 10 ) -#define STR_QUERY_INVALID_IS_NULL_COLUMN ( STR_MORK_BASE + 15 ) -#define STR_ERROR_REFRESH_ROW ( STR_MORK_BASE + 19 ) -#define STR_ILLEGAL_MOVEMENT ( STR_MORK_BASE + 20 ) -#define STR_ERROR_GET_ROW ( STR_MORK_BASE + 21 ) -#define STR_COMMIT_ROW ( STR_MORK_BASE + 22 ) -#define STR_QUERY_AT_LEAST_ONE_TABLES ( STR_MORK_BASE + 27 ) -#define STR_NO_COUNT_SUPPORT ( STR_MORK_BASE + 28 ) -#define STR_STMT_TYPE_NOT_SUPPORTED ( STR_MORK_BASE + 29 ) -#define STR_UNSPECIFIED_ERROR ( STR_MORK_BASE + 31 ) - -#endif // CONNECTIVITY_RESOURCE_MOZAB_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/inc/resource/sharedresources.hxx b/connectivity/source/inc/resource/sharedresources.hxx index f0cbaec43784..c284b4a9e59a 100644 --- a/connectivity/source/inc/resource/sharedresources.hxx +++ b/connectivity/source/inc/resource/sharedresources.hxx @@ -41,20 +41,20 @@ namespace connectivity ~SharedResources(); /** loads a string from the shared resource file - @param _nResId + @param pResId the resource ID of the string @return the string from the resource file */ OUString getResourceString( - ResourceId _nResId + const char* pResId ) const; /** loads a string from the shared resource file, and replaces a given ASCII pattern with a given string - @param _nResId + @param pResId the resource ID of the string to load @param _pAsciiPatternToReplace the ASCII string which is to search in the string. Must not be . @@ -66,7 +66,7 @@ namespace connectivity */ OUString getResourceStringWithSubstitution( - ResourceId _nResId, + const char* pResId, const sal_Char* _pAsciiPatternToReplace, const OUString& _rStringToSubstitute ) const; @@ -74,7 +74,7 @@ namespace connectivity /** loads a string from the shared resource file, and replaces a given ASCII pattern with a given string - @param _nResId + @param pResId the resource ID of the string to load @param _pAsciiPatternToReplace1 the ASCII string (1) which is to search in the string. Must not be . @@ -90,7 +90,7 @@ namespace connectivity */ OUString getResourceStringWithSubstitution( - ResourceId _nResId, + const char* pResId, const sal_Char* _pAsciiPatternToReplace1, const OUString& _rStringToSubstitute1, const sal_Char* _pAsciiPatternToReplace2, @@ -100,7 +100,7 @@ namespace connectivity /** loads a string from the shared resource file, and replaces a given ASCII pattern with a given string - @param _nResId + @param pResId the resource ID of the string to load @param _pAsciiPatternToReplace1 the ASCII string (1) which is to search in the string. Must not be . @@ -120,7 +120,7 @@ namespace connectivity */ OUString getResourceStringWithSubstitution( - ResourceId _nResId, + const char* pResId, const sal_Char* _pAsciiPatternToReplace1, const OUString& _rStringToSubstitute1, const sal_Char* _pAsciiPatternToReplace2, @@ -131,7 +131,7 @@ namespace connectivity /** loads a string from the shared resource file, and replaces a given ASCII pattern with a given string - @param _nResId + @param pResId the resource ID of the string to load @param _aStringToSubstitutes A list of substitutions. @@ -139,7 +139,7 @@ namespace connectivity @return the string from the resource file, with applied string substitution */ - OUString getResourceStringWithSubstitution( ResourceId _nResId, + OUString getResourceStringWithSubstitution( const char* pResId, const std::list< std::pair >& _rStringToSubstitutes) const; }; diff --git a/connectivity/source/resource/conn_error_message.src b/connectivity/source/resource/conn_error_message.src deleted file mode 100644 index 13212649e40e..000000000000 --- a/connectivity/source/resource/conn_error_message.src +++ /dev/null @@ -1,92 +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 . - */ - -// note: the resource IDs of the strings herein *must* correspond to the -// com::sun::star::sdb::ErrorCondition values. -// -// For a given error condition value n, the message string must have ID -// 256 + 2*n, and the SQL state string (if applicable) must -// have ID 256 + 2*n + 1. -// -// The messages must be localized, the SQL states must *not*. - -// ROW_SET_OPERATION_VETOED = 100 -String 256 + 2*100 + 0 -{ - Text [ en-US ] = "The record operation has been vetoed."; -}; - -// PARSER_CYCLIC_SUB_QUERIES = 200 -String 256 + 2*200 + 0 -{ - Text [ en-US ] = "The statement contains a cyclic reference to one or more sub queries."; -}; - -// DB_OBJECT_NAME_WITH_SLASHES = 300 -String 256 + 2*300 + 0 -{ - Text [ en-US ] = "The name must not contain any slashes ('/')."; -}; - -// DB_INVALID_SQL_NAME = 301 -String 256 + 2*301 + 0 -{ - Text [ en-US ] = "$1$ is no SQL conform identifier."; -}; - -// DB_QUERY_NAME_WITH_QUOTES = 302 -String 256 + 2*302 + 0 -{ - Text [ en-US ] = "Query names must not contain quote characters."; -}; - -// DB_OBJECT_NAME_IS_USED = 303 -String 256 + 2*303 + 0 -{ - Text [ en-US ] = "The name '$1$' is already in use in the database."; -}; - -// DB_NOT_CONNECTED = 304 -String 256 + 2*304 + 0 -{ - Text [ en-US ] = "No connection to the database exists."; -}; - -String 256 + 2*304 + 1 -{ - Text = "08003"; -}; - -String 256 + 2*500 + 0 -{ - Text [ en-US ] = "No $1$ exists."; -}; - -// DATA_CANNOT_SELECT_UNFILTERED = 550 -String 256 + 2*550 + 0 -{ - Text [ en-US ] = "Unable to display the complete table content. Please apply a filter."; -}; - -String 256 + 2*550 + 1 -{ - Text = "IM001"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/resource/conn_shared_res.src b/connectivity/source/resource/conn_shared_res.src deleted file mode 100644 index f199414aa1f4..000000000000 --- a/connectivity/source/resource/conn_shared_res.src +++ /dev/null @@ -1,493 +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 "resource/mork_res.hrc" -#include "resource/macab_res.hrc" -#include "resource/calc_res.hrc" -#include "resource/ado_res.hrc" -#include "resource/dbase_res.hrc" -#include "resource/file_res.hrc" -#include "resource/evoab2_res.hrc" -#include "resource/kab_res.hrc" -#include "resource/hsqldb_res.hrc" - -// = the mozab driver's resource strings - -String STR_ERR_EXECUTING_QUERY -{ - Text [ en-US ] = "An error occurred while executing the query."; -}; - -String STR_QUERY_AT_LEAST_ONE_TABLES -{ - Text [ en-US ] = "The query can not be executed. It needs at least one table."; -}; - -String STR_NO_COUNT_SUPPORT -{ - Text [ en-US ] = "The driver does not support the 'COUNT' function."; -}; - -String STR_STMT_TYPE_NOT_SUPPORTED -{ - Text [ en-US ] = "This statement type not supported by this database driver."; -}; - -String STR_UNSPECIFIED_ERROR -{ - Text [ en-US ] = "An unknown error occurred."; -}; - -String STR_ERROR_REFRESH_ROW -{ - Text [ en-US ] = "An error occurred while refreshing the current row."; -}; - -String STR_ERROR_GET_ROW -{ - Text [ en-US ] = "An error occurred while getting the current row."; -}; - -String STR_QUERY_INVALID_IS_NULL_COLUMN -{ - Text [ en-US ] = "The query can not be executed. The 'IS NULL' can only be used with a column name."; -}; - -String STR_ILLEGAL_MOVEMENT -{ - Text [ en-US ] = "Illegal cursor movement occurred."; -}; - -String STR_COMMIT_ROW -{ - Text [ en-US ] = "Please commit row '$position$' before update rows or insert new rows."; -}; - -// = common strings - -String STR_NO_CONNECTION_GIVEN -{ - Text [ en-US ] = "It doesn't exist a connection to the database."; -}; -String STR_WRONG_PARAM_INDEX -{ - Text [ en-US ] = "You tried to set a parameter at position '$pos$' but there is/are only '$count$' parameter(s) allowed. One reason may be that the property \"ParameterNameSubstitution\" is not set to TRUE in the data source."; -}; -String STR_NO_INPUTSTREAM -{ - Text [ en-US ] = "The input stream was not set."; -}; -String STR_NO_ELEMENT_NAME -{ - Text [ en-US ] = "There is no element named '$name$'."; -}; -String STR_INVALID_BOOKMARK -{ - Text [ en-US ] = "Invalid bookmark value"; -}; -String STR_PRIVILEGE_NOT_GRANTED -{ - Text [ en-US ] = "Privilege not granted: Only table privileges can be granted."; -}; -String STR_PRIVILEGE_NOT_REVOKED -{ - Text [ en-US ] = "Privilege not revoked: Only table privileges can be revoked."; -}; - -String STR_ERRORMSG_SEQUENCE -{ - Text [ en-US ] = "Function sequence error."; -}; -String STR_INVALID_INDEX -{ - Text [ en-US ] = "Invalid descriptor index."; -}; -String STR_UNSUPPORTED_FUNCTION -{ - Text [ en-US ] = "The driver does not support the function '$functionname$'."; -}; -String STR_UNSUPPORTED_FEATURE -{ - Text [ en-US ] = "The driver does not support the functionality for '$featurename$'. It is not implemented."; -}; -String STR_FORMULA_WRONG -{ - Text [ en-US ] = "The formula for TypeInfoSettings is wrong!"; -}; -String STR_STRING_LENGTH_EXCEEDED -{ - Text [ en-US ] = "The string '$string$' exceeds the maximum length of $maxlen$ characters when converted to the target character set '$charset$'."; -}; - -String STR_CANNOT_CONVERT_STRING -{ - Text [ en-US ] = "The string '$string$' cannot be converted using the encoding '$charset$'."; -}; - -String STR_URI_SYNTAX_ERROR -{ - Text [ en-US ] = "The connection URL is invalid."; -}; - -String STR_QUERY_TOO_COMPLEX -{ - Text [ en-US ] = "The query can not be executed. It is too complex."; -}; -String STR_OPERATOR_TOO_COMPLEX -{ - Text [ en-US ] = "The query can not be executed. The operator is too complex."; -}; -String STR_QUERY_INVALID_LIKE_COLUMN -{ - Text [ en-US ] = "The query can not be executed. You cannot use 'LIKE' with columns of this type."; -}; -String STR_QUERY_INVALID_LIKE_STRING -{ - Text [ en-US ] = "The query can not be executed. 'LIKE' can be used with a string argument only."; -}; -String STR_QUERY_NOT_LIKE_TOO_COMPLEX -{ - Text [ en-US ] = "The query can not be executed. The 'NOT LIKE' condition is too complex."; -}; -String STR_QUERY_LIKE_WILDCARD -{ - Text [ en-US ] = "The query can not be executed. The 'LIKE' condition contains wildcard in the middle."; -}; -String STR_QUERY_LIKE_WILDCARD_MANY -{ - Text [ en-US ] = "The query can not be executed. The 'LIKE' condition contains too many wildcards."; -}; -String STR_INVALID_COLUMNNAME -{ - Text [ en-US ] = "The column name '$columnname$' is not valid."; -}; -String STR_INVALID_COLUMN_SELECTION -{ - Text [ en-US ] = "The statement contains an invalid selection of columns."; -}; -String STR_COLUMN_NOT_UPDATEABLE -{ - Text [ en-US ] = "The column at position '$position$' could not be updated."; -}; - -String STR_COULD_NOT_LOAD_FILE -{ - Text [ en-US ] = "The file $filename$ could not be loaded."; -}; - -String STR_LOAD_FILE_ERROR_MESSAGE -{ - Text [ en-US ] = "The attempt to load the file resulted in the following error message ($exception_type$):\n\n$error_message$"; -}; - -// = the ado driver's resource strings - -String STR_TYPE_NOT_CONVERT -{ - Text [ en-US ] = "The type could not be converted."; -}; -String STR_INVALID_COLUMN_DESCRIPTOR_ERROR -{ - Text [ en-US ] = "Could not append column: invalid column descriptor."; -}; - -String STR_INVALID_GROUP_DESCRIPTOR_ERROR -{ - Text [ en-US ] = "Could not create group: invalid object descriptor."; -}; -String STR_INVALID_INDEX_DESCRIPTOR_ERROR -{ - Text [ en-US ] = "Could not create index: invalid object descriptor."; -}; -String STR_INVALID_KEY_DESCRIPTOR_ERROR -{ - Text [ en-US ] = "Could not create key: invalid object descriptor."; -}; - -String STR_INVALID_TABLE_DESCRIPTOR_ERROR -{ - Text [ en-US ] = "Could not create table: invalid object descriptor."; -}; - -String STR_INVALID_USER_DESCRIPTOR_ERROR -{ - Text [ en-US ] = "Could not create user: invalid object descriptor."; -}; - -String STR_INVALID_VIEW_DESCRIPTOR_ERROR -{ - Text [ en-US ] = "Could not create view: invalid object descriptor."; -}; - -String STR_VIEW_NO_COMMAND_ERROR -{ - Text [ en-US ] = "Could not create view: no command object."; -}; - -String STR_NO_CONNECTION -{ - Text [ en-US ] = "The connection could not be created. May be the necessary data provider is not installed."; -}; - -// dbase -String STR_COULD_NOT_DELETE_INDEX -{ - Text [ en-US ] = "The index could not be deleted. An unknown error while accessing the file system occurred."; -}; -String STR_ONL_ONE_COLUMN_PER_INDEX -{ - Text [ en-US ] = "The index could not be created. Only one column per index is allowed."; -}; -String STR_COULD_NOT_CREATE_INDEX_NOT_UNIQUE -{ - Text [ en-US ] = "The index could not be created. The values are not unique."; -}; - -String STR_COULD_NOT_CREATE_INDEX -{ - Text [ en-US ] = "The index could not be created. An unknown error appeared."; -}; -String STR_COULD_NOT_CREATE_INDEX_NAME -{ - Text [ en-US ] = "The index could not be created. The file '$filename$' is used by an other index."; -}; -String STR_COULD_NOT_CREATE_INDEX_KEYSIZE -{ - Text [ en-US ] = "The index could not be created. The size of the chosen column is too big."; -}; - -String STR_SQL_NAME_ERROR -{ - Text [ en-US ] = "The name '$name$' doesn't match SQL naming constraints."; -}; - -String STR_COULD_NOT_DELETE_FILE -{ - Text [ en-US ] = "The file $filename$ could not be deleted."; -}; - -String STR_INVALID_COLUMN_TYPE -{ - Text [ en-US ] = "Invalid column type for column '$columnname$'."; -}; -String STR_INVALID_COLUMN_PRECISION -{ - Text [ en-US ] = "Invalid precision for column '$columnname$'."; -}; - -String STR_INVALID_PRECISION_SCALE -{ - Text [ en-US ] = "Precision is less than scale for column '$columnname$'."; -}; - -String STR_INVALID_COLUMN_NAME_LENGTH -{ - Text [ en-US ] = "Invalid column name length for column '$columnname$'."; -}; - -String STR_DUPLICATE_VALUE_IN_COLUMN -{ - Text [ en-US ] = "Duplicate value found in column '$columnname$'."; -}; - -String STR_INVALID_COLUMN_DECIMAL_VALUE -{ - Text [ en-US ] = "The '$columnname$' column has been defined as a \"Decimal\" type, the max. length is $precision$ characters (with $scale$ decimal places).\n\nThe specified value \"$value$ is longer than the number of digits allowed."; -}; - -String STR_COLUMN_NOT_ALTERABLE -{ - Text [ en-US ] = "The column '$columnname$' could not be altered. May be the file system is write protected."; -}; -String STR_INVALID_COLUMN_VALUE -{ - Text [ en-US ] = "The column '$columnname$' could not be updated. The value is invalid for that column."; -}; -String STR_COLUMN_NOT_ADDABLE -{ - Text [ en-US ] = "The column '$columnname$' could not be added. May be the file system is write protected."; -}; -String STR_COLUMN_NOT_DROP -{ - Text [ en-US ] = "The column at position '$position$' could not be dropped. May be the file system is write protected."; -}; -String STR_TABLE_NOT_DROP -{ - Text [ en-US ] = "The table '$tablename$' could not be dropped. May be the file system is write protected."; -}; -String STR_COULD_NOT_ALTER_TABLE -{ - Text [ en-US ] = "The table could not be altered."; -}; - -String STR_INVALID_DBASE_FILE -{ - Text [ en-US ] = "The file '$filename$' is an invalid (or unrecognized) dBase file."; -}; - -// Evoab2 - -String STR_CANNOT_OPEN_BOOK -{ - Text [ en-US ] = "Cannot open Evolution address book."; -}; - -String STR_SORT_BY_COL_ONLY -{ - Text [ en-US ] = "Can only sort by table columns."; -}; - -// File -String STR_QUERY_COMPLEX_COUNT -{ - Text [ en-US ] = "The query can not be executed. It is too complex. Only \"COUNT(*)\" is supported."; -}; -String STR_QUERY_INVALID_BETWEEN -{ - Text [ en-US ] = "The query can not be executed. The 'BETWEEN' arguments are not correct."; -}; -String STR_QUERY_FUNCTION_NOT_SUPPORTED -{ - Text [ en-US ] = "The query can not be executed. The function is not supported."; -}; -String STR_TABLE_READONLY -{ - Text [ en-US ] = "The table can not be changed. It is read only."; -}; -String STR_DELETE_ROW -{ - Text [ en-US ] = "The row could not be deleted. The option \"Display inactive records\" is set."; -}; -String STR_ROW_ALREADY_DELETED -{ - Text [ en-US ] = "The row could not be deleted. It is already deleted."; -}; -String STR_QUERY_MORE_TABLES -{ - Text [ en-US ] = "The query can not be executed. It contains more than one table."; -}; -String STR_QUERY_NO_TABLE -{ - Text [ en-US ] = "The query can not be executed. It contains no valid table."; -}; -String STR_QUERY_NO_COLUMN -{ - Text [ en-US ] = "The query can not be executed. It contains no valid columns."; -}; -String STR_INVALID_PARA_COUNT -{ - Text [ en-US ] = "The count of the given parameter values doesn't match the parameters."; -}; -String STR_NO_VALID_FILE_URL -{ - Text [ en-US ] = "The URL '$URL$' is not valid. A connection can not be created."; -}; - -String STR_NO_CLASSNAME -{ - Text [ en-US ] = "The driver class '$classname$' could not be loaded."; -}; -String STR_NO_JAVA -{ - Text [ en-US ] = "No Java installation could be found. Please check your installation."; -}; -String STR_NO_RESULTSET -{ - Text [ en-US ] = "The execution of the query doesn't return a valid result set."; -}; -String STR_NO_ROWCOUNT -{ - Text [ en-US ] = "The execution of the update statement doesn't effect any rows."; -}; - -String STR_NO_CLASSNAME_PATH -{ - Text [ en-US ] = "The additional driver class path is '$classpath$'."; -}; -String STR_UNKNOWN_PARA_TYPE -{ - Text [ en-US ] = "The type of parameter at position '$position$' is unknown."; -}; -String STR_UNKNOWN_COLUMN_TYPE -{ - Text [ en-US ] = "The type of column at position '$position$' is unknown."; -}; - -// KAB - -String STR_NO_KDE_INST -{ - Text [ en-US ] = "No suitable KDE installation was found."; -}; - -String STR_KDE_VERSION_TOO_OLD -{ - Text [ en-US ] = "KDE version $major$.$minor$ or higher is required to access the KDE Address Book."; -}; -String STR_KDE_VERSION_TOO_NEW -{ - Text [ en-US ] = "The found KDE version is too new. Only KDE up to version $major$.$minor$ is known to work with this product.\n"; -}; -String STR_KDE_VERSION_TOO_NEW_WORK_AROUND -{ - Text [ en-US ] = "If you are sure that your KDE version works, you might execute the following Basic macro to disable this version check:\n\n"; -}; -String STR_PARA_ONLY_PREPARED -{ - Text [ en-US ] = "Parameters can appear only in prepared statements."; -}; - -// MACAB -String STR_NO_TABLE -{ - Text [ en-US ] = "No such table!"; -}; - -String STR_NO_MAC_OS_FOUND -{ - Text [ en-US ] = "No suitable Mac OS installation was found."; -}; - -// hsqldb -String STR_NO_STORAGE -{ - Text [ en-US ] = "The connection can not be established. No storage or URL was given."; -}; -String STR_INVALID_FILE_URL -{ - Text [ en-US ] = "The given URL contains no valid local file system path. Please check the location of your database file."; -}; -String STR_NO_TABLE_CONTAINER -{ - Text [ en-US ] = "An error occurred while obtaining the connection's table container."; -}; -String STR_NO_TABLENAME -{ - Text [ en-US ] = "There is no table named '$tablename$'."; -}; -String STR_NO_DOCUMENTUI -{ - Text [ en-US ] = "The provided DocumentUI is not allowed to be NULL."; -}; -String STR_ERROR_NEW_VERSION -{ - Text [ en-US ] = "The connection could not be established. The database was created by a newer version of %PRODUCTNAME."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/resource/sharedresources.cxx b/connectivity/source/resource/sharedresources.cxx index 5f6e76e55969..1767bfaec8a0 100644 --- a/connectivity/source/resource/sharedresources.cxx +++ b/connectivity/source/resource/sharedresources.cxx @@ -20,14 +20,13 @@ #include #include "resource/sharedresources.hxx" -#include -#include - #include #include +#include #include - +#include +#include namespace connectivity { @@ -44,8 +43,7 @@ namespace connectivity static oslInterlockedCount s_nClients; private: - std::unique_ptr< ::comphelper::OfficeResourceBundle > - m_pResourceBundle; + std::locale m_aLocale; public: static void registerClient(); @@ -54,7 +52,7 @@ namespace connectivity static SharedResources_Impl& getInstance(); - OUString getResourceString( ResourceId _nId ); + OUString getResourceString(const char* pId); private: SharedResources_Impl(); @@ -66,43 +64,24 @@ namespace connectivity } }; - SharedResources_Impl* SharedResources_Impl::s_pInstance( nullptr ); oslInterlockedCount SharedResources_Impl::s_nClients( 0 ); - SharedResources_Impl::SharedResources_Impl() + : m_aLocale(Translate::Create("cnr", Application::GetSettings().GetUILanguageTag())) { - try - { - Reference< XComponentContext > xContext( - comphelper::getProcessComponentContext() ); - m_pResourceBundle.reset( new ::comphelper::OfficeResourceBundle( xContext, "cnr" ) ); - } - catch( const Exception& ) - { - DBG_UNHANDLED_EXCEPTION(); - } } - - OUString SharedResources_Impl::getResourceString( ResourceId _nId ) + OUString SharedResources_Impl::getResourceString(const char* pId) { - if ( m_pResourceBundle.get() == nullptr ) - // this should never happen, but we gracefully ignore it. It has been reported - // in the constructor in non-product builds. - return OUString(); - - return m_pResourceBundle->loadString( _nId ); + return Translate::get(pId, m_aLocale); } - void SharedResources_Impl::registerClient() { osl_atomic_increment( &s_nClients ); } - void SharedResources_Impl::revokeClient() { ::osl::MutexGuard aGuard( getMutex() ); @@ -156,48 +135,48 @@ namespace connectivity } - OUString SharedResources::getResourceString( ResourceId _nResId ) const + OUString SharedResources::getResourceString(const char* pResId) const { - return SharedResources_Impl::getInstance().getResourceString( _nResId ); + return SharedResources_Impl::getInstance().getResourceString(pResId); } - OUString SharedResources::getResourceStringWithSubstitution( ResourceId _nResId, + OUString SharedResources::getResourceStringWithSubstitution(const char* pResId, const sal_Char* _pAsciiPatternToReplace, const OUString& _rStringToSubstitute ) const { - OUString sString( SharedResources_Impl::getInstance().getResourceString( _nResId ) ); + OUString sString( SharedResources_Impl::getInstance().getResourceString(pResId) ); OSL_VERIFY( lcl_substitute( sString, _pAsciiPatternToReplace, _rStringToSubstitute ) ); return sString; } - OUString SharedResources::getResourceStringWithSubstitution( ResourceId _nResId, + OUString SharedResources::getResourceStringWithSubstitution(const char* pResId, const sal_Char* _pAsciiPatternToReplace1, const OUString& _rStringToSubstitute1, const sal_Char* _pAsciiPatternToReplace2, const OUString& _rStringToSubstitute2 ) const { - OUString sString( SharedResources_Impl::getInstance().getResourceString( _nResId ) ); + OUString sString( SharedResources_Impl::getInstance().getResourceString(pResId) ); OSL_VERIFY( lcl_substitute( sString, _pAsciiPatternToReplace1, _rStringToSubstitute1 ) ); OSL_VERIFY( lcl_substitute( sString, _pAsciiPatternToReplace2, _rStringToSubstitute2 ) ); return sString; } - OUString SharedResources::getResourceStringWithSubstitution( ResourceId _nResId, + OUString SharedResources::getResourceStringWithSubstitution(const char* pResId, const sal_Char* _pAsciiPatternToReplace1, const OUString& _rStringToSubstitute1, const sal_Char* _pAsciiPatternToReplace2, const OUString& _rStringToSubstitute2, const sal_Char* _pAsciiPatternToReplace3, const OUString& _rStringToSubstitute3 ) const { - OUString sString( SharedResources_Impl::getInstance().getResourceString( _nResId ) ); + OUString sString( SharedResources_Impl::getInstance().getResourceString(pResId) ); OSL_VERIFY( lcl_substitute( sString, _pAsciiPatternToReplace1, _rStringToSubstitute1 ) ); OSL_VERIFY( lcl_substitute( sString, _pAsciiPatternToReplace2, _rStringToSubstitute2 ) ); OSL_VERIFY( lcl_substitute( sString, _pAsciiPatternToReplace3, _rStringToSubstitute3 ) ); return sString; } - OUString SharedResources::getResourceStringWithSubstitution( ResourceId _nResId, + OUString SharedResources::getResourceStringWithSubstitution(const char* pResId, const std::list< std::pair >& _rStringToSubstitutes) const { - OUString sString( SharedResources_Impl::getInstance().getResourceString( _nResId ) ); + OUString sString( SharedResources_Impl::getInstance().getResourceString(pResId) ); std::list< std::pair >::const_iterator aIter = _rStringToSubstitutes.begin(); std::list< std::pair >::const_iterator aEnd = _rStringToSubstitutes.end(); for(;aIter != aEnd; ++aIter) diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx index 8cf535c40cd3..4e0e3a557c22 100644 --- a/connectivity/source/sdbcx/VCollection.cxx +++ b/connectivity/source/sdbcx/VCollection.cxx @@ -30,7 +30,7 @@ #include #include "TConnection.hxx" #include -#include "resource/common_res.hrc" +#include "strings.hrc" #include "resource/sharedresources.hxx" using namespace connectivity::sdbcx; diff --git a/cppcanvas/CppunitTest_cppcanvas_emfplus.mk b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk index 18cbfc1086cb..7397af3b0610 100644 --- a/cppcanvas/CppunitTest_cppcanvas_emfplus.mk +++ b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk @@ -61,8 +61,4 @@ $(eval $(call gb_CppunitTest_use_components,cppcanvas_emfplus,\ $(eval $(call gb_CppunitTest_use_configuration,cppcanvas_emfplus)) -$(call gb_CppunitTest_get_target,cppcanvas_emfplus): \ - $(call gb_AllLangResTarget_get_target,ofa) \ - $(call gb_AllLangResTarget_get_target,sd) - # vim: set noet sw=4 ts=4: diff --git a/cppcanvas/inc/pch/precompiled_cppcanvas.hxx b/cppcanvas/inc/pch/precompiled_cppcanvas.hxx index c21498f19420..91a51cac250c 100644 --- a/cppcanvas/inc/pch/precompiled_cppcanvas.hxx +++ b/cppcanvas/inc/pch/precompiled_cppcanvas.hxx @@ -184,7 +184,6 @@ #include #include #include -#include #include #include #include @@ -195,7 +194,6 @@ #include #include #include -#include #include #include #include diff --git a/cui/AllLangMoTarget_cui.mk b/cui/AllLangMoTarget_cui.mk new file mode 100644 index 000000000000..a21f043c4ffb --- /dev/null +++ b/cui/AllLangMoTarget_cui.mk @@ -0,0 +1,11 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# 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/. + +$(eval $(call gb_AllLangMoTarget_AllLangMoTarget,cui)) + +# vim: set noet sw=4 ts=4: diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk deleted file mode 100644 index ac6db418161b..000000000000 --- a/cui/AllLangResTarget_cui.mk +++ /dev/null @@ -1,55 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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/. -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,cui)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,cui,svx)) - -$(eval $(call gb_AllLangResTarget_add_srs,cui,\ - cui/res \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,cui/res)) - -$(eval $(call gb_SrsTarget_set_include,cui/res,\ - $$(INCLUDE) \ - -I$(SRCDIR)/cui/source/inc \ -)) - -$(eval $(call gb_SrsTarget_add_files,cui/res,\ - cui/source/customize/cfg.src \ - cui/source/customize/macropg.src \ - cui/source/dialogs/cuires.src \ - cui/source/dialogs/fmsearch.src \ - cui/source/dialogs/gallery.src \ - cui/source/dialogs/hyperdlg.src \ - cui/source/dialogs/multipat.src \ - cui/source/dialogs/passwdomdlg.src \ - cui/source/dialogs/screenshotannotationdlg.src \ - cui/source/dialogs/scriptdlg.src \ - cui/source/dialogs/svuidlg.src \ - cui/source/options/connpooloptions.src \ - cui/source/options/dbregister.src \ - cui/source/options/doclinkdialog.src \ - cui/source/options/optchart.src \ - cui/source/options/optcolor.src \ - cui/source/options/optdict.src \ - cui/source/options/optfltr.src \ - cui/source/options/optinet2.src \ - cui/source/options/optjava.src \ - cui/source/options/optlingu.src \ - cui/source/options/optpath.src \ - cui/source/options/personalization.src \ - cui/source/options/treeopt.src \ - cui/source/tabpages/border.src \ - cui/source/tabpages/frmdirlbox.src \ - cui/source/tabpages/strings.src \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index e308679ae69e..2f3bd0d5881b 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -211,7 +211,4 @@ $(eval $(call gb_Library_add_exception_objects,cui,\ cui/source/uno/services \ )) -# Runtime dependency for unit-tests -$(eval $(call gb_Library_use_restarget,cui,cui)) - # vim: set noet sw=4 ts=4: diff --git a/cui/Module_cui.mk b/cui/Module_cui.mk index c174fb27bd17..888cd2a9f3cd 100644 --- a/cui/Module_cui.mk +++ b/cui/Module_cui.mk @@ -11,11 +11,11 @@ $(eval $(call gb_Module_Module,cui)) $(eval $(call gb_Module_add_targets,cui,\ Library_cui \ + UIConfig_cui \ )) $(eval $(call gb_Module_add_l10n_targets,cui,\ - AllLangResTarget_cui \ - UIConfig_cui \ + AllLangMoTarget_cui \ )) # screenshots diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx index ab2431181cc1..9fb83399de3f 100644 --- a/cui/inc/pch/precompiled_cui.hxx +++ b/cui/inc/pch/precompiled_cui.hxx @@ -325,8 +325,6 @@ #include #include #include -#include -#include #include #include #include @@ -459,7 +457,6 @@ #include #include #include -#include #include #include #include diff --git a/cui/source/options/personalization.src b/cui/inc/personalization.hrc similarity index 62% rename from cui/source/options/personalization.src rename to cui/inc/personalization.hrc index 5886a61c7464..c7bda2bed3a8 100644 --- a/cui/source/options/personalization.src +++ b/cui/inc/personalization.hrc @@ -16,50 +16,26 @@ * 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_CUI_INC_PERSONALIZATION_HRC +#define INCLUDED_CUI_INC_PERSONALIZATION_HRC -#include - -String RID_SVXSTR_SELECTEDPERSONA -{ - Text [ en-US ] = "Selected Theme: "; -}; - -String RID_SVXSTR_SEARCHING -{ - Text [ en-US ] = "Searching, please wait..."; -}; - -String RID_SVXSTR_SEARCHERROR -{ - Text [ en-US ] = "Cannot open %1, please try again later."; -}; - -String RID_SVXSTR_NORESULTS -{ - Text [ en-US ] = "No results found."; -}; - -String RID_SVXSTR_APPLYPERSONA -{ - Text [ en-US ] = "Applying Theme..."; -}; +#define NC_(Context, String) (Context "\004" u8##String) /* * This string array must have exactly the same content * and the same order as the m_vSuggestionCategories array * in personalization.cxx file. */ -StringArray RID_SVXSTR_PERSONA_CATEGORIES +const char* RID_SVXSTR_PERSONA_CATEGORIES[] = { - ItemList [en-US]= - { - < "LibreOffice" ; > ; - < "Abstract" ; > ; - < "Color" ; > ; - < "Music" ; > ; - < "Nature" ; > ; - < "Solid" ; > ; - }; + NC_("RID_SVXSTR_PERSONA_CATEGORIES", "LibreOffice"), + NC_("RID_SVXSTR_PERSONA_CATEGORIES", "Abstract"), + NC_("RID_SVXSTR_PERSONA_CATEGORIES", "Color"), + NC_("RID_SVXSTR_PERSONA_CATEGORIES", "Music"), + NC_("RID_SVXSTR_PERSONA_CATEGORIES", "Nature"), + NC_("RID_SVXSTR_PERSONA_CATEGORIES", "Solid") }; +#endif + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc new file mode 100644 index 000000000000..2a82447321d3 --- /dev/null +++ b/cui/inc/strings.hrc @@ -0,0 +1,385 @@ +/* -*- 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_CUI_INC_STRINGS_HRC +#define INCLUDED_CUI_INC_STRINGS_HRC + +#define NC_(Context, String) (Context "\004" u8##String) + +#define RID_SVXSTR_KEY_CONFIG_DIR NC_("RID_SVXSTR_KEY_CONFIG_DIR", "Configuration") +#define RID_SVXSTR_KEY_WORK_PATH NC_("RID_SVXSTR_KEY_WORK_PATH", "My Documents") +#define RID_SVXSTR_KEY_GRAPHICS_PATH NC_("RID_SVXSTR_KEY_GRAPHICS_PATH", "Images") +#define RID_SVXSTR_KEY_BITMAP_PATH NC_("RID_SVXSTR_KEY_BITMAP_PATH", "Icons") +#define RID_SVXSTR_KEY_PALETTE_PATH NC_("RID_SVXSTR_KEY_PALETTE_PATH", "Palettes") +#define RID_SVXSTR_KEY_BACKUP_PATH NC_("RID_SVXSTR_KEY_BACKUP_PATH", "Backups") +#define RID_SVXSTR_KEY_MODULES_PATH NC_("RID_SVXSTR_KEY_MODULES_PATH", "Modules") +#define RID_SVXSTR_KEY_TEMPLATE_PATH NC_("RID_SVXSTR_KEY_TEMPLATE_PATH", "Templates") +#define RID_SVXSTR_KEY_GLOSSARY_PATH NC_("RID_SVXSTR_KEY_GLOSSARY_PATH", "AutoText") +#define RID_SVXSTR_KEY_DICTIONARY_PATH NC_("RID_SVXSTR_KEY_DICTIONARY_PATH", "Dictionaries") +#define RID_SVXSTR_KEY_HELP_DIR NC_("RID_SVXSTR_KEY_HELP_DIR", "Help") +#define RID_SVXSTR_KEY_GALLERY_DIR NC_("RID_SVXSTR_KEY_GALLERY_DIR", "Gallery") +#define RID_SVXSTR_KEY_STORAGE_DIR NC_("RID_SVXSTR_KEY_STORAGE_DIR", "Message Storage") +#define RID_SVXSTR_KEY_TEMP_PATH NC_("RID_SVXSTR_KEY_TEMP_PATH", "Temporary files") +#define RID_SVXSTR_KEY_PLUGINS_PATH NC_("RID_SVXSTR_KEY_PLUGINS_PATH", "Plug-ins") +#define RID_SVXSTR_KEY_FAVORITES_DIR NC_("RID_SVXSTR_KEY_FAVORITES_DIR", "Folder Bookmarks") +#define RID_SVXSTR_KEY_FILTER_PATH NC_("RID_SVXSTR_KEY_FILTER_PATH", "Filters") +#define RID_SVXSTR_KEY_ADDINS_PATH NC_("RID_SVXSTR_KEY_ADDINS_PATH", "Add-ins") +#define RID_SVXSTR_KEY_USERCONFIG_PATH NC_("RID_SVXSTR_KEY_USERCONFIG_PATH", "User Configuration") +#define RID_SVXSTR_KEY_USERDICTIONARY_DIR NC_("RID_SVXSTR_KEY_USERDICTIONARY_DIR", "User-defined dictionaries") +#define RID_SVXSTR_KEY_CLASSIFICATION_PATH NC_("RID_SVXSTR_KEY_CLASSIFICATION_PATH", "Classification") +#define RID_SVXSTR_KEY_AUTOCORRECT_DIR NC_("RID_SVXSTR_KEY_AUTOCORRECT_DIR", "AutoCorrect") +#define RID_SVXSTR_KEY_LINGUISTIC_DIR NC_("RID_SVXSTR_KEY_LINGUISTIC_DIR", "Writing aids") +/* %n will be replaced at runtime by a number starting with 1 and increasing as necessary */ +#define RID_SVXSTR_NEW_MENU NC_("RID_SVXSTR_NEW_MENU", "New Menu %n") +/* %n will be replaced at runtime by a number starting with 1 and increasing as necessary */ +#define RID_SVXSTR_NEW_TOOLBAR NC_("RID_SVXSTR_NEW_TOOLBAR", "New Toolbar %n") +#define RID_SVXSTR_MOVE_MENU NC_("RID_SVXSTR_MOVE_MENU", "Move Menu") +#define RID_SVXSTR_ADD_SUBMENU NC_("RID_SVXSTR_ADD_SUBMENU", "Add Submenu") +#define RID_SVXSTR_SUBMENU_NAME NC_("RID_SVXSTR_SUBMENU_NAME", "Submenu name") +#define RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION NC_("RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION", "To add a command to a menu, select the category and then the command. You can also drag the command to the Commands list of the Menus tab page in the Customize dialog.") +#define RID_SVXSTR_DELETE_ICON_CONFIRM NC_("RID_SVXSTR_DELETE_ICON_CONFIRM", "Are you sure to delete the image?") +#define RID_SVXSTR_REPLACE_ICON_WARNING NC_("RID_SVXSTR_REPLACE_ICON_WARNING", "The icon %ICONNAME is already contained in the image list.\nWould you like to replace the existing icon?") +#define RID_SVXSTR_REPLACE_ICON_CONFIRM NC_("RID_SVXSTR_REPLACE_ICON_CONFIRM", "Confirm Icon Replacement") +#define RID_SVXSTR_YESTOALL NC_("RID_SVXSTR_YESTOALL", "Yes to All") +#define RID_SVXSTR_PRODUCTNAME_TOOLBARS NC_("RID_SVXSTR_PRODUCTNAME_TOOLBARS", "%PRODUCTNAME %MODULENAME Toolbars") +#define RID_SVXSTR_PRODUCTNAME_CONTEXTMENUS NC_("RID_SVXSTR_PRODUCTNAME_CONTEXTMENUS", "%PRODUCTNAME %MODULENAME Context Menus") +#define RID_SVXSTR_TOOLBAR NC_("RID_SVXSTR_TOOLBAR", "Toolbar") +#define RID_SVXSTR_TOOLBAR_CONTENT NC_("RID_SVXSTR_TOOLBAR_CONTENT", "Toolbar Content") +#define RID_SVXSTR_COMMANDS NC_("RID_SVXSTR_COMMANDS", "Commands") +#define RID_SXVSTR_CONFIRM_DELETE_TOOLBAR NC_("RID_SXVSTR_CONFIRM_DELETE_TOOLBAR", "There are no more commands on the toolbar. Do you want to delete the toolbar?") +/* Translators: Do not translate %SAVE IN SELECTION% It is a placeholder + and will be replaced at runtime by the name of the selected application + or document. +*/ +#define RID_SVXSTR_CONFIRM_MENU_RESET NC_("RID_SVXSTR_CONFIRM_MENU_RESET", "The menu configuration for %SAVE IN SELECTION% will be reset to the default settings. Do you want to continue?") +#define RID_SVXSTR_CONFIRM_TOOLBAR_RESET NC_("RID_SVXSTR_CONFIRM_TOOLBAR_RESET", "The toolbar configuration for %SAVE IN SELECTION% will be reset to the default settings. Do you want to continue?") +#define RID_SVXSTR_CONFIRM_RESTORE_DEFAULT NC_("RID_SVXSTR_CONFIRM_RESTORE_DEFAULT", "This will delete all changes previously made to this toolbar. Do you really want to reset the toolbar?") +#define RID_SVXSTR_MNUCFG_ALREADY_INCLUDED NC_("RID_SVXSTR_MNUCFG_ALREADY_INCLUDED", "Function is already included in this popup.") +#define RID_SVXSTR_LABEL_NEW_NAME NC_("RID_SVXSTR_LABEL_NEW_NAME", "~New name") +#define RID_SVXSTR_RENAME_MENU NC_("RID_SVXSTR_RENAME_MENU", "Rename Menu") +#define RID_SVXSTR_RENAME_TOOLBAR NC_("RID_SVXSTR_RENAME_TOOLBAR", "Rename Toolbar") + +#define RID_SVXSTR_HYPDLG_CLOSEBUT NC_("RID_SVXSTR_HYPDLG_CLOSEBUT", "Close") +#define RID_SVXSTR_HYPDLG_MACROACT1 NC_("RID_SVXSTR_HYPDLG_MACROACT1", "Mouse over object") +#define RID_SVXSTR_HYPDLG_MACROACT2 NC_("RID_SVXSTR_HYPDLG_MACROACT2", "Trigger hyperlink") +#define RID_SVXSTR_HYPDLG_MACROACT3 NC_("RID_SVXSTR_HYPDLG_MACROACT3", "Mouse leaves object") +#define RID_SVXSTR_HYPDLG_NOVALIDFILENAME NC_("RID_SVXSTR_HYPDLG_NOVALIDFILENAME", "Please type in a valid file name.") +#define RID_SVXSTR_HYPERDLG_HLINETTP NC_("RID_SVXSTR_HYPERDLG_HLINETTP", "Internet") +#define RID_SVXSTR_HYPERDLG_HLINETTP_HELP NC_("RID_SVXSTR_HYPERDLG_HLINETTP_HELP", "This is where you create a hyperlink to a Web page or FTP server connection.") +#define RID_SVXSTR_HYPERDLG_HLMAILTP NC_("RID_SVXSTR_HYPERDLG_HLMAILTP", "Mail") +#define RID_SVXSTR_HYPERDLG_HLMAILTP_HELP NC_("RID_SVXSTR_HYPERDLG_HLMAILTP_HELP", "This is where you create a hyperlink to an e-mail address.") +#define RID_SVXSTR_HYPERDLG_HLDOCTP NC_("RID_SVXSTR_HYPERDLG_HLDOCTP", "Document") +#define RID_SVXSTR_HYPERDLG_HLDOCTP_HELP NC_("RID_SVXSTR_HYPERDLG_HLDOCTP_HELP", "This is where you create a hyperlink to an existing document or a target within a document.") +#define RID_SVXSTR_HYPERDLG_HLDOCNTP NC_("RID_SVXSTR_HYPERDLG_HLDOCNTP", "New Document") +#define RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP NC_("RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP", "This is where you create a new document to which the new link points.") +#define RID_SVXSTR_HYPERDLG_FORM_BUTTON NC_("RID_SVXSTR_HYPERDLG_FORM_BUTTON", "Button") +#define RID_SVXSTR_HYPERDLG_FROM_TEXT NC_("RID_SVXSTR_HYPERDLG_FROM_TEXT", "Text") +#define RID_SVXSTR_HYPERDLG_QUERYOVERWRITE NC_("RID_SVXSTR_HYPERDLG_QUERYOVERWRITE", "The file already exists. Overwrite?") + +#define RID_SVXSTR_ERR_TEXTNOTFOUND NC_("RID_SVXSTR_ERR_TEXTNOTFOUND", "No alternatives found.") +#define RID_SVXSTR_SELECT_FILE_IFRAME NC_("RID_SVXSTR_SELECT_FILE_IFRAME", "Select File for Floating Frame") +#define RID_SVXSTR_ALLFUNCTIONS NC_("RID_SVXSTR_ALLFUNCTIONS", "All categories") +#define RID_SVXSTR_MYMACROS NC_("RID_SVXSTR_MYMACROS", "My Macros") +#define RID_SVXSTR_PRODMACROS NC_("RID_SVXSTR_PRODMACROS", "%PRODUCTNAME Macros") +#define RID_SVXSTR_SELECTOR_ADD_COMMANDS NC_("RID_SVXSTR_SELECTOR_ADD_COMMANDS", "Add Commands") +#define RID_SVXSTR_SELECTOR_RUN NC_("RID_SVXSTR_SELECTOR_RUN", "Run") +#define RID_SVXSTR_ROW NC_("RID_SVXSTR_ROW", "Insert Rows") +#define RID_SVXSTR_REMOVE_FAVORITES NC_("RID_SVXSTR_REMOVE_FAVORITES", "Remove from Favorites") +#define RID_SVXSTR_ADD_FAVORITES NC_("RID_SVXSTR_ADD_FAVORITES", "Add to Favorites") +// PPI is pixel per inch, %1 is a number +#define RID_SVXSTR_PPI NC_("RID_SVXSTR_PPI", "(%1 PPI)") +#define RID_SVXSTR_COL NC_("RID_SVXSTR_COL", "Insert Columns") +#define RID_SVXSTR_AUTO_ENTRY NC_("RID_SVXSTR_AUTO_ENTRY", "Automatic") +#define RID_SVXSTR_EDIT_GRAPHIC NC_("RID_SVXSTR_EDIT_GRAPHIC", "Link") +#define RID_SVXSTR_LOADACCELCONFIG NC_("RID_SVXSTR_LOADACCELCONFIG", "Load Keyboard Configuration") +#define RID_SVXSTR_SAVEACCELCONFIG NC_("RID_SVXSTR_SAVEACCELCONFIG", "Save Keyboard Configuration") +#define RID_SVXSTR_FILTERNAME_CFG NC_("RID_SVXSTR_FILTERNAME_CFG", "Configuration (*.cfg)") +#define RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES NC_("RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES", "Targets do not exist in the document.") +#define RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN NC_("RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN", "Couldn't open the document.") +#define RID_SVXSTR_EDITHINT NC_("RID_SVXSTR_EDITHINT", "[Enter text here]") +#define RID_SVXSTR_HANGUL NC_("RID_SVXSTR_HANGUL", "Hangul") +#define RID_SVXSTR_HANJA NC_("RID_SVXSTR_HANJA", "Hanja") +#define RID_SVXSTR_BASICMACROS NC_("RID_SVXSTR_BASICMACROS", "BASIC Macros") +#define RID_SVXSTR_GROUP_STYLES NC_("RID_SVXSTR_GROUP_STYLES", "Styles") + +#define RID_SVXSTR_EVENT_STARTAPP NC_("RID_SVXSTR_EVENT_STARTAPP", "Start Application") +#define RID_SVXSTR_EVENT_CLOSEAPP NC_("RID_SVXSTR_EVENT_CLOSEAPP", "Close Application") +#define RID_SVXSTR_EVENT_NEWDOC NC_("RID_SVXSTR_EVENT_NEWDOC", "New Document") +#define RID_SVXSTR_EVENT_CLOSEDOC NC_("RID_SVXSTR_EVENT_CLOSEDOC", "Document closed") +#define RID_SVXSTR_EVENT_PREPARECLOSEDOC NC_("RID_SVXSTR_EVENT_PREPARECLOSEDOC", "Document is going to be closed") +#define RID_SVXSTR_EVENT_OPENDOC NC_("RID_SVXSTR_EVENT_OPENDOC", "Open Document") +#define RID_SVXSTR_EVENT_SAVEDOC NC_("RID_SVXSTR_EVENT_SAVEDOC", "Save Document") +#define RID_SVXSTR_EVENT_SAVEASDOC NC_("RID_SVXSTR_EVENT_SAVEASDOC", "Save Document As") +#define RID_SVXSTR_EVENT_SAVEDOCDONE NC_("RID_SVXSTR_EVENT_SAVEDOCDONE", "Document has been saved") +#define RID_SVXSTR_EVENT_SAVEASDOCDONE NC_("RID_SVXSTR_EVENT_SAVEASDOCDONE", "Document has been saved as") +#define RID_SVXSTR_EVENT_ACTIVATEDOC NC_("RID_SVXSTR_EVENT_ACTIVATEDOC", "Activate Document") +#define RID_SVXSTR_EVENT_DEACTIVATEDOC NC_("RID_SVXSTR_EVENT_DEACTIVATEDOC", "Deactivate Document") +#define RID_SVXSTR_EVENT_PRINTDOC NC_("RID_SVXSTR_EVENT_PRINTDOC", "Print Document") +#define RID_SVXSTR_EVENT_MODIFYCHANGED NC_("RID_SVXSTR_EVENT_MODIFYCHANGED", "'Modified' status was changed") +#define RID_SVXSTR_EVENT_MAILMERGE NC_("RID_SVXSTR_EVENT_MAILMERGE", "Printing of form letters started") +#define RID_SVXSTR_EVENT_MAILMERGE_END NC_("RID_SVXSTR_EVENT_MAILMERGE_END", "Printing of form letters finished") +#define RID_SVXSTR_EVENT_FIELDMERGE NC_("RID_SVXSTR_EVENT_FIELDMERGE", "Merging of form fields started") +#define RID_SVXSTR_EVENT_FIELDMERGE_FINISHED NC_("RID_SVXSTR_EVENT_FIELDMERGE_FINISHED", "Merging of form fields finished") +#define RID_SVXSTR_EVENT_PAGECOUNTCHANGE NC_("RID_SVXSTR_EVENT_PAGECOUNTCHANGE", "Changing the page count") +#define RID_SVXSTR_EVENT_SUBCOMPONENT_OPENED NC_("RID_SVXSTR_EVENT_SUBCOMPONENT_OPENED", "Loaded a sub component") +#define RID_SVXSTR_EVENT_SUBCOMPONENT_CLOSED NC_("RID_SVXSTR_EVENT_SUBCOMPONENT_CLOSED", "Closed a sub component") +#define RID_SVXSTR_EVENT_APPROVEPARAMETER NC_("RID_SVXSTR_EVENT_APPROVEPARAMETER", "Fill parameters") +#define RID_SVXSTR_EVENT_ACTIONPERFORMED NC_("RID_SVXSTR_EVENT_ACTIONPERFORMED", "Execute action") +#define RID_SVXSTR_EVENT_AFTERUPDATE NC_("RID_SVXSTR_EVENT_AFTERUPDATE", "After updating") +#define RID_SVXSTR_EVENT_BEFOREUPDATE NC_("RID_SVXSTR_EVENT_BEFOREUPDATE", "Before updating") +#define RID_SVXSTR_EVENT_APPROVEROWCHANGE NC_("RID_SVXSTR_EVENT_APPROVEROWCHANGE", "Before record action") +#define RID_SVXSTR_EVENT_ROWCHANGE NC_("RID_SVXSTR_EVENT_ROWCHANGE", "After record action") +#define RID_SVXSTR_EVENT_CONFIRMDELETE NC_("RID_SVXSTR_EVENT_CONFIRMDELETE", "Confirm deletion") +#define RID_SVXSTR_EVENT_ERROROCCURRED NC_("RID_SVXSTR_EVENT_ERROROCCURRED", "Error occurred") +#define RID_SVXSTR_EVENT_ADJUSTMENTVALUECHANGED NC_("RID_SVXSTR_EVENT_ADJUSTMENTVALUECHANGED", "While adjusting") +#define RID_SVXSTR_EVENT_FOCUSGAINED NC_("RID_SVXSTR_EVENT_FOCUSGAINED", "When receiving focus") +#define RID_SVXSTR_EVENT_FOCUSLOST NC_("RID_SVXSTR_EVENT_FOCUSLOST", "When losing focus") +#define RID_SVXSTR_EVENT_ITEMSTATECHANGED NC_("RID_SVXSTR_EVENT_ITEMSTATECHANGED", "Item status changed") +#define RID_SVXSTR_EVENT_KEYTYPED NC_("RID_SVXSTR_EVENT_KEYTYPED", "Key pressed") +#define RID_SVXSTR_EVENT_KEYUP NC_("RID_SVXSTR_EVENT_KEYUP", "Key released") +#define RID_SVXSTR_EVENT_LOADED NC_("RID_SVXSTR_EVENT_LOADED", "When loading") +#define RID_SVXSTR_EVENT_RELOADING NC_("RID_SVXSTR_EVENT_RELOADING", "Before reloading") +#define RID_SVXSTR_EVENT_RELOADED NC_("RID_SVXSTR_EVENT_RELOADED", "When reloading") +#define RID_SVXSTR_EVENT_MOUSEDRAGGED NC_("RID_SVXSTR_EVENT_MOUSEDRAGGED", "Mouse moved while key pressed") +#define RID_SVXSTR_EVENT_MOUSEENTERED NC_("RID_SVXSTR_EVENT_MOUSEENTERED", "Mouse inside") +#define RID_SVXSTR_EVENT_MOUSEEXITED NC_("RID_SVXSTR_EVENT_MOUSEEXITED", "Mouse outside") +#define RID_SVXSTR_EVENT_MOUSEMOVED NC_("RID_SVXSTR_EVENT_MOUSEMOVED", "Mouse moved") +#define RID_SVXSTR_EVENT_MOUSEPRESSED NC_("RID_SVXSTR_EVENT_MOUSEPRESSED", "Mouse button pressed") +#define RID_SVXSTR_EVENT_MOUSERELEASED NC_("RID_SVXSTR_EVENT_MOUSERELEASED", "Mouse button released") +#define RID_SVXSTR_EVENT_POSITIONING NC_("RID_SVXSTR_EVENT_POSITIONING", "Before record change") +#define RID_SVXSTR_EVENT_POSITIONED NC_("RID_SVXSTR_EVENT_POSITIONED", "After record change") +#define RID_SVXSTR_EVENT_RESETTED NC_("RID_SVXSTR_EVENT_RESETTED", "After resetting") +#define RID_SVXSTR_EVENT_APPROVERESETTED NC_("RID_SVXSTR_EVENT_APPROVERESETTED", "Prior to reset") +#define RID_SVXSTR_EVENT_APPROVEACTIONPERFORMED NC_("RID_SVXSTR_EVENT_APPROVEACTIONPERFORMED", "Approve action") +#define RID_SVXSTR_EVENT_SUBMITTED NC_("RID_SVXSTR_EVENT_SUBMITTED", "Before submitting") +#define RID_SVXSTR_EVENT_TEXTCHANGED NC_("RID_SVXSTR_EVENT_TEXTCHANGED", "Text modified") +#define RID_SVXSTR_EVENT_UNLOADING NC_("RID_SVXSTR_EVENT_UNLOADING", "Before unloading") +#define RID_SVXSTR_EVENT_UNLOADED NC_("RID_SVXSTR_EVENT_UNLOADED", "When unloading") +#define RID_SVXSTR_EVENT_CHANGED NC_("RID_SVXSTR_EVENT_CHANGED", "Changed") +#define RID_SVXSTR_EVENT_CREATEDOC NC_("RID_SVXSTR_EVENT_CREATEDOC", "Document created") +#define RID_SVXSTR_EVENT_LOADDOCFINISHED NC_("RID_SVXSTR_EVENT_LOADDOCFINISHED", "Document loading finished") +#define RID_SVXSTR_EVENT_SAVEDOCFAILED NC_("RID_SVXSTR_EVENT_SAVEDOCFAILED", "Saving of document failed") +#define RID_SVXSTR_EVENT_SAVEASDOCFAILED NC_("RID_SVXSTR_EVENT_SAVEASDOCFAILED", "'Save as' has failed") +#define RID_SVXSTR_EVENT_COPYTODOC NC_("RID_SVXSTR_EVENT_COPYTODOC", "Storing or exporting copy of document") +#define RID_SVXSTR_EVENT_COPYTODOCDONE NC_("RID_SVXSTR_EVENT_COPYTODOCDONE", "Document copy has been created") +#define RID_SVXSTR_EVENT_COPYTODOCFAILED NC_("RID_SVXSTR_EVENT_COPYTODOCFAILED", "Creating of document copy failed") +#define RID_SVXSTR_EVENT_VIEWCREATED NC_("RID_SVXSTR_EVENT_VIEWCREATED", "View created") +#define RID_SVXSTR_EVENT_PREPARECLOSEVIEW NC_("RID_SVXSTR_EVENT_PREPARECLOSEVIEW", "View is going to be closed") +#define RID_SVXSTR_EVENT_CLOSEVIEW NC_("RID_SVXSTR_EVENT_CLOSEVIEW", "View closed") +#define RID_SVXSTR_EVENT_TITLECHANGED NC_("RID_SVXSTR_EVENT_TITLECHANGED", "Document title changed") +#define RID_SVXSTR_EVENT_SELECTIONCHANGED NC_("RID_SVXSTR_EVENT_SELECTIONCHANGED", "Selection changed") +#define RID_SVXSTR_EVENT_DOUBLECLICK NC_("RID_SVXSTR_EVENT_DOUBLECLICK", "Double click") +#define RID_SVXSTR_EVENT_RIGHTCLICK NC_("RID_SVXSTR_EVENT_RIGHTCLICK", "Right click") +#define RID_SVXSTR_EVENT_CALCULATE NC_("RID_SVXSTR_EVENT_CALCULATE", "Formulas calculated") +#define RID_SVXSTR_EVENT_CONTENTCHANGED NC_("RID_SVXSTR_EVENT_CONTENTCHANGED", "Content changed") + +#define RID_STR_SEARCH_ANYWHERE NC_("RID_STR_SEARCH_ANYWHERE", "anywhere in the field") +#define RID_STR_SEARCH_BEGINNING NC_("RID_STR_SEARCH_BEGINNING", "beginning of field") +#define RID_STR_SEARCH_END NC_("RID_STR_SEARCH_END", "end of field") +#define RID_STR_SEARCH_WHOLE NC_("RID_STR_SEARCH_WHOLE", "entire field") +#define RID_STR_FROM_TOP NC_("RID_STR_FROM_TOP", "From top") +#define RID_STR_FROM_BOTTOM NC_("RID_STR_FROM_BOTTOM", "From bottom") +#define RID_STR_SEARCH_NORECORD NC_("RID_STR_SEARCH_NORECORD", "No records corresponding to your data found.") +#define RID_STR_SEARCH_GENERAL_ERROR NC_("RID_STR_SEARCH_GENERAL_ERROR", "An unknown error occurred. The search could not be finished.") +#define RID_STR_OVERFLOW_FORWARD NC_("RID_STR_OVERFLOW_FORWARD", "Overflow, search continued at the beginning") +#define RID_STR_OVERFLOW_BACKWARD NC_("RID_STR_OVERFLOW_BACKWARD", "Overflow, search continued at the end") +#define RID_STR_SEARCH_COUNTING NC_("RID_STR_SEARCH_COUNTING", "counting records") + +#define RID_SVXSTR_GALLERY_NOFILES NC_("RID_SVXSTR_GALLERY_NOFILES", "") +#define RID_SVXSTR_GALLERYPROPS_OBJECT NC_("RID_SVXSTR_GALLERYPROPS_OBJECT", "Object;Objects") +#define RID_SVXSTR_GALLERY_READONLY NC_("RID_SVXSTR_GALLERY_READONLY", "(read-only)") +#define RID_SVXSTR_GALLERY_ALLFILES NC_("RID_SVXSTR_GALLERY_ALLFILES", "") +#define RID_SVXSTR_GALLERY_ID_EXISTS NC_("RID_SVXSTR_GALLERY_ID_EXISTS", "This ID already exists...") + +#define RID_MULTIPATH_DBL_ERR NC_("RID_MULTIPATH_DBL_ERR", "The path %1 already exists.") +#define RID_SVXSTR_ARCHIVE_TITLE NC_("RID_SVXSTR_ARCHIVE_TITLE", "Select Archives") +#define RID_SVXSTR_ARCHIVE_HEADLINE NC_("RID_SVXSTR_ARCHIVE_HEADLINE", "Archives") +#define RID_SVXSTR_MULTIFILE_DBL_ERR NC_("RID_SVXSTR_MULTIFILE_DBL_ERR", "The file %1 already exists.") +#define RID_SVXSTR_ADD_IMAGE NC_("RID_SVXSTR_ADD_IMAGE", "Add Image") + +#define RID_SVXSTR_ONE_PASSWORD_MISMATCH NC_("RID_SVXSTR_ONE_PASSWORD_MISMATCH", "The confirmation password did not match the password. Set the password again by entering the same password in both boxes.") +#define RID_SVXSTR_TWO_PASSWORDS_MISMATCH NC_("RID_SVXSTR_TWO_PASSWORDS_MISMATCH", "The confirmation passwords did not match the original passwords. Set the passwords again.") +#define RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON NC_("RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON", "Please enter a password to open or to modify, or check the open read-only option to continue.") +#define RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON_V2 NC_("RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON_V2", "Set the password by entering the same password in both boxes.") + +#define STR_AUTOLINK NC_("STR_AUTOLINK", "Automatic") +#define STR_MANUALLINK NC_("STR_MANUALLINK", "Manual") +#define STR_BROKENLINK NC_("STR_BROKENLINK", "Not available") +#define STR_CLOSELINKMSG NC_("STR_CLOSELINKMSG", "Are you sure you want to remove the selected link?") +#define STR_CLOSELINKMSG_MULTI NC_("STR_CLOSELINKMSG_MULTI", "Are you sure you want to remove the selected link?") +#define STR_WAITINGLINK NC_("STR_WAITINGLINK", "Waiting") + +#define RID_SVXSTR_SAVE_SCREENSHOT_AS NC_("RID_SVXSTR_SAVE_SCREENSHOT_AS", "Save Screenshot As...") + +// $(ROW) can be a number or the caption of the row in quotes +#define RID_SVXSTR_DIAGRAM_ROW NC_("RID_SVXSTR_DIAGRAM_ROW", "Data Series $(ROW)") + +#define RID_SVXSTR_DRIVER_NAME NC_("RID_SVXSTR_DRIVER_NAME", "Driver name") +#define RID_SVXSTR_POOLED_FLAG NC_("RID_SVXSTR_POOLED_FLAG", "Pool") +#define RID_SVXSTR_POOL_TIMEOUT NC_("RID_SVXSTR_POOL_TIMEOUT", "Timeout") +#define RID_SVXSTR_YES NC_("RID_SVXSTR_YES", "Yes") +#define RID_SVXSTR_NO NC_("RID_SVXSTR_NO", "No") + +#define STR_LINKEDDOC_DOESNOTEXIST NC_("STR_LINKEDDOC_DOESNOTEXIST", "The file\n$file$\ndoes not exist.") +#define STR_LINKEDDOC_NO_SYSTEM_FILE NC_("STR_LINKEDDOC_NO_SYSTEM_FILE", "The file\n$file$\ndoes not exist in the local file system.") +#define STR_NAME_CONFLICT NC_("STR_NAME_CONFLICT", "The name '$file$' is already used for another database.\nPlease choose a different name.") +#define RID_SVXSTR_QUERY_DELETE_CONFIRM NC_("RID_SVXSTR_QUERY_DELETE_CONFIRM", "Do you want to delete the entry?") + +#define RID_SVXSTR_DELQUERY NC_("RID_SVXSTR_DELQUERY", "Do you want to delete the following object?") +#define RID_SVXSTR_DELQUERY_TITLE NC_("RID_SVXSTR_DELQUERY_TITLE", "Confirm Deletion") +#define RID_SVXSTR_DELFAILED NC_("RID_SVXSTR_DELFAILED", "The selected object could not be deleted.") +#define RID_SVXSTR_DELFAILED_TITLE NC_("RID_SVXSTR_DELFAILED_TITLE", "Error Deleting Object") +#define RID_SVXSTR_CREATEFAILED NC_("RID_SVXSTR_CREATEFAILED", "The object could not be created.") +#define RID_SVXSTR_CREATEFAILEDDUP NC_("RID_SVXSTR_CREATEFAILEDDUP", " Object with the same name already exists.") +#define RID_SVXSTR_CREATEFAILED_TITLE NC_("RID_SVXSTR_CREATEFAILED_TITLE", "Error Creating Object") +#define RID_SVXSTR_RENAMEFAILED NC_("RID_SVXSTR_RENAMEFAILED", "The object could not be renamed.") +#define RID_SVXSTR_RENAMEFAILED_TITLE NC_("RID_SVXSTR_RENAMEFAILED_TITLE", "Error Renaming Object") +#define RID_SVXSTR_ERROR_TITLE NC_("RID_SVXSTR_ERROR_TITLE", "%PRODUCTNAME Error") +#define RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED NC_("RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED", "The scripting language %LANGUAGENAME is not supported.") +#define RID_SVXSTR_ERROR_RUNNING NC_("RID_SVXSTR_ERROR_RUNNING", "An error occurred while running the %LANGUAGENAME script %SCRIPTNAME.") +#define RID_SVXSTR_EXCEPTION_RUNNING NC_("RID_SVXSTR_EXCEPTION_RUNNING", "An exception occurred while running the %LANGUAGENAME script %SCRIPTNAME.") +#define RID_SVXSTR_ERROR_AT_LINE NC_("RID_SVXSTR_ERROR_AT_LINE", "An error occurred while running the %LANGUAGENAME script %SCRIPTNAME at line: %LINENUMBER.") +#define RID_SVXSTR_EXCEPTION_AT_LINE NC_("RID_SVXSTR_EXCEPTION_AT_LINE", "An exception occurred while running the %LANGUAGENAME script %SCRIPTNAME at line: %LINENUMBER.") +#define RID_SVXSTR_FRAMEWORK_ERROR_RUNNING NC_("RID_SVXSTR_FRAMEWORK_ERROR_RUNNING", "A Scripting Framework error occurred while running the %LANGUAGENAME script %SCRIPTNAME.") +#define RID_SVXSTR_ERROR_TYPE_LABEL NC_("RID_SVXSTR_ERROR_TYPE_LABEL", "Type:") +#define RID_SVXSTR_ERROR_MESSAGE_LABEL NC_("RID_SVXSTR_ERROR_MESSAGE_LABEL", "Message:") + +#define RID_SVXSTR_TYPE NC_("RID_SVXSTR_TYPE", "Registered name") +#define RID_SVXSTR_PATH NC_("RID_SVXSTR_PATH", "Database file") + +//abbreviation for "[Load]" +#define RID_SVXSTR_HEADER1 NC_("RID_SVXSTR_HEADER1", "[L]") +//abbreviation for "[Save]" +#define RID_SVXSTR_HEADER2 NC_("RID_SVXSTR_HEADER2", "[S]") +#define RID_SVXSTR_CHG_MATH NC_("RID_SVXSTR_CHG_MATH", "MathType to %PRODUCTNAME Math or reverse") +#define RID_SVXSTR_CHG_WRITER NC_("RID_SVXSTR_CHG_WRITER", "WinWord to %PRODUCTNAME Writer or reverse") +#define RID_SVXSTR_CHG_CALC NC_("RID_SVXSTR_CHG_CALC", "Excel to %PRODUCTNAME Calc or reverse") +#define RID_SVXSTR_CHG_IMPRESS NC_("RID_SVXSTR_CHG_IMPRESS", "PowerPoint to %PRODUCTNAME Impress or reverse") +#define RID_SVXSTR_CHG_SMARTART NC_("RID_SVXSTR_CHG_SMARTART", "SmartArt to %PRODUCTNAME shapes or reverse") + +#define RID_SVXSTR_OPT_DOUBLE_DICTS NC_("RID_SVXSTR_OPT_DOUBLE_DICTS", "The specified name already exists.\nPlease enter a new name.") +#define STR_MODIFY NC_("STR_MODIFY", "~Replace") +#define RID_SVXSTR_CONFIRM_SET_LANGUAGE NC_("RID_SVXSTR_CONFIRM_SET_LANGUAGE", "Do you want to change the '%1' dictionary language?") + +#define RID_SVXSTR_COLOR_CONFIG_DELETE NC_("RID_SVXSTR_COLOR_CONFIG_DELETE", "Do you really want to delete the color scheme?") +#define RID_SVXSTR_COLOR_CONFIG_DELETE_TITLE NC_("RID_SVXSTR_COLOR_CONFIG_DELETE_TITLE", "Color Scheme Deletion") +#define RID_SVXSTR_COLOR_CONFIG_SAVE1 NC_("RID_SVXSTR_COLOR_CONFIG_SAVE1", "Save scheme") +#define RID_SVXSTR_COLOR_CONFIG_SAVE2 NC_("RID_SVXSTR_COLOR_CONFIG_SAVE2", "Name of color scheme") + +#define RID_SVXSTR_SPELL NC_("RID_SVXSTR_SPELL", "Spelling") +#define RID_SVXSTR_HYPH NC_("RID_SVXSTR_HYPH", "Hyphenation") +#define RID_SVXSTR_THES NC_("RID_SVXSTR_THES", "Thesaurus") +#define RID_SVXSTR_GRAMMAR NC_("RID_SVXSTR_GRAMMAR", "Grammar") +#define RID_SVXSTR_CAPITAL_WORDS NC_("RID_SVXSTR_CAPITAL_WORDS", "Check uppercase words") +#define RID_SVXSTR_WORDS_WITH_DIGITS NC_("RID_SVXSTR_WORDS_WITH_DIGITS", "Check words with numbers ") +#define RID_SVXSTR_SPELL_SPECIAL NC_("RID_SVXSTR_SPELL_SPECIAL", "Check special regions") +#define RID_SVXSTR_SPELL_AUTO NC_("RID_SVXSTR_SPELL_AUTO", "Check spelling as you type") +#define RID_SVXSTR_GRAMMAR_AUTO NC_("RID_SVXSTR_GRAMMAR_AUTO", "Check grammar as you type") +#define RID_SVXSTR_NUM_MIN_WORDLEN NC_("RID_SVXSTR_NUM_MIN_WORDLEN", "Minimal number of characters for hyphenation: ") +#define RID_SVXSTR_NUM_PRE_BREAK NC_("RID_SVXSTR_NUM_PRE_BREAK", "Characters before line break: ") +#define RID_SVXSTR_NUM_POST_BREAK NC_("RID_SVXSTR_NUM_POST_BREAK", "Characters after line break: ") +#define RID_SVXSTR_HYPH_AUTO NC_("RID_SVXSTR_HYPH_AUTO", "Hyphenate without inquiry") +#define RID_SVXSTR_HYPH_SPECIAL NC_("RID_SVXSTR_HYPH_SPECIAL", "Hyphenate special regions") + +#define RID_SVXSTR_JRE_NOT_RECOGNIZED NC_("RID_SVXSTR_JRE_NOT_RECOGNIZED", "The folder you selected does not contain a Java runtime environment.\nPlease select a different folder.") +#define RID_SVXSTR_JRE_FAILED_VERSION NC_("RID_SVXSTR_JRE_FAILED_VERSION", "The Java runtime environment you selected is not the required version.\nPlease select a different folder.") +#define RID_SVXSTR_OPTIONS_RESTART NC_("RID_SVXSTR_OPTIONS_RESTART", "Please restart %PRODUCTNAME now so the new or modified values can take effect.") +#define RID_SVXSTR_JAVA_START_PARAM NC_("RID_SVXSTR_JAVA_START_PARAM", "Edit Parameter") + +#define RID_SVXSTR_OPT_PROXYPORTS NC_("RID_SVXSTR_OPT_PROXYPORTS", "Invalid value!\n\nThe maximum value for a port number is 65535.") + +#define RID_SVXSTR_FRAMEDIR_LTR NC_("RID_SVXSTR_FRAMEDIR_LTR", "Left-to-right (LTR)") +#define RID_SVXSTR_FRAMEDIR_RTL NC_("RID_SVXSTR_FRAMEDIR_RTL", "Right-to-left (RTL)") +#define RID_SVXSTR_FRAMEDIR_SUPER NC_("RID_SVXSTR_FRAMEDIR_SUPER", "Use superordinate object settings") +// page direction +#define RID_SVXSTR_PAGEDIR_LTR_HORI NC_("RID_SVXSTR_PAGEDIR_LTR_HORI", "Left-to-right (horizontal)") +#define RID_SVXSTR_PAGEDIR_RTL_HORI NC_("RID_SVXSTR_PAGEDIR_RTL_HORI", "Right-to-left (horizontal)") +#define RID_SVXSTR_PAGEDIR_RTL_VERT NC_("RID_SVXSTR_PAGEDIR_RTL_VERT", "Right-to-left (vertical)") +#define RID_SVXSTR_PAGEDIR_LTR_VERT NC_("RID_SVXSTR_PAGEDIR_LTR_VERT", "Left-to-right (vertical)") + +#define RID_SVXSTR_DESC_GRADIENT NC_("RID_SVXSTR_DESC_GRADIENT", "Please enter a name for the gradient:") +#define RID_SVXSTR_DESC_NEW_BITMAP NC_("RID_SVXSTR_DESC_NEW_BITMAP", "Please enter a name for the bitmap:") +#define RID_SVXSTR_DESC_EXT_BITMAP NC_("RID_SVXSTR_DESC_EXT_BITMAP", "Please enter a name for the external bitmap:") +#define RID_SVXSTR_DESC_NEW_PATTERN NC_("RID_SVXSTR_DESC_NEW_PATTERN", "Please enter a name for the pattern:") +#define RID_SVXSTR_DESC_LINESTYLE NC_("RID_SVXSTR_DESC_LINESTYLE", "Please enter a name for the line style:") +#define RID_SVXSTR_ASK_CHANGE_LINESTYLE NC_("RID_SVXSTR_ASK_CHANGE_LINESTYLE", "The line style was modified without saving. \nModify the selected line style or add a new line style.") +#define RID_SVXSTR_DESC_HATCH NC_("RID_SVXSTR_DESC_HATCH", "Please enter a name for the hatching:") +#define RID_SVXSTR_CHANGE NC_("RID_SVXSTR_CHANGE", "Modify") +#define RID_SVXSTR_ADD NC_("RID_SVXSTR_ADD", "Add") +#define RID_SVXSTR_DESC_COLOR NC_("RID_SVXSTR_DESC_COLOR", "Please enter a name for the new color:") +#define RID_SVXSTR_TABLE NC_("RID_SVXSTR_TABLE", "Table") +#define RID_SVXSTR_DESC_LINEEND NC_("RID_SVXSTR_DESC_LINEEND", "Please enter a name for the new arrowhead:") +#define RID_SVXSTR_CHARNAME_NOSTYLE NC_("RID_SVXSTR_CHARNAME_NOSTYLE", "No %1") +#define RID_SVXSTR_CHARNAME_FAMILY NC_("RID_SVXSTR_CHARNAME_FAMILY", "Family") +#define RID_SVXSTR_CHARNAME_FONT NC_("RID_SVXSTR_CHARNAME_FONT", "Font") +#define RID_SVXSTR_CHARNAME_STYLE NC_("RID_SVXSTR_CHARNAME_STYLE", "Style") +#define RID_SVXSTR_CHARNAME_TYPEFACE NC_("RID_SVXSTR_CHARNAME_TYPEFACE", "Typeface") +#define RID_SVXSTR_CHARNAME_HIGHLIGHTING NC_("RID_SVXSTR_CHARNAME_HIGHLIGHTING", "Highlight Color") +#define RID_SVXSTR_USE_REPLACE NC_("RID_SVXSTR_USE_REPLACE", "Use replacement table") +#define RID_SVXSTR_CPTL_STT_WORD NC_("RID_SVXSTR_CPTL_STT_WORD", "Correct TWo INitial CApitals") +#define RID_SVXSTR_CPTL_STT_SENT NC_("RID_SVXSTR_CPTL_STT_SENT", "Capitalize first letter of every sentence") +#define RID_SVXSTR_BOLD_UNDER NC_("RID_SVXSTR_BOLD_UNDER", "Automatic *bold*, /italic/, -strikeout- and _underline_") +#define RID_SVXSTR_NO_DBL_SPACES NC_("RID_SVXSTR_NO_DBL_SPACES", "Ignore double spaces") +#define RID_SVXSTR_DETECT_URL NC_("RID_SVXSTR_DETECT_URL", "URL Recognition") +#define RID_SVXSTR_DASH NC_("RID_SVXSTR_DASH", "Replace dashes") +#define RID_SVXSTR_CORRECT_ACCIDENTAL_CAPS_LOCK NC_("RID_SVXSTR_CORRECT_ACCIDENTAL_CAPS_LOCK", "Correct accidental use of cAPS LOCK key") +#define RID_SVXSTR_NON_BREAK_SPACE NC_("RID_SVXSTR_NON_BREAK_SPACE", "Add non-breaking space before specific punctuation marks in French text") +#define RID_SVXSTR_ORDINAL NC_("RID_SVXSTR_ORDINAL", "Format ordinal numbers suffixes (1st -> 1^st)") +#define RID_SVXSTR_DEL_EMPTY_PARA NC_("RID_SVXSTR_DEL_EMPTY_PARA", "Remove blank paragraphs") +#define RID_SVXSTR_USER_STYLE NC_("RID_SVXSTR_USER_STYLE", "Replace Custom Styles") +#define RID_SVXSTR_BULLET NC_("RID_SVXSTR_BULLET", "Replace bullets with: ") +#define RID_SVXSTR_RIGHT_MARGIN NC_("RID_SVXSTR_RIGHT_MARGIN", "Combine single line paragraphs if length greater than") +#define RID_SVXSTR_NUM NC_("RID_SVXSTR_NUM", "Bulleted and numbered lists. Bullet symbol: ") +#define RID_SVXSTR_BORDER NC_("RID_SVXSTR_BORDER", "Apply border") +#define RID_SVXSTR_CREATE_TABLE NC_("RID_SVXSTR_CREATE_TABLE", "Create table") +#define RID_SVXSTR_REPLACE_TEMPLATES NC_("RID_SVXSTR_REPLACE_TEMPLATES", "Apply Styles") +#define RID_SVXSTR_DEL_SPACES_AT_STT_END NC_("RID_SVXSTR_DEL_SPACES_AT_STT_END", "Delete spaces and tabs at beginning and end of paragraph") +#define RID_SVXSTR_DEL_SPACES_BETWEEN_LINES NC_("RID_SVXSTR_DEL_SPACES_BETWEEN_LINES", "Delete spaces and tabs at end and start of line") +#define RID_SVXSTR_CONNECTOR NC_("RID_SVXSTR_CONNECTOR", "Connector") +#define RID_SVXSTR_DIMENSION_LINE NC_("RID_SVXSTR_DIMENSION_LINE", "Dimension line") +#define RID_SVXSTR_LOAD_ERROR NC_("RID_SVXSTR_LOAD_ERROR", "The selected module could not be loaded.") +#define RID_SVXSTR_STARTQUOTE NC_("RID_SVXSTR_STARTQUOTE", "Start Quote") +#define RID_SVXSTR_ENDQUOTE NC_("RID_SVXSTR_ENDQUOTE", "End Quote") + +#define RID_SVXSTR_SELECTEDPERSONA NC_("RID_SVXSTR_SELECTEDPERSONA", "Selected Theme: ") +#define RID_SVXSTR_SEARCHING NC_("RID_SVXSTR_SEARCHING", "Searching, please wait...") +#define RID_SVXSTR_SEARCHERROR NC_("RID_SVXSTR_SEARCHERROR", "Cannot open %1, please try again later.") +#define RID_SVXSTR_NORESULTS NC_("RID_SVXSTR_NORESULTS", "No results found.") +#define RID_SVXSTR_APPLYPERSONA NC_("RID_SVXSTR_APPLYPERSONA", "Applying Theme...") + +#define RID_SVXSTR_TABLE_PRESET_NONE NC_("RID_SVXSTR_TABLE_PRESET_NONE", "Set No Borders") +#define RID_SVXSTR_TABLE_PRESET_ONLYOUTER NC_("RID_SVXSTR_TABLE_PRESET_ONLYOUTER", "Set Outer Border Only") +#define RID_SVXSTR_TABLE_PRESET_OUTERHORI NC_("RID_SVXSTR_TABLE_PRESET_OUTERHORI", "Set Outer Border and Horizontal Lines") +#define RID_SVXSTR_TABLE_PRESET_OUTERALL NC_("RID_SVXSTR_TABLE_PRESET_OUTERALL", "Set Outer Border and All Inner Lines") +#define RID_SVXSTR_TABLE_PRESET_OUTERINNER NC_("RID_SVXSTR_TABLE_PRESET_OUTERINNER", "Set Outer Border Without Changing Inner Lines") +#define RID_SVXSTR_PARA_PRESET_DIAGONAL NC_("RID_SVXSTR_PARA_PRESET_DIAGONAL", "Set Diagonal Lines Only") +#define RID_SVXSTR_PARA_PRESET_ALL NC_("RID_SVXSTR_PARA_PRESET_ALL", "Set All Four Borders") +#define RID_SVXSTR_PARA_PRESET_LEFTRIGHT NC_("RID_SVXSTR_PARA_PRESET_LEFTRIGHT", "Set Left and Right Borders Only") +#define RID_SVXSTR_PARA_PRESET_TOPBOTTOM NC_("RID_SVXSTR_PARA_PRESET_TOPBOTTOM", "Set Top and Bottom Borders Only") +#define RID_SVXSTR_PARA_PRESET_ONLYLEFT NC_("RID_SVXSTR_PARA_PRESET_ONLYLEFT", "Set Left Border Only") +#define RID_SVXSTR_HOR_PRESET_ONLYHOR NC_("RID_SVXSTR_HOR_PRESET_ONLYHOR", "Set Top and Bottom Borders, and All Inner Lines") +#define RID_SVXSTR_VER_PRESET_ONLYVER NC_("RID_SVXSTR_VER_PRESET_ONLYVER", "Set Left and Right Borders, and All Inner Lines") +#define RID_SVXSTR_SHADOW_STYLE_NONE NC_("RID_SVXSTR_SHADOW_STYLE_NONE", "No Shadow") +#define RID_SVXSTR_SHADOW_STYLE_BOTTOMRIGHT NC_("RID_SVXSTR_SHADOW_STYLE_BOTTOMRIGHT", "Cast Shadow to Bottom Right") +#define RID_SVXSTR_SHADOW_STYLE_TOPRIGHT NC_("RID_SVXSTR_SHADOW_STYLE_TOPRIGHT", "Cast Shadow to Top Right") +#define RID_SVXSTR_SHADOW_STYLE_BOTTOMLEFT NC_("RID_SVXSTR_SHADOW_STYLE_BOTTOMLEFT", "Cast Shadow to Bottom Left") +#define RID_SVXSTR_SHADOW_STYLE_TOPLEFT NC_("RID_SVXSTR_SHADOW_STYLE_TOPLEFT", "Cast Shadow to Top Left") + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/scanner/strings.hrc b/cui/inc/strings.hxx similarity index 56% rename from extensions/source/scanner/strings.hrc rename to cui/inc/strings.hxx index 209acdc9a315..76d7f06fa0b3 100644 --- a/extensions/source/scanner/strings.hrc +++ b/cui/inc/strings.hxx @@ -1,4 +1,4 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ /* * This file is part of the LibreOffice project. * @@ -7,11 +7,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#define STR_COULD_NOT_BE_INIT 1000 -#define STR_SLOW_PREVIEW 1001 -#define STR_ERROR_SCAN 1002 -#define STR_DEVICE_DESC 1003 +#ifndef INCLUDED_CUI_INC_STRINGS_HXX +#define INCLUDED_CUI_INC_STRINGS_HXX -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +#define RID_SVXSTR_KEY_BASIC_PATH "BASIC" +#endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/cui/inc/treeopt.hrc b/cui/inc/treeopt.hrc new file mode 100644 index 000000000000..884a2543e543 --- /dev/null +++ b/cui/inc/treeopt.hrc @@ -0,0 +1,155 @@ +/* -*- 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_CUI_INC_TREEOPT_HRC +#define INCLUDED_CUI_INC_TREEOPT_HRC + +#define NC_(Context, String) (Context "\004" u8##String) + +const std::pair SID_GENERAL_OPTIONS_RES[] = +{ + { NC_("SID_GENERAL_OPTIONS_RES", "%PRODUCTNAME"), 0 }, + { NC_("SID_GENERAL_OPTIONS_RES", "User Data"), RID_SFXPAGE_GENERAL }, + { NC_("SID_GENERAL_OPTIONS_RES", "General"), OFA_TP_MISC }, + { NC_("SID_GENERAL_OPTIONS_RES", "Memory"), OFA_TP_MEMORY }, + { NC_("SID_GENERAL_OPTIONS_RES", "View"), OFA_TP_VIEW }, + { NC_("SID_GENERAL_OPTIONS_RES", "Print"), RID_SFXPAGE_PRINTOPTIONS }, + { NC_("SID_GENERAL_OPTIONS_RES", "Paths"), RID_SFXPAGE_PATH }, + { NC_("SID_GENERAL_OPTIONS_RES", "Fonts"), RID_SVX_FONT_SUBSTITUTION }, + { NC_("SID_GENERAL_OPTIONS_RES", "Security"), RID_SVXPAGE_INET_SECURITY }, + { NC_("SID_GENERAL_OPTIONS_RES", "Personalization"), RID_SVXPAGE_PERSONALIZATION }, + { NC_("SID_GENERAL_OPTIONS_RES", "Application Colors"), RID_SVXPAGE_COLORCONFIG }, + { NC_("SID_GENERAL_OPTIONS_RES", "Accessibility"), RID_SVXPAGE_ACCESSIBILITYCONFIG }, + { NC_("SID_GENERAL_OPTIONS_RES", "Advanced"), RID_SVXPAGE_OPTIONS_JAVA }, + { NC_("SID_GENERAL_OPTIONS_RES", "Basic IDE Options"), RID_SVXPAGE_BASICIDE_OPTIONS }, + { NC_("SID_GENERAL_OPTIONS_RES", "Online Update"), RID_SVXPAGE_ONLINEUPDATE }, + { NC_("SID_GENERAL_OPTIONS_RES", "OpenCL"), RID_SVXPAGE_OPENCL } +}; + +const std::pair SID_LANGUAGE_OPTIONS_RES[] = +{ + { NC_("SID_LANGUAGE_OPTIONS_RES", "Language Settings"), 0 }, + { NC_("SID_LANGUAGE_OPTIONS_RES", "Languages"), OFA_TP_LANGUAGES }, + { NC_("SID_LANGUAGE_OPTIONS_RES", "Writing Aids"), RID_SFXPAGE_LINGU }, + { NC_("SID_LANGUAGE_OPTIONS_RES", "Searching in Japanese"), RID_SVXPAGE_JSEARCH_OPTIONS }, + { NC_("SID_LANGUAGE_OPTIONS_RES", "Asian Layout"), RID_SVXPAGE_ASIAN_LAYOUT }, + { NC_("SID_LANGUAGE_OPTIONS_RES", "Complex Text Layout"), RID_SVXPAGE_OPTIONS_CTL } +}; + +const std::pair SID_INET_DLG_RES[] = +{ + { NC_("SID_INET_DLG_RES", "Internet"), 0 }, + { NC_("SID_INET_DLG_RES", "Proxy"), RID_SVXPAGE_INET_PROXY }, + { NC_("SID_INET_DLG_RES", "E-mail"), RID_SVXPAGE_INET_MAIL } +}; + +const std::pair SID_SW_EDITOPTIONS_RES[] = +{ + { NC_("SID_SW_EDITOPTIONS_RES", "%PRODUCTNAME Writer"), 0 }, + { NC_("SID_SW_EDITOPTIONS_RES", "General"), RID_SW_TP_OPTLOAD_PAGE }, + { NC_("SID_SW_EDITOPTIONS_RES", "View"), RID_SW_TP_CONTENT_OPT }, + { NC_("SID_SW_EDITOPTIONS_RES", "Formatting Aids"), RID_SW_TP_OPTSHDWCRSR }, + { NC_("SID_SW_EDITOPTIONS_RES", "Grid"), RID_SVXPAGE_GRID }, + { NC_("SID_SW_EDITOPTIONS_RES", "Basic Fonts (Western)"),RID_SW_TP_STD_FONT }, + { NC_("SID_SW_EDITOPTIONS_RES", "Basic Fonts (Asian)"),RID_SW_TP_STD_FONT_CJK }, + { NC_("SID_SW_EDITOPTIONS_RES", "Basic Fonts (CTL)"), RID_SW_TP_STD_FONT_CTL }, + { NC_("SID_SW_EDITOPTIONS_RES", "Print"), RID_SW_TP_OPTPRINT_PAGE }, + { NC_("SID_SW_EDITOPTIONS_RES", "Table"), RID_SW_TP_OPTTABLE_PAGE }, + { NC_("SID_SW_EDITOPTIONS_RES", "Changes"), RID_SW_TP_REDLINE_OPT }, + { NC_("SID_SW_EDITOPTIONS_RES", "Comparison"), RID_SW_TP_COMPARISON_OPT }, + { NC_("SID_SW_EDITOPTIONS_RES", "Compatibility"), RID_SW_TP_OPTCOMPATIBILITY_PAGE }, + { NC_("SID_SW_EDITOPTIONS_RES", "AutoCaption"), RID_SW_TP_OPTCAPTION_PAGE }, + { NC_("SID_SW_EDITOPTIONS_RES", "Mail Merge E-mail"), RID_SW_TP_MAILCONFIG } +}; + +const std::pair SID_SW_ONLINEOPTIONS_RES[] = +{ + { NC_("SID_SW_ONLINEOPTIONS_RES", "%PRODUCTNAME Writer/Web"), 0 }, + { NC_("SID_SW_ONLINEOPTIONS_RES", "View"), RID_SW_TP_HTML_CONTENT_OPT }, + { NC_("SID_SW_ONLINEOPTIONS_RES", "Formatting Aids"), RID_SW_TP_HTML_OPTSHDWCRSR }, + { NC_("SID_SW_ONLINEOPTIONS_RES", "Grid"), RID_SW_TP_HTML_OPTGRID_PAGE }, + { NC_("SID_SW_ONLINEOPTIONS_RES", "Print"), RID_SW_TP_HTML_OPTPRINT_PAGE }, + { NC_("SID_SW_ONLINEOPTIONS_RES", "Table"), RID_SW_TP_HTML_OPTTABLE_PAGE }, + { NC_("SID_SW_ONLINEOPTIONS_RES", "Background"), RID_SW_TP_BACKGROUND } +}; + +const std::pair SID_SM_EDITOPTIONS_RES[] = +{ + { NC_("SID_SM_EDITOPTIONS_RES", "%PRODUCTNAME Math"), 0 }, + { NC_("SID_SM_EDITOPTIONS_RES", "Settings"), SID_SM_TP_PRINTOPTIONS }, +}; + +const std::pair SID_SC_EDITOPTIONS_RES[] = +{ + { NC_("SID_SC_EDITOPTIONS_RES", "%PRODUCTNAME Calc"), 0 }, + { NC_("SID_SC_EDITOPTIONS_RES", "General"), SID_SC_TP_LAYOUT }, + { NC_("SID_SC_EDITOPTIONS_RES", "Defaults"), RID_SC_TP_DEFAULTS }, + { NC_("SID_SC_EDITOPTIONS_RES", "View"), SID_SC_TP_CONTENT }, + { NC_("SID_SC_EDITOPTIONS_RES", "Calculate"), SID_SC_TP_CALC }, + { NC_("SID_SC_EDITOPTIONS_RES", "Formula"), SID_SC_TP_FORMULA }, + { NC_("SID_SC_EDITOPTIONS_RES", "Sort Lists"), SID_SC_TP_USERLISTS }, + { NC_("SID_SC_EDITOPTIONS_RES", "Changes"), SID_SC_TP_CHANGES }, + { NC_("SID_SC_EDITOPTIONS_RES", "Compatibility"), SID_SC_TP_COMPATIBILITY }, + { NC_("SID_SC_EDITOPTIONS_RES", "Grid"), SID_SC_TP_GRID }, + { NC_("SID_SC_EDITOPTIONS_RES", "Print"), RID_SC_TP_PRINT } +}; + +const std::pair SID_SD_EDITOPTIONS_RES[] = +{ + { NC_("SID_SD_EDITOPTIONS_RES", "%PRODUCTNAME Impress"), 0 }, + { NC_("SID_SD_EDITOPTIONS_RES", "General"), SID_SI_TP_MISC }, + { NC_("SID_SD_EDITOPTIONS_RES", "View"), SID_SI_TP_CONTENTS }, + { NC_("SID_SD_EDITOPTIONS_RES", "Grid"), SID_SI_TP_SNAP }, + { NC_("SID_SD_EDITOPTIONS_RES", "Print"), SID_SI_TP_PRINT } +}; + +const std::pair SID_SD_GRAPHIC_OPTIONS_RES[] = +{ + { NC_("SID_SD_GRAPHIC_OPTIONS_RES", "%PRODUCTNAME Draw"), 0 }, + { NC_("SID_SD_GRAPHIC_OPTIONS_RES", "General"), SID_SD_TP_MISC }, + { NC_("SID_SD_GRAPHIC_OPTIONS_RES", "View"), SID_SD_TP_CONTENTS }, + { NC_("SID_SD_GRAPHIC_OPTIONS_RES", "Grid"), SID_SD_TP_SNAP }, + { NC_("SID_SD_GRAPHIC_OPTIONS_RES", "Print"), SID_SD_TP_PRINT } +}; + +const std::pair SID_SCH_EDITOPTIONS_RES[] = +{ + { NC_("SID_SCH_EDITOPTIONS_RES", "Charts"), 0 }, + { NC_("SID_SCH_EDITOPTIONS_RES", "Default Colors"), RID_OPTPAGE_CHART_DEFCOLORS } +}; + +const std::pair SID_FILTER_DLG_RES[] = +{ + { NC_("SID_FILTER_DLG_RES", "Load/Save"), 0 }, + { NC_("SID_FILTER_DLG_RES", "General"), RID_SFXPAGE_SAVE }, + { NC_("SID_FILTER_DLG_RES", "VBA Properties"), SID_OPTFILTER_MSOFFICE }, + { NC_("SID_FILTER_DLG_RES", "Microsoft Office"), RID_OFAPAGE_MSFILTEROPT2 }, + { NC_("SID_FILTER_DLG_RES", "HTML Compatibility"), RID_OFAPAGE_HTMLOPT } +}; + +const std::pair SID_SB_STARBASEOPTIONS_RES[] = +{ + { NC_("SID_SB_STARBASEOPTIONS_RES", "%PRODUCTNAME Base"), 0 }, + { NC_("SID_SB_STARBASEOPTIONS_RES", "Connections"), SID_SB_CONNECTIONPOOLING }, + { NC_("SID_SB_STARBASEOPTIONS_RES", "Databases"), SID_SB_DBREGISTEROPTIONS } +}; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx index 48ab816a12aa..b51b319b5ae7 100644 --- a/cui/source/customize/SvxMenuConfigPage.cxx +++ b/cui/source/customize/SvxMenuConfigPage.cxx @@ -54,6 +54,7 @@ #include #include +#include #include "helpid.hrc" #include "acccfg.hxx" diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index c1c2104b26ee..bf83de09a634 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -36,7 +36,8 @@ #include #include "cuires.hrc" - +#include "strings.hrc" +#include #include diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 31a56d32941d..41c9cf7b6687 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -55,6 +55,7 @@ #include #include #include "helpid.hrc" +#include "strings.hrc" #include "acccfg.hxx" #include "cfg.hxx" diff --git a/cui/source/customize/cfg.src b/cui/source/customize/cfg.src deleted file mode 100644 index 08d352625cf8..000000000000 --- a/cui/source/customize/cfg.src +++ /dev/null @@ -1,145 +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 -#include "helpid.hrc" - -/* %n will be replaced at runtime by a number starting with 1 and increasing as necessary */ -String RID_SVXSTR_NEW_MENU -{ - Text [ en-US ] = "New Menu %n"; -}; - -/* %n will be replaced at runtime by a number starting with 1 and increasing as necessary */ -String RID_SVXSTR_NEW_TOOLBAR -{ - Text [ en-US ] = "New Toolbar %n"; -}; - -String RID_SVXSTR_MOVE_MENU -{ - Text [ en-US ] = "Move Menu"; -}; - -String RID_SVXSTR_ADD_SUBMENU -{ - Text [ en-US ] = "Add Submenu"; -}; - -String RID_SVXSTR_SUBMENU_NAME -{ - Text [ en-US ] = "Submenu name"; -}; - -String RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION -{ - Text [ en-US ] = "To add a command to a menu, select the category and then the command. You can also drag the command to the Commands list of the Menus tab page in the Customize dialog."; -}; - -// Strings --------------------------------------------------------------- - -String RID_SVXSTR_DELETE_ICON_CONFIRM //added for issue73355 -{ - Text [ en-US ] = "Are you sure to delete the image?" ; -}; - -String RID_SVXSTR_REPLACE_ICON_WARNING //added for issue73355 -{ - Text [ en-US ] = "The icon %ICONNAME is already contained in the image list.\nWould you like to replace the existing icon?"; -}; - -String RID_SVXSTR_REPLACE_ICON_CONFIRM //added for issue73355 -{ - Text [ en-US ] = "Confirm Icon Replacement"; -}; - -String RID_SVXSTR_YESTOALL //added for issue73355 -{ - Text [ en-US ] = "Yes to All"; -}; - -String RID_SVXSTR_PRODUCTNAME_TOOLBARS -{ - Text [ en-US ] = "%PRODUCTNAME %MODULENAME Toolbars" ; -}; - -String RID_SVXSTR_PRODUCTNAME_CONTEXTMENUS -{ - Text [ en-US ] = "%PRODUCTNAME %MODULENAME Context Menus" ; -}; - -String RID_SVXSTR_TOOLBAR -{ - Text [ en-US ] = "Toolbar" ; -}; - -String RID_SVXSTR_TOOLBAR_CONTENT -{ - Text [ en-US ] = "Toolbar Content" ; -}; - -String RID_SVXSTR_COMMANDS -{ - Text [ en-US ] = "Commands" ; -}; - -String RID_SXVSTR_CONFIRM_DELETE_TOOLBAR -{ - Text [ en-US ] = "There are no more commands on the toolbar. Do you want to delete the toolbar?"; -}; - -/* Translators: Do not translate %SAVE IN SELECTION% It is a placeholder - and will be replaced at runtime by the name of the selected application - or document. -*/ -String RID_SVXSTR_CONFIRM_MENU_RESET -{ - Text [ en-US ] = "The menu configuration for %SAVE IN SELECTION% will be reset to the default settings. Do you want to continue?"; -}; - -String RID_SVXSTR_CONFIRM_TOOLBAR_RESET -{ - Text [ en-US ] = "The toolbar configuration for %SAVE IN SELECTION% will be reset to the default settings. Do you want to continue?"; -}; - -String RID_SVXSTR_CONFIRM_RESTORE_DEFAULT -{ - Text [ en-US ] = "This will delete all changes previously made to this toolbar. Do you really want to reset the toolbar?"; -}; - -String RID_SVXSTR_MNUCFG_ALREADY_INCLUDED -{ - Text [ en-US ] = "Function is already included in this popup." ; -}; - -String RID_SVXSTR_LABEL_NEW_NAME -{ - Text [ en-US ] = "~New name"; -}; - -String RID_SVXSTR_RENAME_MENU -{ - Text [ en-US ] = "Rename Menu"; -}; - -String RID_SVXSTR_RENAME_TOOLBAR -{ - Text [ en-US ] = "Rename Toolbar"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 399db0ae57de..1c630c16bee1 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -45,6 +45,7 @@ #include #include #include "cuires.hrc" +#include "strings.hrc" #include "bitmaps.hlst" #include #include diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index d171411c72d2..2b26eca0a0f1 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -39,6 +39,7 @@ #include "headertablistbox.hxx" #include "macropg_impl.hxx" #include +#include "strings.hrc" #include #include #include @@ -529,7 +530,7 @@ void SvxMacroTabPage_::DisplayAppEvents( bool appEvents) } OUString eventURL = h_it->second.second; - OUString displayName(CuiResId(displayableEvent->nEventResourceID)); + OUString displayName(CuiResId(displayableEvent->pEventResourceID)); displayName += "\t"; diff --git a/cui/source/customize/macropg.src b/cui/source/customize/macropg.src deleted file mode 100644 index a57fa254be32..000000000000 --- a/cui/source/customize/macropg.src +++ /dev/null @@ -1,336 +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 -#include -#include "helpid.hrc" -#include - -//DF -String RID_SVXSTR_EVENT_STARTAPP -{ - Text [ en-US ] = "Start Application" ; -}; - -String RID_SVXSTR_EVENT_CLOSEAPP -{ - Text [ en-US ] = "Close Application" ; -}; - -String RID_SVXSTR_EVENT_NEWDOC -{ - Text [ en-US ] = "New Document" ; -}; - -String RID_SVXSTR_EVENT_CLOSEDOC -{ - Text [ en-US ] = "Document closed" ; -}; - -String RID_SVXSTR_EVENT_PREPARECLOSEDOC -{ - Text [ en-US ] = "Document is going to be closed" ; -}; - -String RID_SVXSTR_EVENT_OPENDOC -{ - Text [ en-US ] = "Open Document" ; -}; - -String RID_SVXSTR_EVENT_SAVEDOC -{ - Text [ en-US ] = "Save Document" ; -}; - -String RID_SVXSTR_EVENT_SAVEASDOC -{ - Text [ en-US ] = "Save Document As" ; -}; - -String RID_SVXSTR_EVENT_SAVEDOCDONE -{ - Text [ en-US ] = "Document has been saved" ; -}; - -String RID_SVXSTR_EVENT_SAVEASDOCDONE -{ - Text [ en-US ] = "Document has been saved as" ; -}; - -String RID_SVXSTR_EVENT_ACTIVATEDOC -{ - Text [ en-US ] = "Activate Document" ; -}; - -String RID_SVXSTR_EVENT_DEACTIVATEDOC -{ - Text [ en-US ] = "Deactivate Document" ; -}; - -String RID_SVXSTR_EVENT_PRINTDOC -{ - Text [ en-US ] = "Print Document" ; -}; - -String RID_SVXSTR_EVENT_MODIFYCHANGED -{ - Text [ en-US ] = "'Modified' status was changed" ; -}; -String RID_SVXSTR_EVENT_MAILMERGE -{ - Text [ en-US ] = "Printing of form letters started" ; -}; -String RID_SVXSTR_EVENT_MAILMERGE_END -{ - Text [ en-US ] = "Printing of form letters finished" ; -}; -String RID_SVXSTR_EVENT_FIELDMERGE -{ - Text [ en-US ] = "Merging of form fields started" ; -}; -String RID_SVXSTR_EVENT_FIELDMERGE_FINISHED -{ - Text [ en-US ] = "Merging of form fields finished" ; -}; -String RID_SVXSTR_EVENT_PAGECOUNTCHANGE -{ - Text [ en-US ] = "Changing the page count" ; -}; -String RID_SVXSTR_EVENT_SUBCOMPONENT_OPENED -{ - Text [ en-US ] = "Loaded a sub component" ; -}; -String RID_SVXSTR_EVENT_SUBCOMPONENT_CLOSED -{ - Text [ en-US ] = "Closed a sub component" ; -}; -String RID_SVXSTR_EVENT_APPROVEPARAMETER -{ - Text [ en-US ] = "Fill parameters" ; -}; -String RID_SVXSTR_EVENT_ACTIONPERFORMED -{ - Text [ en-US ] = "Execute action" ; -}; -String RID_SVXSTR_EVENT_AFTERUPDATE -{ - Text [ en-US ] = "After updating" ; -}; -String RID_SVXSTR_EVENT_BEFOREUPDATE -{ - Text [ en-US ] = "Before updating" ; -}; -String RID_SVXSTR_EVENT_APPROVEROWCHANGE -{ - Text [ en-US ] = "Before record action" ; -}; -String RID_SVXSTR_EVENT_ROWCHANGE -{ - Text [ en-US ] = "After record action" ; -}; -String RID_SVXSTR_EVENT_CONFIRMDELETE -{ - Text [ en-US ] = "Confirm deletion" ; -}; -String RID_SVXSTR_EVENT_ERROROCCURRED -{ - Text [ en-US ] = "Error occurred" ; -}; -String RID_SVXSTR_EVENT_ADJUSTMENTVALUECHANGED -{ - Text [ en-US ] = "While adjusting"; -}; -String RID_SVXSTR_EVENT_FOCUSGAINED -{ - Text [ en-US ] = "When receiving focus" ; -}; -String RID_SVXSTR_EVENT_FOCUSLOST -{ - Text [ en-US ] = "When losing focus" ; -}; -String RID_SVXSTR_EVENT_ITEMSTATECHANGED -{ - Text [ en-US ] = "Item status changed" ; -}; -String RID_SVXSTR_EVENT_KEYTYPED -{ - Text [ en-US ] = "Key pressed" ; -}; -String RID_SVXSTR_EVENT_KEYUP -{ - Text [ en-US ] = "Key released" ; -}; -String RID_SVXSTR_EVENT_LOADED -{ - Text [ en-US ] = "When loading" ; -}; -String RID_SVXSTR_EVENT_RELOADING -{ - Text [ en-US ] = "Before reloading" ; -}; -String RID_SVXSTR_EVENT_RELOADED -{ - Text [ en-US ] = "When reloading" ; -}; -String RID_SVXSTR_EVENT_MOUSEDRAGGED -{ - Text [ en-US ] = "Mouse moved while key pressed" ; -}; -String RID_SVXSTR_EVENT_MOUSEENTERED -{ - Text [ en-US ] = "Mouse inside" ; -}; -String RID_SVXSTR_EVENT_MOUSEEXITED -{ - Text [ en-US ] = "Mouse outside" ; -}; -String RID_SVXSTR_EVENT_MOUSEMOVED -{ - Text [ en-US ] = "Mouse moved" ; -}; -String RID_SVXSTR_EVENT_MOUSEPRESSED -{ - Text [ en-US ] = "Mouse button pressed" ; -}; -String RID_SVXSTR_EVENT_MOUSERELEASED -{ - Text [ en-US ] = "Mouse button released" ; -}; -String RID_SVXSTR_EVENT_POSITIONING -{ - Text [ en-US ] = "Before record change" ; -}; -String RID_SVXSTR_EVENT_POSITIONED -{ - Text [ en-US ] = "After record change" ; -}; -String RID_SVXSTR_EVENT_RESETTED -{ - Text [ en-US ] = "After resetting" ; -}; -String RID_SVXSTR_EVENT_APPROVERESETTED -{ - Text [ en-US ] = "Prior to reset" ; -}; -String RID_SVXSTR_EVENT_APPROVEACTIONPERFORMED -{ - Text [ en-US ] = "Approve action" ; -}; -String RID_SVXSTR_EVENT_SUBMITTED -{ - Text [ en-US ] = "Before submitting" ; -}; -String RID_SVXSTR_EVENT_TEXTCHANGED -{ - Text [ en-US ] = "Text modified" ; -}; -String RID_SVXSTR_EVENT_UNLOADING -{ - Text [ en-US ] = "Before unloading" ; -}; -String RID_SVXSTR_EVENT_UNLOADED -{ - Text [ en-US ] = "When unloading" ; -}; -String RID_SVXSTR_EVENT_CHANGED -{ - Text [ en-US ] = "Changed" ; -}; - -String RID_SVXSTR_EVENT_CREATEDOC -{ - Text [ en-US ] = "Document created" ; -}; - -String RID_SVXSTR_EVENT_LOADDOCFINISHED -{ - Text [ en-US ] = "Document loading finished" ; -}; - -String RID_SVXSTR_EVENT_SAVEDOCFAILED -{ - Text [ en-US ] = "Saving of document failed" ; -}; - -String RID_SVXSTR_EVENT_SAVEASDOCFAILED -{ - Text [ en-US ] = "'Save as' has failed" ; -}; - -String RID_SVXSTR_EVENT_COPYTODOC -{ - Text [ en-US ] = "Storing or exporting copy of document" ; -}; - -String RID_SVXSTR_EVENT_COPYTODOCDONE -{ - Text [ en-US ] = "Document copy has been created" ; -}; - -String RID_SVXSTR_EVENT_COPYTODOCFAILED -{ - Text [ en-US ] = "Creating of document copy failed" ; -}; - -String RID_SVXSTR_EVENT_VIEWCREATED -{ - Text [ en-US ] = "View created" ; -}; - -String RID_SVXSTR_EVENT_PREPARECLOSEVIEW -{ - Text [ en-US ] = "View is going to be closed" ; -}; - -String RID_SVXSTR_EVENT_CLOSEVIEW -{ - Text [ en-US ] = "View closed" ; -}; - -String RID_SVXSTR_EVENT_TITLECHANGED -{ - Text [ en-US ] = "Document title changed" ; -}; - -String RID_SVXSTR_EVENT_SELECTIONCHANGED -{ - Text [ en-US ] = "Selection changed" ; -}; - -String RID_SVXSTR_EVENT_DOUBLECLICK -{ - Text [ en-US ] = "Double click" ; -}; - -String RID_SVXSTR_EVENT_RIGHTCLICK -{ - Text [ en-US ] = "Right click" ; -}; - -String RID_SVXSTR_EVENT_CALCULATE -{ - Text [ en-US ] = "Formulas calculated" ; -}; - -String RID_SVXSTR_EVENT_CONTENTCHANGED -{ - Text [ en-US ] = "Content changed" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 6031af5d85fb..2a0e9053c819 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -45,6 +45,7 @@ #include #include #include +#include "strings.hrc" #include "macroass.hxx" using namespace css; diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index fd3d9b3ba8df..b45300ef7bee 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -26,7 +26,7 @@ #include #include #include -#include "fmsearch.hrc" +#include "strings.hrc" #include "cuifmsearch.hxx" #include #include @@ -239,14 +239,14 @@ void FmSearchDialog::Init(const OUString& strVisibleFields, const OUString& sIni // fill the listboxes // method of field comparison - sal_uInt16 nResIds[] = { + const char* aResIds[] = { RID_STR_SEARCH_ANYWHERE, RID_STR_SEARCH_BEGINNING, RID_STR_SEARCH_END, RID_STR_SEARCH_WHOLE }; - for (unsigned short nResId : nResIds) - m_plbPosition->InsertEntry( CuiResId( nResId ) ); + for (auto pResId : aResIds) + m_plbPosition->InsertEntry(CuiResId(pResId)); m_plbPosition->SelectEntryPos(MATCHING_ANYWHERE); // the field listbox @@ -726,10 +726,10 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, const FmSearchProgress*, pProgress, case FmSearchProgress::State::Error: case FmSearchProgress::State::NothingFound: { - sal_uInt16 nErrorId = (FmSearchProgress::State::Error == pProgress->aSearchState) + const char* pErrorId = (FmSearchProgress::State::Error == pProgress->aSearchState) ? RID_STR_SEARCH_GENERAL_ERROR : RID_STR_SEARCH_NORECORD; - ScopedVclPtrInstance(this, CuiResId(nErrorId))->Execute(); + ScopedVclPtrInstance(this, CuiResId(pErrorId))->Execute(); SAL_FALLTHROUGH; } case FmSearchProgress::State::Canceled: diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 196d8acd6c73..ebda6d05cdd8 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -47,9 +47,10 @@ #include #include #include "dialmgr.hxx" -#include "gallery.hrc" +#include "strings.hrc" #include #include +#include using namespace ::ucbhelper; using namespace ::cppu; diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index 04f3d29418f5..374c4b99643d 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -29,6 +29,7 @@ #include "hldocntp.hxx" #include "bitmaps.hlst" #include +#include "strings.hrc" #include using ::com::sun::star::uno::Reference; diff --git a/cui/source/dialogs/cuires.src b/cui/source/dialogs/cuires.src deleted file mode 100644 index 6c22063dee6b..000000000000 --- a/cui/source/dialogs/cuires.src +++ /dev/null @@ -1,133 +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 "cuires.hrc" - -String RID_SVXSTR_ERR_TEXTNOTFOUND -{ - Text [ en-US ] = "No alternatives found." ; -}; - -String RID_SVXSTR_SELECT_FILE_IFRAME -{ - Text [ en-US ] = "Select File for Floating Frame" ; -}; - -String RID_SVXSTR_ALLFUNCTIONS -{ - Text [ en-US ] = "All categories"; -}; - -String RID_SVXSTR_MYMACROS -{ - Text [ en-US ] = "My Macros"; -}; - -String RID_SVXSTR_PRODMACROS -{ - Text [ en-US ] = "%PRODUCTNAME Macros"; -}; - -String RID_SVXSTR_SELECTOR_ADD_COMMANDS -{ - Text [ en-US ] = "Add Commands" ; -}; - -String RID_SVXSTR_SELECTOR_RUN -{ - Text [ en-US ] = "Run" ; -}; - -String RID_SVXSTR_ROW -{ - Text [ en-US ] = "Insert Rows" ; -}; - -String RID_SVXSTR_REMOVE_FAVORITES -{ - Text [ en-US ] = "Remove from Favorites" ; -}; - -String RID_SVXSTR_ADD_FAVORITES -{ - Text [ en-US ] = "Add to Favorites" ; -}; - -String RID_SVXSTR_PPI -{ - Text [ x-comment ] = "PPI is pixel per inch, %1 is a number" ; - Text [ en-US ] = "(%1 PPI)" ; -}; - -String RID_SVXSTR_COL -{ - Text [ en-US ] = "Insert Columns" ; -}; - -String RID_SVXSTR_AUTO_ENTRY -{ - Text [ en-US ] = "Automatic"; -}; - -String RID_SVXSTR_EDIT_GRAPHIC -{ - Text [ en-US ] = "Link" ; -}; - -String RID_SVXSTR_LOADACCELCONFIG -{ - Text [ en-US ] = "Load Keyboard Configuration" ; -}; - -String RID_SVXSTR_SAVEACCELCONFIG -{ - Text [ en-US ] = "Save Keyboard Configuration" ; -}; - -String RID_SVXSTR_FILTERNAME_CFG -{ - Text [ en-US ] = "Configuration (*.cfg)" ; -}; - -String RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES -{ - Text [ en-US ] = "Targets do not exist in the document." ; -}; - -String RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN -{ - Text [ en-US ] = "Couldn't open the document." ; -}; - -String RID_SVXSTR_EDITHINT -{ - Text [ en-US ] = "[Enter text here]"; -}; - -String RID_SVXSTR_HANGUL -{ - Text [ en-US ] = "Hangul"; -}; - -String RID_SVXSTR_HANJA -{ - Text [ en-US ] = "Hanja"; -}; - -String RID_SVXSTR_BASICMACROS -{ - Text [ en-US ] = "BASIC Macros" ; -}; - -String RID_SVXSTR_GROUP_STYLES -{ - Text [ en-US ] = "Styles" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/fmsearch.hrc b/cui/source/dialogs/fmsearch.hrc deleted file mode 100644 index 0b4f77a69da8..000000000000 --- a/cui/source/dialogs/fmsearch.hrc +++ /dev/null @@ -1,38 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_CUI_SOURCE_DIALOGS_FMSEARCH_HRC -#define INCLUDED_CUI_SOURCE_DIALOGS_FMSEARCH_HRC - -#include "svl/solar.hrc" - -#define RID_STR_SEARCH_ANYWHERE (RID_FORMS_START + 85) -#define RID_STR_SEARCH_BEGINNING (RID_FORMS_START + 86) -#define RID_STR_SEARCH_END (RID_FORMS_START + 87) -#define RID_STR_SEARCH_WHOLE (RID_FORMS_START + 88) -#define RID_STR_FROM_TOP (RID_FORMS_START + 74) -#define RID_STR_FROM_BOTTOM (RID_FORMS_START + 75) -#define RID_STR_SEARCH_NORECORD (RID_FORMS_START + 8) -#define RID_STR_SEARCH_GENERAL_ERROR (RID_FORMS_START + 9) -#define RID_STR_OVERFLOW_FORWARD (RID_FORMS_START + 34) -#define RID_STR_OVERFLOW_BACKWARD (RID_FORMS_START + 35) -#define RID_STR_SEARCH_COUNTING (RID_FORMS_START + 76) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/fmsearch.src b/cui/source/dialogs/fmsearch.src deleted file mode 100644 index 0a8cf0024a58..000000000000 --- a/cui/source/dialogs/fmsearch.src +++ /dev/null @@ -1,77 +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 "fmsearch.hrc" -#include "helpid.hrc" - -String RID_STR_SEARCH_ANYWHERE -{ - Text [ en-US ] = "anywhere in the field"; -}; - -String RID_STR_SEARCH_BEGINNING -{ - Text [ en-US ] = "beginning of field"; -}; - -String RID_STR_SEARCH_END -{ - Text [ en-US ] = "end of field"; -}; - -String RID_STR_SEARCH_WHOLE -{ - Text [ en-US ] = "entire field"; -}; - -String RID_STR_FROM_TOP -{ - Text [ en-US ] = "From top"; -}; -String RID_STR_FROM_BOTTOM -{ - Text [ en-US ] = "From bottom"; -}; - -String RID_STR_SEARCH_NORECORD -{ - Text [ en-US ] = "No records corresponding to your data found."; -}; - -String RID_STR_SEARCH_GENERAL_ERROR -{ - Text [ en-US ] = "An unknown error occurred. The search could not be finished."; -}; - -String RID_STR_OVERFLOW_FORWARD -{ - Text [ en-US ] = "Overflow, search continued at the beginning"; -}; - -String RID_STR_OVERFLOW_BACKWARD -{ - Text [ en-US ] = "Overflow, search continued at the end"; -}; - -String RID_STR_SEARCH_COUNTING -{ - Text [ en-US ] = "counting records"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/gallery.src b/cui/source/dialogs/gallery.src deleted file mode 100644 index 43d94175a970..000000000000 --- a/cui/source/dialogs/gallery.src +++ /dev/null @@ -1,46 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include -#include "helpid.hrc" -#include "gallery.hrc" -#include - -String RID_SVXSTR_GALLERY_NOFILES -{ - Text [ en-US ] = "" ; -}; -String RID_SVXSTR_GALLERYPROPS_OBJECT -{ - Text [ en-US ] = "Object;Objects" ; -}; -String RID_SVXSTR_GALLERY_READONLY -{ - Text [ en-US ] = "(read-only)" ; -}; -String RID_SVXSTR_GALLERY_ALLFILES -{ - Text [ en-US ] = "" ; -}; -String RID_SVXSTR_GALLERY_ID_EXISTS -{ - Text [ en-US ] = "This ID already exists..." ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index cb610a612807..d5a16bd468aa 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -22,6 +22,7 @@ #include #include "helpid.hrc" +#include "strings.hrc" #include #include diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index 269aca763ae1..b2710554399b 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -39,6 +39,7 @@ #include #include "bitmaps.hlst" +#include "strings.hrc" using namespace ::com::sun::star::lang; using namespace ::com::sun::star::ui::dialogs; diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index a055a0a243ad..34c2d9a5fb73 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -40,6 +40,7 @@ #include "svtools/treelistentry.hxx" #include +#include #include "hlmarkwn.hxx" #include "hltpbase.hxx" diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 2a8fcbbf763b..07277d1fed98 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -32,6 +32,7 @@ #include "macroass.hxx" #include #include +#include #include #include diff --git a/cui/source/dialogs/hyperdlg.src b/cui/source/dialogs/hyperdlg.src deleted file mode 100644 index ff3bd695ada8..000000000000 --- a/cui/source/dialogs/hyperdlg.src +++ /dev/null @@ -1,97 +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 -#include -#include "helpid.hrc" - -String RID_SVXSTR_HYPDLG_CLOSEBUT -{ - Text [ en-US ] = "Close" ; -}; -String RID_SVXSTR_HYPDLG_MACROACT1 -{ - Text [ en-US ] = "Mouse over object" ; -}; -String RID_SVXSTR_HYPDLG_MACROACT2 -{ - Text [ en-US ] = "Trigger hyperlink" ; -}; -String RID_SVXSTR_HYPDLG_MACROACT3 -{ - Text [ en-US ] = "Mouse leaves object" ; -}; - -String RID_SVXSTR_HYPDLG_NOVALIDFILENAME -{ - Text [ en-US ] = "Please type in a valid file name." ; -}; - -String RID_SVXSTR_HYPERDLG_HLINETTP -{ - Text [ en-US ] = "Internet" ; -}; -String RID_SVXSTR_HYPERDLG_HLINETTP_HELP -{ - Text [ en-US ] = "This is where you create a hyperlink to a Web page or FTP server connection." ; -}; - -String RID_SVXSTR_HYPERDLG_HLMAILTP -{ - Text [ en-US ] = "Mail" ; -}; -String RID_SVXSTR_HYPERDLG_HLMAILTP_HELP -{ - Text [ en-US ] = "This is where you create a hyperlink to an e-mail address." ; -}; - -String RID_SVXSTR_HYPERDLG_HLDOCTP -{ - Text [ en-US ] = "Document" ; -}; -String RID_SVXSTR_HYPERDLG_HLDOCTP_HELP -{ - Text [ en-US ] = "This is where you create a hyperlink to an existing document or a target within a document." ; -}; - -String RID_SVXSTR_HYPERDLG_HLDOCNTP -{ - Text [ en-US ] = "New Document" ; -}; -String RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP -{ - Text [ en-US ] = "This is where you create a new document to which the new link points." ; -}; - -String RID_SVXSTR_HYPERDLG_FORM_BUTTON -{ - Text [ en-US ] = "Button" ; -}; - -String RID_SVXSTR_HYPERDLG_FROM_TEXT -{ - Text [ en-US ] = "Text" ; -}; - -String RID_SVXSTR_HYPERDLG_QUERYOVERWRITE -{ - Text [ en-US ] = "The file already exists. Overwrite?" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index a5f16c8f6b0d..bc68c29d278f 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -35,7 +35,8 @@ #include "insdlg.hxx" #include #include -#include +#include +#include #include #include @@ -54,6 +55,7 @@ #include #include "cuires.hrc" +#include "strings.hrc" #include @@ -67,19 +69,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::container; using namespace ::com::sun::star::ui::dialogs; - -static OUString impl_getSvtResString( sal_uInt32 nId ) -{ - OUString aRet; - ResMgr* pMgr = ResMgr::CreateResMgr( "svt", Application::GetSettings().GetUILanguageTag() ); - if( pMgr ) - { - aRet = ResId( nId, *pMgr ); - delete pMgr; - } - return aRet; -} - bool InsertObjectDialog_Impl::IsCreateNew() const { return false; @@ -278,7 +267,7 @@ short SvInsertOleDlg::Execute() { // object couldn't be created from file // global Resource from svtools (former so3 resource) - OUString aErr( impl_getSvtResString( STR_ERROR_OBJNOCREATE_FROM_FILE ) ); + OUString aErr(SvtResId(STR_ERROR_OBJNOCREATE_FROM_FILE)); aErr = aErr.replaceFirst( "%", aFileName ); ScopedVclPtrInstance(this, aErr)->Execute(); } @@ -286,7 +275,7 @@ short SvInsertOleDlg::Execute() { // object couldn't be created // global Resource from svtools (former so3 resource) - OUString aErr( impl_getSvtResString( STR_ERROR_OBJNOCREATE ) ); + OUString aErr(SvtResId(STR_ERROR_OBJNOCREATE)); aErr = aErr.replaceFirst( "%", aServerName ); ScopedVclPtrInstance(this, aErr)->Execute(); } @@ -327,7 +316,7 @@ short SvInsertOleDlg::Execute() { // object couldn't be created from file // global Resource from svtools (former so3 resource) - OUString aErr( impl_getSvtResString( STR_ERROR_OBJNOCREATE_FROM_FILE ) ); + OUString aErr(SvtResId(STR_ERROR_OBJNOCREATE_FROM_FILE)); aErr = aErr.replaceFirst( "%", aFileName ); ScopedVclPtrInstance(this, aErr)->Execute(); } diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx index 1f32977a0eb1..d0a36050babb 100644 --- a/cui/source/dialogs/insrc.cxx +++ b/cui/source/dialogs/insrc.cxx @@ -20,6 +20,7 @@ #include #include #include +#include #include "insrc.hxx" bool SvxInsRowColDlg::isInsertBefore() const diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index 50d6bd047ca2..961ff4f7ad18 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -34,7 +34,7 @@ #include #include "svtools/treelistentry.hxx" -#include +#include #include #include #include diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index c4da4b668a85..7edc03f8b2db 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -28,6 +28,7 @@ #include #include +#include #include #include #include diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index 21d058f3f4ff..408613465d23 100644 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -20,6 +20,7 @@ #include "passwdomdlg.hxx" #include "cuires.hrc" +#include "strings.hrc" #include "dialmgr.hxx" #include diff --git a/cui/source/dialogs/passwdomdlg.src b/cui/source/dialogs/passwdomdlg.src deleted file mode 100644 index b041e741646e..000000000000 --- a/cui/source/dialogs/passwdomdlg.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 - -String RID_SVXSTR_ONE_PASSWORD_MISMATCH -{ - Text [ en-US ] = "The confirmation password did not match the password. Set the password again by entering the same password in both boxes." ; -}; - -String RID_SVXSTR_TWO_PASSWORDS_MISMATCH -{ - Text [ en-US ] = "The confirmation passwords did not match the original passwords. Set the passwords again." ; -}; - -String RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON -{ - Text [ en-US ] = "Please enter a password to open or to modify, or check the open read-only option to continue." ; -}; - -String RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON_V2 -{ - Text [ en-US ] = "Set the password by entering the same password in both boxes." ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx index 0b8822247d32..3a312da170ee 100644 --- a/cui/source/dialogs/pastedlg.cxx +++ b/cui/source/dialogs/pastedlg.cxx @@ -31,7 +31,8 @@ #include #include #include -#include +#include +#include #include #include @@ -176,10 +177,8 @@ SotClipboardFormatId SvPasteObjectDialog::GetFormat( const TransferableDataHelpe if( aTypeName.isEmpty() && aSourceName.isEmpty() ) { - std::unique_ptr pMgr(ResMgr::CreateResMgr( "svt", Application::GetSettings().GetUILanguageTag() )); // global resource from svtools (former so3 resource) - if( pMgr ) - aSourceName = OUString( ResId( STR_UNKNOWN_SOURCE, *pMgr ) ); + aSourceName = SvtResId(STR_UNKNOWN_SOURCE); } } diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx index 412ee78fd2ae..6060252b4152 100644 --- a/cui/source/dialogs/screenshotannotationdlg.cxx +++ b/cui/source/dialogs/screenshotannotationdlg.cxx @@ -20,6 +20,7 @@ #include "screenshotannotationdlg.hxx" #include "cuires.hrc" +#include "strings.hrc" #include "dialmgr.hxx" #include diff --git a/cui/source/dialogs/screenshotannotationdlg.src b/cui/source/dialogs/screenshotannotationdlg.src deleted file mode 100644 index 62d0ac2ec89e..000000000000 --- a/cui/source/dialogs/screenshotannotationdlg.src +++ /dev/null @@ -1,27 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * 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 - -String RID_SVXSTR_SAVE_SCREENSHOT_AS -{ - Text [ en-US ] = "Save Screenshot As..."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index ec0f4e4c1f1e..6dcba4d31f36 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -27,6 +27,7 @@ #include #include +#include #include #include "scriptdlg.hxx" #include diff --git a/cui/source/dialogs/scriptdlg.src b/cui/source/dialogs/scriptdlg.src deleted file mode 100644 index d1ad2824449e..000000000000 --- a/cui/source/dialogs/scriptdlg.src +++ /dev/null @@ -1,104 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include -#include "helpid.hrc" - -String RID_SVXSTR_DELQUERY -{ - Text [ en-US ] = "Do you want to delete the following object?"; -}; -String RID_SVXSTR_DELQUERY_TITLE -{ - Text [ en-US ] = "Confirm Deletion"; -}; -String RID_SVXSTR_DELFAILED -{ - Text [ en-US ] = "The selected object could not be deleted."; -}; -String RID_SVXSTR_DELFAILED_TITLE -{ - Text [ en-US ] = "Error Deleting Object"; -}; -String RID_SVXSTR_CREATEFAILED -{ - Text [ en-US ] = "The object could not be created."; -}; -String RID_SVXSTR_CREATEFAILEDDUP -{ - Text [ en-US ] = " Object with the same name already exists."; -}; -String RID_SVXSTR_CREATEFAILED_TITLE -{ - Text [ en-US ] = "Error Creating Object"; -}; -String RID_SVXSTR_RENAMEFAILED -{ - Text [ en-US ] = "The object could not be renamed."; -}; -String RID_SVXSTR_RENAMEFAILED_TITLE -{ - Text [ en-US ] = "Error Renaming Object"; -}; - -String RID_SVXSTR_ERROR_TITLE -{ - Text [ en-US ] = "%PRODUCTNAME Error"; -}; - -String RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED -{ - Text [ en-US ] = "The scripting language %LANGUAGENAME is not supported."; -}; -String RID_SVXSTR_ERROR_RUNNING -{ - Text [ en-US ] = "An error occurred while running the %LANGUAGENAME script %SCRIPTNAME."; -}; - -String RID_SVXSTR_EXCEPTION_RUNNING -{ - Text [ en-US ] = "An exception occurred while running the %LANGUAGENAME script %SCRIPTNAME."; -}; - -String RID_SVXSTR_ERROR_AT_LINE -{ - Text [ en-US ] = "An error occurred while running the %LANGUAGENAME script %SCRIPTNAME at line: %LINENUMBER."; -}; - -String RID_SVXSTR_EXCEPTION_AT_LINE -{ - Text [ en-US ] = "An exception occurred while running the %LANGUAGENAME script %SCRIPTNAME at line: %LINENUMBER."; -}; - -String RID_SVXSTR_FRAMEWORK_ERROR_RUNNING -{ - Text [ en-US ] = "A Scripting Framework error occurred while running the %LANGUAGENAME script %SCRIPTNAME."; -}; - -String RID_SVXSTR_ERROR_TYPE_LABEL -{ - Text [ en-US ] = "Type:"; -}; - -String RID_SVXSTR_ERROR_MESSAGE_LABEL -{ - Text [ en-US ] = "Message:"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx index 0f2917fab7f5..50b35c157f6c 100644 --- a/cui/source/dialogs/showcols.cxx +++ b/cui/source/dialogs/showcols.cxx @@ -18,7 +18,7 @@ */ #include "showcols.hxx" -#include "fmsearch.hrc" +#include "strings.hrc" #include #include diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index ea01bcb7a1cc..5ccaa5dd1101 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -18,7 +18,6 @@ */ #include "srchxtra.hxx" -#include #include #include #include @@ -26,6 +25,7 @@ #include #include #include +#include #include #include "chardlg.hxx" #include "paragrph.hxx" @@ -137,7 +137,6 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog(vcl::Window* pParent, SfxObjectShell* pSh = SfxObjectShell::Current(); DBG_ASSERT( pSh, "No DocShell" ); - ResStringArray aAttrNames(ResId(RID_ATTR_NAMES, DIALOG_MGR())); SfxItemPool& rPool = pSh->GetPool(); SfxItemSet aSet( rPool, pWhRanges ); SfxWhichIter aIter( aSet ); @@ -160,10 +159,10 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog(vcl::Window* pParent, } // item resources are in svx - sal_uInt32 nId = aAttrNames.FindIndex( nSlot ); + sal_uInt32 nId = SvxAttrNameTable::FindIndex(nSlot); SvTreeListEntry* pEntry = nullptr; if ( RESARRAY_INDEX_NOTFOUND != nId ) - pEntry = m_pAttrLB->SvTreeListBox::InsertEntry( aAttrNames.GetString(nId) ); + pEntry = m_pAttrLB->SvTreeListBox::InsertEntry(SvxAttrNameTable::GetString(nId)); else SAL_WARN( "cui.dialogs", "no resource for slot id " << static_cast(nSlot) ); diff --git a/cui/source/dialogs/svuidlg.hrc b/cui/source/dialogs/svuidlg.hrc deleted file mode 100644 index 5322c8b0ac54..000000000000 --- a/cui/source/dialogs/svuidlg.hrc +++ /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 -#include - -#define STR_AUTOLINK 32006 -#define STR_MANUALLINK 32007 -#define STR_BROKENLINK 32008 -#define STR_CLOSELINKMSG 32011 -#define STR_CLOSELINKMSG_MULTI 32024 -#define STR_WAITINGLINK 32028 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 0bed6ce6f9a2..0bf69e5329ce 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -20,6 +20,7 @@ #include "thesdlg.hxx" #include "thesdlg_impl.hxx" #include "cuires.hrc" +#include "strings.hrc" #include "dialmgr.hxx" #include diff --git a/cui/source/factory/cuiresmgr.cxx b/cui/source/factory/cuiresmgr.cxx index 376d4962483a..c03d3dbbc476 100644 --- a/cui/source/factory/cuiresmgr.cxx +++ b/cui/source/factory/cuiresmgr.cxx @@ -18,22 +18,22 @@ */ #include -#include #include #include #include -// struct DialogsResMgr -------------------------------------------------- -ResMgr* CuiResMgr::GetResMgr() +namespace { - static ResMgr* pResMgr=nullptr; - - if ( !pResMgr ) + const std::locale& GetResLocale() { - pResMgr = ResMgr::CreateResMgr("cui", Application::GetSettings().GetUILanguageTag()); + static std::locale loc(Translate::Create("cui", Application::GetSettings().GetUILanguageTag())); + return loc; } +} - return pResMgr; +OUString CuiResId(const char *pKey) +{ + return Translate::get(pKey, GetResLocale()); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 3c1287180cae..ed48d45f94ed 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -27,7 +27,6 @@ #include #include "numfmt.hxx" #include "splitcelldlg.hxx" -#include "gallery.hrc" #include "dstribut.hxx" #include "cuiimapwnd.hxx" #include "hlmarkwn.hxx" diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index c784d2917e3d..6502549ac6d7 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -131,8 +131,8 @@ private: DECL_LINK( SyncHdl_Impl, Button*, void); DECL_LINK( RemoveAdjacentCellBorderHdl_Impl, Button*, void); - sal_uInt16 GetPresetImageId( sal_uInt16 nValueSetIdx ) const; - sal_uInt16 GetPresetStringId( sal_uInt16 nValueSetIdx ) const; + sal_uInt16 GetPresetImageId(sal_uInt16 nValueSetIdx) const; + const char* GetPresetStringId(sal_uInt16 nValueSetIdx) const; void FillPresetVS(); void FillShadowVS(); diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index 16cb33c8d6f2..beec430dcd7a 100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -25,72 +25,12 @@ // Resource-Id's ------------------------------------------------------------ -// RID_SVX_START + 0 unused -#define RID_SVXSTR_OPTIONS_RESTART (RID_SVX_START + 1) - // Gallery #define RID_CUI_GALLERY_START (RID_SVX_START + 360) // RID_CUI_GALLERY_END (RID_SVX_START + 410) -// used in "tabpages" -#define RID_SVXSTR_TABLE_PRESET_NONE (RID_SVX_START + 969) -#define RID_SVXSTR_TABLE_PRESET_ONLYOUTER (RID_SVX_START + 970) -#define RID_SVXSTR_TABLE_PRESET_OUTERHORI (RID_SVX_START + 971) -#define RID_SVXSTR_TABLE_PRESET_OUTERALL (RID_SVX_START + 972) -#define RID_SVXSTR_TABLE_PRESET_OUTERINNER (RID_SVX_START + 973) -#define RID_SVXSTR_PARA_PRESET_DIAGONAL (RID_SVX_START + 974) -#define RID_SVXSTR_PARA_PRESET_ALL (RID_SVX_START + 975) -#define RID_SVXSTR_PARA_PRESET_LEFTRIGHT (RID_SVX_START + 976) -#define RID_SVXSTR_PARA_PRESET_TOPBOTTOM (RID_SVX_START + 977) -#define RID_SVXSTR_PARA_PRESET_ONLYLEFT (RID_SVX_START + 978) -#define RID_SVXSTR_SHADOW_STYLE_NONE (RID_SVX_START + 979) -#define RID_SVXSTR_SHADOW_STYLE_BOTTOMRIGHT (RID_SVX_START + 980) -#define RID_SVXSTR_SHADOW_STYLE_TOPRIGHT (RID_SVX_START + 981) -#define RID_SVXSTR_SHADOW_STYLE_BOTTOMLEFT (RID_SVX_START + 982) -#define RID_SVXSTR_SHADOW_STYLE_TOPLEFT (RID_SVX_START + 983) -#define RID_SVXSTR_HOR_PRESET_ONLYHOR (RID_SVX_START + 1113) -#define RID_SVXSTR_VER_PRESET_ONLYVER (RID_SVX_START + 1114) -#define RID_SVXSTR_FRAMEDIR_LTR (RID_SVX_START + 960) -#define RID_SVXSTR_FRAMEDIR_RTL (RID_SVX_START + 961) -#define RID_SVXSTR_FRAMEDIR_SUPER (RID_SVX_START + 962) -#define RID_SVXSTR_PAGEDIR_LTR_HORI (RID_SVX_START + 965) -#define RID_SVXSTR_PAGEDIR_RTL_HORI (RID_SVX_START + 966) -#define RID_SVXSTR_PAGEDIR_RTL_VERT (RID_SVX_START + 967) -#define RID_SVXSTR_PAGEDIR_LTR_VERT (RID_SVX_START + 968) -#define RID_SVXSTR_EDIT_GRAPHIC (RID_SVX_START + 509) - -#define RID_SVXSTR_DESC_GRADIENT (RID_SVX_START + 163) -#define RID_SVXSTR_DESC_NEW_BITMAP (RID_SVX_START + 168) -#define RID_SVXSTR_DESC_EXT_BITMAP (RID_SVX_START + 169) -#define RID_SVXSTR_DESC_NEW_PATTERN (RID_SVX_START + 170) -#define RID_SVXSTR_REMOVE_FAVORITES (RID_SVX_START + 171) -#define RID_SVXSTR_ADD_FAVORITES (RID_SVX_START + 172) -#define RID_SVXSTR_DESC_LINESTYLE (RID_SVX_START + 174) - -#define RID_SVXSTR_ASK_CHANGE_LINESTYLE (RID_SVX_START + 177) -#define RID_SVXSTR_DESC_HATCH (RID_SVX_START + 232) -#define RID_SVXSTR_CHANGE (RID_SVX_START + 181) -#define RID_SVXSTR_ADD (RID_SVX_START + 182) -#define RID_SVXSTR_DESC_COLOR (RID_SVX_START + 215) -#define RID_SVXSTR_TABLE (RID_SVX_START + 220) -#define RID_SVXSTR_CONNECTOR (RID_SVX_START + 221) -#define RID_SVXSTR_DIMENSION_LINE (RID_SVX_START + 222) - -#define RID_SVXSTR_DESC_LINEEND (RID_SVX_START + 238) -#define RID_SVXSTR_CHARNAME_NOSTYLE (RID_SVX_START + 239) -#define RID_SVXSTR_CHARNAME_FAMILY (RID_SVX_START + 240) -#define RID_SVXSTR_CHARNAME_FONT (RID_SVX_START + 241) -#define RID_SVXSTR_CHARNAME_STYLE (RID_SVX_START + 242) -#define RID_SVXSTR_CHARNAME_TYPEFACE (RID_SVX_START + 243) -#define RID_SVXSTR_CHARNAME_HIGHLIGHTING (RID_SVX_START + 244) - // options -#define RID_SVXSTR_DIAGRAM_ROW (RID_SVX_START + 1162) -#define RID_SVXSTR_QUERY_DELETE_CONFIRM (RID_SVX_START + 1110) #define RID_SVXPAGE_JSEARCH_OPTIONS (RID_SVX_START + 840) -#define STR_LINKEDDOC_DOESNOTEXIST (RID_SVX_START + 1111) -#define STR_LINKEDDOC_NO_SYSTEM_FILE (RID_SVX_START + 1169) -#define STR_NAME_CONFLICT (RID_SVX_START + 1112) #define RID_SVX_FONT_SUBSTITUTION (RID_SVX_START + 18) // treeopt @@ -115,293 +55,13 @@ #define RID_OPTPAGE_CHART_DEFCOLORS (RID_SVX_START + 299) #define RID_SVXPAGE_PERSONALIZATION (RID_SVX_START + 247) #define RID_SVXPAGE_COLORCONFIG (RID_SVX_START + 249) -#define RID_SVXSTR_COLOR_CONFIG_DELETE (RID_SVX_START + 324) -#define RID_SVXSTR_COLOR_CONFIG_SAVE1 (RID_SVX_START + 853) -#define RID_SVXSTR_COLOR_CONFIG_SAVE2 (RID_SVX_START + 854) -#define RID_SVXSTR_COLOR_CONFIG_DELETE_TITLE (RID_SVX_START + 855) -#define RID_SVXSTR_OPT_DOUBLE_DICTS (RID_SVX_START + 320) -#define RID_SVXSTR_OPT_PROXYPORTS (RID_SVX_START + 224) -#define RID_SVXSTR_JRE_NOT_RECOGNIZED (RID_SVX_START + 256) -#define RID_SVXSTR_JRE_FAILED_VERSION (RID_SVX_START + 257) -#define RID_SVXSTR_JAVA_START_PARAM (RID_SVX_START + 258) -#define RID_SVXSTR_PATH_NAME_START (RID_SVX_START + 1003) #define RID_SVXPAGE_BASICIDE_OPTIONS (RID_SVX_START + 209) -#define RID_SVXSTR_KEY_AUTOCORRECT_DIR (RID_SVX_START + 1004) //? -#define RID_SVXSTR_KEY_DICTIONARY_PATH (RID_SVX_START + 1010)//? -#define RID_SVXSTR_KEY_LINGUISTIC_DIR (RID_SVX_START + 1016)//? -#define RID_SVXSTR_KEY_USERCONFIG_PATH (RID_SVX_START + 1023)//? -#define RID_SVXSTR_KEY_FILTER_PATH (RID_SVX_START + 1012)//? -#define RID_SVXSTR_KEY_ADDINS_PATH (RID_SVX_START + 1003)//? -#define RID_SVXSTR_KEY_FAVORITES_DIR (RID_SVX_START + 1011)//? -#define RID_SVXSTR_KEY_PLUGINS_PATH (RID_SVX_START + 1019)//? -#define RID_SVXSTR_KEY_TEMP_PATH (RID_SVX_START + 1021)//? -#define RID_SVXSTR_KEY_STORAGE_DIR (RID_SVX_START + 1020)//? -#define RID_SVXSTR_KEY_GALLERY_DIR (RID_SVX_START + 1013)//? -#define RID_SVXSTR_KEY_HELP_DIR (RID_SVX_START + 1015)//? -#define RID_SVXSTR_KEY_GLOSSARY_PATH (RID_SVX_START + 1005)//? -#define RID_SVXSTR_KEY_TEMPLATE_PATH (RID_SVX_START + 1022)//? -#define RID_SVXSTR_KEY_MODULES_PATH (RID_SVX_START + 1017)//? -#define RID_SVXSTR_KEY_BACKUP_PATH (RID_SVX_START + 1006)//? -#define RID_SVXSTR_KEY_PALETTE_PATH (RID_SVX_START + 1018)//? -#define RID_SVXSTR_KEY_CONFIG_DIR (RID_SVX_START + 1009)//? -#define RID_SVXSTR_KEY_WORK_PATH (RID_SVX_START + 1024)//? -#define RID_SVXSTR_KEY_GRAPHICS_PATH (RID_SVX_START + 1014)//? -#define RID_SVXSTR_KEY_BASIC_PATH (RID_SVX_START + 1007)//? -#define RID_SVXSTR_KEY_BITMAP_PATH (RID_SVX_START + 1008)//? -#define RID_SVXSTR_KEY_USERDICTIONARY_DIR (RID_SVX_START + 1025)//? -#define RID_SVXSTR_KEY_CLASSIFICATION_PATH (RID_SVX_START + 1118) - -// dialogs -#define STR_MODIFY (RID_SVX_START + 336)//from optdict.src // hyperlink dialog #define RID_SVXPAGE_HYPERLINK_INTERNET (RID_SVX_START + 228) #define RID_SVXPAGE_HYPERLINK_MAIL (RID_SVX_START + 229) #define RID_SVXPAGE_HYPERLINK_DOCUMENT (RID_SVX_START + 230) #define RID_SVXPAGE_HYPERLINK_NEWDOCUMENT (RID_SVX_START + 231) -#define RID_SVXSTR_HYPERDLG_HLINETTP (RID_SVX_START + 581) -#define RID_SVXSTR_HYPERDLG_HLINETTP_HELP (RID_SVX_START + 582) -#define RID_SVXSTR_HYPERDLG_HLMAILTP (RID_SVX_START + 583) -#define RID_SVXSTR_HYPERDLG_HLMAILTP_HELP (RID_SVX_START + 584) -#define RID_SVXSTR_HYPERDLG_HLDOCTP (RID_SVX_START + 585) -#define RID_SVXSTR_HYPERDLG_HLDOCTP_HELP (RID_SVX_START + 586) -#define RID_SVXSTR_HYPERDLG_HLDOCNTP (RID_SVX_START + 587) -#define RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP (RID_SVX_START + 588) -#define RID_SVXSTR_HYPDLG_CLOSEBUT (RID_SVX_START + 549) -#define RID_SVXSTR_HYPDLG_NOVALIDFILENAME (RID_SVX_START + 553) -#define RID_SVXSTR_HYPERDLG_QUERYOVERWRITE (RID_SVX_START + 815) -#define RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES (RID_SVX_START + 800) -#define RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN (RID_SVX_START + 801) -#define RID_SVXSTR_HYPDLG_MACROACT1 (RID_SVX_START + 550) -#define RID_SVXSTR_HYPDLG_MACROACT2 (RID_SVX_START + 551) -#define RID_SVXSTR_HYPDLG_MACROACT3 (RID_SVX_START + 552) -#define RID_SVXSTR_HYPERDLG_FORM_BUTTON (RID_SVX_START + 813) -#define RID_SVXSTR_HYPERDLG_FROM_TEXT (RID_SVX_START + 814) -#define RID_SVXSTR_MNUCFG_ALREADY_INCLUDED (RID_SVX_START + 816) - -// multi path dialog -#define RID_MULTIPATH_DBL_ERR (RID_SVX_START + 207) -#define RID_SVXSTR_ARCHIVE_TITLE (RID_SVX_START + 484) -#define RID_SVXSTR_ARCHIVE_HEADLINE (RID_SVX_START + 485) -#define RID_SVXSTR_MULTIFILE_DBL_ERR (RID_SVX_START + 486) -#define RID_SVXSTR_ADD_IMAGE (RID_SVX_START + 487) - -// script organizer -#define RID_SVXSTR_DELQUERY (RID_SVX_START + 1027) -#define RID_SVXSTR_DELQUERY_TITLE (RID_SVX_START + 1028) -#define RID_SVXSTR_DELFAILED (RID_SVX_START + 1029) -#define RID_SVXSTR_DELFAILED_TITLE (RID_SVX_START + 1031) -#define RID_SVXSTR_CREATEFAILED (RID_SVX_START + 1032) -#define RID_SVXSTR_CREATEFAILEDDUP (RID_SVX_START + 1034) -#define RID_SVXSTR_CREATEFAILED_TITLE (RID_SVX_START + 1035) -#define RID_SVXSTR_RENAMEFAILED (RID_SVX_START + 1036) -#define RID_SVXSTR_RENAMEFAILED_TITLE (RID_SVX_START + 1038) -#define RID_SVXSTR_ERROR_TITLE (RID_SVX_START + 1100) -#define RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED (RID_SVX_START + 1101) -#define RID_SVXSTR_ERROR_RUNNING (RID_SVX_START + 1102) -#define RID_SVXSTR_EXCEPTION_RUNNING (RID_SVX_START + 1103) -#define RID_SVXSTR_ERROR_AT_LINE (RID_SVX_START + 1104) -#define RID_SVXSTR_EXCEPTION_AT_LINE (RID_SVX_START + 1105) -#define RID_SVXSTR_FRAMEWORK_ERROR_RUNNING (RID_SVX_START + 1106) -#define RID_SVXSTR_ERROR_TYPE_LABEL (RID_SVX_START + 1108) -#define RID_SVXSTR_ERROR_MESSAGE_LABEL (RID_SVX_START + 1109) - -#define RID_SVXSTR_PRODUCTNAME_CONTEXTMENUS (RID_SVX_START + 1167) -#define RID_SVXSTR_NEW_MENU (RID_SVX_START + 1039) -#define RID_SVXSTR_NEW_TOOLBAR (RID_SVX_START + 1040) -#define RID_SVXSTR_MOVE_MENU (RID_SVX_START + 1041) -#define RID_SVXSTR_ADD_SUBMENU (RID_SVX_START + 1048) -#define RID_SVXSTR_SUBMENU_NAME (RID_SVX_START + 1049) -#define RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION (RID_SVX_START + 1050) -#define RID_SVXSTR_DELETE_ICON_CONFIRM (RID_SVX_START + 1163) //added for issue73355 -#define RID_SVXSTR_REPLACE_ICON_WARNING (RID_SVX_START + 1164) //added for issue73355 -#define RID_SVXSTR_REPLACE_ICON_CONFIRM (RID_SVX_START + 1165) //added for issue73355 -#define RID_SVXSTR_YESTOALL (RID_SVX_START + 1166) //added for issue73355 -#define RID_SVXSTR_PRODUCTNAME_TOOLBARS (RID_SVX_START + 1042) -#define RID_SVXSTR_TOOLBAR (RID_SVX_START + 1043) -#define RID_SVXSTR_TOOLBAR_CONTENT (RID_SVX_START + 1044) -#define RID_SVXSTR_COMMANDS (RID_SVX_START + 1045) -#define RID_SVXSTR_CONFIRM_MENU_RESET (RID_SVX_START + 1115) -#define RID_SVXSTR_CONFIRM_TOOLBAR_RESET (RID_SVX_START + 1116) -#define RID_SVXSTR_LABEL_NEW_NAME (RID_SVX_START + 1135) -#define RID_SVXSTR_RENAME_MENU (RID_SVX_START + 1136) -#define RID_SVXSTR_RENAME_TOOLBAR (RID_SVX_START + 1137) -#define RID_SVXSTR_EVENT_STARTAPP (RID_SVX_START + 1051) -#define RID_SVXSTR_EVENT_CLOSEAPP (RID_SVX_START + 1052) -#define RID_SVXSTR_EVENT_NEWDOC (RID_SVX_START + 1053) -#define RID_SVXSTR_EVENT_CLOSEDOC (RID_SVX_START + 1054) -#define RID_SVXSTR_EVENT_PREPARECLOSEDOC (RID_SVX_START + 1055) -#define RID_SVXSTR_EVENT_OPENDOC (RID_SVX_START + 1056) -#define RID_SVXSTR_EVENT_SAVEDOC (RID_SVX_START + 1057) -#define RID_SVXSTR_EVENT_SAVEASDOC (RID_SVX_START + 1058) -#define RID_SVXSTR_EVENT_SAVEDOCDONE (RID_SVX_START + 1059) -#define RID_SVXSTR_EVENT_SAVEASDOCDONE (RID_SVX_START + 1060) -#define RID_SVXSTR_EVENT_ACTIVATEDOC (RID_SVX_START + 1061) -#define RID_SVXSTR_EVENT_DEACTIVATEDOC (RID_SVX_START + 1062) -#define RID_SVXSTR_EVENT_PRINTDOC (RID_SVX_START + 1063) -#define RID_SVXSTR_EVENT_MODIFYCHANGED (RID_SVX_START + 1064) -#define RID_SVXSTR_EVENT_MAILMERGE (RID_SVX_START + 1065) -#define RID_SVXSTR_EVENT_PAGECOUNTCHANGE (RID_SVX_START + 1066) -#define RID_SVXSTR_EVENT_APPROVEACTIONPERFORMED (RID_SVX_START + 1067) -#define RID_SVXSTR_EVENT_ACTIONPERFORMED (RID_SVX_START + 1068) -#define RID_SVXSTR_EVENT_CHANGED (RID_SVX_START + 1069) -#define RID_SVXSTR_EVENT_TEXTCHANGED (RID_SVX_START + 1070) -#define RID_SVXSTR_EVENT_ITEMSTATECHANGED (RID_SVX_START + 1071) -#define RID_SVXSTR_EVENT_FOCUSGAINED (RID_SVX_START + 1072) -#define RID_SVXSTR_EVENT_FOCUSLOST (RID_SVX_START + 1073) -#define RID_SVXSTR_EVENT_KEYTYPED (RID_SVX_START + 1074) -#define RID_SVXSTR_EVENT_KEYUP (RID_SVX_START + 1075) -#define RID_SVXSTR_EVENT_MOUSEENTERED (RID_SVX_START + 1076) -#define RID_SVXSTR_EVENT_MOUSEDRAGGED (RID_SVX_START + 1077) -#define RID_SVXSTR_EVENT_MOUSEMOVED (RID_SVX_START + 1078) -#define RID_SVXSTR_EVENT_MOUSEPRESSED (RID_SVX_START + 1079) -#define RID_SVXSTR_EVENT_MOUSERELEASED (RID_SVX_START + 1080) -#define RID_SVXSTR_EVENT_MOUSEEXITED (RID_SVX_START + 1081) -#define RID_SVXSTR_EVENT_APPROVERESETTED (RID_SVX_START + 1082) -#define RID_SVXSTR_EVENT_SUBMITTED (RID_SVX_START + 1083) -#define RID_SVXSTR_EVENT_BEFOREUPDATE (RID_SVX_START + 1084) -#define RID_SVXSTR_EVENT_AFTERUPDATE (RID_SVX_START + 1085) -#define RID_SVXSTR_EVENT_LOADED (RID_SVX_START + 1086) -#define RID_SVXSTR_EVENT_RELOADING (RID_SVX_START + 1087) -#define RID_SVXSTR_EVENT_RELOADED (RID_SVX_START + 1088) -#define RID_SVXSTR_EVENT_UNLOADING (RID_SVX_START + 1089) -#define RID_SVXSTR_EVENT_UNLOADED (RID_SVX_START + 1090) -#define RID_SVXSTR_EVENT_CONFIRMDELETE (RID_SVX_START + 1091) -#define RID_SVXSTR_EVENT_APPROVEROWCHANGE (RID_SVX_START + 1092) -#define RID_SVXSTR_EVENT_ROWCHANGE (RID_SVX_START + 1093) -#define RID_SVXSTR_EVENT_POSITIONING (RID_SVX_START + 1094) -#define RID_SVXSTR_EVENT_POSITIONED (RID_SVX_START + 1095) -#define RID_SVXSTR_EVENT_APPROVEPARAMETER (RID_SVX_START + 1096) -#define RID_SVXSTR_EVENT_ERROROCCURRED (RID_SVX_START + 1097) -#define RID_SVXSTR_EVENT_ADJUSTMENTVALUECHANGED (RID_SVX_START + 1098) -#define RID_SVXSTR_EVENT_RESETTED (RID_SVX_START + 1099) -#define RID_SVXSTR_EVENT_SUBCOMPONENT_OPENED (RID_SVX_START + 1170) -#define RID_SVXSTR_EVENT_SUBCOMPONENT_CLOSED (RID_SVX_START + 1171) -#define RID_SVXSTR_EVENT_CREATEDOC (RID_SVX_START + 1172) -#define RID_SVXSTR_EVENT_LOADDOCFINISHED (RID_SVX_START + 1173) -#define RID_SVXSTR_EVENT_SAVEDOCFAILED (RID_SVX_START + 1174) -#define RID_SVXSTR_EVENT_SAVEASDOCFAILED (RID_SVX_START + 1175) -#define RID_SVXSTR_EVENT_COPYTODOC (RID_SVX_START + 1176) -#define RID_SVXSTR_EVENT_COPYTODOCDONE (RID_SVX_START + 1177) -#define RID_SVXSTR_EVENT_COPYTODOCFAILED (RID_SVX_START + 1178) -#define RID_SVXSTR_EVENT_VIEWCREATED (RID_SVX_START + 1179) -#define RID_SVXSTR_EVENT_PREPARECLOSEVIEW (RID_SVX_START + 1180) -#define RID_SVXSTR_EVENT_CLOSEVIEW (RID_SVX_START + 1181) -#define RID_SVXSTR_EVENT_TITLECHANGED (RID_SVX_START + 1182) -#define RID_SVXSTR_EVENT_MAILMERGE_END (RID_SVX_START + 1186) -#define RID_SVXSTR_EVENT_FIELDMERGE (RID_SVX_START + 1187) -#define RID_SVXSTR_EVENT_FIELDMERGE_FINISHED (RID_SVX_START + 1188) - -// For now, keep new IDs unique only within cui. -// Later, cui should perhaps get an own range of IDs. -#define RID_SVXSTR_EVENT_SELECTIONCHANGED (RID_SVX_START + 1190) -#define RID_SVXSTR_EVENT_DOUBLECLICK (RID_SVX_START + 1191) -#define RID_SVXSTR_EVENT_RIGHTCLICK (RID_SVX_START + 1192) -#define RID_SVXSTR_EVENT_CALCULATE (RID_SVX_START + 1193) -#define RID_SVXSTR_EVENT_CONTENTCHANGED (RID_SVX_START + 1194) - -#define RID_SVXSTR_ERR_TEXTNOTFOUND (RID_SVX_START + 1195) -#define RID_SVXSTR_SELECT_FILE_IFRAME (RID_SVX_START + 1196) -#define RID_SVXSTR_MYMACROS (RID_SVX_START + 1197) -#define RID_SVXSTR_PRODMACROS (RID_SVX_START + 1198) -#define RID_SVXSTR_SELECTOR_ADD_COMMANDS (RID_SVX_START + 1199) -#define RID_SVXSTR_SELECTOR_RUN (RID_SVX_START + 1200) -#define RID_SVXSTR_ROW (RID_SVX_START + 1201) -#define RID_SVXSTR_COL (RID_SVX_START + 1202) -#define RID_SVXSTR_AUTO_ENTRY (RID_SVX_START + 1203) -#define RID_SVXSTR_ALLFUNCTIONS (RID_SVX_START + 1204) - -#define RID_SVXSTR_USE_REPLACE (RID_SVX_START + 1205) -#define RID_SVXSTR_CPTL_STT_WORD (RID_SVX_START + 1206) -#define RID_SVXSTR_CPTL_STT_SENT (RID_SVX_START + 1207) -#define RID_SVXSTR_BOLD_UNDER (RID_SVX_START + 1208) -#define RID_SVXSTR_NO_DBL_SPACES (RID_SVX_START + 1209) -#define RID_SVXSTR_DETECT_URL (RID_SVX_START + 1210) -#define RID_SVXSTR_DASH (RID_SVX_START + 1211) -#define RID_SVXSTR_CORRECT_ACCIDENTAL_CAPS_LOCK (RID_SVX_START + 1212) -#define RID_SVXSTR_NON_BREAK_SPACE (RID_SVX_START + 1213) -#define RID_SVXSTR_ORDINAL (RID_SVX_START + 1214) -#define RID_SVXSTR_DEL_EMPTY_PARA (RID_SVX_START + 1215) -#define RID_SVXSTR_USER_STYLE (RID_SVX_START + 1216) -#define RID_SVXSTR_BULLET (RID_SVX_START + 1217) -#define RID_SVXSTR_RIGHT_MARGIN (RID_SVX_START + 1218) -#define RID_SVXSTR_NUM (RID_SVX_START + 1219) -#define RID_SVXSTR_BORDER (RID_SVX_START + 1220) -#define RID_SVXSTR_CREATE_TABLE (RID_SVX_START + 1221) -#define RID_SVXSTR_REPLACE_TEMPLATES (RID_SVX_START + 1222) -#define RID_SVXSTR_DEL_SPACES_AT_STT_END (RID_SVX_START + 1223) -#define RID_SVXSTR_DEL_SPACES_BETWEEN_LINES (RID_SVX_START + 1224) - -#define RID_SVXSTR_CAPITAL_WORDS (RID_SVX_START + 1225) -#define RID_SVXSTR_WORDS_WITH_DIGITS (RID_SVX_START + 1226) -#define RID_SVXSTR_SPELL_SPECIAL (RID_SVX_START + 1227) -#define RID_SVXSTR_SPELL_AUTO (RID_SVX_START + 1228) -#define RID_SVXSTR_NUM_PRE_BREAK (RID_SVX_START + 1229) -#define RID_SVXSTR_NUM_POST_BREAK (RID_SVX_START + 1230) -#define RID_SVXSTR_HYPH_AUTO (RID_SVX_START + 1231) -#define RID_SVXSTR_HYPH_SPECIAL (RID_SVX_START + 1232) -#define RID_SVXSTR_NUM_MIN_WORDLEN (RID_SVX_START + 1233) -#define RID_SVXSTR_GRAMMAR_AUTO (RID_SVX_START + 1234) -#define RID_SVXSTR_GROUP_STYLES (RID_SVX_START + 1235) -#define RID_SVXSTR_BASICMACROS (RID_SVX_START + 1236) -// There is a gap here because of removed strings -#define RID_SVXSTR_CHG_MATH (RID_SVX_START + 1238) -#define RID_SVXSTR_CHG_WRITER (RID_SVX_START + 1239) -#define RID_SVXSTR_CHG_CALC (RID_SVX_START + 1240) -#define RID_SVXSTR_CHG_IMPRESS (RID_SVX_START + 1241) -#define RID_SVXSTR_HEADER1 (RID_SVX_START + 1242) -#define RID_SVXSTR_HEADER2 (RID_SVX_START + 1243) - -#define RID_SVXSTR_TYPE (RID_SVX_START + 1244) -#define RID_SVXSTR_PATH (RID_SVX_START + 1245) - -#define RID_SVXSTR_DRIVER_NAME (RID_SVX_START + 1246) -#define RID_SVXSTR_POOLED_FLAG (RID_SVX_START + 1247) -#define RID_SVXSTR_POOL_TIMEOUT (RID_SVX_START + 1248) -#define RID_SVXSTR_YES (RID_SVX_START + 1249) -#define RID_SVXSTR_NO (RID_SVX_START + 1250) - -#define RID_SVXSTR_CHG_SMARTART (RID_SVX_START + 1251) - -#define RID_SVXSTR_PPI (RID_SVX_START + 1252) -#define RID_SVXSTR_SPELL (RID_SVX_START + 1253) -#define RID_SVXSTR_HYPH (RID_SVX_START + 1254) -#define RID_SVXSTR_THES (RID_SVX_START + 1255) -#define RID_SVXSTR_GRAMMAR (RID_SVX_START + 1256) - -#define RID_SVXSTR_ONE_PASSWORD_MISMATCH (RID_SVX_START + 1258) -#define RID_SVXSTR_TWO_PASSWORDS_MISMATCH (RID_SVX_START + 1259) -#define RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON (RID_SVX_START + 1260) -#define RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON_V2 (RID_SVX_START + 1261) - -#define RID_SVXSTR_LOADACCELCONFIG (RID_SVX_START + 1262) -#define RID_SVXSTR_SAVEACCELCONFIG (RID_SVX_START + 1263) -#define RID_SVXSTR_FILTERNAME_CFG (RID_SVX_START + 1264) -#define RID_SVXSTR_LOAD_ERROR (RID_SVX_START + 1265) - -#define RID_SVXSTR_EDITHINT (RID_SVX_START + 1266) -#define RID_SVXSTR_SAVE_SCREENSHOT_AS (RID_SVX_START + 1267) - -#define RID_SVXSTR_STARTQUOTE (RID_SVX_START + 1268) -#define RID_SVXSTR_ENDQUOTE (RID_SVX_START + 1269) - -// Hangul/Hanja Dialog -#define RID_SVXSTR_HANGUL (RID_SVX_START + 1270) -#define RID_SVXSTR_HANJA (RID_SVX_START + 1271) - -// Search Persona Dialog -#define RID_SVXSTR_SELECTEDPERSONA (RID_SVX_START + 1278) -#define RID_SVXSTR_SEARCHING (RID_SVX_START + 1279) -#define RID_SVXSTR_SEARCHERROR (RID_SVX_START + 1280) -#define RID_SVXSTR_NORESULTS (RID_SVX_START + 1281) -#define RID_SVXSTR_APPLYPERSONA (RID_SVX_START + 1282) - -#define RID_SXVSTR_CONFIRM_DELETE_TOOLBAR (RID_SVX_START + 1283) -#define RID_SVXSTR_CONFIRM_RESTORE_DEFAULT (RID_SVX_START + 1284) -#define RID_SVXSTR_CONFIRM_SET_LANGUAGE (RID_SVX_START + 1285) - -// String Array for Persona Categories -#define RID_SVXSTR_PERSONA_CATEGORIES (RID_SVX_START + 1286) #define RID_SVXPAGE_OPENCL (RID_SVX_START + 254) diff --git a/cui/source/inc/dialmgr.hxx b/cui/source/inc/dialmgr.hxx index e323ba987c7e..067591a09bab 100644 --- a/cui/source/inc/dialmgr.hxx +++ b/cui/source/inc/dialmgr.hxx @@ -19,21 +19,9 @@ #ifndef INCLUDED_CUI_SOURCE_INC_DIALMGR_HXX #define INCLUDED_CUI_SOURCE_INC_DIALMGR_HXX -#include +#include -// forward --------------------------------------------------------------- - -#define CUI_MGR() (*CuiResMgr::GetResMgr()) - -struct CuiResMgr -{ - static ResMgr* GetResMgr(); -}; - -inline OUString CuiResId(sal_uInt16 nId) -{ - return ResId(nId, CUI_MGR()); -} +OUString CuiResId(const char *pKey); #endif diff --git a/cui/source/inc/gallery.hrc b/cui/source/inc/gallery.hrc deleted file mode 100644 index 221aa9bd5f6e..000000000000 --- a/cui/source/inc/gallery.hrc +++ /dev/null @@ -1,28 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#include - -// Gallery-Strings -#define RID_SVXSTR_GALLERY_NOFILES (RID_CUI_GALLERY_START + 12) -#define RID_SVXSTR_GALLERYPROPS_OBJECT (RID_CUI_GALLERY_START + 39) -#define RID_SVXSTR_GALLERY_READONLY (RID_CUI_GALLERY_START + 43) -#define RID_SVXSTR_GALLERY_ALLFILES (RID_CUI_GALLERY_START + 44) -#define RID_SVXSTR_GALLERY_ID_EXISTS (RID_CUI_GALLERY_START + 81) - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index b2feb3c6dcdc..736c4de3cbcf 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -41,10 +41,10 @@ typedef std::unordered_map< OUString, std::pair< OUString, OUString >, struct EventDisplayName { const sal_Char* pAsciiEventName; - sal_uInt16 nEventResourceID; - EventDisplayName( const sal_Char* _pAsciiName, const sal_uInt16 _nResId ) - : pAsciiEventName( _pAsciiName ) - , nEventResourceID( _nResId ) + const char* pEventResourceID; + EventDisplayName(const sal_Char* pAsciiName, const char* pResId) + : pAsciiEventName(pAsciiName) + , pEventResourceID(pResId) { } }; diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index fdd97c4566d8..ff83afe71892 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -73,9 +73,6 @@ class SvxSwPosSizeTabPage : public SfxTabPage Link m_aValidateLink; - //'string provider' - SvxSwFramePosString m_aFramePosString; - ::tools::Rectangle m_aRect; //size of all selected objects ::tools::Rectangle m_aWorkArea; Point m_aAnchorPos; @@ -110,7 +107,7 @@ class SvxSwPosSizeTabPage : public SfxTabPage void InitPos(RndStdIds nAnchorType, sal_uInt16 nH, sal_uInt16 nHRel, sal_uInt16 nV, sal_uInt16 nVRel, long nX, long nY); - sal_uInt16 GetMapPos(FrmMap *pMap, ListBox &rAlignLB); + static sal_uInt16 GetMapPos(FrmMap *pMap, ListBox &rAlignLB); static short GetAlignment(FrmMap *pMap, sal_uInt16 nMapPos, ListBox &rAlignLB, ListBox &rRelationLB); static short GetRelation(FrmMap *pMap, ListBox &rRelationLB); RndStdIds GetAnchorType(bool* pbHasChanged = nullptr); diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index a771ef0a206f..d01c1c10e2fe 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -24,7 +24,6 @@ #include -#include #include class SfxModule; @@ -196,40 +195,6 @@ public: static void ApplyLanguageOptions(const SfxItemSet& rSet); }; -// class OfaPageResource ------------------------------------------------- - -class OfaPageResource -{ - ResStringArray aGeneralDlgAry; - ResStringArray aInetDlgAry; - ResStringArray aLangDlgAry; - ResStringArray aTextDlgAry; - ResStringArray aHTMLDlgAry; - ResStringArray aCalcDlgAry; - ResStringArray aStarMathDlgAry; - ResStringArray aImpressDlgAry; - ResStringArray aDrawDlgAry; - ResStringArray aChartDlgAry; - ResStringArray aFilterDlgAry; - ResStringArray aDatasourcesDlgAry; - -public: - OfaPageResource(); - - ResStringArray& GetGeneralArray() {return aGeneralDlgAry;} - ResStringArray& GetInetArray() {return aInetDlgAry;} - ResStringArray& GetLangArray() {return aLangDlgAry;} - ResStringArray& GetTextArray() {return aTextDlgAry;} - ResStringArray& GetHTMLArray() {return aHTMLDlgAry;} - ResStringArray& GetCalcArray() {return aCalcDlgAry;} - ResStringArray& GetStarMathArray() {return aStarMathDlgAry;} - ResStringArray& GetImpressArray() {return aImpressDlgAry;} - ResStringArray& GetDrawArray() {return aDrawDlgAry;} - ResStringArray& GetChartArray() {return aChartDlgAry;} - ResStringArray& GetFilterArray() {return aFilterDlgAry;} - ResStringArray& GetDatasourcesArray() {return aDatasourcesDlgAry;} -}; - // class ExtensionsTabPage ----------------------------------------------- namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } } diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index 8a2e95793b16..4e8666cdac1a 100644 --- a/cui/source/options/cfgchart.cxx +++ b/cui/source/options/cfgchart.cxx @@ -22,6 +22,7 @@ #include "cfgchart.hxx" #include #include +#include #define ROW_COLOR_COUNT 12 diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index 850a05d8d2c2..ae3a2538d386 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -25,6 +25,7 @@ #include #include #include "helpid.hrc" +#include #include using ::svt::EditBrowseBox; diff --git a/cui/source/options/connpooloptions.src b/cui/source/options/connpooloptions.src deleted file mode 100644 index 5f441079f37f..000000000000 --- a/cui/source/options/connpooloptions.src +++ /dev/null @@ -1,43 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include - -String RID_SVXSTR_DRIVER_NAME -{ - Text [ en-US ] = "Driver name"; -}; -String RID_SVXSTR_POOLED_FLAG -{ - Text [ en-US ] = "Pool"; -}; -String RID_SVXSTR_POOL_TIMEOUT -{ - Text [ en-US ] = "Timeout"; -}; -String RID_SVXSTR_YES -{ - Text [ en-US ] = "Yes"; -}; -String RID_SVXSTR_NO -{ - Text [ en-US ] = "No"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index ce2a4a94dd4b..df307e814396 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -25,6 +25,7 @@ #include #include "svtools/treelistentry.hxx" #include +#include #include #include #include @@ -442,5 +443,4 @@ IMPL_LINK( DbRegistrationOptionsPage, NameValidator, const OUString&, _rName, bo } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/dbregister.src b/cui/source/options/dbregister.src deleted file mode 100644 index 7362be056d51..000000000000 --- a/cui/source/options/dbregister.src +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include - -String RID_SVXSTR_TYPE -{ - Text [ en-US ] = "Registered name" ; -}; - -String RID_SVXSTR_PATH -{ - Text [ en-US ] = "Database file" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx index eacfc0319f80..6bb15f5b3aae 100644 --- a/cui/source/options/doclinkdialog.cxx +++ b/cui/source/options/doclinkdialog.cxx @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include diff --git a/cui/source/options/doclinkdialog.src b/cui/source/options/doclinkdialog.src deleted file mode 100644 index 6e93f0c373fa..000000000000 --- a/cui/source/options/doclinkdialog.src +++ /dev/null @@ -1,42 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include - -String STR_LINKEDDOC_DOESNOTEXIST -{ - Text [ en-US ] = "The file\n$file$\ndoes not exist."; -}; - -String STR_LINKEDDOC_NO_SYSTEM_FILE -{ - Text [ en-US ] = "The file\n$file$\ndoes not exist in the local file system."; -}; - -String STR_NAME_CONFLICT -{ - Text [ en-US ] = "The name '$file$' is already used for another database.\nPlease choose a different name."; -}; - -String RID_SVXSTR_QUERY_DELETE_CONFIRM -{ - Text [ en-US ] = "Do you want to delete the entry?" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optchart.src b/cui/source/options/optchart.src deleted file mode 100644 index f5ae78182f52..000000000000 --- a/cui/source/options/optchart.src +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include -#include "helpid.hrc" - -// tab page for setting the default colors used for new charts - -String RID_SVXSTR_DIAGRAM_ROW -{ - // $(ROW) can be a number or the caption of the row in quotes - - Text [ en-US ] = "Data Series $(ROW)" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 33ea45e806c0..1a64c728eddb 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -39,6 +39,7 @@ #include #include "optcolor.hxx" #include +#include #include using namespace ::com::sun::star; @@ -283,7 +284,6 @@ private: // ctor for default groups // rParent: parent window (ColorConfigWindow_Impl) // eGroup: which group is this? -// rResMgr: resource manager ColorConfigWindow_Impl::Chapter::Chapter(FixedText* pText, bool bShow) : m_pText(pText) { diff --git a/cui/source/options/optcolor.src b/cui/source/options/optcolor.src deleted file mode 100644 index 2a9af27e71b1..000000000000 --- a/cui/source/options/optcolor.src +++ /dev/null @@ -1,41 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include -#include "helpid.hrc" -#include - -String RID_SVXSTR_COLOR_CONFIG_DELETE -{ - Text [ en-US ] = "Do you really want to delete the color scheme?" ; -}; -String RID_SVXSTR_COLOR_CONFIG_DELETE_TITLE -{ - Text [ en-US ] = "Color Scheme Deletion" ; -}; -String RID_SVXSTR_COLOR_CONFIG_SAVE1 -{ - Text [ en-US ] = "Save scheme" ; -}; -String RID_SVXSTR_COLOR_CONFIG_SAVE2 -{ - Text [ en-US ] = "Name of color scheme" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index a8beb91cfa46..9f0f8bd434a4 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -34,6 +34,7 @@ #include #include +#include #include "optdict.hxx" #include #include @@ -177,7 +178,7 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl, Button*, void) xNewDic = nullptr; // error: couldn't create new dictionary SfxErrorContext aContext( ERRCTX_SVX_LINGU_DICTIONARY, OUString(), - this, RID_SVXERRCTX, &DIALOG_MGR() ); + this, getRID_SVXERRCTX(), &SvxResLocale() ); ErrorHandler::HandleError( *new StringErrorInfo( ERRCODE_SVX_LINGU_DICT_NOTWRITEABLE, sDict ) ); EndDialog(); diff --git a/cui/source/options/optdict.src b/cui/source/options/optdict.src deleted file mode 100644 index eeae6311835a..000000000000 --- a/cui/source/options/optdict.src +++ /dev/null @@ -1,38 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "helpid.hrc" -#include - -String RID_SVXSTR_OPT_DOUBLE_DICTS -{ - Text [ en-US ] = "The specified name already exists.\nPlease enter a new name." ; -}; - -String STR_MODIFY -{ - Text [ en-US ] = "~Replace" ; -}; - -String RID_SVXSTR_CONFIRM_SET_LANGUAGE -{ - Text [ en-US ] = "Do you want to change the '%1' dictionary language?" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 8723c18e77be..6964977d3a39 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -23,6 +23,7 @@ #include "optfltr.hxx" #include #include "helpid.hrc" +#include "strings.hrc" #include #include "svtools/svlbitm.hxx" diff --git a/cui/source/options/optfltr.src b/cui/source/options/optfltr.src deleted file mode 100644 index 41b378c05342..000000000000 --- a/cui/source/options/optfltr.src +++ /dev/null @@ -1,51 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include - -String RID_SVXSTR_HEADER1 -{ - Text [ en-US ] = "[L]"; -}; -String RID_SVXSTR_HEADER2 -{ - Text [ en-US ] = "[S]"; -}; -String RID_SVXSTR_CHG_MATH -{ - Text [ en-US ] = "MathType to %PRODUCTNAME Math or reverse"; -}; -String RID_SVXSTR_CHG_WRITER -{ - Text [ en-US ] = "WinWord to %PRODUCTNAME Writer or reverse"; -}; -String RID_SVXSTR_CHG_CALC -{ - Text [ en-US ] = "Excel to %PRODUCTNAME Calc or reverse"; -}; -String RID_SVXSTR_CHG_IMPRESS -{ - Text [ en-US ] = "PowerPoint to %PRODUCTNAME Impress or reverse"; -}; -String RID_SVXSTR_CHG_SMARTART -{ - Text [ en-US ] = "SmartArt to %PRODUCTNAME shapes or reverse"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index c28e7aecc901..db2ff453dbd4 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -54,6 +54,7 @@ #include #include #include +#include #include diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src deleted file mode 100644 index e1a9ee0f7800..000000000000 --- a/cui/source/options/optinet2.src +++ /dev/null @@ -1,29 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include -#include "helpid.hrc" -#include - -String RID_SVXSTR_OPT_PROXYPORTS -{ - Text [ en-US ] = "Invalid value!\n\nThe maximum value for a port number is 65535."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 732c616df0c5..8141a5b4ccc0 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -33,6 +33,7 @@ #include #include "helpid.hrc" +#include #include #include #include diff --git a/cui/source/options/optjava.src b/cui/source/options/optjava.src deleted file mode 100644 index f4e931a9fbd8..000000000000 --- a/cui/source/options/optjava.src +++ /dev/null @@ -1,43 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include -#include "helpid.hrc" - -String RID_SVXSTR_JRE_NOT_RECOGNIZED -{ - Text [ en-US ] = "The folder you selected does not contain a Java runtime environment.\nPlease select a different folder." ; -}; - -String RID_SVXSTR_JRE_FAILED_VERSION -{ - Text [ en-US ] = "The Java runtime environment you selected is not the required version.\nPlease select a different folder." ; -}; - -String RID_SVXSTR_OPTIONS_RESTART -{ - Text [ en-US ] = "Please restart %PRODUCTNAME now so the new or modified values can take effect." ; -}; - -String RID_SVXSTR_JAVA_START_PARAM -{ - Text [ en-US ] = "Edit Parameter" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index a67c458e43ec..1c85f8469c07 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -58,6 +58,7 @@ #include #include #include "helpid.hrc" +#include #include diff --git a/cui/source/options/optlingu.src b/cui/source/options/optlingu.src deleted file mode 100644 index 084f3a902de6..000000000000 --- a/cui/source/options/optlingu.src +++ /dev/null @@ -1,87 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "helpid.hrc" - -#include -#include -#include - -String RID_SVXSTR_SPELL -{ - Text [ en-US ] = "Spelling"; -}; - -String RID_SVXSTR_HYPH -{ - Text [ en-US ] = "Hyphenation"; -}; - -String RID_SVXSTR_THES -{ - Text [ en-US ] = "Thesaurus"; -}; - -String RID_SVXSTR_GRAMMAR -{ - Text [ en-US ] = "Grammar"; -}; - -String RID_SVXSTR_CAPITAL_WORDS -{ - Text [ en-US ] = "Check uppercase words"; -}; -String RID_SVXSTR_WORDS_WITH_DIGITS -{ - Text [ en-US ] = "Check words with numbers "; -}; -String RID_SVXSTR_SPELL_SPECIAL -{ - Text [ en-US ] = "Check special regions"; -}; -String RID_SVXSTR_SPELL_AUTO -{ - Text [ en-US ] = "Check spelling as you type"; -}; -String RID_SVXSTR_GRAMMAR_AUTO -{ - Text [ en-US ] = "Check grammar as you type"; -}; -String RID_SVXSTR_NUM_MIN_WORDLEN -{ - Text [ en-US ] = "Minimal number of characters for hyphenation: "; -}; -String RID_SVXSTR_NUM_PRE_BREAK -{ - Text [ en-US ] = "Characters before line break: "; -}; -String RID_SVXSTR_NUM_POST_BREAK -{ - Text [ en-US ] = "Characters after line break: "; -}; -String RID_SVXSTR_HYPH_AUTO -{ - Text [ en-US ] = "Hyphenate without inquiry"; -}; -String RID_SVXSTR_HYPH_SPECIAL -{ - Text [ en-US ] = "Hyphenate special regions"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx index b99cd7f04767..0fb1e1a172ee 100644 --- a/cui/source/options/optopencl.cxx +++ b/cui/source/options/optopencl.cxx @@ -35,6 +35,7 @@ #include #include +#include #include #include "optopencl.hxx" #include diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index ab292153757f..08b0243a6f02 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -36,6 +36,7 @@ #include #include #include "helpid.hrc" +#include "strings.hrc" #include #include #include @@ -276,7 +277,6 @@ bool SvxPathTabPage::FillItemSet( SfxItemSet* ) return true; } - void SvxPathTabPage::Reset( const SfxItemSet* ) { pPathBox->Clear(); @@ -292,51 +292,74 @@ void SvxPathTabPage::Reset( const SfxItemSet* ) && !SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) ) continue; + const char* pId = nullptr; + switch (i) { case SvtPathOptions::PATH_AUTOCORRECT: + pId = RID_SVXSTR_KEY_AUTOCORRECT_DIR; + break; case SvtPathOptions::PATH_AUTOTEXT: + pId = RID_SVXSTR_KEY_GLOSSARY_PATH; + break; case SvtPathOptions::PATH_BACKUP: + pId = RID_SVXSTR_KEY_BACKUP_PATH; + break; case SvtPathOptions::PATH_GALLERY: + pId = RID_SVXSTR_KEY_GALLERY_DIR; + break; case SvtPathOptions::PATH_GRAPHIC: + pId = RID_SVXSTR_KEY_GRAPHICS_PATH; + break; case SvtPathOptions::PATH_TEMP: + pId = RID_SVXSTR_KEY_TEMP_PATH; + break; case SvtPathOptions::PATH_TEMPLATE: + pId = RID_SVXSTR_KEY_TEMPLATE_PATH; + break; case SvtPathOptions::PATH_DICTIONARY: + pId = RID_SVXSTR_KEY_DICTIONARY_PATH; + break; case SvtPathOptions::PATH_CLASSIFICATION: + pId = RID_SVXSTR_KEY_CLASSIFICATION_PATH; + break; #if OSL_DEBUG_LEVEL > 1 case SvtPathOptions::PATH_LINGUISTIC: + pId = RID_SVXSTR_KEY_LINGUISTIC_DIR; + break; #endif case SvtPathOptions::PATH_WORK: - { - sal_uInt32 nId = RID_SVXSTR_PATH_NAME_START + i; - if (i == SvtPathOptions::PATH_CLASSIFICATION) - // RID_SVXSTR_KEY_USERDICTIONARY_DIR already took our slot, so name the key explicitly. - nId = RID_SVXSTR_KEY_CLASSIFICATION_PATH; - OUString aStr(CuiResId(nId)); - - nWidth1 = std::max(nWidth1, pPathBox->GetTextWidth(aStr)); - aStr += "\t"; - OUString sInternal, sUser, sWritable; - bool bReadOnly = false; - GetPathList( i, sInternal, sUser, sWritable, bReadOnly ); - OUString sTmpPath = sUser; - if ( !sTmpPath.isEmpty() && !sWritable.isEmpty() ) - sTmpPath += OUStringLiteral1(MULTIPATH_DELIMITER); - sTmpPath += sWritable; - const OUString aValue = Convert_Impl( sTmpPath ); - nWidth2 = std::max(nWidth2, pPathBox->GetTextWidth(aValue)); - aStr += aValue; - SvTreeListEntry* pEntry = pPathBox->InsertEntry( aStr ); - if ( bReadOnly ) - { - pPathBox->SetCollapsedEntryBmp( pEntry, pImpl->m_aLockImage ); - } - PathUserData_Impl* pPathImpl = new PathUserData_Impl(i); - pPathImpl->sUserPath = sUser; - pPathImpl->sWritablePath = sWritable; - pEntry->SetUserData( pPathImpl ); - } + pId = RID_SVXSTR_KEY_WORK_PATH; + break; } + + if (pId) + { + OUString aStr(CuiResId(pId)); + + nWidth1 = std::max(nWidth1, pPathBox->GetTextWidth(aStr)); + aStr += "\t"; + OUString sInternal, sUser, sWritable; + bool bReadOnly = false; + GetPathList( i, sInternal, sUser, sWritable, bReadOnly ); + OUString sTmpPath = sUser; + if ( !sTmpPath.isEmpty() && !sWritable.isEmpty() ) + sTmpPath += OUStringLiteral1(MULTIPATH_DELIMITER); + sTmpPath += sWritable; + const OUString aValue = Convert_Impl( sTmpPath ); + nWidth2 = std::max(nWidth2, pPathBox->GetTextWidth(aValue)); + aStr += aValue; + SvTreeListEntry* pEntry = pPathBox->InsertEntry( aStr ); + if ( bReadOnly ) + { + pPathBox->SetCollapsedEntryBmp( pEntry, pImpl->m_aLockImage ); + } + PathUserData_Impl* pPathImpl = new PathUserData_Impl(i); + pPathImpl->sUserPath = sUser; + pPathImpl->sWritablePath = sWritable; + pEntry->SetUserData( pPathImpl ); + } + } long aTabs[] = {3, 0, 0, 0}; diff --git a/cui/source/options/optpath.src b/cui/source/options/optpath.src deleted file mode 100644 index 8eae97173416..000000000000 --- a/cui/source/options/optpath.src +++ /dev/null @@ -1,120 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#include -#include -#include "helpid.hrc" - -String RID_SVXSTR_KEY_CONFIG_DIR -{ - Text [ en-US ] = "Configuration" ; -}; -String RID_SVXSTR_KEY_WORK_PATH -{ - Text [ en-US ] = "My Documents" ; -}; -String RID_SVXSTR_KEY_GRAPHICS_PATH -{ - Text [ en-US ] = "Images" ; -}; -String RID_SVXSTR_KEY_BITMAP_PATH -{ - Text [ en-US ] = "Icons" ; -}; -String RID_SVXSTR_KEY_BASIC_PATH -{ - Text = "BASIC" ; -}; -String RID_SVXSTR_KEY_PALETTE_PATH -{ - Text [ en-US ] = "Palettes" ; -}; -String RID_SVXSTR_KEY_BACKUP_PATH -{ - Text [ en-US ] = "Backups" ; -}; -String RID_SVXSTR_KEY_MODULES_PATH -{ - Text [ en-US ] = "Modules" ; -}; -String RID_SVXSTR_KEY_TEMPLATE_PATH -{ - Text [ en-US ] = "Templates" ; -}; -String RID_SVXSTR_KEY_GLOSSARY_PATH -{ - Text [ en-US ] = "AutoText"; -}; -String RID_SVXSTR_KEY_DICTIONARY_PATH -{ - Text [ en-US ] = "Dictionaries" ; -}; -String RID_SVXSTR_KEY_HELP_DIR -{ - Text [ en-US ] = "Help" ; -}; -String RID_SVXSTR_KEY_GALLERY_DIR -{ - Text [ en-US ] = "Gallery" ; -}; -String RID_SVXSTR_KEY_STORAGE_DIR -{ - Text [ en-US ] = "Message Storage" ; -}; -String RID_SVXSTR_KEY_TEMP_PATH -{ - Text [ en-US ] = "Temporary files"; -}; -String RID_SVXSTR_KEY_PLUGINS_PATH -{ - Text [ en-US ] = "Plug-ins"; -}; -String RID_SVXSTR_KEY_FAVORITES_DIR -{ - Text [ en-US ] = "Folder Bookmarks"; -}; -String RID_SVXSTR_KEY_FILTER_PATH -{ - Text [ en-US ] = "Filters"; -}; -String RID_SVXSTR_KEY_ADDINS_PATH -{ - Text [ en-US ] = "Add-ins"; -}; -String RID_SVXSTR_KEY_USERCONFIG_PATH -{ - Text [ en-US ] = "User Configuration"; -}; -String RID_SVXSTR_KEY_USERDICTIONARY_DIR -{ - Text [ en-US ] = "User-defined dictionaries"; -}; -String RID_SVXSTR_KEY_CLASSIFICATION_PATH -{ - Text [ en-US ] = "Classification" ; -}; -String RID_SVXSTR_KEY_AUTOCORRECT_DIR -{ - Text [ en-US ] = "AutoCorrect"; -}; -String RID_SVXSTR_KEY_LINGUISTIC_DIR -{ - Text [ en-US ] = "Writing aids"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index 66f663d68fb4..9594e6c644c0 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -29,6 +29,8 @@ #include #include #include "cuires.hrc" +#include "strings.hrc" +#include "personalization.hrc" #include #include @@ -36,7 +38,6 @@ #include #include "ucbhelper/content.hxx" #include -#include #define MAX_RESULTS 9 @@ -58,11 +59,10 @@ SelectPersonaDialog::SelectPersonaDialog( vcl::Window *pParent ) get( m_vSearchSuggestions[4], "suggestion5" ); get( m_vSearchSuggestions[5], "suggestion6" ); - ResStringArray aCategoriesArr(ResId(RID_SVXSTR_PERSONA_CATEGORIES, CUI_MGR())); - assert(aCategoriesArr.Count() >= CATEGORYCOUNT); + assert(SAL_N_ELEMENTS(RID_SVXSTR_PERSONA_CATEGORIES) >= CATEGORYCOUNT); for(sal_uInt32 i = 0; i < CATEGORYCOUNT; ++i) { - m_vSearchSuggestions[i]->SetText( aCategoriesArr.GetString(i) ); + m_vSearchSuggestions[i]->SetText(CuiResId(RID_SVXSTR_PERSONA_CATEGORIES[i])); m_vSearchSuggestions[i]->SetClickHdl( LINK( this, SelectPersonaDialog, SearchPersonas ) ); } @@ -127,7 +127,7 @@ IMPL_LINK( SelectPersonaDialog, SearchPersonas, Button*, pButton, void ) /* * English category names should be used for search. * These strings should be in sync with the strings of - * RID_SVXSTR_PERSONA_CATEGORIES in personalization.src + * RID_SVXSTR_PERSONA_CATEGORIES in personalization.hrc */ static const OUStringLiteral vSuggestionCategories[] = {"LibreOffice", "Abstract", "Color", "Music", "Nature", "Solid"}; diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 97681f0259da..685d2a49e2a0 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -20,11 +20,13 @@ #include #include -#include "cuires.hrc" -#include "helpid.hrc" - #include +#include "cuires.hrc" +#include "strings.hrc" +#include "treeopt.hrc" +#include "helpid.hrc" + #include "cfgchart.hxx" #include "connpoolconfig.hxx" #include "connpooloptions.hxx" @@ -145,8 +147,6 @@ struct ModuleToGroupNameMap_Impl sal_uInt16 m_nNodeId; }; -static OfaPageResource* pPageRes = nullptr; - static ModuleToGroupNameMap_Impl ModuleMap[] = { { "ProductName", OUString(), SID_GENERAL_OPTIONS }, @@ -199,23 +199,20 @@ static OUString getGroupName( const OUString& rModule, bool bForced ) if ( sGroupName.isEmpty() && bForced ) { - if ( !pPageRes ) - pPageRes = new OfaPageResource; - if ( rModule == "Writer" ) - sGroupName = pPageRes->GetTextArray().GetString(0); + sGroupName = CuiResId(SID_SW_EDITOPTIONS_RES[0].first); else if ( rModule == "WriterWeb" ) - sGroupName = pPageRes->GetHTMLArray().GetString(0); + sGroupName = CuiResId(SID_SW_ONLINEOPTIONS_RES[0].first); else if ( rModule == "Calc" ) - sGroupName = pPageRes->GetCalcArray().GetString(0); + sGroupName = CuiResId(SID_SC_EDITOPTIONS_RES[0].first); else if ( rModule == "Impress" ) - sGroupName = pPageRes->GetImpressArray().GetString(0); + sGroupName = CuiResId(SID_SD_EDITOPTIONS_RES[0].first); else if ( rModule == "Draw" ) - sGroupName = pPageRes->GetDrawArray().GetString(0); + sGroupName = CuiResId(SID_SD_GRAPHIC_OPTIONS_RES[0].first); else if ( rModule == "Math" ) - sGroupName = pPageRes->GetStarMathArray().GetString(0); + sGroupName = CuiResId(SID_SM_EDITOPTIONS_RES[0].first); else if ( rModule == "Base" ) - sGroupName = pPageRes->GetDatasourcesArray().GetString(0); + sGroupName = CuiResId(SID_SB_STARBASEOPTIONS_RES[0].first); } return sGroupName; } @@ -337,7 +334,7 @@ struct OptionsMapping_Impl static OptionsMapping_Impl const OptionsMap_Impl[] = { // GROUP PAGE PAGE-ID - { "ProductName", nullptr, SID_GENERAL_OPTIONS }, + { "ProductName", nullptr, SID_GENERAL_OPTIONS }, { "ProductName", "UserData", RID_SFXPAGE_GENERAL }, { "ProductName", "General", OFA_TP_MISC }, { "ProductName", "Memory", OFA_TP_MEMORY }, @@ -352,21 +349,21 @@ static OptionsMapping_Impl const OptionsMap_Impl[] = { "ProductName", "Java", RID_SVXPAGE_OPTIONS_JAVA }, { "ProductName", "BasicIDEOptions", RID_SVXPAGE_BASICIDE_OPTIONS }, { "ProductName", "OnlineUpdate", RID_SVXPAGE_ONLINEUPDATE }, - { "LanguageSettings", nullptr, SID_LANGUAGE_OPTIONS }, + { "LanguageSettings", nullptr, SID_LANGUAGE_OPTIONS }, { "LanguageSettings", "Languages", OFA_TP_LANGUAGES }, { "LanguageSettings", "WritingAids", RID_SFXPAGE_LINGU }, { "LanguageSettings", "SearchingInJapanese", RID_SVXPAGE_JSEARCH_OPTIONS }, { "LanguageSettings", "AsianLayout", RID_SVXPAGE_ASIAN_LAYOUT }, { "LanguageSettings", "ComplexTextLayout", RID_SVXPAGE_OPTIONS_CTL }, - { "Internet", nullptr, SID_INET_DLG }, + { "Internet", nullptr, SID_INET_DLG }, { "Internet", "Proxy", RID_SVXPAGE_INET_PROXY }, { "Internet", "Email", RID_SVXPAGE_INET_MAIL }, - { "LoadSave", nullptr, SID_FILTER_DLG }, + { "LoadSave", nullptr, SID_FILTER_DLG }, { "LoadSave", "General", RID_SFXPAGE_SAVE }, { "LoadSave", "VBAProperties", SID_OPTFILTER_MSOFFICE }, { "LoadSave", "MicrosoftOffice", RID_OFAPAGE_MSFILTEROPT2 }, { "LoadSave", "HTMLCompatibility", RID_OFAPAGE_HTMLOPT }, - { "Writer", nullptr, SID_SW_EDITOPTIONS }, + { "Writer", nullptr, SID_SW_EDITOPTIONS }, { "Writer", "General", RID_SW_TP_OPTLOAD_PAGE }, { "Writer", "View", RID_SW_TP_CONTENT_OPT }, { "Writer", "FormattingAids", RID_SW_TP_OPTSHDWCRSR }, @@ -381,16 +378,16 @@ static OptionsMapping_Impl const OptionsMap_Impl[] = { "Writer", "Compatibility", RID_SW_TP_OPTCOMPATIBILITY_PAGE }, { "Writer", "AutoCaption", RID_SW_TP_OPTCAPTION_PAGE }, { "Writer", "MailMerge", RID_SW_TP_MAILCONFIG }, - { "WriterWeb", nullptr, SID_SW_ONLINEOPTIONS }, + { "WriterWeb", nullptr, SID_SW_ONLINEOPTIONS }, { "WriterWeb", "View", RID_SW_TP_HTML_CONTENT_OPT }, { "WriterWeb", "FormattingAids", RID_SW_TP_HTML_OPTSHDWCRSR }, { "WriterWeb", "Grid", RID_SW_TP_HTML_OPTGRID_PAGE }, { "WriterWeb", "Print", RID_SW_TP_HTML_OPTPRINT_PAGE }, { "WriterWeb", "Table", RID_SW_TP_HTML_OPTTABLE_PAGE }, { "WriterWeb", "Background", RID_SW_TP_BACKGROUND }, - { "Math", nullptr, SID_SM_EDITOPTIONS }, + { "Math", nullptr, SID_SM_EDITOPTIONS }, { "Math", "Settings", SID_SM_TP_PRINTOPTIONS }, - { "Calc", nullptr, SID_SC_EDITOPTIONS }, + { "Calc", nullptr, SID_SC_EDITOPTIONS }, { "Calc", "General", SID_SC_TP_LAYOUT }, { "Calc", "View", SID_SC_TP_CONTENT }, { "Calc", "Calculate", SID_SC_TP_CALC }, @@ -400,22 +397,22 @@ static OptionsMapping_Impl const OptionsMap_Impl[] = { "Calc", "Compatibility", SID_SC_TP_COMPATIBILITY }, { "Calc", "Grid", SID_SC_TP_GRID }, { "Calc", "Print", RID_SC_TP_PRINT }, - { "Impress", nullptr, SID_SD_EDITOPTIONS }, + { "Impress", nullptr, SID_SD_EDITOPTIONS }, { "Impress", "General", SID_SI_TP_MISC }, { "Impress", "View", SID_SI_TP_CONTENTS }, { "Impress", "Grid", SID_SI_TP_SNAP }, { "Impress", "Print", SID_SI_TP_PRINT }, - { "Draw", nullptr, SID_SD_GRAPHIC_OPTIONS }, + { "Draw", nullptr, SID_SD_GRAPHIC_OPTIONS }, { "Draw", "General", SID_SD_TP_MISC }, { "Draw", "View", SID_SD_TP_CONTENTS }, { "Draw", "Grid", SID_SD_TP_SNAP }, { "Draw", "Print", SID_SD_TP_PRINT }, - { "Charts", nullptr, SID_SCH_EDITOPTIONS }, + { "Charts", nullptr, SID_SCH_EDITOPTIONS }, { "Charts", "DefaultColors", RID_OPTPAGE_CHART_DEFCOLORS }, - { "Base", nullptr, SID_SB_STARBASEOPTIONS }, + { "Base", nullptr, SID_SB_STARBASEOPTIONS }, { "Base", "Connections", SID_SB_CONNECTIONPOOLING }, { "Base", "Databases", SID_SB_DBREGISTEROPTIONS }, - { nullptr, nullptr, 0 } + { nullptr, nullptr, 0 } }; static bool lcl_getStringFromID( sal_uInt16 _nPageId, OUString& _rGroupName, OUString& _rPageName ) @@ -1098,22 +1095,6 @@ void OfaTreeOptionsDialog::SelectHdl_Impl() pBox->SetHelpId(sHelpId); } -OfaPageResource::OfaPageResource() : - aGeneralDlgAry(ResId(SID_GENERAL_OPTIONS, CUI_MGR())), - aInetDlgAry(ResId(SID_INET_DLG, CUI_MGR())), - aLangDlgAry(ResId(SID_LANGUAGE_OPTIONS, CUI_MGR())), - aTextDlgAry(ResId(SID_SW_EDITOPTIONS, CUI_MGR())), - aHTMLDlgAry(ResId(SID_SW_ONLINEOPTIONS, CUI_MGR())), - aCalcDlgAry(ResId(SID_SC_EDITOPTIONS, CUI_MGR())), - aStarMathDlgAry(ResId(SID_SM_EDITOPTIONS, CUI_MGR())), - aImpressDlgAry(ResId(SID_SD_EDITOPTIONS, CUI_MGR())), - aDrawDlgAry(ResId(SID_SD_GRAPHIC_OPTIONS, CUI_MGR())), - aChartDlgAry(ResId(SID_SCH_EDITOPTIONS, CUI_MGR())), - aFilterDlgAry(ResId(SID_FILTER_DLG, CUI_MGR())), - aDatasourcesDlgAry(ResId(SID_SB_STARBASEOPTIONS, CUI_MGR())) -{ -} - std::unique_ptr OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId ) { Reference< XLinguProperties > xProp( LinguMgr::GetLinguPropertySet() ); @@ -1447,7 +1428,6 @@ OUString getCurrentFactory_Impl( const Reference< XFrame >& _xFrame ) void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) { - OfaPageResource aDlgResource; sal_uInt16 nGroup = 0; SvtOptionsDialogOptions aOptionsDlgOpt; @@ -1456,15 +1436,14 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) // %PRODUCTNAME options if ( !lcl_isOptionHidden( SID_GENERAL_OPTIONS, aOptionsDlgOpt ) ) { - ResStringArray& rGeneralArray = aDlgResource.GetGeneralArray(); - setGroupName( "ProductName", rGeneralArray.GetString(0) ); - nGroup = AddGroup( rGeneralArray.GetString(0), nullptr, nullptr, SID_GENERAL_OPTIONS ); - sal_uInt16 nEnd = static_cast< sal_uInt16 >( rGeneralArray.Count() ); + setGroupName("ProductName", CuiResId(SID_GENERAL_OPTIONS_RES[0].first)); + nGroup = AddGroup(CuiResId(SID_GENERAL_OPTIONS_RES[0].first), nullptr, nullptr, SID_GENERAL_OPTIONS ); + const sal_uInt16 nEnd = static_cast(SAL_N_ELEMENTS(SID_GENERAL_OPTIONS_RES)); - for ( sal_uInt16 i = 1; i < nEnd; ++i ) + for (sal_uInt16 i = 1; i < nEnd; ++i) { - OUString sNewTitle = rGeneralArray.GetString(i); - nPageId = (sal_uInt16)rGeneralArray.GetValue(i); + OUString sNewTitle = CuiResId(SID_GENERAL_OPTIONS_RES[i].first); + nPageId = SID_GENERAL_OPTIONS_RES[i].second; if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) continue; @@ -1498,14 +1477,13 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) // Load and Save options if ( !lcl_isOptionHidden( SID_FILTER_DLG, aOptionsDlgOpt ) ) { - ResStringArray& rFilterArray = aDlgResource.GetFilterArray(); - setGroupName( "LoadSave", rFilterArray.GetString(0) ); - nGroup = AddGroup( rFilterArray.GetString(0), nullptr, nullptr, SID_FILTER_DLG ); - for ( sal_uInt32 i = 1; i < rFilterArray.Count(); ++i ) + setGroupName( "LoadSave", CuiResId(SID_FILTER_DLG_RES[0].first) ); + nGroup = AddGroup( CuiResId(SID_FILTER_DLG_RES[0].first), nullptr, nullptr, SID_FILTER_DLG ); + for ( sal_uInt32 i = 1; i < SAL_N_ELEMENTS(SID_FILTER_DLG_RES); ++i ) { - nPageId = (sal_uInt16)rFilterArray.GetValue(i); + nPageId = (sal_uInt16)SID_FILTER_DLG_RES[i].second; if ( !lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) - AddTabPage( nPageId, rFilterArray.GetString(i), nGroup ); + AddTabPage( nPageId, CuiResId(SID_FILTER_DLG_RES[i].first), nGroup ); } } @@ -1513,22 +1491,20 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) SvtLanguageOptions aLanguageOptions; if ( !lcl_isOptionHidden( SID_LANGUAGE_OPTIONS, aOptionsDlgOpt ) ) { - ResStringArray& rLangArray = aDlgResource.GetLangArray(); - setGroupName( "LanguageSettings", rLangArray.GetString(0) ); - nGroup = AddGroup( rLangArray.GetString(0), nullptr, nullptr, SID_LANGUAGE_OPTIONS ); - for ( sal_uInt32 i = 1; i < rLangArray.Count(); ++i ) + setGroupName("LanguageSettings", CuiResId(SID_LANGUAGE_OPTIONS_RES[0].first)); + nGroup = AddGroup(CuiResId(SID_LANGUAGE_OPTIONS_RES[0].first), nullptr, nullptr, SID_LANGUAGE_OPTIONS ); + for (sal_uInt32 i = 1; i < SAL_N_ELEMENTS(SID_LANGUAGE_OPTIONS_RES); ++i) { - nPageId = (sal_uInt16)rLangArray.GetValue(i); + nPageId = (sal_uInt16)SID_LANGUAGE_OPTIONS_RES[i].second; if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) continue; if ( ( RID_SVXPAGE_JSEARCH_OPTIONS != nPageId || aLanguageOptions.IsJapaneseFindEnabled() ) && ( RID_SVXPAGE_ASIAN_LAYOUT != nPageId || aLanguageOptions.IsAsianTypographyEnabled() ) && ( RID_SVXPAGE_OPTIONS_CTL != nPageId || aLanguageOptions.IsCTLFontEnabled() ) ) - AddTabPage( nPageId, rLangArray.GetString(i), nGroup ); + AddTabPage(nPageId, CuiResId(SID_LANGUAGE_OPTIONS_RES[i].first), nGroup); } } - OUString aFactory = getCurrentFactory_Impl( _xFrame ); DBG_ASSERT( GetModuleIdentifier( _xFrame ) == aFactory, "S H I T!!!" ); @@ -1537,7 +1513,6 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) ) { // text document - ResStringArray& rTextArray = aDlgResource.GetTextArray(); if ( aFactory == "com.sun.star.text.TextDocument" || aFactory == "com.sun.star.text.WebDocument" || aFactory == "com.sun.star.text.GlobalDocument" ) @@ -1546,19 +1521,19 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) if ( !lcl_isOptionHidden( SID_SW_EDITOPTIONS, aOptionsDlgOpt ) ) { if ( aFactory == "com.sun.star.text.WebDocument" ) - setGroupName( "WriterWeb", rTextArray.GetString(0) ); + setGroupName( "WriterWeb", CuiResId(SID_SW_EDITOPTIONS_RES[0].first) ); else - setGroupName( "Writer", rTextArray.GetString(0) ); - nGroup = AddGroup(rTextArray.GetString(0), pSwMod, pSwMod, SID_SW_EDITOPTIONS ); - for ( sal_uInt32 i = 1; i < rTextArray.Count(); ++i ) + setGroupName( "Writer", CuiResId(SID_SW_EDITOPTIONS_RES[0].first) ); + nGroup = AddGroup(CuiResId(SID_SW_EDITOPTIONS_RES[0].first), pSwMod, pSwMod, SID_SW_EDITOPTIONS ); + for ( sal_uInt32 i = 1; i < SAL_N_ELEMENTS(SID_SW_EDITOPTIONS_RES); ++i ) { - nPageId = (sal_uInt16)rTextArray.GetValue(i); + nPageId = (sal_uInt16)SID_SW_EDITOPTIONS_RES[i].second; if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) continue; if ( ( RID_SW_TP_STD_FONT_CJK != nPageId || aLanguageOptions.IsCJKFontEnabled() ) && ( RID_SW_TP_STD_FONT_CTL != nPageId || aLanguageOptions.IsCTLFontEnabled() ) && ( RID_SW_TP_MAILCONFIG != nPageId || MailMergeCfg_Impl().IsEmailSupported() ) ) - AddTabPage( nPageId, rTextArray.GetString(i), nGroup ); + AddTabPage( nPageId, CuiResId(SID_SW_EDITOPTIONS_RES[i].first), nGroup ); } #ifdef DBG_UTIL AddTabPage( RID_SW_TP_OPTTEST_PAGE, "Internal Test", nGroup ); @@ -1568,13 +1543,12 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) // HTML documents if ( !lcl_isOptionHidden( SID_SW_ONLINEOPTIONS, aOptionsDlgOpt ) ) { - ResStringArray& rHTMLArray = aDlgResource.GetHTMLArray(); - nGroup = AddGroup(rHTMLArray.GetString(0), pSwMod, pSwMod, SID_SW_ONLINEOPTIONS ); - for( sal_uInt32 i = 1; i < rHTMLArray.Count(); ++i ) + nGroup = AddGroup(CuiResId(SID_SW_ONLINEOPTIONS_RES[0].first), pSwMod, pSwMod, SID_SW_ONLINEOPTIONS ); + for( sal_uInt32 i = 1; i < SAL_N_ELEMENTS(SID_SW_ONLINEOPTIONS_RES); ++i ) { - nPageId = (sal_uInt16)rHTMLArray.GetValue(i); + nPageId = (sal_uInt16)SID_SW_ONLINEOPTIONS_RES[i].second; if ( !lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) - AddTabPage( nPageId, rHTMLArray.GetString(i), nGroup ); + AddTabPage(nPageId, CuiResId(SID_SW_ONLINEOPTIONS_RES[i].first), nGroup); } #ifdef DBG_UTIL AddTabPage( RID_SW_TP_OPTTEST_PAGE, "Internal Test", nGroup ); @@ -1590,18 +1564,17 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) { if ( !lcl_isOptionHidden( SID_SC_EDITOPTIONS, aOptionsDlgOpt ) ) { - ResStringArray& rCalcArray = aDlgResource.GetCalcArray(); SfxModule* pScMod = SfxApplication::GetModule( SfxToolsModule::Calc ); - setGroupName( "Calc", rCalcArray.GetString(0) ); - nGroup = AddGroup( rCalcArray.GetString( 0 ), pScMod, pScMod, SID_SC_EDITOPTIONS ); - const sal_uInt16 nCount = static_cast< sal_uInt16 >( rCalcArray.Count() ); + setGroupName( "Calc", CuiResId(SID_SC_EDITOPTIONS_RES[0].first) ); + nGroup = AddGroup( CuiResId(SID_SC_EDITOPTIONS_RES[0].first), pScMod, pScMod, SID_SC_EDITOPTIONS ); + const sal_uInt16 nCount = static_cast(SAL_N_ELEMENTS(SID_SC_EDITOPTIONS_RES)); for ( sal_uInt16 i = 1; i < nCount; ++i ) { - nPageId = (sal_uInt16)rCalcArray.GetValue(i); + nPageId = (sal_uInt16)SID_SC_EDITOPTIONS_RES[i].second; if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) continue; - AddTabPage( nPageId, rCalcArray.GetString( i ), nGroup ); + AddTabPage( nPageId, CuiResId(SID_SC_EDITOPTIONS_RES[i].first), nGroup ); } } } @@ -1615,17 +1588,16 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) { if ( !lcl_isOptionHidden( SID_SD_EDITOPTIONS, aOptionsDlgOpt ) ) { - ResStringArray& rImpressArray = aDlgResource.GetImpressArray(); - setGroupName( "Impress", rImpressArray.GetString(0) ); - nGroup = AddGroup( rImpressArray.GetString( 0 ), pSdMod, pSdMod, SID_SD_EDITOPTIONS ); - const sal_uInt16 nCount = static_cast< sal_uInt16 >( rImpressArray.Count() ); + setGroupName( "Impress", CuiResId(SID_SD_EDITOPTIONS_RES[0].first) ); + nGroup = AddGroup( CuiResId(SID_SD_EDITOPTIONS_RES[0].first), pSdMod, pSdMod, SID_SD_EDITOPTIONS ); + const sal_uInt16 nCount = static_cast(SAL_N_ELEMENTS(SID_SD_EDITOPTIONS_RES)); for ( sal_uInt16 i = 1; i < nCount; ++i ) { - nPageId = (sal_uInt16)rImpressArray.GetValue(i); + nPageId = (sal_uInt16)SID_SD_EDITOPTIONS_RES[0].second; if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) continue; - AddTabPage( nPageId, rImpressArray.GetString(i), nGroup ); + AddTabPage( nPageId, CuiResId(SID_SD_EDITOPTIONS_RES[i].first), nGroup ); } } } @@ -1638,17 +1610,16 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) { if ( !lcl_isOptionHidden( SID_SD_GRAPHIC_OPTIONS, aOptionsDlgOpt ) ) { - ResStringArray& rDrawArray = aDlgResource.GetDrawArray(); - setGroupName( "Draw", rDrawArray.GetString(0) ); - nGroup = AddGroup( rDrawArray.GetString( 0 ), pSdMod, pSdMod, SID_SD_GRAPHIC_OPTIONS ); - const sal_uInt16 nCount = static_cast< sal_uInt16 >( rDrawArray.Count() ); + setGroupName( "Draw", CuiResId(SID_SD_GRAPHIC_OPTIONS_RES[0].first) ); + nGroup = AddGroup( CuiResId(SID_SD_GRAPHIC_OPTIONS_RES[0].first), pSdMod, pSdMod, SID_SD_GRAPHIC_OPTIONS ); + const sal_uInt16 nCount = static_cast(SAL_N_ELEMENTS(SID_SD_GRAPHIC_OPTIONS_RES)); for ( sal_uInt16 i = 1; i < nCount; ++i ) { - nPageId = (sal_uInt16)rDrawArray.GetValue(i); + nPageId = (sal_uInt16)SID_SD_GRAPHIC_OPTIONS_RES[0].second; if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) continue; - AddTabPage( nPageId, rDrawArray.GetString(i), nGroup ); + AddTabPage( nPageId, CuiResId(SID_SD_GRAPHIC_OPTIONS_RES[i].first), nGroup ); } } } @@ -1661,15 +1632,14 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) { if ( !lcl_isOptionHidden( SID_SM_EDITOPTIONS, aOptionsDlgOpt ) ) { - ResStringArray& rStarMathArray = aDlgResource.GetStarMathArray(); SfxModule* pSmMod = SfxApplication::GetModule(SfxToolsModule::Math); - setGroupName( "Math", rStarMathArray.GetString(0) ); - nGroup = AddGroup(rStarMathArray.GetString(0), pSmMod, pSmMod, SID_SM_EDITOPTIONS ); - for ( sal_uInt32 i = 1; i < rStarMathArray.Count(); ++i ) + setGroupName( "Math", CuiResId(SID_SM_EDITOPTIONS_RES[0].first) ); + nGroup = AddGroup(CuiResId(SID_SM_EDITOPTIONS_RES[0].first), pSmMod, pSmMod, SID_SM_EDITOPTIONS ); + for ( sal_uInt32 i = 1; i < SAL_N_ELEMENTS(SID_SM_EDITOPTIONS_RES); ++i ) { - nPageId = (sal_uInt16)rStarMathArray.GetValue(i); + nPageId = (sal_uInt16)SID_SM_EDITOPTIONS_RES[0].second; if ( !lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) - AddTabPage( nPageId, rStarMathArray.GetString(i), nGroup ); + AddTabPage( nPageId, CuiResId(SID_SM_EDITOPTIONS_RES[i].first), nGroup ); } } } @@ -1682,41 +1652,38 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) || aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::CALC ) ) ) { - ResStringArray& rDSArray = aDlgResource.GetDatasourcesArray(); - setGroupName( "Base", rDSArray.GetString(0) ); - nGroup = AddGroup( rDSArray.GetString(0), nullptr, nullptr, SID_SB_STARBASEOPTIONS ); - for ( sal_uInt32 i = 1; i < rDSArray.Count(); ++i ) + setGroupName( "Base", CuiResId(SID_SB_STARBASEOPTIONS_RES[0].first) ); + nGroup = AddGroup( CuiResId(SID_SB_STARBASEOPTIONS_RES[0].first), nullptr, nullptr, SID_SB_STARBASEOPTIONS ); + for ( sal_uInt32 i = 1; i < SAL_N_ELEMENTS(SID_SB_STARBASEOPTIONS_RES); ++i ) { - nPageId = (sal_uInt16)rDSArray.GetValue(i); + nPageId = (sal_uInt16)SID_SB_STARBASEOPTIONS_RES[i].second; if ( !lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) - AddTabPage( nPageId, rDSArray.GetString(i), nGroup ); + AddTabPage( nPageId, CuiResId(SID_SB_STARBASEOPTIONS_RES[i].first), nGroup ); } } // Chart options (always installed and active) if ( !lcl_isOptionHidden( SID_SCH_EDITOPTIONS, aOptionsDlgOpt ) ) { - ResStringArray& rChartArray = aDlgResource.GetChartArray(); - setGroupName( "Charts", rChartArray.GetString(0) ); - nGroup = AddGroup( rChartArray.GetString(0), nullptr, nullptr, SID_SCH_EDITOPTIONS ); - for ( sal_uInt32 i = 1; i < rChartArray.Count(); ++i ) + setGroupName( "Charts", CuiResId(SID_SCH_EDITOPTIONS_RES[0].first) ); + nGroup = AddGroup( CuiResId(SID_SCH_EDITOPTIONS_RES[0].first), nullptr, nullptr, SID_SCH_EDITOPTIONS ); + for ( sal_uInt32 i = 1; i < SAL_N_ELEMENTS(SID_SCH_EDITOPTIONS_RES); ++i ) { - nPageId = (sal_uInt16)rChartArray.GetValue(i); + nPageId = (sal_uInt16)SID_SCH_EDITOPTIONS_RES[i].second; if ( !lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) - AddTabPage( nPageId, rChartArray.GetString(i), nGroup ); + AddTabPage( nPageId, CuiResId(SID_SCH_EDITOPTIONS_RES[i].first), nGroup ); } } // Internet options if ( !lcl_isOptionHidden( SID_INET_DLG, aOptionsDlgOpt ) ) { - ResStringArray& rInetArray = aDlgResource.GetInetArray(); - setGroupName( "Internet", rInetArray.GetString(0) ); - nGroup = AddGroup(rInetArray.GetString(0), nullptr, nullptr, SID_INET_DLG ); + setGroupName("Internet", CuiResId(SID_INET_DLG_RES[0].first)); + nGroup = AddGroup(CuiResId(SID_INET_DLG_RES[0].first), nullptr, nullptr, SID_INET_DLG ); - for ( sal_uInt32 i = 1; i < rInetArray.Count(); ++i ) + for ( sal_uInt32 i = 1; i < SAL_N_ELEMENTS(SID_INET_DLG_RES); ++i ) { - nPageId = (sal_uInt16)rInetArray.GetValue(i); + nPageId = (sal_uInt16)SID_INET_DLG_RES[i].second; if ( lcl_isOptionHidden( nPageId, aOptionsDlgOpt ) ) continue; #if defined(_WIN32) @@ -1724,13 +1691,9 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) if ( nPageId == RID_SVXPAGE_INET_MAIL ) continue; #endif - AddTabPage( nPageId, rInetArray.GetString(i), nGroup ); + AddTabPage( nPageId, CuiResId(SID_INET_DLG_RES[i].first), nGroup ); } } - -/*!!! - ActivateLastSelection(); - */ } bool isNodeActive( OptionsNode* pNode, Module* pModule ) diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src deleted file mode 100644 index 4301f793f543..000000000000 --- a/cui/source/options/treeopt.src +++ /dev/null @@ -1,177 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include -#include "helpid.hrc" -#include - -StringArray SID_GENERAL_OPTIONS -{ - ItemList [ en-US ] = - { - < "%PRODUCTNAME" ; 0; > ; - < "User Data" ; RID_SFXPAGE_GENERAL; > ; - < "General" ; OFA_TP_MISC; > ; - < "Memory" ; OFA_TP_MEMORY; > ; - < "View" ; OFA_TP_VIEW ; > ; - < "Print" ; RID_SFXPAGE_PRINTOPTIONS; > ; - < "Paths" ; RID_SFXPAGE_PATH; > ; - < "Fonts" ; RID_SVX_FONT_SUBSTITUTION ; > ; - < "Security" ; RID_SVXPAGE_INET_SECURITY ; > ; - < "Personalization" ; RID_SVXPAGE_PERSONALIZATION ; > ; - < "Application Colors" ; RID_SVXPAGE_COLORCONFIG ; > ; - < "Accessibility" ; RID_SVXPAGE_ACCESSIBILITYCONFIG ; > ; - < "Advanced" ; RID_SVXPAGE_OPTIONS_JAVA ; > ; - < "Basic IDE Options" ; RID_SVXPAGE_BASICIDE_OPTIONS ; > ; - < "Online Update" ; RID_SVXPAGE_ONLINEUPDATE ; > ; - < "OpenCL" ; RID_SVXPAGE_OPENCL ; > ; - }; -}; -StringArray SID_LANGUAGE_OPTIONS -{ - ItemList [ en-US ] = - { - < "Language Settings" ; 0; > ; - < "Languages"; OFA_TP_LANGUAGES; > ; - < "Writing Aids" ; RID_SFXPAGE_LINGU; > ; - < "Searching in Japanese" ; RID_SVXPAGE_JSEARCH_OPTIONS; > ; - < "Asian Layout" ; RID_SVXPAGE_ASIAN_LAYOUT; > ; - < "Complex Text Layout" ; RID_SVXPAGE_OPTIONS_CTL; >; - }; -}; -StringArray SID_INET_DLG -{ - ItemList [ en-US ] = - { - < "Internet" ; 0; > ; - < "Proxy" ; RID_SVXPAGE_INET_PROXY; > ; - < "E-mail" ; RID_SVXPAGE_INET_MAIL; > ; - }; -}; -StringArray SID_SW_EDITOPTIONS -{ - ItemList [ en-US ] = - { - < "%PRODUCTNAME Writer" ; 0; > ; - < "General" ; RID_SW_TP_OPTLOAD_PAGE ; > ; - < "View" ; RID_SW_TP_CONTENT_OPT ;> ; - < "Formatting Aids" ; RID_SW_TP_OPTSHDWCRSR ; > ; - < "Grid" ; RID_SVXPAGE_GRID ; > ; - < "Basic Fonts (Western)" ;RID_SW_TP_STD_FONT ; > ; - < "Basic Fonts (Asian)" ;RID_SW_TP_STD_FONT_CJK ; > ; - < "Basic Fonts (CTL)" ; RID_SW_TP_STD_FONT_CTL ; > ; - < "Print" ; RID_SW_TP_OPTPRINT_PAGE ; > ; - < "Table" ; RID_SW_TP_OPTTABLE_PAGE ; > ; - < "Changes" ; RID_SW_TP_REDLINE_OPT ; > ; - < "Comparison" ; RID_SW_TP_COMPARISON_OPT ; > ; - < "Compatibility" ; RID_SW_TP_OPTCOMPATIBILITY_PAGE ; > ; - < "AutoCaption" ; RID_SW_TP_OPTCAPTION_PAGE ; > ; - < "Mail Merge E-mail" ; RID_SW_TP_MAILCONFIG ; >; - }; -}; -StringArray SID_SW_ONLINEOPTIONS -{ - ItemList [ en-US ] = - { - < "%PRODUCTNAME Writer/Web" ; 0; > ; - < "View" ; RID_SW_TP_HTML_CONTENT_OPT ;> ; - < "Formatting Aids" ; RID_SW_TP_HTML_OPTSHDWCRSR ; > ; - < "Grid" ; RID_SW_TP_HTML_OPTGRID_PAGE ; > ; - < "Print" ; RID_SW_TP_HTML_OPTPRINT_PAGE ; > ; - < "Table" ; RID_SW_TP_HTML_OPTTABLE_PAGE ; > ; - < "Background" ; RID_SW_TP_BACKGROUND ; > ; - }; -}; -StringArray SID_SM_EDITOPTIONS -{ - ItemList [ en-US ] = - { - < "%PRODUCTNAME Math" ; 0; > ; - < "Settings" ; SID_SM_TP_PRINTOPTIONS;> ; - }; -}; -StringArray SID_SC_EDITOPTIONS -{ - ItemList [ en-US ] = - { - < "%PRODUCTNAME Calc" ; 0; > ; - < "General" ; SID_SC_TP_LAYOUT ;> ; - < "Defaults" ; RID_SC_TP_DEFAULTS ;> ; - < "View" ; SID_SC_TP_CONTENT ;> ; - < "Calculate" ; SID_SC_TP_CALC ;> ; - < "Formula" ; SID_SC_TP_FORMULA ;> ; - < "Sort Lists" ; SID_SC_TP_USERLISTS ;> ; - < "Changes" ; SID_SC_TP_CHANGES ;> ; - < "Compatibility" ; SID_SC_TP_COMPATIBILITY ;> ; - < "Grid" ; SID_SC_TP_GRID ;> ; - < "Print" ; RID_SC_TP_PRINT ;> ; - }; -}; -StringArray SID_SD_EDITOPTIONS -{ - ItemList [ en-US ] = - { - < "%PRODUCTNAME Impress" ; 0; > ; - < "General"; SID_SI_TP_MISC ; > ; - < "View" ; SID_SI_TP_CONTENTS ; > ; - < "Grid" ; SID_SI_TP_SNAP ; > ; - < "Print" ; SID_SI_TP_PRINT ; > ; - }; -}; -StringArray SID_SD_GRAPHIC_OPTIONS -{ - ItemList [ en-US ] = - { - < "%PRODUCTNAME Draw" ; 0; > ; - < "General" ; SID_SD_TP_MISC ; > ; - < "View" ; SID_SD_TP_CONTENTS ; > ; - < "Grid" ; SID_SD_TP_SNAP ; > ; - < "Print" ; SID_SD_TP_PRINT ; > ; - }; -}; -StringArray SID_SCH_EDITOPTIONS -{ - ItemList [ en-US ] = - { - < "Charts" ; 0; > ; - < "Default Colors" ; RID_OPTPAGE_CHART_DEFCOLORS ; > ; - }; -}; -StringArray SID_FILTER_DLG -{ - ItemList [ en-US ] = - { - < "Load/Save" ; 0; > ; - < "General" ; RID_SFXPAGE_SAVE; > ; - < "VBA Properties" ; SID_OPTFILTER_MSOFFICE; > ; - < "Microsoft Office" ; RID_OFAPAGE_MSFILTEROPT2; > ; - < "HTML Compatibility" ; RID_OFAPAGE_HTMLOPT ; > ; - }; -}; -StringArray SID_SB_STARBASEOPTIONS -{ - ItemList [ en-US ] = - { - < "%PRODUCTNAME Base" ; 0; > ; - < "Connections" ; SID_SB_CONNECTIONPOOLING; > ; - < "Databases" ; SID_SB_DBREGISTEROPTIONS; > ; - }; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index 2586a454f71e..dfa4a531870d 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -22,6 +22,7 @@ #include #include #include +#include #include #include diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 3b6a24608690..def8d3de5013 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -53,6 +53,7 @@ #include #include "cuicharmap.hxx" #include "cuires.hrc" +#include "strings.hrc" #include #include #include diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index ec1775251187..343e4ff2722f 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -29,11 +29,12 @@ #include #include #include +#include #include +#include #include #include -#include #include #include @@ -45,7 +46,7 @@ #include #include #include -#include +#include #include #include #include @@ -822,8 +823,8 @@ void SvxBackgroundTabPage::RaiseLoadError_Impl() SfxErrorContext aContext( ERRCTX_SVX_BACKGROUND, OUString(), this, - RID_SVXERRCTX, - &DIALOG_MGR() ); + getRID_SVXERRCTX(), + &SvxResLocale() ); ErrorHandler::HandleError( *new StringErrorInfo( ERRCODE_SVX_GRAPHIC_NOTREADABLE, diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index e6848ad3bd1a..dbcb814ced3e 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -22,8 +22,10 @@ #include #include #include +#include #include +#include #include #include "helpid.hrc" @@ -970,10 +972,10 @@ sal_uInt16 SvxBorderTabPage::GetPresetImageId( sal_uInt16 nValueSetIdx ) const return ppnImgIds[ nLine ][ nValueSetIdx - 1 ]; } -sal_uInt16 SvxBorderTabPage::GetPresetStringId( sal_uInt16 nValueSetIdx ) const +const char* SvxBorderTabPage::GetPresetStringId( sal_uInt16 nValueSetIdx ) const { // string resource IDs for each image (in order of the IID_PRE_* image IDs) - static const sal_uInt16 pnStrIds[] = + static const char* pnStrIds[] = { RID_SVXSTR_TABLE_PRESET_NONE, RID_SVXSTR_PARA_PRESET_ALL, @@ -1029,7 +1031,7 @@ void SvxBorderTabPage::FillShadowVS() m_pWndShadows->SetColCount( SVX_BORDER_SHADOW_COUNT ); // string resource IDs for each image - static const sal_uInt16 pnStrIds[ SVX_BORDER_SHADOW_COUNT ] = + static const char* pnStrIds[ SVX_BORDER_SHADOW_COUNT ] = { RID_SVXSTR_SHADOW_STYLE_NONE, RID_SVXSTR_SHADOW_STYLE_BOTTOMRIGHT, RID_SVXSTR_SHADOW_STYLE_TOPRIGHT, RID_SVXSTR_SHADOW_STYLE_BOTTOMLEFT, RID_SVXSTR_SHADOW_STYLE_TOPLEFT }; // insert images and help texts diff --git a/cui/source/tabpages/border.src b/cui/source/tabpages/border.src deleted file mode 100644 index 2dded5a4ded3..000000000000 --- a/cui/source/tabpages/border.src +++ /dev/null @@ -1,95 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "helpid.hrc" -#include -#include - -String RID_SVXSTR_TABLE_PRESET_NONE -{ - Text [ en-US ] = "Set No Borders" ; -}; -String RID_SVXSTR_TABLE_PRESET_ONLYOUTER -{ - Text [ en-US ] = "Set Outer Border Only" ; -}; -String RID_SVXSTR_TABLE_PRESET_OUTERHORI -{ - Text [ en-US ] = "Set Outer Border and Horizontal Lines" ; -}; -String RID_SVXSTR_TABLE_PRESET_OUTERALL -{ - Text [ en-US ] = "Set Outer Border and All Inner Lines" ; -}; -String RID_SVXSTR_TABLE_PRESET_OUTERINNER -{ - Text [ en-US ] = "Set Outer Border Without Changing Inner Lines" ; -}; -String RID_SVXSTR_PARA_PRESET_DIAGONAL -{ - Text [ en-US ] = "Set Diagonal Lines Only" ; -}; -String RID_SVXSTR_PARA_PRESET_ALL -{ - Text [ en-US ] = "Set All Four Borders" ; -}; -String RID_SVXSTR_PARA_PRESET_LEFTRIGHT -{ - Text [ en-US ] = "Set Left and Right Borders Only" ; -}; -String RID_SVXSTR_PARA_PRESET_TOPBOTTOM -{ - Text [ en-US ] = "Set Top and Bottom Borders Only" ; -}; -String RID_SVXSTR_PARA_PRESET_ONLYLEFT -{ - Text [ en-US ] = "Set Left Border Only" ; -}; -String RID_SVXSTR_HOR_PRESET_ONLYHOR -{ - Text [ en-US ] = "Set Top and Bottom Borders, and All Inner Lines"; -}; -String RID_SVXSTR_VER_PRESET_ONLYVER -{ - Text [ en-US ] = "Set Left and Right Borders, and All Inner Lines"; -}; -String RID_SVXSTR_SHADOW_STYLE_NONE -{ - Text [ en-US ] = "No Shadow" ; -}; -String RID_SVXSTR_SHADOW_STYLE_BOTTOMRIGHT -{ - Text [ en-US ] = "Cast Shadow to Bottom Right" ; -}; -String RID_SVXSTR_SHADOW_STYLE_TOPRIGHT -{ - Text [ en-US ] = "Cast Shadow to Top Right" ; -}; -String RID_SVXSTR_SHADOW_STYLE_BOTTOMLEFT -{ - Text [ en-US ] = "Cast Shadow to Bottom Left" ; -}; -String RID_SVXSTR_SHADOW_STYLE_TOPLEFT -{ - Text [ en-US ] = "Cast Shadow to Top Left" ; -}; - -// ********************************************************************** - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 063a9baac2c5..ef454619a8ad 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -69,6 +69,7 @@ #include #include #include +#include #include #include #include "svx/flagsdef.hxx" diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index f4d566875385..d5df97d4c037 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -18,6 +18,7 @@ */ #include +#include #include #include #include diff --git a/cui/source/tabpages/frmdirlbox.src b/cui/source/tabpages/frmdirlbox.src deleted file mode 100644 index e2470a6a93b0..000000000000 --- a/cui/source/tabpages/frmdirlbox.src +++ /dev/null @@ -1,61 +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 - -// frame direction ------------------------------------------------------------ - -String RID_SVXSTR_FRAMEDIR_LTR -{ - Text [ en-US ] = "Left-to-right (LTR)"; -}; - -String RID_SVXSTR_FRAMEDIR_RTL -{ - Text [ en-US ] = "Right-to-left (RTL)"; -}; - -String RID_SVXSTR_FRAMEDIR_SUPER -{ - Text [ en-US ] = "Use superordinate object settings"; -}; - -// page direction ------------------------------------------------------------- - -String RID_SVXSTR_PAGEDIR_LTR_HORI -{ - Text [ en-US ] = "Left-to-right (horizontal)"; -}; - -String RID_SVXSTR_PAGEDIR_RTL_HORI -{ - Text [ en-US ] = "Right-to-left (horizontal)"; -}; - -String RID_SVXSTR_PAGEDIR_RTL_VERT -{ - Text [ en-US ] = "Right-to-left (vertical)"; -}; - -String RID_SVXSTR_PAGEDIR_LTR_VERT -{ - Text [ en-US ] = "Left-to-right (vertical)"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 1938f2705b91..85e2c98e8595 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -33,6 +33,7 @@ #include #include #include +#include #include #include diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index c502e077f08d..c41bf6b52286 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -18,6 +18,7 @@ */ #include +#include #include #include #include @@ -804,17 +805,16 @@ void SvxMeasurePage::ChangeAttrHdl_Impl( void* p ) void SvxMeasurePage::FillUnitLB() { // fill ListBox with metrics - SvxStringArray aMetricArr(ResId(RID_SVXSTR_FIELDUNIT_TABLE, DIALOG_MGR())); - sal_IntPtr nUnit = FUNIT_NONE; + FieldUnit nUnit = FUNIT_NONE; OUString aStrMetric( m_pFtAutomatic->GetText()); sal_Int32 nPos = m_pLbUnit->InsertEntry( aStrMetric ); m_pLbUnit->SetEntryData( nPos, reinterpret_cast(nUnit) ); - for( sal_uInt32 i = 0; i < aMetricArr.Count(); ++i ) + for( sal_uInt32 i = 0; i < SvxFieldUnitTable::Count(); ++i ) { - aStrMetric = aMetricArr.GetStringByPos( i ); - nUnit = aMetricArr.GetValue( i ); + aStrMetric = SvxFieldUnitTable::GetString(i); + nUnit = SvxFieldUnitTable::GetValue(i); nPos = m_pLbUnit->InsertEntry( aStrMetric ); m_pLbUnit->SetEntryData( nPos, reinterpret_cast(nUnit) ); } diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 78cae7475cf6..a4981f5d84cf 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -31,6 +31,7 @@ #include #include +#include #include diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index d0bf7386f770..30525c1045c6 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -62,7 +63,6 @@ #include #include #include -#include #include #include @@ -70,6 +70,7 @@ #include "sfx2/opengrf.hxx" #include +#include #include #include #include @@ -1179,12 +1180,11 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(vcl::Window* pParent, eCoreUnit = rSet.GetPool()->GetMetric(rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE)); // Fill ListBox with predefined / translated numbering types. - ResStringArray aNames(ResId(RID_SVXSTRARY_NUMBERINGTYPE, DIALOG_MGR())); - sal_uInt32 nCount = aNames.Count(); + sal_uInt32 nCount = SvxNumberingTypeTable::Count(); for (sal_uInt32 i = 0; i < nCount; ++i) { - sal_Int32 nPos = m_pFmtLB->InsertEntry( aNames.GetString(i)); - m_pFmtLB->SetEntryData( nPos, reinterpret_cast(static_cast(aNames.GetValue(i)))); + sal_Int32 nPos = m_pFmtLB->InsertEntry(SvxNumberingTypeTable::GetString(i)); + m_pFmtLB->SetEntryData( nPos, reinterpret_cast(static_cast(SvxNumberingTypeTable::GetValue(i)))); } // Get advanced numbering types from the component. diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 50e83e91714b..98f0d12ee183 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include @@ -32,6 +31,7 @@ #include #include +#include #include "helpid.hrc" #include "page.hxx" #include diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 4d608a2e4147..a4f83510ae2c 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -30,6 +30,7 @@ #include #include #include +#include #include "paragrph.hxx" #include #include diff --git a/cui/source/tabpages/strings.src b/cui/source/tabpages/strings.src deleted file mode 100644 index 744aa6b60d58..000000000000 --- a/cui/source/tabpages/strings.src +++ /dev/null @@ -1,195 +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 - -String RID_SVXSTR_DESC_GRADIENT -{ - Text [ en-US ] = "Please enter a name for the gradient:" ; -}; -String RID_SVXSTR_DESC_NEW_BITMAP -{ - Text [ en-US ] = "Please enter a name for the bitmap:" ; -}; -String RID_SVXSTR_DESC_EXT_BITMAP -{ - Text [ en-US ] = "Please enter a name for the external bitmap:" ; -}; -String RID_SVXSTR_DESC_NEW_PATTERN -{ - Text [ en-US ] = "Please enter a name for the pattern:" ; -}; -String RID_SVXSTR_DESC_LINESTYLE -{ - Text [ en-US ] = "Please enter a name for the line style:" ; -}; -String RID_SVXSTR_ASK_CHANGE_LINESTYLE -{ - Text [ en-US ] = "The line style was modified without saving. \nModify the selected line style or add a new line style." ; -}; -String RID_SVXSTR_DESC_HATCH -{ - Text [ en-US ] = "Please enter a name for the hatching:" ; -}; -String RID_SVXSTR_CHANGE -{ - Text [ en-US ] = "Modify" ; -}; -String RID_SVXSTR_ADD -{ - Text [ en-US ] = "Add" ; -}; -String RID_SVXSTR_DESC_COLOR -{ - Text [ en-US ] = "Please enter a name for the new color:" ; -}; -String RID_SVXSTR_TABLE -{ - Text [ en-US ] = "Table" ; -}; -String RID_SVXSTR_DESC_LINEEND -{ - Text [ en-US ] = "Please enter a name for the new arrowhead:" ; -}; -String RID_SVXSTR_CHARNAME_NOSTYLE -{ - Text [ en-US ] = "No %1"; -}; -String RID_SVXSTR_CHARNAME_FAMILY -{ - Text [ en-US ] = "Family"; -}; -String RID_SVXSTR_CHARNAME_FONT -{ - Text [ en-US ] = "Font"; -}; -String RID_SVXSTR_CHARNAME_STYLE -{ - Text [ en-US ] = "Style"; -}; -String RID_SVXSTR_CHARNAME_TYPEFACE -{ - Text [ en-US ] = "Typeface"; -}; -String RID_SVXSTR_CHARNAME_HIGHLIGHTING -{ - Text [ en-US ] = "Highlight Color"; -}; -String RID_SVXSTR_USE_REPLACE -{ - Text [ en-US ] = "Use replacement table" ; -}; -String RID_SVXSTR_CPTL_STT_WORD -{ - Text [ en-US ] = "Correct TWo INitial CApitals" ; -}; -String RID_SVXSTR_CPTL_STT_SENT -{ - Text [ en-US ] = "Capitalize first letter of every sentence" ; -}; -String RID_SVXSTR_BOLD_UNDER -{ - Text [ en-US ] = "Automatic *bold*, /italic/, -strikeout- and _underline_" ; -}; -String RID_SVXSTR_NO_DBL_SPACES -{ - Text [ en-US ] = "Ignore double spaces" ; -}; -String RID_SVXSTR_DETECT_URL -{ - Text [ en-US ] = "URL Recognition" ; -}; -String RID_SVXSTR_DASH -{ - Text [ en-US ] = "Replace dashes" ; -}; -String RID_SVXSTR_CORRECT_ACCIDENTAL_CAPS_LOCK -{ - Text [ en-US ] = "Correct accidental use of cAPS LOCK key" ; -}; -String RID_SVXSTR_NON_BREAK_SPACE -{ - Text [ en-US ] = "Add non-breaking space before specific punctuation marks in French text" ; -}; -String RID_SVXSTR_ORDINAL -{ - Text [ en-US ] = "Format ordinal numbers suffixes (1st -> 1^st)" ; -}; -String RID_SVXSTR_DEL_EMPTY_PARA -{ - Text [ en-US ] = "Remove blank paragraphs" ; -}; -String RID_SVXSTR_USER_STYLE -{ - Text [ en-US ] = "Replace Custom Styles" ; -}; -String RID_SVXSTR_BULLET -{ - Text [ en-US ] = "Replace bullets with: " ; -}; -String RID_SVXSTR_RIGHT_MARGIN -{ - Text [ en-US ] = "Combine single line paragraphs if length greater than" ; -}; -String RID_SVXSTR_NUM -{ - Text [ en-US ] = "Bulleted and numbered lists. Bullet symbol: " ; -}; -String RID_SVXSTR_BORDER -{ - Text [ en-US ] = "Apply border" ; -}; -String RID_SVXSTR_CREATE_TABLE -{ - Text [ en-US ] = "Create table" ; -}; -String RID_SVXSTR_REPLACE_TEMPLATES -{ - Text [ en-US ] = "Apply Styles" ; -}; -String RID_SVXSTR_DEL_SPACES_AT_STT_END -{ - Text [ en-US ] = "Delete spaces and tabs at beginning and end of paragraph"; -}; -String RID_SVXSTR_DEL_SPACES_BETWEEN_LINES -{ - Text [ en-US ] = "Delete spaces and tabs at end and start of line"; -}; -String RID_SVXSTR_CONNECTOR -{ - Text [en-US ] = "Connector"; -}; -String RID_SVXSTR_DIMENSION_LINE -{ - Text [en-US ] = "Dimension line"; -}; -String RID_SVXSTR_LOAD_ERROR -{ - Text [ en-US ] = "The selected module could not be loaded."; -}; -String RID_SVXSTR_STARTQUOTE -{ - Text [ en-US ] = "Start Quote"; -}; -String RID_SVXSTR_ENDQUOTE -{ - Text [ en-US ] = "End Quote"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 3c92d5a7a8f5..9bcd7c1454e1 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -683,7 +683,7 @@ void SvxSwPosSizeTabPage::setOptimalFrmWidth() for (std::vector::const_iterator aI = aFrames.begin(), aEnd = aFrames.end(); aI != aEnd; ++aI) { - m_pHoriLB->InsertEntry(m_aFramePosString.GetString(*aI)); + m_pHoriLB->InsertEntry(SvxSwFramePosString::GetString(*aI)); } Size aBiggest(m_pHoriLB->GetOptimalSize()); @@ -724,7 +724,7 @@ void SvxSwPosSizeTabPage::setOptimalRelWidth() for (std::vector::const_iterator aI = aRels.begin(), aEnd = aRels.end(); aI != aEnd; ++aI) { - m_pHoriLB->InsertEntry(m_aFramePosString.GetString(*aI)); + m_pHoriLB->InsertEntry(SvxSwFramePosString::GetString(*aI)); } Size aBiggest(m_pHoriLB->GetOptimalSize()); @@ -1462,7 +1462,7 @@ sal_uInt16 SvxSwPosSizeTabPage::GetMapPos(FrmMap *pMap, ListBox &rAlignLB) { SvxSwFramePosString::StringId eResId = pMap[i].eStrId; - OUString sEntry = m_aFramePosString.GetString(eResId); + OUString sEntry = SvxSwFramePosString::GetString(eResId); if (sEntry == sSelEntry) { @@ -1688,7 +1688,7 @@ void SvxSwPosSizeTabPage::FillRelLB(FrmMap *pMap, sal_uInt16 nMapPos, sal_uInt16 SvxSwFramePosString::StringId sStrId1 = aAsCharRelationMap[nRelPos].eStrId; sStrId1 = lcl_ChangeResIdToVerticalOrRTL(sStrId1, m_bIsVerticalFrame, m_bIsInRightToLeft); - OUString sEntry = m_aFramePosString.GetString(sStrId1); + OUString sEntry = SvxSwFramePosString::GetString(sStrId1); sal_Int32 nPos = rLB.InsertEntry(sEntry); rLB.SetEntryData(nPos, &aAsCharRelationMap[nRelPos]); if (pMap[_nMapPos].nAlign == nAlign) @@ -1745,7 +1745,7 @@ void SvxSwPosSizeTabPage::FillRelLB(FrmMap *pMap, sal_uInt16 nMapPos, sal_uInt16 { SvxSwFramePosString::StringId sStrId1 = m_pHoriMirrorCB->IsChecked() ? aRelationMap[nRelPos].eMirrorStrId : aRelationMap[nRelPos].eStrId; sStrId1 = lcl_ChangeResIdToVerticalOrRTL(sStrId1, m_bIsVerticalFrame, m_bIsInRightToLeft); - OUString sEntry = m_aFramePosString.GetString(sStrId1); + OUString sEntry = SvxSwFramePosString::GetString(sStrId1); sal_Int32 nPos = rLB.InsertEntry(sEntry); rLB.SetEntryData(nPos, &aRelationMap[nRelPos]); if (sSelEntry.isEmpty() && aRelationMap[nRelPos].nRelation == nRel) @@ -1826,7 +1826,7 @@ sal_uInt16 SvxSwPosSizeTabPage::FillPosLB(FrmMap *_pMap, { SvxSwFramePosString::StringId eStrId = m_pHoriMirrorCB->IsChecked() ? _pMap[i].eMirrorStrId : _pMap[i].eStrId; eStrId = lcl_ChangeResIdToVerticalOrRTL(eStrId, m_bIsVerticalFrame, m_bIsInRightToLeft); - OUString sEntry(m_aFramePosString.GetString(eStrId)); + OUString sEntry(SvxSwFramePosString::GetString(eStrId)); if (_rLB.GetEntryPos(sEntry) == LISTBOX_ENTRY_NOTFOUND) { // don't insert duplicate entries at character wrapped borders diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 5ea3afe39b2f..bc87cf191c8c 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -26,6 +26,7 @@ #include "svx/xattr.hxx" #include #include +#include #include #include #include @@ -758,7 +759,6 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ModifyTileOffsetHdl, Edit&, void) IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl, Button*, void) { - ResMgr& rMgr = CUI_MGR(); SvxOpenGraphicDialog aDlg( "Import" ); aDlg.EnableLink(false); long nCount = m_pBitmapList->Count(); @@ -773,7 +773,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl, Button*, void) if( !nError ) { - OUString aDesc( ResId(RID_SVXSTR_DESC_EXT_BITMAP, rMgr) ); + OUString aDesc(CuiResId(RID_SVXSTR_DESC_EXT_BITMAP)); ScopedVclPtr pWarnBox; // convert file URL to UI name diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index d9b140729036..fb2a1300696b 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -33,6 +33,7 @@ #include "com/sun/star/ui/dialogs/TemplateDescription.hpp" #include +#include #include "helpid.hrc" #include "svx/xattr.hxx" #include @@ -46,6 +47,7 @@ #include #include #include +#include #include #include #include diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index f7f2de67e2ae..8de274563d88 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -28,6 +28,7 @@ #include "com/sun/star/ui/dialogs/TemplateDescription.hpp" #include +#include #include "helpid.hrc" #include #include "svx/xattr.hxx" @@ -41,6 +42,7 @@ #include #include #include +#include #include diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 45b14ec5d2ca..0e78ab78089e 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -29,6 +29,7 @@ #include "com/sun/star/ui/dialogs/TemplateDescription.hpp" #include +#include #include "helpid.hrc" #include #include "svx/xattr.hxx" @@ -43,6 +44,7 @@ #include "svx/dlgutil.hxx" #include #include +#include #include diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 0e6c80f070ce..de1526d4b7dc 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -25,6 +25,7 @@ #include #include +#include #include #include "svx/xattr.hxx" #include @@ -51,6 +52,7 @@ #include "sfx2/opengrf.hxx" #include #include +#include #include #include diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index f622e18358e7..1cd1b4f61a01 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -27,6 +27,7 @@ #include "com/sun/star/ui/dialogs/TemplateDescription.hpp" #include +#include #include "helpid.hrc" #include "svx/xattr.hxx" @@ -42,6 +43,7 @@ #include "svx/dlgutil.hxx" #include #include +#include #include #include "cuitabarea.hxx" @@ -240,15 +242,14 @@ void SvxLineDefTabPage::CheckChanges_Impl() m_pLbType2->IsValueChangedFromSaved() || m_pMtrDistance->IsValueChangedFromSaved() ) { - ResMgr& rMgr = CUI_MGR(); Image aWarningBoxImage = WarningBox::GetStandardImage(); ScopedVclPtrInstance aMessDlg( GetParentDialog(), SvxResId( RID_SVXSTR_LINESTYLE ), - OUString( ResId( RID_SVXSTR_ASK_CHANGE_LINESTYLE, rMgr ) ), + CuiResId(RID_SVXSTR_ASK_CHANGE_LINESTYLE), &aWarningBoxImage ); DBG_ASSERT(aMessDlg, "Dialog creation failed!"); - aMessDlg->SetButtonText( SvxMessDialogButton::N1, OUString( ResId( RID_SVXSTR_CHANGE, rMgr ) ) ); - aMessDlg->SetButtonText( SvxMessDialogButton::N2, OUString( ResId( RID_SVXSTR_ADD, rMgr ) ) ); + aMessDlg->SetButtonText( SvxMessDialogButton::N1, CuiResId(RID_SVXSTR_CHANGE) ); + aMessDlg->SetButtonText( SvxMessDialogButton::N2, CuiResId(RID_SVXSTR_ADD) ); short nRet = aMessDlg->Execute(); @@ -532,9 +533,8 @@ void SvxLineDefTabPage::SelectTypeHdl_Impl(ListBox* p) IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl, Button*, void) { - ResMgr& rMgr = CUI_MGR(); - OUString aNewName( SvxResId( RID_SVXSTR_LINESTYLE ) ); - OUString aDesc( ResId( RID_SVXSTR_DESC_LINESTYLE, rMgr ) ); + OUString aNewName(SvxResId(RID_SVXSTR_LINESTYLE)); + OUString aDesc(CuiResId(RID_SVXSTR_DESC_LINESTYLE)); OUString aName; long nCount = pDashList->Count(); @@ -618,8 +618,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl, Button*, void) if( nPos != LISTBOX_ENTRY_NOTFOUND ) { - ResMgr& rMgr = CUI_MGR(); - OUString aDesc( ResId( RID_SVXSTR_DESC_LINESTYLE, rMgr ) ); + OUString aDesc(CuiResId(RID_SVXSTR_DESC_LINESTYLE)); OUString aName( pDashList->GetDash( nPos )->GetName() ); OUString aOldName = aName; diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index df8309d1054c..a5a0579226b7 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -26,6 +26,7 @@ #include "com/sun/star/ui/dialogs/TemplateDescription.hpp" #include +#include #include "helpid.hrc" #include #include @@ -45,6 +46,7 @@ #include #include #include +#include #include @@ -310,8 +312,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl, Button*, void) if( nPos != LISTBOX_ENTRY_NOTFOUND ) { - ResMgr& rMgr = CUI_MGR(); - OUString aDesc( ResId( RID_SVXSTR_DESC_LINEEND, rMgr ) ); + OUString aDesc(CuiResId(RID_SVXSTR_DESC_LINEEND)); OUString aName( m_pEdtName->GetText() ); long nCount = pLineEndList->Count(); bool bDifferent = true; @@ -417,9 +418,8 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl, Button*, void) SdrObject::Free( pConvPolyObj ); - ResMgr& rMgr = CUI_MGR(); - OUString aNewName( SvxResId( RID_SVXSTR_LINEEND ) ); - OUString aDesc( ResId( RID_SVXSTR_DESC_LINEEND, rMgr ) ); + OUString aNewName(SvxResId(RID_SVXSTR_LINEEND)); + OUString aDesc(CuiResId(RID_SVXSTR_DESC_LINEEND)); OUString aName; long nCount = pLineEndList->Count(); diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx index dba1fc108066..9f57f7e5a0d5 100644 --- a/cui/source/tabpages/tppattern.cxx +++ b/cui/source/tabpages/tppattern.cxx @@ -33,8 +33,10 @@ #include #include #include +#include #include +#include #include "helpid.hrc" #include "svx/xattr.hxx" #include @@ -468,9 +470,8 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void) if ( nPos != VALUESET_ITEM_NOTFOUND ) { - ResMgr& rMgr = CUI_MGR(); - OUString aDesc( ResId( RID_SVXSTR_DESC_NEW_PATTERN, rMgr ) ); - OUString aName( m_pPatternList->GetBitmap( nPos )->GetName() ); + OUString aDesc(CuiResId(RID_SVXSTR_DESC_NEW_PATTERN)); + OUString aName(m_pPatternList->GetBitmap(nPos)->GetName()); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); assert(pFact && "Dialog creation failed!"); diff --git a/cui/uiconfig/ui/aboutconfigdialog.ui b/cui/uiconfig/ui/aboutconfigdialog.ui index 65cc729dc7f0..876f78a8f5f6 100644 --- a/cui/uiconfig/ui/aboutconfigdialog.ui +++ b/cui/uiconfig/ui/aboutconfigdialog.ui @@ -1,12 +1,12 @@ - + False 6 - Expert Configuration + Expert Configuration normal True @@ -45,7 +45,7 @@ - _Search + _Search True True True @@ -78,7 +78,7 @@ True False 0.49000000953674316 - Preference Name + Preference Name 0 @@ -93,7 +93,7 @@ False 0.51999998092651367 0.50999999046325684 - Property + Property 1 @@ -106,7 +106,7 @@ True False - Type + Type 2 @@ -119,7 +119,7 @@ True False - Value + Value 3 @@ -166,7 +166,7 @@ end - Edit + Edit True True True @@ -179,7 +179,7 @@ - Reset + Reset True True True diff --git a/cui/uiconfig/ui/aboutconfigvaluedialog.ui b/cui/uiconfig/ui/aboutconfigvaluedialog.ui index 4024f45f89a0..895124080640 100644 --- a/cui/uiconfig/ui/aboutconfigvaluedialog.ui +++ b/cui/uiconfig/ui/aboutconfigvaluedialog.ui @@ -1,12 +1,12 @@ - + False 6 - Name + Name False dialog @@ -84,7 +84,7 @@ True False 0 - Value: + Value: False diff --git a/cui/uiconfig/ui/aboutdialog.ui b/cui/uiconfig/ui/aboutdialog.ui index dbbb9d4faa7e..067ca0633d9f 100644 --- a/cui/uiconfig/ui/aboutdialog.ui +++ b/cui/uiconfig/ui/aboutdialog.ui @@ -1,14 +1,14 @@ - + - Version: %ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX + Version: %ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX False 6 - About %PRODUCTNAME + About %PRODUCTNAME False dialog @@ -22,7 +22,7 @@ end - Cre_dits + Cre_dits True True True @@ -37,7 +37,7 @@ - _Website + _Website True True True @@ -106,7 +106,7 @@ False True - %PRODUCTNAME + %PRODUCTNAME center @@ -125,7 +125,7 @@ False True True - Build ID: $BUILDID + Build ID: $BUILDID center @@ -138,7 +138,7 @@ False True True - Locale: $LOCALE + Locale: $LOCALE center @@ -171,7 +171,7 @@ - See Log: $GITHASH + See Log: $GITHASH True True True @@ -188,7 +188,7 @@ True False True - %PRODUCTNAME is a modern, easy-to-use, open source productivity suite for word processing, spreadsheets, presentations and more. + %PRODUCTNAME is a modern, easy-to-use, open source productivity suite for word processing, spreadsheets, presentations and more. center True 62 @@ -211,7 +211,7 @@ 12 12 True - Copyright © 2000–2017 LibreOffice contributors. + Copyright © 2000–2017 LibreOffice contributors. center True @@ -225,7 +225,7 @@ False True True - LibreOffice was based on OpenOffice.org. + LibreOffice was based on OpenOffice.org. center True @@ -239,7 +239,7 @@ False True True - %PRODUCTNAME is derived from LibreOffice which was based on OpenOffice.org. + %PRODUCTNAME is derived from LibreOffice which was based on OpenOffice.org. center True @@ -253,7 +253,7 @@ False True True - This release was supplied by %OOOVENDOR. + This release was supplied by %OOOVENDOR. center True @@ -273,7 +273,7 @@ False True - https://www.libreoffice.org/about-us/credits/ + https://www.libreoffice.org/about-us/credits/ False diff --git a/cui/uiconfig/ui/accelconfigpage.ui b/cui/uiconfig/ui/accelconfigpage.ui index 68e17b4b01c6..1296e9b01e11 100644 --- a/cui/uiconfig/ui/accelconfigpage.ui +++ b/cui/uiconfig/ui/accelconfigpage.ui @@ -1,6 +1,6 @@ - + @@ -50,7 +50,7 @@ True False - Shortcut Keys + Shortcut Keys @@ -77,7 +77,7 @@ 6 - %PRODUCTNAME + %PRODUCTNAME True True False @@ -94,7 +94,7 @@ - $(MODULE) + $(MODULE) True True False @@ -126,7 +126,7 @@ start - _Modify + _Modify True True True @@ -154,7 +154,7 @@ - _Load... + _Load... True True True @@ -169,7 +169,7 @@ - _Save... + _Save... True True True @@ -242,7 +242,7 @@ True True - Type to search + Type to search False @@ -262,7 +262,7 @@ True False - _Category + _Category True category:border 0 @@ -276,7 +276,7 @@ True False - _Function + _Function True function:border 0 @@ -290,7 +290,7 @@ True False - _Keys + _Keys True keys:border 0 @@ -360,7 +360,7 @@ True False - Functions + Functions diff --git a/cui/uiconfig/ui/acorexceptpage.ui b/cui/uiconfig/ui/acorexceptpage.ui index f7893aab4aef..0dab0855818e 100644 --- a/cui/uiconfig/ui/acorexceptpage.ui +++ b/cui/uiconfig/ui/acorexceptpage.ui @@ -1,5 +1,5 @@ - + @@ -47,7 +47,7 @@ - _AutoInclude + _AutoInclude True True False @@ -80,7 +80,7 @@ True - New abbreviations + New abbreviations @@ -92,7 +92,7 @@ - _Replace + _Replace True True True @@ -116,7 +116,7 @@ True - Delete abbreviations + Delete abbreviations @@ -164,7 +164,7 @@ True False - Abbreviations (no Subsequent Capital) + Abbreviations (no Subsequent Capital) @@ -217,7 +217,7 @@ - A_utoInclude + A_utoInclude True True False @@ -250,7 +250,7 @@ True - New words with two initial capitals + New words with two initial capitals @@ -262,7 +262,7 @@ - _Replace + _Replace True True True @@ -286,7 +286,7 @@ True - Delete words with two initial capitals + Delete words with two initial capitals @@ -334,7 +334,7 @@ True False - Words With TWo INitial CApitals + Words With TWo INitial CApitals diff --git a/cui/uiconfig/ui/acoroptionspage.ui b/cui/uiconfig/ui/acoroptionspage.ui index b7f090607ae6..5d6ad7accf56 100644 --- a/cui/uiconfig/ui/acoroptionspage.ui +++ b/cui/uiconfig/ui/acoroptionspage.ui @@ -1,5 +1,5 @@ - + diff --git a/cui/uiconfig/ui/acorreplacepage.ui b/cui/uiconfig/ui/acorreplacepage.ui index 2f7c6f836568..4bf945202c3f 100644 --- a/cui/uiconfig/ui/acorreplacepage.ui +++ b/cui/uiconfig/ui/acorreplacepage.ui @@ -1,6 +1,6 @@ - + @@ -35,7 +35,7 @@ - _Replace + _Replace True True True @@ -118,7 +118,7 @@ True False 0 - Repla_ce + Repla_ce True origtext @@ -138,7 +138,7 @@ True False 0 - _With: + _With: True newtext @@ -151,7 +151,7 @@ - _Text only + _Text only True True False diff --git a/cui/uiconfig/ui/agingdialog.ui b/cui/uiconfig/ui/agingdialog.ui index a37c8460ed97..42433c4cdab5 100644 --- a/cui/uiconfig/ui/agingdialog.ui +++ b/cui/uiconfig/ui/agingdialog.ui @@ -1,6 +1,6 @@ - + @@ -13,7 +13,7 @@ False 6 - Aging + Aging False dialog @@ -134,7 +134,7 @@ True False 0 - Aging degree: + Aging degree: True value:% @@ -157,7 +157,7 @@ True False - Parameters + Parameters diff --git a/cui/uiconfig/ui/applyautofmtpage.ui b/cui/uiconfig/ui/applyautofmtpage.ui index 0ed07bf64f28..c466faf60ae8 100644 --- a/cui/uiconfig/ui/applyautofmtpage.ui +++ b/cui/uiconfig/ui/applyautofmtpage.ui @@ -1,5 +1,5 @@ - + @@ -24,7 +24,7 @@ 12 - _Edit... + _Edit... True True True @@ -43,7 +43,7 @@ True False 0 - [M]: Replace while modifying existing text + [M]: Replace while modifying existing text 1 @@ -57,7 +57,7 @@ True False 0 - [T]: AutoCorrect while typing + [T]: AutoCorrect while typing 1 @@ -85,7 +85,7 @@ False True - [M] + [M] 0 @@ -98,7 +98,7 @@ False True - [T] + [T] 1 diff --git a/cui/uiconfig/ui/applylocalizedpage.ui b/cui/uiconfig/ui/applylocalizedpage.ui index d917442473ba..a298a5b08c9b 100644 --- a/cui/uiconfig/ui/applylocalizedpage.ui +++ b/cui/uiconfig/ui/applylocalizedpage.ui @@ -1,5 +1,5 @@ - + @@ -27,7 +27,7 @@ False True - [M] + [M] 0 @@ -40,7 +40,7 @@ False True - [T] + [T] 1 @@ -115,7 +115,7 @@ 6 - Repla_ce + Repla_ce True True False @@ -135,7 +135,7 @@ True False 0 - _Start quote: + _Start quote: True startsingle @@ -159,7 +159,7 @@ True - Start quote of single quotes + Start quote of single quotes @@ -175,7 +175,7 @@ True False 0 - Default + Default 1 @@ -194,7 +194,7 @@ - _Default + _Default True True True @@ -202,7 +202,7 @@ True - Single quotes default + Single quotes default @@ -218,7 +218,7 @@ True False 0 - _End quote: + _End quote: True endsingle @@ -242,7 +242,7 @@ True - End quote of single quotes + End quote of single quotes @@ -258,7 +258,7 @@ True False 0 - Default + Default 1 @@ -283,7 +283,7 @@ True False - Single Quotes + Single Quotes @@ -315,7 +315,7 @@ 6 - Repla_ce + Repla_ce True True False @@ -335,7 +335,7 @@ True False 0 - _Start quote: + _Start quote: True startdouble @@ -359,7 +359,7 @@ True - Start quote of double quotes + Start quote of double quotes @@ -375,7 +375,7 @@ True False 0 - Default + Default 1 @@ -394,7 +394,7 @@ - _Default + _Default True True True @@ -402,7 +402,7 @@ True - Double quotes default + Double quotes default @@ -418,7 +418,7 @@ True False 0 - _End quote: + _End quote: True enddouble @@ -442,7 +442,7 @@ True - End quote of double quotes + End quote of double quotes @@ -458,7 +458,7 @@ True False 0 - Default + Default 1 @@ -483,7 +483,7 @@ True False - Double Quotes + Double Quotes diff --git a/cui/uiconfig/ui/areadialog.ui b/cui/uiconfig/ui/areadialog.ui index e9c557e8bbd4..5a0c983f7c76 100644 --- a/cui/uiconfig/ui/areadialog.ui +++ b/cui/uiconfig/ui/areadialog.ui @@ -1,11 +1,11 @@ - + False 6 - Area + Area False dialog @@ -97,7 +97,7 @@ True False - Area + Area False @@ -110,7 +110,7 @@ True False - Shadow + Shadow 1 @@ -124,7 +124,7 @@ True False - Transparency + Transparency 2 diff --git a/cui/uiconfig/ui/areatabpage.ui b/cui/uiconfig/ui/areatabpage.ui index 405060116ff4..11e939855fa7 100644 --- a/cui/uiconfig/ui/areatabpage.ui +++ b/cui/uiconfig/ui/areatabpage.ui @@ -1,6 +1,6 @@ - + @@ -26,7 +26,7 @@ center - None + None True True True @@ -39,7 +39,7 @@ - Color + Color True True True @@ -52,7 +52,7 @@ - Gradient + Gradient True True True @@ -65,7 +65,7 @@ - Hatch + Hatch True True True @@ -78,7 +78,7 @@ - Bitmap + Bitmap True True True @@ -91,7 +91,7 @@ - Pattern + Pattern True True True diff --git a/cui/uiconfig/ui/asiantypography.ui b/cui/uiconfig/ui/asiantypography.ui index b25746ffe42b..6f719ea6e3f6 100644 --- a/cui/uiconfig/ui/asiantypography.ui +++ b/cui/uiconfig/ui/asiantypography.ui @@ -1,6 +1,6 @@ - + True @@ -22,7 +22,7 @@ 6 - Apply list of forbidden characters to the beginning and end of lines + Apply list of forbidden characters to the beginning and end of lines True True False @@ -38,7 +38,7 @@ - Allow hanging punctuation + Allow hanging punctuation True True False @@ -54,7 +54,7 @@ - Apply spacing between Asian, Latin and complex text + Apply spacing between Asian, Latin and complex text True True False @@ -76,7 +76,7 @@ True False - Line Change + Line Change diff --git a/cui/uiconfig/ui/assigncomponentdialog.ui b/cui/uiconfig/ui/assigncomponentdialog.ui index 024f66e336d8..134e32f8f740 100644 --- a/cui/uiconfig/ui/assigncomponentdialog.ui +++ b/cui/uiconfig/ui/assigncomponentdialog.ui @@ -1,13 +1,13 @@ - + False True True 6 - Assign Component + Assign Component dialog @@ -88,7 +88,7 @@ True False start - Component method name: + Component method name: False diff --git a/cui/uiconfig/ui/autocorrectdialog.ui b/cui/uiconfig/ui/autocorrectdialog.ui index 343b1d50c9ec..d8fbf1f30183 100644 --- a/cui/uiconfig/ui/autocorrectdialog.ui +++ b/cui/uiconfig/ui/autocorrectdialog.ui @@ -1,12 +1,12 @@ - + False 6 - AutoCorrect + AutoCorrect dialog @@ -101,7 +101,7 @@ True False 0 - Replacements and exceptions for language: + Replacements and exceptions for language: False @@ -140,7 +140,7 @@ True False - Replace + Replace False @@ -153,7 +153,7 @@ True False - Exceptions + Exceptions 1 @@ -167,7 +167,7 @@ True False - Options + Options 2 @@ -181,7 +181,7 @@ True False - Options + Options 3 @@ -195,7 +195,7 @@ True False - Localized Options + Localized Options 4 @@ -209,7 +209,7 @@ True False - Word Completion + Word Completion 5 @@ -223,7 +223,7 @@ True False - Smart Tags + Smart Tags 6 diff --git a/cui/uiconfig/ui/backgroundpage.ui b/cui/uiconfig/ui/backgroundpage.ui index 5125e4c066c6..c29f179da611 100644 --- a/cui/uiconfig/ui/backgroundpage.ui +++ b/cui/uiconfig/ui/backgroundpage.ui @@ -1,6 +1,6 @@ - + @@ -17,11 +17,11 @@ - Color + Color 1 - Image + Image 4 @@ -42,7 +42,7 @@ False True - A_s: + A_s: True @@ -68,7 +68,7 @@ False True 0 - F_or: + F_or: True @@ -86,9 +86,9 @@ False True - Cell - Row - Table + Cell + Row + Table @@ -209,7 +209,7 @@ True False - Background Color + Background Color @@ -272,7 +272,7 @@ False True 0 - Unlinked image + Unlinked image 0 @@ -284,7 +284,7 @@ False True 0 - Find images + Find images 0 @@ -299,7 +299,7 @@ 12 - _Browse... + _Browse... True True True @@ -312,7 +312,7 @@ - _Link + _Link True True False @@ -340,7 +340,7 @@ True False - File + File @@ -398,7 +398,7 @@ start - _Position + _Position True True False @@ -418,7 +418,7 @@ - Ar_ea + Ar_ea True True False @@ -434,7 +434,7 @@ - _Tile + _Tile True True False @@ -462,7 +462,7 @@ True False - Type + Type @@ -503,7 +503,7 @@ - Pre_view + Pre_view True False True diff --git a/cui/uiconfig/ui/baselinksdialog.ui b/cui/uiconfig/ui/baselinksdialog.ui index 1d77a0a68c54..bd14fce35e68 100644 --- a/cui/uiconfig/ui/baselinksdialog.ui +++ b/cui/uiconfig/ui/baselinksdialog.ui @@ -1,12 +1,12 @@ - + False 6 - Edit Links + Edit Links dialog @@ -51,7 +51,7 @@ - _Update + _Update False True True @@ -66,7 +66,7 @@ - _Open + _Open False True True @@ -81,7 +81,7 @@ - _Modify... + _Modify... False True True @@ -96,7 +96,7 @@ - _Break Link + _Break Link False True True @@ -144,7 +144,7 @@ True False 0 - Source file + Source file 0 @@ -158,7 +158,7 @@ True False 0 - Element: + Element: 1 @@ -172,7 +172,7 @@ True False 0 - Type + Type 2 @@ -187,7 +187,7 @@ False True 0 - Status + Status 3 @@ -214,7 +214,7 @@ - Edit Links + Edit Links @@ -243,7 +243,7 @@ True False 0 - Source file + Source file True TB_LINKS:border @@ -259,7 +259,7 @@ True False 0 - Element: + Element: 0 @@ -273,7 +273,7 @@ True False 0 - Type: + Type: 0 @@ -287,7 +287,7 @@ True False 0 - Update: + Update: 0 @@ -342,7 +342,7 @@ 12 - _Automatic + _Automatic False True True @@ -362,7 +362,7 @@ - Ma_nual + Ma_nual False True True diff --git a/cui/uiconfig/ui/bitmaptabpage.ui b/cui/uiconfig/ui/bitmaptabpage.ui index 7b7148fd5604..a18167ed4f0d 100644 --- a/cui/uiconfig/ui/bitmaptabpage.ui +++ b/cui/uiconfig/ui/bitmaptabpage.ui @@ -1,6 +1,6 @@ - + @@ -43,7 +43,7 @@ - Add / Import + Add / Import True True True @@ -63,7 +63,7 @@ True False 0 - Bitmap + Bitmap @@ -108,7 +108,7 @@ True False 0 - Style: + Style: False @@ -121,12 +121,12 @@ True False - Original - Filled - Stretched - Zoomed - Custom - Tiled + Original + Filled + Stretched + Zoomed + Custom + Tiled @@ -153,7 +153,7 @@ True False 0 - Size: + Size: False @@ -170,7 +170,7 @@ True False - W: + W: False @@ -194,7 +194,7 @@ True False - H: + H: False @@ -223,7 +223,7 @@ - Scale + Scale True True False @@ -254,7 +254,7 @@ True False 0 - Position: + Position: False @@ -267,15 +267,15 @@ True False - Top Left - Top Center - Top Right - Center Left - Center - Center Right - Bottom Left - Bottom Center - Bottom Right + Top Left + Top Center + Top Right + Center Left + Center + Center Right + Bottom Left + Bottom Center + Bottom Right @@ -302,7 +302,7 @@ True False 0 - Tiling Position: + Tiling Position: False @@ -320,7 +320,7 @@ True False - X: + X: False @@ -343,7 +343,7 @@ True False - Y: + Y: False @@ -387,7 +387,7 @@ True False 0 - Tiling Offset: + Tiling Offset: False @@ -406,8 +406,8 @@ False True - Row - Column + Row + Column @@ -450,7 +450,7 @@ True False - Options + Options @@ -493,7 +493,7 @@ True - Example + Example @@ -511,7 +511,7 @@ True False - Preview + Preview diff --git a/cui/uiconfig/ui/blackorwhitelistentrydialog.ui b/cui/uiconfig/ui/blackorwhitelistentrydialog.ui index ecd102812ea2..5649c19a16f4 100644 --- a/cui/uiconfig/ui/blackorwhitelistentrydialog.ui +++ b/cui/uiconfig/ui/blackorwhitelistentrydialog.ui @@ -1,6 +1,6 @@ - + @@ -11,7 +11,7 @@ - Any + Any 0 @@ -185,7 +185,7 @@ True False end - Operating system: + Operating system: True @@ -198,7 +198,7 @@ True False end - Version: + Version: True @@ -211,7 +211,7 @@ True False end - OpenCL vendor: + OpenCL vendor: True @@ -224,7 +224,7 @@ True False end - Device: + Device: True @@ -237,7 +237,7 @@ True False end - Driver version: + Driver version: True @@ -255,7 +255,7 @@ False True - Edit OpenCL Blacklist Entry + Edit OpenCL Blacklist Entry 0 @@ -266,7 +266,7 @@ False True - Create OpenCL Blacklist Entry + Create OpenCL Blacklist Entry 0 @@ -277,7 +277,7 @@ False True - Edit OpenCL Whitelist Entry + Edit OpenCL Whitelist Entry 0 @@ -288,7 +288,7 @@ False True - Create OpenCL Whitelist Entry + Create OpenCL Whitelist Entry 0 @@ -303,7 +303,7 @@ True False - OpenCL Information + OpenCL Information diff --git a/cui/uiconfig/ui/borderareatransparencydialog.ui b/cui/uiconfig/ui/borderareatransparencydialog.ui index a996970ad2b3..a5715ef3fdd7 100644 --- a/cui/uiconfig/ui/borderareatransparencydialog.ui +++ b/cui/uiconfig/ui/borderareatransparencydialog.ui @@ -1,11 +1,11 @@ - + False 6 - Border / Background + Border / Background False dialog @@ -97,7 +97,7 @@ True False - Borders + Borders False @@ -110,7 +110,7 @@ True False - Area + Area 1 @@ -124,7 +124,7 @@ True False - Transparency + Transparency 2 diff --git a/cui/uiconfig/ui/borderbackgrounddialog.ui b/cui/uiconfig/ui/borderbackgrounddialog.ui index 4a2ed33258be..99b2fde564ed 100644 --- a/cui/uiconfig/ui/borderbackgrounddialog.ui +++ b/cui/uiconfig/ui/borderbackgrounddialog.ui @@ -1,11 +1,11 @@ - + False 6 - Border / Background + Border / Background False dialog @@ -97,7 +97,7 @@ True False - Borders + Borders False @@ -110,7 +110,7 @@ True False - Background + Background 1 diff --git a/cui/uiconfig/ui/borderpage.ui b/cui/uiconfig/ui/borderpage.ui index a3cb06bb068a..5fbadc551d89 100644 --- a/cui/uiconfig/ui/borderpage.ui +++ b/cui/uiconfig/ui/borderpage.ui @@ -1,6 +1,6 @@ - + @@ -68,7 +68,7 @@ True False 0 - _User-defined: + _User-defined: True framesel @@ -82,7 +82,7 @@ True False 0 - Pr_esets: + Pr_esets: True presets @@ -107,7 +107,7 @@ True False 0 - _Adjacent Cells: + _Adjacent Cells: True rmadjcellborders @@ -118,7 +118,7 @@ - Remove border + Remove border True True False @@ -138,7 +138,7 @@ True False - Line Arrangement + Line Arrangement @@ -172,7 +172,7 @@ True False 0 - St_yle: + St_yle: True linestylelb @@ -186,7 +186,7 @@ True False 0 - _Width: + _Width: True linewidthmf:0.00pt @@ -200,7 +200,7 @@ True False 0 - _Color: + _Color: True linecolorlb @@ -250,7 +250,7 @@ True False - Line + Line @@ -337,7 +337,7 @@ True False 0 - _Left: + _Left: True leftmf:0.00mm @@ -351,7 +351,7 @@ True False 0 - Right: + Right: True rightmf:0.00mm @@ -365,7 +365,7 @@ True False 0 - _Top: + _Top: True topmf:0.00mm @@ -379,7 +379,7 @@ True False 0 - _Bottom: + _Bottom: True bottommf:0.00mm @@ -390,7 +390,7 @@ - Synchronize + Synchronize True True False @@ -411,7 +411,7 @@ True False - Spacing to Contents + Spacing to Contents @@ -454,7 +454,7 @@ True False 0 - _Position: + _Position: True shadows @@ -468,7 +468,7 @@ True False 0 - Distan_ce: + Distan_ce: True distancemf:0.00mm @@ -482,7 +482,7 @@ True False 0 - C_olor: + C_olor: True shadowcolorlb @@ -534,7 +534,7 @@ True False - Shadow Style + Shadow Style @@ -567,7 +567,7 @@ 12 - _Merge with next paragraph + _Merge with next paragraph True False True @@ -582,7 +582,7 @@ - _Merge adjacent line styles + _Merge adjacent line styles True False True @@ -603,7 +603,7 @@ True False - Properties + Properties diff --git a/cui/uiconfig/ui/breaknumberoption.ui b/cui/uiconfig/ui/breaknumberoption.ui index 34a06bfbb17c..2aac625050a3 100644 --- a/cui/uiconfig/ui/breaknumberoption.ui +++ b/cui/uiconfig/ui/breaknumberoption.ui @@ -1,6 +1,6 @@ - + 2 @@ -12,7 +12,7 @@ False 6 - Hyphenation + Hyphenation False dialog @@ -94,7 +94,7 @@ True False - Characters Before Break + Characters Before Break @@ -133,7 +133,7 @@ True False - Characters After Break + Characters After Break @@ -172,7 +172,7 @@ True False - Minimal Word Length + Minimal Word Length diff --git a/cui/uiconfig/ui/calloutdialog.ui b/cui/uiconfig/ui/calloutdialog.ui index 6208d1c4c296..d01063e819d8 100644 --- a/cui/uiconfig/ui/calloutdialog.ui +++ b/cui/uiconfig/ui/calloutdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Position and Size + Position and Size False dialog @@ -97,7 +97,7 @@ True False - Position and Size + Position and Size False @@ -110,7 +110,7 @@ True False - Position and Size + Position and Size 1 @@ -124,7 +124,7 @@ True False - Callout + Callout 2 diff --git a/cui/uiconfig/ui/calloutpage.ui b/cui/uiconfig/ui/calloutpage.ui index 7c2bb8caa260..56f3351ad50b 100644 --- a/cui/uiconfig/ui/calloutpage.ui +++ b/cui/uiconfig/ui/calloutpage.ui @@ -1,6 +1,6 @@ - + @@ -17,23 +17,23 @@ - Optimal + Optimal 4 - From top + From top 3 - From left + From left 3 - Horizontal + Horizontal 1 - Vertical + Vertical 2 @@ -71,7 +71,7 @@ True False 0 - _Extension: + _Extension: True extension @@ -120,7 +120,7 @@ True False 0 - _Length: + _Length: True length:0.00mm @@ -137,7 +137,7 @@ - _Optimal + _Optimal True True False @@ -161,7 +161,7 @@ True False 0 - _Position: + _Position: True position @@ -175,7 +175,7 @@ True False 0 - _By: + _By: True by:0.00mm @@ -189,12 +189,12 @@ True False - Top - Middle - Bottom - Left - Center - Right + Top + Middle + Bottom + Left + Center + Right @@ -231,7 +231,7 @@ True False 0 - _Spacing: + _Spacing: True spacing:0.00mm @@ -309,9 +309,9 @@ False True - Straight Line - Angled Line - Angled Connector Line + Straight Line + Angled Line + Angled Connector Line diff --git a/cui/uiconfig/ui/cellalignment.ui b/cui/uiconfig/ui/cellalignment.ui index d5e8b7388018..581523076bd7 100644 --- a/cui/uiconfig/ui/cellalignment.ui +++ b/cui/uiconfig/ui/cellalignment.ui @@ -1,6 +1,6 @@ - + @@ -21,31 +21,31 @@ - Default + Default 0 - Left + Left 1 - Center + Center 2 - Right + Right 3 - Justified + Justified 4 - Filled + Filled 5 - Distributed + Distributed 6 @@ -59,27 +59,27 @@ - Default + Default 0 - Top + Top 1 - Middle + Middle 2 - Bottom + Bottom 3 - Justified + Justified 4 - Distributed + Distributed 5 @@ -120,7 +120,7 @@ True False 0 - _Degrees: + _Degrees: True @@ -133,7 +133,7 @@ True False 0 - _Reference edge: + _Reference edge: True references @@ -193,7 +193,7 @@ 6 - Vertically s_tacked + Vertically s_tacked True True False @@ -209,7 +209,7 @@ - Asian layout _mode + Asian layout _mode True True False @@ -238,7 +238,7 @@ True False - Text Orientation + Text Orientation @@ -272,7 +272,7 @@ 12 - _Wrap text automatically + _Wrap text automatically True True False @@ -289,7 +289,7 @@ - _Shrink to fit cell size + _Shrink to fit cell size True True False @@ -305,7 +305,7 @@ - Hyphenation _active + Hyphenation _active True True False @@ -331,7 +331,7 @@ True False 0 - Te_xt direction: + Te_xt direction: True comboTextDirBox @@ -366,7 +366,7 @@ True False - Properties + Properties @@ -415,7 +415,7 @@ True False 0 - Hori_zontal + Hori_zontal True comboboxHorzAlign @@ -429,7 +429,7 @@ True False 0 - _Vertical + _Vertical True comboboxVertAlign @@ -443,7 +443,7 @@ True False 0 - I_ndent + I_ndent True spinIndentFrom:0.00pt @@ -484,7 +484,7 @@ True False - Text Alignment + Text Alignment @@ -504,7 +504,7 @@ False - Text Extension From Lower Cell Border + Text Extension From Lower Cell Border False @@ -515,7 +515,7 @@ False - Text Extension From Upper Cell Border + Text Extension From Upper Cell Border False @@ -526,7 +526,7 @@ False - Text Extension Inside Cell + Text Extension Inside Cell False @@ -537,7 +537,7 @@ False - ABCD + ABCD False diff --git a/cui/uiconfig/ui/certdialog.ui b/cui/uiconfig/ui/certdialog.ui index b8c2ec6a0f70..7cbc1c428ce9 100644 --- a/cui/uiconfig/ui/certdialog.ui +++ b/cui/uiconfig/ui/certdialog.ui @@ -1,12 +1,12 @@ - + False 6 - Certificate Path + Certificate Path normal @@ -63,7 +63,7 @@ - _Add... + _Add... True True True @@ -115,7 +115,7 @@ False 0 0 - Select or add the correct Network Security Services Certificate directory to use for digital signatures: + Select or add the correct Network Security Services Certificate directory to use for digital signatures: True True paths @@ -137,7 +137,7 @@ True False True - manual + manual 0 @@ -151,7 +151,7 @@ True False True - Profile + Profile 1 @@ -165,7 +165,7 @@ True False True - Directory + Directory 2 @@ -178,7 +178,7 @@ True False - Select a Certificate directory + Select a Certificate directory 0 @@ -221,7 +221,7 @@ True False - Certificate Path + Certificate Path diff --git a/cui/uiconfig/ui/charnamepage.ui b/cui/uiconfig/ui/charnamepage.ui index 88e63b8180c7..83041dcf7fca 100644 --- a/cui/uiconfig/ui/charnamepage.ui +++ b/cui/uiconfig/ui/charnamepage.ui @@ -1,6 +1,6 @@ - + @@ -43,7 +43,7 @@ start True 0 - Language: + Language: True westlanglb-nocjk @@ -103,7 +103,7 @@ True False - Family: + Family: @@ -142,7 +142,7 @@ True False - Style: + Style: @@ -182,7 +182,7 @@ True False - Size: + Size: @@ -224,7 +224,7 @@ False True 0 - Family: + Family: True westfontnamelb-cjk @@ -239,7 +239,7 @@ False True 0 - Style: + Style: True weststylelb-cjk @@ -254,7 +254,7 @@ False True 0 - Size: + Size: True westsizelb-cjk @@ -269,7 +269,7 @@ False True 0 - Language: + Language: True westlanglb-cjk @@ -343,7 +343,7 @@ True False - Western Text Font + Western Text Font @@ -382,7 +382,7 @@ False True 0 - Family: + Family: True eastfontnamelb @@ -397,7 +397,7 @@ False True 0 - Style: + Style: True eaststylelb @@ -412,7 +412,7 @@ False True 0 - Size: + Size: True eastsizelb @@ -427,7 +427,7 @@ False True 0 - Language: + Language: True eastlanglb @@ -500,7 +500,7 @@ True False - Asian Text Font + Asian Text Font @@ -539,7 +539,7 @@ False True 0 - Family: + Family: True ctlfontnamelb @@ -554,7 +554,7 @@ False True 0 - Style: + Style: True ctlstylelb @@ -569,7 +569,7 @@ False True 0 - Size: + Size: True ctlsizelb @@ -584,7 +584,7 @@ False True 0 - Language: + Language: True ctllanglb @@ -658,7 +658,7 @@ True False - CTL Font + CTL Font @@ -685,7 +685,7 @@ False - Preview + Preview diff --git a/cui/uiconfig/ui/colorconfigwin.ui b/cui/uiconfig/ui/colorconfigwin.ui index 6c8dd3f6aedb..dbcbb89dbeb0 100644 --- a/cui/uiconfig/ui/colorconfigwin.ui +++ b/cui/uiconfig/ui/colorconfigwin.ui @@ -1,6 +1,6 @@ - + @@ -11,7 +11,7 @@ True - Text boundaries + Text boundaries True True False @@ -30,7 +30,7 @@ False 6 0 - Document background + Document background 0 @@ -86,7 +86,7 @@ True False 0 - General + General @@ -125,7 +125,7 @@ False 6 0 - Application background + Application background 0 @@ -134,7 +134,7 @@ - Object boundaries + Object boundaries True True False @@ -171,7 +171,7 @@ - Table boundaries + Table boundaries True True False @@ -212,7 +212,7 @@ False 6 0 - Font color + Font color 0 @@ -243,7 +243,7 @@ - Unvisited links + Unvisited links True True False @@ -280,7 +280,7 @@ - Visited links + Visited links True True False @@ -321,7 +321,7 @@ False 6 0 - AutoSpellcheck + AutoSpellcheck 0 @@ -334,7 +334,7 @@ False 6 0 - Smart Tags + Smart Tags 0 @@ -388,7 +388,7 @@ True False 0 - Text Document + Text Document @@ -415,7 +415,7 @@ False 6 0 - Grid + Grid 0 @@ -494,7 +494,7 @@ False 6 0 - Script Indicator + Script Indicator 0 @@ -515,7 +515,7 @@ - Field shadings + Field shadings True True False @@ -530,7 +530,7 @@ - Index and table shadings + Index and table shadings True True False @@ -545,7 +545,7 @@ - Section boundaries + Section boundaries True True False @@ -596,7 +596,7 @@ False 6 0 - Headers and Footer delimiter + Headers and Footer delimiter 0 @@ -631,7 +631,7 @@ False 6 0 - Page and column breaks + Page and column breaks 0 @@ -666,7 +666,7 @@ False 6 0 - Direct Cursor + Direct Cursor 0 @@ -690,7 +690,7 @@ True False 0 - HTML Document + HTML Document @@ -717,7 +717,7 @@ False 6 0 - SGML syntax highlighting + SGML syntax highlighting 0 @@ -752,7 +752,7 @@ False 6 0 - Comment highlighting + Comment highlighting 0 @@ -787,7 +787,7 @@ False 6 0 - Keyword highlighting + Keyword highlighting 0 @@ -822,7 +822,7 @@ False 6 0 - Text + Text 0 @@ -846,7 +846,7 @@ True False 0 - Spreadsheet + Spreadsheet @@ -873,7 +873,7 @@ False 6 0 - Grid lines + Grid lines 0 @@ -908,7 +908,7 @@ False 6 0 - Page breaks + Page breaks 0 @@ -943,7 +943,7 @@ False 6 0 - Manual page breaks + Manual page breaks 0 @@ -978,7 +978,7 @@ False 6 0 - Automatic page breaks + Automatic page breaks 0 @@ -1013,7 +1013,7 @@ False 6 0 - Detective + Detective 0 @@ -1048,7 +1048,7 @@ False 6 0 - Detective error + Detective error 0 @@ -1083,7 +1083,7 @@ False 6 0 - References + References 0 @@ -1118,7 +1118,7 @@ False 6 0 - Notes background + Notes background 0 @@ -1142,7 +1142,7 @@ True False 0 - Drawing / Presentation + Drawing / Presentation @@ -1169,7 +1169,7 @@ False 6 0 - Grid + Grid 0 @@ -1193,7 +1193,7 @@ True False 0 - Basic Syntax Highlighting + Basic Syntax Highlighting @@ -1220,7 +1220,7 @@ False 6 0 - Identifier + Identifier 0 @@ -1255,7 +1255,7 @@ False 6 0 - Comment + Comment 0 @@ -1290,7 +1290,7 @@ False 6 0 - Number + Number 0 @@ -1325,7 +1325,7 @@ False 6 0 - String + String 0 @@ -1360,7 +1360,7 @@ False 6 0 - Operator + Operator 0 @@ -1395,7 +1395,7 @@ False 6 0 - Reserved expression + Reserved expression 0 @@ -1430,7 +1430,7 @@ False 6 0 - Error + Error 0 @@ -1454,7 +1454,7 @@ True False 0 - SQL Syntax Highlighting + SQL Syntax Highlighting @@ -1481,7 +1481,7 @@ False 6 0 - Identifier + Identifier 0 @@ -1516,7 +1516,7 @@ False 6 0 - Number + Number 0 @@ -1551,7 +1551,7 @@ False 6 0 - String + String 0 @@ -1586,7 +1586,7 @@ False 6 0 - Operator + Operator 0 @@ -1621,7 +1621,7 @@ False 6 0 - Keyword + Keyword 0 @@ -1656,7 +1656,7 @@ False 6 0 - Parameter + Parameter 0 @@ -1691,7 +1691,7 @@ False 6 0 - Comment + Comment 0 @@ -1736,7 +1736,7 @@ - Shadows + Shadows True True False diff --git a/cui/uiconfig/ui/colorpage.ui b/cui/uiconfig/ui/colorpage.ui index e0810b887ca3..b8b77731ec11 100644 --- a/cui/uiconfig/ui/colorpage.ui +++ b/cui/uiconfig/ui/colorpage.ui @@ -1,6 +1,6 @@ - + @@ -57,7 +57,7 @@ center 0 0 - Palette: + Palette: True paletteselector @@ -98,7 +98,7 @@ True False 0 - Recent Colors + Recent Colors True recentcolorset @@ -153,7 +153,7 @@ - RGB + RGB True False 0 @@ -169,7 +169,7 @@ - CMYK + CMYK True False 0 @@ -185,7 +185,7 @@ - Delete + Delete True True True @@ -203,7 +203,7 @@ False 3 0 - Custom Palette + Custom Palette 0 @@ -255,7 +255,7 @@ True False - Colors + Colors @@ -300,7 +300,7 @@ True - Old Color + Old Color @@ -330,7 +330,7 @@ True False - B + B True B_custom @@ -345,7 +345,7 @@ True False - G + G True G_custom @@ -360,7 +360,7 @@ True False - R + R True R_custom @@ -375,7 +375,7 @@ True False - Hex + Hex 0 @@ -455,7 +455,7 @@ True False - _C + _C True C_custom:0% @@ -470,7 +470,7 @@ True False - _K + _K True K_custom:0% @@ -485,7 +485,7 @@ True False - _Y + _Y True @@ -551,7 +551,7 @@ True False - _M + _M True @@ -576,7 +576,7 @@ True False - Active + Active @@ -622,7 +622,7 @@ True - New Color + New Color @@ -653,7 +653,7 @@ True True • - Blue + Blue adjustment2 @@ -668,7 +668,7 @@ True True • - Red + Red adjustment2 @@ -682,7 +682,7 @@ True False - _B + _B True @@ -696,7 +696,7 @@ True False - _G + _G True @@ -710,7 +710,7 @@ True False - _R + _R True @@ -725,7 +725,7 @@ True True • - Green + Green adjustment2 @@ -739,7 +739,7 @@ True False - _Hex + _Hex True hex_custom @@ -783,7 +783,7 @@ True False - _C + _C True C_custom:0% @@ -798,7 +798,7 @@ True False - _M + _M True @@ -812,7 +812,7 @@ True False - _K + _K True K_custom:0% @@ -855,7 +855,7 @@ True False - _Y + _Y True @@ -902,7 +902,7 @@ - Pick + Pick True True True @@ -924,7 +924,7 @@ True False - New + New diff --git a/cui/uiconfig/ui/colorpickerdialog.ui b/cui/uiconfig/ui/colorpickerdialog.ui index cbc5c66fced9..b850cb7274b1 100644 --- a/cui/uiconfig/ui/colorpickerdialog.ui +++ b/cui/uiconfig/ui/colorpickerdialog.ui @@ -1,6 +1,6 @@ - + @@ -23,7 +23,7 @@ True True 6 - Pick a Color + Pick a Color False True dialog @@ -241,7 +241,7 @@ 12 - _Red: + _Red: False True True @@ -259,7 +259,7 @@ - _Green: + _Green: False True True @@ -276,7 +276,7 @@ - _Blue: + _Blue: False True True @@ -332,7 +332,7 @@ True False 0 - Hex _#: + Hex _#: True hexEntry @@ -360,7 +360,7 @@ True False - RGB + RGB @@ -399,7 +399,7 @@ 12 - H_ue: + H_ue: False True True @@ -417,7 +417,7 @@ - _Saturation: + _Saturation: False True True @@ -434,7 +434,7 @@ - Bright_ness: + Bright_ness: False True True @@ -493,7 +493,7 @@ True False - HSB + HSB @@ -534,7 +534,7 @@ False start 0 - _Cyan: + _Cyan: True cyanSpinbutton:% @@ -549,7 +549,7 @@ False start 0 - _Magenta: + _Magenta: True magSpinbutton:% @@ -564,7 +564,7 @@ False start 0 - _Yellow: + _Yellow: True yellowSpinbutton:% @@ -579,7 +579,7 @@ False start 0 - _Key: + _Key: True keySpinbutton:% @@ -644,7 +644,7 @@ True False - CMYK + CMYK diff --git a/cui/uiconfig/ui/comment.ui b/cui/uiconfig/ui/comment.ui index f25f37f76812..286b2b3308d8 100644 --- a/cui/uiconfig/ui/comment.ui +++ b/cui/uiconfig/ui/comment.ui @@ -1,10 +1,10 @@ - + False 6 - Insert Comment + Insert Comment dialog @@ -150,7 +150,7 @@ True False 0 - Author + Author False @@ -182,7 +182,7 @@ True False 0 - _Text + _Text True edit:border @@ -225,7 +225,7 @@ True False 0 - _Insert + _Insert True author @@ -238,7 +238,7 @@ - Author + Author True True True @@ -261,7 +261,7 @@ False True - Edit Comment + Edit Comment False @@ -277,7 +277,7 @@ True False - Contents + Contents diff --git a/cui/uiconfig/ui/connectortabpage.ui b/cui/uiconfig/ui/connectortabpage.ui index 9a3947c9e4fc..c91a899c1ff2 100644 --- a/cui/uiconfig/ui/connectortabpage.ui +++ b/cui/uiconfig/ui/connectortabpage.ui @@ -1,6 +1,6 @@ - + @@ -31,7 +31,7 @@ True False 0 - _Type: + _Type: True LB_TYPE @@ -82,7 +82,7 @@ True False 0 - Line _1: + Line _1: True MTR_FLD_LINE_1:0.00cm @@ -96,7 +96,7 @@ True False 0 - Line _2: + Line _2: True MTR_FLD_LINE_2:0.00cm @@ -110,7 +110,7 @@ True False 0 - Line _3: + Line _3: True MTR_FLD_LINE_3:0.00cm @@ -167,7 +167,7 @@ True False 0 - Line Skew + Line Skew @@ -203,7 +203,7 @@ True False 0 - _Begin horizontal: + _Begin horizontal: True MTR_FLD_HORZ_1:0.00mm @@ -217,7 +217,7 @@ True False 0 - End _horizontal: + End _horizontal: True MTR_FLD_HORZ_2:0.00mm @@ -231,7 +231,7 @@ True False 0 - Begin _vertical: + Begin _vertical: True MTR_FLD_VERT_1:0.00mm @@ -245,7 +245,7 @@ True False 0 - _End vertical: + _End vertical: True MTR_FLD_VERT_2:0.00mm @@ -315,7 +315,7 @@ True False 0 - Line Spacing + Line Spacing @@ -339,12 +339,12 @@ True False - Preview + Preview True True - Example + Example diff --git a/cui/uiconfig/ui/connpooloptions.ui b/cui/uiconfig/ui/connpooloptions.ui index d8a2d33c985b..fab025fde0e0 100644 --- a/cui/uiconfig/ui/connpooloptions.ui +++ b/cui/uiconfig/ui/connpooloptions.ui @@ -1,6 +1,6 @@ - + @@ -36,7 +36,7 @@ 6 - Connection pooling enabled + Connection pooling enabled False True True @@ -65,7 +65,7 @@ True False 0 - Drivers known in %PRODUCTNAME + Drivers known in %PRODUCTNAME True driverlist @@ -99,7 +99,7 @@ True False 0 - Current driver: + Current driver: False @@ -130,7 +130,7 @@ - Enable pooling for this driver + Enable pooling for this driver False True True @@ -156,7 +156,7 @@ True False 0 - _Timeout (seconds) + _Timeout (seconds) True timeout @@ -205,7 +205,7 @@ True False - Connection Pool + Connection Pool diff --git a/cui/uiconfig/ui/croppage.ui b/cui/uiconfig/ui/croppage.ui index 4fa005a97f74..a45ed6d41bbe 100644 --- a/cui/uiconfig/ui/croppage.ui +++ b/cui/uiconfig/ui/croppage.ui @@ -1,6 +1,6 @@ - + @@ -50,7 +50,7 @@ 12 - Keep _scale + Keep _scale True True False @@ -68,7 +68,7 @@ - Keep image si_ze + Keep image si_ze True True False @@ -94,7 +94,7 @@ True False 0 - _Left: + _Left: True left:0.00cm @@ -121,7 +121,7 @@ True False 0 - _Right: + _Right: True right:0.00cm @@ -160,7 +160,7 @@ True False 0 - _Top: + _Top: True top:0.00cm @@ -174,7 +174,7 @@ True False 0 - _Bottom: + _Bottom: True bottom:0.00cm @@ -223,7 +223,7 @@ True False - Crop + Crop @@ -258,7 +258,7 @@ True False 0 - _Width: + _Width: True widthzoom:0% @@ -284,7 +284,7 @@ True False 0 - _Height: + _Height: True heightzoom:0% @@ -313,7 +313,7 @@ True False - Scale + Scale @@ -348,7 +348,7 @@ True False 0 - _Width: + _Width: True width:0.00cm @@ -375,7 +375,7 @@ True False 0 - _Height: + _Height: True height:0.00cm @@ -405,7 +405,7 @@ True False - Image Size + Image Size @@ -457,7 +457,7 @@ - _Original Size + _Original Size True True True diff --git a/cui/uiconfig/ui/cuiimapdlg.ui b/cui/uiconfig/ui/cuiimapdlg.ui index 355db5bb8759..c9b18c4c2016 100644 --- a/cui/uiconfig/ui/cuiimapdlg.ui +++ b/cui/uiconfig/ui/cuiimapdlg.ui @@ -1,11 +1,11 @@ - + False 6 - Properties + Properties dialog @@ -93,7 +93,7 @@ False True 0 - _URL: + _URL: True urlentry @@ -135,7 +135,7 @@ False True 0 - F_rame: + F_rame: True frameCB @@ -183,7 +183,7 @@ False True 0 - _Name: + _Name: True nameentry @@ -225,7 +225,7 @@ False True 0 - Alternative _text: + Alternative _text: True textentry @@ -267,7 +267,7 @@ False True 0 - _Description: + _Description: True descTV:border diff --git a/cui/uiconfig/ui/customizedialog.ui b/cui/uiconfig/ui/customizedialog.ui index 9f0d188d138e..aaa25c399643 100644 --- a/cui/uiconfig/ui/customizedialog.ui +++ b/cui/uiconfig/ui/customizedialog.ui @@ -1,11 +1,11 @@ - + False 6 - Customize + Customize dialog @@ -96,7 +96,7 @@ True False - Menus + Menus False @@ -109,7 +109,7 @@ True False - Context Menus + Context Menus 1 @@ -123,7 +123,7 @@ True False - Keyboard + Keyboard 2 @@ -137,7 +137,7 @@ True False - Toolbars + Toolbars 3 @@ -151,7 +151,7 @@ True False - Events + Events 4 diff --git a/cui/uiconfig/ui/databaselinkdialog.ui b/cui/uiconfig/ui/databaselinkdialog.ui index 08a48af2e05e..17c49c398212 100644 --- a/cui/uiconfig/ui/databaselinkdialog.ui +++ b/cui/uiconfig/ui/databaselinkdialog.ui @@ -1,12 +1,12 @@ - + False 6 - Create Database Link + Create Database Link dialog @@ -85,7 +85,7 @@ 12 - Browse... + Browse... True True True @@ -101,7 +101,7 @@ True False 0 - _Database file: + _Database file: True url @@ -145,7 +145,7 @@ True False 0 - Registered _name: + Registered _name: True name @@ -176,7 +176,7 @@ False True - Edit Database Link + Edit Database Link 0 diff --git a/cui/uiconfig/ui/dbregisterpage.ui b/cui/uiconfig/ui/dbregisterpage.ui index fad2f6246256..17101a11aa03 100644 --- a/cui/uiconfig/ui/dbregisterpage.ui +++ b/cui/uiconfig/ui/dbregisterpage.ui @@ -1,6 +1,6 @@ - + @@ -59,7 +59,7 @@ end - _New... + _New... True True True @@ -73,7 +73,7 @@ - _Delete + _Delete True True True @@ -87,7 +87,7 @@ - _Edit... + _Edit... True True True @@ -114,7 +114,7 @@ True False - Registered Databases + Registered Databases diff --git a/cui/uiconfig/ui/dimensionlinestabpage.ui b/cui/uiconfig/ui/dimensionlinestabpage.ui index b0caf9ca1ea9..d5247a622d7f 100644 --- a/cui/uiconfig/ui/dimensionlinestabpage.ui +++ b/cui/uiconfig/ui/dimensionlinestabpage.ui @@ -1,6 +1,6 @@ - + @@ -50,7 +50,7 @@ False 0 0.4699999988079071 - Line _distance: + Line _distance: True MTR_LINE_DIST:0.00mm @@ -64,7 +64,7 @@ True False 0 - Guide _overhang: + Guide _overhang: True MTR_FLD_HELPLINE_OVERHANG:0.00mm @@ -78,7 +78,7 @@ True False 0 - _Guide distance: + _Guide distance: True MTR_FLD_HELPLINE_DIST:0.00mm @@ -92,7 +92,7 @@ True False 0 - _Left guide: + _Left guide: True MTR_FLD_HELPLINE1_LEN:0.00mm @@ -106,7 +106,7 @@ True False 0 - _Right guide: + _Right guide: True MTR_FLD_HELPLINE2_LEN:0.00mm @@ -120,7 +120,7 @@ True False 0 - Decimal _places: + Decimal _places: True MTR_FLD_DECIMALPLACES:0 @@ -131,7 +131,7 @@ - Measure _below object + Measure _below object True False False @@ -233,7 +233,7 @@ True False 0 - Line + Line @@ -269,7 +269,7 @@ True False 0 - _Text position + _Text position True @@ -304,7 +304,7 @@ - _AutoVertical + _AutoVertical True False False @@ -321,7 +321,7 @@ - A_utoHorizontal + A_utoHorizontal True False False @@ -347,7 +347,7 @@ - _Parallel to line + _Parallel to line True False False @@ -364,7 +364,7 @@ - Show _measurement units + Show _measurement units True False False @@ -401,7 +401,7 @@ True False 0 - Legend + Legend @@ -424,7 +424,7 @@ False - Automatic + Automatic False diff --git a/cui/uiconfig/ui/distributiondialog.ui b/cui/uiconfig/ui/distributiondialog.ui index d9245f621868..dd2b74dd5d52 100644 --- a/cui/uiconfig/ui/distributiondialog.ui +++ b/cui/uiconfig/ui/distributiondialog.ui @@ -1,11 +1,11 @@ - + False 6 - Distribution + Distribution False dialog diff --git a/cui/uiconfig/ui/distributionpage.ui b/cui/uiconfig/ui/distributionpage.ui index c278b2f0f463..c07dbe02c2a1 100644 --- a/cui/uiconfig/ui/distributionpage.ui +++ b/cui/uiconfig/ui/distributionpage.ui @@ -1,6 +1,6 @@ - + True @@ -33,7 +33,7 @@ True - _None + _None True True False @@ -50,7 +50,7 @@ - _Left + _Left True True False @@ -66,7 +66,7 @@ - _Center + _Center True True False @@ -82,7 +82,7 @@ - _Right + _Right True True False @@ -124,7 +124,7 @@ - _Spacing + _Spacing True True False @@ -175,7 +175,7 @@ True False - Horizontal + Horizontal @@ -208,7 +208,7 @@ True - N_one + N_one True True False @@ -224,7 +224,7 @@ - _Top + _Top True True False @@ -240,7 +240,7 @@ - C_enter + C_enter True True False @@ -257,7 +257,7 @@ - S_pacing + S_pacing True True False @@ -273,7 +273,7 @@ - _Bottom + _Bottom True True False @@ -350,7 +350,7 @@ True False - Vertical + Vertical diff --git a/cui/uiconfig/ui/editdictionarydialog.ui b/cui/uiconfig/ui/editdictionarydialog.ui index d50629d5ae04..5fb319aba1dc 100644 --- a/cui/uiconfig/ui/editdictionarydialog.ui +++ b/cui/uiconfig/ui/editdictionarydialog.ui @@ -1,11 +1,11 @@ - + False 6 - Edit Custom Dictionary + Edit Custom Dictionary dialog @@ -92,7 +92,7 @@ True False 0 - _Book: + _Book: True book @@ -107,7 +107,7 @@ True False - _Language: + _Language: True lang @@ -179,7 +179,7 @@ True False 0 - _Word + _Word True word @@ -195,7 +195,7 @@ True False 0 - _Replace By + _Replace By True replace @@ -248,7 +248,7 @@ start - _New + _New True True True @@ -262,7 +262,7 @@ - _Delete + _Delete True True True diff --git a/cui/uiconfig/ui/editmodulesdialog.ui b/cui/uiconfig/ui/editmodulesdialog.ui index ac0431ae7f26..5b5b77faca95 100644 --- a/cui/uiconfig/ui/editmodulesdialog.ui +++ b/cui/uiconfig/ui/editmodulesdialog.ui @@ -1,12 +1,12 @@ - + False 6 - Edit Modules + Edit Modules dialog @@ -81,7 +81,7 @@ 12 - Get more dictionaries online... + Get more dictionaries online... True True True @@ -105,7 +105,7 @@ True False 0 - Language: + Language: True language @@ -150,7 +150,7 @@ start - Move Up + Move Up True True True @@ -164,7 +164,7 @@ - Move Down + Move Down True True True @@ -178,7 +178,7 @@ - _Back + _Back True True True @@ -225,7 +225,7 @@ True False - Options + Options diff --git a/cui/uiconfig/ui/effectspage.ui b/cui/uiconfig/ui/effectspage.ui index bf80526b73e2..a699df24ef41 100644 --- a/cui/uiconfig/ui/effectspage.ui +++ b/cui/uiconfig/ui/effectspage.ui @@ -1,6 +1,6 @@ - + @@ -10,19 +10,19 @@ - (Without) + (Without) - Capitals + Capitals - Lowercase + Lowercase - Title + Title - Small capitals + Small capitals @@ -33,13 +33,13 @@ - (Without) + (Without) - Embossed + Embossed - Engraved + Engraved @@ -50,19 +50,19 @@ - (Without) + (Without) - Dot + Dot - Circle + Circle - Disc + Disc - Accent + Accent @@ -75,11 +75,11 @@ - Above text + Above text 0 - Below text + Below text 1 @@ -93,27 +93,27 @@ - (Without) + (Without) 0 - Single + Single 1 - Double + Double 2 - Bold + Bold 4 - With / + With / 5 - With X + With X 6 @@ -127,71 +127,71 @@ - (Without) + (Without) 0 - Single + Single 1 - Double + Double 2 - Bold + Bold 12 - Dotted + Dotted 3 - Dotted (Bold) + Dotted (Bold) 13 - Dash + Dash 5 - Dash (Bold) + Dash (Bold) 14 - Long Dash + Long Dash 6 - Long Dash (Bold) + Long Dash (Bold) 15 - Dot Dash + Dot Dash 7 - Dot Dash (Bold) + Dot Dash (Bold) 16 - Dot Dot Dash + Dot Dot Dash 8 - Dot Dot Dash (Bold) + Dot Dot Dash (Bold) 17 - Wave + Wave 10 - Wave (Bold) + Wave (Bold) 18 - Double Wave + Double Wave 11 @@ -215,7 +215,7 @@ True False - Font color: + Font color: True fontcolorlb 0 @@ -229,7 +229,7 @@ True False - Effects: + Effects: True effectslb 0 @@ -243,7 +243,7 @@ True False - Relief: + Relief: True relieflb 0 @@ -257,7 +257,7 @@ True False - Overlining: + Overlining: True overlinelb 0 @@ -271,7 +271,7 @@ True False - Strikethrough: + Strikethrough: True strikeoutlb 0 @@ -285,7 +285,7 @@ True False - Underlining: + Underlining: True underlinelb 0 @@ -299,7 +299,7 @@ True False - Overline color: + Overline color: True overlinecolorlb 0 @@ -313,7 +313,7 @@ True False - Underline color: + Underline color: True underlinecolorlb 0 @@ -410,7 +410,7 @@ - Outline + Outline True True False @@ -425,7 +425,7 @@ - Blinking + Blinking True True False @@ -440,7 +440,7 @@ - Hidden + Hidden True True False @@ -455,7 +455,7 @@ - Individual words + Individual words True True False @@ -493,7 +493,7 @@ True False - Position: + Position: True positionlb 0 @@ -507,7 +507,7 @@ True False - Emphasis mark: + Emphasis mark: True emphasislb 0 @@ -519,7 +519,7 @@ - Shadow + Shadow True True False @@ -559,7 +559,7 @@ False - Accessibility option "Use automatic font color for screen display" is active. Font color attributes are not currently used to display text. + Accessibility option "Use automatic font color for screen display" is active. Font color attributes are not currently used to display text. True 50 0 @@ -608,7 +608,7 @@ False - Preview + Preview diff --git a/cui/uiconfig/ui/embossdialog.ui b/cui/uiconfig/ui/embossdialog.ui index c9a298d0a835..fe52caece92e 100644 --- a/cui/uiconfig/ui/embossdialog.ui +++ b/cui/uiconfig/ui/embossdialog.ui @@ -1,12 +1,12 @@ - + False 6 - Emboss + Emboss dialog @@ -117,7 +117,7 @@ True False 0 - _Light source: + _Light source: True lightsource @@ -152,7 +152,7 @@ True False - Parameters + Parameters diff --git a/cui/uiconfig/ui/eventassigndialog.ui b/cui/uiconfig/ui/eventassigndialog.ui index 5be57cc782c7..499b5a1610fd 100644 --- a/cui/uiconfig/ui/eventassigndialog.ui +++ b/cui/uiconfig/ui/eventassigndialog.ui @@ -1,11 +1,11 @@ - + False 6 - Assign Macro + Assign Macro False normal diff --git a/cui/uiconfig/ui/eventassignpage.ui b/cui/uiconfig/ui/eventassignpage.ui index 1b773857467e..ab0431dde106 100644 --- a/cui/uiconfig/ui/eventassignpage.ui +++ b/cui/uiconfig/ui/eventassignpage.ui @@ -1,6 +1,6 @@ - + @@ -44,7 +44,7 @@ True False - Existing Macros + Existing Macros False @@ -94,7 +94,7 @@ True False 0 - Macro From + Macro From @@ -156,7 +156,7 @@ True False - Event + Event 0 @@ -169,7 +169,7 @@ True False - Assigned Action + Assigned Action 1 @@ -194,7 +194,7 @@ True False - Assignments + Assignments @@ -217,7 +217,7 @@ start - Assign + Assign True True True @@ -231,7 +231,7 @@ - Remove + Remove True True True diff --git a/cui/uiconfig/ui/eventsconfigpage.ui b/cui/uiconfig/ui/eventsconfigpage.ui index 4adcfae890ec..938380ef5be5 100644 --- a/cui/uiconfig/ui/eventsconfigpage.ui +++ b/cui/uiconfig/ui/eventsconfigpage.ui @@ -1,6 +1,6 @@ - + @@ -28,7 +28,7 @@ True False 0 - Assign: + Assign: False @@ -46,7 +46,7 @@ start - M_acro... + M_acro... True True True @@ -60,7 +60,7 @@ - _Remove + _Remove True True True @@ -102,7 +102,7 @@ True False 0 - Save in: + Save in: True savein @@ -153,7 +153,7 @@ True False True - Event + Event 0 @@ -165,7 +165,7 @@ True False True - Assigned Action + Assigned Action 1 diff --git a/cui/uiconfig/ui/fmsearchdialog.ui b/cui/uiconfig/ui/fmsearchdialog.ui index 33b2ce2bf30d..15411e39d4cc 100644 --- a/cui/uiconfig/ui/fmsearchdialog.ui +++ b/cui/uiconfig/ui/fmsearchdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Record Search + Record Search dialog @@ -18,7 +18,7 @@ end - S_earch + S_earch False True True @@ -139,7 +139,7 @@ - _Text: + _Text: False True True @@ -163,7 +163,7 @@ - Field content is _NULL + Field content is _NULL False True True @@ -182,7 +182,7 @@ - Field content is not NU_LL + Field content is not NU_LL False True True @@ -213,7 +213,7 @@ True False - _Search for + _Search for True @@ -269,7 +269,7 @@ 12 - _Single field: + _Single field: False True True @@ -306,7 +306,7 @@ - _All fields + _All fields False True True @@ -332,7 +332,7 @@ True False 0 - Form: + Form: True lbForm @@ -406,7 +406,7 @@ True False - Where to Search + Where to Search True @@ -457,7 +457,7 @@ True False 0 - _Position: + _Position: True lbPosition @@ -493,7 +493,7 @@ 12 - Match character wi_dth + Match character wi_dth False True True @@ -514,7 +514,7 @@ 12 - Sounds like (_Japanese) + Sounds like (_Japanese) False True True @@ -530,7 +530,7 @@ - Similarities... + Similarities... True True True @@ -555,7 +555,7 @@ 12 - S_imilarity search + S_imilarity search False True True @@ -571,7 +571,7 @@ - Similarities... + Similarities... True True True @@ -592,7 +592,7 @@ - _Match case + _Match case False True True @@ -608,7 +608,7 @@ - Fr_om top + Fr_om top False True True @@ -624,7 +624,7 @@ - _Regular expression + _Regular expression False True True @@ -640,7 +640,7 @@ - Appl_y field format + Appl_y field format False True True @@ -656,7 +656,7 @@ - Search _backwards + Search _backwards False True True @@ -672,7 +672,7 @@ - _Wildcard expression + _Wildcard expression False True True @@ -701,7 +701,7 @@ True False - Settings + Settings True @@ -737,7 +737,7 @@ True False 0 - Record: + Record: 0 @@ -748,7 +748,7 @@ True False - record count + record count 1 @@ -774,7 +774,7 @@ True False - State + State diff --git a/cui/uiconfig/ui/formatcellsdialog.ui b/cui/uiconfig/ui/formatcellsdialog.ui index 08449e34c7a5..7160a97016bc 100644 --- a/cui/uiconfig/ui/formatcellsdialog.ui +++ b/cui/uiconfig/ui/formatcellsdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Table Properties + Table Properties False dialog @@ -97,7 +97,7 @@ True False - Font + Font False @@ -110,7 +110,7 @@ True False - Font Effects + Font Effects 1 @@ -124,7 +124,7 @@ True False - Borders + Borders 2 @@ -138,7 +138,7 @@ True False - Background + Background 3 diff --git a/cui/uiconfig/ui/formatnumberdialog.ui b/cui/uiconfig/ui/formatnumberdialog.ui index 6bb47e1790ec..f0c1156772ac 100644 --- a/cui/uiconfig/ui/formatnumberdialog.ui +++ b/cui/uiconfig/ui/formatnumberdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Format Number + Format Number False dialog diff --git a/cui/uiconfig/ui/galleryapplyprogress.ui b/cui/uiconfig/ui/galleryapplyprogress.ui index b15952740b3e..ba572e0055f4 100644 --- a/cui/uiconfig/ui/galleryapplyprogress.ui +++ b/cui/uiconfig/ui/galleryapplyprogress.ui @@ -1,11 +1,11 @@ - + False 6 - Apply + Apply normal @@ -70,7 +70,7 @@ True False - File + File diff --git a/cui/uiconfig/ui/galleryfilespage.ui b/cui/uiconfig/ui/galleryfilespage.ui index 3c2d95fcde9f..4de695cdf261 100644 --- a/cui/uiconfig/ui/galleryfilespage.ui +++ b/cui/uiconfig/ui/galleryfilespage.ui @@ -1,6 +1,6 @@ - + @@ -27,7 +27,7 @@ True False 0 - _File type: + _File type: True filetype @@ -74,7 +74,7 @@ - Files Found + Files Found @@ -101,7 +101,7 @@ 12 - Pr_eview + Pr_eview True True False @@ -122,7 +122,7 @@ True - Preview + Preview @@ -146,7 +146,7 @@ start - _Find Files... + _Find Files... True True True @@ -174,7 +174,7 @@ - A_dd All + A_dd All True True True diff --git a/cui/uiconfig/ui/gallerygeneralpage.ui b/cui/uiconfig/ui/gallerygeneralpage.ui index 4d82153ef6d5..88a0a6b946a6 100644 --- a/cui/uiconfig/ui/gallerygeneralpage.ui +++ b/cui/uiconfig/ui/gallerygeneralpage.ui @@ -1,6 +1,6 @@ - + True @@ -19,7 +19,7 @@ True False 0 - Modified: + Modified: 0 @@ -60,7 +60,7 @@ True False 0 - Type: + Type: 0 @@ -87,7 +87,7 @@ True False 0 - Location: + Location: 0 @@ -101,7 +101,7 @@ True False 0 - Contents: + Contents: 0 @@ -159,7 +159,7 @@ - Theme Name + Theme Name diff --git a/cui/uiconfig/ui/gallerysearchprogress.ui b/cui/uiconfig/ui/gallerysearchprogress.ui index 0e32e580667e..be956840d36b 100644 --- a/cui/uiconfig/ui/gallerysearchprogress.ui +++ b/cui/uiconfig/ui/gallerysearchprogress.ui @@ -1,11 +1,11 @@ - + False 6 - Find + Find False dialog @@ -75,7 +75,7 @@ True False - File Type + File Type @@ -112,7 +112,7 @@ True False - Directory + Directory diff --git a/cui/uiconfig/ui/gallerythemedialog.ui b/cui/uiconfig/ui/gallerythemedialog.ui index ed7631dfd2b8..c91a73b06fff 100644 --- a/cui/uiconfig/ui/gallerythemedialog.ui +++ b/cui/uiconfig/ui/gallerythemedialog.ui @@ -1,11 +1,11 @@ - + False 6 - Properties of + Properties of False dialog @@ -97,7 +97,7 @@ True False - General + General False @@ -110,7 +110,7 @@ True False - Files + Files 1 diff --git a/cui/uiconfig/ui/gallerythemeiddialog.ui b/cui/uiconfig/ui/gallerythemeiddialog.ui index 3f3a36cf2e2b..f87ed9e04034 100644 --- a/cui/uiconfig/ui/gallerythemeiddialog.ui +++ b/cui/uiconfig/ui/gallerythemeiddialog.ui @@ -1,11 +1,11 @@ - + False 6 - Theme ID + Theme ID False dialog @@ -24,7 +24,7 @@ True False - ID: + ID: True entry diff --git a/cui/uiconfig/ui/gallerytitledialog.ui b/cui/uiconfig/ui/gallerytitledialog.ui index 14939f6a0c09..9f2c736b1f1a 100644 --- a/cui/uiconfig/ui/gallerytitledialog.ui +++ b/cui/uiconfig/ui/gallerytitledialog.ui @@ -1,11 +1,11 @@ - + False 6 - Enter Title + Enter Title dialog @@ -23,7 +23,7 @@ True False - Title: + Title: True entry diff --git a/cui/uiconfig/ui/galleryupdateprogress.ui b/cui/uiconfig/ui/galleryupdateprogress.ui index 563089a0acfb..ca35ec78668f 100644 --- a/cui/uiconfig/ui/galleryupdateprogress.ui +++ b/cui/uiconfig/ui/galleryupdateprogress.ui @@ -1,11 +1,11 @@ - + False 6 - Update + Update False normal @@ -71,7 +71,7 @@ True False - File + File diff --git a/cui/uiconfig/ui/gradientpage.ui b/cui/uiconfig/ui/gradientpage.ui index 96bb4baa9d84..bca24795a82f 100644 --- a/cui/uiconfig/ui/gradientpage.ui +++ b/cui/uiconfig/ui/gradientpage.ui @@ -1,6 +1,6 @@ - + @@ -76,7 +76,7 @@ - _Modify + _Modify True True True @@ -103,7 +103,7 @@ True False - Gradient + Gradient @@ -147,7 +147,7 @@ True False 0 - _Type: + _Type: True @@ -161,12 +161,12 @@ True False - Linear - Axial - Radial - Ellipsoid - Quadratic - Square + Linear + Axial + Radial + Ellipsoid + Quadratic + Square @@ -195,7 +195,7 @@ False 0 0.43999999761581421 - Increment: + Increment: 0 @@ -235,7 +235,7 @@ - Automatic + Automatic True True False @@ -275,7 +275,7 @@ False 0 0.43999999761581421 - A_ngle: + A_ngle: True @@ -305,7 +305,7 @@ False 0 0.43999999761581421 - Center ( X / Y ) : + Center ( X / Y ) : True @@ -377,7 +377,7 @@ False 0 0.43999999761581421 - _Border: + _Border: True @@ -439,7 +439,7 @@ True False 0 - _From: + _From: True @@ -529,7 +529,7 @@ True False 0 - _To: + _To: True @@ -557,7 +557,7 @@ True False - Options + Options @@ -601,7 +601,7 @@ True - Example + Example @@ -619,7 +619,7 @@ True False - Preview + Preview diff --git a/cui/uiconfig/ui/hangulhanjaadddialog.ui b/cui/uiconfig/ui/hangulhanjaadddialog.ui index 9616774a5584..750b8d27a41d 100644 --- a/cui/uiconfig/ui/hangulhanjaadddialog.ui +++ b/cui/uiconfig/ui/hangulhanjaadddialog.ui @@ -1,11 +1,11 @@ - + False 6 - New Dictionary + New Dictionary dialog @@ -94,7 +94,7 @@ True False - _Name: + _Name: True entry @@ -126,7 +126,7 @@ True False - Dictionary + Dictionary diff --git a/cui/uiconfig/ui/hangulhanjaconversiondialog.ui b/cui/uiconfig/ui/hangulhanjaconversiondialog.ui index e48423bed503..5122a861bdf4 100644 --- a/cui/uiconfig/ui/hangulhanjaconversiondialog.ui +++ b/cui/uiconfig/ui/hangulhanjaconversiondialog.ui @@ -1,10 +1,10 @@ - + False - Hangul/Hanja Conversion + Hangul/Hanja Conversion normal @@ -93,7 +93,7 @@ True False 28 - Original + Original False @@ -129,7 +129,7 @@ True False 42 - Word + Word False @@ -150,7 +150,7 @@ - _Find + _Find True True True @@ -178,7 +178,7 @@ True False - Suggestions + Suggestions True @@ -216,7 +216,7 @@ True False 28 - Format + Format False @@ -226,7 +226,7 @@ - _Hangul/Hanja + _Hangul/Hanja True True False @@ -244,7 +244,7 @@ - Hanja (Han_gul) + Hanja (Han_gul) True True False @@ -261,7 +261,7 @@ - Hang_ul (Hanja) + Hang_ul (Hanja) True True False @@ -292,7 +292,7 @@ 12 - Hanja + Hanja True True False @@ -309,7 +309,7 @@ - Hanja + Hanja True True False @@ -325,7 +325,7 @@ - Hangul + Hangul True True False @@ -341,7 +341,7 @@ - Hangul + Hangul True True False @@ -372,7 +372,7 @@ True False - Conversion + Conversion False @@ -382,7 +382,7 @@ - Hangul _only + Hangul _only True True False @@ -399,7 +399,7 @@ - Hanja onl_y + Hanja onl_y True True False @@ -437,7 +437,7 @@ True - _Ignore + _Ignore True True True @@ -453,7 +453,7 @@ - Always I_gnore + Always I_gnore True True True @@ -467,7 +467,7 @@ - _Replace + _Replace True True True @@ -481,7 +481,7 @@ - Always R_eplace + Always R_eplace True True True @@ -498,7 +498,7 @@ - Replace b_y character + Replace b_y character True True False @@ -514,7 +514,7 @@ - Options + Options True True True diff --git a/cui/uiconfig/ui/hangulhanjaeditdictdialog.ui b/cui/uiconfig/ui/hangulhanjaeditdictdialog.ui index b0bfd2c3417d..163f25cd5276 100644 --- a/cui/uiconfig/ui/hangulhanjaeditdictdialog.ui +++ b/cui/uiconfig/ui/hangulhanjaeditdictdialog.ui @@ -1,12 +1,12 @@ - + False 6 - Edit Custom Dictionary + Edit Custom Dictionary dialog @@ -104,7 +104,7 @@ True False 0 - Book + Book True book @@ -210,7 +210,7 @@ True False 0 - Original + Original True @@ -323,7 +323,7 @@ True False 0 - Suggestions + Suggestions True end diff --git a/cui/uiconfig/ui/hangulhanjaoptdialog.ui b/cui/uiconfig/ui/hangulhanjaoptdialog.ui index cd07cf864400..b658a9b7ee3a 100644 --- a/cui/uiconfig/ui/hangulhanjaoptdialog.ui +++ b/cui/uiconfig/ui/hangulhanjaoptdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Hangul/Hanja Options + Hangul/Hanja Options dialog @@ -104,7 +104,7 @@ start - New... + New... True True True @@ -118,7 +118,7 @@ - Edit... + Edit... True True True @@ -169,7 +169,7 @@ True False - User-defined Dictionaries + User-defined Dictionaries @@ -200,7 +200,7 @@ 6 - Ignore post-positional word + Ignore post-positional word True True False @@ -215,7 +215,7 @@ - Show recently used entries first + Show recently used entries first True True False @@ -229,7 +229,7 @@ - Replace all unique entries automatically + Replace all unique entries automatically True True False @@ -249,7 +249,7 @@ True False - Options + Options diff --git a/cui/uiconfig/ui/hatchpage.ui b/cui/uiconfig/ui/hatchpage.ui index 365ce1ba5927..1ecd4111f8aa 100644 --- a/cui/uiconfig/ui/hatchpage.ui +++ b/cui/uiconfig/ui/hatchpage.ui @@ -1,6 +1,6 @@ - + @@ -78,7 +78,7 @@ - _Modify + _Modify True True True @@ -105,7 +105,7 @@ True False - Hatch + Hatch @@ -145,7 +145,7 @@ True False 0 - _Spacing: + _Spacing: True @@ -172,7 +172,7 @@ True False 0 - A_ngle: + A_ngle: True @@ -226,7 +226,7 @@ True False 0 - _Line type: + _Line type: True @@ -240,9 +240,9 @@ True False - Single - Crossed - Triple + Single + Crossed + Triple @@ -256,7 +256,7 @@ True False 0 - Line _color: + Line _color: True @@ -278,7 +278,7 @@ - Background Color + Background Color True True False @@ -310,7 +310,7 @@ True False - Options + Options @@ -354,7 +354,7 @@ True - Example + Example @@ -372,7 +372,7 @@ True False - Preview + Preview diff --git a/cui/uiconfig/ui/hyperlinkdialog.ui b/cui/uiconfig/ui/hyperlinkdialog.ui index 4ebf47e7217d..28a4731bb8aa 100644 --- a/cui/uiconfig/ui/hyperlinkdialog.ui +++ b/cui/uiconfig/ui/hyperlinkdialog.ui @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ True True 6 - Hyperlink + Hyperlink dialog @@ -39,7 +39,7 @@ - Apply + Apply True True True @@ -81,7 +81,7 @@ - Reset + Reset True True True diff --git a/cui/uiconfig/ui/hyperlinkdocpage.ui b/cui/uiconfig/ui/hyperlinkdocpage.ui index d5703a303e75..1273adb78da0 100644 --- a/cui/uiconfig/ui/hyperlinkdocpage.ui +++ b/cui/uiconfig/ui/hyperlinkdocpage.ui @@ -1,6 +1,6 @@ - + @@ -36,7 +36,7 @@ False start 0 - _Path: + _Path: True path @@ -59,12 +59,12 @@ - Open File + Open File False True True True - Open File + Open File 2 @@ -79,7 +79,7 @@ True False - Document + Document @@ -116,7 +116,7 @@ False start 0 - Targ_et: + Targ_et: True target @@ -131,7 +131,7 @@ False start 0 - URL: + URL: True @@ -141,12 +141,12 @@ - Target in Document + Target in Document False True True True - Target in Document + Target in Document 2 @@ -170,7 +170,7 @@ False start True - Test text + Test text 1 @@ -188,7 +188,7 @@ True False - Target in Document + Target in Document @@ -227,7 +227,7 @@ False start 0 - F_rame: + F_rame: True frame @@ -242,7 +242,7 @@ False start 0 - Te_xt: + Te_xt: True indication @@ -257,7 +257,7 @@ False start 0 - N_ame: + N_ame: True name @@ -300,7 +300,7 @@ True False 0 - F_orm: + F_orm: True form @@ -326,7 +326,7 @@ True True True - Events + Events 3 @@ -364,7 +364,7 @@ True False - Further Settings + Further Settings diff --git a/cui/uiconfig/ui/hyperlinkinternetpage.ui b/cui/uiconfig/ui/hyperlinkinternetpage.ui index 047799f89008..81397aa6989b 100644 --- a/cui/uiconfig/ui/hyperlinkinternetpage.ui +++ b/cui/uiconfig/ui/hyperlinkinternetpage.ui @@ -1,6 +1,6 @@ - + @@ -39,7 +39,7 @@ 12 - _Web + _Web False True True @@ -56,7 +56,7 @@ - _FTP + _FTP False True True @@ -83,7 +83,7 @@ True False start - _URL: + _URL: True target 0 @@ -110,7 +110,7 @@ True False start - _Login name: + _Login name: True login 0 @@ -125,7 +125,7 @@ True False start - _Password: + _Password: True password 0 @@ -161,7 +161,7 @@ - Anonymous _user + Anonymous _user False True True @@ -189,7 +189,7 @@ True False - Hyperlink Type + Hyperlink Type @@ -227,7 +227,7 @@ True False start - F_rame: + F_rame: True frame 0 @@ -242,7 +242,7 @@ True False start - Te_xt: + Te_xt: True indication 0 @@ -257,7 +257,7 @@ True False start - N_ame: + N_ame: True name 0 @@ -300,7 +300,7 @@ True False - F_orm: + F_orm: True form 0 @@ -327,7 +327,7 @@ True True True - Events + Events 3 @@ -365,7 +365,7 @@ True False - Further Settings + Further Settings diff --git a/cui/uiconfig/ui/hyperlinkmailpage.ui b/cui/uiconfig/ui/hyperlinkmailpage.ui index 9496365518d4..14a60c70825f 100644 --- a/cui/uiconfig/ui/hyperlinkmailpage.ui +++ b/cui/uiconfig/ui/hyperlinkmailpage.ui @@ -1,6 +1,6 @@ - + @@ -36,7 +36,7 @@ False start 0 - Re_cipient: + Re_cipient: True receiver @@ -59,12 +59,12 @@ - Data Sources… + Data Sources… False True True True - Data Sources... + Data Sources... 2 @@ -78,7 +78,7 @@ start 0 1 - _Subject: + _Subject: True subject @@ -116,7 +116,7 @@ True False - Mail + Mail @@ -155,7 +155,7 @@ False start 0 - F_rame: + F_rame: True frame @@ -170,7 +170,7 @@ False start 0 - Te_xt: + Te_xt: True indication @@ -185,7 +185,7 @@ False start 0 - N_ame: + N_ame: True name @@ -228,7 +228,7 @@ True False 0 - F_orm: + F_orm: True form @@ -254,7 +254,7 @@ True True True - Events + Events 3 @@ -292,7 +292,7 @@ True False - Further Settings + Further Settings diff --git a/cui/uiconfig/ui/hyperlinkmarkdialog.ui b/cui/uiconfig/ui/hyperlinkmarkdialog.ui index 56c97aeb671e..2ded667f1384 100644 --- a/cui/uiconfig/ui/hyperlinkmarkdialog.ui +++ b/cui/uiconfig/ui/hyperlinkmarkdialog.ui @@ -1,12 +1,12 @@ - + False 6 - Target in Document + Target in Document dialog @@ -19,7 +19,7 @@ end - _Apply + _Apply False True True @@ -36,7 +36,7 @@ - _Close + _Close False True True @@ -69,7 +69,7 @@ - Mark Tree + Mark Tree diff --git a/cui/uiconfig/ui/hyperlinknewdocpage.ui b/cui/uiconfig/ui/hyperlinknewdocpage.ui index 39f06f972168..e762e0e1cc2b 100644 --- a/cui/uiconfig/ui/hyperlinknewdocpage.ui +++ b/cui/uiconfig/ui/hyperlinknewdocpage.ui @@ -1,6 +1,6 @@ - + @@ -41,7 +41,7 @@ 12 - Edit _now + Edit _now False True True @@ -58,7 +58,7 @@ - Edit _later + Edit _later False True True @@ -86,7 +86,7 @@ False start 0 - _File: + _File: True path @@ -109,12 +109,12 @@ - Select Path + Select Path False True True True - Select Path + Select Path 2 @@ -129,7 +129,7 @@ 0 0 1 - File _type: + File _type: True types:border @@ -169,7 +169,7 @@ True False - New Document + New Document @@ -208,7 +208,7 @@ False start 0 - F_rame: + F_rame: True frame @@ -223,7 +223,7 @@ False start 0 - Te_xt: + Te_xt: True indication @@ -238,7 +238,7 @@ False start 0 - N_ame: + N_ame: True name @@ -280,7 +280,7 @@ True False - F_orm: + F_orm: True form @@ -306,7 +306,7 @@ True True True - Events + Events 3 @@ -344,7 +344,7 @@ True False - Further Settings + Further Settings diff --git a/cui/uiconfig/ui/hyphenate.ui b/cui/uiconfig/ui/hyphenate.ui index 3239594886d3..3db83fd262e3 100644 --- a/cui/uiconfig/ui/hyphenate.ui +++ b/cui/uiconfig/ui/hyphenate.ui @@ -1,6 +1,6 @@ - + @@ -16,7 +16,7 @@ False 6 - Hyphenation + Hyphenation False dialog @@ -45,7 +45,7 @@ - Hyphenate All + Hyphenate All True True True @@ -95,7 +95,7 @@ start - Hyphenate + Hyphenate True True True @@ -109,7 +109,7 @@ - Skip + Skip True True True @@ -145,7 +145,7 @@ True False 0 - Word: + Word: True diff --git a/cui/uiconfig/ui/iconchangedialog.ui b/cui/uiconfig/ui/iconchangedialog.ui index 8cad637912e9..4cb96211834b 100644 --- a/cui/uiconfig/ui/iconchangedialog.ui +++ b/cui/uiconfig/ui/iconchangedialog.ui @@ -1,13 +1,13 @@ - + False True True 6 - %PRODUCTNAME %PRODUCTVERSION + %PRODUCTNAME %PRODUCTVERSION False dialog @@ -72,7 +72,7 @@ start 0 0 - The files listed below could not be imported. + The files listed below could not be imported. The file format could not be interpreted. diff --git a/cui/uiconfig/ui/iconselectordialog.ui b/cui/uiconfig/ui/iconselectordialog.ui index 498e42ad3322..2b7e21f49eb0 100644 --- a/cui/uiconfig/ui/iconselectordialog.ui +++ b/cui/uiconfig/ui/iconselectordialog.ui @@ -1,13 +1,13 @@ - + False True True 6 - Change Icon + Change Icon False dialog @@ -122,7 +122,7 @@ True False - _Icons + _Icons True @@ -145,7 +145,7 @@ start - I_mport... + I_mport... False True True @@ -160,7 +160,7 @@ - _Delete... + _Delete... False True True @@ -194,7 +194,7 @@ start 0 0 - Note: + Note: The size of an icon should be 16x16 pixel to achieve best quality. Different sized icons will be scaled automatically. True diff --git a/cui/uiconfig/ui/insertfloatingframe.ui b/cui/uiconfig/ui/insertfloatingframe.ui index b2b617971347..fdc3e87aa74e 100644 --- a/cui/uiconfig/ui/insertfloatingframe.ui +++ b/cui/uiconfig/ui/insertfloatingframe.ui @@ -1,6 +1,6 @@ - + 99 @@ -10,7 +10,7 @@ False 6 - Floating Frame Properties + Floating Frame Properties dialog @@ -62,7 +62,7 @@ False start 12 - Name: + Name: 0 @@ -75,7 +75,7 @@ False start 12 - Contents: + Contents: 0 @@ -84,7 +84,7 @@ - Browse... + Browse... True True True @@ -127,7 +127,7 @@ 6 - On + On True True False @@ -144,7 +144,7 @@ - Off + Off True True False @@ -160,7 +160,7 @@ - Automatic + Automatic True True False @@ -182,7 +182,7 @@ True False - Scroll Bar + Scroll Bar @@ -215,7 +215,7 @@ 6 - On + On True True False @@ -232,7 +232,7 @@ - Off + Off True True False @@ -257,7 +257,7 @@ True False - Border + Border @@ -294,7 +294,7 @@ False 12 0 - Width: + Width: 0 @@ -307,7 +307,7 @@ False 12 0 - Height: + Height: 0 @@ -342,7 +342,7 @@ - Default + Default True True False @@ -356,7 +356,7 @@ - Default + Default True True False @@ -376,7 +376,7 @@ True False - Spacing to Contents + Spacing to Contents diff --git a/cui/uiconfig/ui/insertoleobject.ui b/cui/uiconfig/ui/insertoleobject.ui index 1aaeecb9319a..a10b6e6c0375 100644 --- a/cui/uiconfig/ui/insertoleobject.ui +++ b/cui/uiconfig/ui/insertoleobject.ui @@ -1,11 +1,11 @@ - + False 6 - Insert OLE Object + Insert OLE Object dialog @@ -83,7 +83,7 @@ True - Create new + Create new True True False @@ -99,7 +99,7 @@ - Create from file + Create from file True True False @@ -148,7 +148,7 @@ True False - Object Type + Object Type @@ -194,7 +194,7 @@ - Search… + Search… True True True @@ -207,7 +207,7 @@ - Link to file + Link to file True True False @@ -221,7 +221,7 @@ - Display as icon + Display as icon True True False @@ -242,7 +242,7 @@ True False - File + File diff --git a/cui/uiconfig/ui/insertrowcolumn.ui b/cui/uiconfig/ui/insertrowcolumn.ui index d2d06dabee29..9ac093790916 100644 --- a/cui/uiconfig/ui/insertrowcolumn.ui +++ b/cui/uiconfig/ui/insertrowcolumn.ui @@ -1,6 +1,6 @@ - + 1 @@ -12,7 +12,7 @@ False 6 - Insert Row + Insert Row False dialog @@ -103,7 +103,7 @@ True False - _Number: + _Number: True insert_number @@ -135,7 +135,7 @@ True False - Insert + Insert @@ -166,7 +166,7 @@ 6 - _Before + _Before True True False @@ -184,7 +184,7 @@ - A_fter + A_fter True True False @@ -207,7 +207,7 @@ True False - Position + Position diff --git a/cui/uiconfig/ui/javaclasspathdialog.ui b/cui/uiconfig/ui/javaclasspathdialog.ui index a15c48bb23a0..d4b9689cda7c 100644 --- a/cui/uiconfig/ui/javaclasspathdialog.ui +++ b/cui/uiconfig/ui/javaclasspathdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Class Path + Class Path False dialog @@ -90,7 +90,7 @@ True False 0 - A_ssigned folders and archives + A_ssigned folders and archives True paths:border @@ -141,7 +141,7 @@ 12 - _Add Archive... + _Add Archive... True True True @@ -155,7 +155,7 @@ - Add _Folder + Add _Folder True True True @@ -169,7 +169,7 @@ - _Remove + _Remove True True True diff --git a/cui/uiconfig/ui/javastartparametersdialog.ui b/cui/uiconfig/ui/javastartparametersdialog.ui index bba3f96c4607..b8aa224c4558 100644 --- a/cui/uiconfig/ui/javastartparametersdialog.ui +++ b/cui/uiconfig/ui/javastartparametersdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Java Start Parameters + Java Start Parameters dialog @@ -91,7 +91,7 @@ True False 0 - Java start _parameter + Java start _parameter True parameterfield @@ -117,7 +117,7 @@ True False 0 - Assig_ned start parameters + Assig_ned start parameters True assignlist:border @@ -156,7 +156,7 @@ True False 0 - For example: -Dmyprop=c:\\program files\\java + For example: -Dmyprop=c:\\program files\\java 0 @@ -165,7 +165,7 @@ - _Add + _Add True True True @@ -185,7 +185,7 @@ vertical - _Edit + _Edit True True True @@ -200,7 +200,7 @@ - _Remove + _Remove True True True diff --git a/cui/uiconfig/ui/linedialog.ui b/cui/uiconfig/ui/linedialog.ui index 1df67bd19774..f834c37a1847 100644 --- a/cui/uiconfig/ui/linedialog.ui +++ b/cui/uiconfig/ui/linedialog.ui @@ -1,11 +1,11 @@ - + False 6 - Line + Line False dialog @@ -97,7 +97,7 @@ True False - Line + Line False @@ -110,7 +110,7 @@ True False - Shadow + Shadow 1 @@ -124,7 +124,7 @@ True False - Line Styles + Line Styles 2 @@ -138,7 +138,7 @@ True False - Arrow Styles + Arrow Styles 3 diff --git a/cui/uiconfig/ui/lineendstabpage.ui b/cui/uiconfig/ui/lineendstabpage.ui index 00bcec8e924f..cda3a5af7438 100644 --- a/cui/uiconfig/ui/lineendstabpage.ui +++ b/cui/uiconfig/ui/lineendstabpage.ui @@ -1,5 +1,5 @@ - + @@ -46,7 +46,7 @@ True False 0 - _Title: + _Title: True EDT_NAME @@ -62,7 +62,7 @@ True False 0 - Arrow _style: + Arrow _style: True @@ -108,7 +108,7 @@ end True 0 - Add a selected object to create new arrow styles. + Add a selected object to create new arrow styles. 0 @@ -149,7 +149,7 @@ - _Modify + _Modify True False True @@ -187,7 +187,7 @@ True True True - Load arrow styles + Load arrow styles center True image1 @@ -205,7 +205,7 @@ True True True - Save arrow styles + Save arrow styles center True image2 @@ -273,7 +273,7 @@ True False 0 - Organize Arrow Styles + Organize Arrow Styles diff --git a/cui/uiconfig/ui/linestyletabpage.ui b/cui/uiconfig/ui/linestyletabpage.ui index ee3e2b5029b3..4eb56a19fba0 100644 --- a/cui/uiconfig/ui/linestyletabpage.ui +++ b/cui/uiconfig/ui/linestyletabpage.ui @@ -1,5 +1,5 @@ - + @@ -31,11 +31,11 @@ - Dots + Dots 0 - Dash + Dash 0 @@ -89,7 +89,7 @@ True False 0 - Line _style: + Line _style: True @@ -127,7 +127,7 @@ True False 0 - _Type: + _Type: True LB_TYPE_1 @@ -143,7 +143,7 @@ True False 0 - _Number: + _Number: True NUM_FLD_1 @@ -159,7 +159,7 @@ True False 0 - _Length: + _Length: True MTR_FLD_LENGTH_1:0.00cm @@ -175,7 +175,7 @@ True False 0 - _Spacing: + _Spacing: True MTR_FLD_DISTANCE:0.00cm @@ -188,7 +188,7 @@ - _Fit to line width + _Fit to line width True False False @@ -351,7 +351,7 @@ - _Modify + _Modify True False True @@ -389,7 +389,7 @@ True True True - Load Line Styles + Load Line Styles center True image1 @@ -407,7 +407,7 @@ True True True - Save Line Styles + Save Line Styles center True image2 @@ -462,7 +462,7 @@ True False 0 - Properties + Properties diff --git a/cui/uiconfig/ui/linetabpage.ui b/cui/uiconfig/ui/linetabpage.ui index 26dd4db2b166..9b7893219710 100644 --- a/cui/uiconfig/ui/linetabpage.ui +++ b/cui/uiconfig/ui/linetabpage.ui @@ -1,6 +1,6 @@ - + @@ -27,15 +27,15 @@ - Flat + Flat 0 - Round + Round 1 - Square + Square 2 @@ -49,19 +49,19 @@ - Rounded + Rounded 0 - - none - + - none - 1 - Mitered + Mitered 2 - Beveled + Beveled 3 @@ -106,7 +106,7 @@ True False 0 - _Style: + _Style: True LB_LINE_STYLE @@ -145,7 +145,7 @@ True False 0 - Colo_r: + Colo_r: True LB_COLOR @@ -183,7 +183,7 @@ True False 0 - _Width: + _Width: True MTR_FLD_LINE_WIDTH:0cm @@ -225,7 +225,7 @@ True False 0 - _Transparency: + _Transparency: True MTR_LINE_TRANSPARENT:0% @@ -264,7 +264,7 @@ True False - Line Properties + Line Properties @@ -312,7 +312,7 @@ True False 0 - Start st_yle: + Start st_yle: True LB_START_STYLE @@ -352,7 +352,7 @@ True False 0 - End sty_le: + End sty_le: True LB_END_STYLE @@ -374,7 +374,7 @@ True False 0 - Wi_dth: + Wi_dth: True MTR_FLD_START_WIDTH:0cm @@ -401,7 +401,7 @@ - Ce_nter + Ce_nter True False False @@ -435,7 +435,7 @@ True False 0 - W_idth: + W_idth: True MTR_FLD_END_WIDTH:0cm @@ -462,7 +462,7 @@ - C_enter + C_enter True False False @@ -494,7 +494,7 @@ - Synchroni_ze ends + Synchroni_ze ends True False False @@ -516,7 +516,7 @@ True False - Arrow Styles + Arrow Styles @@ -552,7 +552,7 @@ True False 0 - _Corner style: + _Corner style: True LB_EDGE_STYLE @@ -568,7 +568,7 @@ True False 0 - Ca_p style: + Ca_p style: True LB_CAP_STYLE @@ -613,7 +613,7 @@ True False - Corner and Cap Styles + Corner and Cap Styles @@ -646,7 +646,7 @@ 6 - Select... + Select... True False True @@ -668,7 +668,7 @@ True False 0 - Widt_h: + Widt_h: True MF_SYMBOL_WIDTH:0cm @@ -696,7 +696,7 @@ - _Keep ratio + _Keep ratio True False False @@ -716,7 +716,7 @@ True False 0 - Hei_ght: + Hei_ght: True @@ -756,7 +756,7 @@ True False - Icon + Icon @@ -795,7 +795,7 @@ False - Example + Example @@ -821,7 +821,7 @@ True False - _No Symbol + _No Symbol True @@ -829,7 +829,7 @@ True False - _Automatic + _Automatic True @@ -837,7 +837,7 @@ True False - _From file... + _From file... True @@ -845,7 +845,7 @@ True False - _Gallery + _Gallery True @@ -853,7 +853,7 @@ True False - _Symbols + _Symbols True diff --git a/cui/uiconfig/ui/macroassigndialog.ui b/cui/uiconfig/ui/macroassigndialog.ui index 5e13ca6ea559..8dcc8532bd58 100644 --- a/cui/uiconfig/ui/macroassigndialog.ui +++ b/cui/uiconfig/ui/macroassigndialog.ui @@ -1,11 +1,11 @@ - + False 6 - Assign Action + Assign Action False dialog diff --git a/cui/uiconfig/ui/macroassignpage.ui b/cui/uiconfig/ui/macroassignpage.ui index a7a02307130b..4bd104716608 100644 --- a/cui/uiconfig/ui/macroassignpage.ui +++ b/cui/uiconfig/ui/macroassignpage.ui @@ -1,6 +1,6 @@ - + @@ -54,7 +54,7 @@ True False - Event + Event 0 @@ -67,7 +67,7 @@ True False - Assigned Action + Assigned Action 1 @@ -92,7 +92,7 @@ True False - Assignments + Assignments @@ -127,7 +127,7 @@ start - M_acro... + M_acro... True True True @@ -141,7 +141,7 @@ - Com_ponent... + Com_ponent... True True True @@ -155,7 +155,7 @@ - Remove + Remove True True True @@ -213,7 +213,7 @@ True False - Assign + Assign diff --git a/cui/uiconfig/ui/macroselectordialog.ui b/cui/uiconfig/ui/macroselectordialog.ui index 476b526ffef4..0d9db625a4b1 100644 --- a/cui/uiconfig/ui/macroselectordialog.ui +++ b/cui/uiconfig/ui/macroselectordialog.ui @@ -1,11 +1,11 @@ - + False 6 - Macro Selector + Macro Selector dialog @@ -34,7 +34,7 @@ - Add + Add True True True @@ -111,7 +111,7 @@ True True 0 - Select the library that contains the macro you want. Then select the macro under 'Macro name'. + Select the library that contains the macro you want. Then select the macro under 'Macro name'. True 60 @@ -127,7 +127,7 @@ True True 0 - To add a command to a toolbar, select the category and then the command. Then drag the command to the Commands list of the Toolbars tab page in the Customize dialog. + To add a command to a toolbar, select the category and then the command. Then drag the command to the Commands list of the Toolbars tab page in the Customize dialog. True 60 @@ -181,7 +181,7 @@ True False - Library + Library @@ -196,7 +196,7 @@ True False - Category + Category @@ -253,7 +253,7 @@ True False - Macro Name + Macro Name False @@ -269,7 +269,7 @@ True False - Commands + Commands False @@ -338,7 +338,7 @@ True False - Description + Description diff --git a/cui/uiconfig/ui/menuassignpage.ui b/cui/uiconfig/ui/menuassignpage.ui index 435a33e9737a..1213719c2f3c 100644 --- a/cui/uiconfig/ui/menuassignpage.ui +++ b/cui/uiconfig/ui/menuassignpage.ui @@ -1,6 +1,6 @@ - + True @@ -9,7 +9,7 @@ True False - Rename... + Rename... True @@ -17,7 +17,7 @@ True False - Restore Default Command + Restore Default Command True @@ -31,7 +31,7 @@ True False - Change Icon... + Change Icon... True @@ -39,7 +39,7 @@ True False - Reset Icon + Reset Icon True @@ -89,7 +89,7 @@ True False - Menu + Menu True toplevellist 0 @@ -117,7 +117,7 @@ False 6 6 - Style + Style True toplevellist 0 @@ -137,7 +137,7 @@ True - Icons & Text + Icons & Text True True False @@ -156,7 +156,7 @@ - Icons + Icons True True False @@ -172,7 +172,7 @@ - Text + Text True True False @@ -208,7 +208,7 @@ start - New... + New... True True True @@ -222,7 +222,7 @@ - Menu + Menu True True True @@ -247,7 +247,7 @@ True False - %PRODUCTNAME %MODULENAME Menus + %PRODUCTNAME %MODULENAME Menus @@ -306,7 +306,7 @@ True False - _Save In + _Save In True savein 0 @@ -321,7 +321,7 @@ True False start - Entries + Entries True entries 0 @@ -426,7 +426,7 @@ start - Reset + Reset True True True @@ -454,7 +454,7 @@ start - Modify + Modify True True True @@ -467,7 +467,7 @@ - Remove + Remove True True True @@ -495,7 +495,7 @@ start - Add Command + Add Command True True True @@ -509,7 +509,7 @@ - Add Separator + Add Separator True True True @@ -523,7 +523,7 @@ - Add Submenu + Add Submenu True True True @@ -555,7 +555,7 @@ True False - Menu Content + Menu Content @@ -602,7 +602,7 @@ True False - _Description + _Description True @@ -642,7 +642,7 @@ True False - Move... + Move... True @@ -650,7 +650,7 @@ True False - Rename... + Rename... True @@ -664,7 +664,7 @@ True False - Delete... + Delete... True @@ -676,14 +676,14 @@ True False - Rename... + Rename... True False - Delete + Delete @@ -694,7 +694,7 @@ True False - Rename... + Rename... True diff --git a/cui/uiconfig/ui/messbox.ui b/cui/uiconfig/ui/messbox.ui index 29913a9a2654..6e9120c4df3d 100644 --- a/cui/uiconfig/ui/messbox.ui +++ b/cui/uiconfig/ui/messbox.ui @@ -1,6 +1,6 @@ - + False diff --git a/cui/uiconfig/ui/mosaicdialog.ui b/cui/uiconfig/ui/mosaicdialog.ui index b29991b26590..ac7714c486eb 100644 --- a/cui/uiconfig/ui/mosaicdialog.ui +++ b/cui/uiconfig/ui/mosaicdialog.ui @@ -1,6 +1,6 @@ - + @@ -13,7 +13,7 @@ False 6 - Mosaic + Mosaic False dialog @@ -141,7 +141,7 @@ True False 0 - _Width: + _Width: True width:px @@ -165,7 +165,7 @@ True True - 2 + 2 adjustment1 2 @@ -179,7 +179,7 @@ True False 0 - _Height: + _Height: True height:px @@ -196,7 +196,7 @@ - E_nhance edges + E_nhance edges True True False @@ -223,7 +223,7 @@ True False - Parameters + Parameters diff --git a/cui/uiconfig/ui/movemenu.ui b/cui/uiconfig/ui/movemenu.ui index d6533a42377e..dee4c288d53c 100644 --- a/cui/uiconfig/ui/movemenu.ui +++ b/cui/uiconfig/ui/movemenu.ui @@ -1,6 +1,6 @@ - + @@ -16,7 +16,7 @@ False 6 - New Menu + New Menu dialog @@ -100,7 +100,7 @@ True False 0 - Menu name: + Menu name: True menuname @@ -194,7 +194,7 @@ True False 0 - Menu _position: + Menu _position: True @@ -241,7 +241,7 @@ image1 - Up + Up @@ -259,7 +259,7 @@ image2 - Down + Down diff --git a/cui/uiconfig/ui/multipathdialog.ui b/cui/uiconfig/ui/multipathdialog.ui index 6a0322385eea..616d37720961 100644 --- a/cui/uiconfig/ui/multipathdialog.ui +++ b/cui/uiconfig/ui/multipathdialog.ui @@ -1,12 +1,12 @@ - + False 6 - Select Paths + Select Paths False normal @@ -104,7 +104,7 @@ start - _Add... + _Add... True True True @@ -161,7 +161,7 @@ False True 0 - Path list: + Path list: 0 @@ -182,7 +182,7 @@ True False - Mark the Default Path for New Files + Mark the Default Path for New Files diff --git a/cui/uiconfig/ui/namedialog.ui b/cui/uiconfig/ui/namedialog.ui index 541b795f1a8a..7a221cef9c74 100644 --- a/cui/uiconfig/ui/namedialog.ui +++ b/cui/uiconfig/ui/namedialog.ui @@ -1,11 +1,11 @@ - + False 6 - Name + Name dialog diff --git a/cui/uiconfig/ui/newlibdialog.ui b/cui/uiconfig/ui/newlibdialog.ui index 7b284317acc4..79d42644d729 100644 --- a/cui/uiconfig/ui/newlibdialog.ui +++ b/cui/uiconfig/ui/newlibdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Create Library + Create Library dialog @@ -25,7 +25,7 @@ True False 0 - Enter the name for the new library. + Enter the name for the new library. True entry @@ -54,7 +54,7 @@ False True 0 - Enter the name for the new macro. + Enter the name for the new macro. True entry @@ -70,7 +70,7 @@ False True 0 - Enter the new name for the selected object. + Enter the new name for the selected object. True entry @@ -85,7 +85,7 @@ False True - Create Macro + Create Macro True @@ -99,7 +99,7 @@ False True - Rename + Rename True diff --git a/cui/uiconfig/ui/newtabledialog.ui b/cui/uiconfig/ui/newtabledialog.ui index bddbd31a3ba9..a7448651e965 100644 --- a/cui/uiconfig/ui/newtabledialog.ui +++ b/cui/uiconfig/ui/newtabledialog.ui @@ -1,6 +1,6 @@ - + 1 @@ -19,7 +19,7 @@ False 6 - Insert Table + Insert Table dialog @@ -96,7 +96,7 @@ False True 0 - _Number of columns: + _Number of columns: True columns @@ -113,7 +113,7 @@ False True 0 - _Number of rows: + _Number of rows: True rows diff --git a/cui/uiconfig/ui/newtoolbardialog.ui b/cui/uiconfig/ui/newtoolbardialog.ui index 5c617436ed57..815776afe986 100644 --- a/cui/uiconfig/ui/newtoolbardialog.ui +++ b/cui/uiconfig/ui/newtoolbardialog.ui @@ -1,11 +1,11 @@ - + False 6 - Name + Name True dialog @@ -90,7 +90,7 @@ True False 0 - _Toolbar name: + _Toolbar name: True edit @@ -131,7 +131,7 @@ True False 0 - _Save in: + _Save in: True savein diff --git a/cui/uiconfig/ui/numberingformatpage.ui b/cui/uiconfig/ui/numberingformatpage.ui index a6250aa4141a..90fde3e53a8e 100644 --- a/cui/uiconfig/ui/numberingformatpage.ui +++ b/cui/uiconfig/ui/numberingformatpage.ui @@ -1,6 +1,6 @@ - + @@ -35,37 +35,37 @@ - All + All - User-defined + User-defined - Number + Number - Percent + Percent - Currency + Currency - Date + Date - Time + Time - Scientific + Scientific - Fraction + Fraction - Boolean Value + Boolean Value - Text + Text @@ -76,7 +76,7 @@ - Automatically + Automatically @@ -123,7 +123,7 @@ True True True - Add + Add center image2 @@ -138,7 +138,7 @@ True True True - Edit Comment + Edit Comment center image3 @@ -153,7 +153,7 @@ True True True - Remove + Remove center image1 @@ -194,7 +194,7 @@ True False - _Format code + _Format code True formatted @@ -290,7 +290,7 @@ True False 1 - _Decimal places: + _Decimal places: True decimalsed @@ -305,7 +305,7 @@ False False 1 - Den_ominator places: + Den_ominator places: True denominatored @@ -326,7 +326,7 @@ True False 1 - Leading _zeroes: + Leading _zeroes: True leadzerosed @@ -337,7 +337,7 @@ - _Negative numbers red + _Negative numbers red True True False @@ -359,7 +359,7 @@ 6 - _Thousands separator + _Thousands separator True True False @@ -375,7 +375,7 @@ - _Engineering notation + _Engineering notation False True False @@ -403,7 +403,7 @@ True False - Options + Options @@ -460,7 +460,7 @@ True False - C_ategory + C_ategory True categorylb:border @@ -533,7 +533,7 @@ True False - Fo_rmat + Fo_rmat True formatlb:border @@ -593,7 +593,7 @@ - So_urce format + So_urce format True False True @@ -614,7 +614,7 @@ True False - _Language + _Language True languagelb diff --git a/cui/uiconfig/ui/numberingoptionspage.ui b/cui/uiconfig/ui/numberingoptionspage.ui index 0e18b19e74ab..36c369f46dcc 100644 --- a/cui/uiconfig/ui/numberingoptionspage.ui +++ b/cui/uiconfig/ui/numberingoptionspage.ui @@ -1,6 +1,6 @@ - + 19.989999999999998 @@ -61,7 +61,7 @@ True False - Level + Level @@ -107,7 +107,7 @@ True False - Number: + Number: True numfmtlb 1 @@ -156,7 +156,7 @@ True False - Start at: + Start at: True startat 1 @@ -180,7 +180,7 @@ True False - Graphics: + Graphics: True bitmap:bitmapmenu 1 @@ -194,7 +194,7 @@ True False - Width: + Width: True widthmf:0.00cm 1 @@ -221,7 +221,7 @@ True False - Height: + Height: True heightmf:0.00cm end @@ -247,7 +247,7 @@ - Keep ratio + Keep ratio True True False @@ -263,7 +263,7 @@ True False - Alignment: + Alignment: True orientlb 1 @@ -278,15 +278,15 @@ True False - Top of baseline - Center of baseline - Bottom of baseline - Top of character - Center of character - Bottom of character - Top of line - Center of line - Bottom of line + Top of baseline + Center of baseline + Bottom of baseline + Top of character + Center of character + Bottom of character + Top of line + Center of line + Bottom of line @@ -296,7 +296,7 @@ - Select... + Select... True True True @@ -333,9 +333,9 @@ True False - Left - Centered - Right + Left + Centered + Right @@ -345,7 +345,7 @@ - Select... + Select... True True True @@ -364,7 +364,7 @@ True False - Before: + Before: True prefix 1 @@ -385,7 +385,7 @@ True False - Separator + Separator 1 @@ -421,7 +421,7 @@ True False - After: + After: True suffix 1 @@ -435,7 +435,7 @@ True False - Show sublevels: + Show sublevels: True sublevels end @@ -450,7 +450,7 @@ True False - Character: + Character: True bullet 1 @@ -464,7 +464,7 @@ True False - _Relative size: + _Relative size: True relsize:0% 1 @@ -478,7 +478,7 @@ True False - Color: + Color: True color 1 @@ -492,7 +492,7 @@ True False - Character style: + Character style: True charstyle 1 @@ -506,7 +506,7 @@ True False - _Alignment: + _Alignment: True numalign 1 @@ -550,7 +550,7 @@ True False - Numbering + Numbering @@ -577,7 +577,7 @@ 12 - _Consecutive numbering + _Consecutive numbering True True False @@ -593,7 +593,7 @@ True False - All Levels + All Levels @@ -621,7 +621,7 @@ True False - From file... + From file... True @@ -629,7 +629,7 @@ True False - Gallery + Gallery True diff --git a/cui/uiconfig/ui/numberingpositionpage.ui b/cui/uiconfig/ui/numberingpositionpage.ui index 9f08ba2e6480..aaed61012926 100644 --- a/cui/uiconfig/ui/numberingpositionpage.ui +++ b/cui/uiconfig/ui/numberingpositionpage.ui @@ -1,6 +1,6 @@ - + 19.989999999999998 @@ -20,13 +20,13 @@ - Left + Left - Centered + Centered - Right + Right @@ -37,13 +37,13 @@ - Tab stop + Tab stop - Space + Space - Nothing + Nothing @@ -85,7 +85,7 @@ True False - Level + Level @@ -136,7 +136,7 @@ False True 1 - Numbering followed by: + Numbering followed by: True numfollowedbylb @@ -150,7 +150,7 @@ True False 1 - N_umbering alignment: + N_umbering alignment: True num2alignlb @@ -164,7 +164,7 @@ True False 1 - Aligned at: + Aligned at: True alignedatmf:0.00cm @@ -178,7 +178,7 @@ True False 1 - Indent at: + Indent at: True indentatmf:0.00cm @@ -214,7 +214,7 @@ True False 1 - Tab stop at: + Tab stop at: True atmf:0.00cm @@ -263,7 +263,7 @@ True False 1 - Indent: + Indent: True indentmf:0.00cm @@ -287,7 +287,7 @@ - Relati_ve + Relati_ve True True False @@ -307,7 +307,7 @@ True False 1 - Width of numbering: + Width of numbering: True numberingwidthmf:0.00cm @@ -347,7 +347,7 @@ True False 1 - Minimum space between + Minimum space between numbering and text: True right @@ -363,7 +363,7 @@ numbering and text: True False 1 - N_umbering alignment: + N_umbering alignment: True numalignlb @@ -391,7 +391,7 @@ numbering and text: True False - Position and Spacing + Position and Spacing @@ -413,7 +413,7 @@ numbering and text: 12 - Default + Default True True True diff --git a/cui/uiconfig/ui/objectnamedialog.ui b/cui/uiconfig/ui/objectnamedialog.ui index d5da22a35554..dd1cb4f7a05a 100644 --- a/cui/uiconfig/ui/objectnamedialog.ui +++ b/cui/uiconfig/ui/objectnamedialog.ui @@ -1,11 +1,11 @@ - + False 6 - Name + Name dialog @@ -80,7 +80,7 @@ True False 0 - _Name: + _Name: True object_name_entry diff --git a/cui/uiconfig/ui/objecttitledescdialog.ui b/cui/uiconfig/ui/objecttitledescdialog.ui index fdf781124280..797394ef6555 100644 --- a/cui/uiconfig/ui/objecttitledescdialog.ui +++ b/cui/uiconfig/ui/objecttitledescdialog.ui @@ -1,6 +1,6 @@ - + @@ -12,7 +12,7 @@ False 6 - Description + Description dialog @@ -87,7 +87,7 @@ True False 0 - _Title: + _Title: True object_title_entry @@ -115,7 +115,7 @@ True False 0 - _Description: + _Description: True diff --git a/cui/uiconfig/ui/optaccessibilitypage.ui b/cui/uiconfig/ui/optaccessibilitypage.ui index faacf845ff52..182d54d359ab 100644 --- a/cui/uiconfig/ui/optaccessibilitypage.ui +++ b/cui/uiconfig/ui/optaccessibilitypage.ui @@ -1,6 +1,6 @@ - + True @@ -28,7 +28,7 @@ 6 - Support _assistive technology tools (program restart required) + Support _assistive technology tools (program restart required) True True False @@ -44,7 +44,7 @@ - Use te_xt selection cursor in read-only text documents + Use te_xt selection cursor in read-only text documents True True False @@ -60,7 +60,7 @@ - Allow animated _images + Allow animated _images True True False @@ -76,7 +76,7 @@ - Allow animated _text + Allow animated _text True True False @@ -98,7 +98,7 @@ True False - Miscellaneous Options + Miscellaneous Options @@ -131,7 +131,7 @@ 6 - Automatically _detect high contrast mode of operating system + Automatically _detect high contrast mode of operating system True True False @@ -147,7 +147,7 @@ - Use automatic font _color for screen display + Use automatic font _color for screen display True True False @@ -163,7 +163,7 @@ - _Use system colors for page previews + _Use system colors for page previews True True False @@ -185,7 +185,7 @@ True False - Options for High Contrast Appearance + Options for High Contrast Appearance diff --git a/cui/uiconfig/ui/optadvancedpage.ui b/cui/uiconfig/ui/optadvancedpage.ui index eac60789eab1..c8ec75c5880f 100644 --- a/cui/uiconfig/ui/optadvancedpage.ui +++ b/cui/uiconfig/ui/optadvancedpage.ui @@ -1,6 +1,6 @@ - + @@ -35,7 +35,7 @@ 6 - _Use a Java runtime environment + _Use a Java runtime environment True True False @@ -69,7 +69,7 @@ True False start - _Java runtime environments (JRE) already installed: + _Java runtime environments (JRE) already installed: True javas @@ -95,7 +95,7 @@ start - _Add... + _Add... True True True @@ -109,7 +109,7 @@ - _Parameters... + _Parameters... True True True @@ -123,7 +123,7 @@ - _Class Path... + _Class Path... True True True @@ -156,7 +156,7 @@ True False - Vendor + Vendor 0 @@ -168,7 +168,7 @@ True False - Version + Version 0 @@ -180,7 +180,7 @@ True False - Features + Features 0 @@ -192,7 +192,7 @@ True False - with accessibility support + with accessibility support 1 @@ -203,7 +203,7 @@ True False - Select a Java Runtime Environment + Select a Java Runtime Environment 2 @@ -251,7 +251,7 @@ True False - Location: + Location: 0 @@ -277,7 +277,7 @@ True False - Java Options + Java Options @@ -312,7 +312,7 @@ 6 - Enable experimental features (may be unstable) + Enable experimental features (may be unstable) True True False @@ -327,7 +327,7 @@ - Enable macro recording (may be limited) + Enable macro recording (may be limited) True True False @@ -341,7 +341,7 @@ - Open Expert Configuration + Open Expert Configuration True True True @@ -361,7 +361,7 @@ True False - Optional Features + Optional Features diff --git a/cui/uiconfig/ui/optappearancepage.ui b/cui/uiconfig/ui/optappearancepage.ui index f3d602857e15..7dad23e72945 100644 --- a/cui/uiconfig/ui/optappearancepage.ui +++ b/cui/uiconfig/ui/optappearancepage.ui @@ -1,6 +1,6 @@ - + True @@ -32,7 +32,7 @@ True False - _Scheme: + _Scheme: True colorschemelb @@ -85,7 +85,7 @@ True False - Color Scheme + Color Scheme @@ -130,7 +130,7 @@ 250 False True - User interface elements + User interface elements 1 @@ -142,7 +142,7 @@ 150 False True - Color setting + Color setting 2 @@ -154,7 +154,7 @@ 100 False True - Preview + Preview 3 @@ -165,7 +165,7 @@ False True - On + On 0 @@ -198,7 +198,7 @@ True False - Custom Colors + Custom Colors diff --git a/cui/uiconfig/ui/optasianpage.ui b/cui/uiconfig/ui/optasianpage.ui index 79f7e4848251..3016fa00a54e 100644 --- a/cui/uiconfig/ui/optasianpage.ui +++ b/cui/uiconfig/ui/optasianpage.ui @@ -1,6 +1,6 @@ - + @@ -28,7 +28,7 @@ 6 - _Western text only + _Western text only True True False @@ -46,7 +46,7 @@ - Western _text and Asian punctuation + Western _text and Asian punctuation True True False @@ -70,7 +70,7 @@ True False - Kerning + Kerning @@ -102,7 +102,7 @@ 6 - _No compression + _No compression True True False @@ -120,7 +120,7 @@ - _Compress punctuation only + _Compress punctuation only True True False @@ -138,7 +138,7 @@ - Compress punctuation and Japanese Kana + Compress punctuation and Japanese Kana True True False @@ -162,7 +162,7 @@ True False - Character Spacing + Character Spacing @@ -223,7 +223,7 @@ - _Default + _Default True True False @@ -248,7 +248,7 @@ True False 0 - _Language: + _Language: True language @@ -262,7 +262,7 @@ True False 0 - Not _at start of line: + Not _at start of line: True start @@ -276,7 +276,7 @@ True False 0 - Not at _end of line: + Not at _end of line: True end @@ -321,7 +321,7 @@ True False 0 - Without user-defined line break symbols + Without user-defined line break symbols False @@ -337,7 +337,7 @@ True False - First and Last Characters + First and Last Characters diff --git a/cui/uiconfig/ui/optbasicidepage.ui b/cui/uiconfig/ui/optbasicidepage.ui index 90ea4c88ba55..70af9886d9dd 100644 --- a/cui/uiconfig/ui/optbasicidepage.ui +++ b/cui/uiconfig/ui/optbasicidepage.ui @@ -1,6 +1,6 @@ - + True @@ -26,7 +26,7 @@ False - Enable code completion + Enable code completion True True False @@ -46,7 +46,7 @@ True False - Code Completion + Code Completion @@ -78,7 +78,7 @@ 6 - Autoclose procedures + Autoclose procedures True True False @@ -92,7 +92,7 @@ - Autoclose parenthesis + Autoclose parenthesis True True False @@ -106,7 +106,7 @@ - Autoclose quotes + Autoclose quotes True True False @@ -120,7 +120,7 @@ - Autocorrection + Autocorrection True True False @@ -141,7 +141,7 @@ True False - Code Suggestion + Code Suggestion @@ -173,7 +173,7 @@ 6 - Use extended types + Use extended types True True False @@ -193,7 +193,7 @@ True False - Language Features + Language Features diff --git a/cui/uiconfig/ui/optchartcolorspage.ui b/cui/uiconfig/ui/optchartcolorspage.ui index 3d1fc1a40b83..59bc5e744f36 100644 --- a/cui/uiconfig/ui/optchartcolorspage.ui +++ b/cui/uiconfig/ui/optchartcolorspage.ui @@ -1,5 +1,5 @@ - + @@ -39,7 +39,7 @@ True False - Chart Colors + Chart Colors @@ -125,7 +125,7 @@ - _Default + _Default True True True @@ -153,7 +153,7 @@ True False - Color Table + Color Table diff --git a/cui/uiconfig/ui/optctlpage.ui b/cui/uiconfig/ui/optctlpage.ui index b7e3d9ae1937..cb04e7f1e9c9 100644 --- a/cui/uiconfig/ui/optctlpage.ui +++ b/cui/uiconfig/ui/optctlpage.ui @@ -1,6 +1,6 @@ - + True @@ -28,7 +28,7 @@ 6 - Use se_quence checking + Use se_quence checking True True False @@ -53,7 +53,7 @@ 6 - Restricted + Restricted True True False @@ -67,7 +67,7 @@ - _Type and replace + _Type and replace True True False @@ -96,7 +96,7 @@ True False - Sequence Checking + Sequence Checking @@ -131,7 +131,7 @@ True False - Movement: + Movement: 1 @@ -141,7 +141,7 @@ - Lo_gical + Lo_gical True True False @@ -158,7 +158,7 @@ - _Visual + _Visual True True False @@ -183,7 +183,7 @@ True False - Cursor Control + Cursor Control @@ -217,7 +217,7 @@ True False - _Numerals: + _Numerals: True numerals 1 @@ -232,10 +232,10 @@ True False - Arabic (1, 2, 3…) - Eastern Arabic (٣ ,٢ ,١…) - System - Context + Arabic (1, 2, 3…) + Eastern Arabic (٣ ,٢ ,١…) + System + Context @@ -251,7 +251,7 @@ True False - General Options + General Options diff --git a/cui/uiconfig/ui/optemailpage.ui b/cui/uiconfig/ui/optemailpage.ui index 890604488538..0f1d68ede197 100644 --- a/cui/uiconfig/ui/optemailpage.ui +++ b/cui/uiconfig/ui/optemailpage.ui @@ -1,5 +1,5 @@ - + True @@ -23,7 +23,7 @@ True False - _E-mail program: + _E-mail program: True url @@ -52,7 +52,7 @@ - Browse... + Browse... False True True @@ -86,7 +86,7 @@ False True - All files + All files 0 @@ -113,7 +113,7 @@ True False 0 - Suppress hidden elements of documents + Suppress hidden elements of documents True @@ -168,7 +168,7 @@ True False - Sending Documents as E-mail Attachments + Sending Documents as E-mail Attachments diff --git a/cui/uiconfig/ui/optfltrembedpage.ui b/cui/uiconfig/ui/optfltrembedpage.ui index 4e882419054c..811ecdc990ff 100644 --- a/cui/uiconfig/ui/optfltrembedpage.ui +++ b/cui/uiconfig/ui/optfltrembedpage.ui @@ -1,5 +1,5 @@ - + @@ -49,7 +49,7 @@ True False 0 - [L]: Load and convert the object + [L]: Load and convert the object False @@ -62,7 +62,7 @@ True False 0 - [S]: Convert and save the object + [S]: Convert and save the object False @@ -78,7 +78,7 @@ True False - Embedded Objects + Embedded Objects @@ -113,7 +113,7 @@ True False - Export as: + Export as: False @@ -128,7 +128,7 @@ start - Highlighting + Highlighting True True False @@ -144,7 +144,7 @@ - Shading + Shading True True False @@ -172,7 +172,7 @@ True False - Character Highlighting + Character Highlighting diff --git a/cui/uiconfig/ui/optfltrpage.ui b/cui/uiconfig/ui/optfltrpage.ui index 3e43b457f0f3..b5b614aed852 100644 --- a/cui/uiconfig/ui/optfltrpage.ui +++ b/cui/uiconfig/ui/optfltrpage.ui @@ -1,5 +1,5 @@ - + True @@ -26,7 +26,7 @@ 6 - Load Basic _code + Load Basic _code True True False @@ -43,7 +43,7 @@ - E_xecutable code + E_xecutable code True True False @@ -61,7 +61,7 @@ - Save _original Basic code + Save _original Basic code True True False @@ -84,7 +84,7 @@ True False - Microsoft Word 97/2000/XP + Microsoft Word 97/2000/XP @@ -116,7 +116,7 @@ 6 - Lo_ad Basic code + Lo_ad Basic code True True False @@ -133,7 +133,7 @@ - E_xecutable code + E_xecutable code True True False @@ -151,7 +151,7 @@ - Sa_ve original Basic code + Sa_ve original Basic code True True False @@ -174,7 +174,7 @@ True False - Microsoft Excel 97/2000/XP + Microsoft Excel 97/2000/XP @@ -206,7 +206,7 @@ 6 - Load Ba_sic code + Load Ba_sic code True True False @@ -223,7 +223,7 @@ - Sav_e original Basic code + Sav_e original Basic code True True False @@ -246,7 +246,7 @@ True False - Microsoft PowerPoint 97/2000/XP + Microsoft PowerPoint 97/2000/XP diff --git a/cui/uiconfig/ui/optfontspage.ui b/cui/uiconfig/ui/optfontspage.ui index 99e94ade7879..a315e8277280 100644 --- a/cui/uiconfig/ui/optfontspage.ui +++ b/cui/uiconfig/ui/optfontspage.ui @@ -1,6 +1,6 @@ - + @@ -56,7 +56,7 @@ True False 0 - _Font: + _Font: True font1 @@ -70,7 +70,7 @@ True False 0 - Re_place with: + Re_place with: True font2 @@ -107,7 +107,7 @@ False True - Always + Always 0 @@ -118,7 +118,7 @@ False True - Screen only + Screen only 1 @@ -129,7 +129,7 @@ False True - Font + Font 2 @@ -140,7 +140,7 @@ False True - Replace with + Replace with 3 @@ -202,7 +202,7 @@ - _Apply replacement table + _Apply replacement table True True False @@ -224,7 +224,7 @@ True False - Replacement Table + Replacement Table @@ -263,7 +263,7 @@ False start 0 - Fon_ts: + Fon_ts: True fontname @@ -278,7 +278,7 @@ False start 0 - _Size: + _Size: True fontheight @@ -292,7 +292,7 @@ True False - Automatic + Automatic @@ -302,7 +302,7 @@ - _Non-proportional fonts only + _Non-proportional fonts only True True False @@ -338,7 +338,7 @@ True False - Font Settings for HTML, Basic and SQL Sources + Font Settings for HTML, Basic and SQL Sources diff --git a/cui/uiconfig/ui/optgeneralpage.ui b/cui/uiconfig/ui/optgeneralpage.ui index ac98e80ba79b..49d383ec4a37 100644 --- a/cui/uiconfig/ui/optgeneralpage.ui +++ b/cui/uiconfig/ui/optgeneralpage.ui @@ -1,6 +1,6 @@ - + 1583 @@ -28,7 +28,7 @@ 12 - _Extended tips + _Extended tips True True False @@ -43,7 +43,7 @@ True False - Help + Help @@ -74,7 +74,7 @@ 6 - _Use %PRODUCTNAME dialogs + _Use %PRODUCTNAME dialogs True True False @@ -108,7 +108,7 @@ True False - Open/Save Dialogs + Open/Save Dialogs @@ -134,7 +134,7 @@ 12 - Use %PRODUCTNAME _dialogs + Use %PRODUCTNAME _dialogs True True False @@ -149,7 +149,7 @@ True False - Print Dialogs + Print Dialogs @@ -175,7 +175,7 @@ 12 - _Printing sets "document modified" status + _Printing sets "document modified" status True True False @@ -190,7 +190,7 @@ True False - Document Status + Document Status @@ -223,7 +223,7 @@ True False - _Interpret as years between + _Interpret as years between True year 0 @@ -249,7 +249,7 @@ True False - and + and 2 @@ -264,7 +264,7 @@ True False - Year (Two Digits) + Year (Two Digits) @@ -290,7 +290,7 @@ 12 - Collect usage data and send it to The Document Foundation + Collect usage data and send it to The Document Foundation True True False @@ -305,7 +305,7 @@ True False - Help Improve %PRODUCTNAME + Help Improve %PRODUCTNAME diff --git a/cui/uiconfig/ui/opthtmlpage.ui b/cui/uiconfig/ui/opthtmlpage.ui index 7032b399c242..ef063d453fe4 100644 --- a/cui/uiconfig/ui/opthtmlpage.ui +++ b/cui/uiconfig/ui/opthtmlpage.ui @@ -1,6 +1,6 @@ - + @@ -87,7 +87,7 @@ True False - Size _7: + Size _7: True size7 @@ -116,7 +116,7 @@ True False - Size _6: + Size _6: True size6 @@ -145,7 +145,7 @@ True False - Size _5: + Size _5: True size5 @@ -174,7 +174,7 @@ True False - Size _4: + Size _4: True size4 @@ -203,7 +203,7 @@ True False - Size _3: + Size _3: True size3 @@ -232,7 +232,7 @@ True False - Size _2: + Size _2: True size2 @@ -261,7 +261,7 @@ True False - Size _1: + Size _1: True size1 @@ -294,7 +294,7 @@ True False - Font Sizes + Font Sizes @@ -344,7 +344,7 @@ 6 - Ignore _font settings + Ignore _font settings True True False @@ -362,7 +362,7 @@ - _Import unknown HTML tags as fields + _Import unknown HTML tags as fields True True False @@ -380,7 +380,7 @@ - _Use '%ENGLISHUSLOCALE' locale for numbers + _Use '%ENGLISHUSLOCALE' locale for numbers True True False @@ -404,7 +404,7 @@ True False - Import + Import @@ -451,7 +451,7 @@ True False 0 - Character _set: + Character _set: True charset @@ -486,7 +486,7 @@ - _Copy local images to Internet + _Copy local images to Internet True True False @@ -504,7 +504,7 @@ - _Print layout + _Print layout True True False @@ -522,7 +522,7 @@ - Display _warning + Display _warning True True False @@ -541,7 +541,7 @@ - LibreOffice _Basic + LibreOffice _Basic True True False @@ -565,7 +565,7 @@ True False - Export + Export diff --git a/cui/uiconfig/ui/optionsdialog.ui b/cui/uiconfig/ui/optionsdialog.ui index e40815bef3ed..7c1465e2c7cc 100644 --- a/cui/uiconfig/ui/optionsdialog.ui +++ b/cui/uiconfig/ui/optionsdialog.ui @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ True True 6 - Options + Options dialog diff --git a/cui/uiconfig/ui/optjsearchpage.ui b/cui/uiconfig/ui/optjsearchpage.ui index 008f2eb8c2eb..96c2773f4aaa 100644 --- a/cui/uiconfig/ui/optjsearchpage.ui +++ b/cui/uiconfig/ui/optjsearchpage.ui @@ -1,5 +1,5 @@ - + True @@ -30,7 +30,7 @@ True - _uppercase/lowercase + _uppercase/lowercase True True False @@ -47,7 +47,7 @@ - _full-width/half-width forms + _full-width/half-width forms True True False @@ -64,7 +64,7 @@ - _hiragana/katakana + _hiragana/katakana True True False @@ -81,7 +81,7 @@ - _contractions (yo-on, sokuon) + _contractions (yo-on, sokuon) True True False @@ -98,7 +98,7 @@ - _minus/dash/cho-on + _minus/dash/cho-on True True False @@ -115,7 +115,7 @@ - 're_peat character' marks + 're_peat character' marks True True False @@ -132,7 +132,7 @@ - _variant-form kanji (itaiji) + _variant-form kanji (itaiji) True True False @@ -149,7 +149,7 @@ - _old Kana forms + _old Kana forms True True False @@ -166,7 +166,7 @@ - _di/zi, du/zu + _di/zi, du/zu True True False @@ -183,7 +183,7 @@ - _ba/va, ha/fa + _ba/va, ha/fa True True False @@ -200,7 +200,7 @@ - _tsi/thi/chi, dhi/zi + _tsi/thi/chi, dhi/zi True True False @@ -217,7 +217,7 @@ - h_yu/fyu, byu/vyu + h_yu/fyu, byu/vyu True True False @@ -234,7 +234,7 @@ - _se/she, ze/je + _se/she, ze/je True True False @@ -251,7 +251,7 @@ - _ia/iya (piano/piyano) + _ia/iya (piano/piyano) True True False @@ -268,7 +268,7 @@ - _ki/ku (tekisuto/tekusuto) + _ki/ku (tekisuto/tekusuto) True True False @@ -285,7 +285,7 @@ - Prolon_ged vowels (ka-/kaa) + Prolon_ged vowels (ka-/kaa) True True False @@ -308,7 +308,7 @@ True False - Treat as Equal + Treat as Equal @@ -342,7 +342,7 @@ True - Pu_nctuation characters + Pu_nctuation characters True True False @@ -359,7 +359,7 @@ - _Whitespace characters + _Whitespace characters True True False @@ -376,7 +376,7 @@ - Midd_le dots + Midd_le dots True True False @@ -402,7 +402,7 @@ True False - Ignore + Ignore diff --git a/cui/uiconfig/ui/optlanguagespage.ui b/cui/uiconfig/ui/optlanguagespage.ui index f642c47f5473..20845a3231cd 100644 --- a/cui/uiconfig/ui/optlanguagespage.ui +++ b/cui/uiconfig/ui/optlanguagespage.ui @@ -1,6 +1,6 @@ - + @@ -34,7 +34,7 @@ True False 0 - _User interface: + _User interface: True userinterface @@ -48,7 +48,7 @@ True False 0 - Locale setting: + Locale setting: True localesetting @@ -62,7 +62,7 @@ True False 0 - Decimal separator key: + Decimal separator key: True decimalseparator @@ -76,7 +76,7 @@ True False 0 - _Default currency: + _Default currency: True currencylb @@ -90,7 +90,7 @@ True False 0 - Date acceptance _patterns: + Date acceptance _patterns: True datepatterns @@ -151,7 +151,7 @@ - _Same as locale setting ( %1 ) + _Same as locale setting ( %1 ) True True False @@ -172,7 +172,7 @@ True False - Language Of + Language Of @@ -243,7 +243,7 @@ - For the current document only + For the current document only True True False @@ -259,7 +259,7 @@ - Complex _text layout: + Complex _text layout: True True False @@ -274,7 +274,7 @@ - Asian: + Asian: True True False @@ -292,7 +292,7 @@ True False 0 - Western: + Western: True westernlanguage @@ -309,7 +309,7 @@ True False - Default Languages for Documents + Default Languages for Documents @@ -340,7 +340,7 @@ 6 - Ignore s_ystem input language + Ignore s_ystem input language True True False @@ -361,7 +361,7 @@ True False - Enhanced Language Support + Enhanced Language Support diff --git a/cui/uiconfig/ui/optlingupage.ui b/cui/uiconfig/ui/optlingupage.ui index 5034a5df4088..8ffee5e470b5 100644 --- a/cui/uiconfig/ui/optlingupage.ui +++ b/cui/uiconfig/ui/optlingupage.ui @@ -1,6 +1,6 @@ - + @@ -44,7 +44,7 @@ True False - _Available language modules: + _Available language modules: True lingumodules:border 0 @@ -71,7 +71,7 @@ - _Edit... + _Edit... True True True @@ -79,7 +79,7 @@ True - Edit Available language modules + Edit Available language modules @@ -109,7 +109,7 @@ True False - _User-defined dictionaries: + _User-defined dictionaries: True lingudicts:border 0 @@ -143,7 +143,7 @@ start - _New... + _New... True True True @@ -157,14 +157,14 @@ - Ed_it... + Ed_it... True True True True - Edit User-defined dictionaries + Edit User-defined dictionaries @@ -176,7 +176,7 @@ - _Delete + _Delete True True True @@ -215,7 +215,7 @@ True False - _Options: + _Options: True linguoptions:border 0 @@ -227,7 +227,7 @@ - Get more dictionaries online... + Get more dictionaries online... True True True @@ -259,7 +259,7 @@ - Edi_t... + Edi_t... True True True @@ -267,7 +267,7 @@ True - Edit Options + Edit Options @@ -293,7 +293,7 @@ True False - Writing Aids + Writing Aids diff --git a/cui/uiconfig/ui/optmemorypage.ui b/cui/uiconfig/ui/optmemorypage.ui index 38953cde10bb..736e25b82a58 100644 --- a/cui/uiconfig/ui/optmemorypage.ui +++ b/cui/uiconfig/ui/optmemorypage.ui @@ -1,6 +1,6 @@ - + 1 @@ -51,7 +51,7 @@ True False - _Use for %PRODUCTNAME: + _Use for %PRODUCTNAME: True graphiccache 1 @@ -65,7 +65,7 @@ True False - _Memory per object: + _Memory per object: True objectcache 1 @@ -79,7 +79,7 @@ True False - Remove _from memory after: + Remove _from memory after: True objecttime:hh:mm 1 @@ -93,7 +93,7 @@ True False - MB + MB 0 @@ -105,7 +105,7 @@ True False - MB + MB 0 @@ -152,7 +152,7 @@ True False - hh:mm + hh:mm 2 @@ -167,7 +167,7 @@ True False - Image Cache + Image Cache @@ -213,7 +213,7 @@ True False - Number of objects: + Number of objects: True olecache 1 @@ -231,7 +231,7 @@ True False - Cache for Inserted Objects + Cache for Inserted Objects @@ -263,7 +263,7 @@ 6 - Load %PRODUCTNAME during system start-up + Load %PRODUCTNAME during system start-up True False True @@ -277,7 +277,7 @@ - Enable systray Quickstarter + Enable systray Quickstarter True False True @@ -297,7 +297,7 @@ True False - %PRODUCTNAME Quickstarter + %PRODUCTNAME Quickstarter diff --git a/cui/uiconfig/ui/optnewdictionarydialog.ui b/cui/uiconfig/ui/optnewdictionarydialog.ui index b5a78e54f7e6..ebcde4147fa1 100644 --- a/cui/uiconfig/ui/optnewdictionarydialog.ui +++ b/cui/uiconfig/ui/optnewdictionarydialog.ui @@ -1,12 +1,12 @@ - + False 6 - New Dictionary + New Dictionary dialog @@ -118,7 +118,7 @@ True False 0 - _Name: + _Name: True nameedit @@ -132,7 +132,7 @@ True False 0 - _Language: + _Language: True language @@ -143,7 +143,7 @@ - _Exception (-) + _Exception (-) True True False @@ -165,7 +165,7 @@ True False - Dictionary + Dictionary diff --git a/cui/uiconfig/ui/optonlineupdatepage.ui b/cui/uiconfig/ui/optonlineupdatepage.ui index fca1c9906b79..cd70c881f57c 100644 --- a/cui/uiconfig/ui/optonlineupdatepage.ui +++ b/cui/uiconfig/ui/optonlineupdatepage.ui @@ -1,6 +1,6 @@ - + True @@ -25,7 +25,7 @@ 12 - _Check for updates automatically + _Check for updates automatically True True False @@ -51,7 +51,7 @@ 6 - Every da_y + Every da_y True True False @@ -68,7 +68,7 @@ - Every _week + Every _week True True False @@ -84,7 +84,7 @@ - Every _month + Every _month True True False @@ -111,7 +111,7 @@ True False - Last checked: %DATE%, %TIME% + Last checked: %DATE%, %TIME% 0 @@ -122,7 +122,7 @@ - Check _Now + Check _Now True True True @@ -137,7 +137,7 @@ - _Download updates automatically + _Download updates automatically True True False @@ -169,7 +169,7 @@ True False - Download destination: + Download destination: 0 @@ -179,7 +179,7 @@ - Ch_ange... + Ch_ange... True True True @@ -217,11 +217,11 @@ - _Send OS version and basic hardware information + _Send OS version and basic hardware information True True False - This information lets us make optimizations for your hardware and operating system. + This information lets us make optimizations for your hardware and operating system. True 0 True @@ -241,7 +241,7 @@ True False - User Agent: + User Agent: 0 @@ -253,7 +253,7 @@ False - Hit apply to update + Hit apply to update 0 @@ -285,7 +285,7 @@ False True - Last checked: Not yet + Last checked: Not yet 0 @@ -302,7 +302,7 @@ True False - Online Update Options + Online Update Options diff --git a/cui/uiconfig/ui/optopenclpage.ui b/cui/uiconfig/ui/optopenclpage.ui index 86eee5774d6e..3408825fd3b0 100644 --- a/cui/uiconfig/ui/optopenclpage.ui +++ b/cui/uiconfig/ui/optopenclpage.ui @@ -1,6 +1,6 @@ - + @@ -27,7 +27,7 @@ 12 - Allow use of Software Interpreter (even when OpenCL is not available) + Allow use of Software Interpreter (even when OpenCL is not available) True True False @@ -43,7 +43,7 @@ - Allow use of OpenCL + Allow use of OpenCL True True False @@ -61,7 +61,7 @@ False False - OpenCL is available for use. + OpenCL is available for use. False @@ -73,7 +73,7 @@ False False - OpenCL is not used. + OpenCL is not used. False @@ -89,7 +89,7 @@ True False - OpenCL Options + OpenCL Options diff --git a/cui/uiconfig/ui/optpathspage.ui b/cui/uiconfig/ui/optpathspage.ui index 887904d5707d..0a24ebc201c2 100644 --- a/cui/uiconfig/ui/optpathspage.ui +++ b/cui/uiconfig/ui/optpathspage.ui @@ -1,5 +1,5 @@ - + True @@ -37,7 +37,7 @@ True False - Type + Type 0 @@ -50,7 +50,7 @@ True False - Path + Path 1 @@ -63,7 +63,7 @@ True False - Edit Paths: %1 + Edit Paths: %1 2 @@ -113,7 +113,7 @@ True False - Paths used by %PRODUCTNAME + Paths used by %PRODUCTNAME @@ -134,7 +134,7 @@ end - _Default + _Default True True True @@ -148,7 +148,7 @@ - _Edit... + _Edit... True True True diff --git a/cui/uiconfig/ui/optproxypage.ui b/cui/uiconfig/ui/optproxypage.ui index 46d0dcaef9ed..c2ea4b11d3c2 100644 --- a/cui/uiconfig/ui/optproxypage.ui +++ b/cui/uiconfig/ui/optproxypage.ui @@ -1,6 +1,6 @@ - + @@ -29,7 +29,7 @@ True False 0 - Proxy s_erver: + Proxy s_erver: True proxymode @@ -135,9 +135,9 @@ False start - None - System - Manual + None + System + Manual @@ -150,7 +150,7 @@ True False 0 - HT_TP proxy: + HT_TP proxy: True http @@ -163,7 +163,7 @@ True False - _Port: + _Port: True httpport @@ -177,7 +177,7 @@ True False 0 - HTTP_S proxy: + HTTP_S proxy: True https @@ -191,7 +191,7 @@ True False 0 - _FTP proxy: + _FTP proxy: True ftp @@ -205,7 +205,7 @@ True False 0 - _No proxy for: + _No proxy for: True noproxy @@ -218,7 +218,7 @@ True False - P_ort: + P_ort: True httpsport @@ -231,7 +231,7 @@ True False - P_ort: + P_ort: True ftpport @@ -245,7 +245,7 @@ True False 0 - Separator ; + Separator ; 2 @@ -267,7 +267,7 @@ True False - Settings + Settings diff --git a/cui/uiconfig/ui/optsavepage.ui b/cui/uiconfig/ui/optsavepage.ui index 9a6b81ef1416..9438d03d334c 100644 --- a/cui/uiconfig/ui/optsavepage.ui +++ b/cui/uiconfig/ui/optsavepage.ui @@ -1,6 +1,6 @@ - + 1 @@ -33,7 +33,7 @@ 6 - Load printer settings with the document + Load printer settings with the document True True False @@ -49,7 +49,7 @@ - Load user-specific settings with the document + Load user-specific settings with the document True True False @@ -71,7 +71,7 @@ True False - Load + Load @@ -108,7 +108,7 @@ 6 - Save _AutoRecovery information every: + Save _AutoRecovery information every: True True False @@ -137,7 +137,7 @@ True False - minutes + minutes 2 @@ -152,7 +152,7 @@ - Automatically save the document too + Automatically save the document too False True False @@ -168,7 +168,7 @@ - Save URLs relative to file system + Save URLs relative to file system True True False @@ -183,7 +183,7 @@ - _Edit document properties before saving + _Edit document properties before saving True True False @@ -198,7 +198,7 @@ - Save URLs relative to internet + Save URLs relative to internet True True False @@ -213,7 +213,7 @@ - Al_ways create backup copy + Al_ways create backup copy True True False @@ -234,7 +234,7 @@ True False - Save + Save @@ -266,7 +266,7 @@ 12 - Warn when not saving in ODF or default format + Warn when not saving in ODF or default format True True False @@ -290,7 +290,7 @@ True False - Not using ODF 1.2 Extended may cause information to be lost. + Not using ODF 1.2 Extended may cause information to be lost. 1 @@ -320,10 +320,10 @@ True False - 1.0/1.1 - 1.2 - 1.2 Extended (compatibility mode) - 1.2 Extended (recommended) + 1.0/1.1 + 1.2 + 1.2 Extended (compatibility mode) + 1.2 Extended (recommended) @@ -336,7 +336,7 @@ True False 0 - ODF format version: + ODF format version: True odfversion @@ -350,7 +350,7 @@ True False 0 - Always sa_ve as: + Always sa_ve as: True saveas @@ -364,13 +364,13 @@ True False - Text document - HTML document - Master document - Spreadsheet - Presentation - Drawing - Formula + Text document + HTML document + Master document + Spreadsheet + Presentation + Drawing + Formula @@ -393,7 +393,7 @@ True False 0 - D_ocument type: + D_ocument type: True doctype @@ -410,7 +410,7 @@ True False - Default File Format and ODF Settings + Default File Format and ODF Settings diff --git a/cui/uiconfig/ui/optsecuritypage.ui b/cui/uiconfig/ui/optsecuritypage.ui index 121af49d8b5b..13feb26c8921 100644 --- a/cui/uiconfig/ui/optsecuritypage.ui +++ b/cui/uiconfig/ui/optsecuritypage.ui @@ -1,6 +1,6 @@ - + True @@ -33,7 +33,7 @@ False True 0 - Maintain a list of Time Stamping Authority (TSA) URLs to be used for digital signatures in PDF export. + Maintain a list of Time Stamping Authority (TSA) URLs to be used for digital signatures in PDF export. True 56 @@ -46,7 +46,7 @@ - _TSAs... + _TSAs... True True True @@ -68,7 +68,7 @@ True False - TSAs + TSAs @@ -108,7 +108,7 @@ False True 0 - Select the Network Security Services certificate directory to use for digital signatures. + Select the Network Security Services certificate directory to use for digital signatures. True 56 @@ -121,7 +121,7 @@ - _Certificate... + _Certificate... True True True @@ -143,7 +143,7 @@ True False - Certificate Path + Certificate Path @@ -183,7 +183,7 @@ False True 0 - Adjust the security level for executing macros and specify trusted macro developers. + Adjust the security level for executing macros and specify trusted macro developers. True 56 @@ -196,7 +196,7 @@ - Macro Securit_y... + Macro Securit_y... True True True @@ -218,7 +218,7 @@ True False - Macro Security + Macro Security @@ -260,7 +260,7 @@ 12 - Persistently _save passwords for web connections + Persistently _save passwords for web connections True True False @@ -289,7 +289,7 @@ 6 - Protected _by a master password (recommended) + Protected _by a master password (recommended) True True False @@ -310,7 +310,7 @@ False True 0 - Passwords are protected by a master password. You will be asked to enter it once per session, if %PRODUCTNAME retrieves a password from the protected password list. + Passwords are protected by a master password. You will be asked to enter it once per session, if %PRODUCTNAME retrieves a password from the protected password list. True 56 @@ -327,7 +327,7 @@ True True 0 - Disabling the function to persistently store passwords deletes the list of passwords stored and resets the master password. + Disabling the function to persistently store passwords deletes the list of passwords stored and resets the master password. Do you want to delete password list and reset master password? True @@ -364,7 +364,7 @@ Do you want to delete password list and reset master password? False - Connect_ions... + Connect_ions... True True True @@ -381,7 +381,7 @@ Do you want to delete password list and reset master password? - _Master Password... + _Master Password... True True True @@ -412,7 +412,7 @@ Do you want to delete password list and reset master password? True False - Passwords for Web Connections + Passwords for Web Connections @@ -452,7 +452,7 @@ Do you want to delete password list and reset master password? False True 0 - Adjust security related options and define warnings for hidden information in documents. + Adjust security related options and define warnings for hidden information in documents. True 56 @@ -465,7 +465,7 @@ Do you want to delete password list and reset master password? - O_ptions... + O_ptions... True True True @@ -487,7 +487,7 @@ Do you want to delete password list and reset master password? True False - Security Options and Warnings + Security Options and Warnings diff --git a/cui/uiconfig/ui/optuserpage.ui b/cui/uiconfig/ui/optuserpage.ui index 93a7db478f96..61245f6fb3b8 100644 --- a/cui/uiconfig/ui/optuserpage.ui +++ b/cui/uiconfig/ui/optuserpage.ui @@ -1,6 +1,6 @@ - + True @@ -25,7 +25,7 @@ False True end - _Company: + _Company: True company @@ -39,7 +39,7 @@ False True end - First/last _name/initials: + First/last _name/initials: True firstname @@ -53,7 +53,7 @@ False True end - _Street: + _Street: True street @@ -67,7 +67,7 @@ False True end - City/state/_zip: + City/state/_zip: True city @@ -81,7 +81,7 @@ False True end - Country/re_gion: + Country/re_gion: True country @@ -95,7 +95,7 @@ False True end - _Title/position: + _Title/position: True title @@ -109,12 +109,12 @@ False True end - Telephone (home/_work): + Telephone (home/_work): True home - Home telephone number + Home telephone number @@ -128,7 +128,7 @@ False True end - Fa_x/e-mail: + Fa_x/e-mail: True fax @@ -151,7 +151,7 @@ • - First name + First name @@ -169,7 +169,7 @@ • - Last name + Last name @@ -187,7 +187,7 @@ 7 - Initials + Initials @@ -216,7 +216,7 @@ • - City + City @@ -234,7 +234,7 @@ • - State + State @@ -252,7 +252,7 @@ 15 - Zip code + Zip code @@ -282,7 +282,7 @@ • - Title + Title @@ -300,7 +300,7 @@ • - Position + Position @@ -329,7 +329,7 @@ • - Home telephone number + Home telephone number @@ -347,7 +347,7 @@ • - Work telephone number + Work telephone number @@ -377,7 +377,7 @@ • - FAX number + FAX number @@ -395,7 +395,7 @@ • - email address + email address @@ -412,7 +412,7 @@ - Use data for document properties + Use data for document properties True True False @@ -429,7 +429,7 @@ False True end - Last name/first _name/father’s name/initials: + Last name/first _name/father’s name/initials: True ruslastname @@ -452,7 +452,7 @@ • - Last name + Last name @@ -470,7 +470,7 @@ • - Father's name + Father's name @@ -488,7 +488,7 @@ 7 - Initials + Initials @@ -506,7 +506,7 @@ • - First name + First name @@ -526,7 +526,7 @@ False True end - Last/first _name/initials: + Last/first _name/initials: True eastlastname @@ -549,7 +549,7 @@ • - Last name + Last name @@ -567,7 +567,7 @@ • - First name + First name @@ -585,7 +585,7 @@ 7 - Initials + Initials @@ -605,7 +605,7 @@ False True end - _Street/apartment number: + _Street/apartment number: True russtreet @@ -628,7 +628,7 @@ • - Street + Street @@ -646,7 +646,7 @@ 15 - Apartment number + Apartment number @@ -666,7 +666,7 @@ False True end - _Zip/city: + _Zip/city: True izip @@ -689,7 +689,7 @@ • - City + City @@ -707,7 +707,7 @@ 15 - Zip code + Zip code @@ -805,7 +805,7 @@ True False - Address + Address diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui index fc75fc821e9d..56d227d55b38 100644 --- a/cui/uiconfig/ui/optviewpage.ui +++ b/cui/uiconfig/ui/optviewpage.ui @@ -1,6 +1,6 @@ - + 80 @@ -44,11 +44,11 @@ True False - Requires restart + Requires restart 6 - Use hard_ware acceleration + Use hard_ware acceleration True True False @@ -63,7 +63,7 @@ - Use anti-a_liasing + Use anti-a_liasing True True False @@ -78,7 +78,7 @@ - Use OpenGL for all rendering + Use OpenGL for all rendering True True False @@ -92,11 +92,11 @@ - Ignore OpenGL blacklist + Ignore OpenGL blacklist True True False - Requires restart. Enabling this may expose driver bugs + Requires restart. Enabling this may expose driver bugs 12 0 True @@ -110,7 +110,7 @@ False 12 - GL is currently enabled. + GL is currently enabled. 0 @@ -122,7 +122,7 @@ False 12 - GL is currently disabled. + GL is currently disabled. 0 @@ -138,7 +138,7 @@ True False - Graphics Output + Graphics Output @@ -172,7 +172,7 @@ True False start - Icons in men_us: + Icons in men_us: True menuicons @@ -186,9 +186,9 @@ True False - Automatic - Hide - Show + Automatic + Hide + Show @@ -201,7 +201,7 @@ True False start - Shortcuts in context menus: + Shortcuts in context menus: True contextmenushortcuts @@ -215,9 +215,9 @@ True False - Automatic - Hide - Show + Automatic + Hide + Show @@ -233,7 +233,7 @@ True False - Menu + Menu @@ -264,7 +264,7 @@ 6 - Show p_review of fonts + Show p_review of fonts True True False @@ -285,7 +285,7 @@ True False - Font Lists + Font Lists @@ -340,7 +340,7 @@ True False start - Toolbar icon _size: + Toolbar icon _size: True iconsize @@ -355,16 +355,16 @@ False True - Automatic - Galaxy - High Contrast - Crystal - Tango - Oxygen - Classic - Sifr - Breeze - Tango Testing + Automatic + Galaxy + High Contrast + Crystal + Tango + Oxygen + Classic + Sifr + Breeze + Tango Testing @@ -377,10 +377,10 @@ True False - Automatic - Small - Large - Extra Large + Automatic + Small + Large + Extra Large @@ -393,7 +393,7 @@ True False start - Icon s_tyle: + Icon s_tyle: True iconstyle @@ -404,7 +404,7 @@ - Screen font antialiasin_g + Screen font antialiasin_g True True False @@ -422,7 +422,7 @@ True False start - Sidebar _icon size: + Sidebar _icon size: True iconsize @@ -436,9 +436,9 @@ True False - Automatic - Small - Large + Automatic + Small + Large @@ -451,7 +451,7 @@ True False start - _Notebookbar icon size: + _Notebookbar icon size: True iconsize @@ -465,9 +465,9 @@ True False - Automatic - Small - Large + Automatic + Small + Large @@ -486,7 +486,7 @@ True False start - fro_m: + fro_m: True aanf:0pixels @@ -527,7 +527,7 @@ True False - User Interface + User Interface @@ -564,7 +564,7 @@ True False start - Mouse _positioning: + Mouse _positioning: True mousepos @@ -578,7 +578,7 @@ True False start - Middle mouse _button: + Middle mouse _button: True mousemiddle @@ -594,9 +594,9 @@ start True - Default button - Dialog center - No automatic positioning + Default button + Dialog center + No automatic positioning @@ -611,9 +611,9 @@ start True - No function - Automatic scrolling - Paste clipboard + No function + Automatic scrolling + Paste clipboard @@ -629,7 +629,7 @@ True False - Mouse + Mouse diff --git a/cui/uiconfig/ui/pageformatpage.ui b/cui/uiconfig/ui/pageformatpage.ui index ef717c2e296e..4fccfc9f9e1c 100644 --- a/cui/uiconfig/ui/pageformatpage.ui +++ b/cui/uiconfig/ui/pageformatpage.ui @@ -1,6 +1,6 @@ - + @@ -12,19 +12,19 @@ - Right and left + Right and left 0 - Mirrored + Mirrored 0 - Only right + Only right 0 - Only left + Only left 0 @@ -69,7 +69,7 @@ True False - _Format: + _Format: True comboPageFormat 0 @@ -93,7 +93,7 @@ True False - _Width: + _Width: True spinWidth:0.00cm 0 @@ -120,7 +120,7 @@ True False - _Height: + _Height: True spinHeight:0.00cm 0 @@ -146,7 +146,7 @@ True False - _Orientation: + _Orientation: True radiobuttonPortrait 0 @@ -158,7 +158,7 @@ - _Portrait + _Portrait True True False @@ -179,7 +179,7 @@ - L_andscape + L_andscape True True False @@ -202,7 +202,7 @@ False True - _Text direction: + _Text direction: True comboTextFlowBox 0 @@ -263,7 +263,7 @@ True False True - Paper _tray: + Paper _tray: True comboPaperTray 0 @@ -299,7 +299,7 @@ True False - Paper Format + Paper Format @@ -343,7 +343,7 @@ True False - Top: + Top: True spinMargTop:0.00cm 0 @@ -357,7 +357,7 @@ True False - Bottom: + Bottom: True spinMargBot:0.00cm 0 @@ -420,7 +420,7 @@ False - Right: + Right: True spinMargRight:0.00cm 0 @@ -434,7 +434,7 @@ False - O_uter: + O_uter: True spinMargRight:0.00cm 0 @@ -460,7 +460,7 @@ False - Left: + Left: True spinMargLeft:0.00cm 0 @@ -474,7 +474,7 @@ False - I_nner: + I_nner: True spinMargLeft:0.00cm 0 @@ -499,7 +499,7 @@ True False - Margins + Margins @@ -536,7 +536,7 @@ True False True - _Page layout: + _Page layout: True comboPageLayout 0 @@ -551,7 +551,7 @@ True False True - Page numbers: + Page numbers: True comboLayoutFormat 0 @@ -563,7 +563,7 @@ - Register-tr_ue + Register-tr_ue True False True @@ -603,7 +603,7 @@ False True True - Table alignment: + Table alignment: True checkbuttonHorz 0 @@ -615,7 +615,7 @@ - Hori_zontal + Hori_zontal True False True @@ -630,7 +630,7 @@ - _Vertical + _Vertical True False True @@ -645,7 +645,7 @@ - _Fit object to paper format + _Fit object to paper format True False True @@ -676,7 +676,7 @@ False True - Reference _Style: + Reference _Style: True comboRegisterStyle 0 @@ -718,7 +718,7 @@ True False - Layout Settings + Layout Settings @@ -739,7 +739,7 @@ False - The margin settings are out of print range. + The margin settings are out of print range. Do you still want to apply these settings? diff --git a/cui/uiconfig/ui/paragalignpage.ui b/cui/uiconfig/ui/paragalignpage.ui index b94b73dcfaf3..ba90b60a3fee 100644 --- a/cui/uiconfig/ui/paragalignpage.ui +++ b/cui/uiconfig/ui/paragalignpage.ui @@ -1,6 +1,6 @@ - + @@ -12,19 +12,19 @@ - Default + Default 0 - Left + Left 1 - Centered + Centered 2 - Justified + Justified 3 @@ -38,23 +38,23 @@ - Automatic + Automatic 0 - Base line + Base line 1 - Top + Top 2 - Middle + Middle 3 - Bottom + Bottom 4 @@ -82,7 +82,7 @@ start - Example + Example @@ -117,7 +117,7 @@ 6 - _Left + _Left True True False @@ -133,7 +133,7 @@ - _Right + _Right True True False @@ -149,7 +149,7 @@ - _Center + _Center True True False @@ -166,7 +166,7 @@ - _Justified + _Justified True True False @@ -182,7 +182,7 @@ - _Expand single word + _Expand single word True True False @@ -199,7 +199,7 @@ - _Snap to text grid (if active) + _Snap to text grid (if active) True True False @@ -230,7 +230,7 @@ False 12 True - _Last line: + _Last line: True comboLB_LASTLINE 0 @@ -274,7 +274,7 @@ False - Righ_t/Bottom + Righ_t/Bottom True @@ -287,7 +287,7 @@ False 5 - _Left/Top + _Left/Top True @@ -310,7 +310,7 @@ True False - Options + Options @@ -344,7 +344,7 @@ True False 12 - _Alignment: + _Alignment: True comboLB_VERTALIGN 0 @@ -375,7 +375,7 @@ True False - Text-to-text + Text-to-text @@ -409,7 +409,7 @@ True False 12 - _Text direction: + _Text direction: True comboLB_TEXTDIRECTION 0 @@ -441,7 +441,7 @@ True False - Properties + Properties diff --git a/cui/uiconfig/ui/paraindentspacing.ui b/cui/uiconfig/ui/paraindentspacing.ui index 18a0dc4ff7e4..734d23f2d42e 100644 --- a/cui/uiconfig/ui/paraindentspacing.ui +++ b/cui/uiconfig/ui/paraindentspacing.ui @@ -1,6 +1,6 @@ - + @@ -34,31 +34,31 @@ - Single + Single 0 - 1.15 Lines + 1.15 Lines 1 - 1.5 Lines + 1.5 Lines 2 - Double + Double 3 - Proportional + Proportional 4 - At least + At least 5 - Leading + Leading 6 @@ -88,7 +88,7 @@ True - Example + Example @@ -126,7 +126,7 @@ True False - _Before text: + _Before text: True spinED_LEFTINDENT:0cm 0 @@ -140,7 +140,7 @@ True False - After _text: + After _text: True spinED_RIGHTINDENT:0cm 0 @@ -154,7 +154,7 @@ True False - _First line: + _First line: True spinED_FLINEINDENT:0cm 0 @@ -166,7 +166,7 @@ - _Automatic + _Automatic True True False @@ -218,7 +218,7 @@ False - Fixed + Fixed 1 @@ -233,7 +233,7 @@ True False - Indent + Indent @@ -273,7 +273,7 @@ True False - Ab_ove paragraph: + Ab_ove paragraph: True spinED_TOPDIST:0cm 0 @@ -287,7 +287,7 @@ True False - Below _paragraph: + Below _paragraph: True spinED_BOTTOMDIST:0cm 0 @@ -330,7 +330,7 @@ - Don't add space between paragraphs of the same style + Don't add space between paragraphs of the same style True True False @@ -351,7 +351,7 @@ True False - Spacing + Spacing @@ -401,7 +401,7 @@ True False - of + of False @@ -461,7 +461,7 @@ True False - Line Spacing + Line Spacing @@ -486,7 +486,7 @@ 12 - A_ctivate + A_ctivate True False True @@ -500,7 +500,7 @@ True False - Register-true + Register-true diff --git a/cui/uiconfig/ui/paratabspage.ui b/cui/uiconfig/ui/paratabspage.ui index 74f632482eb5..56344137082e 100644 --- a/cui/uiconfig/ui/paratabspage.ui +++ b/cui/uiconfig/ui/paratabspage.ui @@ -1,6 +1,6 @@ - + @@ -46,7 +46,7 @@ True False - Position + Position 0 @@ -81,7 +81,7 @@ 12 - Deci_mal + Deci_mal True False False @@ -154,7 +154,7 @@ vertical - _Left + _Left False False True @@ -171,7 +171,7 @@ - _Left/Top + _Left/Top False False True @@ -198,7 +198,7 @@ vertical - Righ_t + Righ_t False False True @@ -214,7 +214,7 @@ - Righ_t/Bottom + Righ_t/Bottom False False True @@ -236,7 +236,7 @@ - C_entered + C_entered True False False @@ -260,7 +260,7 @@ True False center - _Character + _Character True entryED_TABTYPE_DECCHAR 0 @@ -280,7 +280,7 @@ True False - Type + Type @@ -314,7 +314,7 @@ 12 - N_one + N_one True True False @@ -331,7 +331,7 @@ - _........ + _........ True True False @@ -348,7 +348,7 @@ - _-------- + _-------- True True False @@ -365,7 +365,7 @@ - ______ + ______ True True False @@ -382,7 +382,7 @@ - C_haracter + C_haracter True True False @@ -422,7 +422,7 @@ True False - Fill Character + Fill Character 0 @@ -460,7 +460,7 @@ - Delete _all + Delete _all True False True @@ -489,7 +489,7 @@ False - points + points True radiobuttonBTN_FILLCHAR_POINTS @@ -502,7 +502,7 @@ False - dashes + dashes True radiobuttonBTN_FILLCHAR_DASHLINE @@ -515,7 +515,7 @@ False - underscores + underscores True radiobuttonBTN_FILLCHAR_UNDERSCORE diff --git a/cui/uiconfig/ui/password.ui b/cui/uiconfig/ui/password.ui index f19a40e1912f..eef7168a9ed7 100644 --- a/cui/uiconfig/ui/password.ui +++ b/cui/uiconfig/ui/password.ui @@ -1,11 +1,11 @@ - + False 6 - Set Password + Set Password normal @@ -87,7 +87,7 @@ True False 0 - Confirm password + Confirm password True confirmpassEntry @@ -103,7 +103,7 @@ True False 0 - _Enter password to open + _Enter password to open True newpassEntry @@ -147,7 +147,7 @@ True False 0 - Note: After a password has been set, the document will only open with the password. Should you lose the password, there will be no way to recover the document. Please also note that this password is case-sensitive. + Note: After a password has been set, the document will only open with the password. Should you lose the password, there will be no way to recover the document. Please also note that this password is case-sensitive. True 60 @@ -182,7 +182,7 @@ 6 - Open file read-only + Open file read-only True True False @@ -201,7 +201,7 @@ True False 0 - Enter password to allow editing + Enter password to allow editing True newpassroEntry @@ -231,7 +231,7 @@ True False 0 - Confirm password + Confirm password True confirmropassEntry @@ -264,7 +264,7 @@ True False - File Sharing Password + File Sharing Password @@ -276,7 +276,7 @@ True False - _Options + _Options True @@ -296,7 +296,7 @@ True False - File Encryption Password + File Encryption Password diff --git a/cui/uiconfig/ui/pastespecial.ui b/cui/uiconfig/ui/pastespecial.ui index fd37b963fd7e..017e2a408dd6 100644 --- a/cui/uiconfig/ui/pastespecial.ui +++ b/cui/uiconfig/ui/pastespecial.ui @@ -1,10 +1,10 @@ - + False 6 - Paste Special + Paste Special dialog @@ -84,7 +84,7 @@ True False - Source: + Source: False @@ -154,7 +154,7 @@ True False - Selection + Selection diff --git a/cui/uiconfig/ui/patterntabpage.ui b/cui/uiconfig/ui/patterntabpage.ui index 309608cd34ba..8f2a34fd63d7 100644 --- a/cui/uiconfig/ui/patterntabpage.ui +++ b/cui/uiconfig/ui/patterntabpage.ui @@ -1,6 +1,6 @@ - + @@ -62,7 +62,7 @@ - _Modify + _Modify True False True @@ -89,7 +89,7 @@ True False - Pattern + Pattern @@ -132,7 +132,7 @@ True False 0 - Pattern Editor: + Pattern Editor: False @@ -148,7 +148,7 @@ start - Pattern Editor + Pattern Editor @@ -176,7 +176,7 @@ True False 0 - Foreground Color: + Foreground Color: False @@ -214,7 +214,7 @@ True False 0 - Background Color: + Background Color: False @@ -249,7 +249,7 @@ True False - Options + Options @@ -292,7 +292,7 @@ True - Example + Example @@ -310,7 +310,7 @@ True False - Preview + Preview diff --git a/cui/uiconfig/ui/percentdialog.ui b/cui/uiconfig/ui/percentdialog.ui index 991cda65d690..e95f17790d6a 100644 --- a/cui/uiconfig/ui/percentdialog.ui +++ b/cui/uiconfig/ui/percentdialog.ui @@ -1,5 +1,5 @@ - + 100 @@ -10,7 +10,7 @@ False 6 - Combine + Combine dialog @@ -91,7 +91,7 @@ True False - Minimum Size + Minimum Size diff --git a/cui/uiconfig/ui/personalization_tab.ui b/cui/uiconfig/ui/personalization_tab.ui index d240a2da1934..623d6ccdb411 100644 --- a/cui/uiconfig/ui/personalization_tab.ui +++ b/cui/uiconfig/ui/personalization_tab.ui @@ -1,6 +1,6 @@ - + True @@ -28,7 +28,7 @@ 12 - Default look, do not use Themes + Default look, do not use Themes True True False @@ -44,7 +44,7 @@ - Pre-installed Theme (if available) + Pre-installed Theme (if available) True True False @@ -116,7 +116,7 @@ True - Own Theme + Own Theme True True False @@ -143,7 +143,7 @@ - Select Theme + Select Theme True True True @@ -165,7 +165,7 @@ False 0 - Or, select from the Themes installed via extensions: + Or, select from the Themes installed via extensions: True @@ -217,7 +217,7 @@ True False - Firefox Themes + Firefox Themes diff --git a/cui/uiconfig/ui/pickbulletpage.ui b/cui/uiconfig/ui/pickbulletpage.ui index faa76e284648..da2a1dae0198 100644 --- a/cui/uiconfig/ui/pickbulletpage.ui +++ b/cui/uiconfig/ui/pickbulletpage.ui @@ -1,5 +1,5 @@ - + True @@ -31,7 +31,7 @@ True False - Selection + Selection diff --git a/cui/uiconfig/ui/pickgraphicpage.ui b/cui/uiconfig/ui/pickgraphicpage.ui index 2979aebdcd58..8f11c574c316 100644 --- a/cui/uiconfig/ui/pickgraphicpage.ui +++ b/cui/uiconfig/ui/pickgraphicpage.ui @@ -1,5 +1,5 @@ - + True @@ -42,7 +42,7 @@ False True - The Gallery theme 'Bullets' is empty (no images). + The Gallery theme 'Bullets' is empty (no images). True @@ -54,7 +54,7 @@ - Add and Resize + Add and Resize True False end @@ -72,7 +72,7 @@ True False - Selection + Selection diff --git a/cui/uiconfig/ui/picknumberingpage.ui b/cui/uiconfig/ui/picknumberingpage.ui index 868e8f625d31..13eb0317c380 100644 --- a/cui/uiconfig/ui/picknumberingpage.ui +++ b/cui/uiconfig/ui/picknumberingpage.ui @@ -1,5 +1,5 @@ - + True @@ -31,7 +31,7 @@ True False - Selection + Selection diff --git a/cui/uiconfig/ui/pickoutlinepage.ui b/cui/uiconfig/ui/pickoutlinepage.ui index 8e1f4a332483..bfcbdf12a5d9 100644 --- a/cui/uiconfig/ui/pickoutlinepage.ui +++ b/cui/uiconfig/ui/pickoutlinepage.ui @@ -1,5 +1,5 @@ - + True @@ -31,7 +31,7 @@ True False - Selection + Selection diff --git a/cui/uiconfig/ui/positionpage.ui b/cui/uiconfig/ui/positionpage.ui index 755835235b8d..3cefde8e549d 100644 --- a/cui/uiconfig/ui/positionpage.ui +++ b/cui/uiconfig/ui/positionpage.ui @@ -1,6 +1,6 @@ - + @@ -54,7 +54,7 @@ True - Superscript + Superscript True True False @@ -70,7 +70,7 @@ - Normal + Normal True True False @@ -86,7 +86,7 @@ - Subscript + Subscript True True False @@ -118,7 +118,7 @@ True False - Raise/lower by + Raise/lower by True raiselowersb:0% 0 @@ -154,7 +154,7 @@ - Automatic + Automatic True True False @@ -170,7 +170,7 @@ True False - Relative font size + Relative font size True fontsizesb:0% 0 @@ -198,7 +198,7 @@ True False - Position + Position @@ -236,7 +236,7 @@ 12 - 0 degrees + 0 degrees True True False @@ -252,7 +252,7 @@ - 90 degrees + 90 degrees True True False @@ -268,7 +268,7 @@ - 270 degrees + 270 degrees True True False @@ -284,7 +284,7 @@ - Fit to line + Fit to line True True False @@ -313,7 +313,7 @@ True False - Scale width + Scale width True scalewidthsb:0% @@ -356,7 +356,7 @@ True False - Rotation / Scaling + Rotation / Scaling @@ -372,7 +372,7 @@ True False start - Scaling + Scaling @@ -425,7 +425,7 @@ - Pair kerning + Pair kerning True True False @@ -446,7 +446,7 @@ True False - Spacing + Spacing @@ -475,7 +475,7 @@ True - Preview + Preview diff --git a/cui/uiconfig/ui/positionsizedialog.ui b/cui/uiconfig/ui/positionsizedialog.ui index fa8e1628ff96..9a40c10c48bc 100644 --- a/cui/uiconfig/ui/positionsizedialog.ui +++ b/cui/uiconfig/ui/positionsizedialog.ui @@ -1,11 +1,11 @@ - + False 6 - Position and Size + Position and Size False True dialog @@ -98,7 +98,7 @@ True False - Position and Size + Position and Size False @@ -111,7 +111,7 @@ True False - Position and Size + Position and Size 1 @@ -125,7 +125,7 @@ True False - Rotation + Rotation 2 @@ -139,7 +139,7 @@ True False - Slant & Corner Radius + Slant & Corner Radius 3 diff --git a/cui/uiconfig/ui/possizetabpage.ui b/cui/uiconfig/ui/possizetabpage.ui index 25c48cbbe2e7..93eeaf4823c0 100644 --- a/cui/uiconfig/ui/possizetabpage.ui +++ b/cui/uiconfig/ui/possizetabpage.ui @@ -1,5 +1,5 @@ - + @@ -37,7 +37,7 @@ True False 0 - Position _X: + Position _X: True MTR_FLD_POS_X:0.00cm @@ -53,7 +53,7 @@ True False 0 - Position _Y: + Position _Y: True MTR_FLD_POS_Y:0.00cm @@ -109,7 +109,7 @@ True False - _Base point: + _Base point: True CTL_POSRECT @@ -147,7 +147,7 @@ True False 0 - Position + Position @@ -189,7 +189,7 @@ True False 0 - Wi_dth: + Wi_dth: True MTR_FLD_WIDTH:0.00cm @@ -205,7 +205,7 @@ True False 0 - H_eight: + H_eight: True MTR_FLD_HEIGHT:0.00cm @@ -248,7 +248,7 @@ - _Keep ratio + _Keep ratio True False False @@ -280,7 +280,7 @@ True False - Base _point: + Base _point: True CTL_SIZERECT @@ -318,7 +318,7 @@ True False 0 - Size + Size @@ -357,7 +357,7 @@ 6 - Positio_n + Positio_n True False False @@ -374,7 +374,7 @@ - _Size + _Size True False False @@ -398,7 +398,7 @@ True False 0 - Protect + Protect @@ -431,7 +431,7 @@ 6 - _Fit width to text + _Fit width to text True False False @@ -448,7 +448,7 @@ - Fit _height to text + Fit _height to text True False False @@ -472,7 +472,7 @@ True False 0 - Adapt + Adapt diff --git a/cui/uiconfig/ui/posterdialog.ui b/cui/uiconfig/ui/posterdialog.ui index 59fdcc322133..4c0658eccace 100644 --- a/cui/uiconfig/ui/posterdialog.ui +++ b/cui/uiconfig/ui/posterdialog.ui @@ -1,6 +1,6 @@ - + @@ -13,7 +13,7 @@ False 6 - Posterize + Posterize dialog @@ -133,7 +133,7 @@ True False 0 - Poster colors: + Poster colors: True value @@ -156,7 +156,7 @@ True False - Parameters + Parameters diff --git a/cui/uiconfig/ui/querychangelineenddialog.ui b/cui/uiconfig/ui/querychangelineenddialog.ui index 41dd4573b8e7..b8e5f113a203 100644 --- a/cui/uiconfig/ui/querychangelineenddialog.ui +++ b/cui/uiconfig/ui/querychangelineenddialog.ui @@ -1,18 +1,18 @@ - + False 6 - Save Arrowhead? + Save Arrowhead? False dialog True warning yes-no - The arrowhead was modified without saving. - Would you like to save the arrowhead now? + The arrowhead was modified without saving. + Would you like to save the arrowhead now? False diff --git a/cui/uiconfig/ui/querydeletebitmapdialog.ui b/cui/uiconfig/ui/querydeletebitmapdialog.ui index c484fdcbe16e..a737c87ee58a 100644 --- a/cui/uiconfig/ui/querydeletebitmapdialog.ui +++ b/cui/uiconfig/ui/querydeletebitmapdialog.ui @@ -1,17 +1,17 @@ - + False 6 - Delete Bitmap? + Delete Bitmap? False dialog True question yes-no - Are you sure you want to delete the bitmap? + Are you sure you want to delete the bitmap? False diff --git a/cui/uiconfig/ui/querydeletechartcolordialog.ui b/cui/uiconfig/ui/querydeletechartcolordialog.ui index 6b1ebb84b198..ad07c12effdb 100644 --- a/cui/uiconfig/ui/querydeletechartcolordialog.ui +++ b/cui/uiconfig/ui/querydeletechartcolordialog.ui @@ -1,18 +1,18 @@ - + False 6 - Delete Color? + Delete Color? False dialog True warning yes-no - Do you really want to delete the chart color? - This action cannot be undone. + Do you really want to delete the chart color? + This action cannot be undone. False diff --git a/cui/uiconfig/ui/querydeletecolordialog.ui b/cui/uiconfig/ui/querydeletecolordialog.ui index f44ac093634f..fc142aacde96 100644 --- a/cui/uiconfig/ui/querydeletecolordialog.ui +++ b/cui/uiconfig/ui/querydeletecolordialog.ui @@ -1,16 +1,16 @@ - + False 6 - Delete color? + Delete color? False dialog True question yes-no - Do you want to delete the color? + Do you want to delete the color? False diff --git a/cui/uiconfig/ui/querydeletedictionarydialog.ui b/cui/uiconfig/ui/querydeletedictionarydialog.ui index ef0ae5676d9f..663b917689a1 100644 --- a/cui/uiconfig/ui/querydeletedictionarydialog.ui +++ b/cui/uiconfig/ui/querydeletedictionarydialog.ui @@ -1,18 +1,18 @@ - + False 6 - Delete Dictionary? + Delete Dictionary? False dialog True warning yes-no - Do you really want to delete the dictionary? - This action cannot be undone. + Do you really want to delete the dictionary? + This action cannot be undone. False diff --git a/cui/uiconfig/ui/querydeletegradientdialog.ui b/cui/uiconfig/ui/querydeletegradientdialog.ui index c6bc9646eab7..b4353a10413f 100644 --- a/cui/uiconfig/ui/querydeletegradientdialog.ui +++ b/cui/uiconfig/ui/querydeletegradientdialog.ui @@ -1,17 +1,17 @@ - + False 6 - Delete gradient? + Delete gradient? False dialog True question yes-no - Do you want to delete the gradient? + Do you want to delete the gradient? False diff --git a/cui/uiconfig/ui/querydeletehatchdialog.ui b/cui/uiconfig/ui/querydeletehatchdialog.ui index 8545fbacc20e..ab22d721852e 100644 --- a/cui/uiconfig/ui/querydeletehatchdialog.ui +++ b/cui/uiconfig/ui/querydeletehatchdialog.ui @@ -1,17 +1,17 @@ - + False 6 - Delete Hatching? + Delete Hatching? False dialog True question yes-no - Do you want to delete the hatching? + Do you want to delete the hatching? False diff --git a/cui/uiconfig/ui/querydeletelineenddialog.ui b/cui/uiconfig/ui/querydeletelineenddialog.ui index f5a6c7120989..30355fcd662c 100644 --- a/cui/uiconfig/ui/querydeletelineenddialog.ui +++ b/cui/uiconfig/ui/querydeletelineenddialog.ui @@ -1,18 +1,18 @@ - + False 6 - Delete Arrowhead? + Delete Arrowhead? False dialog True question yes-no - Do you really want to delete the arrowhead? - This action cannot be undone. + Do you really want to delete the arrowhead? + This action cannot be undone. False diff --git a/cui/uiconfig/ui/querydeletelinestyledialog.ui b/cui/uiconfig/ui/querydeletelinestyledialog.ui index b08db9802332..86aa1fdf08da 100644 --- a/cui/uiconfig/ui/querydeletelinestyledialog.ui +++ b/cui/uiconfig/ui/querydeletelinestyledialog.ui @@ -1,17 +1,17 @@ - + False 6 - Delete Line Style? + Delete Line Style? False dialog True question yes-no - Do you want to delete the line style? + Do you want to delete the line style? False diff --git a/cui/uiconfig/ui/queryduplicatedialog.ui b/cui/uiconfig/ui/queryduplicatedialog.ui index beafdb33cc1c..172e14baddef 100644 --- a/cui/uiconfig/ui/queryduplicatedialog.ui +++ b/cui/uiconfig/ui/queryduplicatedialog.ui @@ -1,18 +1,18 @@ - + False 6 - Duplicate Name + Duplicate Name False dialog True warning ok - The name you have entered already exists. - Please choose another name. + The name you have entered already exists. + Please choose another name. False diff --git a/cui/uiconfig/ui/querynoloadedfiledialog.ui b/cui/uiconfig/ui/querynoloadedfiledialog.ui index 0ac554f58d24..397919a42717 100644 --- a/cui/uiconfig/ui/querynoloadedfiledialog.ui +++ b/cui/uiconfig/ui/querynoloadedfiledialog.ui @@ -1,17 +1,17 @@ - + False 6 - No Loaded File + No Loaded File False dialog True error ok - The file could not be loaded! + The file could not be loaded! False diff --git a/cui/uiconfig/ui/querynosavefiledialog.ui b/cui/uiconfig/ui/querynosavefiledialog.ui index 0d1f71304fec..a579aba13727 100644 --- a/cui/uiconfig/ui/querynosavefiledialog.ui +++ b/cui/uiconfig/ui/querynosavefiledialog.ui @@ -1,17 +1,17 @@ - + False 6 - No Saved File + No Saved File False dialog True error ok - The file could not be saved! + The file could not be saved! False diff --git a/cui/uiconfig/ui/querysavelistdialog.ui b/cui/uiconfig/ui/querysavelistdialog.ui index deb85061f475..8ccf00b71b67 100644 --- a/cui/uiconfig/ui/querysavelistdialog.ui +++ b/cui/uiconfig/ui/querysavelistdialog.ui @@ -1,18 +1,18 @@ - + False 6 - Save List? + Save List? False dialog True warning ok-cancel - The list was modified without saving. - Would you like to save the list now? + The list was modified without saving. + Would you like to save the list now? False diff --git a/cui/uiconfig/ui/queryupdategalleryfilelistdialog.ui b/cui/uiconfig/ui/queryupdategalleryfilelistdialog.ui index 8f26b2b81355..e41d5cca1724 100644 --- a/cui/uiconfig/ui/queryupdategalleryfilelistdialog.ui +++ b/cui/uiconfig/ui/queryupdategalleryfilelistdialog.ui @@ -1,17 +1,17 @@ - + False 6 - Update File List? + Update File List? False dialog True question yes-no - Do you want to update the file list? + Do you want to update the file list? False diff --git a/cui/uiconfig/ui/recordnumberdialog.ui b/cui/uiconfig/ui/recordnumberdialog.ui index 9f4824b8cea1..9e843967a654 100644 --- a/cui/uiconfig/ui/recordnumberdialog.ui +++ b/cui/uiconfig/ui/recordnumberdialog.ui @@ -1,10 +1,10 @@ - + False 6 - Record Number + Record Number dialog @@ -22,7 +22,7 @@ True False - go to record + go to record True entry-nospin diff --git a/cui/uiconfig/ui/rotationtabpage.ui b/cui/uiconfig/ui/rotationtabpage.ui index 7c3e34d757b8..7d63bdd04b51 100644 --- a/cui/uiconfig/ui/rotationtabpage.ui +++ b/cui/uiconfig/ui/rotationtabpage.ui @@ -1,6 +1,6 @@ - + @@ -49,7 +49,7 @@ True False 0 - Position _X: + Position _X: True MTR_FLD_POS_X:0.00cm @@ -63,7 +63,7 @@ True False 0 - Position _Y: + Position _Y: True MTR_FLD_POS_Y:0.00cm @@ -115,7 +115,7 @@ True False - _Default settings: + _Default settings: True CTL_RECT @@ -129,7 +129,7 @@ True False - Rotation point + Rotation point center @@ -154,7 +154,7 @@ True False 0 - Pivot Point + Pivot Point @@ -196,7 +196,7 @@ True False 0 - _Angle: + _Angle: True NF_ANGLE @@ -238,7 +238,7 @@ True False - Default _settings: + Default _settings: True CTL_ANGLE @@ -252,7 +252,7 @@ True False - Rotation Angle + Rotation Angle center @@ -277,7 +277,7 @@ True False 0 - Rotation Angle + Rotation Angle diff --git a/cui/uiconfig/ui/screenshotannotationdialog.ui b/cui/uiconfig/ui/screenshotannotationdialog.ui index 0da255e064cc..3e6c2f67dcea 100644 --- a/cui/uiconfig/ui/screenshotannotationdialog.ui +++ b/cui/uiconfig/ui/screenshotannotationdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Interactive Screenshot Annotation + Interactive Screenshot Annotation True 600 460 @@ -36,7 +36,7 @@ - Save Screenshot... + Save Screenshot... save True True @@ -64,7 +64,7 @@ True False start - Click the widgets to add annotation: + Click the widgets to add annotation: False @@ -90,7 +90,7 @@ True False start - Paste the following markup into the help file: + Paste the following markup into the help file: end diff --git a/cui/uiconfig/ui/scriptorganizer.ui b/cui/uiconfig/ui/scriptorganizer.ui index 4b17afa87ee6..c7a7001ad29d 100644 --- a/cui/uiconfig/ui/scriptorganizer.ui +++ b/cui/uiconfig/ui/scriptorganizer.ui @@ -1,10 +1,10 @@ - + False 6 - %MACROLANG Macros + %MACROLANG Macros dialog @@ -17,7 +17,7 @@ start - Run + Run True True True @@ -46,7 +46,7 @@ - Create... + Create... True True True @@ -76,7 +76,7 @@ - Rename... + Rename... True True True @@ -90,7 +90,7 @@ - Delete... + Delete... True True True @@ -157,7 +157,7 @@ True False - Macros + Macros diff --git a/cui/uiconfig/ui/searchattrdialog.ui b/cui/uiconfig/ui/searchattrdialog.ui index 5741e9238248..827c380f875d 100644 --- a/cui/uiconfig/ui/searchattrdialog.ui +++ b/cui/uiconfig/ui/searchattrdialog.ui @@ -1,12 +1,12 @@ - + False 6 - Attributes + Attributes False dialog diff --git a/cui/uiconfig/ui/searchformatdialog.ui b/cui/uiconfig/ui/searchformatdialog.ui index 4a95988a97c9..8a4f612c876b 100644 --- a/cui/uiconfig/ui/searchformatdialog.ui +++ b/cui/uiconfig/ui/searchformatdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Text Format + Text Format False dialog @@ -97,7 +97,7 @@ True False - Font + Font False @@ -110,7 +110,7 @@ True False - Font Effects + Font Effects 1 @@ -124,7 +124,7 @@ True False - Position + Position 2 @@ -138,7 +138,7 @@ True False - Asian Layout + Asian Layout 3 @@ -152,7 +152,7 @@ True False - Indents & Spacing + Indents & Spacing 4 @@ -167,7 +167,7 @@ True False 0.4699999988079071 - Alignment + Alignment 5 @@ -182,7 +182,7 @@ True False 0.46000000834465027 - Text Flow + Text Flow 6 @@ -196,7 +196,7 @@ True False - Asian Typography + Asian Typography 7 @@ -210,7 +210,7 @@ True False - Highlighting + Highlighting 8 diff --git a/cui/uiconfig/ui/securityoptionsdialog.ui b/cui/uiconfig/ui/securityoptionsdialog.ui index 1262e1047eb6..077fe67db1c2 100644 --- a/cui/uiconfig/ui/securityoptionsdialog.ui +++ b/cui/uiconfig/ui/securityoptionsdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Security Options and Warnings + Security Options and Warnings False dialog @@ -102,7 +102,7 @@ 12 - _When saving or sending + _When saving or sending True True False @@ -117,7 +117,7 @@ - When _signing + When _signing True True False @@ -132,7 +132,7 @@ - When _printing + When _printing True True False @@ -147,7 +147,7 @@ - When creating PDF _files + When creating PDF _files True True False @@ -224,7 +224,7 @@ False True 0 - Warn if document contains recorded changes, versions, hidden information or notes: + Warn if document contains recorded changes, versions, hidden information or notes: 0 @@ -239,7 +239,7 @@ True False - Security Warnings + Security Warnings @@ -273,7 +273,7 @@ 12 - _Remove personal information on saving + _Remove personal information on saving True True False @@ -289,7 +289,7 @@ - Recommend password protection on sa_ving + Recommend password protection on sa_ving True True False @@ -305,7 +305,7 @@ - Ctrl-click required _to follow hyperlinks + Ctrl-click required _to follow hyperlinks True True False @@ -321,7 +321,7 @@ - Block any links from documents not among the trusted locations (see Macro Security) + Block any links from documents not among the trusted locations (see Macro Security) True True False @@ -392,7 +392,7 @@ True False - Security Options + Security Options diff --git a/cui/uiconfig/ui/select_persona_dialog.ui b/cui/uiconfig/ui/select_persona_dialog.ui index 230f3b241930..087dccdf0df9 100644 --- a/cui/uiconfig/ui/select_persona_dialog.ui +++ b/cui/uiconfig/ui/select_persona_dialog.ui @@ -1,11 +1,11 @@ - + False 6 - Select Firefox Theme + Select Firefox Theme dialog @@ -53,7 +53,7 @@ - _Go + _Go 85 True True @@ -83,7 +83,7 @@ True False - Search Term or Firefox Theme URL + Search Term or Firefox Theme URL @@ -225,7 +225,7 @@ True False - Categories + Categories diff --git a/cui/uiconfig/ui/selectpathdialog.ui b/cui/uiconfig/ui/selectpathdialog.ui index 4578362f3298..0e7dfe483583 100644 --- a/cui/uiconfig/ui/selectpathdialog.ui +++ b/cui/uiconfig/ui/selectpathdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Select Paths + Select Paths False normal @@ -103,7 +103,7 @@ start - _Add... + _Add... True True True @@ -165,7 +165,7 @@ True False - Paths + Paths diff --git a/cui/uiconfig/ui/shadowtabpage.ui b/cui/uiconfig/ui/shadowtabpage.ui index 98c2563b5b14..c7e2913dfb6e 100644 --- a/cui/uiconfig/ui/shadowtabpage.ui +++ b/cui/uiconfig/ui/shadowtabpage.ui @@ -1,6 +1,6 @@ - + @@ -42,7 +42,7 @@ 6 - _Use shadow + _Use shadow True False False @@ -120,7 +120,7 @@ True False - _Distance: + _Distance: True @@ -156,7 +156,7 @@ True False - _Transparency: + _Transparency: True @@ -177,7 +177,7 @@ True False - _Color: + _Color: True @@ -220,7 +220,7 @@ True - Example + Example @@ -245,7 +245,7 @@ True False - Properties + Properties diff --git a/cui/uiconfig/ui/showcoldialog.ui b/cui/uiconfig/ui/showcoldialog.ui index 67e8b5f6c476..b576fd6d1120 100644 --- a/cui/uiconfig/ui/showcoldialog.ui +++ b/cui/uiconfig/ui/showcoldialog.ui @@ -1,11 +1,11 @@ - + False 6 - Show Columns + Show Columns False dialog @@ -67,7 +67,7 @@ True False 0 - The following columns are currently hidden. Please mark the fields you want to show and choose OK. + The following columns are currently hidden. Please mark the fields you want to show and choose OK. True True treeview:border diff --git a/cui/uiconfig/ui/similaritysearchdialog.ui b/cui/uiconfig/ui/similaritysearchdialog.ui index d82a62d45002..bee9ca70b722 100644 --- a/cui/uiconfig/ui/similaritysearchdialog.ui +++ b/cui/uiconfig/ui/similaritysearchdialog.ui @@ -1,6 +1,6 @@ - + 30 @@ -11,7 +11,7 @@ False 6 - Similarity Search + Similarity Search False dialog @@ -92,7 +92,7 @@ True False 1 - _Exchange characters: + _Exchange characters: True otherfld @@ -106,7 +106,7 @@ True False 1 - _Add characters: + _Add characters: True longerfld @@ -120,7 +120,7 @@ True False 1 - _Remove characters: + _Remove characters: True shorterfld @@ -131,7 +131,7 @@ - _Combine + _Combine True True False diff --git a/cui/uiconfig/ui/slantcornertabpage.ui b/cui/uiconfig/ui/slantcornertabpage.ui index 177656a712be..32573a622f85 100644 --- a/cui/uiconfig/ui/slantcornertabpage.ui +++ b/cui/uiconfig/ui/slantcornertabpage.ui @@ -1,6 +1,6 @@ - + 500 @@ -47,7 +47,7 @@ True False - _X: + _X: True controlx1:0.00cm 0 @@ -86,7 +86,7 @@ True False - _Y: + _Y: True controly1:0.00cm 0 @@ -124,7 +124,7 @@ True False - Control Point 1 + Control Point 1 0 @@ -158,7 +158,7 @@ True False - _Radius: + _Radius: True MTR_FLD_RADIUS:0.00cm 0 @@ -189,7 +189,7 @@ True False - Corner Radius + Corner Radius 0 @@ -223,7 +223,7 @@ True False - _Angle: + _Angle: True MTR_FLD_ANGLE:0.00degrees 0 @@ -254,7 +254,7 @@ True False - Slant + Slant 0 @@ -295,7 +295,7 @@ True False - _X: + _X: True controlx2:0.00cm 0 @@ -334,7 +334,7 @@ True False - _Y: + _Y: True controly2:0.00cm 0 @@ -372,7 +372,7 @@ True False - Control Point 2 + Control Point 2 0 diff --git a/cui/uiconfig/ui/smarttagoptionspage.ui b/cui/uiconfig/ui/smarttagoptionspage.ui index 405f365701dd..31be2c46d834 100644 --- a/cui/uiconfig/ui/smarttagoptionspage.ui +++ b/cui/uiconfig/ui/smarttagoptionspage.ui @@ -1,6 +1,6 @@ - + @@ -18,7 +18,7 @@ 6 - Label text with smart tags + Label text with smart tags True True False @@ -58,7 +58,7 @@ 12 - Properties... + Properties... True True True @@ -97,7 +97,7 @@ True False - Currently Installed Smart Tags + Currently Installed Smart Tags diff --git a/cui/uiconfig/ui/smoothdialog.ui b/cui/uiconfig/ui/smoothdialog.ui index a08eb9cfc2fb..8cd503f378b4 100644 --- a/cui/uiconfig/ui/smoothdialog.ui +++ b/cui/uiconfig/ui/smoothdialog.ui @@ -1,6 +1,6 @@ - + @@ -13,7 +13,7 @@ False 6 - Smooth + Smooth False dialog @@ -135,7 +135,7 @@ True False 0 - _Smooth radius: + _Smooth radius: True radius @@ -158,7 +158,7 @@ True False - Parameters + Parameters diff --git a/cui/uiconfig/ui/solarizedialog.ui b/cui/uiconfig/ui/solarizedialog.ui index 14215225dcd7..9d4c007e8e86 100644 --- a/cui/uiconfig/ui/solarizedialog.ui +++ b/cui/uiconfig/ui/solarizedialog.ui @@ -1,6 +1,6 @@ - + @@ -11,7 +11,7 @@ False 6 - Solarization + Solarization False dialog @@ -132,7 +132,7 @@ True False 0 - Threshold _value: + Threshold _value: True value:0% @@ -143,7 +143,7 @@ - _Invert + _Invert True True False @@ -170,7 +170,7 @@ True False - Parameters + Parameters diff --git a/cui/uiconfig/ui/specialcharacters.ui b/cui/uiconfig/ui/specialcharacters.ui index e6429826a57b..6440b9bacac3 100644 --- a/cui/uiconfig/ui/specialcharacters.ui +++ b/cui/uiconfig/ui/specialcharacters.ui @@ -1,13 +1,13 @@ - + False 6 - Special Characters + Special Characters dialog @@ -20,7 +20,7 @@ end - _Insert + _Insert True True True @@ -89,7 +89,7 @@ True False - Font: + Font: True fontlb @@ -102,7 +102,7 @@ True False - Subset: + Subset: True subsetlb @@ -187,7 +187,7 @@ False start 0 - Hexadecimal: + Hexadecimal: 0 @@ -238,7 +238,7 @@ True False 0 - Decimal: + Decimal: 0 @@ -296,7 +296,7 @@ False start start - Recent Characters: + Recent Characters: False diff --git a/cui/uiconfig/ui/spellingdialog.ui b/cui/uiconfig/ui/spellingdialog.ui index 94b530770678..0f576da899ac 100644 --- a/cui/uiconfig/ui/spellingdialog.ui +++ b/cui/uiconfig/ui/spellingdialog.ui @@ -1,12 +1,12 @@ - + False 6 - Spelling and Grammar: $LANGUAGE ($LOCATION) + Spelling and Grammar: $LANGUAGE ($LOCATION) False dialog @@ -35,7 +35,7 @@ - _Options... + _Options... True True True @@ -107,7 +107,7 @@ - _Ignore Once + _Ignore Once True True True @@ -135,7 +135,7 @@ - Co_rrect + Co_rrect True True True @@ -149,7 +149,7 @@ - Correct A_ll + Correct A_ll True True True @@ -163,7 +163,7 @@ - Alwa_ys Correct + Alwa_ys Correct True True True @@ -177,7 +177,7 @@ - Chec_k grammar + Chec_k grammar True True False @@ -193,7 +193,7 @@ - I_gnore All + I_gnore All True True True @@ -207,7 +207,7 @@ - I_gnore Rule + I_gnore Rule True True True @@ -223,7 +223,7 @@ True False - Text languag_e: + Text languag_e: True languagelb 0 @@ -249,7 +249,7 @@ - More... + More... True True True @@ -265,7 +265,7 @@ False True - Res_ume + Res_ume True @@ -277,7 +277,7 @@ False True - (no suggestions) + (no suggestions) True @@ -289,7 +289,7 @@ False True - Spelling: $LANGUAGE ($LOCATION) + Spelling: $LANGUAGE ($LOCATION) True @@ -316,7 +316,7 @@ - _Add to Dictionary + _Add to Dictionary True True True @@ -330,7 +330,7 @@ - _Add to Dictionary + _Add to Dictionary True True True @@ -346,7 +346,7 @@ True False - _Suggestions + _Suggestions True suggestionslb 0 @@ -362,7 +362,7 @@ True False True - _Not in dictionary + _Not in dictionary True sentence 0 @@ -383,7 +383,7 @@ True False paste - Paste + Paste True cmd/sc_paste.png @@ -397,7 +397,7 @@ True False insert - Special Character + Special Character True cmd/sc_insertsymbol.png diff --git a/cui/uiconfig/ui/spelloptionsdialog.ui b/cui/uiconfig/ui/spelloptionsdialog.ui index 29c6add47ad3..34bb3a66e92f 100644 --- a/cui/uiconfig/ui/spelloptionsdialog.ui +++ b/cui/uiconfig/ui/spelloptionsdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Options + Options dialog diff --git a/cui/uiconfig/ui/splitcellsdialog.ui b/cui/uiconfig/ui/splitcellsdialog.ui index 89c276d7b7e2..9131178af49d 100644 --- a/cui/uiconfig/ui/splitcellsdialog.ui +++ b/cui/uiconfig/ui/splitcellsdialog.ui @@ -1,6 +1,6 @@ - + 2 @@ -22,7 +22,7 @@ False 6 - Split Cells + Split Cells False dialog @@ -114,7 +114,7 @@ True False - _Split cell into: + _Split cell into: True countnf @@ -143,7 +143,7 @@ True False - Split + Split @@ -175,7 +175,7 @@ 6 - H_orizontally + H_orizontally True True False @@ -193,7 +193,7 @@ - _Vertically + _Vertically True True False @@ -215,7 +215,7 @@ 12 - _Into equal proportions + _Into equal proportions True True False @@ -238,7 +238,7 @@ True False - Direction + Direction diff --git a/cui/uiconfig/ui/storedwebconnectiondialog.ui b/cui/uiconfig/ui/storedwebconnectiondialog.ui index 8e200e3201cb..b75122bb17cf 100644 --- a/cui/uiconfig/ui/storedwebconnectiondialog.ui +++ b/cui/uiconfig/ui/storedwebconnectiondialog.ui @@ -1,12 +1,12 @@ - + False 6 - Stored Web Connection Information + Stored Web Connection Information False dialog @@ -67,7 +67,7 @@ True False 0 - Web login information (passwords are never shown) + Web login information (passwords are never shown) 0 @@ -84,7 +84,7 @@ True False - Website + Website 0 @@ -95,7 +95,7 @@ True False - User name + User name 1 @@ -145,7 +145,7 @@ - Remove _All + Remove _All True True True @@ -159,7 +159,7 @@ - _Change Password... + _Change Password... True True True diff --git a/cui/uiconfig/ui/swpossizepage.ui b/cui/uiconfig/ui/swpossizepage.ui index 893607c2e9c4..9bc70c3d07b3 100644 --- a/cui/uiconfig/ui/swpossizepage.ui +++ b/cui/uiconfig/ui/swpossizepage.ui @@ -1,6 +1,6 @@ - + @@ -72,7 +72,7 @@ True False 0 - _Width: + _Width: True width:0.00cm @@ -110,7 +110,7 @@ True False 0 - H_eight: + H_eight: True height:0.00cm @@ -127,7 +127,7 @@ - _Keep ratio + _Keep ratio True True False @@ -148,7 +148,7 @@ True False - Size + Size @@ -204,7 +204,7 @@ 6 - To _page + To _page True True False @@ -221,7 +221,7 @@ - To paragrap_h + To paragrap_h True True False @@ -237,7 +237,7 @@ - To cha_racter + To cha_racter True True False @@ -253,7 +253,7 @@ - _As character + _As character True True False @@ -269,7 +269,7 @@ - To _frame + To _frame True True False @@ -291,7 +291,7 @@ True False - Anchor + Anchor @@ -332,7 +332,7 @@ True False 0 - Hori_zontal: + Hori_zontal: True horipos @@ -346,7 +346,7 @@ True False 0 - b_y: + b_y: True byhori:0.00cm @@ -360,7 +360,7 @@ True False 0 - _by: + _by: True byvert:0.00cm @@ -374,7 +374,7 @@ True False 0 - _to: + _to: True horianchor @@ -421,7 +421,7 @@ True False 0 - _Vertical: + _Vertical: True vertpos @@ -458,7 +458,7 @@ True False 0 - t_o: + t_o: True vertanchor @@ -479,7 +479,7 @@ - _Mirror on even pages + _Mirror on even pages True True False @@ -496,7 +496,7 @@ - Follow te_xt flow + Follow te_xt flow True True False @@ -519,7 +519,7 @@ True False - Position + Position @@ -550,7 +550,7 @@ 18 - Positio_n + Positio_n True True False @@ -566,7 +566,7 @@ - _Size + _Size True True False @@ -588,7 +588,7 @@ True False - Protect + Protect diff --git a/cui/uiconfig/ui/textanimtabpage.ui b/cui/uiconfig/ui/textanimtabpage.ui index b49480431526..1926205a52e5 100644 --- a/cui/uiconfig/ui/textanimtabpage.ui +++ b/cui/uiconfig/ui/textanimtabpage.ui @@ -1,6 +1,6 @@ - + 100 @@ -46,23 +46,23 @@ - No Effect + No Effect 0 - Blink + Blink 1 - Scroll Through + Scroll Through 2 - Scroll Back and Forth + Scroll Back and Forth 3 - Scroll In + Scroll In 4 @@ -91,7 +91,7 @@ True False 0 - E_ffect: + E_ffect: True LB_EFFECT @@ -132,7 +132,7 @@ True False - Direction: + Direction: True grid1 @@ -152,13 +152,13 @@ True True True - To top + To top center True imageUP - Up + Up @@ -173,13 +173,13 @@ True True True - To right + To right center True imageRIGHT - Right + Right @@ -194,13 +194,13 @@ True True True - To left + To left center True imageLEFT - Left + Left @@ -215,13 +215,13 @@ True True True - To bottom + To bottom center True imageDOWN - Down + Down @@ -286,7 +286,7 @@ 6 - S_tart inside + S_tart inside True False False @@ -303,7 +303,7 @@ - Text _visible when exiting + Text _visible when exiting True False False @@ -323,7 +323,7 @@ True False 0 - Animation cycles: + Animation cycles: False @@ -341,7 +341,7 @@ True - _Continuous + _Continuous True False False @@ -387,7 +387,7 @@ True False 0 - Increment: + Increment: False @@ -405,7 +405,7 @@ True - _Pixels + _Pixels True False False @@ -451,7 +451,7 @@ True False 0 - Delay: + Delay: False @@ -469,7 +469,7 @@ True - _Automatic + _Automatic True False False @@ -519,7 +519,7 @@ True False 0 - Properties + Properties diff --git a/cui/uiconfig/ui/textattrtabpage.ui b/cui/uiconfig/ui/textattrtabpage.ui index dc0059bb32db..6390bbefd230 100644 --- a/cui/uiconfig/ui/textattrtabpage.ui +++ b/cui/uiconfig/ui/textattrtabpage.ui @@ -1,6 +1,6 @@ - + @@ -40,7 +40,7 @@ 12 - Fit wi_dth to text + Fit wi_dth to text True True False @@ -56,7 +56,7 @@ - Fit h_eight to text + Fit h_eight to text True True False @@ -72,7 +72,7 @@ - _Fit to frame + _Fit to frame True True False @@ -88,7 +88,7 @@ - _Adjust to contour + _Adjust to contour True True False @@ -110,7 +110,7 @@ True False - Drawing Object Text + Drawing Object Text 0 @@ -143,7 +143,7 @@ 12 - _Word wrap text in shape + _Word wrap text in shape True True False @@ -159,7 +159,7 @@ - _Resize shape to fit text + _Resize shape to fit text True True False @@ -187,7 +187,7 @@ True False - Custom Shape Text + Custom Shape Text 0 @@ -234,7 +234,7 @@ True False - _Left: + _Left: True MTR_FLD_LEFT:0.00cm 0 @@ -248,7 +248,7 @@ True False - _Right: + _Right: True MTR_FLD_RIGHT:0.00cm 0 @@ -262,7 +262,7 @@ True False - _Top: + _Top: True MTR_FLD_TOP:0.00cm 0 @@ -276,7 +276,7 @@ True False - _Bottom: + _Bottom: True MTR_FLD_BOTTOM:0.00cm 0 @@ -346,7 +346,7 @@ True False - Spacing to Borders + Spacing to Borders 0 @@ -395,7 +395,7 @@ - Full _width + Full _width True False False @@ -418,7 +418,7 @@ True False - Text Anchor + Text Anchor diff --git a/cui/uiconfig/ui/textdialog.ui b/cui/uiconfig/ui/textdialog.ui index 8c7ec8553b53..16157dce4fe2 100644 --- a/cui/uiconfig/ui/textdialog.ui +++ b/cui/uiconfig/ui/textdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Text + Text False dialog @@ -97,7 +97,7 @@ True False - Text + Text False @@ -110,7 +110,7 @@ True False - Text Animation + Text Animation 1 diff --git a/cui/uiconfig/ui/textflowpage.ui b/cui/uiconfig/ui/textflowpage.ui index 8ce7a43b9100..6565cb8427ea 100644 --- a/cui/uiconfig/ui/textflowpage.ui +++ b/cui/uiconfig/ui/textflowpage.ui @@ -1,6 +1,6 @@ - + 2 @@ -50,7 +50,7 @@ 12 - A_utomatically + A_utomatically True True False @@ -115,7 +115,7 @@ True False start - C_haracters at line end + C_haracters at line end True spinLineEnd @@ -129,7 +129,7 @@ True False start - Cha_racters at line begin + Cha_racters at line begin True spinLineBegin @@ -143,7 +143,7 @@ True False start - _Maximum number of consecutive hyphens + _Maximum number of consecutive hyphens True spinMaxNum @@ -160,7 +160,7 @@ True False - Hyphenation + Hyphenation @@ -193,7 +193,7 @@ 12 - _Insert + _Insert True True False @@ -209,7 +209,7 @@ - With page st_yle: + With page st_yle: True True False @@ -228,7 +228,7 @@ True False - _Type: + _Type: True comboBreakType 0 @@ -257,7 +257,7 @@ True True - Page _number: + Page _number: True True right @@ -272,7 +272,7 @@ True False - Position: + Position: True right comboBreakPosition @@ -292,7 +292,7 @@ - Page Style + Page Style @@ -306,8 +306,8 @@ True False - Page - Column + Page + Column @@ -320,8 +320,8 @@ True False - Before - After + Before + After @@ -340,7 +340,7 @@ True False - Breaks + Breaks @@ -372,7 +372,7 @@ 12 - _Do not split paragraph + _Do not split paragraph True True False @@ -388,7 +388,7 @@ - _Keep with next paragraph + _Keep with next paragraph True True False @@ -404,7 +404,7 @@ - _Orphan control + _Orphan control True True False @@ -420,7 +420,7 @@ - _Widow control + _Widow control True True False @@ -470,7 +470,7 @@ True False - lines + lines 0 @@ -482,7 +482,7 @@ True False - lines + lines 0 @@ -510,7 +510,7 @@ True False - Options + Options diff --git a/cui/uiconfig/ui/thesaurus.ui b/cui/uiconfig/ui/thesaurus.ui index 61ea65fe977d..c2c1cc17dc4f 100644 --- a/cui/uiconfig/ui/thesaurus.ui +++ b/cui/uiconfig/ui/thesaurus.ui @@ -1,6 +1,6 @@ - + @@ -11,7 +11,7 @@ False 6 - Thesaurus + Thesaurus False dialog @@ -40,7 +40,7 @@ - _Replace + _Replace True True True @@ -86,7 +86,7 @@ True False 0 - Current word: + Current word: True wordcb @@ -101,7 +101,7 @@ True False 0 - Alternatives: + Alternatives: True alternatives @@ -116,7 +116,7 @@ True False 0 - Replace with: + Replace with: True replaceed diff --git a/cui/uiconfig/ui/transparencytabpage.ui b/cui/uiconfig/ui/transparencytabpage.ui index 4e6d244313fa..544b86e44f34 100644 --- a/cui/uiconfig/ui/transparencytabpage.ui +++ b/cui/uiconfig/ui/transparencytabpage.ui @@ -1,6 +1,6 @@ - + @@ -22,27 +22,27 @@ - Linear + Linear 0 - Axial + Axial 0 - Radial + Radial 0 - Ellipsoid + Ellipsoid 0 - Quadratic + Quadratic 0 - Square + Square 0 @@ -82,7 +82,7 @@ 12 - _No transparency + _No transparency True False False @@ -100,7 +100,7 @@ - _Transparency: + _Transparency: True False False @@ -121,7 +121,7 @@ - _Gradient + _Gradient True False False @@ -263,7 +263,7 @@ True False 1 - Ty_pe: + Ty_pe: True LB_TRGR_GRADIENT_TYPES @@ -284,7 +284,7 @@ True False 1 - Center _X: + Center _X: True MTR_TRGR_CENTER_X:0% @@ -305,7 +305,7 @@ True False 1 - Center _Y: + Center _Y: True MTR_TRGR_CENTER_Y:0% @@ -326,7 +326,7 @@ True False 1 - _Angle: + _Angle: True MTR_TRGR_ANGLE:0degree @@ -347,7 +347,7 @@ True False 1 - _Border: + _Border: True MTR_TRGR_BORDER:0% @@ -368,7 +368,7 @@ True False 1 - _Start value: + _Start value: True MTR_TRGR_START_VALUE:0% @@ -389,7 +389,7 @@ True False 1 - _End value: + _End value: True MTR_TRGR_END_VALUE:0% @@ -432,7 +432,7 @@ True - Example + Example @@ -450,7 +450,7 @@ True - Example + Example @@ -491,7 +491,7 @@ True False 0 - Area Transparency Mode + Area Transparency Mode diff --git a/cui/uiconfig/ui/tsaurldialog.ui b/cui/uiconfig/ui/tsaurldialog.ui index 172970d3d9e1..4b5b137b738a 100644 --- a/cui/uiconfig/ui/tsaurldialog.ui +++ b/cui/uiconfig/ui/tsaurldialog.ui @@ -1,10 +1,10 @@ - + False 6 - Time Stamping Authority URLs + Time Stamping Authority URLs normal @@ -32,7 +32,7 @@ - _Delete... + _Delete... True True True @@ -48,7 +48,7 @@ - _Add... + _Add... True True True @@ -128,7 +128,7 @@ 6 0 0 - Add or delete Time Stamp Authority URLs + Add or delete Time Stamp Authority URLs True True 60 @@ -164,7 +164,7 @@ True False True - Enter a Time Stamp Authority URL + Enter a Time Stamp Authority URL 2 @@ -194,7 +194,7 @@ True False - TSA URL + TSA URL diff --git a/cui/uiconfig/ui/twolinespage.ui b/cui/uiconfig/ui/twolinespage.ui index 2adca53b0187..57a4b6f1d5c4 100644 --- a/cui/uiconfig/ui/twolinespage.ui +++ b/cui/uiconfig/ui/twolinespage.ui @@ -1,5 +1,5 @@ - + @@ -11,27 +11,27 @@ - (None) + (None) 0 - ( + ( 1 - [ + [ 2 - < + < 3 - { + { 4 - Other Characters... + Other Characters... 5 @@ -45,27 +45,27 @@ - (None) + (None) 0 - ) + ) 1 - ] + ] 2 - > + > 3 - } + } 4 - Other Characters... + Other Characters... 5 @@ -90,7 +90,7 @@ 12 - Write in double lines + Write in double lines True True False @@ -104,7 +104,7 @@ True False - Double-lined + Double-lined @@ -139,7 +139,7 @@ True False - Initial character + Initial character 0 @@ -152,7 +152,7 @@ True False - Final character + Final character 1 @@ -203,7 +203,7 @@ True False - Enclosing Character + Enclosing Character @@ -230,7 +230,7 @@ False - Preview + Preview diff --git a/cui/uiconfig/ui/wordcompletionpage.ui b/cui/uiconfig/ui/wordcompletionpage.ui index 0ab7df972b9c..48a981b5b288 100644 --- a/cui/uiconfig/ui/wordcompletionpage.ui +++ b/cui/uiconfig/ui/wordcompletionpage.ui @@ -1,6 +1,6 @@ - + @@ -40,7 +40,7 @@ 6 - _Delete Entry + _Delete Entry True True True @@ -84,7 +84,7 @@ True False 0 - _Max. entries: + _Max. entries: True maxentries @@ -123,7 +123,7 @@ True False 0 - Mi_n. word length: + Mi_n. word length: True maxentries @@ -169,7 +169,7 @@ 6 - _Append space + _Append space True True False @@ -184,7 +184,7 @@ - _Show as tip + _Show as tip True True False @@ -207,7 +207,7 @@ - Enable word _completion + Enable word _completion True True False @@ -243,7 +243,7 @@ 6 - _When closing a document, remove the words collected from it from the list + _When closing a document, remove the words collected from it from the list True True False @@ -266,7 +266,7 @@ - C_ollect words + C_ollect words True True False @@ -296,7 +296,7 @@ True False 0 - Acc_ept with: + Acc_ept with: True acceptwith diff --git a/cui/uiconfig/ui/zoomdialog.ui b/cui/uiconfig/ui/zoomdialog.ui index 5d5df219b7f5..40fa13f6b3fb 100644 --- a/cui/uiconfig/ui/zoomdialog.ui +++ b/cui/uiconfig/ui/zoomdialog.ui @@ -1,6 +1,6 @@ - + 1 @@ -11,7 +11,7 @@ False 6 - Zoom & View Layout + Zoom & View Layout False dialog @@ -100,7 +100,7 @@ 6 - Optimal + Optimal True True False @@ -117,7 +117,7 @@ - Fit width and height + Fit width and height True True False @@ -134,7 +134,7 @@ - Fit width + Fit width True True False @@ -151,7 +151,7 @@ - 100% + 100% True True False @@ -173,7 +173,7 @@ 12 - Variable: + Variable: True True False @@ -201,7 +201,7 @@ - Variable + Variable @@ -226,7 +226,7 @@ True False - Zoom Factor + Zoom Factor @@ -259,7 +259,7 @@ 6 - Automatic + Automatic True True False @@ -276,7 +276,7 @@ - Single page + Single page True True False @@ -298,7 +298,7 @@ 12 - Columns: + Columns: True True False @@ -329,7 +329,7 @@ - Columns + Columns @@ -353,7 +353,7 @@ 12 - Book mode + Book mode True True False @@ -380,7 +380,7 @@ True False - View Layout + View Layout diff --git a/dbaccess/AllLangMoTarget_dba.mk b/dbaccess/AllLangMoTarget_dba.mk new file mode 100644 index 000000000000..5c57ae6a8425 --- /dev/null +++ b/dbaccess/AllLangMoTarget_dba.mk @@ -0,0 +1,13 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# 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/. + +$(eval $(call gb_AllLangMoTarget_AllLangMoTarget,dba)) + +$(eval $(call gb_AllLangMoTarget_set_polocation,dba,dbaccess)) + +# vim: set noet sw=4 ts=4: diff --git a/dbaccess/AllLangResTarget_dba.mk b/dbaccess/AllLangResTarget_dba.mk deleted file mode 100644 index 4892ba492704..000000000000 --- a/dbaccess/AllLangResTarget_dba.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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/. -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,dba)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,dba,dbaccess)) - -$(eval $(call gb_AllLangResTarget_add_srs,dba,\ - dbaccess/dba \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dba)) - -$(eval $(call gb_SrsTarget_set_include,dbaccess/dba,\ - $$(INCLUDE) \ - -I$(SRCDIR)/dbaccess/source/core/inc \ -)) - -$(eval $(call gb_SrsTarget_add_files,dbaccess/dba,\ - dbaccess/source/core/resource/strings.src \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/dbaccess/AllLangResTarget_dbmm.mk b/dbaccess/AllLangResTarget_dbmm.mk deleted file mode 100644 index 7004c1126222..000000000000 --- a/dbaccess/AllLangResTarget_dbmm.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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/. -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,dbmm)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,dbmm,dbaccess)) - -$(eval $(call gb_AllLangResTarget_add_srs,dbmm,\ - dbaccess/dbmm \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dbmm)) - -$(eval $(call gb_SrsTarget_add_files,dbaccess/dbmm,\ - dbaccess/source/ext/macromigration/macromigration.src \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk deleted file mode 100644 index 6cb9ced4ddc3..000000000000 --- a/dbaccess/AllLangResTarget_dbu.mk +++ /dev/null @@ -1,52 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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/. -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,dbu)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,dbu,dbaccess)) - -$(eval $(call gb_AllLangResTarget_add_srs,dbu,\ - dbaccess/dbu \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dbu)) - -$(eval $(call gb_SrsTarget_set_include,dbaccess/dbu,\ - $$(INCLUDE) \ - -I$(SRCDIR)/dbaccess/inc \ - -I$(SRCDIR)/dbaccess/source/ui/inc \ -)) - -$(eval $(call gb_SrsTarget_add_files,dbaccess/dbu,\ - dbaccess/source/ui/app/app.src \ - dbaccess/source/ui/browser/sbabrw.src \ - dbaccess/source/ui/browser/sbagrid.src \ - dbaccess/source/ui/control/TableGrantCtrl.src \ - dbaccess/source/ui/control/tabletree.src \ - dbaccess/source/ui/control/undosqledit.src \ - dbaccess/source/ui/dlg/AutoControls.src \ - dbaccess/source/ui/dlg/ConnectionPage.src \ - dbaccess/source/ui/dlg/dbadmin2.src \ - dbaccess/source/ui/dlg/dbadminsetup.src \ - dbaccess/source/ui/dlg/dbadmin.src \ - dbaccess/source/ui/dlg/directsql.src \ - dbaccess/source/ui/dlg/indexdialog.src \ - dbaccess/source/ui/dlg/paramdialog.src \ - dbaccess/source/ui/dlg/sqlmessage.src \ - dbaccess/source/ui/dlg/UserAdmin.src \ - dbaccess/source/ui/misc/dbumiscres.src \ - dbaccess/source/ui/misc/WizardPages.src \ - dbaccess/source/ui/querydesign/querydlg.src \ - dbaccess/source/ui/querydesign/query.src \ - dbaccess/source/ui/relationdesign/relation.src \ - dbaccess/source/ui/tabledesign/table.src \ - dbaccess/source/ui/uno/copytablewizard.src \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/dbaccess/AllLangResTarget_sdbt.mk b/dbaccess/AllLangResTarget_sdbt.mk deleted file mode 100644 index 8b18e2f6c768..000000000000 --- a/dbaccess/AllLangResTarget_sdbt.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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/. -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,sdbt)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,sdbt,dbaccess)) - -$(eval $(call gb_AllLangResTarget_add_srs,sdbt,\ - dbaccess/sdbt \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,dbaccess/sdbt)) - -$(eval $(call gb_SrsTarget_set_include,dbaccess/sdbt,\ - $$(INCLUDE) \ - -I$(SRCDIR)/dbaccess/source/sdbtools/inc \ -)) - -$(eval $(call gb_SrsTarget_add_files,dbaccess/sdbt,\ - dbaccess/source/sdbtools/resource/sdbt_strings.src \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk index de5b2a8ff0ab..0bc9c77d46dd 100644 --- a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk +++ b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk @@ -112,7 +112,4 @@ $(WORKDIR)/CppunitTest/RowSetClones.odb : $(SRCDIR)/dbaccess/qa/extras/testdocum cp -P -f "$<" "$@" .PHONY: $(WORKDIR)/CppunitTest/RowSetClones.odb -$(call gb_CppunitTest_get_target,dbaccess_RowSetClones): \ - $(call gb_AllLangResTarget_get_target,ofa) - # vim: set noet sw=4 ts=4: diff --git a/dbaccess/CppunitTest_dbaccess_dialog_save.mk b/dbaccess/CppunitTest_dbaccess_dialog_save.mk index 68cfeb6eb808..408366ecb445 100644 --- a/dbaccess/CppunitTest_dbaccess_dialog_save.mk +++ b/dbaccess/CppunitTest_dbaccess_dialog_save.mk @@ -105,7 +105,4 @@ $(WORKDIR)/CppunitTest/testDialogSave.odb : $(SRCDIR)/dbaccess/qa/extras/testdoc cp -P -f "$<" "$@" .PHONY: $(WORKDIR)/CppunitTest/testDialogSave.odb -$(call gb_CppunitTest_get_target,dbaccess_dialog_save): \ - $(call gb_AllLangResTarget_get_target,ofa) - # vim: set noet sw=4 ts=4: diff --git a/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk b/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk index 268ebf8439ac..6d1e47df4a30 100644 --- a/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk +++ b/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk @@ -105,7 +105,4 @@ $(WORKDIR)/CppunitTest/testEmptyStdlibSave.odb : $(SRCDIR)/dbaccess/qa/extras/te cp -P -f "$<" "$@" .PHONY: $(WORKDIR)/CppunitTest/testEmptyStdlibSave.odb -$(call gb_CppunitTest_get_target,dbaccess_empty_stdlib_save): \ - $(call gb_AllLangResTarget_get_target,ofa) - # vim: set noet sw=4 ts=4: diff --git a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk index 41c54b05d85a..071f05c5e34a 100644 --- a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk +++ b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk @@ -78,7 +78,4 @@ $(eval $(call gb_CppunitTest_use_jars,dbaccess_hsqldb_test,\ $(eval $(call gb_CppunitTest_use_configuration,dbaccess_hsqldb_test)) -$(call gb_CppunitTest_get_target,dbaccess_hsqldb_test): \ - $(call gb_AllLangResTarget_get_target,ofa) - # vim: set noet sw=4 ts=4: diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk index 82829acd1ec7..8d8672e882fe 100644 --- a/dbaccess/CppunitTest_dbaccess_macros_test.mk +++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk @@ -98,7 +98,4 @@ $(eval $(call gb_CppunitTest_use_components,dbaccess_macros_test,\ $(eval $(call gb_CppunitTest_use_configuration,dbaccess_macros_test)) -$(call gb_CppunitTest_get_target,dbaccess_macros_test): \ - $(call gb_AllLangResTarget_get_target,ofa) - # vim: set noet sw=4 ts=4: diff --git a/dbaccess/CppunitTest_dbaccess_nolib_save.mk b/dbaccess/CppunitTest_dbaccess_nolib_save.mk index 71e517c2e31a..1490c024aeb2 100644 --- a/dbaccess/CppunitTest_dbaccess_nolib_save.mk +++ b/dbaccess/CppunitTest_dbaccess_nolib_save.mk @@ -105,7 +105,4 @@ $(WORKDIR)/CppunitTest/testNolibSave.odb : $(SRCDIR)/dbaccess/qa/extras/testdocu cp -P -f "$<" "$@" .PHONY: $(WORKDIR)/CppunitTest/testNolibSave.odb -$(call gb_CppunitTest_get_target,dbaccess_nolib_save): \ - $(call gb_AllLangResTarget_get_target,ofa) - # vim: set noet sw=4 ts=4: diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk index ed92df704917..9af43f75c3de 100644 --- a/dbaccess/Library_dba.mk +++ b/dbaccess/Library_dba.mk @@ -11,6 +11,7 @@ $(eval $(call gb_Library_Library,dba)) $(eval $(call gb_Library_set_include,dba,\ $$(INCLUDE) \ + -I$(SRCDIR)/dbaccess/inc \ -I$(SRCDIR)/dbaccess/source/inc \ -I$(SRCDIR)/dbaccess/source/core/inc \ -I$(WORKDIR)/YaccTarget/connectivity/source/parse \ diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk index ae92553677af..0bfcfe9b7e16 100644 --- a/dbaccess/Library_dbaxml.mk +++ b/dbaccess/Library_dbaxml.mk @@ -11,6 +11,7 @@ $(eval $(call gb_Library_Library,dbaxml)) $(eval $(call gb_Library_set_include,dbaxml,\ $$(INCLUDE) \ + -I$(SRCDIR)/dbaccess/inc \ -I$(SRCDIR)/dbaccess/source/inc \ )) @@ -68,7 +69,6 @@ $(eval $(call gb_Library_add_exception_objects,dbaxml,\ dbaccess/source/filter/xml/xmlTableFilterList \ dbaccess/source/filter/xml/xmlTableFilterPattern \ dbaccess/source/shared/flt_reghelper \ - dbaccess/source/shared/xmlstrings \ )) # vim: set noet sw=4 ts=4: diff --git a/dbaccess/Library_dbmm.mk b/dbaccess/Library_dbmm.mk index 3fb6dde2c7b5..95aa4502645c 100644 --- a/dbaccess/Library_dbmm.mk +++ b/dbaccess/Library_dbmm.mk @@ -24,6 +24,7 @@ $(eval $(call gb_Library_use_libraries,dbmm,\ comphelper \ cppu \ cppuhelper \ + dba \ sal \ svl \ svt \ @@ -39,7 +40,6 @@ $(eval $(call gb_Library_use_libraries,dbmm,\ $(eval $(call gb_Library_set_componentfile,dbmm,dbaccess/source/ext/macromigration/dbmm)) $(eval $(call gb_Library_add_exception_objects,dbmm,\ - dbaccess/source/ext/macromigration/dbmm_module \ dbaccess/source/ext/macromigration/dbmm_services \ dbaccess/source/ext/macromigration/dbmm_types \ dbaccess/source/ext/macromigration/docinteraction \ diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk index 2192c77e4ebe..0ea52842317c 100644 --- a/dbaccess/Library_dbu.mk +++ b/dbaccess/Library_dbu.mk @@ -166,7 +166,6 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\ dbaccess/source/ui/misc/imageprovider \ dbaccess/source/ui/misc/indexcollection \ dbaccess/source/ui/misc/linkeddocuments \ - dbaccess/source/ui/misc/moduledbu \ dbaccess/source/ui/misc/propertysetitem \ dbaccess/source/ui/misc/propertystorage \ dbaccess/source/ui/misc/RowSetDrop \ diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk index 50c67d364dc2..7af89f68911e 100644 --- a/dbaccess/Library_sdbt.mk +++ b/dbaccess/Library_sdbt.mk @@ -11,6 +11,7 @@ $(eval $(call gb_Library_Library,sdbt)) $(eval $(call gb_Library_set_include,sdbt,\ $$(INCLUDE) \ + -I$(SRCDIR)/dbaccess/inc/ \ -I$(SRCDIR)/dbaccess/source/inc/ \ -I$(SRCDIR)/dbaccess/source/sdbtools/inc \ )) @@ -25,6 +26,7 @@ $(eval $(call gb_Library_use_libraries,sdbt,\ comphelper \ cppu \ cppuhelper \ + dba \ dbtools \ sal \ salhelper \ @@ -39,9 +41,7 @@ $(eval $(call gb_Library_add_exception_objects,sdbt,\ dbaccess/source/sdbtools/connection/datasourcemetadata \ dbaccess/source/sdbtools/connection/objectnames \ dbaccess/source/sdbtools/connection/tablename \ - dbaccess/source/sdbtools/misc/module_sdbt \ dbaccess/source/sdbtools/misc/sdbt_services \ - dbaccess/source/shared/sdbtstrings \ )) # vim: set noet sw=4 ts=4: diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk index f7bd82efd669..d9f80fc11540 100644 --- a/dbaccess/Module_dbaccess.mk +++ b/dbaccess/Module_dbaccess.mk @@ -18,13 +18,6 @@ $(eval $(call gb_Module_add_targets,dbaccess,\ Library_dbmm \ Library_dbu \ Library_sdbt \ -)) - -$(eval $(call gb_Module_add_l10n_targets,dbaccess,\ - AllLangResTarget_dba \ - AllLangResTarget_dbmm \ - AllLangResTarget_dbu \ - AllLangResTarget_sdbt \ UIConfig_dbaccess \ UIConfig_dbapp \ UIConfig_dbbrowser \ @@ -34,6 +27,10 @@ $(eval $(call gb_Module_add_l10n_targets,dbaccess,\ UIConfig_dbtdata \ )) +$(eval $(call gb_Module_add_l10n_targets,dbaccess,\ + AllLangMoTarget_dba \ +)) + ifneq ($(OS),IOS) ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE) $(eval $(call gb_Module_add_check_targets,dbaccess,\ diff --git a/dbaccess/source/core/inc/core_resource.hxx b/dbaccess/inc/core_resource.hxx similarity index 81% rename from dbaccess/source/core/inc/core_resource.hxx rename to dbaccess/inc/core_resource.hxx index 2c52c7a41872..ecbdcdde5bf4 100644 --- a/dbaccess/source/core/inc/core_resource.hxx +++ b/dbaccess/inc/core_resource.hxx @@ -21,22 +21,20 @@ #define INCLUDED_DBACCESS_SOURCE_CORE_INC_CORE_RESOURCE_HXX #include +#include "dbadllapi.hxx" -class ResMgr; +#define DBA_RES( id ) ::dbaccess::ResourceManager::loadString( id ) +#define DBA_RES_PARAM( id, ascii, replace ) ::dbaccess::ResourceManager::loadString( id, ascii, replace ) namespace dbaccess { - -#define DBA_RES( id ) ResourceManager::loadString( id ) -#define DBA_RES_PARAM( id, ascii, replace ) ResourceManager::loadString( id, ascii, replace ) - // ResourceManager // handling resources within the DBA-Core library - class ResourceManager + class OOO_DLLPUBLIC_DBA ResourceManager { friend class OModuleClient; static sal_Int32 s_nClients; /// number of registered clients - static ResMgr* m_pImpl; + static std::locale* m_pImpl; private: // no instantiation allowed @@ -53,11 +51,11 @@ namespace dbaccess public: /** loads the string with the specified resource id */ - static OUString loadString(sal_uInt16 _nResId); + static OUString loadString(const char* pResId); /** loads a string from the resource file, substituting a placeholder with a given string - @param _nResId + @param pResId the resource ID of the string to load @param _pPlaceholderAscii the ASCII representation of the placeholder string @@ -65,14 +63,14 @@ namespace dbaccess the string which should substitute the placeholder */ static OUString loadString( - sal_uInt16 _nResId, - const sal_Char* _pPlaceholderAscii, + const char* pResId, + const sal_Char* _pPlaceholderAscii, const OUString& _rReplace ); /** loads a string from the resource file, substituting two placeholders with given strings - @param _nResId + @param pResId the resource ID of the string to load @param _pPlaceholderAscii1 the ASCII representation of the first placeholder string @@ -84,11 +82,11 @@ namespace dbaccess the string which should substitute the second placeholder */ static OUString loadString( - sal_uInt16 _nResId, - const sal_Char* _pPlaceholderAscii1, - const OUString& _rReplace1, - const sal_Char* _pPlaceholderAscii2, - const OUString& _rReplace2 + const char* pResId, + const sal_Char* _pPlaceholderAscii1, + const OUString& _rReplace1, + const sal_Char* _pPlaceholderAscii2, + const OUString& _rReplace2 ); }; diff --git a/dbaccess/source/inc/dbadllapi.hxx b/dbaccess/inc/dbadllapi.hxx similarity index 100% rename from dbaccess/source/inc/dbadllapi.hxx rename to dbaccess/inc/dbadllapi.hxx diff --git a/dbaccess/inc/pch/precompiled_dba.hxx b/dbaccess/inc/pch/precompiled_dba.hxx index 5e0f6e33eb85..592f0f7acb1e 100644 --- a/dbaccess/inc/pch/precompiled_dba.hxx +++ b/dbaccess/inc/pch/precompiled_dba.hxx @@ -264,7 +264,6 @@ #include #include #include -#include #include #include #include @@ -277,7 +276,6 @@ #include #include #include -#include #include #include #include diff --git a/dbaccess/inc/pch/precompiled_dbaxml.hxx b/dbaccess/inc/pch/precompiled_dbaxml.hxx index da594a547c78..d566e6f5f39e 100644 --- a/dbaccess/inc/pch/precompiled_dbaxml.hxx +++ b/dbaccess/inc/pch/precompiled_dbaxml.hxx @@ -91,14 +91,12 @@ #include #include #include -#include #include #include #include #include #include #include -#include #include #include #include diff --git a/dbaccess/inc/pch/precompiled_dbmm.hxx b/dbaccess/inc/pch/precompiled_dbmm.hxx index 02ec793771e7..5280bb6c3ba2 100644 --- a/dbaccess/inc/pch/precompiled_dbmm.hxx +++ b/dbaccess/inc/pch/precompiled_dbmm.hxx @@ -192,7 +192,6 @@ #include #include #include -#include #include #include #include @@ -203,7 +202,6 @@ #include #include #include -#include #include #include #include diff --git a/dbaccess/inc/pch/precompiled_dbu.hxx b/dbaccess/inc/pch/precompiled_dbu.hxx index c572c0098654..3adbf7daef0c 100644 --- a/dbaccess/inc/pch/precompiled_dbu.hxx +++ b/dbaccess/inc/pch/precompiled_dbu.hxx @@ -121,7 +121,6 @@ #include #include #include -#include #include #include #include @@ -140,7 +139,6 @@ #include #include #include -#include #include #include #include diff --git a/sw/source/ui/dialog/swdialmgr.cxx b/dbaccess/inc/query.hrc similarity index 73% rename from sw/source/ui/dialog/swdialmgr.cxx rename to dbaccess/inc/query.hrc index d9c86575cb6e..00a17a34aeef 100644 --- a/sw/source/ui/dialog/swdialmgr.cxx +++ b/dbaccess/inc/query.hrc @@ -16,25 +16,18 @@ * 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_VCL_INC_PRINTACCESSORYVIEW_HRC +#define INCLUDED_VCL_INC_PRINTACCESSORYVIEW_HRC -#include "dialmgr.hxx" -#include "swtypes.hxx" -#include +#define NC_(Context, String) (Context "\004" u8##String) + +const char* RSC_QUERY_OBJECT_TYPE[] = +{ + NC_("RSC_QUERY_OBJECT_TYPE", "The table view"), + NC_("RSC_QUERY_OBJECT_TYPE", "The query"), + NC_("RSC_QUERY_OBJECT_TYPE", "The SQL statement") +}; -#ifndef DISABLE_DYNLOADING -ResMgr* pSwResMgr=nullptr; -#else -static ResMgr *pSwResMgr; #endif -ResMgr* SwDialogsResMgr::GetResMgr() -{ - if ( !pSwResMgr ) - { - pSwResMgr = ResMgr::CreateResMgr( "sw" ); - } - - return pSwResMgr; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/inc/strings.hrc b/dbaccess/inc/strings.hrc new file mode 100644 index 000000000000..47068f43d09e --- /dev/null +++ b/dbaccess/inc/strings.hrc @@ -0,0 +1,495 @@ +/* -*- 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_DBACCESS_SOURCE_CORE_INC_CORE_RESOURCE_HRC +#define INCLUDED_DBACCESS_SOURCE_CORE_INC_CORE_RESOURCE_HRC + +#define NC_(Context, String) (Context "\004" u8##String) + +#define RID_STR_CONNECTION_INVALID NC_("RID_STR_CONNECTION_INVALID", "No connection could be established.") +#define RID_STR_TABLE_IS_FILTERED NC_("RID_STR_TABLE_IS_FILTERED", "The table $name$ already exists. It is not visible because it has been filtered out.") +#define RID_STR_COULDNOTCONNECT_UNSPECIFIED NC_("RID_STR_COULDNOTCONNECT_UNSPECIFIED", "The connection to the external data source could not be established. An unknown error occurred. The driver is probably defective.") +#define RID_STR_COULDNOTCONNECT_NODRIVER NC_("RID_STR_COULDNOTCONNECT_NODRIVER", "The connection to the external data source could not be established. No SDBC driver was found for the URL '$name$'.") +#define RID_STR_COULDNOTLOAD_MANAGER NC_("RID_STR_COULDNOTLOAD_MANAGER", "The connection to the external data source could not be established. The SDBC driver manager could not be loaded.") +#define RID_STR_FORM NC_("RID_STR_FORM", "Form") +#define RID_STR_REPORT NC_("RID_STR_REPORT", "Report") +#define RID_STR_DATASOURCE_NOT_STORED NC_("RID_STR_DATASOURCE_NOT_STORED", "The data source was not saved. Please use the interface XStorable to save the data source.") +#define RID_STR_ONLY_QUERY NC_("RID_STR_ONLY_QUERY", "The given command is not a SELECT statement.\nOnly queries are allowed.") +#define RID_STR_NO_VALUE_CHANGED NC_("RID_STR_NO_VALUE_CHANGED", "No values were modified.") +#define RID_STR_NO_XROWUPDATE NC_("RID_STR_NO_XROWUPDATE", "Values could not be inserted. The XRowUpdate interface is not supported by ResultSet.") +#define RID_STR_NO_XRESULTSETUPDATE NC_("RID_STR_NO_XRESULTSETUPDATE", "Values could not be inserted. The XResultSetUpdate interface is not supported by ResultSet.") +#define RID_STR_NO_UPDATE_MISSING_CONDITION NC_("RID_STR_NO_UPDATE_MISSING_CONDITION", "Values could not be modified, due to a missing condition statement.") +#define RID_STR_NO_COLUMN_ADD NC_("RID_STR_NO_COLUMN_ADD", "The adding of columns is not supported.") +#define RID_STR_NO_COLUMN_DROP NC_("RID_STR_NO_COLUMN_DROP", "The dropping of columns is not supported.") +#define RID_STR_NO_CONDITION_FOR_PK NC_("RID_STR_NO_CONDITION_FOR_PK", "The WHERE condition could not be created for the primary key.") +#define RID_STR_COLUMN_UNKNOWN_PROP NC_("RID_STR_COLUMN_UNKNOWN_PROP", "The column does not support the property '%value'.") +#define RID_STR_COLUMN_NOT_SEARCHABLE NC_("RID_STR_COLUMN_NOT_SEARCHABLE", "The column is not searchable!") +#define RID_STR_NOT_SEQUENCE_INT8 NC_("RID_STR_NOT_SEQUENCE_INT8", "The value of the columns is not of the type Sequence.") +#define RID_STR_COLUMN_NOT_VALID NC_("RID_STR_COLUMN_NOT_VALID", "The column is not valid.") +#define RID_STR_COLUMN_MUST_VISIBLE NC_("RID_STR_COLUMN_MUST_VISIBLE", "The column '%name' must be visible as a column.") +#define RID_STR_NO_XQUERIESSUPPLIER NC_("RID_STR_NO_XQUERIESSUPPLIER", "The interface XQueriesSupplier is not available.") +#define RID_STR_NO_ABS_ZERO NC_("RID_STR_NO_ABS_ZERO", "An 'absolute(0)' call is not allowed.") +#define RID_STR_NO_RELATIVE NC_("RID_STR_NO_RELATIVE", "Relative positioning is not allowed in this state.") +#define RID_STR_NO_REFESH_AFTERLAST NC_("RID_STR_NO_REFESH_AFTERLAST", "A row cannot be refreshed when the ResultSet is positioned after the last row.") +#define RID_STR_NO_MOVETOINSERTROW_CALLED NC_("RID_STR_NO_MOVETOINSERTROW_CALLED", "A new row cannot be inserted when the ResultSet is not first moved to the insert row.") +#define RID_STR_NO_UPDATEROW NC_("RID_STR_NO_UPDATEROW", "A row cannot be modified in this state") +#define RID_STR_NO_DELETEROW NC_("RID_STR_NO_DELETEROW", "A row cannot be deleted in this state.") +#define RID_STR_NO_TABLE_RENAME NC_("RID_STR_NO_TABLE_RENAME", "The driver does not support table renaming.") +#define RID_STR_COLUMN_ALTER_BY_NAME NC_("RID_STR_COLUMN_ALTER_BY_NAME", "The driver does not support the modification of column descriptions by changing the name.") +#define RID_STR_COLUMN_ALTER_BY_INDEX NC_("RID_STR_COLUMN_ALTER_BY_INDEX", "The driver does not support the modification of column descriptions by changing the index.") +#define RID_STR_FILE_DOES_NOT_EXIST NC_("RID_STR_FILE_DOES_NOT_EXIST", "The file \"$file$\" does not exist.") +#define RID_STR_TABLE_DOES_NOT_EXIST NC_("RID_STR_TABLE_DOES_NOT_EXIST", "There exists no table named \"$table$\".") +#define RID_STR_QUERY_DOES_NOT_EXIST NC_("RID_STR_QUERY_DOES_NOT_EXIST", "There exists no query named \"$table$\".") +#define RID_STR_CONFLICTING_NAMES NC_("RID_STR_CONFLICTING_NAMES", "There are tables in the database whose names conflict with the names of existing queries. To make full use of all queries and tables, make sure they have distinct names.") +#define RID_STR_COMMAND_LEADING_TO_ERROR NC_("RID_STR_COMMAND_LEADING_TO_ERROR", "The SQL command leading to this error is:\n\n$command$") +#define RID_STR_STATEMENT_WITHOUT_RESULT_SET NC_("RID_STR_STATEMENT_WITHOUT_RESULT_SET", "The SQL command does not describe a result set.") +#define RID_STR_NAME_MUST_NOT_BE_EMPTY NC_("RID_STR_NAME_MUST_NOT_BE_EMPTY", "The name must not be empty.") +#define RID_STR_NO_NULL_OBJECTS_IN_CONTAINER NC_("RID_STR_NO_NULL_OBJECTS_IN_CONTAINER", "The container cannot contain NULL objects.") +#define RID_STR_NAME_ALREADY_USED NC_("RID_STR_NAME_ALREADY_USED", "There already is an object with the given name.") +#define RID_STR_OBJECT_CONTAINER_MISMATCH NC_("RID_STR_OBJECT_CONTAINER_MISMATCH", "This object cannot be part of this container.") +#define RID_STR_OBJECT_ALREADY_CONTAINED NC_("RID_STR_OBJECT_ALREADY_CONTAINED", "The object already is, with a different name, part of the container.") +#define RID_STR_NAME_NOT_FOUND NC_("RID_STR_NAME_NOT_FOUND", "Unable to find the document '$name$'.") +#define RID_STR_ERROR_WHILE_SAVING NC_("RID_STR_ERROR_WHILE_SAVING", "Could not save the document to $location$:\n$message$") +#define RID_NO_SUCH_DATA_SOURCE NC_("RID_NO_SUCH_DATA_SOURCE", "Error accessing data source '$name$':\n$error$") +#define RID_STR_NO_SUB_FOLDER NC_("RID_STR_NO_SUB_FOLDER", "There exists no folder named \"$folder$\".") +#define RID_STR_NO_DELETE_BEFORE_AFTER NC_("RID_STR_NO_DELETE_BEFORE_AFTER", "Cannot delete the before-first or after-last row.") +#define RID_STR_NO_DELETE_INSERT_ROW NC_("RID_STR_NO_DELETE_INSERT_ROW", "Cannot delete the insert-row.") +#define RID_STR_RESULT_IS_READONLY NC_("RID_STR_RESULT_IS_READONLY", "Result set is read only.") +#define RID_STR_NO_DELETE_PRIVILEGE NC_("RID_STR_NO_DELETE_PRIVILEGE", "DELETE privilege not available.") +#define RID_STR_ROW_ALREADY_DELETED NC_("RID_STR_ROW_ALREADY_DELETED", "Current row is already deleted.") +#define RID_STR_UPDATE_FAILED NC_("RID_STR_UPDATE_FAILED", "Current row could not be updated.") +#define RID_STR_NO_INSERT_PRIVILEGE NC_("RID_STR_NO_INSERT_PRIVILEGE", "INSERT privilege not available.") +#define RID_STR_INTERNAL_ERROR NC_("RID_STR_INTERNAL_ERROR", "Internal error: no statement object provided by the database driver.") +#define RID_STR_EXPRESSION1 NC_("RID_STR_EXPRESSION1", "Expression1") +#define RID_STR_NO_SQL_COMMAND NC_("RID_STR_NO_SQL_COMMAND", "No SQL command was provided.") +#define RID_STR_INVALID_INDEX NC_("RID_STR_INVALID_INDEX", "Invalid column index.") +#define RID_STR_INVALID_CURSOR_STATE NC_("RID_STR_INVALID_CURSOR_STATE", "Invalid cursor state.") +#define RID_STR_CURSOR_BEFORE_OR_AFTER NC_("RID_STR_CURSOR_BEFORE_OR_AFTER", "The cursor points to before the first or after the last row.") +#define RID_STR_NO_BOOKMARK_BEFORE_OR_AFTER NC_("RID_STR_NO_BOOKMARK_BEFORE_OR_AFTER", "The rows before the first and after the last row don't have a bookmark.") +#define RID_STR_NO_BOOKMARK_DELETED NC_("RID_STR_NO_BOOKMARK_DELETED", "The current row is deleted, and thus doesn't have a bookmark.") +#define RID_STR_CONNECTION_REQUEST NC_("RID_STR_CONNECTION_REQUEST", "A connection for the following URL was requested \"$name$\".") +#define RID_STR_MISSING_EXTENSION NC_("RID_STR_MISSING_EXTENSION", "The extension is not installed.") + +#define STR_QUERY_AND_TABLE_DISTINCT_NAMES NC_("STR_QUERY_AND_TABLE_DISTINCT_NAMES", "You cannot give a table and a query the same name. Please use a name which is not yet used by a query or table.") +#define STR_BASENAME_TABLE NC_("STR_BASENAME_TABLE", "Table") +#define STR_BASENAME_QUERY NC_("STR_BASENAME_QUERY", "Query") +#define STR_CONN_WITHOUT_QUERIES_OR_TABLES NC_("STR_CONN_WITHOUT_QUERIES_OR_TABLES", "The given connection is no valid query and/or tables supplier.") +#define STR_NO_TABLE_OBJECT NC_("STR_NO_TABLE_OBJECT", "The given object is no table object.") +#define STR_INVALID_COMPOSITION_TYPE NC_("STR_INVALID_COMPOSITION_TYPE", "Invalid composition type - need a value from com.sun.star.sdb.tools.CompositionType.") +#define STR_INVALID_COMMAND_TYPE NC_("STR_INVALID_COMMAND_TYPE", "Invalid command type - only TABLE and QUERY from com.sun.star.sdb.CommandType are allowed.") + +#define STR_STATE_CLOSE_SUB_DOCS NC_("STR_STATE_CLOSE_SUB_DOCS", "Prepare") +#define STR_STATE_BACKUP_DBDOC NC_("STR_STATE_BACKUP_DBDOC", "Backup Document") +#define STR_STATE_MIGRATE NC_("STR_STATE_MIGRATE", "Migrate") +#define STR_STATE_SUMMARY NC_("STR_STATE_SUMMARY", "Summary") +// To translators: This refers to a form documen t inside a database document. +#define STR_FORM NC_("STR_FORM", "Form '$name$'") +// To translators: This refers to a report docum ent inside a database document. +#define STR_REPORT NC_("STR_REPORT", "Report '$name$'") +#define STR_OVERALL_PROGRESS NC_("STR_OVERALL_PROGRESS", "document $current$ of $overall$") +#define STR_DATABASE_DOCUMENT NC_("STR_DATABASE_DOCUMENT", "Database Document") +#define STR_SAVED_COPY_TO NC_("STR_SAVED_COPY_TO", "saved copy to $location$") +#define STR_MOVED_LIBRARY NC_("STR_MOVED_LIBRARY", "migrated $type$ library '$old$' to '$new$'") +#define STR_LIBRARY_TYPE_AND_NAME NC_("STR_LIBRARY_TYPE_AND_NAME", "$type$ library '$library$'") +#define STR_MIGRATING_LIBS NC_("STR_MIGRATING_LIBS", "migrating libraries ...") +#define STR_OOO_BASIC NC_("STR_OOO_BASIC", "%PRODUCTNAME Basic") +#define STR_JAVA_SCRIPT NC_("STR_JAVA_SCRIPT", "JavaScript") +#define STR_BEAN_SHELL NC_("STR_BEAN_SHELL", "BeanShell") +#define STR_JAVA NC_("STR_JAVA", "Java") +#define STR_PYTHON NC_("STR_PYTHON", "Python") +#define STR_DIALOG NC_("STR_DIALOG", "dialog") +#define STR_ERRORS NC_("STR_ERRORS", "Error(s)") +#define STR_WARNINGS NC_("STR_WARNINGS", "Warnings") +#define STR_EXCEPTION NC_("STR_EXCEPTION", "caught exception:") +#define STR_INVALID_BACKUP_LOCATION NC_("STR_INVALID_BACKUP_LOCATION", "You need to choose a backup location other than the document location itself.") +#define STR_INVALID_NUMBER_ARGS NC_("STR_INVALID_NUMBER_ARGS", "Invalid number of initialization arguments. Expected 1.") +#define STR_NO_DATABASE NC_("STR_NO_DATABASE", "No database document found in the initialization arguments.") +#define STR_NOT_READONLY NC_("STR_NOT_READONLY", "Not applicable to read-only documents.") + +#define STR_QUERY_UNDO_TABWINSHOW NC_("STR_QUERY_UNDO_TABWINSHOW", "Add Table Window" ) +#define STR_QUERY_UNDO_MOVETABWIN NC_("STR_QUERY_UNDO_MOVETABWIN", "Move table window" ) +#define STR_QUERY_UNDO_INSERTCONNECTION NC_("STR_QUERY_UNDO_INSERTCONNECTION", "Insert Join" ) +#define STR_QUERY_UNDO_REMOVECONNECTION NC_("STR_QUERY_UNDO_REMOVECONNECTION", "Delete Join" ) +#define STR_QUERY_UNDO_SIZETABWIN NC_("STR_QUERY_UNDO_SIZETABWIN", "Resize table window" ) +#define STR_QUERY_UNDO_TABFIELDDELETE NC_("STR_QUERY_UNDO_TABFIELDDELETE", "Delete Column" ) +#define STR_QUERY_UNDO_TABFIELDMOVED NC_("STR_QUERY_UNDO_TABFIELDMOVED", "Move column") +#define STR_QUERY_UNDO_TABFIELDCREATE NC_("STR_QUERY_UNDO_TABFIELDCREATE", "Add Column" ) +#define RID_STR_FIELD_DOESNT_EXIST NC_("RID_STR_FIELD_DOESNT_EXIST", "Invalid expression, field name '$name$' does not exist.") +#define STR_QUERY_UNDO_TABWINDELETE NC_("STR_QUERY_UNDO_TABWINDELETE", "Delete Table Window" ) +#define STR_QUERY_UNDO_MODIFY_CELL NC_("STR_QUERY_UNDO_MODIFY_CELL", "Edit Column Description") +#define STR_QUERY_UNDO_SIZE_COLUMN NC_("STR_QUERY_UNDO_SIZE_COLUMN", "Adjust column width") +#define STR_QUERY_SORTTEXT NC_("STR_QUERY_SORTTEXT", "(not sorted);ascending;descending" ) +#define STR_QUERY_FUNCTIONS NC_("STR_QUERY_FUNCTIONS", "(no function);Group") +#define STR_QUERY_NOTABLE NC_("STR_QUERY_NOTABLE", "(no table)") +#define STR_QRY_ORDERBY_UNRELATED NC_("STR_QRY_ORDERBY_UNRELATED", "The database only supports sorting for visible fields.") +#define STR_QUERY_HANDLETEXT NC_("STR_QUERY_HANDLETEXT", "Field;Alias;Table;Sort;Visible;Function;Criterion;Or;Or") +#define STR_QUERY_LIMIT_ALL NC_("STR_QUERY_LIMIT_ALL", "All") +#define STR_QRY_TOO_MANY_COLUMNS NC_("STR_QRY_TOO_MANY_COLUMNS", "There are too many columns.") +#define STR_QRY_CRITERIA_ON_ASTERISK NC_("STR_QRY_CRITERIA_ON_ASTERISK", "A condition cannot be applied to field [*]" ) +#define STR_QRY_TOO_LONG_STATEMENT NC_("STR_QRY_TOO_LONG_STATEMENT", "The SQL statement created is too long.") +#define STR_QRY_TOOCOMPLEX NC_("STR_QRY_TOOCOMPLEX", "Query is too complex" ) +#define STR_QRY_NOSELECT NC_("STR_QRY_NOSELECT", "Nothing has been selected." ) +#define STR_QRY_SYNTAX NC_("STR_QRY_SYNTAX", "SQL syntax error" ) +#define STR_QRY_ORDERBY_ON_ASTERISK NC_("STR_QRY_ORDERBY_ON_ASTERISK", "[*] cannot be used as a sort criterion.") +#define STR_QRY_TOO_MANY_TABLES NC_("STR_QRY_TOO_MANY_TABLES", "There are too many tables.") +#define STR_QRY_NATIVE NC_("STR_QRY_NATIVE", "The statement will not be applied when querying in the SQL dialect of the database." ) +#define STR_QRY_ILLEGAL_JOIN NC_("STR_QRY_ILLEGAL_JOIN", "Join could not be processed" ) +#define STR_SVT_SQL_SYNTAX_ERROR NC_("STR_SVT_SQL_SYNTAX_ERROR", "Syntax error in SQL statement" ) +#define STR_QUERYDESIGN_NO_VIEW_SUPPORT NC_("STR_QUERYDESIGN_NO_VIEW_SUPPORT", "This database does not support table views.") +#define STR_NO_ALTER_VIEW_SUPPORT NC_("STR_NO_ALTER_VIEW_SUPPORT", "This database does not support altering of existing table views.") +#define STR_QUERYDESIGN_NO_VIEW_ASK NC_("STR_QUERYDESIGN_NO_VIEW_ASK", "Do you want to create a query instead?") +#define STR_DATASOURCE_DELETED NC_("STR_DATASOURCE_DELETED", "The corresponding data source has been deleted. Therefore, data relevant to that data source cannot be saved.") +#define STR_QRY_COLUMN_NOT_FOUND NC_("STR_QRY_COLUMN_NOT_FOUND", "The column '$name$' is unknown.") +#define STR_QRY_JOIN_COLUMN_COMPARE NC_("STR_QRY_JOIN_COLUMN_COMPARE", "Columns can only be compared using '='.") +#define STR_QRY_LIKE_LEFT_NO_COLUMN NC_("STR_QRY_LIKE_LEFT_NO_COLUMN", "You must use a column name before 'LIKE'.") +#define STR_QRY_CHECK_CASESENSITIVE NC_("STR_QRY_CHECK_CASESENSITIVE", "The column could not be found. Please note that the database is case-sensitive.") +// To translators: For $object$, one of the valu es of the RSC_QUERY_OBJECT_TYPE resource will be inserted. +#define STR_QUERY_SAVEMODIFIED NC_("STR_QUERY_SAVEMODIFIED", "$object$ has been changed.\nDo you want to save the changes?" ) +// To translators: For $object$, one of the valu es of the RSC_QUERY_OBJECT_TYPE resource (except \"SQL command\", which doesn't make sense here) will be inserted. +#define STR_ERROR_PARSING_STATEMENT NC_("STR_ERROR_PARSING_STATEMENT", "$object$ is based on an SQL command which could not be parsed.") +// To translators: For $object$, one of the valu es of the RSC_QUERY_OBJECT_TYPE resource (except \"SQL command\", which doesn't make sense here) will be inserted. +#define STR_INFO_OPENING_IN_SQL_VIEW NC_("STR_INFO_OPENING_IN_SQL_VIEW", "$object$ will be opened in SQL view.") +#define STR_STATEMENT_WITHOUT_RESULT_SET NC_("STR_STATEMENT_WITHOUT_RESULT_SET", "The query does not create a result set, and thus cannot be part of another query.") + +#define RID_STR_COLUMN_FORMAT NC_("RID_STR_COLUMN_FORMAT", "Column ~Format...") +#define RID_STR_COLUMN_WIDTH NC_("RID_STR_COLUMN_WIDTH", "Column ~Width...") +#define RID_STR_TABLE_FORMAT NC_("RID_STR_TABLE_FORMAT", "Table Format...") +#define RID_STR_ROW_HEIGHT NC_("RID_STR_ROW_HEIGHT", "Row Height...") +#define RID_STR_COPY NC_("RID_STR_COPY", "~Copy") +#define RID_STR_UNDO_MODIFY_RECORD NC_("RID_STR_UNDO_MODIFY_RECORD", "Undo: Data Input") +#define RID_STR_SAVE_CURRENT_RECORD NC_("RID_STR_SAVE_CURRENT_RECORD", "Save current record") +#define STR_QRY_TITLE NC_("STR_QRY_TITLE", "Query #" ) +#define STR_TBL_TITLE NC_("STR_TBL_TITLE", "Table #" ) +#define STR_VIEW_TITLE NC_("STR_VIEW_TITLE", "View #" ) +#define STR_NAME_ALREADY_EXISTS NC_("STR_NAME_ALREADY_EXISTS", "The name \"#\" already exists.") +#define STR_NO_COLUMNNAME_MATCHING NC_("STR_NO_COLUMNNAME_MATCHING", "No matching column names were found.") +#define STR_ERROR_OCCURRED_WHILE_COPYING NC_("STR_ERROR_OCCURRED_WHILE_COPYING", "An error occurred. Do you want to continue copying?") +#define STR_DATASOURCE_GRIDCONTROL_NAME NC_("STR_DATASOURCE_GRIDCONTROL_NAME", "Data source table view") +#define STR_DATASOURCE_GRIDCONTROL_DESC NC_("STR_DATASOURCE_GRIDCONTROL_DESC", "Shows the selected table or query.") + +#define STR_QUERY_UNDO_MODIFYSQLEDIT NC_("STR_QUERY_UNDO_MODIFYSQLEDIT", "Modify SQL statement(s)" ) + +#define RID_STR_NEW_FORM NC_("RID_STR_NEW_FORM", "Create Form in Design View..." ) +#define RID_STR_NEW_FORM_AUTO NC_("RID_STR_NEW_FORM_AUTO", "Use Wizard to Create Form..." ) +#define RID_STR_NEW_REPORT_AUTO NC_("RID_STR_NEW_REPORT_AUTO", "Use Wizard to Create Report..." ) +#define RID_STR_NEW_REPORT NC_("RID_STR_NEW_REPORT", "Create Report in Design View..." ) +#define RID_STR_NEW_QUERY NC_("RID_STR_NEW_QUERY", "Create Query in Design View..." ) +#define RID_STR_NEW_QUERY_SQL NC_("RID_STR_NEW_QUERY_SQL", "Create Query in SQL View..." ) +#define RID_STR_NEW_QUERY_AUTO NC_("RID_STR_NEW_QUERY_AUTO", "Use Wizard to Create Query..." ) +#define RID_STR_NEW_TABLE NC_("RID_STR_NEW_TABLE", "Create Table in Design View..." ) +#define RID_STR_NEW_TABLE_AUTO NC_("RID_STR_NEW_TABLE_AUTO", "Use Wizard to Create Table..." ) +#define RID_STR_NEW_VIEW NC_("RID_STR_NEW_VIEW", "Create View..." ) +#define RID_STR_FORMS_CONTAINER NC_("RID_STR_FORMS_CONTAINER", "Forms" ) +#define RID_STR_REPORTS_CONTAINER NC_("RID_STR_REPORTS_CONTAINER", "Reports" ) +#define RID_STR_REPORTS_HELP_TEXT_WIZARD NC_("RID_STR_REPORTS_HELP_TEXT_WIZARD", "The wizard will guide you through the steps necessary to create a report." ) +#define RID_STR_FORMS_HELP_TEXT NC_("RID_STR_FORMS_HELP_TEXT", "Create a form by specifying the record source, controls, and control properties." ) +#define RID_STR_REPORT_HELP_TEXT NC_("RID_STR_REPORT_HELP_TEXT", "Create a report by specifying the record source, controls, and control properties." ) +#define RID_STR_FORMS_HELP_TEXT_WIZARD NC_("RID_STR_FORMS_HELP_TEXT_WIZARD", "The wizard will guide you through the steps necessary to create a form." ) +#define RID_STR_QUERIES_HELP_TEXT NC_("RID_STR_QUERIES_HELP_TEXT", "Create a query by specifying the filters, input tables, field names, and properties for sorting or grouping." ) +#define RID_STR_QUERIES_HELP_TEXT_SQL NC_("RID_STR_QUERIES_HELP_TEXT_SQL", "Create a query by entering an SQL statement directly." ) +#define RID_STR_QUERIES_HELP_TEXT_WIZARD NC_("RID_STR_QUERIES_HELP_TEXT_WIZARD", "The wizard will guide you through the steps necessary to create a query." ) +#define RID_STR_TABLES_HELP_TEXT_DESIGN NC_("RID_STR_TABLES_HELP_TEXT_DESIGN", "Create a table by specifying the field names and properties, as well as the data types." ) +#define RID_STR_TABLES_HELP_TEXT_WIZARD NC_("RID_STR_TABLES_HELP_TEXT_WIZARD", "Choose from a selection of business and personal table samples, which you customize to create a table." ) +#define RID_STR_VIEWS_HELP_TEXT_DESIGN NC_("RID_STR_VIEWS_HELP_TEXT_DESIGN", "Create a view by specifying the tables and field names you would like to have visible." ) +#define STR_DATABASE NC_("STR_DATABASE", "Database" ) +#define STR_TASKS NC_("STR_TASKS", "Tasks" ) +#define STR_DESCRIPTION NC_("STR_DESCRIPTION", "Description" ) +#define STR_PREVIEW NC_("STR_PREVIEW", "Preview" ) +#define STR_QUERY_CLOSEDOCUMENTS NC_("STR_QUERY_CLOSEDOCUMENTS", "The connection type has been altered.\n" \ + "For the changes to take effect, all forms, reports, queries and tables must be closed.\n\n" \ + "Do you want to close all documents now?") +#define STR_FRM_LABEL NC_("STR_FRM_LABEL", "F~orm name" ) +#define STR_RPT_LABEL NC_("STR_RPT_LABEL", "~Report name" ) +#define STR_FOLDER_LABEL NC_("STR_FOLDER_LABEL", "F~older name" ) +#define STR_SUB_DOCS_WITH_SCRIPTS NC_("STR_SUB_DOCS_WITH_SCRIPTS", "The document contains forms or reports with embedded macros.") +#define STR_SUB_DOCS_WITH_SCRIPTS_DETAIL NC_("STR_SUB_DOCS_WITH_SCRIPTS_DETAIL", "Macros should be embedded into the database document itself.\n\n" \ + "You can continue to use your document as before, however, you are encouraged to migrate " \ + "your macros. The menu item 'Tools / Migrate Macros ...' will assist you with this.\n\n" \ + "Note that you won't be able to embed macros into the database document itself until " \ + "this migration is done. ") +#define RID_STR_EMBEDDED_DATABASE NC_("RID_STR_EMBEDDED_DATABASE", "Embedded database") +#define RID_STR_NO_DIFF_CAT NC_("RID_STR_NO_DIFF_CAT", "You cannot select different categories.") +#define RID_STR_UNSUPPORTED_OBJECT_TYPE NC_("RID_STR_UNSUPPORTED_OBJECT_TYPE", "Unsupported object type found ($type$).") +#define STR_PAGETITLE_GENERAL NC_("STR_PAGETITLE_GENERAL", "Advanced Properties") +#define STR_PAGETITLE_ADVANCED NC_("STR_PAGETITLE_ADVANCED", "Additional Settings") +#define STR_PAGETITLE_CONNECTION NC_("STR_PAGETITLE_CONNECTION", "Connection settings") +#define STR_TBL_LABEL NC_("STR_TBL_LABEL", "~Table Name") +#define STR_QRY_LABEL NC_("STR_QRY_LABEL", "~Query name") +#define STR_TITLE_RENAME NC_("STR_TITLE_RENAME", "Rename to") +#define STR_TITLE_PASTE_AS NC_("STR_TITLE_PASTE_AS", "Insert as") + +#define STR_QUERY_BRW_DELETE_ROWS NC_("STR_QUERY_BRW_DELETE_ROWS", "Do you want to delete the selected data?" ) +#define SBA_BROWSER_SETTING_ORDER NC_("SBA_BROWSER_SETTING_ORDER", "Error setting the sort criteria") +#define SBA_BROWSER_SETTING_FILTER NC_("SBA_BROWSER_SETTING_FILTER", "Error setting the filter criteria") +#define RID_STR_CONNECTION_LOST NC_("RID_STR_CONNECTION_LOST", "Connection lost") +#define RID_STR_QUERIES_CONTAINER NC_("RID_STR_QUERIES_CONTAINER", "Queries") +#define RID_STR_TABLES_CONTAINER NC_("RID_STR_TABLES_CONTAINER", "Tables") +#define STR_TITLE_CONFIRM_DELETION NC_("STR_TITLE_CONFIRM_DELETION", "Confirm Deletion" ) +#define STR_QUERY_DELETE_TABLE NC_("STR_QUERY_DELETE_TABLE", "Do you want to delete the table '%1'?" ) +#define STR_QUERY_CONNECTION_LOST NC_("STR_QUERY_CONNECTION_LOST", "The connection to the database has been lost. Do you want to reconnect?" ) +#define STR_OPENTABLES_WARNINGS NC_("STR_OPENTABLES_WARNINGS", "Warnings encountered") +#define STR_OPENTABLES_WARNINGS_DETAILS NC_("STR_OPENTABLES_WARNINGS_DETAILS", "While retrieving the tables, warnings were reported by the database connection.") +#define STR_CONNECTING_DATASOURCE NC_("STR_CONNECTING_DATASOURCE", "Connecting to \"$name$\" ...") +#define STR_LOADING_QUERY NC_("STR_LOADING_QUERY", "Loading query $name$ ...") +#define STR_LOADING_TABLE NC_("STR_LOADING_TABLE", "Loading table $name$ ...") +#define STR_NO_TABLE_FORMAT_INSIDE NC_("STR_NO_TABLE_FORMAT_INSIDE", "No table format could be found." ) +#define STR_COULDNOTCONNECT_DATASOURCE NC_("STR_COULDNOTCONNECT_DATASOURCE", "The connection to the data source \"$name$\" could not be established.") + +#define STR_TABLEDESIGN_DBFIELDTYPES NC_("STR_TABLEDESIGN_DBFIELDTYPES", "Unknown;Text;Number;Date/Time;Date;Time;Yes/No;Currency;Memo;Counter;Image;Text (fix);Decimal;Binary (fix);Binary;BigInt;Double;Float;Real;Integer;Small Integer;Tiny Integer;SQL Null;Object;Distinct;Structure;Field;BLOB;CLOB;REF;OTHER;Bit (fix)") +#define STR_TABLEDESIGN_UNDO_PRIMKEY NC_("STR_TABLEDESIGN_UNDO_PRIMKEY", "Insert/remove primary key" ) +#define STR_VALUE_YES NC_("STR_VALUE_YES", "Yes" ) +#define STR_VALUE_NO NC_("STR_VALUE_NO", "No" ) +// Note: should somehow fit to the word "value" in other languages as well: value - none .... +#define STR_VALUE_NONE NC_("STR_VALUE_NONE", "") +#define STR_TAB_FIELD_NAME NC_("STR_TAB_FIELD_NAME", "Field name" ) +#define STR_TAB_FIELD_COLUMN_NAME NC_("STR_TAB_FIELD_COLUMN_NAME", "Field Name" ) +#define STR_TAB_FIELD_DATATYPE NC_("STR_TAB_FIELD_DATATYPE", "Field ~type" ) +#define STR_TAB_FIELD_COLUMN_DATATYPE NC_("STR_TAB_FIELD_COLUMN_DATATYPE", "Field Type" ) +#define STR_TAB_HELP_TEXT NC_("STR_TAB_HELP_TEXT", "Description" ) +#define STR_COLUMN_DESCRIPTION NC_("STR_COLUMN_DESCRIPTION", "Column Description" ) +#define STR_FIELD_AUTOINCREMENT NC_("STR_FIELD_AUTOINCREMENT", "~AutoValue") +#define STR_TAB_PROPERTIES NC_("STR_TAB_PROPERTIES", "Field Properties" ) +#define STR_TABED_UNDO_CELLMODIFIED NC_("STR_TABED_UNDO_CELLMODIFIED", "Modify cell" ) +#define STR_TABED_UNDO_ROWDELETED NC_("STR_TABED_UNDO_ROWDELETED", "Delete row" ) +#define STR_TABED_UNDO_TYPE_CHANGED NC_("STR_TABED_UNDO_TYPE_CHANGED", "Modify field type") +#define STR_TABED_UNDO_ROWINSERTED NC_("STR_TABED_UNDO_ROWINSERTED", "Insert row" ) +#define STR_TABED_UNDO_NEWROWINSERTED NC_("STR_TABED_UNDO_NEWROWINSERTED", "Insert new row" ) +#define STR_DEFAULT_VALUE NC_("STR_DEFAULT_VALUE", "~Default value" ) +#define STR_FIELD_REQUIRED NC_("STR_FIELD_REQUIRED", "~Entry required" ) +#define STR_TEXT_LENGTH NC_("STR_TEXT_LENGTH", "~Length" ) +#define STR_NUMERIC_TYPE NC_("STR_NUMERIC_TYPE", "~Type" ) +#define STR_LENGTH NC_("STR_LENGTH", "~Length" ) +#define STR_SCALE NC_("STR_SCALE", "Decimal ~places" ) +#define STR_FORMAT NC_("STR_FORMAT", "Format example") +#define STR_HELP_BOOL_DEFAULT NC_("STR_HELP_BOOL_DEFAULT", "Select a value that is to appear in all new records as default.\nIf the field is not to have a default value, select the empty string.") +#define STR_HELP_DEFAULT_VALUE NC_("STR_HELP_DEFAULT_VALUE", "Enter a default value for this field.\n\nWhen you later enter data in the table, this string will be used in each new record for the field selected. It should, therefore, correspond to the cell format that needs to be entered below." ) +#define STR_HELP_FIELD_REQUIRED NC_("STR_HELP_FIELD_REQUIRED", "Activate this option if this field cannot contain NULL values, i.e. the user must always enter data." ) +#define STR_HELP_TEXT_LENGTH NC_("STR_HELP_TEXT_LENGTH", "Enter the maximum text length permitted." ) +#define STR_HELP_NUMERIC_TYPE NC_("STR_HELP_NUMERIC_TYPE", "Enter the number format." ) +#define STR_HELP_LENGTH NC_("STR_HELP_LENGTH", "Determine the length data can have in this field.\n\nIf decimal fields, then the maximum length of the number to be entered, if binary fields, then the length of the data block.\nThe value will be corrected accordingly when it exceeds the maximum for this database." ) +#define STR_HELP_SCALE NC_("STR_HELP_SCALE", "Specify the number of decimal places permitted in this field." ) +#define STR_HELP_FORMAT_CODE NC_("STR_HELP_FORMAT_CODE", "This is where you see how the data would be displayed in the current format (use the button on the right to modify the format).") +#define STR_HELP_FORMAT_BUTTON NC_("STR_HELP_FORMAT_BUTTON", "This is where you determine the output format of the data.") +#define STR_HELP_AUTOINCREMENT NC_("STR_HELP_AUTOINCREMENT", "Choose if this field should contain AutoIncrement values.\n\nYou can not enter data in fields of this type. An intrinsic value will be assigned to each new record automatically (resulting from the increment of the previous record)." ) +#define STR_BUTTON_FORMAT NC_("STR_BUTTON_FORMAT", "~...") +#define STR_TABLEDESIGN_DUPLICATE_NAME NC_("STR_TABLEDESIGN_DUPLICATE_NAME", "The table cannot be saved because column name \"$column$\" was assigned twice.") +#define STR_TBL_COLUMN_IS_KEYCOLUMN NC_("STR_TBL_COLUMN_IS_KEYCOLUMN", "The column \"$column$\" belongs to the primary key. If the column is deleted, the primary key will also be deleted. Do you really want to continue?") +#define STR_TBL_COLUMN_IS_KEYCOLUMN_TITLE NC_("STR_TBL_COLUMN_IS_KEYCOLUMN_TITLE", "Primary Key Affected") +#define STR_COLUMN_NAME NC_("STR_COLUMN_NAME", "Column") +#define STR_QRY_CONTINUE NC_("STR_QRY_CONTINUE", "Continue anyway?" ) +#define STR_TABLEDESIGN_CONNECTION_MISSING NC_("STR_TABLEDESIGN_CONNECTION_MISSING", "The table could not be saved due to problems connecting to the database.") +#define STR_TABLEDESIGN_DATASOURCE_DELETED NC_("STR_TABLEDESIGN_DATASOURCE_DELETED", "The table filter could not be adjusted because the data source has been deleted.") +#define STR_QUERY_SAVE_TABLE_EDIT_INDEXES NC_("STR_QUERY_SAVE_TABLE_EDIT_INDEXES", "Before you can edit the indexes of a table, you have to save it.\nDo you want to save the changes now?") +#define STR_TABLEDESIGN_NO_PRIM_KEY_HEAD NC_("STR_TABLEDESIGN_NO_PRIM_KEY_HEAD", "No primary key" ) +#define STR_TABLEDESIGN_NO_PRIM_KEY NC_("STR_TABLEDESIGN_NO_PRIM_KEY", "A unique index or primary key is required for data record identification in this database.\nYou can only enter data into this table when one of these two structural conditions has been met.\n\nShould a primary key be created now?" ) +#define STR_TABLEDESIGN_ALTER_ERROR NC_("STR_TABLEDESIGN_ALTER_ERROR", "The column \"$column$\" could not be changed. Should the column instead be deleted and the new format appended?" ) +#define STR_TABLEDESIGN_SAVE_ERROR NC_("STR_TABLEDESIGN_SAVE_ERROR", "Error while saving the table design") +#define STR_TABLEDESIGN_COULD_NOT_DROP_COL NC_("STR_TABLEDESIGN_COULD_NOT_DROP_COL", "The column $column$ could not be deleted.") +#define STR_AUTOINCREMENT_VALUE NC_("STR_AUTOINCREMENT_VALUE", "A~uto-increment statement") +#define STR_HELP_AUTOINCREMENT_VALUE NC_("STR_HELP_AUTOINCREMENT_VALUE", "Enter an SQL statement for the auto-increment field.\n\nThis statement will be directly transferred to the database when the table is created.") +#define STR_NO_TYPE_INFO_AVAILABLE NC_("STR_NO_TYPE_INFO_AVAILABLE", "No type information could be retrieved from the database.\nThe table design mode is not available for this data source.") +#define STR_CHANGE_COLUMN_NAME NC_("STR_CHANGE_COLUMN_NAME", "change field name") +#define STR_CHANGE_COLUMN_TYPE NC_("STR_CHANGE_COLUMN_TYPE", "change field type") +#define STR_CHANGE_COLUMN_DESCRIPTION NC_("STR_CHANGE_COLUMN_DESCRIPTION", "change field description") +#define STR_CHANGE_COLUMN_ATTRIBUTE NC_("STR_CHANGE_COLUMN_ATTRIBUTE", "change field attribute") + +#define STR_ENTER_CONNECTION_PASSWORD NC_("STR_ENTER_CONNECTION_PASSWORD", "A password is needed to connect to the data source \"$name$\".") +#define STR_ASK_FOR_DIRECTORY_CREATION NC_("STR_ASK_FOR_DIRECTORY_CREATION", "The directory\n\n$path$\n\ndoes not exist. Should it be created?") +#define STR_COULD_NOT_CREATE_DIRECTORY NC_("STR_COULD_NOT_CREATE_DIRECTORY", "The directory $name$ could not be created.") +#define STR_ALREADYEXISTOVERWRITE NC_("STR_ALREADYEXISTOVERWRITE", "The file already exists. Overwrite?" ) +#define STR_NEW_FOLDER NC_("STR_NEW_FOLDER", "Folder" ) + +#define STR_DATABASE_TYPE_CHANGE NC_("STR_DATABASE_TYPE_CHANGE", "Database properties" ) +#define STR_PARENTTITLE_GENERAL NC_("STR_PARENTTITLE_GENERAL", "Data Source Properties: #" ) +#define STR_ERR_USE_CONNECT_TO NC_("STR_ERR_USE_CONNECT_TO", "Please choose 'Connect to an existing database' to connect to an existing database instead.") +#define STR_COULD_NOT_LOAD_ODBC_LIB NC_("STR_COULD_NOT_LOAD_ODBC_LIB", "Could not load the program library #lib# or it is corrupted. The ODBC data source selection is not available.") +#define STR_UNSUPPORTED_DATASOURCE_TYPE NC_("STR_UNSUPPORTED_DATASOURCE_TYPE", "This kind of data source is not supported on this platform.\nYou are allowed to change the settings, but you probably will not be able to connect to the database.") +#define STR_AUTOTEXT_FIELD_SEP_NONE NC_("STR_AUTOTEXT_FIELD_SEP_NONE", "{None}") +// To translators: EM Dec 2002: 'Space' refers t o what you get when you hit the space bar on your keyboard. +#define STR_AUTOFIELDSEPARATORLIST NC_("STR_AUTOFIELDSEPARATORLIST", ";\t59\t,\t44\t:\t58\t{Tab}\t9\t{Space}\t32" ) +#define STR_AUTODELIMITER_MISSING NC_("STR_AUTODELIMITER_MISSING", "#1 must be set." ) +#define STR_AUTODELIMITER_MUST_DIFFER NC_("STR_AUTODELIMITER_MUST_DIFFER", "#1 and #2 must be different." ) +#define STR_AUTONO_WILDCARDS NC_("STR_AUTONO_WILDCARDS", "Wildcards such as ?,* are not allowed in #1." ) + +#define STR_CONNECTION_TEST NC_("STR_CONNECTION_TEST", "Connection Test") +#define STR_CONNECTION_SUCCESS NC_("STR_CONNECTION_SUCCESS", "The connection was established successfully.") +#define STR_CONNECTION_NO_SUCCESS NC_("STR_CONNECTION_NO_SUCCESS", "The connection could not be established.") +#define STR_JDBCDRIVER_SUCCESS NC_("STR_JDBCDRIVER_SUCCESS", "The JDBC driver was loaded successfully.") +#define STR_JDBCDRIVER_NO_SUCCESS NC_("STR_JDBCDRIVER_NO_SUCCESS", "The JDBC driver could not be loaded.") +#define STR_MSACCESS_FILTERNAME NC_("STR_MSACCESS_FILTERNAME", "MS Access file") +#define STR_MSACCESS_2007_FILTERNAME NC_("STR_MSACCESS_2007_FILTERNAME", "MS Access 2007 file") +#define STR_FIREBIRD_FILTERNAME NC_("STR_FIREBIRD_FILTERNAME", "Firebird Database") + +#define STR_RSC_CHARSETS NC_("STR_RSC_CHARSETS", "System") +#define STR_ERROR_DURING_CREATION NC_("STR_ERROR_DURING_CREATION", "Error during creation") +#define STR_UNEXPECTED_ERROR NC_("STR_UNEXPECTED_ERROR", "An unexpected error occurred. The operation could not be performed.") +#define STR_COULDNOTOPEN_LINKEDDOC NC_("STR_COULDNOTOPEN_LINKEDDOC", "The document \"$file$\" could not be opened.") +#define STR_MISSING_TABLES_XDROP NC_("STR_MISSING_TABLES_XDROP", "The table cannot be deleted because the database connection does not support this.") +#define STR_BUTTON_TEXT_ALL NC_("STR_BUTTON_TEXT_ALL", "~All") +#define STR_UNDO_COLON NC_("STR_UNDO_COLON", "Undo:") +#define STR_REDO_COLON NC_("STR_REDO_COLON", "Redo:") +#define STR_UNKNOWN_TYPE_FOUND NC_("STR_UNKNOWN_TYPE_FOUND", "No corresponding column type could be found for column '#1'." ) +#define STR_FILE_DOES_NOT_EXIST NC_("STR_FILE_DOES_NOT_EXIST", "The file \"$file$\" does not exist.") +#define STR_WARNINGS_DURING_CONNECT NC_("STR_WARNINGS_DURING_CONNECT", "Warnings were encountered while connecting to the data source. Press \"$buttontext$\" to view them.") +#define STR_NAMED_OBJECT_ALREADY_EXISTS NC_("STR_NAMED_OBJECT_ALREADY_EXISTS", "The name '$#$' already exists.\nPlease enter another name." ) +// #i96130# use hard coded name +#define RID_STR_EXTENSION_NOT_PRESENT NC_("RID_STR_EXTENSION_NOT_PRESENT", "The report, \"$file$\", requires the Oracle Report Builder feature.") + +#define STR_COULDNOTCREATE_DRIVERMANAGER NC_("STR_COULDNOTCREATE_DRIVERMANAGER", "Cannot connect to the SDBC driver manager (#servicename#).") +#define STR_NOREGISTEREDDRIVER NC_("STR_NOREGISTEREDDRIVER", "A driver is not registered for the URL #connurl#.") +#define STR_NOTABLEINFO NC_("STR_NOTABLEINFO", "Successfully connected, but information about database tables is not available.") +#define STR_ALL_TABLES NC_("STR_ALL_TABLES", "All tables") +#define STR_ALL_VIEWS NC_("STR_ALL_VIEWS", "All views") +#define STR_ALL_TABLES_AND_VIEWS NC_("STR_ALL_TABLES_AND_VIEWS", "All tables and views") + +#define STR_TABLE_PRIV_NAME NC_("STR_TABLE_PRIV_NAME", "Table name") +#define STR_TABLE_PRIV_INSERT NC_("STR_TABLE_PRIV_INSERT", "Insert data") +#define STR_TABLE_PRIV_DELETE NC_("STR_TABLE_PRIV_DELETE", "Delete data") +#define STR_TABLE_PRIV_UPDATE NC_("STR_TABLE_PRIV_UPDATE", "Modify data") +#define STR_TABLE_PRIV_ALTER NC_("STR_TABLE_PRIV_ALTER", "Alter structure") +#define STR_TABLE_PRIV_SELECT NC_("STR_TABLE_PRIV_SELECT", "Read data") +#define STR_TABLE_PRIV_REFERENCE NC_("STR_TABLE_PRIV_REFERENCE", "Modify references") +#define STR_TABLE_PRIV_DROP NC_("STR_TABLE_PRIV_DROP", "Drop structure") + +#define STR_DBASE_PATH_OR_FILE NC_("STR_DBASE_PATH_OR_FILE", "Path to the dBASE files") +#define STR_FLAT_PATH_OR_FILE NC_("STR_FLAT_PATH_OR_FILE", "Path to the text files") +#define STR_CALC_PATH_OR_FILE NC_("STR_CALC_PATH_OR_FILE", "Path to the spreadsheet document") +#define STR_NAME_OF_ODBC_DATASOURCE NC_("STR_NAME_OF_ODBC_DATASOURCE", "Name of the ODBC data source on your system") +#define STR_WRITER_PATH_OR_FILE NC_("STR_WRITER_PATH_OR_FILE", "Path to the Writer document") +#define STR_MYSQL_DATABASE_NAME NC_("STR_MYSQL_DATABASE_NAME", "Name of the MySQL database") +#define STR_ORACLE_DATABASE_NAME NC_("STR_ORACLE_DATABASE_NAME", "Name of the Oracle database") +#define STR_MSACCESS_MDB_FILE NC_("STR_MSACCESS_MDB_FILE", "Microsoft Access database file") +#define STR_NO_ADDITIONAL_SETTINGS NC_("STR_NO_ADDITIONAL_SETTINGS", "No more settings are necessary. To verify that the connection is working, click the '%test' button.") +#define STR_COMMONURL NC_("STR_COMMONURL", "Datasource URL (e.g. postgresql://host:port/database)" ) +#define STR_HOSTNAME NC_("STR_HOSTNAME", "~Host name") +#define STR_MOZILLA_PROFILE_NAME NC_("STR_MOZILLA_PROFILE_NAME", "~Mozilla profile name") +#define STR_THUNDERBIRD_PROFILE_NAME NC_("STR_THUNDERBIRD_PROFILE_NAME", "~Thunderbird profile name") +#define STR_ADD_TABLES NC_("STR_ADD_TABLES", "Add Tables") +#define STR_ADD_TABLE_OR_QUERY NC_("STR_ADD_TABLE_OR_QUERY", "Add Table or Query" ) + +#define STR_WIZ_COLUMN_SELECT_TITEL NC_("STR_WIZ_COLUMN_SELECT_TITEL", "Apply columns") +#define STR_WIZ_TYPE_SELECT_TITEL NC_("STR_WIZ_TYPE_SELECT_TITEL", "Type formatting") +#define STR_WIZ_NAME_ALREADY_DEFINED NC_("STR_WIZ_NAME_ALREADY_DEFINED", "Enter a unique name for the new primary key data field.\nThe following name is already in use:") +#define STR_WIZ_NAME_MATCHING_TITEL NC_("STR_WIZ_NAME_MATCHING_TITEL", "Assign columns" ) +#define STR_WIZ_PB_PREV NC_("STR_WIZ_PB_PREV", "< ~Back") +#define STR_WIZ_PB_NEXT NC_("STR_WIZ_PB_NEXT", "~Next>") +#define STR_WIZ_PB_OK NC_("STR_WIZ_PB_OK", "C~reate") +#define STR_WIZ_TABLE_COPY NC_("STR_WIZ_TABLE_COPY", "Copy table" ) +#define STR_COPYTABLE_TITLE_COPY NC_("STR_COPYTABLE_TITLE_COPY", "Copy table" ) +#define STR_INVALID_TABLE_NAME NC_("STR_INVALID_TABLE_NAME", "This table name is not valid in the current database.") +#define STR_SUGGEST_APPEND_TABLE_DATA NC_("STR_SUGGEST_APPEND_TABLE_DATA", "Choose the option 'Append data' on the first page to append data to an existing table.") +#define STR_INVALID_TABLE_NAME_LENGTH NC_("STR_INVALID_TABLE_NAME_LENGTH", "Please change the table name. It is too long.") + +#define STR_DBWIZARDTITLE NC_("STR_DBWIZARDTITLE", "Database Wizard" ) +#define STR_PAGETITLE_INTROPAGE NC_("STR_PAGETITLE_INTROPAGE", "Select database" ) +#define STR_PAGETITLE_DBASE NC_("STR_PAGETITLE_DBASE", "Set up dBASE connection" ) +#define STR_PAGETITLE_TEXT NC_("STR_PAGETITLE_TEXT", "Set up a connection to text files" ) +#define STR_PAGETITLE_MSACCESS NC_("STR_PAGETITLE_MSACCESS", "Set up Microsoft Access connection" ) +#define STR_PAGETITLE_LDAP NC_("STR_PAGETITLE_LDAP", "Set up LDAP connection" ) +#define STR_PAGETITLE_ADO NC_("STR_PAGETITLE_ADO", "Set up ADO connection" ) +#define STR_PAGETITLE_JDBC NC_("STR_PAGETITLE_JDBC", "Set up JDBC connection" ) +#define STR_PAGETITLE_ORACLE NC_("STR_PAGETITLE_ORACLE", "Set up Oracle database connection" ) +#define STR_PAGETITLE_MYSQL NC_("STR_PAGETITLE_MYSQL", "Set up MySQL connection" ) +#define STR_PAGETITLE_ODBC NC_("STR_PAGETITLE_ODBC", "Set up ODBC connection" ) +#define STR_PAGETITLE_DOCUMENT_OR_SPREADSHEET NC_("STR_PAGETITLE_DOCUMENT_OR_SPREADSHEET", "Set up Writer Document or Spreadsheet connection" ) +#define STR_PAGETITLE_AUTHENTIFICATION NC_("STR_PAGETITLE_AUTHENTIFICATION", "Set up user authentication" ) +#define STR_PAGETITLE_MYSQL_NATIVE NC_("STR_PAGETITLE_MYSQL_NATIVE", "Set up MySQL server data") +#define STR_PAGETITLE_FINAL NC_("STR_PAGETITLE_FINAL", "Save and proceed" ) +#define STR_DATABASEDEFAULTNAME NC_("STR_DATABASEDEFAULTNAME", "New Database" ) +#define STR_MYSQLJDBC_HEADERTEXT NC_("STR_MYSQLJDBC_HEADERTEXT", "Set up connection to a MySQL database using JDBC" ) +#define STR_MYSQLJDBC_HELPTEXT NC_("STR_MYSQLJDBC_HELPTEXT", "Please enter the required information to connect to a MySQL database using JDBC. Note that a JDBC driver class must be installed on your system and registered with %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings.") +#define STR_MYSQL_DRIVERCLASSTEXT NC_("STR_MYSQL_DRIVERCLASSTEXT", "MySQL JDBC d~river class:") +#define STR_MYSQL_DEFAULT NC_("STR_MYSQL_DEFAULT", "Default: 3306") +#define STR_DBASE_HEADERTEXT NC_("STR_DBASE_HEADERTEXT", "Set up a connection to dBASE files" ) +#define STR_DBASE_HELPTEXT NC_("STR_DBASE_HELPTEXT", "Select the folder where the dBASE files are stored." ) +#define STR_TEXT_HEADERTEXT NC_("STR_TEXT_HEADERTEXT", "Set up a connection to text files" ) +#define STR_TEXT_HELPTEXT NC_("STR_TEXT_HELPTEXT", "Select the folder where the CSV (Comma Separated Values) text files are stored. %PRODUCTNAME Base will open these files in read-only mode." ) +#define STR_TEXT_PATH_OR_FILE NC_("STR_TEXT_PATH_OR_FILE", "Path to text files") +#define STR_MSACCESS_HEADERTEXT NC_("STR_MSACCESS_HEADERTEXT", "Set up a connection to a Microsoft Access database" ) +#define STR_MSACCESS_HELPTEXT NC_("STR_MSACCESS_HELPTEXT", "Please select the Microsoft Access file you want to access.") +#define STR_ADO_HEADERTEXT NC_("STR_ADO_HEADERTEXT", "Set up a connection to an ADO database" ) +#define STR_ADO_HELPTEXT NC_("STR_ADO_HELPTEXT", "Please enter the URL of the ADO data source you want to connect to.\nClick 'Browse' to configure provider-specific settings.\nPlease contact your system administrator if you are unsure about the following settings." ) +#define STR_ODBC_HEADERTEXT NC_("STR_ODBC_HEADERTEXT", "Set up a connection to an ODBC database" ) +#define STR_ODBC_HELPTEXT NC_("STR_ODBC_HELPTEXT", "Enter the name of the ODBC database you want to connect to.\nClick 'Browse...' to select an ODBC database that is already registered in %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings." ) +#define STR_JDBC_HEADERTEXT NC_("STR_JDBC_HEADERTEXT", "Set up a connection to a JDBC database" ) +#define STR_JDBC_HELPTEXT NC_("STR_JDBC_HELPTEXT", "Please enter the required information to connect to a JDBC database.\nPlease contact your system administrator if you are unsure about the following settings." ) +#define STR_ORACLE_HEADERTEXT NC_("STR_ORACLE_HEADERTEXT", "Set up a connection to an Oracle database") +#define STR_ORACLE_DEFAULT NC_("STR_ORACLE_DEFAULT", "Default: 1521" ) +#define STR_ORACLE_DRIVERCLASSTEXT NC_("STR_ORACLE_DRIVERCLASSTEXT", "Oracle JDBC ~driver class") +#define STR_ORACLE_HELPTEXT NC_("STR_ORACLE_HELPTEXT", "Please enter the required information to connect to an Oracle database. Note that a JDBC Driver Class must be installed on your system and registered with %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings." ) +#define STR_SPREADSHEET_HEADERTEXT NC_("STR_SPREADSHEET_HEADERTEXT", "Set up a connection to spreadsheets") +#define STR_SPREADSHEET_HELPTEXT NC_("STR_SPREADSHEET_HELPTEXT", "Click 'Browse...' to select a %PRODUCTNAME spreadsheet or Microsoft Excel workbook.\n%PRODUCTNAME will open this file in read-only mode." ) +#define STR_SPREADSHEETPATH NC_("STR_SPREADSHEETPATH", "~Location and file name" ) + +#define STR_COMMAND_EXECUTED_SUCCESSFULLY NC_("STR_COMMAND_EXECUTED_SUCCESSFULLY", "Command successfully executed." ) +#define STR_DIRECTSQL_CONNECTIONLOST NC_("STR_DIRECTSQL_CONNECTIONLOST", "The connection to the database has been lost. This dialog will be closed.") + +#define STR_TAB_INDEX_SORTORDER NC_("STR_TAB_INDEX_SORTORDER", "Sort order" ) +#define STR_TAB_INDEX_FIELD NC_("STR_TAB_INDEX_FIELD", "Index field" ) +#define STR_ORDER_ASCENDING NC_("STR_ORDER_ASCENDING", "Ascending" ) +#define STR_ORDER_DESCENDING NC_("STR_ORDER_DESCENDING", "Descending" ) +#define STR_CONFIRM_DROP_INDEX NC_("STR_CONFIRM_DROP_INDEX", "Do you really want to delete the index '$name$'?") +#define STR_LOGICAL_INDEX_NAME NC_("STR_LOGICAL_INDEX_NAME", "index") +#define STR_NEED_INDEX_FIELDS NC_("STR_NEED_INDEX_FIELDS", "The index must contain at least one field.") +#define STR_INDEX_NAME_ALREADY_USED NC_("STR_INDEX_NAME_ALREADY_USED", "There is already another index named \"$name$\".") +#define STR_INDEXDESIGN_DOUBLE_COLUMN_NAME NC_("STR_INDEXDESIGN_DOUBLE_COLUMN_NAME", "In an index definition, no table column may occur more than once. However, you have entered column \"$name$\" twice.") + +#define STR_COULD_NOT_CONVERT_PARAM NC_("STR_COULD_NOT_CONVERT_PARAM", "The entry could not be converted to a valid value for the \"$name$\" parameter") + +#define STR_EXCEPTION_STATUS NC_("STR_EXCEPTION_STATUS", "SQL Status") +#define STR_EXCEPTION_ERRORCODE NC_("STR_EXCEPTION_ERRORCODE", "Error code") +#define STR_EXPLAN_STRINGCONVERSION_ERROR NC_("STR_EXPLAN_STRINGCONVERSION_ERROR", "A frequent reason for this error is an inappropriate character set setting for the language of your database. Check the setting by choosing Edit - Database - Properties.") +#define STR_EXCEPTION_ERROR NC_("STR_EXCEPTION_ERROR", "Error") +#define STR_EXCEPTION_WARNING NC_("STR_EXCEPTION_WARNING", "Warning") +#define STR_EXCEPTION_INFO NC_("STR_EXCEPTION_INFO", "Information") +#define STR_EXCEPTION_DETAILS NC_("STR_EXCEPTION_DETAILS", "Details") + +#define STR_QUERY_USERADMIN_DELETE_USER NC_("STR_QUERY_USERADMIN_DELETE_USER", "Do you really want to delete the user?") +#define STR_USERADMIN_NOT_AVAILABLE NC_("STR_USERADMIN_NOT_AVAILABLE", "The database does not support user administration." ) +#define STR_ERROR_PASSWORDS_NOT_IDENTICAL NC_("STR_ERROR_PASSWORDS_NOT_IDENTICAL", "The passwords do not match. Please enter the password again.") + +#define STR_JOIN_TYPE_HINT NC_("STR_JOIN_TYPE_HINT", "Please note that some databases may not support this join type.") +#define STR_QUERY_INNER_JOIN NC_("STR_QUERY_INNER_JOIN", "Includes only records for which the contents of the related fields of both tables are identical.") +#define STR_QUERY_LEFTRIGHT_JOIN NC_("STR_QUERY_LEFTRIGHT_JOIN", "Contains ALL records from table '%1' but only records from table '%2' where the values in the related fields are matching.") +#define STR_QUERY_FULL_JOIN NC_("STR_QUERY_FULL_JOIN", "Contains ALL records from '%1' and from '%2'.") +#define STR_QUERY_CROSS_JOIN NC_("STR_QUERY_CROSS_JOIN", "Contains the Cartesian product of ALL records from '%1' and from '%2'.") + +#define STR_CTW_NO_VIEWS_SUPPORT NC_("STR_CTW_NO_VIEWS_SUPPORT", "The destination database does not support views.") +#define STR_CTW_NO_PRIMARY_KEY_SUPPORT NC_("STR_CTW_NO_PRIMARY_KEY_SUPPORT", "The destination database does not support primary keys.") +#define STR_CTW_INVALID_DATA_ACCESS_DESCRIPTOR NC_("STR_CTW_INVALID_DATA_ACCESS_DESCRIPTOR", "no data access descriptor found, or no data access descriptor able to provide all necessary information") +#define STR_CTW_ONLY_TABLES_AND_QUERIES_SUPPORT NC_("STR_CTW_ONLY_TABLES_AND_QUERIES_SUPPORT", "Only tables and queries are supported at the moment.") +#define STR_CTW_COPY_SOURCE_NEEDS_BOOKMARKS NC_("STR_CTW_COPY_SOURCE_NEEDS_BOOKMARKS", "The copy source's result set must support bookmarks.") +#define STR_CTW_UNSUPPORTED_COLUMN_TYPE NC_("STR_CTW_UNSUPPORTED_COLUMN_TYPE", "Unsupported source column type ($type$) at column position $pos$.") +#define STR_CTW_ILLEGAL_PARAMETER_COUNT NC_("STR_CTW_ILLEGAL_PARAMETER_COUNT", "Illegal number of initialization parameters.") +#define STR_CTW_ERROR_DURING_INITIALIZATION NC_("STR_CTW_ERROR_DURING_INITIALIZATION", "An error occurred during initialization.") +#define STR_CTW_ERROR_UNSUPPORTED_SETTING NC_("STR_CTW_ERROR_UNSUPPORTED_SETTING", "Unsupported setting in the copy source descriptor: $name$.") +#define STR_CTW_ERROR_NO_QUERY NC_("STR_CTW_ERROR_NO_QUERY", "To copy a query, your connection must be able to provide queries.") +#define STR_CTW_ERROR_INVALID_INTERACTIONHANDLER NC_("STR_CTW_ERROR_INVALID_INTERACTIONHANDLER", "The given interaction handler is invalid.") + +#define STR_QUERY_REL_EDIT_RELATION NC_("STR_QUERY_REL_EDIT_RELATION", "This relation already exists. Do you want to edit it or create a new one?" ) +#define STR_QUERY_REL_EDIT NC_("STR_QUERY_REL_EDIT", "Edit..." ) +#define STR_QUERY_REL_CREATE NC_("STR_QUERY_REL_CREATE", "Create..." ) +#define STR_RELATIONDESIGN NC_("STR_RELATIONDESIGN", " - %PRODUCTNAME Base: Relation design" ) +#define STR_RELATIONDESIGN_NOT_AVAILABLE NC_("STR_RELATIONDESIGN_NOT_AVAILABLE", "The database does not support relations." ) +#define STR_QUERY_REL_DELETE_WINDOW NC_("STR_QUERY_REL_DELETE_WINDOW", "When you delete this table all corresponding relations will be deleted as well. Continue?") +#define STR_QUERY_REL_COULD_NOT_CREATE NC_("STR_QUERY_REL_COULD_NOT_CREATE", "The database could not create the relation. Maybe foreign keys for this kind of table aren't supported.\nPlease check your documentation of the database.") + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/inc/stringconstants.inc b/dbaccess/inc/strings.hxx similarity index 81% rename from dbaccess/source/inc/stringconstants.inc rename to dbaccess/inc/strings.hxx index acaf156546ec..a0909f00c639 100644 --- a/dbaccess/source/inc/stringconstants.inc +++ b/dbaccess/inc/strings.hxx @@ -1,23 +1,14 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ /* * 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 . */ -// be included itself - +#ifndef INCLUDED_DBACCESS_INC_STRINGS_HXX +#define INCLUDED_DBACCESS_INC_STRINGS_HXX // property names @@ -90,7 +81,7 @@ #define PROPERTY_FILTER "Filter" #define PROPERTY_APPLYFILTER "ApplyFilter" #define PROPERTY_ORDER "Order" -#define PROPERTY_APPLYORDER "ApplyOrder" +#define PROPERTY_APPLYORDER "ApplyOrder" #define PROPERTY_ISMODIFIED "IsModified" #define PROPERTY_ISNEW "IsNew" #define PROPERTY_ROWCOUNT "RowCount" @@ -124,10 +115,10 @@ #define PROPERTY_SQLEXCEPTION "SQLException" #define PROPERTY_BORDER "Border" #define PROPERTY_THREADSAFE "ThreadSafe" -#define PROPERTY_HELPTEXT "HelpText" -#define PROPERTY_CONTROLDEFAULT "ControlDefault" -#define PROPERTY_HIDDEN "Hidden" -#define PROPERTY_DEFAULTSTATE "DefaultState" +#define PROPERTY_HELPTEXT "HelpText" +#define PROPERTY_CONTROLDEFAULT "ControlDefault" +#define PROPERTY_HIDDEN "Hidden" +#define PROPERTY_DEFAULTSTATE "DefaultState" #define PROPERTY_SUPPRESSVERSIONCL "SuppressVersionColumns" #define PROPERTY_SHOW_BROWSER "ShowBrowser" #define PROPERTY_ENABLE_BROWSER "EnableBrowser" @@ -151,7 +142,7 @@ #define PROPERTY_FONTFAMILY "FontFamily" #define PROPERTY_FONTHEIGHT "FontHeight" #define PROPERTY_FONTKERNING "FontKerning" -#define PROPERTY_FONTNAME "FontName" +#define PROPERTY_FONTNAME "FontName" #define PROPERTY_FONTORIENTATION "FontOrientation" #define PROPERTY_FONTPITCH "FontPitch" #define PROPERTY_FONTSLANT "FontSlant" @@ -161,16 +152,16 @@ #define PROPERTY_FONTWEIGHT "FontWeight" #define PROPERTY_FONTWIDTH "FontWidth" #define PROPERTY_FONTWORDLINEMODE "FontWordLineMode" -#define PROPERTY_FONTTYPE "FontType" -#define PROPERTY_PERSISTENT_NAME "PersistentName" -#define PROPERTY_EMBEDDEDOBJECT "EmbeddedObject" +#define PROPERTY_FONTTYPE "FontType" +#define PROPERTY_PERSISTENT_NAME "PersistentName" +#define PROPERTY_EMBEDDEDOBJECT "EmbeddedObject" #define PROPERTY_ORIGINAL "Original" #define PROPERTY_USECATALOGINSELECT "UseCatalogInSelect" #define PROPERTY_USESCHEMAINSELECT "UseSchemaInSelect" #define PROPERTY_OUTERJOINESCAPE "EnableOuterJoinEscape" #define PROPERTY_AS_TEMPLATE "AsTemplate" #define PROPERTY_HAVING_CLAUSE "HavingClause" -#define PROPERTY_GROUP_BY "GroupBy" +#define PROPERTY_GROUP_BY "GroupBy" #define PROPERTY_EDIT_WIDTH "EditWidth" #define PROPERTY_SINGLESELECTQUERYCOMPOSER "SingleSelectQueryComposer" #define PROPERTY_CHANGE_NOTIFICATION_ENABLED "PropertyChangeNotificationEnabled" @@ -208,7 +199,7 @@ #define SERVICE_SDBCX_INDEXCOLUMN "com.sun.star.sdbcx.IndexColumn" #define SERVICE_SDBCX_KEYCOLUMN "com.sun.star.sdbcx.KeyColumn" #define SERVICE_SDB_DOCUMENTDEFINITION "com.sun.star.sdb.DocumentDefinition" -#define SERVICE_NAME_FORM "com.sun.star.sdb.Form" +#define SERVICE_NAME_FORM "com.sun.star.sdb.Form" #define SERVICE_NAME_FORM_COLLECTION "com.sun.star.sdb.Forms" #define SERVICE_NAME_REPORT "com.sun.star.sdb.Report" #define SERVICE_NAME_REPORT_COLLECTION "com.sun.star.sdb.Reports" @@ -232,8 +223,8 @@ #define INFO_AUTORETRIEVEVALUE "AutoRetrievingStatement" #define INFO_AUTORETRIEVEENABLED "IsAutoRetrievingEnabled" #define INFO_APPEND_TABLE_ALIAS "AppendTableAliasName" -#define INFO_AS_BEFORE_CORRELATION_NAME "GenerateASBeforeCorrelationName" -#define INFO_FORMS_CHECK_REQUIRED_FIELDS "FormsCheckRequiredFields" +#define INFO_AS_BEFORE_CORRELATION_NAME "GenerateASBeforeCorrelationName" +#define INFO_FORMS_CHECK_REQUIRED_FIELDS "FormsCheckRequiredFields" #define INFO_PARAMETERNAMESUBST "ParameterNameSubstitution" #define INFO_IGNOREDRIVER_PRIV "IgnoreDriverPrivileges" #define INFO_USECATALOG "UseCatalog" @@ -246,3 +237,47 @@ // other #define INFO_POOLURL "PoolURL" #define URL_INTERACTIVE "Interactive" + +// URLs + +#define URL_COMPONENT_QUERYDESIGN ".component:DB/QueryDesign" +#define URL_COMPONENT_VIEWDESIGN ".component:DB/ViewDesign" +#define URL_COMPONENT_TABLEDESIGN ".component:DB/TableDesign" +#define URL_COMPONENT_FORMGRIDVIEW ".component:DB/FormGridView" +#define URL_COMPONENT_DATASOURCEBROWSER ".component:DB/DataSourceBrowser" +#define URL_COMPONENT_RELATIONDESIGN ".component:DB/RelationDesign" +#define URL_COMPONENT_APPLICATION ".component:DB/Application" +#define URL_COMPONENT_REPORTDESIGN ".component:DB/ReportDesign" + +// service names + +#define SERVICE_SDB_DIRECTSQLDIALOG "org.openoffice.comp.dbu.DirectSqlDialog" + +// other DBU relevant strings + +#define FRAME_NAME_QUERY_PREVIEW "QueryPreview" +#define SERVICE_CONTROLDEFAULT "com.sun.star.comp.dbu.OColumnControl" +#define PROPERTY_QUERYDESIGNVIEW "QueryDesignView" +#define PROPERTY_GRAPHICAL_DESIGN "GraphicalDesign" +#define PROPERTY_HELP_URL "HelpURL" + +// other DBU properties + +#define PROPERTY_TRISTATE "TriState" +#define PROPERTY_ENABLEOUTERJOIN "EnableOuterJoinEscape" +#define PROPERTY_TABSTOP "TabStop" +#define PROPERTY_DEFAULTCONTROL "DefaultControl" +#define PROPERTY_ENABLED "Enabled" +#define PROPERTY_MOUSE_WHEEL_BEHAVIOR "MouseWheelBehavior" + +#define SQLSTATE_GENERAL "01000" + +#define PROPERTY_APPLYFORMDESIGNMODE "ApplyFormDesignMode" +#define PROPERTY_IS_FORM "IsForm" +#define PROPERTY_PERSISTENT_PATH "PersistentPath" + +#define STR_AUTOTEXTSEPARATORLIST "\"\t34\t'\t39" + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/dbaccess/source/core/api/BookmarkSet.cxx b/dbaccess/source/core/api/BookmarkSet.cxx index 3b5f5f79801d..31a89bc615dd 100644 --- a/dbaccess/source/core/api/BookmarkSet.cxx +++ b/dbaccess/source/core/api/BookmarkSet.cxx @@ -19,7 +19,7 @@ #include "BookmarkSet.hxx" #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include #include diff --git a/dbaccess/source/core/api/CIndexes.cxx b/dbaccess/source/core/api/CIndexes.cxx index f51a1d845ac6..b29ca36c16f6 100644 --- a/dbaccess/source/core/api/CIndexes.cxx +++ b/dbaccess/source/core/api/CIndexes.cxx @@ -21,7 +21,7 @@ #include #include #include -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include #include diff --git a/dbaccess/source/core/api/CRowSetColumn.cxx b/dbaccess/source/core/api/CRowSetColumn.cxx index 3912b16181ce..1e01dab55917 100644 --- a/dbaccess/source/core/api/CRowSetColumn.cxx +++ b/dbaccess/source/core/api/CRowSetColumn.cxx @@ -18,7 +18,7 @@ */ -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "apitools.hxx" #include "CRowSetColumn.hxx" diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx index 680be37f9b75..0a681e9642be 100644 --- a/dbaccess/source/core/api/CRowSetDataColumn.cxx +++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx @@ -19,7 +19,7 @@ #include "CRowSetDataColumn.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "apitools.hxx" #include #include diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx index 8e6f5c9837b5..184a749c2964 100644 --- a/dbaccess/source/core/api/CacheSet.cxx +++ b/dbaccess/source/core/api/CacheSet.cxx @@ -19,7 +19,8 @@ #include "CacheSet.hxx" #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" +#include "strings.hxx" #include #include #include @@ -27,7 +28,7 @@ #include #include #include -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include #include diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx index af261a6d2a0f..43038b7274a7 100644 --- a/dbaccess/source/core/api/FilteredContainer.cxx +++ b/dbaccess/source/core/api/FilteredContainer.cxx @@ -17,7 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "dbastrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include "FilteredContainer.hxx" #include "RefreshListener.hxx" #include "sdbcoretools.hxx" diff --git a/dbaccess/source/core/api/HelperCollections.cxx b/dbaccess/source/core/api/HelperCollections.cxx index b62b70eeb5fb..98b263f21570 100644 --- a/dbaccess/source/core/api/HelperCollections.cxx +++ b/dbaccess/source/core/api/HelperCollections.cxx @@ -19,7 +19,8 @@ #include "HelperCollections.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" namespace dbaccess { diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index 04ab330a3ba3..bab0851063d3 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -20,7 +20,7 @@ #include #include "KeySet.hxx" #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include #include #include @@ -29,7 +29,7 @@ #include #include #include -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "apitools.hxx" #include #include diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx index 79c2a05d4f59..7d4558390688 100644 --- a/dbaccess/source/core/api/OptimisticSet.cxx +++ b/dbaccess/source/core/api/OptimisticSet.cxx @@ -21,7 +21,7 @@ #include #include "OptimisticSet.hxx" #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include #include #include @@ -32,7 +32,7 @@ #include #include #include -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "apitools.hxx" #include #include diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index 8f191ed318be..68da787a81dc 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -24,13 +24,13 @@ #include #include "RowSet.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "sdbcoretools.hxx" #include "SingleSelectQueryComposer.hxx" #include "CRowSetColumn.hxx" #include "CRowSetDataColumn.hxx" #include "RowSetCache.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include "core_resource.hxx" #include "tablecontainer.hxx" diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx index c4b7fdb65a1e..a0a680e9113b 100644 --- a/dbaccess/source/core/api/RowSetBase.cxx +++ b/dbaccess/source/core/api/RowSetBase.cxx @@ -21,8 +21,9 @@ #include "CRowSetDataColumn.hxx" #include #include "RowSetCache.hxx" -#include "dbastrings.hrc" -#include "core_resource.hrc" +#include "stringconstants.hxx" +#include "strings.hrc" +#include "strings.hxx" #include #include #include diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index e51d87ac2458..8bd299112e1c 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -27,9 +27,10 @@ #include "RowSetCache.hxx" #include "StaticSet.hxx" #include "WrappedResultSet.hxx" -#include "core_resource.hrc" +#include "strings.hrc" +#include "strings.hxx" #include "core_resource.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include #include diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx index 0558b34dcf13..d284a3e21e21 100644 --- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx +++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx @@ -19,9 +19,9 @@ #include #include "composertools.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include "core_resource.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "HelperCollections.hxx" #include "SingleSelectQueryComposer.hxx" #include "sqlbison.hxx" diff --git a/dbaccess/source/core/api/StaticSet.cxx b/dbaccess/source/core/api/StaticSet.cxx index 5fc3a9276d32..e9d3af392ae8 100644 --- a/dbaccess/source/core/api/StaticSet.cxx +++ b/dbaccess/source/core/api/StaticSet.cxx @@ -23,7 +23,7 @@ #include #include #include -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "apitools.hxx" #include #include diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx index cf8c115bf028..dd167c116d3e 100644 --- a/dbaccess/source/core/api/TableDeco.cxx +++ b/dbaccess/source/core/api/TableDeco.cxx @@ -21,9 +21,9 @@ #include "TableDeco.hxx" #include -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include #include diff --git a/dbaccess/source/core/api/View.cxx b/dbaccess/source/core/api/View.cxx index 883346bb2693..42dca2256cf8 100644 --- a/dbaccess/source/core/api/View.cxx +++ b/dbaccess/source/core/api/View.cxx @@ -18,7 +18,8 @@ */ #include "View.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include "connectivity/dbexception.hxx" #include "connectivity/dbtools.hxx" diff --git a/dbaccess/source/core/api/WrappedResultSet.cxx b/dbaccess/source/core/api/WrappedResultSet.cxx index 77836d7746e2..a29463544475 100644 --- a/dbaccess/source/core/api/WrappedResultSet.cxx +++ b/dbaccess/source/core/api/WrappedResultSet.cxx @@ -19,7 +19,7 @@ #include "WrappedResultSet.hxx" #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include #include diff --git a/dbaccess/source/core/api/callablestatement.cxx b/dbaccess/source/core/api/callablestatement.cxx index 050931dc76a6..bd2209a7fd92 100644 --- a/dbaccess/source/core/api/callablestatement.cxx +++ b/dbaccess/source/core/api/callablestatement.cxx @@ -22,7 +22,8 @@ #include #include #include -#include "dbastrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" using namespace dbaccess; using namespace ::com::sun::star::sdbc; diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx index 1c431420a34e..0ad8d09324a0 100644 --- a/dbaccess/source/core/api/column.cxx +++ b/dbaccess/source/core/api/column.cxx @@ -20,9 +20,9 @@ #include "ContainerMediator.hxx" #include "apitools.hxx" #include "column.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include "core_resource.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "sdbcoretools.hxx" #include diff --git a/dbaccess/source/core/api/columnsettings.cxx b/dbaccess/source/core/api/columnsettings.cxx index 860ed7d36617..4d8857f5ec07 100644 --- a/dbaccess/source/core/api/columnsettings.cxx +++ b/dbaccess/source/core/api/columnsettings.cxx @@ -18,7 +18,8 @@ */ #include "columnsettings.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include diff --git a/dbaccess/source/core/api/datacolumn.cxx b/dbaccess/source/core/api/datacolumn.cxx index 34604e602c9f..8d22401fdcea 100644 --- a/dbaccess/source/core/api/datacolumn.cxx +++ b/dbaccess/source/core/api/datacolumn.cxx @@ -24,7 +24,8 @@ #include #include #include -#include "dbastrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include "apitools.hxx" using namespace dbaccess; diff --git a/dbaccess/source/core/api/datasettings.cxx b/dbaccess/source/core/api/datasettings.cxx index f381b40fbb82..33683266da8d 100644 --- a/dbaccess/source/core/api/datasettings.cxx +++ b/dbaccess/source/core/api/datasettings.cxx @@ -19,7 +19,7 @@ #include "datasettings.hxx" #include "apitools.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include #include #include diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx index a3ef15206420..f8b56a649b7c 100644 --- a/dbaccess/source/core/api/definitioncolumn.cxx +++ b/dbaccess/source/core/api/definitioncolumn.cxx @@ -20,7 +20,7 @@ #include #include "apitools.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "definitioncolumn.hxx" #include "sdbcoretools.hxx" diff --git a/dbaccess/source/core/api/preparedstatement.cxx b/dbaccess/source/core/api/preparedstatement.cxx index 7a79ae4415f3..619eacfab8ca 100644 --- a/dbaccess/source/core/api/preparedstatement.cxx +++ b/dbaccess/source/core/api/preparedstatement.cxx @@ -18,7 +18,7 @@ */ -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include #include diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx index 9016d2bfba34..0a127bf448dd 100644 --- a/dbaccess/source/core/api/query.cxx +++ b/dbaccess/source/core/api/query.cxx @@ -18,11 +18,11 @@ */ #include "query.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include #include "HelperCollections.hxx" #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include #include diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx index a390a614057a..c6221be76c7e 100644 --- a/dbaccess/source/core/api/querycomposer.cxx +++ b/dbaccess/source/core/api/querycomposer.cxx @@ -28,7 +28,7 @@ #include #include #include -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include #include #include diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx index 0add2d493d5e..1641f6445d47 100644 --- a/dbaccess/source/core/api/querycontainer.cxx +++ b/dbaccess/source/core/api/querycontainer.cxx @@ -18,7 +18,7 @@ */ #include "querycontainer.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "query.hxx" #include "objectnameapproval.hxx" #include "veto.hxx" diff --git a/dbaccess/source/core/api/querydescriptor.cxx b/dbaccess/source/core/api/querydescriptor.cxx index 019f2d238c9d..7ae594f98928 100644 --- a/dbaccess/source/core/api/querydescriptor.cxx +++ b/dbaccess/source/core/api/querydescriptor.cxx @@ -21,7 +21,7 @@ #include "querydescriptor.hxx" #include "apitools.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include #include #include diff --git a/dbaccess/source/core/api/resultcolumn.cxx b/dbaccess/source/core/api/resultcolumn.cxx index 2970dc00c231..96ce95ad646c 100644 --- a/dbaccess/source/core/api/resultcolumn.cxx +++ b/dbaccess/source/core/api/resultcolumn.cxx @@ -26,7 +26,7 @@ #include #include #include -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "apitools.hxx" #include #include diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx index 320e2fc4f596..9a6eb24824da 100644 --- a/dbaccess/source/core/api/resultset.cxx +++ b/dbaccess/source/core/api/resultset.cxx @@ -18,7 +18,7 @@ */ #include -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "apitools.hxx" #include #include diff --git a/dbaccess/source/core/api/statement.cxx b/dbaccess/source/core/api/statement.cxx index 813fa8a450f1..978552f36b6f 100644 --- a/dbaccess/source/core/api/statement.cxx +++ b/dbaccess/source/core/api/statement.cxx @@ -19,7 +19,7 @@ #include #include -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include #include #include diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx index 291f597fb7db..c192b10117bc 100644 --- a/dbaccess/source/core/api/table.cxx +++ b/dbaccess/source/core/api/table.cxx @@ -21,9 +21,9 @@ #include "table.hxx" #include -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include "CIndexes.hxx" #include diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx index 925552954ff3..cd03ff639e2a 100644 --- a/dbaccess/source/core/api/tablecontainer.cxx +++ b/dbaccess/source/core/api/tablecontainer.cxx @@ -18,14 +18,14 @@ */ #include "tablecontainer.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "table.hxx" #include #include #include #include #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include #include #include diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx index 3ca37659ed55..111089ebac9a 100644 --- a/dbaccess/source/core/api/viewcontainer.cxx +++ b/dbaccess/source/core/api/viewcontainer.cxx @@ -18,9 +18,9 @@ */ #include "viewcontainer.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include "View.hxx" #include diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx index a0e760891d55..5d442e62c30b 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx @@ -19,7 +19,7 @@ #include "ComponentDefinition.hxx" #include "apitools.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include #include diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx index 47c71bcef2e2..e365e94d6367 100644 --- a/dbaccess/source/core/dataaccess/ContentHelper.cxx +++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx @@ -34,7 +34,7 @@ #include "myucp_resultset.hxx" #include #include "sdbcoretools.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" namespace dbaccess { diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx index 3608a06e9ffe..f05eda723b83 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.cxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx @@ -19,12 +19,12 @@ #include "commandcontainer.hxx" #include "connection.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include "core_resource.hxx" #include "databasecontext.hxx" #include "databasedocument.hxx" #include "datasource.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "ModelImpl.hxx" #include "userinformation.hxx" #include "sdbcoretools.hxx" diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx index 4ee378e7d8ed..fb550264a0f0 100644 --- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx +++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx @@ -18,10 +18,10 @@ */ #include "bookmarkcontainer.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "apitools.hxx" #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include #include diff --git a/dbaccess/source/core/dataaccess/commandcontainer.cxx b/dbaccess/source/core/dataaccess/commandcontainer.cxx index 9513600459df..22ad03474d1f 100644 --- a/dbaccess/source/core/dataaccess/commandcontainer.cxx +++ b/dbaccess/source/core/dataaccess/commandcontainer.cxx @@ -20,7 +20,7 @@ #include "commandcontainer.hxx" #include "commanddefinition.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include #include diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx b/dbaccess/source/core/dataaccess/commanddefinition.cxx index 111d535f2796..fd87605ca4e4 100644 --- a/dbaccess/source/core/dataaccess/commanddefinition.cxx +++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx @@ -19,7 +19,7 @@ #include "commanddefinition.hxx" #include "apitools.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include #include diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx index 2390bcf467e1..30166707664d 100644 --- a/dbaccess/source/core/dataaccess/connection.cxx +++ b/dbaccess/source/core/dataaccess/connection.cxx @@ -22,9 +22,9 @@ #include #include "connection.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "datasource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include "core_resource.hxx" #include "statement.hxx" #include "preparedstatement.hxx" diff --git a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx index a3fc0f66a7db..ce1c40b08968 100644 --- a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx +++ b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx @@ -17,7 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "dbastrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include #include diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx index 237db1fce2fe..e023806270b2 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.cxx +++ b/dbaccess/source/core/dataaccess/databasecontext.cxx @@ -20,13 +20,13 @@ #include #include "apitools.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include "core_resource.hxx" #include "databasecontext.hxx" #include "databasedocument.hxx" #include "databaseregistrations.hxx" #include "datasource.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include #include diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index cadc240f1ffe..e06b56310d7a 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -18,10 +18,10 @@ */ #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include "datasource.hxx" #include "databasedocument.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "documenteventexecutor.hxx" #include "databasecontext.hxx" #include "documentcontainer.hxx" diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index 68c8d140ddcf..5f5aa0a4cede 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -20,9 +20,9 @@ #include "datasource.hxx" #include "userinformation.hxx" #include "commandcontainer.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include "connection.hxx" #include "SharedConnection.hxx" #include "databasedocument.hxx" @@ -594,7 +594,7 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const OUString sPwd = m_pImpl->m_aPassword; } - sal_uInt16 nExceptionMessageId = RID_STR_COULDNOTCONNECT_UNSPECIFIED; + const char* pExceptionMessageId = RID_STR_COULDNOTCONNECT_UNSPECIFIED; if (xManager.is()) { sal_Int32 nAdditionalArgs(0); @@ -630,7 +630,7 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const OUString // Nowadays, it's allowed for a driver to be registered for a given URL, but actually not to accept it. // This is because registration nowadays happens at compile time (by adding respective configuration data), // but acceptance is decided at runtime. - nExceptionMessageId = RID_STR_COULDNOTCONNECT_NODRIVER; + pExceptionMessageId = RID_STR_COULDNOTCONNECT_NODRIVER; } else { @@ -672,11 +672,11 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const OUString } } else - nExceptionMessageId = RID_STR_COULDNOTLOAD_MANAGER; + pExceptionMessageId = RID_STR_COULDNOTLOAD_MANAGER; if ( !xReturn.is() ) { - OUString sMessage = DBA_RES(nExceptionMessageId) + OUString sMessage = DBA_RES(pExceptionMessageId) .replaceAll("$name$", m_pImpl->m_sConnectURL); SQLContext aContext; diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx index 3c3f3089365a..6270c92385d6 100644 --- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx +++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx @@ -18,10 +18,10 @@ */ #include "definitioncontainer.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "apitools.hxx" #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include #include diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx index b30ee9adef0d..9674fe45ba61 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.cxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx @@ -18,7 +18,7 @@ */ #include "documentcontainer.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "documentdefinition.hxx" #include #include @@ -35,7 +35,7 @@ #include #include #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include #include diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index d117a3fc0ca6..744ca5464122 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -18,7 +18,7 @@ */ #include "documentdefinition.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "sdbcoretools.hxx" #include #include @@ -83,7 +83,7 @@ #include #include #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include "datasource.hxx" #include #include diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx index b1f55958ffe1..b7011dce3b32 100644 --- a/dbaccess/source/core/dataaccess/intercept.cxx +++ b/dbaccess/source/core/dataaccess/intercept.cxx @@ -19,7 +19,7 @@ #include "intercept.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include #include diff --git a/dbaccess/source/core/inc/core_resource.hrc b/dbaccess/source/core/inc/core_resource.hrc deleted file mode 100644 index 64bbb69efdb9..000000000000 --- a/dbaccess/source/core/inc/core_resource.hrc +++ /dev/null @@ -1,97 +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_DBACCESS_SOURCE_CORE_INC_CORE_RESOURCE_HRC -#define INCLUDED_DBACCESS_SOURCE_CORE_INC_CORE_RESOURCE_HRC - -#include - -#define RID_CORE_STRINGS_START RID_DBACCESS_START - -//- String-IDs -#define RID_STR_CONNECTION_INVALID ( RID_CORE_STRINGS_START + 1 ) -#define RID_STR_TABLE_IS_FILTERED ( RID_CORE_STRINGS_START + 2 ) -#define RID_STR_COULDNOTCONNECT_NODRIVER ( RID_CORE_STRINGS_START + 4 ) -#define RID_STR_COULDNOTCONNECT_UNSPECIFIED ( RID_CORE_STRINGS_START + 5 ) -#define RID_STR_COULDNOTLOAD_MANAGER ( RID_CORE_STRINGS_START + 6 ) -#define RID_STR_ONLY_QUERY ( RID_CORE_STRINGS_START + 7 ) -#define RID_STR_NO_VALUE_CHANGED ( RID_CORE_STRINGS_START + 8 ) -#define RID_STR_NO_XROWUPDATE ( RID_CORE_STRINGS_START + 9 ) -#define RID_STR_NO_XRESULTSETUPDATE ( RID_CORE_STRINGS_START + 10 ) -#define RID_STR_NO_UPDATE_MISSING_CONDITION ( RID_CORE_STRINGS_START + 11 ) -#define RID_STR_NO_COLUMN_ADD ( RID_CORE_STRINGS_START + 12 ) -#define RID_STR_NO_COLUMN_DROP ( RID_CORE_STRINGS_START + 13 ) -#define RID_STR_NO_CONDITION_FOR_PK ( RID_CORE_STRINGS_START + 14 ) -#define RID_STR_NO_XQUERIESSUPPLIER ( RID_CORE_STRINGS_START + 15 ) -#define RID_STR_NO_ABS_ZERO ( RID_CORE_STRINGS_START + 16 ) -#define RID_STR_NO_RELATIVE ( RID_CORE_STRINGS_START + 17 ) -#define RID_STR_NO_REFESH_AFTERLAST ( RID_CORE_STRINGS_START + 18 ) -#define RID_STR_NO_MOVETOINSERTROW_CALLED ( RID_CORE_STRINGS_START + 19 ) -#define RID_STR_NO_UPDATEROW ( RID_CORE_STRINGS_START + 20 ) -#define RID_STR_NO_DELETEROW ( RID_CORE_STRINGS_START + 21 ) -#define RID_STR_COLUMN_MUST_VISIBLE ( RID_CORE_STRINGS_START + 22 ) -#define RID_STR_COLUMN_NOT_VALID ( RID_CORE_STRINGS_START + 23 ) -#define RID_STR_COLUMN_NOT_SEARCHABLE ( RID_CORE_STRINGS_START + 24 ) -#define RID_STR_NOT_SEQUENCE_INT8 ( RID_CORE_STRINGS_START + 25 ) -#define RID_STR_NO_TABLE_RENAME ( RID_CORE_STRINGS_START + 27 ) -#define RID_STR_COLUMN_ALTER_BY_NAME ( RID_CORE_STRINGS_START + 28 ) -#define RID_STR_COLUMN_ALTER_BY_INDEX ( RID_CORE_STRINGS_START + 29 ) -#define RID_STR_COLUMN_UNKNOWN_PROP ( RID_CORE_STRINGS_START + 31 ) -#define RID_STR_FORM ( RID_CORE_STRINGS_START + 32 ) -#define RID_STR_REPORT ( RID_CORE_STRINGS_START + 33 ) -#define RID_STR_DATASOURCE_NOT_STORED ( RID_CORE_STRINGS_START + 34 ) -#define RID_STR_FILE_DOES_NOT_EXIST ( RID_CORE_STRINGS_START + 35 ) -#define RID_STR_TABLE_DOES_NOT_EXIST ( RID_CORE_STRINGS_START + 36 ) -#define RID_STR_CONFLICTING_NAMES ( RID_CORE_STRINGS_START + 37 ) -#define RID_STR_COMMAND_LEADING_TO_ERROR ( RID_CORE_STRINGS_START + 38 ) -#define RID_STR_STATEMENT_WITHOUT_RESULT_SET ( RID_CORE_STRINGS_START + 39 ) -#define RID_STR_NAME_MUST_NOT_BE_EMPTY ( RID_CORE_STRINGS_START + 40 ) -#define RID_STR_NO_NULL_OBJECTS_IN_CONTAINER ( RID_CORE_STRINGS_START + 41 ) -#define RID_STR_NAME_ALREADY_USED ( RID_CORE_STRINGS_START + 42 ) -#define RID_STR_OBJECT_CONTAINER_MISMATCH ( RID_CORE_STRINGS_START + 43 ) -#define RID_STR_OBJECT_ALREADY_CONTAINED ( RID_CORE_STRINGS_START + 44 ) -#define RID_STR_NAME_NOT_FOUND ( RID_CORE_STRINGS_START + 45 ) -#define RID_STR_QUERY_DOES_NOT_EXIST ( RID_CORE_STRINGS_START + 46 ) -#define RID_STR_ERROR_WHILE_SAVING ( RID_CORE_STRINGS_START + 47 ) -#define RID_STR_NO_SUB_FOLDER ( RID_CORE_STRINGS_START + 48 ) - -#define RID_STR_NO_DELETE_BEFORE_AFTER ( RID_CORE_STRINGS_START + 49 ) -#define RID_STR_NO_DELETE_INSERT_ROW ( RID_CORE_STRINGS_START + 50 ) -#define RID_STR_RESULT_IS_READONLY ( RID_CORE_STRINGS_START + 51 ) -#define RID_STR_NO_DELETE_PRIVILEGE ( RID_CORE_STRINGS_START + 52 ) -#define RID_STR_ROW_ALREADY_DELETED ( RID_CORE_STRINGS_START + 53 ) -#define RID_STR_UPDATE_FAILED ( RID_CORE_STRINGS_START + 54 ) - -#define RID_STR_INVALID_INDEX ( RID_CORE_STRINGS_START + 55 ) -#define RID_STR_NO_INSERT_PRIVILEGE ( RID_CORE_STRINGS_START + 56 ) -#define RID_STR_INTERNAL_ERROR ( RID_CORE_STRINGS_START + 57 ) -#define RID_STR_EXPRESSION1 ( RID_CORE_STRINGS_START + 58 ) -#define RID_STR_NO_SQL_COMMAND ( RID_CORE_STRINGS_START + 59 ) -#define RID_STR_INVALID_CURSOR_STATE ( RID_CORE_STRINGS_START + 60 ) -#define RID_STR_CURSOR_BEFORE_OR_AFTER ( RID_CORE_STRINGS_START + 61 ) -#define RID_STR_NO_BOOKMARK_BEFORE_OR_AFTER ( RID_CORE_STRINGS_START + 62 ) -#define RID_STR_NO_BOOKMARK_DELETED ( RID_CORE_STRINGS_START + 63 ) -#define RID_STR_CONNECTION_REQUEST ( RID_CORE_STRINGS_START + 65 ) -#define RID_STR_MISSING_EXTENSION ( RID_CORE_STRINGS_START + 66 ) - -#define RID_NO_SUCH_DATA_SOURCE ( RID_CORE_STRINGS_START + 67 ) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/misc/ContainerMediator.cxx b/dbaccess/source/core/misc/ContainerMediator.cxx index adde1ade5b3a..6b42cc2047b9 100644 --- a/dbaccess/source/core/misc/ContainerMediator.cxx +++ b/dbaccess/source/core/misc/ContainerMediator.cxx @@ -18,7 +18,7 @@ */ #include "ContainerMediator.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "PropertyForward.hxx" #include diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx index aaca4ecd9cd3..0d8b9805c033 100644 --- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx +++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx @@ -18,7 +18,8 @@ */ #include "DatabaseDataProvider.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include #include #include diff --git a/dbaccess/source/core/misc/PropertyForward.cxx b/dbaccess/source/core/misc/PropertyForward.cxx index 95cabf09220c..827bee9b9e43 100644 --- a/dbaccess/source/core/misc/PropertyForward.cxx +++ b/dbaccess/source/core/misc/PropertyForward.cxx @@ -18,7 +18,7 @@ */ #include "PropertyForward.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include #include diff --git a/dbaccess/source/core/misc/apitools.cxx b/dbaccess/source/core/misc/apitools.cxx index 879f86516e6a..1b8bc07a1206 100644 --- a/dbaccess/source/core/misc/apitools.cxx +++ b/dbaccess/source/core/misc/apitools.cxx @@ -18,7 +18,7 @@ */ #include "apitools.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include #include diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx index 2bef7806208e..f568942272da 100644 --- a/dbaccess/source/core/misc/dsntypes.cxx +++ b/dbaccess/source/core/misc/dsntypes.cxx @@ -18,14 +18,13 @@ */ #include "dsntypes.hxx" -#include "dbamiscres.hrc" #include #include #include #include -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include #include diff --git a/dbaccess/source/core/misc/sdbcoretools.cxx b/dbaccess/source/core/misc/sdbcoretools.cxx index c97a0a609c04..0f8ddc705d6a 100644 --- a/dbaccess/source/core/misc/sdbcoretools.cxx +++ b/dbaccess/source/core/misc/sdbcoretools.cxx @@ -18,7 +18,7 @@ */ #include "sdbcoretools.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include #include diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx index 62407e4df00f..7e848865a7e3 100644 --- a/dbaccess/source/core/recovery/dbdocrecovery.cxx +++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx @@ -22,7 +22,7 @@ #include "storagetextstream.hxx" #include "subcomponentrecovery.hxx" #include "subcomponents.hxx" -#include "dbastrings.hrc" +#include "stringconstants.hxx" #include #include diff --git a/dbaccess/source/core/resource/core_resource.cxx b/dbaccess/source/core/resource/core_resource.cxx index f2a7ea3b0f81..ad52b1638f90 100644 --- a/dbaccess/source/core/resource/core_resource.cxx +++ b/dbaccess/source/core/resource/core_resource.cxx @@ -38,37 +38,37 @@ namespace dbaccess } sal_Int32 ResourceManager::s_nClients = 0; - ResMgr* ResourceManager::m_pImpl = nullptr; + std::locale* ResourceManager::m_pImpl = nullptr; void ResourceManager::ensureImplExists() { if (m_pImpl) return; - m_pImpl = ResMgr::CreateResMgr("dba", Application::GetSettings().GetUILanguageTag()); + m_pImpl = new std::locale(Translate::Create("dba", Application::GetSettings().GetUILanguageTag())); } - OUString ResourceManager::loadString(sal_uInt16 _nResId) + OUString ResourceManager::loadString(const char* pResId) { OUString sReturn; ensureImplExists(); if (m_pImpl) - sReturn = OUString(ResId(_nResId,*m_pImpl)); + sReturn = Translate::get(pResId, *m_pImpl); return sReturn; } - OUString ResourceManager::loadString( sal_uInt16 _nResId, const sal_Char* _pPlaceholderAscii, const OUString& _rReplace ) + OUString ResourceManager::loadString(const char* pResId, const sal_Char* _pPlaceholderAscii, const OUString& _rReplace) { - OUString sString( loadString( _nResId ) ); + OUString sString(loadString(pResId)); return sString.replaceFirst( OUString::createFromAscii(_pPlaceholderAscii), _rReplace ); } - OUString ResourceManager::loadString( sal_uInt16 _nResId, const sal_Char* _pPlaceholderAscii1, const OUString& _rReplace1, - const sal_Char* _pPlaceholderAscii2, const OUString& _rReplace2 ) + OUString ResourceManager::loadString(const char* pResId, const sal_Char* _pPlaceholderAscii1, const OUString& _rReplace1, + const sal_Char* _pPlaceholderAscii2, const OUString& _rReplace2) { - OUString sString( loadString( _nResId ) ); + OUString sString(loadString(pResId)); sString = sString.replaceFirst( OUString::createFromAscii(_pPlaceholderAscii1), _rReplace1 ); sString = sString.replaceFirst( OUString::createFromAscii(_pPlaceholderAscii2), _rReplace2 ); return sString; diff --git a/dbaccess/source/core/resource/strings.src b/dbaccess/source/core/resource/strings.src deleted file mode 100644 index f81344328458..000000000000 --- a/dbaccess/source/core/resource/strings.src +++ /dev/null @@ -1,338 +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 "core_resource.hrc" -#include "dbamiscres.hrc" - -String RID_STR_CONNECTION_INVALID -{ - Text [ en-US ] = "No connection could be established."; -}; - -String RID_STR_TABLE_IS_FILTERED -{ - Text [ en-US ] = "The table $name$ already exists. It is not visible because it has been filtered out."; -}; - -String RID_STR_COULDNOTCONNECT_UNSPECIFIED -{ - Text [ en-US ] = "The connection to the external data source could not be established. An unknown error occurred. The driver is probably defective."; -}; - -String RID_STR_COULDNOTCONNECT_NODRIVER -{ - Text [ en-US ] = "The connection to the external data source could not be established. No SDBC driver was found for the URL '$name$'."; -}; - -String RID_STR_COULDNOTLOAD_MANAGER -{ - Text [ en-US ] = "The connection to the external data source could not be established. The SDBC driver manager could not be loaded."; -}; - -String RID_STR_FORM -{ - Text [ en-US ] = "Form"; -}; - -String RID_STR_REPORT -{ - Text [ en-US ] = "Report"; -}; - -String RID_STR_DATASOURCE_NOT_STORED -{ - Text [ en-US ] = "The data source was not saved. Please use the interface XStorable to save the data source."; -}; - -String RID_STR_ONLY_QUERY -{ - Text [ en-US ] = "The given command is not a SELECT statement.\nOnly queries are allowed."; -}; - -String RID_STR_NO_VALUE_CHANGED -{ - Text [ en-US ] = "No values were modified."; -}; - -String RID_STR_NO_XROWUPDATE -{ - Text [ en-US ] = "Values could not be inserted. The XRowUpdate interface is not supported by ResultSet."; -}; - -String RID_STR_NO_XRESULTSETUPDATE -{ - Text [ en-US ] = "Values could not be inserted. The XResultSetUpdate interface is not supported by ResultSet."; -}; - -String RID_STR_NO_UPDATE_MISSING_CONDITION -{ - Text [ en-US ] = "Values could not be modified, due to a missing condition statement."; -}; - -String RID_STR_NO_COLUMN_ADD -{ - Text [ en-US ] = "The adding of columns is not supported."; -}; - -String RID_STR_NO_COLUMN_DROP -{ - Text [ en-US ] = "The dropping of columns is not supported."; -}; - -String RID_STR_NO_CONDITION_FOR_PK -{ - Text [ en-US ] = "The WHERE condition could not be created for the primary key."; -}; - -String RID_STR_COLUMN_UNKNOWN_PROP -{ - Text [ en-US ] = "The column does not support the property '%value'."; -}; - -String RID_STR_COLUMN_NOT_SEARCHABLE -{ - Text [ en-US ] = "The column is not searchable!"; -}; - -String RID_STR_NOT_SEQUENCE_INT8 -{ - Text [ en-US ] = "The value of the columns is not of the type Sequence."; -}; - -String RID_STR_COLUMN_NOT_VALID -{ - Text [ en-US ] = "The column is not valid."; -}; - -String RID_STR_COLUMN_MUST_VISIBLE -{ - Text [ en-US ] = "The column '%name' must be visible as a column."; -}; - -String RID_STR_NO_XQUERIESSUPPLIER -{ - Text [ en-US ] = "The interface XQueriesSupplier is not available."; -}; - -String RID_STR_NO_ABS_ZERO -{ - Text [ en-US ] = "An 'absolute(0)' call is not allowed."; -}; - -String RID_STR_NO_RELATIVE -{ - Text [ en-US ] = "Relative positioning is not allowed in this state."; -}; - -String RID_STR_NO_REFESH_AFTERLAST -{ - Text [ en-US ] = "A row cannot be refreshed when the ResultSet is positioned after the last row."; -}; - -String RID_STR_NO_MOVETOINSERTROW_CALLED -{ - Text [ en-US ] = "A new row cannot be inserted when the ResultSet is not first moved to the insert row."; -}; - -String RID_STR_NO_UPDATEROW -{ - Text [ en-US ] = "A row cannot be modified in this state"; -}; - -String RID_STR_NO_DELETEROW -{ - Text [ en-US ] = "A row cannot be deleted in this state."; -}; - -String RID_STR_NO_TABLE_RENAME -{ - Text [ en-US ] = "The driver does not support table renaming."; -}; - -String RID_STR_COLUMN_ALTER_BY_NAME -{ - Text [ en-US ] = "The driver does not support the modification of column descriptions by changing the name."; -}; - -String RID_STR_COLUMN_ALTER_BY_INDEX -{ - Text [ en-US ] = "The driver does not support the modification of column descriptions by changing the index."; -}; - -String RID_STR_FILE_DOES_NOT_EXIST -{ - Text[ en-US ] = "The file \"$file$\" does not exist."; -}; - -String RID_STR_TABLE_DOES_NOT_EXIST -{ - Text [ en-US ] = "There exists no table named \"$table$\"."; -}; - -String RID_STR_QUERY_DOES_NOT_EXIST -{ - Text [ en-US ] = "There exists no query named \"$table$\"."; -}; - -String RID_STR_CONFLICTING_NAMES -{ - Text [ en-US ] = "There are tables in the database whose names conflict with the names of existing queries. To make full use of all queries and tables, make sure they have distinct names."; -}; - -String RID_STR_COMMAND_LEADING_TO_ERROR -{ - Text [ en-US ] = "The SQL command leading to this error is:\n\n$command$"; -}; - -String RID_STR_STATEMENT_WITHOUT_RESULT_SET -{ - Text [ en-US ] = "The SQL command does not describe a result set."; -}; - -String RID_STR_NAME_MUST_NOT_BE_EMPTY -{ - Text [ en-US ] = "The name must not be empty."; -}; - -String RID_STR_NO_NULL_OBJECTS_IN_CONTAINER -{ - Text [ en-US ] = "The container cannot contain NULL objects."; -}; - -String RID_STR_NAME_ALREADY_USED -{ - Text [ en-US ] = "There already is an object with the given name."; -}; - -String RID_STR_OBJECT_CONTAINER_MISMATCH -{ - Text [ en-US ] = "This object cannot be part of this container."; -}; - -String RID_STR_OBJECT_ALREADY_CONTAINED -{ - Text [ en-US ] = "The object already is, with a different name, part of the container."; -}; - -String RID_STR_NAME_NOT_FOUND -{ - Text [ en-US ] = "Unable to find the document '$name$'."; -}; - -String RID_STR_ERROR_WHILE_SAVING -{ - Text [ en-US ] = "Could not save the document to $location$:\n$message$"; -}; - -String RID_NO_SUCH_DATA_SOURCE -{ - Text [ en-US ] = "Error accessing data source '$name$':\n$error$"; -}; - -String RID_STR_NO_SUB_FOLDER -{ - Text [ en-US ] = "There exists no folder named \"$folder$\"."; -}; - -String RID_STR_NO_DELETE_BEFORE_AFTER -{ - Text [ en-US ] = "Cannot delete the before-first or after-last row."; -}; - -String RID_STR_NO_DELETE_INSERT_ROW -{ - Text [ en-US ] = "Cannot delete the insert-row."; -}; - -String RID_STR_RESULT_IS_READONLY -{ - Text [ en-US ] = "Result set is read only."; -}; - -String RID_STR_NO_DELETE_PRIVILEGE -{ - Text [ en-US ] = "DELETE privilege not available."; -}; - -String RID_STR_ROW_ALREADY_DELETED -{ - Text [ en-US ] = "Current row is already deleted."; -}; - -String RID_STR_UPDATE_FAILED -{ - Text [ en-US ] = "Current row could not be updated."; -}; - -String RID_STR_NO_INSERT_PRIVILEGE -{ - Text [ en-US ] = "INSERT privilege not available."; -}; - -String RID_STR_INTERNAL_ERROR -{ - Text [ en-US ] = "Internal error: no statement object provided by the database driver."; -}; - -String RID_STR_EXPRESSION1 -{ - Text [ en-US ] = "Expression1"; -}; - -String RID_STR_NO_SQL_COMMAND -{ - Text [ en-US ] = "No SQL command was provided."; -}; - -String RID_STR_INVALID_INDEX -{ - Text [ en-US ] = "Invalid column index."; -}; - -String RID_STR_INVALID_CURSOR_STATE -{ - Text [ en-US ] = "Invalid cursor state."; -}; - -String RID_STR_CURSOR_BEFORE_OR_AFTER -{ - Text [ en-US ] = "The cursor points to before the first or after the last row."; -}; - -String RID_STR_NO_BOOKMARK_BEFORE_OR_AFTER -{ - Text [ en-US ] = "The rows before the first and after the last row don't have a bookmark."; -}; - -String RID_STR_NO_BOOKMARK_DELETED -{ - Text [ en-US ] = "The current row is deleted, and thus doesn't have a bookmark."; -}; - -String RID_STR_CONNECTION_REQUEST -{ - Text [ en-US ] = "A connection for the following URL was requested \"$name$\"."; -}; - -String RID_STR_MISSING_EXTENSION -{ - Text [ en-US ] = "The extension is not installed."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/dbmm_global.hrc b/dbaccess/source/ext/macromigration/dbmm_global.hrc deleted file mode 100644 index 9105d11721dc..000000000000 --- a/dbaccess/source/ext/macromigration/dbmm_global.hrc +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef DBACCESS_DBMM_GLOBAL_HRC -#define DBACCESS_DBMM_GLOBAL_HRC - -#include - -#define RID_DBMM_STRING_START RID_DBACCESS_START + 0 - -#define STR_FORM ( RID_DBMM_STRING_START + 0 ) -#define STR_REPORT ( RID_DBMM_STRING_START + 1 ) -#define STR_OVERALL_PROGRESS ( RID_DBMM_STRING_START + 2 ) -#define STR_DATABASE_DOCUMENT ( RID_DBMM_STRING_START + 3 ) -#define STR_SAVED_COPY_TO ( RID_DBMM_STRING_START + 4 ) -#define STR_MOVED_LIBRARY ( RID_DBMM_STRING_START + 5 ) -#define STR_OOO_BASIC ( RID_DBMM_STRING_START + 6 ) -#define STR_JAVA_SCRIPT ( RID_DBMM_STRING_START + 7 ) -#define STR_BEAN_SHELL ( RID_DBMM_STRING_START + 8 ) -#define STR_JAVA ( RID_DBMM_STRING_START + 9 ) -#define STR_PYTHON ( RID_DBMM_STRING_START + 10 ) -#define STR_DIALOG ( RID_DBMM_STRING_START + 11 ) -#define STR_MIGRATING_LIBS ( RID_DBMM_STRING_START + 12 ) -#define STR_ERRORS ( RID_DBMM_STRING_START + 13 ) -#define STR_WARNINGS ( RID_DBMM_STRING_START + 14 ) -#define STR_EXCEPTION ( RID_DBMM_STRING_START + 15 ) -#define STR_LIBRARY_TYPE_AND_NAME ( RID_DBMM_STRING_START + 16 ) -#define STR_INVALID_NUMBER_ARGS ( RID_DBMM_STRING_START + 17 ) -#define STR_NO_DATABASE ( RID_DBMM_STRING_START + 18 ) -#define STR_NOT_READONLY ( RID_DBMM_STRING_START + 19 ) -#define STR_STATE_CLOSE_SUB_DOCS ( RID_DBMM_STRING_START + 20 ) -#define STR_STATE_BACKUP_DBDOC ( RID_DBMM_STRING_START + 21 ) -#define STR_STATE_MIGRATE ( RID_DBMM_STRING_START + 22 ) -#define STR_STATE_SUMMARY ( RID_DBMM_STRING_START + 23 ) -#define STR_INVALID_BACKUP_LOCATION ( RID_DBMM_STRING_START + 25 ) - -#endif // DBACCESS_DBMM_GLOBAL_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/dbmm_module.cxx b/dbaccess/source/ext/macromigration/dbmm_module.cxx deleted file mode 100644 index 826e945ae167..000000000000 --- a/dbaccess/source/ext/macromigration/dbmm_module.cxx +++ /dev/null @@ -1,31 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "dbmm_module.hxx" - -#include - -namespace dbmm -{ - - IMPLEMENT_MODULE( MacroMigrationModule, "dbmm" ); - -} // namespace dbmm - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/dbmm_module.hxx b/dbaccess/source/ext/macromigration/dbmm_module.hxx deleted file mode 100644 index ff171823703f..000000000000 --- a/dbaccess/source/ext/macromigration/dbmm_module.hxx +++ /dev/null @@ -1,34 +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_DBACCESS_SOURCE_EXT_MACROMIGRATION_DBMM_MODULE_HXX -#define INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_DBMM_MODULE_HXX - -#include - -namespace dbmm -{ - - DEFINE_MODULE( MacroMigrationModule, MacroMigrationModuleClient, MacroMigrationResId ) - -} // namespace dbmm - -#endif // INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_DBMM_MODULE_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/dbmm_services.cxx b/dbaccess/source/ext/macromigration/dbmm_services.cxx index 332d82987d20..1ced4c105042 100644 --- a/dbaccess/source/ext/macromigration/dbmm_services.cxx +++ b/dbaccess/source/ext/macromigration/dbmm_services.cxx @@ -17,26 +17,25 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "dbmm_module.hxx" +#include #include "macromigrationwizard.hxx" -namespace dbmm -{ - - static void initializeModule() - { - ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - createRegistryInfo_MacroMigrationDialogService(); - } - -} // namespace dbmm - extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbmm_component_getFactory( const sal_Char* pImplementationName, SAL_UNUSED_PARAMETER void*, SAL_UNUSED_PARAMETER void* ) { - ::dbmm::initializeModule(); - return ::dbmm::MacroMigrationModule::getInstance().getComponentFactory( pImplementationName ); + css::uno::Reference xRet; + + if (dbmm::MacroMigrationDialogService::getImplementationName_static() == OUString::createFromAscii(pImplementationName)) + { + xRet = ::cppu::createSingleComponentFactory(dbmm::MacroMigrationDialogService::Create, + dbmm::MacroMigrationDialogService::getImplementationName_static(), + dbmm::MacroMigrationDialogService::getSupportedServiceNames_static(), nullptr); + } + + if (xRet.is()) + xRet->acquire(); + return xRet.get(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/dbmm_types.cxx b/dbaccess/source/ext/macromigration/dbmm_types.cxx index 87f7311ec952..554945c068a3 100644 --- a/dbaccess/source/ext/macromigration/dbmm_types.cxx +++ b/dbaccess/source/ext/macromigration/dbmm_types.cxx @@ -17,30 +17,30 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include +#include "core_resource.hxx" #include "dbmm_types.hxx" - -#include "dbmm_global.hrc" -#include "dbmm_module.hxx" +#include "strings.hrc" namespace dbmm { - // helper OUString getScriptTypeDisplayName( const ScriptType _eType ) { - sal_uInt16 nResId( 0 ); + const char *pResId = nullptr; switch ( _eType ) { - case eBasic: nResId = STR_OOO_BASIC; break; - case eBeanShell: nResId = STR_BEAN_SHELL; break; - case eJavaScript: nResId = STR_JAVA_SCRIPT; break; - case ePython: nResId = STR_PYTHON; break; - case eJava: nResId = STR_JAVA; break; - case eDialog: nResId = STR_DIALOG; break; + case eBasic: pResId = STR_OOO_BASIC; break; + case eBeanShell: pResId = STR_BEAN_SHELL; break; + case eJavaScript: pResId = STR_JAVA_SCRIPT; break; + case ePython: pResId = STR_PYTHON; break; + case eJava: pResId = STR_JAVA; break; + case eDialog: pResId = STR_DIALOG; break; } - OSL_ENSURE( nResId != 0, "getScriptTypeDisplayName: illegal script type!" ); - return nResId ? OUString( MacroMigrationResId( nResId ) ) : OUString(); + OSL_ENSURE( pResId != nullptr, "getScriptTypeDisplayName: illegal script type!" ); + + return pResId ? DBA_RES(pResId) : OUString(); } } // namespace dbmm diff --git a/dbaccess/source/ext/macromigration/macromigration.hrc b/dbaccess/source/ext/macromigration/macromigration.hrc deleted file mode 100644 index e4bc293c6803..000000000000 --- a/dbaccess/source/ext/macromigration/macromigration.hrc +++ /dev/null @@ -1,29 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef DBACCESS_MACROMIGRATION_HRC -#define DBACCESS_MACROMIGRATION_HRC - -// height and width of tab pages -#define TAB_PAGE_WIDTH 280 -#define TAB_PAGE_HEIGHT 185 - -#endif // DBACCESS_MACROMIGRATION_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/macromigration.src b/dbaccess/source/ext/macromigration/macromigration.src deleted file mode 100644 index fe5812bfc50c..000000000000 --- a/dbaccess/source/ext/macromigration/macromigration.src +++ /dev/null @@ -1,149 +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 "dbmm_global.hrc" - -String STR_STATE_CLOSE_SUB_DOCS -{ - Text [ en-US ] = "Prepare"; -}; - -String STR_STATE_BACKUP_DBDOC -{ - Text [ en-US ] = "Backup Document"; -}; - -String STR_STATE_MIGRATE -{ - Text [ en-US ] = "Migrate"; -}; - -String STR_STATE_SUMMARY -{ - Text [ en-US ] = "Summary"; -}; - -String STR_FORM -{ - Text [ en-US ] = "Form '$name$'"; - Text [ x-comment ] = "This refers to a form document inside a database document."; -}; - -String STR_REPORT -{ - Text [ en-US ] = "Report '$name$'"; - Text [ x-comment ] = "This refers to a report document inside a database document."; -}; - -String STR_OVERALL_PROGRESS -{ - Text [ en-US ] = "document $current$ of $overall$"; -}; - -String STR_DATABASE_DOCUMENT -{ - Text[ en-US ] = "Database Document"; -}; - -String STR_SAVED_COPY_TO -{ - Text[ en-US ] = "saved copy to $location$"; -}; - -String STR_MOVED_LIBRARY -{ - Text[ en-US ] = "migrated $type$ library '$old$' to '$new$'"; -}; - -String STR_LIBRARY_TYPE_AND_NAME -{ - Text [ en-US ] = "$type$ library '$library$'"; -}; - -String STR_MIGRATING_LIBS -{ - Text [ en-US ] = "migrating libraries ..."; -}; - -String STR_OOO_BASIC -{ - Text[ en-US ] = "%PRODUCTNAME Basic"; -}; - -String STR_JAVA_SCRIPT -{ - Text[ en-US ] = "JavaScript"; -}; - -String STR_BEAN_SHELL -{ - Text[ en-US ] = "BeanShell"; -}; - -String STR_JAVA -{ - Text[ en-US ] = "Java"; -}; - -String STR_PYTHON -{ - Text[ en-US ] = "Python"; -}; - -String STR_DIALOG -{ - Text[ en-US ] = "dialog"; -}; - -String STR_ERRORS -{ - Text [ en-US ] = "Error(s)"; -}; - -String STR_WARNINGS -{ - Text [ en-US ] = "Warnings"; -}; - -String STR_EXCEPTION -{ - Text [ en-US ] = "caught exception:"; -}; - -String STR_INVALID_BACKUP_LOCATION -{ - Text [ en-US ] = "You need to choose a backup location other than the document location itself."; -}; - -String STR_INVALID_NUMBER_ARGS -{ - Text [ en-US ] = "Invalid number of initialization arguments. Expected 1."; -}; - -String STR_NO_DATABASE -{ - Text [ en-US ] = "No database document found in the initialization arguments."; -}; - -String STR_NOT_READONLY -{ - Text [ en-US ] = "Not applicable to read-only documents."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx index 6637bb32f49c..349c95d2b35d 100644 --- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx @@ -17,10 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "dbmm_global.hrc" -#include "dbmm_module.hxx" #include "docinteraction.hxx" -#include "macromigration.hrc" +#include "core_resource.hxx" +#include "strings.hrc" #include "macromigrationdialog.hxx" #include "macromigrationpages.hxx" #include "migrationengine.hxx" @@ -57,6 +56,10 @@ namespace dbmm #define PATH_DEFAULT 1 +// height and width of tab pages +#define TAB_PAGE_WIDTH 280 +#define TAB_PAGE_HEIGHT 185 + using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XComponentContext; using ::com::sun::star::uno::XInterface; @@ -125,10 +128,10 @@ namespace dbmm : MacroMigrationDialog_Base(_pParent) , m_pData( new MacroMigrationDialog_Data( _rContext, _rxDocument ) ) { - OUString sTitlePrepare( MacroMigrationResId( STR_STATE_CLOSE_SUB_DOCS ) ); - OUString sTitleStoreAs( MacroMigrationResId( STR_STATE_BACKUP_DBDOC ) ); - OUString sTitleMigrate( MacroMigrationResId( STR_STATE_MIGRATE ) ); - OUString sTitleSummary( MacroMigrationResId( STR_STATE_SUMMARY ) ); + OUString sTitlePrepare( DBA_RES( STR_STATE_CLOSE_SUB_DOCS ) ); + OUString sTitleStoreAs( DBA_RES( STR_STATE_BACKUP_DBDOC ) ); + OUString sTitleMigrate( DBA_RES( STR_STATE_MIGRATE ) ); + OUString sTitleSummary( DBA_RES( STR_STATE_SUMMARY ) ); describeState( STATE_CLOSE_SUB_DOCS, sTitlePrepare, &PreparationPage::Create ); describeState( STATE_BACKUP_DBDOC, sTitleStoreAs, &SaveDBDocPage::Create ); @@ -382,7 +385,7 @@ namespace dbmm // check that the backup location isn't the same as the document itself if ( lcl_equalURLs_nothrow( m_pData->aContext, sBackupLocation, m_pData->xDocumentModel->getURL() ) ) { - ScopedVclPtrInstance< MessageDialog > aErrorBox( const_cast< MacroMigrationDialog* >( this ), MacroMigrationResId( STR_INVALID_BACKUP_LOCATION ) ); + ScopedVclPtrInstance< MessageDialog > aErrorBox( const_cast< MacroMigrationDialog* >( this ), DBA_RES( STR_INVALID_BACKUP_LOCATION ) ); aErrorBox->Execute(); rBackupPage.grabLocationFocus(); return false; diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx index dd1f49942698..e2e134d5ac52 100644 --- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx @@ -18,9 +18,7 @@ */ #include "dbaccess_helpid.hrc" -#include "dbmm_module.hxx" -#include "dbmm_global.hrc" -#include "macromigration.hrc" +#include "strings.hrc" #include "macromigrationpages.hxx" #include "macromigrationdialog.hxx" diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx index 96201b2f801f..4cb72dce82df 100644 --- a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx @@ -17,83 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "dbmm_module.hxx" -#include "dbmm_global.hrc" -#include "macromigrationdialog.hxx" #include "macromigrationwizard.hxx" -#include -#include -#include - -#include - namespace dbmm { - - using ::com::sun::star::uno::Reference; - using ::com::sun::star::uno::XInterface; - using ::com::sun::star::uno::UNO_QUERY; - using ::com::sun::star::uno::UNO_QUERY_THROW; - using ::com::sun::star::uno::Exception; - using ::com::sun::star::uno::RuntimeException; - using ::com::sun::star::uno::Any; - using ::com::sun::star::uno::XComponentContext; - using ::com::sun::star::uno::Sequence; - using ::com::sun::star::beans::XPropertySetInfo; - using ::com::sun::star::beans::Property; - using ::com::sun::star::ucb::AlreadyInitializedException; - using ::com::sun::star::sdb::XOfficeDatabaseDocument; - using ::com::sun::star::lang::IllegalArgumentException; - using ::com::sun::star::frame::XStorable; - - // MacroMigrationDialogService - class MacroMigrationDialogService; - typedef ::svt::OGenericUnoDialog MacroMigrationDialogService_Base; - typedef ::comphelper::OPropertyArrayUsageHelper< MacroMigrationDialogService > MacroMigrationDialogService_PBase; - - class MacroMigrationDialogService - :public MacroMigrationDialogService_Base - ,public MacroMigrationDialogService_PBase - ,public MacroMigrationModuleClient - { - public: - explicit MacroMigrationDialogService( const Reference< XComponentContext >& _rxContext ); - - // XTypeProvider - virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() override; - - // XServiceInfo - virtual OUString SAL_CALL getImplementationName() override; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override; - - // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; - - // XPropertySet - virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo() override; - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; - - // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; - - // helper for factories - static Reference< XInterface > SAL_CALL Create( const Reference< XComponentContext >& _rxContext ); - /// @throws RuntimeException - static OUString SAL_CALL getImplementationName_static(); - /// @throws RuntimeException - static Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); - - protected: - virtual ~MacroMigrationDialogService() override; - - protected: - virtual VclPtr createDialog( vcl::Window* _pParent ) override; - - private: - Reference< XOfficeDatabaseDocument > m_xDocument; - }; - // MacroMigrationDialogService MacroMigrationDialogService::MacroMigrationDialogService( const Reference< XComponentContext >& _rxContext ) :MacroMigrationDialogService_Base( _rxContext ) @@ -157,7 +84,7 @@ namespace dbmm if ( _rArguments.getLength() != 1 ) throw IllegalArgumentException( - MacroMigrationResId(STR_INVALID_NUMBER_ARGS), + DBA_RES(STR_INVALID_NUMBER_ARGS), *this, 1 ); @@ -165,7 +92,7 @@ namespace dbmm m_xDocument.set( _rArguments[0], UNO_QUERY ); if ( !m_xDocument.is() ) throw IllegalArgumentException( - MacroMigrationResId(STR_NO_DATABASE), + DBA_RES(STR_NO_DATABASE), *this, 1 ); @@ -173,7 +100,7 @@ namespace dbmm Reference< XStorable > xDocStor( m_xDocument, UNO_QUERY_THROW ); if ( xDocStor->isReadonly() ) throw IllegalArgumentException( - MacroMigrationResId(STR_NOT_READONLY), + DBA_RES(STR_NOT_READONLY), *this, 1 ); @@ -197,12 +124,6 @@ namespace dbmm describeProperties( aProps ); return new ::cppu::OPropertyArrayHelper( aProps ); } - - void createRegistryInfo_MacroMigrationDialogService() - { - static OAutoRegistration< MacroMigrationDialogService > aAutoRegistration; - } - } // namespace dbmm /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.hxx b/dbaccess/source/ext/macromigration/macromigrationwizard.hxx index 3c0bb6c37bbc..ebe1634c8bf6 100644 --- a/dbaccess/source/ext/macromigration/macromigrationwizard.hxx +++ b/dbaccess/source/ext/macromigration/macromigrationwizard.hxx @@ -17,17 +17,82 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_MACROMIGRATIONWIZARD_HXX -#define INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_MACROMIGRATIONWIZARD_HXX +#include "macromigrationdialog.hxx" -#include +#include +#include +#include -namespace dbmm { +#include -void createRegistryInfo_MacroMigrationDialogService(); +#include "core_resource.hxx" +#include "strings.hrc" -} +namespace dbmm +{ -#endif + using ::com::sun::star::uno::Reference; + using ::com::sun::star::uno::XInterface; + using ::com::sun::star::uno::UNO_QUERY; + using ::com::sun::star::uno::UNO_QUERY_THROW; + using ::com::sun::star::uno::Exception; + using ::com::sun::star::uno::RuntimeException; + using ::com::sun::star::uno::Any; + using ::com::sun::star::uno::XComponentContext; + using ::com::sun::star::uno::Sequence; + using ::com::sun::star::beans::XPropertySetInfo; + using ::com::sun::star::beans::Property; + using ::com::sun::star::ucb::AlreadyInitializedException; + using ::com::sun::star::sdb::XOfficeDatabaseDocument; + using ::com::sun::star::lang::IllegalArgumentException; + using ::com::sun::star::frame::XStorable; + + // MacroMigrationDialogService + class MacroMigrationDialogService; + typedef ::svt::OGenericUnoDialog MacroMigrationDialogService_Base; + typedef ::comphelper::OPropertyArrayUsageHelper< MacroMigrationDialogService > MacroMigrationDialogService_PBase; + + class MacroMigrationDialogService + :public MacroMigrationDialogService_Base + ,public MacroMigrationDialogService_PBase + { + public: + explicit MacroMigrationDialogService( const Reference< XComponentContext >& _rxContext ); + + // XTypeProvider + virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + + // XServiceInfo + virtual OUString SAL_CALL getImplementationName() override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override; + + // XInitialization + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; + + // XPropertySet + virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo() override; + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; + + // OPropertyArrayUsageHelper + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; + + // helper for factories + static Reference< XInterface > SAL_CALL Create( const Reference< XComponentContext >& _rxContext ); + /// @throws RuntimeException + static OUString SAL_CALL getImplementationName_static(); + /// @throws RuntimeException + static Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); + + protected: + virtual ~MacroMigrationDialogService() override; + + protected: + virtual VclPtr createDialog( vcl::Window* _pParent ) override; + + private: + Reference< XOfficeDatabaseDocument > m_xDocument; + }; + +} // namespace dbmm /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx index 8b0b7a3c8a5f..ebfe416d28e5 100644 --- a/dbaccess/source/ext/macromigration/migrationengine.cxx +++ b/dbaccess/source/ext/macromigration/migrationengine.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "dbmm_global.hrc" -#include "dbmm_module.hxx" #include "dbmm_types.hxx" #include "docinteraction.hxx" #include "migrationengine.hxx" @@ -27,6 +25,8 @@ #include "migrationlog.hxx" #include "progresscapture.hxx" #include "progressmixer.hxx" +#include "core_resource.hxx" +#include "strings.hrc" #include #include @@ -209,8 +209,8 @@ namespace dbmm OUString lcl_getSubDocumentDescription( const SubDocument& _rDocument ) { OUString sObjectName( - OUString(MacroMigrationResId( - _rDocument.eType == eForm ? STR_FORM : STR_REPORT)). + DBA_RES( + _rDocument.eType == eForm ? STR_FORM : STR_REPORT). replaceFirst("$name$", _rDocument.sHierarchicalName)); return sObjectName; } @@ -924,7 +924,7 @@ namespace dbmm // initialize global progress sal_Int32 nOverallRange( m_aSubDocs.size() ); OUString sProgressSkeleton( - OUString(MacroMigrationResId(STR_OVERALL_PROGRESS)). + DBA_RES( STR_OVERALL_PROGRESS). replaceFirst("$overall$", OUString::number(nOverallRange))); m_rProgress.start( nOverallRange ); @@ -1045,7 +1045,7 @@ namespace dbmm } // migrate the libraries - ProgressDelegator aDelegator(m_rProgress, sObjectName, MacroMigrationResId(STR_MIGRATING_LIBS)); + ProgressDelegator aDelegator(m_rProgress, sObjectName, DBA_RES(STR_MIGRATING_LIBS)); ProgressMixer aProgressMixer( aDelegator ); aProgressMixer.registerPhase( PHASE_JAVASCRIPT, 1 ); aProgressMixer.registerPhase( PHASE_BEANSHELL, 1 ); @@ -1773,7 +1773,7 @@ namespace dbmm { // a human-readable description of the affected library OUString sLibraryDescription( - OUString(MacroMigrationResId(STR_LIBRARY_TYPE_AND_NAME)). + DBA_RES(STR_LIBRARY_TYPE_AND_NAME). replaceFirst("$type$", getScriptTypeDisplayName(_eScriptType)). replaceFirst("$library$", _rLibraryName)); diff --git a/dbaccess/source/ext/macromigration/migrationlog.cxx b/dbaccess/source/ext/macromigration/migrationlog.cxx index 6c82391b8197..1346999440fe 100644 --- a/dbaccess/source/ext/macromigration/migrationlog.cxx +++ b/dbaccess/source/ext/macromigration/migrationlog.cxx @@ -17,12 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "dbmm_module.hxx" -#include "dbmm_global.hrc" +#include "core_resource.hxx" #include "migrationerror.hxx" #include "migrationlog.hxx" +#include "strings.hrc" #include +#include #include #include @@ -340,13 +341,13 @@ namespace dbmm } } - void lcl_describeErrors( OUStringBuffer& _rBuffer, const ErrorLog& _rErrors, const sal_uInt16 _nHeadingResId ) + void lcl_describeErrors( OUStringBuffer& _rBuffer, const ErrorLog& _rErrors, const char* pHeadingResId ) { _rBuffer.append( "=== " ); - _rBuffer.append ( OUString( MacroMigrationResId( _nHeadingResId ) ) ); + _rBuffer.append( DBA_RES(pHeadingResId) ); _rBuffer.append( " ===\n" ); - OUString sException( MacroMigrationResId( STR_EXCEPTION ) ); + OUString sException( DBA_RES( STR_EXCEPTION ) ); for ( ErrorLog::const_iterator error = _rErrors.begin(); error != _rErrors.end(); @@ -386,10 +387,10 @@ namespace dbmm if ( !m_pData->sBackupLocation.isEmpty() ) { - OUString sBackedUp( MacroMigrationResId( STR_SAVED_COPY_TO ) ); + OUString sBackedUp( DBA_RES( STR_SAVED_COPY_TO ) ); sBackedUp = sBackedUp.replaceAll( "$location$", m_pData->sBackupLocation ); - aBuffer.append( "=== " + OUString( MacroMigrationResId( STR_DATABASE_DOCUMENT ) ) + aBuffer.append( "=== " + DBA_RES( STR_DATABASE_DOCUMENT ) + " ===\n" + sBackedUp + "\n\n"); } @@ -400,7 +401,7 @@ namespace dbmm } else { - OUString sMovedLibTemplate( MacroMigrationResId( STR_MOVED_LIBRARY ) ); + OUString sMovedLibTemplate( DBA_RES( STR_MOVED_LIBRARY ) ); for ( DocumentLogs::const_iterator doc = m_pData->aDocumentLogs.begin(); doc != m_pData->aDocumentLogs.end(); @@ -412,7 +413,7 @@ namespace dbmm if ( rDoc.aMovedLibraries.empty() ) continue; - OUString sDocTitle( MacroMigrationResId( rDoc.eType == eForm ? STR_FORM : STR_REPORT ) ); + OUString sDocTitle( DBA_RES( rDoc.eType == eForm ? STR_FORM : STR_REPORT ) ); sDocTitle = sDocTitle.replaceAll( "$name$", rDoc.sName ); aBuffer.append( "=== " + sDocTitle + " ===\n" ); diff --git a/dbaccess/source/ext/macromigration/migrationprogress.hxx b/dbaccess/source/ext/macromigration/migrationprogress.hxx index 55087bfc7756..49feb9af9181 100644 --- a/dbaccess/source/ext/macromigration/migrationprogress.hxx +++ b/dbaccess/source/ext/macromigration/migrationprogress.hxx @@ -20,6 +20,9 @@ #ifndef INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_MIGRATIONPROGRESS_HXX #define INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_MIGRATIONPROGRESS_HXX +#include +#include + namespace dbmm { diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index aff11ddd5376..a20c299e8caf 100644 --- a/dbaccess/source/filter/xml/dbloader2.cxx +++ b/dbaccess/source/filter/xml/dbloader2.cxx @@ -19,7 +19,8 @@ #include "flt_reghelper.hxx" #include "xmlservices.hxx" -#include "xmlstrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include #include diff --git a/dbaccess/source/filter/xml/xmlColumn.cxx b/dbaccess/source/filter/xml/xmlColumn.cxx index fbb75beadd0c..db8a81e0a987 100644 --- a/dbaccess/source/filter/xml/xmlColumn.cxx +++ b/dbaccess/source/filter/xml/xmlColumn.cxx @@ -24,7 +24,8 @@ #include #include #include "xmlEnums.hxx" -#include "xmlstrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include #include #include diff --git a/dbaccess/source/filter/xml/xmlComponent.cxx b/dbaccess/source/filter/xml/xmlComponent.cxx index 9d0bfd65f25d..f1ceb62e3797 100644 --- a/dbaccess/source/filter/xml/xmlComponent.cxx +++ b/dbaccess/source/filter/xml/xmlComponent.cxx @@ -23,7 +23,8 @@ #include #include #include "xmlEnums.hxx" -#include "xmlstrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include #include #include diff --git a/dbaccess/source/filter/xml/xmlConnectionData.cxx b/dbaccess/source/filter/xml/xmlConnectionData.cxx index 20b562697383..c3be7fedaf49 100644 --- a/dbaccess/source/filter/xml/xmlConnectionData.cxx +++ b/dbaccess/source/filter/xml/xmlConnectionData.cxx @@ -27,7 +27,7 @@ #include "xmlEnums.hxx" #include "xmlDatabaseDescription.hxx" #include "xmlConnectionResource.hxx" -#include "xmlstrings.hrc" +#include "stringconstants.hxx" #include namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlConnectionResource.cxx b/dbaccess/source/filter/xml/xmlConnectionResource.cxx index 8905cfe44564..09d330d5a4a3 100644 --- a/dbaccess/source/filter/xml/xmlConnectionResource.cxx +++ b/dbaccess/source/filter/xml/xmlConnectionResource.cxx @@ -23,7 +23,8 @@ #include #include #include "xmlEnums.hxx" -#include "xmlstrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include #include diff --git a/dbaccess/source/filter/xml/xmlDataSource.cxx b/dbaccess/source/filter/xml/xmlDataSource.cxx index 80d2377d3e77..e57ba90947d7 100644 --- a/dbaccess/source/filter/xml/xmlDataSource.cxx +++ b/dbaccess/source/filter/xml/xmlDataSource.cxx @@ -28,7 +28,8 @@ #include #include #include "xmlEnums.hxx" -#include "xmlstrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include #include #include "xmlConnectionData.hxx" diff --git a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx index 3416ee256838..b5c53aabb580 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx @@ -24,7 +24,8 @@ #include #include #include "xmlEnums.hxx" -#include "xmlstrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include #include diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx index a7f25caec522..fe0b336a74a5 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx @@ -29,7 +29,7 @@ #include #include #include "xmlEnums.hxx" -#include "xmlstrings.hrc" +#include "stringconstants.hxx" #include namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx index e9b4f23ba3e4..e9378590dd1d 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx @@ -24,7 +24,7 @@ #include #include #include "xmlEnums.hxx" -#include "xmlstrings.hrc" +#include "stringconstants.hxx" #include #include diff --git a/dbaccess/source/filter/xml/xmlDatabase.cxx b/dbaccess/source/filter/xml/xmlDatabase.cxx index af7d1d61ba70..e79c57efe3e0 100644 --- a/dbaccess/source/filter/xml/xmlDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlDatabase.cxx @@ -28,7 +28,8 @@ #include #include #include -#include "xmlstrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx index 579325c57fbe..bc6b1eb1c72a 100644 --- a/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx +++ b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx @@ -26,7 +26,7 @@ #include "xmlEnums.hxx" #include "xmlFileBasedDatabase.hxx" #include "xmlServerDatabase.hxx" -#include "xmlstrings.hrc" +#include "stringconstants.hxx" #include namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlDocuments.cxx b/dbaccess/source/filter/xml/xmlDocuments.cxx index 97b0c6ce41b3..b8137f2233a4 100644 --- a/dbaccess/source/filter/xml/xmlDocuments.cxx +++ b/dbaccess/source/filter/xml/xmlDocuments.cxx @@ -26,7 +26,7 @@ #include "xmlComponent.hxx" #include "xmlHierarchyCollection.hxx" #include "xmlEnums.hxx" -#include "xmlstrings.hrc" +#include "stringconstants.hxx" namespace dbaxml { diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx index 707a8b778d8d..0644db8ac6e8 100644 --- a/dbaccess/source/filter/xml/xmlExport.cxx +++ b/dbaccess/source/filter/xml/xmlExport.cxx @@ -31,7 +31,8 @@ #include #include #include -#include "xmlstrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include "xmlEnums.hxx" #include #include diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx index 458a26b57161..8ddd10face62 100644 --- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx @@ -23,7 +23,8 @@ #include #include #include "xmlEnums.hxx" -#include "xmlstrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include #include #include diff --git a/dbaccess/source/filter/xml/xmlHelper.cxx b/dbaccess/source/filter/xml/xmlHelper.cxx index 5bcb2906eea0..d7e24a8fb5d0 100644 --- a/dbaccess/source/filter/xml/xmlHelper.cxx +++ b/dbaccess/source/filter/xml/xmlHelper.cxx @@ -27,7 +27,8 @@ #include #include -#include "xmlstrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include "xmlEnums.hxx" namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx index 44197f555ed4..d7a10a735814 100644 --- a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx +++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx @@ -26,7 +26,7 @@ #include #include #include "xmlEnums.hxx" -#include "xmlstrings.hrc" +#include "stringconstants.hxx" #include #include diff --git a/dbaccess/source/filter/xml/xmlLogin.cxx b/dbaccess/source/filter/xml/xmlLogin.cxx index bad2b885b03b..3c44f3cfbee3 100644 --- a/dbaccess/source/filter/xml/xmlLogin.cxx +++ b/dbaccess/source/filter/xml/xmlLogin.cxx @@ -23,7 +23,8 @@ #include #include #include "xmlEnums.hxx" -#include "xmlstrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include #include #include diff --git a/dbaccess/source/filter/xml/xmlQuery.cxx b/dbaccess/source/filter/xml/xmlQuery.cxx index d37fd226947a..e93d411df2af 100644 --- a/dbaccess/source/filter/xml/xmlQuery.cxx +++ b/dbaccess/source/filter/xml/xmlQuery.cxx @@ -23,7 +23,8 @@ #include #include #include "xmlEnums.hxx" -#include "xmlstrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include #include #include diff --git a/dbaccess/source/filter/xml/xmlServerDatabase.cxx b/dbaccess/source/filter/xml/xmlServerDatabase.cxx index 06502559eec2..63718920070b 100644 --- a/dbaccess/source/filter/xml/xmlServerDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlServerDatabase.cxx @@ -23,7 +23,8 @@ #include #include #include "xmlEnums.hxx" -#include "xmlstrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include #include diff --git a/dbaccess/source/filter/xml/xmlTable.cxx b/dbaccess/source/filter/xml/xmlTable.cxx index 2450c8b9c875..ceb86414d249 100644 --- a/dbaccess/source/filter/xml/xmlTable.cxx +++ b/dbaccess/source/filter/xml/xmlTable.cxx @@ -25,7 +25,8 @@ #include "xmlEnums.hxx" #include "xmlStyleImport.hxx" #include "xmlHierarchyCollection.hxx" -#include "xmlstrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include #include #include diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.cxx b/dbaccess/source/filter/xml/xmlTableFilterList.cxx index 2cd959e5cfb5..20427c2a0df6 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterList.cxx +++ b/dbaccess/source/filter/xml/xmlTableFilterList.cxx @@ -23,7 +23,8 @@ #include #include #include -#include "xmlstrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include #include #include "xmlfilter.hxx" diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index 41973b5efd6c..0f9007c379a6 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -43,7 +43,8 @@ #include #include "xmlDatabase.hxx" #include "xmlEnums.hxx" -#include "xmlstrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include #include "xmlStyleImport.hxx" #include diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx index d03fdb0d453b..015d8c14b4a1 100644 --- a/dbaccess/source/inc/apitools.hxx +++ b/dbaccess/source/inc/apitools.hxx @@ -30,6 +30,7 @@ #include #include #include +#include "strings.hxx" // OSubComponent - a component which holds a hard ref to its parent // and is been hold itself (by the parent) with a weak ref diff --git a/dbaccess/source/inc/dbastrings.hrc b/dbaccess/source/inc/dbastrings.hrc deleted file mode 100644 index a4ccd46649d4..000000000000 --- a/dbaccess/source/inc/dbastrings.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 DBACCESS_SHARED_DBASTRINGS_HRC -#define DBACCESS_SHARED_DBASTRINGS_HRC - -#include - -#define STRINGCONSTANTS_INCLUDED_INDIRECT -#include "stringconstants.hrc" -#undef STRINGCONSTANTS_INCLUDED_INDIRECT -#include "stringconstants.inc" - - #define SQLSTATE_GENERAL "01000" - - #define PROPERTY_APPLYFORMDESIGNMODE "ApplyFormDesignMode" - #define PROPERTY_IS_FORM "IsForm" - #define PROPERTY_PERSISTENT_PATH "PersistentPath" - -#endif // DBACCESS_SHARED_DBASTRINGS_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/inc/dbustrings.hrc b/dbaccess/source/inc/dbustrings.hrc deleted file mode 100644 index 9911441257c6..000000000000 --- a/dbaccess/source/inc/dbustrings.hrc +++ /dev/null @@ -1,63 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef DBACCESS_SHARED_DBUSTRINGS_HRC -#define DBACCESS_SHARED_DBUSTRINGS_HRC - -#include - -#define STRINGCONSTANTS_INCLUDED_INDIRECT -#include "stringconstants.hrc" -#undef STRINGCONSTANTS_INCLUDED_INDIRECT -#include "stringconstants.inc" - - // URLs - - #define URL_COMPONENT_QUERYDESIGN ".component:DB/QueryDesign" - #define URL_COMPONENT_VIEWDESIGN ".component:DB/ViewDesign" - #define URL_COMPONENT_TABLEDESIGN ".component:DB/TableDesign" - #define URL_COMPONENT_FORMGRIDVIEW ".component:DB/FormGridView" - #define URL_COMPONENT_DATASOURCEBROWSER ".component:DB/DataSourceBrowser" - #define URL_COMPONENT_RELATIONDESIGN ".component:DB/RelationDesign" - #define URL_COMPONENT_APPLICATION ".component:DB/Application" - #define URL_COMPONENT_REPORTDESIGN ".component:DB/ReportDesign" - - // service names - - #define SERVICE_SDB_DIRECTSQLDIALOG "org.openoffice.comp.dbu.DirectSqlDialog" - - // other DBU relevant strings - - #define FRAME_NAME_QUERY_PREVIEW "QueryPreview" - #define SERVICE_CONTROLDEFAULT "com.sun.star.comp.dbu.OColumnControl" - #define PROPERTY_QUERYDESIGNVIEW "QueryDesignView" - #define PROPERTY_GRAPHICAL_DESIGN "GraphicalDesign" - #define PROPERTY_HELP_URL "HelpURL" - - // other DBU properties - - #define PROPERTY_TRISTATE "TriState" - #define PROPERTY_ENABLEOUTERJOIN "EnableOuterJoinEscape" - #define PROPERTY_TABSTOP "TabStop" - #define PROPERTY_DEFAULTCONTROL "DefaultControl" - #define PROPERTY_ENABLED "Enabled" - #define PROPERTY_MOUSE_WHEEL_BEHAVIOR "MouseWheelBehavior" - -#endif // DBACCESS_SHARED_DBUSTRINGS_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/inc/stringconstants.hrc b/dbaccess/source/inc/stringconstants.hxx similarity index 98% rename from dbaccess/source/inc/stringconstants.hrc rename to dbaccess/source/inc/stringconstants.hxx index d05fbf775e44..197a9c95de9d 100644 --- a/dbaccess/source/inc/stringconstants.hrc +++ b/dbaccess/source/inc/stringconstants.hxx @@ -20,10 +20,6 @@ #ifndef INCLUDED_DBACCESS_SOURCE_INC_STRINGCONSTANTS_HRC #define INCLUDED_DBACCESS_SOURCE_INC_STRINGCONSTANTS_HRC -#ifndef STRINGCONSTANTS_INCLUDED_INDIRECT -#error "don't include this file directly! use dbastrings.hrc or dbustrings.hrc instead!" -#endif - // property ids #define PROPERTY_ID_TITLE 1 diff --git a/dbaccess/source/inc/xmlstrings.hrc b/dbaccess/source/inc/xmlstrings.hrc deleted file mode 100644 index b896a924b4ab..000000000000 --- a/dbaccess/source/inc/xmlstrings.hrc +++ /dev/null @@ -1,31 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef DBACCESS_SHARED_XMLSTRINGS_HRC -#define DBACCESS_SHARED_XMLSTRINGS_HRC - -#include - -#define STRINGCONSTANTS_INCLUDED_INDIRECT -#include "stringconstants.hrc" -#undef STRINGCONSTANTS_INCLUDED_INDIRECT -#include "stringconstants.inc" - -#endif // DBACCESS_SHARED_XMLSTRINGS_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/sdbtools/connection/connectiontools.cxx b/dbaccess/source/sdbtools/connection/connectiontools.cxx index cbc269aa6305..15cb2be4f883 100644 --- a/dbaccess/source/sdbtools/connection/connectiontools.cxx +++ b/dbaccess/source/sdbtools/connection/connectiontools.cxx @@ -18,7 +18,6 @@ */ #include "connectiontools.hxx" -#include "sdbt_services.hxx" #include "tablename.hxx" #include "objectnames.hxx" #include "datasourcemetadata.hxx" @@ -30,11 +29,6 @@ #include -extern "C" void SAL_CALL createRegistryInfo_ConnectionTools() -{ - ::sdbtools::OAutoRegistration< ::sdbtools::ConnectionTools > aRegistration; -} - namespace sdbtools { diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx index d2026b579fff..9bc0e42b5c90 100644 --- a/dbaccess/source/sdbtools/connection/objectnames.cxx +++ b/dbaccess/source/sdbtools/connection/objectnames.cxx @@ -18,8 +18,9 @@ */ #include "objectnames.hxx" +#include "core_resource.hxx" -#include "sdbt_resource.hrc" +#include "strings.hrc" #include #include @@ -99,7 +100,7 @@ namespace sdbtools ::dbtools::DatabaseMetaData aMeta( m_xConnection ); if ( aMeta.supportsSubqueriesInFrom() ) { - OUString sNeedDistinctNames( SdbtRes( STR_QUERY_AND_TABLE_DISTINCT_NAMES ) ); + OUString sNeedDistinctNames( DBA_RES( STR_QUERY_AND_TABLE_DISTINCT_NAMES ) ); aError.NextException <<= SQLException( sNeedDistinctNames, m_xConnection, OUString(), 0, Any() ); } @@ -282,7 +283,7 @@ namespace sdbtools && ( _nCommandType != CommandType::QUERY ) ) throw IllegalArgumentException( - SdbtRes( STR_INVALID_COMMAND_TYPE ), + DBA_RES( STR_INVALID_COMMAND_TYPE ), nullptr, 0 ); @@ -305,7 +306,7 @@ namespace sdbtools catch( const Exception& ) { throw IllegalArgumentException( - SdbtRes( STR_CONN_WITHOUT_QUERIES_OR_TABLES ), + DBA_RES( STR_CONN_WITHOUT_QUERIES_OR_TABLES ), nullptr, 0 ); @@ -368,9 +369,9 @@ namespace sdbtools if ( sBaseName.isEmpty() ) { if ( CommandType == CommandType::TABLE ) - sBaseName = OUString( SdbtRes( STR_BASENAME_TABLE ) ); + sBaseName = DBA_RES(STR_BASENAME_TABLE); else - sBaseName = OUString( SdbtRes( STR_BASENAME_QUERY ) ); + sBaseName = DBA_RES(STR_BASENAME_QUERY); } else if( CommandType == CommandType::QUERY ) { diff --git a/dbaccess/source/sdbtools/connection/objectnames.hxx b/dbaccess/source/sdbtools/connection/objectnames.hxx index 6a74c457aadc..433f75b72742 100644 --- a/dbaccess/source/sdbtools/connection/objectnames.hxx +++ b/dbaccess/source/sdbtools/connection/objectnames.hxx @@ -21,7 +21,6 @@ #define INCLUDED_DBACCESS_SOURCE_SDBTOOLS_CONNECTION_OBJECTNAMES_HXX #include "connectiondependent.hxx" -#include "module_sdbt.hxx" #include @@ -40,9 +39,6 @@ namespace sdbtools class ObjectNames :public ObjectNames_Base ,public ConnectionDependentComponent { - private: - SdbtClient m_aModuleClient; // keep the module alive as long as this instance lives - public: /** constructs the instance diff --git a/dbaccess/source/sdbtools/connection/tablename.cxx b/dbaccess/source/sdbtools/connection/tablename.cxx index e51e997c13e0..0e78a9cb7d35 100644 --- a/dbaccess/source/sdbtools/connection/tablename.cxx +++ b/dbaccess/source/sdbtools/connection/tablename.cxx @@ -18,9 +18,10 @@ */ #include "tablename.hxx" -#include "sdbt_resource.hrc" -#include "module_sdbt.hxx" -#include "sdbtstrings.hrc" +#include "core_resource.hxx" +#include "strings.hrc" +#include "strings.hxx" +#include "stringconstants.hxx" #include #include @@ -53,8 +54,6 @@ namespace sdbtools // TableName struct TableName_Impl { - SdbtClient m_aModuleClient; // keep the module alive as long as this instance lives - OUString sCatalog; OUString sSchema; OUString sName; @@ -152,7 +151,7 @@ namespace sdbtools || !xPSI->hasPropertyByName( PROPERTY_NAME ) ) throw IllegalArgumentException( - SdbtRes( STR_NO_TABLE_OBJECT ), + DBA_RES( STR_NO_TABLE_OBJECT ), *this, 0 ); @@ -199,7 +198,7 @@ namespace sdbtools found = true; if ( !found ) throw IllegalArgumentException( - SdbtRes( STR_INVALID_COMPOSITION_TYPE ), + DBA_RES( STR_INVALID_COMPOSITION_TYPE ), nullptr, 0 ); diff --git a/dbaccess/source/sdbtools/connection/connectiondependent.hxx b/dbaccess/source/sdbtools/inc/connectiondependent.hxx similarity index 100% rename from dbaccess/source/sdbtools/connection/connectiondependent.hxx rename to dbaccess/source/sdbtools/inc/connectiondependent.hxx diff --git a/dbaccess/source/sdbtools/connection/connectiontools.hxx b/dbaccess/source/sdbtools/inc/connectiontools.hxx similarity index 97% rename from dbaccess/source/sdbtools/connection/connectiontools.hxx rename to dbaccess/source/sdbtools/inc/connectiontools.hxx index 4eb9ed23354b..b4b6b727a8cf 100644 --- a/dbaccess/source/sdbtools/connection/connectiontools.hxx +++ b/dbaccess/source/sdbtools/inc/connectiontools.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_DBACCESS_SOURCE_SDBTOOLS_CONNECTION_CONNECTIONTOOLS_HXX #define INCLUDED_DBACCESS_SOURCE_SDBTOOLS_CONNECTION_CONNECTIONTOOLS_HXX -#include "module_sdbt.hxx" - #include "connectiondependent.hxx" #include @@ -44,9 +42,6 @@ namespace sdbtools class ConnectionTools :public ConnectionTools_Base ,public ConnectionDependentComponent { - private: - SdbtClient m_aModuleClient; - public: /** constructs a ConnectionTools instance diff --git a/dbaccess/source/sdbtools/inc/sdbt_resource.hrc b/dbaccess/source/sdbtools/inc/sdbt_resource.hrc deleted file mode 100644 index ae0dbe3ef783..000000000000 --- a/dbaccess/source/sdbtools/inc/sdbt_resource.hrc +++ /dev/null @@ -1,38 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef DBACCESS_SDBT_RESOURCE_HRC -#define DBACCESS_SDBT_RESOURCE_HRC - -#include - -#define RID_SDBT_STRINGS_START RID_DBACCESS_START - -//- String-IDs -#define STR_QUERY_AND_TABLE_DISTINCT_NAMES RID_SDBT_STRINGS_START + 0 -#define STR_BASENAME_TABLE RID_SDBT_STRINGS_START + 1 -#define STR_BASENAME_QUERY RID_SDBT_STRINGS_START + 2 -#define STR_CONN_WITHOUT_QUERIES_OR_TABLES RID_SDBT_STRINGS_START + 3 -#define STR_NO_TABLE_OBJECT RID_SDBT_STRINGS_START + 4 -#define STR_INVALID_COMPOSITION_TYPE RID_SDBT_STRINGS_START + 5 -#define STR_INVALID_COMMAND_TYPE RID_SDBT_STRINGS_START + 6 - -#endif // DBACCESS_SDBT_RESOURCE_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/sdbtools/misc/module_sdbt.cxx b/dbaccess/source/sdbtools/misc/module_sdbt.cxx deleted file mode 100644 index d40ef6b96aff..000000000000 --- a/dbaccess/source/sdbtools/misc/module_sdbt.cxx +++ /dev/null @@ -1,29 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "module_sdbt.hxx" - -namespace sdbtools -{ - - IMPLEMENT_MODULE( SdbtModule, "sdbt" ) - -} // namespace sdbtools - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/sdbtools/misc/sdbt_services.cxx b/dbaccess/source/sdbtools/misc/sdbt_services.cxx index 65d438cc6b22..0f2edc74ab9b 100644 --- a/dbaccess/source/sdbtools/misc/sdbt_services.cxx +++ b/dbaccess/source/sdbtools/misc/sdbt_services.cxx @@ -17,34 +17,22 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "module_sdbt.hxx" -#include "sdbt_services.hxx" +#include "connectiontools.hxx" +#include using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; -extern "C" void SAL_CALL sdbt_initializeModule() -{ - static bool s_bInit = false; - if (!s_bInit) - { - createRegistryInfo_ConnectionTools(); - s_bInit = true; - } -} - extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL sdbt_component_getFactory( - const sal_Char* pImplementationName, - void* pServiceManager, - void* /*pRegistryKey*/) + const sal_Char* pImplementationName, SAL_UNUSED_PARAMETER void*, SAL_UNUSED_PARAMETER void*) { - sdbt_initializeModule(); - Reference< XInterface > xRet; - if (pServiceManager && pImplementationName) + + if (sdbtools::ConnectionTools::getImplementationName_static() == OUString::createFromAscii(pImplementationName)) { - xRet = ::sdbtools::SdbtModule::getInstance().getComponentFactory( - OUString::createFromAscii(pImplementationName)); + xRet = ::cppu::createSingleComponentFactory(sdbtools::ConnectionTools::Create, + sdbtools::ConnectionTools::getImplementationName_static(), + sdbtools::ConnectionTools::getSupportedServiceNames_static(), nullptr); } if (xRet.is()) diff --git a/dbaccess/source/sdbtools/resource/sdbt_strings.src b/dbaccess/source/sdbtools/resource/sdbt_strings.src deleted file mode 100644 index 858c0d70633e..000000000000 --- a/dbaccess/source/sdbtools/resource/sdbt_strings.src +++ /dev/null @@ -1,57 +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 "sdbt_resource.hrc" - -String STR_QUERY_AND_TABLE_DISTINCT_NAMES -{ - Text [ en-US ] = "You cannot give a table and a query the same name. Please use a name which is not yet used by a query or table."; -}; - -String STR_BASENAME_TABLE -{ - Text [ en-US ] = "Table"; -}; - -String STR_BASENAME_QUERY -{ - Text [ en-US ] = "Query"; -}; - -String STR_CONN_WITHOUT_QUERIES_OR_TABLES -{ - Text [ en-US ] = "The given connection is no valid query and/or tables supplier."; -}; - -String STR_NO_TABLE_OBJECT -{ - Text [ en-US ] = "The given object is no table object."; -}; - -String STR_INVALID_COMPOSITION_TYPE -{ - Text [ en-US ] = "Invalid composition type - need a value from com.sun.star.sdb.tools.CompositionType."; -}; - -String STR_INVALID_COMMAND_TYPE -{ - Text [ en-US ] = "Invalid command type - only TABLE and QUERY from com.sun.star.sdb.CommandType are allowed."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/shared/sdbtstrings.cxx b/dbaccess/source/shared/sdbtstrings.cxx deleted file mode 100644 index d0fb5ead3a40..000000000000 --- a/dbaccess/source/shared/sdbtstrings.cxx +++ /dev/null @@ -1,27 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * 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 "sdbtstrings.hrc" - -namespace sdbtools -{ - #include "stringconstants.inc" -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/shared/xmlstrings.cxx b/dbaccess/source/shared/xmlstrings.cxx deleted file mode 100644 index a6074fd5b0ae..000000000000 --- a/dbaccess/source/shared/xmlstrings.cxx +++ /dev/null @@ -1,27 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * 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 "xmlstrings.hrc" - -namespace dbaxml -{ -#include "stringconstants.inc" -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index ef7070e2b720..402998f35920 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -19,7 +19,8 @@ #include #include "AppController.hxx" -#include "dbustrings.hrc" +#include "core_resource.hxx" +#include "stringconstants.hxx" #include "advancedsettingsdlg.hxx" #include "subcomponentmanager.hxx" #include "uiservices.hxx" @@ -109,7 +110,7 @@ #include "AppView.hxx" #include "browserids.hxx" #include "dbu_reghelper.hxx" -#include "dbu_app.hrc" +#include "strings.hrc" #include "defaultobjectnamecheck.hxx" #include "databaseobjectview.hxx" #include "listviewitems.hxx" @@ -864,7 +865,7 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const OUString sDSTypeName; if ( dbaccess::ODsnTypeCollection::isEmbeddedDatabase( sURL ) ) { - sDSTypeName = OUString( ModuleRes( RID_STR_EMBEDDED_DATABASE ) ); + sDSTypeName = DBA_RES(RID_STR_EMBEDDED_DATABASE); } else { @@ -2035,9 +2036,9 @@ void OApplicationController::renameEntry() { OUString sLabel; if ( eType == E_FORM ) - sLabel = OUString(ModuleRes( STR_FRM_LABEL )); + sLabel = DBA_RES(STR_FRM_LABEL); else - sLabel = OUString(ModuleRes( STR_RPT_LABEL )); + sLabel = DBA_RES(STR_RPT_LABEL); OUString sName = *aList.begin(); if ( xHNames->hasByHierarchicalName(sName) ) @@ -2134,7 +2135,7 @@ void OApplicationController::renameEntry() } catch(const ElementExistException& e) { - OUString sMsg( ModuleRes( STR_NAME_ALREADY_EXISTS ) ); + OUString sMsg(DBA_RES(STR_NAME_ALREADY_EXISTS)); showError(SQLExceptionInfo(SQLException(sMsg.replaceAll("#", e.Message), e.Context, "S1000", 0, Any()))); } catch(const Exception& ) @@ -2528,9 +2529,9 @@ void OApplicationController::OnFirstControllerConnected() return; SQLWarning aWarning; - aWarning.Message = OUString( ModuleRes( STR_SUB_DOCS_WITH_SCRIPTS ) ); + aWarning.Message = DBA_RES(STR_SUB_DOCS_WITH_SCRIPTS); SQLException aDetail; - aDetail.Message = OUString( ModuleRes( STR_SUB_DOCS_WITH_SCRIPTS_DETAIL ) ); + aDetail.Message = DBA_RES(STR_SUB_DOCS_WITH_SCRIPTS_DETAIL); aWarning.NextException <<= aDetail; Reference< XExecutableDialog > xDialog = ErrorMessageDialog::create( getORB(), "", nullptr, makeAny( aWarning ) ); @@ -2767,7 +2768,7 @@ sal_Bool SAL_CALL OApplicationController::select( const Any& _aSelection ) case DatabaseObjectContainer::REPORTS: if ( eSelectedCategory != E_NONE ) throw IllegalArgumentException( - ModuleRes(RID_STR_NO_DIFF_CAT), + DBA_RES(RID_STR_NO_DIFF_CAT), *this, sal_Int16( pObject - aSelectedObjects.getConstArray() ) ); eSelectedCategory = ( pObject->Type == DatabaseObjectContainer::TABLES ) ? E_TABLE @@ -2781,7 +2782,7 @@ sal_Bool SAL_CALL OApplicationController::select( const Any& _aSelection ) case DatabaseObjectContainer::DATA_SOURCE: { OUString sMessage( - OUString(ModuleRes(RID_STR_UNSUPPORTED_OBJECT_TYPE)). + DBA_RES(RID_STR_UNSUPPORTED_OBJECT_TYPE). replaceFirst("$type$", OUString::number(pObject->Type))); throw IllegalArgumentException(sMessage, *this, sal_Int16( pObject - aSelectedObjects.getConstArray() )); } diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx index 81323fd6e5e9..654f0c238c6a 100644 --- a/dbaccess/source/ui/app/AppController.hxx +++ b/dbaccess/source/ui/app/AppController.hxx @@ -26,7 +26,7 @@ #include "dsntypes.hxx" #include #include "linkeddocuments.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "TableCopyHelper.hxx" #include @@ -94,7 +94,7 @@ namespace dbaui css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; TransferableDataHelper m_aSystemClipboard; // content of the clipboard css::uno::Reference< css::beans::XPropertySet > m_xDataSource; diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index 14c12d0848bc..bf23714399c3 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -22,7 +22,8 @@ #include #include #include -#include "dbustrings.hrc" +#include "core_resource.hxx" +#include "stringconstants.hxx" #include #include #include @@ -55,7 +56,7 @@ #include #include "browserids.hxx" #include "dbu_reghelper.hxx" -#include "dbu_app.hrc" +#include "strings.hrc" #include #include #include @@ -176,7 +177,7 @@ void OApplicationController::deleteTables(const std::vector< OUString>& _rList) } else { - OUString sMessage(ModuleRes(STR_MISSING_TABLES_XDROP)); + OUString sMessage(DBA_RES(STR_MISSING_TABLES_XDROP)); ScopedVclPtrInstance< MessageDialog > aError(getView(), sMessage); aError->Execute(); } @@ -345,7 +346,7 @@ const SharedConnection& OApplicationController::ensureConnection( ::dbtools::SQL { SolarMutexGuard aSolarGuard; - OUString sConnectingContext( ModuleRes( STR_COULDNOTCONNECT_DATASOURCE ) ); + OUString sConnectingContext(DBA_RES(STR_COULDNOTCONNECT_DATASOURCE)); sConnectingContext = sConnectingContext.replaceFirst("$name$", getStrippedDatabaseName()); // do the connection *without* holding getMutex() to avoid deadlock @@ -621,7 +622,7 @@ bool OApplicationController::paste( ElementType _eType, const svx::ODataAccessDe if ( sTargetName.isEmpty() ) { - OUString sDefaultName = OUString( ModuleRes( STR_QRY_TITLE ) ); + OUString sDefaultName = DBA_RES(STR_QRY_TITLE); sDefaultName = sDefaultName.getToken( 0, ' ' ); Reference< XNameAccess > xQueries( getQueryDefinitions(), UNO_QUERY_THROW ); diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx index f1100dbb1c0e..28e0860c3b51 100644 --- a/dbaccess/source/ui/app/AppControllerGen.cxx +++ b/dbaccess/source/ui/app/AppControllerGen.cxx @@ -20,9 +20,10 @@ #include "AppController.hxx" #include "AppDetailView.hxx" #include "AppView.hxx" +#include "core_resource.hxx" #include "dbaccess_slotid.hrc" -#include "dbu_app.hrc" -#include "dbustrings.hrc" +#include "strings.hrc" +#include "stringconstants.hxx" #include "defaultobjectnamecheck.hxx" #include "dlgsave.hxx" #include "UITools.hxx" @@ -104,7 +105,7 @@ void OApplicationController::convertToView(const OUString& _sName) Reference< XDatabaseMetaData > xMeta = xConnection->getMetaData(); - OUString aName = OUString(ModuleRes(STR_TBL_TITLE)); + OUString aName = DBA_RES(STR_TBL_TITLE); aName = aName.getToken(0,' '); OUString aDefaultName = ::dbaui::createDefaultName(xMeta,xTables,aName); @@ -119,7 +120,7 @@ void OApplicationController::convertToView(const OUString& _sName) ::dbtools::composeTableName( xMeta, sCatalog, sSchema, sName, false, ::dbtools::EComposeRule::InTableDefinitions ) ); Reference xView = ::dbaui::createView(sNewName,xConnection,xSourceObject); if ( !xView.is() ) - throw SQLException(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE),*this, "S1000",0,Any()); + throw SQLException(DBA_RES(STR_NO_TABLE_FORMAT_INSIDE),*this, "S1000",0,Any()); getContainer()->elementAdded(E_TABLE,sNewName,makeAny(xView)); } } @@ -329,7 +330,7 @@ void SAL_CALL OApplicationController::connect( ) aError.doThrow(); // no particular error, but nonetheless could not connect -> throw a generic exception - OUString sConnectingContext( ModuleRes( STR_COULDNOTCONNECT_DATASOURCE ) ); + OUString sConnectingContext( DBA_RES( STR_COULDNOTCONNECT_DATASOURCE ) ); ::dbtools::throwGenericSQLException( sConnectingContext.replaceFirst( "$name$", getStrippedDatabaseName() ), *this ); } } @@ -517,7 +518,7 @@ void OApplicationController::askToReconnect() bool bClear = true; if ( !m_pSubComponentManager->empty() ) { - ScopedVclPtrInstance< MessageDialog > aQry(getView(), ModuleRes(STR_QUERY_CLOSEDOCUMENTS), VclMessageType::Question, VclButtonsType::YesNo); + ScopedVclPtrInstance< MessageDialog > aQry(getView(), DBA_RES(STR_QUERY_CLOSEDOCUMENTS), VclMessageType::Question, VclButtonsType::YesNo); switch (aQry->Execute()) { case RET_YES: diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index f797da66b562..4f06cfc6a519 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -18,7 +18,7 @@ */ #include "AppDetailPageHelper.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include #include #include @@ -52,10 +52,11 @@ #include #include "AppView.hxx" #include "dbaccess_helpid.hrc" -#include "dbu_app.hrc" +#include "strings.hrc" +#include "strings.hxx" #include "callbacks.hxx" #include -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include "dbaccess_slotid.hrc" #include "databaseobjectview.hxx" #include "imageprovider.hxx" diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index eecaa2a59cdd..24a44f4411aa 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -20,7 +20,7 @@ #include "AppDetailView.hxx" #include #include "dbaccess_helpid.hrc" -#include "dbu_app.hrc" +#include "strings.hrc" #include "AppView.hxx" #include #include @@ -29,6 +29,7 @@ #include #include #include +#include "core_resource.hxx" #include "listviewitems.hxx" #include #include @@ -38,7 +39,7 @@ #include #include "callbacks.hxx" #include -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "svtools/treelistentry.hxx" #include "svtools/viewdataentry.hxx" #include @@ -62,10 +63,10 @@ using ::com::sun::star::sdb::application::NamedDatabaseObject; #define SPACEBETWEENENTRIES 4 -TaskEntry::TaskEntry( const sal_Char* _pAsciiUNOCommand, sal_uInt16 _nHelpID, sal_uInt16 _nTitleResourceID, bool _bHideWhenDisabled ) +TaskEntry::TaskEntry( const sal_Char* _pAsciiUNOCommand, const char* _pHelpID, const char* pTitleResourceID, bool _bHideWhenDisabled ) :sUNOCommand( OUString::createFromAscii( _pAsciiUNOCommand ) ) - ,nHelpID( _nHelpID ) - ,sTitle( ModuleRes( _nTitleResourceID ) ) + ,pHelpID( _pHelpID ) + ,sTitle( DBA_RES(pTitleResourceID) ) ,bHideWhenDisabled( _bHideWhenDisabled ) { } @@ -295,10 +296,10 @@ bool OCreationList::setCurrentEntryInvalidate( SvTreeListEntry* _pEntry ) void OCreationList::updateHelpText() { - sal_uInt16 nHelpTextId = 0; + const char* pHelpTextId = nullptr; if ( GetCurEntry() ) - nHelpTextId = static_cast< TaskEntry* >( GetCurEntry()->GetUserData() )->nHelpID; - m_rTaskWindow.setHelpText( nHelpTextId ); + pHelpTextId = static_cast< TaskEntry* >( GetCurEntry()->GetUserData() )->pHelpID; + m_rTaskWindow.setHelpText(pHelpTextId); } void OCreationList::onSelected( SvTreeListEntry* _pEntry ) const @@ -351,7 +352,7 @@ OTasksWindow::OTasksWindow(vcl::Window* _pParent,OApplicationDetailView* _pDetai m_aCreation->SetSelectHdl(LINK(this, OTasksWindow, OnEntrySelectHdl)); m_aHelpText->SetHelpId(HID_APP_HELP_TEXT); m_aDescription->SetHelpId(HID_APP_DESCRIPTION_TEXT); - m_aDescription->SetText(ModuleRes(STR_DESCRIPTION)); + m_aDescription->SetText(DBA_RES(STR_DESCRIPTION)); Image aFolderImage = ImageProvider::getFolderImage( css::sdb::application::DatabaseObject::FORM ); m_aCreation->SetDefaultCollapsedEntryBmp( aFolderImage ); @@ -414,11 +415,11 @@ void OTasksWindow::ImplInitSettings() m_aDescription->SetControlFont(aFont); } -void OTasksWindow::setHelpText(sal_uInt16 _nId) +void OTasksWindow::setHelpText(const char* pId) { - if ( _nId ) + if (pId) { - OUString sText = ModuleRes(_nId); + OUString sText = DBA_RES(pId); m_aHelpText->SetText(sText); } else @@ -432,7 +433,7 @@ IMPL_LINK_NOARG(OTasksWindow, OnEntrySelectHdl, SvTreeListBox*, void) { SvTreeListEntry* pEntry = m_aCreation->GetHdlEntry(); if ( pEntry ) - m_aHelpText->SetText( ModuleRes( static_cast< TaskEntry* >( pEntry->GetUserData() )->nHelpID ) ); + m_aHelpText->SetText(DBA_RES(static_cast(pEntry->GetUserData())->pHelpID)); } void OTasksWindow::Resize() @@ -522,8 +523,8 @@ void OTasksWindow::Clear() OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,PreviewMode _ePreviewMode) : OSplitterView(&_rParent ) ,m_aHorzSplitter(VclPtr::Create(this)) - ,m_aTasks(VclPtr::Create(this,STR_TASKS,WB_BORDER | WB_DIALOGCONTROL) ) - ,m_aContainer(VclPtr::Create(this,0,WB_BORDER | WB_DIALOGCONTROL) ) + ,m_aTasks(VclPtr::Create(this, STR_TASKS, WB_BORDER | WB_DIALOGCONTROL)) + ,m_aContainer(VclPtr::Create(this, nullptr, WB_BORDER | WB_DIALOGCONTROL)) ,m_rBorderWin(_rParent) { ImplInitSettings(); @@ -636,7 +637,7 @@ void OApplicationDetailView::impl_createPage( ElementType _eType, const Referenc bool bEnabled = !rData.aTasks.empty() && getBorderWin().getView()->getCommandController().isCommandEnabled( rData.aTasks[0].sUNOCommand ); getTasksWindow().Enable( bEnabled ); - m_aContainer->setTitle( rData.nTitleId ); + m_aContainer->setTitle(rData.pTitleId); // let our helper create the object list if ( _eType == E_TABLE ) @@ -672,26 +673,26 @@ void OApplicationDetailView::impl_fillTaskPaneData( ElementType _eType, TaskPane rList.push_back( TaskEntry( ".uno:DBNewTable", RID_STR_TABLES_HELP_TEXT_DESIGN, RID_STR_NEW_TABLE ) ); rList.push_back( TaskEntry( ".uno:DBNewTableAutoPilot", RID_STR_TABLES_HELP_TEXT_WIZARD, RID_STR_NEW_TABLE_AUTO ) ); rList.push_back( TaskEntry( ".uno:DBNewView", RID_STR_VIEWS_HELP_TEXT_DESIGN, RID_STR_NEW_VIEW, true ) ); - _rData.nTitleId = RID_STR_TABLES_CONTAINER; + _rData.pTitleId = RID_STR_TABLES_CONTAINER; break; case E_FORM: rList.push_back( TaskEntry( ".uno:DBNewForm", RID_STR_FORMS_HELP_TEXT, RID_STR_NEW_FORM ) ); rList.push_back( TaskEntry( ".uno:DBNewFormAutoPilot", RID_STR_FORMS_HELP_TEXT_WIZARD, RID_STR_NEW_FORM_AUTO ) ); - _rData.nTitleId = RID_STR_FORMS_CONTAINER; + _rData.pTitleId = RID_STR_FORMS_CONTAINER; break; case E_REPORT: rList.push_back( TaskEntry( ".uno:DBNewReport", RID_STR_REPORT_HELP_TEXT, RID_STR_NEW_REPORT, true ) ); rList.push_back( TaskEntry( ".uno:DBNewReportAutoPilot", RID_STR_REPORTS_HELP_TEXT_WIZARD, RID_STR_NEW_REPORT_AUTO ) ); - _rData.nTitleId = RID_STR_REPORTS_CONTAINER; + _rData.pTitleId = RID_STR_REPORTS_CONTAINER; break; case E_QUERY: rList.push_back( TaskEntry( ".uno:DBNewQuery", RID_STR_QUERIES_HELP_TEXT, RID_STR_NEW_QUERY ) ); rList.push_back( TaskEntry( ".uno:DBNewQueryAutoPilot", RID_STR_QUERIES_HELP_TEXT_WIZARD, RID_STR_NEW_QUERY_AUTO ) ); rList.push_back( TaskEntry( ".uno:DBNewQuerySql", RID_STR_QUERIES_HELP_TEXT_SQL, RID_STR_NEW_QUERY_SQL ) ); - _rData.nTitleId = RID_STR_QUERIES_CONTAINER; + _rData.pTitleId = RID_STR_QUERIES_CONTAINER; break; default: diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx index 634ebadfabbd..09093e2d2d5d 100644 --- a/dbaccess/source/ui/app/AppDetailView.hxx +++ b/dbaccess/source/ui/app/AppDetailView.hxx @@ -89,14 +89,14 @@ namespace dbaui struct TaskEntry { OUString sUNOCommand; - sal_uInt16 nHelpID; + const char* pHelpID; OUString sTitle; bool bHideWhenDisabled; // TODO: we should be consistent in the task pane and the menus/toolbars: // If an entry is disabled in the latter, it should also be disabled in the former. // If an entry is *hidden* in the former, it should also be hidden in the latter. - TaskEntry( const sal_Char* _pAsciiUNOCommand, sal_uInt16 _nHelpID, sal_uInt16 _nTitleResourceID, bool _bHideWhenDisabled = false ); + TaskEntry( const sal_Char* _pAsciiUNOCommand, const char* pHelpID, const char* pTitleResourceID, bool _bHideWhenDisabled = false ); }; typedef std::vector< TaskEntry > TaskEntryList; @@ -105,7 +105,7 @@ namespace dbaui /// the tasks available in the pane TaskEntryList aTasks; /// the resource ID for the title of the pane - sal_uInt16 nTitleId; + const char* pTitleId; }; class OTasksWindow : public vcl::Window @@ -139,7 +139,7 @@ namespace dbaui } void Clear(); - void setHelpText(sal_uInt16 _nId); + void setHelpText(const char* pId); }; class OApplicationDetailView : public OSplitterView , public IClipboardTest diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx index 23b9c3f28227..3fe62cb57912 100644 --- a/dbaccess/source/ui/app/AppIconControl.cxx +++ b/dbaccess/source/ui/app/AppIconControl.cxx @@ -19,8 +19,8 @@ #include "AppIconControl.hxx" #include "dbaccess_helpid.hrc" -#include "moduledbu.hxx" -#include "dbu_app.hrc" +#include "core_resource.hxx" +#include "strings.hrc" #include "bitmaps.hlst" #include #include "callbacks.hxx" @@ -38,7 +38,7 @@ OApplicationIconControl::OApplicationIconControl(vcl::Window* _pParent) const struct CategoryDescriptor { - sal_uInt16 nLabelResId; + const char* pLabelResId; ElementType eType; const char* aImageResId; } aCategories[] = { @@ -50,7 +50,7 @@ OApplicationIconControl::OApplicationIconControl(vcl::Window* _pParent) for (const CategoryDescriptor& aCategorie : aCategories) { SvxIconChoiceCtrlEntry* pEntry = InsertEntry( - OUString( ModuleRes( aCategorie.nLabelResId ) ) , + DBA_RES(aCategorie.pLabelResId) , Image(BitmapEx(OUString::createFromAscii(aCategorie.aImageResId)))); if ( pEntry ) pEntry->SetUserData( new ElementType( aCategorie.eType ) ); diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx index f9953b6fcae2..96d546084358 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.cxx +++ b/dbaccess/source/ui/app/AppSwapWindow.cxx @@ -19,7 +19,7 @@ #include "AppSwapWindow.hxx" #include "dbaccess_helpid.hrc" -#include "dbu_app.hrc" +#include "strings.hrc" #include "AppView.hxx" #include #include diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx index 2bdcea9299bf..f3769cb0f509 100644 --- a/dbaccess/source/ui/app/AppTitleWindow.cxx +++ b/dbaccess/source/ui/app/AppTitleWindow.cxx @@ -18,14 +18,14 @@ */ #include "AppTitleWindow.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include #include namespace dbaui { -OTitleWindow::OTitleWindow(vcl::Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits,bool _bShift) +OTitleWindow::OTitleWindow(vcl::Window* _pParent, const char* pTitleId, WinBits _nBits, bool _bShift) : Window(_pParent,_nBits | WB_DIALOGCONTROL) , m_aSpace1(VclPtr::Create(this)) , m_aSpace2(VclPtr::Create(this)) @@ -33,8 +33,7 @@ OTitleWindow::OTitleWindow(vcl::Window* _pParent,sal_uInt16 _nTitleId,WinBits _n , m_pChild(nullptr) , m_bShift(_bShift) { - - setTitle(_nTitleId); + setTitle(pTitleId); SetBorderStyle(WindowBorderStyle::MONO); ImplInitSettings(); @@ -100,11 +99,11 @@ void OTitleWindow::Resize() } } -void OTitleWindow::setTitle(sal_uInt16 _nTitleId) +void OTitleWindow::setTitle(const char* pTitleId) { - if ( _nTitleId != 0 ) + if (pTitleId) { - m_aTitle->SetText(ModuleRes(_nTitleId)); + m_aTitle->SetText(DBA_RES(pTitleId)); } } diff --git a/dbaccess/source/ui/app/AppTitleWindow.hxx b/dbaccess/source/ui/app/AppTitleWindow.hxx index 491ebfd56912..c6a8d417df7f 100644 --- a/dbaccess/source/ui/app/AppTitleWindow.hxx +++ b/dbaccess/source/ui/app/AppTitleWindow.hxx @@ -34,7 +34,7 @@ namespace dbaui protected: virtual void DataChanged(const DataChangedEvent& rDCEvt) override; public: - OTitleWindow(vcl::Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits,bool _bShift = true); + OTitleWindow(vcl::Window* _pParent, const char* pTitleId, WinBits _nBits, bool _bShift = true); virtual ~OTitleWindow() override; virtual void dispose() override; @@ -58,10 +58,10 @@ namespace dbaui vcl::Window* getChildWindow() const { return m_pChild; } /** sets the title text out of the resource - @param _nTitleId + @param pTitleId The resource id of the title text. */ - void setTitle(sal_uInt16 _nTitleId); + void setTitle(const char* pTitleId); /** Gets the min Width in Pixel which is needed to display the whole diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index c57c414464ba..6920cc05614f 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -18,7 +18,7 @@ */ #include "AppView.hxx" -#include "dbu_app.hrc" +#include "strings.hrc" #include #include #include "dbaccess_helpid.hrc" @@ -39,7 +39,7 @@ #include #include "AppTitleWindow.hxx" #include "dsntypes.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include #include "browserids.hxx" #include diff --git a/dbaccess/source/ui/app/app.src b/dbaccess/source/ui/app/app.src deleted file mode 100644 index 82b118b0e801..000000000000 --- a/dbaccess/source/ui/app/app.src +++ /dev/null @@ -1,247 +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 "dbu_app.hrc" -#include "browserids.hxx" -#include "dbaccess_helpid.hrc" - -String RID_STR_NEW_FORM -{ - Text [ en-US ] = "Create Form in Design View..." ; -}; - -String RID_STR_NEW_FORM_AUTO -{ - Text [ en-US ] = "Use Wizard to Create Form..." ; -}; - -String RID_STR_NEW_REPORT_AUTO -{ - Text [ en-US ] = "Use Wizard to Create Report..." ; -}; - -String RID_STR_NEW_REPORT -{ - Text [ en-US ] = "Create Report in Design View..." ; -}; - -String RID_STR_NEW_QUERY -{ - Text [ en-US ] = "Create Query in Design View..." ; -}; - -String RID_STR_NEW_QUERY_SQL -{ - Text [ en-US ] = "Create Query in SQL View..." ; -}; - -String RID_STR_NEW_QUERY_AUTO -{ - Text [ en-US ] = "Use Wizard to Create Query..." ; -}; -String RID_STR_NEW_TABLE -{ - Text [ en-US ] = "Create Table in Design View..." ; -}; - -String RID_STR_NEW_TABLE_AUTO -{ - Text [ en-US ] = "Use Wizard to Create Table..." ; -}; -String RID_STR_NEW_VIEW -{ - Text [ en-US ] = "Create View..." ; -}; - -String RID_STR_FORMS_CONTAINER -{ - Text [ en-US ] = "Forms" ; -}; - -String RID_STR_REPORTS_CONTAINER -{ - Text [ en-US ] = "Reports" ; -}; - -String RID_STR_REPORTS_HELP_TEXT_WIZARD -{ - Text [ en-US ] = "The wizard will guide you through the steps necessary to create a report." ; -}; - -String RID_STR_FORMS_HELP_TEXT -{ - Text [ en-US ] = "Create a form by specifying the record source, controls, and control properties." ; -}; - -String RID_STR_REPORT_HELP_TEXT -{ - Text [ en-US ] = "Create a report by specifying the record source, controls, and control properties." ; -}; - -String RID_STR_FORMS_HELP_TEXT_WIZARD -{ - Text [ en-US ] = "The wizard will guide you through the steps necessary to create a form." ; -}; - -String RID_STR_QUERIES_HELP_TEXT -{ - Text [ en-US ] = "Create a query by specifying the filters, input tables, field names, and properties for sorting or grouping." ; -}; - -String RID_STR_QUERIES_HELP_TEXT_SQL -{ - Text [ en-US ] = "Create a query by entering an SQL statement directly." ; -}; - -String RID_STR_QUERIES_HELP_TEXT_WIZARD -{ - Text [ en-US ] = "The wizard will guide you through the steps necessary to create a query." ; -}; - -String RID_STR_TABLES_HELP_TEXT_DESIGN -{ - Text [ en-US ] = "Create a table by specifying the field names and properties, as well as the data types." ; -}; - -String RID_STR_TABLES_HELP_TEXT_WIZARD -{ - Text [ en-US ] = "Choose from a selection of business and personal table samples, which you customize to create a table." ; -}; - -String RID_STR_VIEWS_HELP_TEXT_DESIGN -{ - Text [ en-US ] = "Create a view by specifying the tables and field names you would like to have visible." ; -}; - -String STR_DATABASE -{ - Text [ en-US ] = "Database" ; -}; - -String STR_TASKS -{ - Text [ en-US ] = "Tasks" ; -}; - -String STR_DESCRIPTION -{ - Text [ en-US ] = "Description" ; -}; - -String STR_PREVIEW -{ - Text [ en-US ] = "Preview" ; -}; - -String STR_QUERY_CLOSEDOCUMENTS -{ - Text [ en-US ] = "The connection type has been altered.\nFor the changes to take effect, all forms, reports, queries and tables must be closed.\n\nDo you want to close all documents now?" ; -}; - -String RID_STR_FORM -{ - Text [ en-US ] = "Form"; -}; - -String RID_STR_REPORT -{ - Text [ en-US ] = "Report"; -}; - -String STR_FRM_LABEL -{ - Text [ en-US ] = "F~orm name" ; -}; - -String STR_RPT_LABEL -{ - Text [ en-US ] = "~Report name" ; -}; - -String STR_FOLDER_LABEL -{ - Text [ en-US ] = "F~older name" ; -}; - -String STR_SUB_DOCS_WITH_SCRIPTS -{ - Text [ en-US ] = "The document contains forms or reports with embedded macros."; -}; - -String STR_SUB_DOCS_WITH_SCRIPTS_DETAIL -{ - Text [ en-US ] = "Macros should be embedded into the database document itself.\n\n" - - "You can continue to use your document as before, however, you are encouraged to migrate " - "your macros. The menu item 'Tools / Migrate Macros ...' will assist you with this.\n\n" - - "Note that you won't be able to embed macros into the database document itself until " - "this migration is done. "; -}; - -String RID_STR_EMBEDDED_DATABASE -{ - Text [ en-US ] = "Embedded database"; -}; - -String RID_STR_NO_DIFF_CAT -{ - Text [ en-US ] = "You cannot select different categories."; -}; - -String RID_STR_UNSUPPORTED_OBJECT_TYPE -{ - Text [ en-US ] = "Unsupported object type found ($type$)."; -}; - -String STR_PAGETITLE_GENERAL -{ - Text [ en-US ] = "Advanced Properties" ; -}; - -String STR_PAGETITLE_ADVANCED -{ - Text [ en-US ] = "Additional Settings" ; -}; - -String STR_PAGETITLE_CONNECTION -{ - Text [ en-US ] = "Connection settings" ; -}; - -String STR_TBL_LABEL -{ - Text [ en-US ] = "~Table Name" ; -}; - -String STR_QRY_LABEL -{ - Text [ en-US ] = "~Query name" ; -}; - -String STR_TITLE_RENAME -{ - Text [ en-US ] = "Rename to"; -}; - -String STR_TITLE_PASTE_AS -{ - Text [ en-US ] = "Insert as"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/dbu_app.hrc b/dbaccess/source/ui/app/dbu_app.hrc deleted file mode 100644 index e0a894a3331f..000000000000 --- a/dbaccess/source/ui/app/dbu_app.hrc +++ /dev/null @@ -1,62 +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_DBACCESS_SOURCE_UI_APP_DBU_APP_HRC -#define INCLUDED_DBACCESS_SOURCE_UI_APP_DBU_APP_HRC - -#include "dbu_resource.hrc" - -#define RID_STR_NEW_FORM RID_STR_APP_START -#define RID_STR_NEW_FORM_AUTO RID_STR_APP_START + 1 -#define RID_STR_NEW_REPORT RID_STR_APP_START + 2 -#define RID_STR_NEW_REPORT_AUTO RID_STR_APP_START + 3 -#define RID_STR_NEW_TABLE RID_STR_APP_START + 4 -#define RID_STR_NEW_TABLE_AUTO RID_STR_APP_START + 5 -#define RID_STR_NEW_VIEW RID_STR_APP_START + 6 -#define RID_STR_NEW_QUERY RID_STR_APP_START + 8 -#define RID_STR_NEW_QUERY_AUTO RID_STR_APP_START + 9 -#define RID_STR_NEW_QUERY_SQL RID_STR_APP_START + 12 -#define RID_STR_REPORTS_CONTAINER RID_STR_APP_START + 13 -#define RID_STR_FORMS_CONTAINER RID_STR_APP_START + 14 -#define RID_STR_REPORTS_HELP_TEXT_WIZARD RID_STR_APP_START + 15 -#define RID_STR_FORMS_HELP_TEXT RID_STR_APP_START + 16 -#define RID_STR_QUERIES_HELP_TEXT RID_STR_APP_START + 17 -#define RID_STR_QUERIES_HELP_TEXT_SQL RID_STR_APP_START + 18 -#define RID_STR_VIEWS_HELP_TEXT_DESIGN RID_STR_APP_START + 19 -#define STR_DATABASE RID_STR_APP_START + 21 -#define STR_TASKS RID_STR_APP_START + 22 -#define STR_DESCRIPTION RID_STR_APP_START + 23 -#define STR_PREVIEW RID_STR_APP_START + 24 -#define RID_STR_QUERIES_HELP_TEXT_WIZARD RID_STR_APP_START + 26 -#define RID_STR_TABLES_HELP_TEXT_DESIGN RID_STR_APP_START + 27 -#define RID_STR_TABLES_HELP_TEXT_WIZARD RID_STR_APP_START + 28 -#define RID_STR_FORMS_HELP_TEXT_WIZARD RID_STR_APP_START + 29 -#define RID_STR_REPORT_HELP_TEXT RID_STR_APP_START + 30 -#define RID_STR_EMBEDDED_DATABASE RID_STR_APP_START + 31 -#define RID_STR_NO_DIFF_CAT RID_STR_APP_START + 32 -#define RID_STR_UNSUPPORTED_OBJECT_TYPE RID_STR_APP_START + 33 - -// please adjust checking before insert new strings - -#if RID_STR_UNSUPPORTED_OBJECT_TYPE > RID_STR_APP_END -#error Resource ID overflow in #file, #line -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/subcomponentmanager.cxx b/dbaccess/source/ui/app/subcomponentmanager.cxx index bb66c221b918..d74ea7192273 100644 --- a/dbaccess/source/ui/app/subcomponentmanager.cxx +++ b/dbaccess/source/ui/app/subcomponentmanager.cxx @@ -19,7 +19,8 @@ #include "subcomponentmanager.hxx" #include "AppController.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include #include diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 4256ff2f36c1..b3e7ba256657 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -20,8 +20,10 @@ #include "browserids.hxx" #include "brwctrlr.hxx" #include "brwview.hxx" -#include "dbu_brw.hrc" -#include "dbustrings.hrc" +#include "strings.hrc" +#include "strings.hxx" +#include "core_resource.hxx" +#include "stringconstants.hxx" #include "queryfilter.hxx" #include "queryorder.hxx" #include "sqlmessage.hxx" @@ -536,8 +538,8 @@ SbaXDataBrowserController::SbaXDataBrowserController(const Reference< css::uno:: ,m_nRowSetPrivileges(0) ,m_aAsyncGetCellFocus(LINK(this, SbaXDataBrowserController, OnAsyncGetCellFocus)) ,m_aAsyncDisplayError( LINK( this, SbaXDataBrowserController, OnAsyncDisplayError ) ) - ,m_sStateSaveRecord(ModuleRes(RID_STR_SAVE_CURRENT_RECORD)) - ,m_sStateUndoRecord(ModuleRes(RID_STR_UNDO_MODIFY_RECORD)) + ,m_sStateSaveRecord(DBA_RES(RID_STR_SAVE_CURRENT_RECORD)) + ,m_sStateUndoRecord(DBA_RES(RID_STR_UNDO_MODIFY_RECORD)) ,m_sModuleIdentifier( OUString( "com.sun.star.sdb.DataSourceBrowser" ) ) ,m_pFormControllerImpl(nullptr) ,m_nFormActionNestingLevel(0) @@ -751,7 +753,7 @@ bool SbaXDataBrowserController::Construct(vcl::Window* pParent) // marry them Reference< css::container::XNameContainer > xNameCont(m_xRowSet, UNO_QUERY); { - OUString sText(ModuleRes(STR_DATASOURCE_GRIDCONTROL_NAME)); + OUString sText(DBA_RES(STR_DATASOURCE_GRIDCONTROL_NAME)); xNameCont->insertByName(sText, makeAny(m_xGridModel)); } @@ -1371,7 +1373,7 @@ void SbaXDataBrowserController::resetted(const css::lang::EventObject& rEvent) sal_Bool SbaXDataBrowserController::confirmDelete(const css::sdb::RowChangeEvent& /*aEvent*/) { - if (ScopedVclPtrInstance(getBrowserView(), ModuleRes(STR_QUERY_BRW_DELETE_ROWS), VclMessageType::Question, VclButtonsType::YesNo)->Execute() != RET_YES) + if (ScopedVclPtrInstance(getBrowserView(), DBA_RES(STR_QUERY_BRW_DELETE_ROWS), VclMessageType::Question, VclButtonsType::YesNo)->Execute() != RET_YES) return false; return true; @@ -1983,7 +1985,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property HANDLE_SQL_ERRORS( xParser->setOrder(OUString()); xParser->appendOrderByColumn(xField, bSortUp), bParserSuccess, - ModuleRes(SBA_BROWSER_SETTING_ORDER), + DBA_RES(SBA_BROWSER_SETTING_ORDER), "SbaXDataBrowserController::Execute : caught an exception while composing the new filter !" ) @@ -2040,7 +2042,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property HANDLE_SQL_ERRORS( xParser->appendHavingClauseByColumn(xField,true,nOp), bParserSuccess, - ModuleRes(SBA_BROWSER_SETTING_FILTER), + DBA_RES(SBA_BROWSER_SETTING_FILTER), "SbaXDataBrowserController::Execute : caught an exception while composing the new filter !" ) } @@ -2049,7 +2051,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property HANDLE_SQL_ERRORS( xParser->appendFilterByColumn(xField,true,nOp), bParserSuccess, - ModuleRes(SBA_BROWSER_SETTING_FILTER), + DBA_RES(SBA_BROWSER_SETTING_FILTER), "SbaXDataBrowserController::Execute : caught an exception while composing the new filter !" ) } diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx index fee1b1ab6932..1be565799a11 100644 --- a/dbaccess/source/ui/browser/brwview.cxx +++ b/dbaccess/source/ui/browser/brwview.cxx @@ -24,8 +24,9 @@ #include #include #include "dbtreeview.hxx" -#include "dbustrings.hrc" -#include "dbu_brw.hrc" +#include "stringconstants.hxx" +#include "strings.hrc" +#include "strings.hxx" #include #include #include "UITools.hxx" diff --git a/dbaccess/source/ui/browser/dbexchange.cxx b/dbaccess/source/ui/browser/dbexchange.cxx index e744a20b6a07..e8cf07c36eb1 100644 --- a/dbaccess/source/ui/browser/dbexchange.cxx +++ b/dbaccess/source/ui/browser/dbexchange.cxx @@ -24,7 +24,7 @@ #include #include #include "TokenWriter.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include #include #include "UITools.hxx" diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx index 7415e3a10698..b56ecf9318c3 100644 --- a/dbaccess/source/ui/browser/dbloader.cxx +++ b/dbaccess/source/ui/browser/dbloader.cxx @@ -18,7 +18,8 @@ */ #include "dbu_reghelper.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include "uiservices.hxx" #include "UITools.hxx" diff --git a/dbaccess/source/ui/browser/dbtreemodel.cxx b/dbaccess/source/ui/browser/dbtreemodel.cxx index f955010eaff9..a81d475b0a98 100644 --- a/dbaccess/source/ui/browser/dbtreemodel.cxx +++ b/dbaccess/source/ui/browser/dbtreemodel.cxx @@ -18,7 +18,7 @@ */ #include "dbtreemodel.hxx" -#include "dbu_resource.hrc" +#include "dbu_pageids.hxx" namespace dbaui { diff --git a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx index 367023fa4be6..f65391f910b9 100644 --- a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx +++ b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx @@ -28,7 +28,7 @@ #include #include "dbtreeview.hxx" #include "dbtreelistbox.hxx" -#include "dbu_brw.hrc" +#include "strings.hrc" #include "dbtreemodel.hxx" #include "svtools/treelistentry.hxx" diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx index bcdb8cb216e8..850d514d2157 100644 --- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx +++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx @@ -21,8 +21,8 @@ #include "dbtreelistbox.hxx" #include "dbtreemodel.hxx" #include "dbtreeview.hxx" -#include "dbu_brw.hrc" -#include "dbustrings.hrc" +#include "strings.hrc" +#include "stringconstants.hxx" #include "QEnumTypes.hxx" #include "UITools.hxx" #include "unodatbr.hxx" diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx index 19832f26930a..8bbd503f2293 100644 --- a/dbaccess/source/ui/browser/exsrcbrw.cxx +++ b/dbaccess/source/ui/browser/exsrcbrw.cxx @@ -26,7 +26,8 @@ #include #include "formadapter.hxx" #include -#include "dbustrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include "dbu_reghelper.hxx" #include #include diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx index d3cd39a7e1ed..8122b7cef908 100644 --- a/dbaccess/source/ui/browser/formadapter.cxx +++ b/dbaccess/source/ui/browser/formadapter.cxx @@ -23,8 +23,9 @@ #include #include #include -#include "dbu_brw.hrc" -#include "dbustrings.hrc" +#include "strings.hrc" +#include "strings.hxx" +#include "stringconstants.hxx" #include #include #include diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index d95fd67d0fae..576289f3fb42 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -26,7 +26,7 @@ #include #include #include -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include #include #include diff --git a/dbaccess/source/ui/browser/sbabrw.src b/dbaccess/source/ui/browser/sbabrw.src deleted file mode 100644 index 2171873f2bd8..000000000000 --- a/dbaccess/source/ui/browser/sbabrw.src +++ /dev/null @@ -1,103 +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 "dbaccess_helpid.hrc" -#include "dbu_brw.hrc" -#include "browserids.hxx" - -String STR_QUERY_BRW_DELETE_ROWS -{ - Text[ en-US ] = "Do you want to delete the selected data?" ; -}; - -String SBA_BROWSER_SETTING_ORDER -{ - Text [ en-US ] = "Error setting the sort criteria"; -}; - -String SBA_BROWSER_SETTING_FILTER -{ - Text [ en-US ] = "Error setting the filter criteria"; -}; - -String RID_STR_CONNECTION_LOST -{ - Text [ en-US ] = "Connection lost"; -}; - -String RID_STR_QUERIES_CONTAINER -{ - Text [ en-US ] = "Queries"; -}; - -String RID_STR_TABLES_CONTAINER -{ - Text [ en-US ] = "Tables"; -}; - -String STR_TITLE_CONFIRM_DELETION -{ - Text [ en-US ] = "Confirm Deletion" ; -}; - -String STR_QUERY_DELETE_TABLE -{ - Text [ en-US ] = "Do you want to delete the table '%1'?" ; -}; - -String STR_QUERY_CONNECTION_LOST -{ - Text [ en-US ] = "The connection to the database has been lost. Do you want to reconnect?" ; -}; - -String STR_OPENTABLES_WARNINGS -{ - Text [ en-US ] = "Warnings encountered"; -}; - -String STR_OPENTABLES_WARNINGS_DETAILS -{ - Text [ en-US ] = "While retrieving the tables, warnings were reported by the database connection."; -}; - -String STR_CONNECTING_DATASOURCE -{ - Text [ en-US ] = "Connecting to \"$name$\" ..."; -}; - -String STR_LOADING_QUERY -{ - Text [ en-US ] = "Loading query $name$ ..."; -}; - -String STR_LOADING_TABLE -{ - Text [ en-US ] = "Loading table $name$ ..."; -}; - -String STR_NO_TABLE_FORMAT_INSIDE -{ - Text [ en-US ] = "No table format could be found." ; -}; - -String STR_COULDNOTCONNECT_DATASOURCE -{ - Text [ en-US ] = "The connection to the data source \"$name$\" could not be established."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index f40df7404bdd..3aa1b9237f56 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -18,6 +18,7 @@ */ #include "sbagrid.hrc" +#include "core_resource.hxx" #include "dbaccess_helpid.hrc" #include "uiservices.hxx" @@ -70,9 +71,10 @@ #include #include #include -#include "dbu_brw.hrc" #include "browserids.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" +#include "strings.hrc" +#include "strings.hxx" #include "dbu_reghelper.hxx" #include "dbexchange.hxx" #include "TableRowExchange.hxx" @@ -666,13 +668,13 @@ void SbaGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rM case DataType::REF: break; default: - rMenu.InsertItem(ID_BROWSER_COLATTRSET, ModuleRes(RID_STR_COLUMN_FORMAT), MenuItemBits::NONE, OString(), nPos++); + rMenu.InsertItem(ID_BROWSER_COLATTRSET, DBA_RES(RID_STR_COLUMN_FORMAT), MenuItemBits::NONE, OString(), nPos++); rMenu.SetHelpId(ID_BROWSER_COLATTRSET, HID_BROWSER_COLUMNFORMAT); rMenu.InsertSeparator(OString(), nPos++); } } - rMenu.InsertItem(ID_BROWSER_COLWIDTH, ModuleRes(RID_STR_COLUMN_WIDTH), MenuItemBits::NONE, OString(), nPos++); + rMenu.InsertItem(ID_BROWSER_COLWIDTH, DBA_RES(RID_STR_COLUMN_WIDTH), MenuItemBits::NONE, OString(), nPos++); rMenu.SetHelpId(ID_BROWSER_COLWIDTH, HID_BROWSER_COLUMNWIDTH); rMenu.InsertSeparator(OString(), nPos++); } @@ -751,17 +753,17 @@ void SbaGridControl::PreExecuteRowContextMenu(sal_uInt16 nRow, PopupMenu& rMenu) if (!IsReadOnlyDB()) { - rMenu.InsertItem(ID_BROWSER_TABLEATTR, ModuleRes(RID_STR_TABLE_FORMAT), MenuItemBits::NONE, OString(), nPos++); + rMenu.InsertItem(ID_BROWSER_TABLEATTR, DBA_RES(RID_STR_TABLE_FORMAT), MenuItemBits::NONE, OString(), nPos++); rMenu.SetHelpId(ID_BROWSER_TABLEATTR, HID_BROWSER_TABLEFORMAT); - rMenu.InsertItem(ID_BROWSER_ROWHEIGHT, ModuleRes(RID_STR_ROW_HEIGHT), MenuItemBits::NONE, OString(), nPos++); + rMenu.InsertItem(ID_BROWSER_ROWHEIGHT, DBA_RES(RID_STR_ROW_HEIGHT), MenuItemBits::NONE, OString(), nPos++); rMenu.SetHelpId(ID_BROWSER_ROWHEIGHT, HID_BROWSER_ROWHEIGHT); rMenu.InsertSeparator(OString(), nPos++); } if ( GetSelectRowCount() > 0 ) { - rMenu.InsertItem(ID_BROWSER_COPY, ModuleRes(RID_STR_COPY), MenuItemBits::NONE, OString(), nPos++); + rMenu.InsertItem(ID_BROWSER_COPY, DBA_RES(RID_STR_COPY), MenuItemBits::NONE, OString(), nPos++); rMenu.InsertSeparator(OString(), nPos++); } } @@ -1425,7 +1427,7 @@ IMPL_LINK_NOARG(SbaGridControl, AsynchDropEvent, void*, void) m_pMasterListener->BeforeDrop(); if(!pImExport->Read()) { - OUString sError = OUString(ModuleRes(STR_NO_COLUMNNAME_MATCHING)); + OUString sError = DBA_RES(STR_NO_COLUMNNAME_MATCHING); throwGenericSQLException(sError,nullptr); } if (m_pMasterListener) @@ -1458,7 +1460,7 @@ OUString SbaGridControl::GetAccessibleObjectDescription( ::svt::AccessibleBrowse if ( ::svt::BBTYPE_BROWSEBOX == eObjType ) { SolarMutexGuard aGuard; - sRet = OUString(ModuleRes(STR_DATASOURCE_GRIDCONTROL_DESC)); + sRet = DBA_RES(STR_DATASOURCE_GRIDCONTROL_DESC); } else sRet = FmGridControl::GetAccessibleObjectDescription( eObjType,_nPosition); diff --git a/dbaccess/source/ui/browser/sbagrid.src b/dbaccess/source/ui/browser/sbagrid.src deleted file mode 100644 index a54584007f4e..000000000000 --- a/dbaccess/source/ui/browser/sbagrid.src +++ /dev/null @@ -1,98 +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 "dbu_brw.hrc" -#include "dbaccess_helpid.hrc" -#include "browserids.hxx" - -String RID_STR_COLUMN_FORMAT -{ - Text [ en-US ] = "Column ~Format..."; -}; - -String RID_STR_COLUMN_WIDTH -{ - Text [ en-US ] = "Column ~Width..."; -}; - -String RID_STR_TABLE_FORMAT -{ - Text [ en-US ] = "Table Format..."; -}; - -String RID_STR_ROW_HEIGHT -{ - Text [ en-US ] = "Row Height..."; -}; - -String RID_STR_COPY -{ - Text [ en-US ] = "~Copy"; -}; - -String RID_STR_UNDO_MODIFY_RECORD -{ - Text [ en-US ] = "Undo: Data Input"; -}; - -String RID_STR_SAVE_CURRENT_RECORD -{ - Text [ en-US ] = "Save current record"; -}; - -String STR_QRY_TITLE -{ - Text [ en-US ] = "Query #" ; -}; - -String STR_TBL_TITLE -{ - Text [ en-US ] = "Table #" ; -}; - -String STR_VIEW_TITLE -{ - Text [ en-US ] = "View #" ; -}; - -String STR_NAME_ALREADY_EXISTS -{ - Text [ en-US ] = "The name \"#\" already exists."; -}; - -String STR_NO_COLUMNNAME_MATCHING -{ - Text [ en-US ] = "No matching column names were found."; -}; - -String STR_ERROR_OCCURRED_WHILE_COPYING -{ - Text [ en-US ] = "An error occurred. Do you want to continue copying?"; -}; - -String STR_DATASOURCE_GRIDCONTROL_NAME -{ - Text [ en-US ] = "Data source table view"; -}; - -String STR_DATASOURCE_GRIDCONTROL_DESC -{ - Text [ en-US ] = "Shows the selected table or query."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 9d456cc11204..68cecb3f0cd5 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -18,14 +18,15 @@ */ #include "browserids.hxx" +#include "core_resource.hxx" #include "dbaccess_helpid.hrc" #include "dbexchange.hxx" #include "dbtreelistbox.hxx" #include "dbtreemodel.hxx" #include "dbtreeview.hxx" -#include "dbu_brw.hrc" #include "dbu_reghelper.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" +#include "strings.hrc" #include "dlgsave.hxx" #include "uiservices.hxx" #include "HtmlReader.hxx" @@ -1776,10 +1777,10 @@ FeatureState SbaTableQueryBrowser::GetState(sal_uInt16 nId) const switch (nCommandType) { case CommandType::TABLE: - sTitle = OUString(ModuleRes(STR_TBL_TITLE)); break; + sTitle = DBA_RES(STR_TBL_TITLE); break; case CommandType::QUERY: case CommandType::COMMAND: - sTitle = OUString(ModuleRes(STR_QRY_TITLE)); break; + sTitle = DBA_RES(STR_QRY_TITLE); break; default: SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::GetState: unknown command type!"); } @@ -2026,9 +2027,9 @@ void SbaTableQueryBrowser::implAddDatasource(const OUString& _rDbName, Image& _r SolarMutexGuard aGuard; // initialize the names/images if necessary if (_rQueryName.isEmpty()) - _rQueryName = OUString(ModuleRes(RID_STR_QUERIES_CONTAINER)); + _rQueryName = DBA_RES(RID_STR_QUERIES_CONTAINER); if (_rTableName.isEmpty()) - _rTableName = OUString(ModuleRes(RID_STR_TABLES_CONTAINER)); + _rTableName = DBA_RES(RID_STR_TABLES_CONTAINER); ImageProvider aImageProvider; if (!_rQueryImage) @@ -2202,8 +2203,8 @@ IMPL_LINK(SbaTableQueryBrowser, OnExpandEntry, SvTreeListEntry*, _pParent, bool) if (aWarnings.isValid() && sal_False) { SQLContext aContext; - aContext.Message = String(ModuleRes(STR_OPENTABLES_WARNINGS)); - aContext.Details = String(ModuleRes(STR_OPENTABLES_WARNINGS_DETAILS)); + aContext.Message = DBA_RES(STR_OPENTABLES_WARNINGS); + aContext.Details = DBA_RES(STR_OPENTABLES_WARNINGS_DETAILS); aContext.NextException = aWarnings.get(); aWarnings = aContext; showError(aWarnings); @@ -2613,7 +2614,7 @@ bool SbaTableQueryBrowser::implSelect( SvTreeListEntry* _pEntry ) } break; } - OUString sStatus(ModuleRes( CommandType::TABLE == nCommandType ? STR_LOADING_TABLE : STR_LOADING_QUERY )); + OUString sStatus(DBA_RES(CommandType::TABLE == nCommandType ? STR_LOADING_TABLE : STR_LOADING_QUERY)); sStatus = sStatus.replaceFirst("$name$", aName); BrowserViewStatusDisplay aShowStatus(static_cast(getView()), sStatus); @@ -3316,12 +3317,12 @@ bool SbaTableQueryBrowser::ensureConnection( SvTreeListEntry* _pDSEntry, void* p if ( !_rConnection.is() && pTreeListData ) { // show the "connecting to ..." status - OUString sConnecting(ModuleRes(STR_CONNECTING_DATASOURCE)); + OUString sConnecting(DBA_RES(STR_CONNECTING_DATASOURCE)); sConnecting = sConnecting.replaceFirst("$name$", aDSName); BrowserViewStatusDisplay aShowStatus(static_cast(getView()), sConnecting); // build a string showing context information in case of error - OUString sConnectingContext( ModuleRes( STR_COULDNOTCONNECT_DATASOURCE ) ); + OUString sConnectingContext(DBA_RES(STR_COULDNOTCONNECT_DATASOURCE)); sConnectingContext = sConnectingContext.replaceFirst("$name$", aDSName); // connect @@ -3358,9 +3359,9 @@ IMPL_LINK( SbaTableQueryBrowser, OnTreeEntryCompare, const SvSortData&, _rSortDa const OUString sLeft = m_pTreeView->getListBox().GetEntryText(const_cast(pLHS)); EntryType eLeft = etTableContainer; - if (OUString(ModuleRes(RID_STR_TABLES_CONTAINER)) == sLeft) + if (DBA_RES(RID_STR_TABLES_CONTAINER) == sLeft) eLeft = etTableContainer; - else if (OUString(ModuleRes(RID_STR_QUERIES_CONTAINER)) == sLeft) + else if (DBA_RES(RID_STR_QUERIES_CONTAINER) == sLeft) eLeft = etQueryContainer; if ( eLeft == eRight ) diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx b/dbaccess/source/ui/control/ColumnControlWindow.cxx index c3a1bb3af524..5c7599bc3ccf 100644 --- a/dbaccess/source/ui/control/ColumnControlWindow.cxx +++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx @@ -22,7 +22,9 @@ #include #include #include "UITools.hxx" -#include "dbu_resource.hrc" +#include "core_resource.hxx" +#include "dbu_pageids.hxx" +#include "strings.hrc" #include #include @@ -39,7 +41,7 @@ OColumnControlWindow::OColumnControlWindow(vcl::Window* pParent ,const Reference& _rxContext) : OFieldDescControl(pParent,nullptr) , m_xContext(_rxContext) - , m_sTypeNames(ModuleRes(STR_TABLEDESIGN_DBFIELDTYPES)) + , m_sTypeNames(DBA_RES(STR_TABLEDESIGN_DBFIELDTYPES)) , m_bAutoIncrementEnabled(true) { diff --git a/dbaccess/source/ui/control/FieldControls.cxx b/dbaccess/source/ui/control/FieldControls.cxx index e827fccdda3a..c2b8ee260375 100644 --- a/dbaccess/source/ui/control/FieldControls.cxx +++ b/dbaccess/source/ui/control/FieldControls.cxx @@ -19,6 +19,7 @@ #include "FieldControls.hxx" #include "SqlNameEdit.hxx" +#include "core_resource.hxx" #include @@ -38,20 +39,20 @@ void lcl_setSpecialReadOnly( bool _bReadOnly, vcl::Window* _pWin ) OPropColumnEditCtrl::OPropColumnEditCtrl(vcl::Window* pParent, rtl::OUString& _rAllowedChars, - sal_uInt16 nHelpId, + const char* pHelpId, short nPosition, WinBits nWinStyle) :OSQLNameEdit(pParent, nWinStyle, _rAllowedChars) ,m_nPos(nPosition) { - m_strHelpText = ModuleRes(nHelpId); + m_strHelpText = DBA_RES(pHelpId); } -OPropEditCtrl::OPropEditCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle) +OPropEditCtrl::OPropEditCtrl(vcl::Window* pParent, const char* pHelpId, short nPosition, WinBits nWinStyle) :Edit(pParent, nWinStyle) ,m_nPos(nPosition) { - m_strHelpText = ModuleRes(nHelpId); + m_strHelpText = DBA_RES(pHelpId); } void @@ -62,18 +63,18 @@ OPropNumericEditCtrl::SetSpecialReadOnly(bool _bReadOnly) } -OPropNumericEditCtrl::OPropNumericEditCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle) +OPropNumericEditCtrl::OPropNumericEditCtrl(vcl::Window* pParent, const char* pHelpId, short nPosition, WinBits nWinStyle) :NumericField(pParent, nWinStyle) ,m_nPos(nPosition) { - m_strHelpText = ModuleRes(nHelpId); + m_strHelpText = DBA_RES(pHelpId); } -OPropListBoxCtrl::OPropListBoxCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle) +OPropListBoxCtrl::OPropListBoxCtrl(vcl::Window* pParent, const char* pHelpId, short nPosition, WinBits nWinStyle) :ListBox(pParent, nWinStyle) ,m_nPos(nPosition) { - m_strHelpText = ModuleRes(nHelpId); + m_strHelpText = DBA_RES(pHelpId); } } // end namespace dbaui diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index f8ef35fb9650..2a984fa65bae 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "core_resource.hxx" #include "FieldDescControl.hxx" #include "FieldControls.hxx" #include @@ -50,8 +51,7 @@ #include #include #include "UITools.hxx" -#include "dbu_control.hrc" -#include "dbu_tbl.hrc" +#include "strings.hrc" #include using namespace dbaui; @@ -124,8 +124,8 @@ OFieldDescControl::OFieldDescControl( vcl::Window* pParent, OTableDesignHelpBar* ,m_pHorzScroll( nullptr ) ,m_pPreviousType() ,m_nPos(-1) - ,aYes(ModuleRes(STR_VALUE_YES)) - ,aNo(ModuleRes(STR_VALUE_NO)) + ,aYes(DBA_RES(STR_VALUE_YES)) + ,aNo(DBA_RES(STR_VALUE_NO)) ,m_nOldVThumb( 0 ) ,m_nOldHThumb( 0 ) ,m_nWidth(50) @@ -232,7 +232,7 @@ OUString OFieldDescControl::BoolStringUI(const OUString& rPersistentString) cons if (rPersistentString == "1") return aYes; - return ModuleRes(STR_VALUE_NONE); + return DBA_RES(STR_VALUE_NONE); } void OFieldDescControl::Init() @@ -581,7 +581,7 @@ IMPL_LINK( OFieldDescControl, ChangeHdl, ListBox&, rListBox, void ) if(pRequired->GetSelectEntryPos() == 0) // Yes { - pBoolDefault->RemoveEntry(OUString(ModuleRes(STR_VALUE_NONE))); + pBoolDefault->RemoveEntry(DBA_RES(STR_VALUE_NONE)); if (sDef != aYes && sDef != aNo) pBoolDefault->SelectEntryPos(1); // No as a default else @@ -589,7 +589,7 @@ IMPL_LINK( OFieldDescControl, ChangeHdl, ListBox&, rListBox, void ) } else if(pBoolDefault->GetEntryCount() < 3) { - pBoolDefault->InsertEntry(OUString(ModuleRes(STR_VALUE_NONE))); + pBoolDefault->InsertEntry(DBA_RES(STR_VALUE_NONE)); pBoolDefault->SelectEntry(sDef); } } @@ -869,7 +869,7 @@ void OFieldDescControl::ActivateAggregate( EControlType eType ) InitializeControl(pFormatSample,HID_TAB_ENT_FORMAT_SAMPLE,false); pFormat = VclPtr::Create(this, WB_TABSTOP); - pFormat->SetText(ModuleRes(STR_BUTTON_FORMAT)); + pFormat->SetText(DBA_RES(STR_BUTTON_FORMAT)); const sal_Int32 nControlHeight = GetMaxControlHeight(); pFormat->SetSizePixel(Size(nControlHeight, nControlHeight)); pFormat->SetClickHdl( LINK( this, OFieldDescControl, FormatClickHdl ) ); @@ -887,7 +887,7 @@ void OFieldDescControl::ActivateAggregate( EControlType eType ) pBoolDefaultText = CreateText(STR_DEFAULT_VALUE); pBoolDefault = VclPtr::Create( this, STR_HELP_BOOL_DEFAULT, FIELD_PROPERTY_BOOL_DEFAULT, WB_DROPDOWN ); pBoolDefault->SetDropDownLineCount(3); - pBoolDefault->InsertEntry(OUString(ModuleRes(STR_VALUE_NONE))); + pBoolDefault->InsertEntry(DBA_RES(STR_VALUE_NONE)); pBoolDefault->InsertEntry(aYes); pBoolDefault->InsertEntry(aNo); @@ -907,17 +907,17 @@ void OFieldDescControl::InitializeControl(Control* _pControl,const OString& _sHe _pControl->EnableClipSiblings(); } -VclPtr OFieldDescControl::CreateText(sal_uInt16 _nTextRes) +VclPtr OFieldDescControl::CreateText(const char* pTextRes) { VclPtrInstance pFixedText( this ); - pFixedText->SetText( ModuleRes(_nTextRes) ); + pFixedText->SetText(DBA_RES(pTextRes)); pFixedText->EnableClipSiblings(); return pFixedText; } -VclPtr OFieldDescControl::CreateNumericControl(sal_uInt16 _nHelpStr,short _nProperty,const OString& _sHelpId) +VclPtr OFieldDescControl::CreateNumericControl(const char* pHelpId, short _nProperty, const OString& _sHelpId) { - VclPtrInstance pControl( this, _nHelpStr, _nProperty, WB_BORDER ); + VclPtrInstance pControl(this, pHelpId, _nProperty, WB_BORDER); pControl->SetDecimalDigits(0); pControl->SetMin(0); pControl->SetMax(0x7FFFFFFF); // Should be changed outside, if needed @@ -1296,7 +1296,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) { pFieldDescr->SetIsNullable(ColumnValue::NO_NULLS); // The type says so - pBoolDefault->RemoveEntry(OUString(ModuleRes(STR_VALUE_NONE))); + pBoolDefault->RemoveEntry(DBA_RES(STR_VALUE_NONE)); if ( sDef != aYes && sDef != aNo ) pBoolDefault->SelectEntryPos(1); // No as a default else @@ -1306,7 +1306,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) } else if(pBoolDefault->GetEntryCount() < 3) { - pBoolDefault->InsertEntry(OUString(ModuleRes(STR_VALUE_NONE))); + pBoolDefault->InsertEntry(DBA_RES(STR_VALUE_NONE)); pBoolDefault->SelectEntry(sDef); } else @@ -1413,7 +1413,7 @@ IMPL_LINK(OFieldDescControl, OnControlFocusGot, Control&, rControl, void ) } if (&rControl == pFormat) - strHelpText = ModuleRes(STR_HELP_FORMAT_BUTTON); + strHelpText = DBA_RES(STR_HELP_FORMAT_BUTTON); if (!strHelpText.isEmpty() && (pHelp != nullptr)) pHelp->SetHelpText(strHelpText); diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index 0874d383086c..15c1ce6a6ab2 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -31,7 +31,7 @@ #include #include #include "RelControliFace.hxx" -#include "dbu_control.hrc" +#include "strings.hrc" #include "dbaccess_helpid.hrc" #include diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index 91cd2b3c64b3..00b15258a9e6 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -18,12 +18,13 @@ */ #include "TableGrantCtrl.hxx" +#include "core_resource.hxx" #include #include #include #include #include -#include "dbu_control.hrc" +#include "strings.hrc" #include "UITools.hxx" using namespace ::com::sun::star::accessibility; @@ -54,15 +55,15 @@ OTableGrantControl::OTableGrantControl( vcl::Window* pParent, WinBits nBits) { // insert columns sal_uInt16 i=1; - InsertDataColumn( i, OUString(ModuleRes(STR_TABLE_PRIV_NAME) ), 75); + InsertDataColumn( i, DBA_RES(STR_TABLE_PRIV_NAME), 75); FreezeColumn(i++); - InsertDataColumn( i++, OUString(ModuleRes(STR_TABLE_PRIV_SELECT)), 75); - InsertDataColumn( i++, OUString(ModuleRes(STR_TABLE_PRIV_INSERT)), 75); - InsertDataColumn( i++, OUString(ModuleRes(STR_TABLE_PRIV_DELETE)), 75); - InsertDataColumn( i++, OUString(ModuleRes(STR_TABLE_PRIV_UPDATE)), 75); - InsertDataColumn( i++, OUString(ModuleRes(STR_TABLE_PRIV_ALTER)), 75); - InsertDataColumn( i++, OUString(ModuleRes(STR_TABLE_PRIV_REFERENCE)), 75); - InsertDataColumn( i++, OUString(ModuleRes(STR_TABLE_PRIV_DROP)), 75); + InsertDataColumn( i++, DBA_RES(STR_TABLE_PRIV_SELECT), 75); + InsertDataColumn( i++, DBA_RES(STR_TABLE_PRIV_INSERT), 75); + InsertDataColumn( i++, DBA_RES(STR_TABLE_PRIV_DELETE), 75); + InsertDataColumn( i++, DBA_RES(STR_TABLE_PRIV_UPDATE), 75); + InsertDataColumn( i++, DBA_RES(STR_TABLE_PRIV_ALTER), 75); + InsertDataColumn( i++, DBA_RES(STR_TABLE_PRIV_REFERENCE), 75); + InsertDataColumn( i++, DBA_RES(STR_TABLE_PRIV_DROP), 75); while(--i) SetColumnWidth(i,GetAutoColumnWidth(i)); diff --git a/dbaccess/source/ui/control/TableGrantCtrl.src b/dbaccess/source/ui/control/TableGrantCtrl.src deleted file mode 100644 index 5073d49b94e1..000000000000 --- a/dbaccess/source/ui/control/TableGrantCtrl.src +++ /dev/null @@ -1,62 +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 "dbu_control.hrc" - -String STR_TABLE_PRIV_NAME -{ - Text [ en-US ] = "Table name"; -}; - -String STR_TABLE_PRIV_INSERT -{ - Text [ en-US ] = "Insert data"; -}; - -String STR_TABLE_PRIV_DELETE -{ - Text [ en-US ] = "Delete data"; -}; - -String STR_TABLE_PRIV_UPDATE -{ - Text [ en-US ] = "Modify data"; -}; - -String STR_TABLE_PRIV_ALTER -{ - Text [ en-US ] = "Alter structure"; -}; - -String STR_TABLE_PRIV_SELECT -{ - Text [ en-US ] = "Read data"; -}; - -String STR_TABLE_PRIV_REFERENCE -{ - Text [ en-US ] = "Modify references"; -}; - -String STR_TABLE_PRIV_DROP -{ - Text [ en-US ] = "Drop structure"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 2553ed8c9aed..1d0b31fc5601 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -18,7 +18,7 @@ */ #include "dbtreelistbox.hxx" -#include "dbu_resource.hrc" +#include "dbu_pageids.hxx" #include "browserids.hxx" #include "listviewitems.hxx" #include "callbacks.hxx" diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx index 5f4abcd8261c..b9827df00949 100644 --- a/dbaccess/source/ui/control/marktree.cxx +++ b/dbaccess/source/ui/control/marktree.cxx @@ -18,7 +18,7 @@ */ #include "marktree.hxx" -#include "dbu_control.hrc" +#include "strings.hrc" #include #include diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx index 6cdab2604fde..2033702c67d9 100644 --- a/dbaccess/source/ui/control/tabletree.cxx +++ b/dbaccess/source/ui/control/tabletree.cxx @@ -17,16 +17,16 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "core_resource.hxx" #include "tabletree.hxx" #include "imageprovider.hxx" -#include "moduledbu.hxx" -#include "dbu_control.hrc" +#include "strings.hrc" #include #include #include #include #include -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include #include #include @@ -141,7 +141,7 @@ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConn try { Reference< XTablesSupplier > xTableSupp( _rxConnection, UNO_QUERY_THROW ); - sCurrentActionError = ModuleRes(STR_NOTABLEINFO); + sCurrentActionError = DBA_RES(STR_NOTABLEINFO); Reference< XNameAccess > xTables,xViews; @@ -251,12 +251,12 @@ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConn OUString sRootEntryText; if ( std::none_of(_rTables.begin(),_rTables.end(), [] (const TNames::value_type& name) { return !name.second; }) ) - sRootEntryText = ModuleRes(STR_ALL_TABLES); + sRootEntryText = DBA_RES(STR_ALL_TABLES); else if ( std::none_of(_rTables.begin(),_rTables.end(), [] (const TNames::value_type& name) { return name.second; }) ) - sRootEntryText = ModuleRes(STR_ALL_VIEWS); + sRootEntryText = DBA_RES(STR_ALL_VIEWS); else - sRootEntryText = ModuleRes(STR_ALL_TABLES_AND_VIEWS); + sRootEntryText = DBA_RES(STR_ALL_TABLES_AND_VIEWS); InsertEntry( sRootEntryText, nullptr, false, TREELIST_APPEND, reinterpret_cast< void* >( DatabaseObjectContainer::TABLES ) ); } diff --git a/dbaccess/source/ui/control/tabletree.src b/dbaccess/source/ui/control/tabletree.src deleted file mode 100644 index 6657dd0ef9c9..000000000000 --- a/dbaccess/source/ui/control/tabletree.src +++ /dev/null @@ -1,53 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "dbu_control.hrc" -#include "browserids.hxx" - -String STR_COULDNOTCREATE_DRIVERMANAGER -{ - Text [ en-US ] = "Cannot connect to the SDBC driver manager (#servicename#)."; -}; - -String STR_NOREGISTEREDDRIVER -{ - Text [ en-US ] = "A driver is not registered for the URL #connurl#."; -}; - -String STR_NOTABLEINFO -{ - Text [ en-US ] = "Successfully connected, but information about database tables is not available."; -}; - -String STR_ALL_TABLES -{ - Text [ en-US ] = "All tables"; -}; - -String STR_ALL_VIEWS -{ - Text [ en-US ] = "All views"; -}; - -String STR_ALL_TABLES_AND_VIEWS -{ - Text [ en-US ] = "All tables and views"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/undosqledit.src b/dbaccess/source/ui/control/undosqledit.src deleted file mode 100644 index f63ff3275705..000000000000 --- a/dbaccess/source/ui/control/undosqledit.src +++ /dev/null @@ -1,27 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * 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 "dbu_control.hrc" - -String STR_QUERY_UNDO_MODIFYSQLEDIT -{ - Text [ en-US ] = "Modify SQL statement(s)" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/AutoControls.src b/dbaccess/source/ui/dlg/AutoControls.src deleted file mode 100644 index c6539edc6f66..000000000000 --- a/dbaccess/source/ui/dlg/AutoControls.src +++ /dev/null @@ -1,97 +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 "dbu_dlg.hrc" - -String STR_DBASE_PATH_OR_FILE -{ - Text[ en-US ] = "Path to the dBASE files"; -}; - -String STR_FLAT_PATH_OR_FILE -{ - Text[ en-US ] = "Path to the text files"; -}; - -String STR_CALC_PATH_OR_FILE -{ - Text[ en-US ] = "Path to the spreadsheet document"; -}; - -String STR_WRITER_PATH_OR_FILE -{ - Text[ en-US ] = "Path to the Writer document"; -}; - -String STR_NAME_OF_ODBC_DATASOURCE -{ - Text[ en-US ] = "Name of the ODBC data source on your system"; -}; - -String STR_MYSQL_DATABASE_NAME -{ - Text[ en-US ] = "Name of the MySQL database"; -}; - -String STR_ORACLE_DATABASE_NAME -{ - Text[ en-US ] = "Name of the Oracle database"; -}; - -String STR_MSACCESS_MDB_FILE -{ - Text[ en-US ] = "Microsoft Access database file"; -}; - -String STR_NO_ADDITIONAL_SETTINGS -{ - Text[ en-US ] = "No more settings are necessary. To verify that the connection is working, click the '%test' button."; -}; - -String STR_COMMONURL -{ - Text [ en-US ] = "Datasource URL (e.g. postgresql://host:port/database)" ; -}; - -String STR_HOSTNAME -{ - Text[ en-US ] = "~Host name"; -}; - -String STR_MOZILLA_PROFILE_NAME -{ - Text[ en-US ] = "~Mozilla profile name"; -}; - -String STR_THUNDERBIRD_PROFILE_NAME -{ - Text[ en-US ] = "~Thunderbird profile name"; -}; - -String STR_ADD_TABLES -{ - Text [ en-US ] = "Add Tables"; -}; - -String STR_ADD_TABLE_OR_QUERY -{ - Text [ en-US ] = "Add Table or Query" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx index 019cb59cabf7..0d92a221646a 100644 --- a/dbaccess/source/ui/dlg/CollectionView.cxx +++ b/dbaccess/source/ui/dlg/CollectionView.cxx @@ -20,18 +20,20 @@ #include "CollectionView.hxx" #include #include -#include "moduledbu.hxx" -#include "dbu_dlg.hrc" +#include "core_resource.hxx" +#include "dbu_dlg.hxx" +#include "strings.hrc" #include #include #include +#include "core_resource.hxx" #include #include #include #include #include #include -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include "bitmaps.hlst" #include "UITools.hxx" #include @@ -179,7 +181,7 @@ IMPL_LINK_NOARG(OCollectionView, Save_Click, Button*, void) { if ( xNameContainer->hasByName(sName) ) { - ScopedVclPtrInstance< QueryBox > aBox( this, WB_YES_NO, ModuleRes( STR_ALREADYEXISTOVERWRITE ) ); + ScopedVclPtrInstance< QueryBox > aBox(this, WB_YES_NO, DBA_RES(STR_ALREADYEXISTOVERWRITE)); if ( aBox->Execute() != RET_YES ) return; } diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index d6b535a0cd13..5e83545acfda 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -17,10 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "core_resource.hxx" #include "dsnItem.hxx" #include "ConnectionHelper.hxx" -#include "dbu_dlg.hrc" -#include "dbu_misc.hrc" +#include "dbu_dlg.hxx" +#include "strings.hrc" #include #include #include @@ -30,7 +31,7 @@ #include #include "dsitems.hxx" #include "dbaccess_helpid.hrc" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include #include #include @@ -42,7 +43,7 @@ #include "odbcconfig.hxx" #include "dsselect.hxx" #include -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include #include #include @@ -238,7 +239,7 @@ namespace dbaui case ::dbaccess::DST_MSACCESS: { const OUString sExt("*.mdb;*.mde"); - OUString sFilterName(ModuleRes (STR_MSACCESS_FILTERNAME)); + OUString sFilterName(DBA_RES (STR_MSACCESS_FILTERNAME)); ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION); aFileDlg.AddFilter(sFilterName,sExt); @@ -249,7 +250,7 @@ namespace dbaui case ::dbaccess::DST_MSACCESS_2007: { const OUString sAccdb("*.accdb;*.accde"); - OUString sFilterName2(ModuleRes (STR_MSACCESS_2007_FILTERNAME)); + OUString sFilterName2(DBA_RES (STR_MSACCESS_2007_FILTERNAME)); ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION); aFileDlg.AddFilter(sFilterName2,sAccdb); @@ -329,7 +330,7 @@ namespace dbaui case ::dbaccess::DST_FIREBIRD: { const OUString sExt("*.fdb"); - OUString sFilterName(ModuleRes (STR_FIREBIRD_FILTERNAME)); + OUString sFilterName(DBA_RES (STR_FIREBIRD_FILTERNAME)); ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE); aFileDlg.AddFilter(sFilterName,sExt); @@ -353,7 +354,7 @@ namespace dbaui case ::dbaccess::DST_FIREBIRD: { const OUString sExt("*.fdb"); - OUString sFilterName(ModuleRes (STR_FIREBIRD_FILTERNAME)); + OUString sFilterName(DBA_RES (STR_FIREBIRD_FILTERNAME)); ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION); aFileDlg.AddFilter(sFilterName,sExt); @@ -467,7 +468,7 @@ namespace dbaui if (!m_pCollection->supportsDBCreation(m_eType) && (( e_exists == PATH_NOT_EXIST) || ( e_exists == PATH_NOT_KNOWN))) { - OUString sQuery(ModuleRes(STR_ASK_FOR_DIRECTORY_CREATION)); + OUString sQuery(DBA_RES(STR_ASK_FOR_DIRECTORY_CREATION)); OFileNotation aTransformer(_rURL); sQuery = sQuery.replaceFirst("$path$", aTransformer.get(OFileNotation::N_SYSTEM)); @@ -485,7 +486,7 @@ namespace dbaui { if ( !createDirectoryDeep(_rURL) ) { // could not create the directory - sQuery = ModuleRes(STR_COULD_NOT_CREATE_DIRECTORY); + sQuery = DBA_RES(STR_COULD_NOT_CREATE_DIRECTORY); sQuery = sQuery.replaceFirst("$name$", aTransformer.get(OFileNotation::N_SYSTEM)); m_bUserGrabFocus = false; @@ -679,7 +680,7 @@ namespace dbaui { if( pathExists(sURL, true) == PATH_NOT_EXIST ) { - OUString sFile = ModuleRes( STR_FILE_DOES_NOT_EXIST ); + OUString sFile = DBA_RES( STR_FILE_DOES_NOT_EXIST ); sFile = sFile.replaceFirst("$file$", aTransformer.get(OFileNotation::N_SYSTEM)); ScopedVclPtrInstance(this, sFile)->Execute(); setURLNoPrefix(sOldPath); diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index 7ca9c7096900..a2abf4eb718a 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -19,7 +19,9 @@ #include #include "ConnectionPage.hxx" -#include "dbu_dlg.hrc" +#include "core_resource.hxx" +#include "dbu_dlg.hxx" +#include "strings.hrc" #include "dsmeta.hxx" #if HAVE_FEATURE_JAVA #include @@ -38,11 +40,11 @@ #include #include #include "sqlmessage.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "odbcconfig.hxx" #include "dsselect.hxx" #include -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include #include #include @@ -138,53 +140,53 @@ namespace dbaui switch( eType ) { case ::dbaccess::DST_DBASE: - m_pFT_Connection->SetText(OUString(ModuleRes(STR_DBASE_PATH_OR_FILE))); + m_pFT_Connection->SetText(DBA_RES(STR_DBASE_PATH_OR_FILE)); m_pConnectionURL->SetHelpId(HID_DSADMIN_DBASE_PATH); break; case ::dbaccess::DST_FLAT: - m_pFT_Connection->SetText(OUString(ModuleRes(STR_FLAT_PATH_OR_FILE))); + m_pFT_Connection->SetText(DBA_RES(STR_FLAT_PATH_OR_FILE)); m_pConnectionURL->SetHelpId(HID_DSADMIN_FLAT_PATH); break; case ::dbaccess::DST_CALC: - m_pFT_Connection->SetText(OUString(ModuleRes(STR_CALC_PATH_OR_FILE))); + m_pFT_Connection->SetText(DBA_RES(STR_CALC_PATH_OR_FILE)); m_pConnectionURL->SetHelpId(HID_DSADMIN_CALC_PATH); break; case ::dbaccess::DST_WRITER: - m_pFT_Connection->SetText(OUString(ModuleRes(STR_WRITER_PATH_OR_FILE))); + m_pFT_Connection->SetText((DBA_RES(STR_WRITER_PATH_OR_FILE))); m_pConnectionURL->SetHelpId(HID_DSADMIN_WRITER_PATH); break; case ::dbaccess::DST_ADO: - m_pFT_Connection->SetText(OUString(ModuleRes(STR_COMMONURL))); + m_pFT_Connection->SetText(DBA_RES(STR_COMMONURL)); break; case ::dbaccess::DST_MSACCESS: case ::dbaccess::DST_MSACCESS_2007: - m_pFT_Connection->SetText(OUString(ModuleRes(STR_MSACCESS_MDB_FILE))); + m_pFT_Connection->SetText(DBA_RES(STR_MSACCESS_MDB_FILE)); m_pConnectionURL->SetHelpId(HID_DSADMIN_MSACCESS_MDB_FILE); break; case ::dbaccess::DST_MYSQL_NATIVE: case ::dbaccess::DST_MYSQL_JDBC: - m_pFT_Connection->SetText(OUString(ModuleRes(STR_MYSQL_DATABASE_NAME))); + m_pFT_Connection->SetText(DBA_RES(STR_MYSQL_DATABASE_NAME)); m_pConnectionURL->SetHelpId( HID_DSADMIN_MYSQL_DATABASE ); break; case ::dbaccess::DST_ORACLE_JDBC: - m_pFT_Connection->SetText(OUString(ModuleRes(STR_ORACLE_DATABASE_NAME))); + m_pFT_Connection->SetText(DBA_RES(STR_ORACLE_DATABASE_NAME)); m_pConnectionURL->SetHelpId(HID_DSADMIN_ORACLE_DATABASE); break; case ::dbaccess::DST_MYSQL_ODBC: case ::dbaccess::DST_ODBC: - m_pFT_Connection->SetText(OUString(ModuleRes(STR_NAME_OF_ODBC_DATASOURCE))); + m_pFT_Connection->SetText(DBA_RES(STR_NAME_OF_ODBC_DATASOURCE)); m_pConnectionURL->SetHelpId( eType == ::dbaccess::DST_MYSQL_ODBC ? HID_DSADMIN_MYSQL_ODBC_DATASOURCE : HID_DSADMIN_ODBC_DATASOURCE); break; case ::dbaccess::DST_LDAP: - m_pFT_Connection->SetText(OUString(ModuleRes(STR_HOSTNAME))); + m_pFT_Connection->SetText(DBA_RES(STR_HOSTNAME)); m_pConnectionURL->SetHelpId( HID_DSADMIN_LDAP_HOSTNAME ); break; case ::dbaccess::DST_MOZILLA: - m_pFT_Connection->SetText(OUString(ModuleRes(STR_MOZILLA_PROFILE_NAME))); + m_pFT_Connection->SetText(DBA_RES(STR_MOZILLA_PROFILE_NAME)); m_pConnectionURL->SetHelpId( HID_DSADMIN_MOZILLA_PROFILE_NAME ); break; case ::dbaccess::DST_THUNDERBIRD: - m_pFT_Connection->SetText(OUString(ModuleRes(STR_THUNDERBIRD_PROFILE_NAME))); + m_pFT_Connection->SetText(DBA_RES(STR_THUNDERBIRD_PROFILE_NAME)); m_pConnectionURL->SetHelpId( HID_DSADMIN_THUNDERBIRD_PROFILE_NAME ); break; case ::dbaccess::DST_OUTLOOK: @@ -194,7 +196,7 @@ namespace dbaui case ::dbaccess::DST_EVOLUTION_LDAP: case ::dbaccess::DST_KAB: case ::dbaccess::DST_MACAB: - m_pFT_Connection->SetText(OUString(ModuleRes(STR_NO_ADDITIONAL_SETTINGS))); + m_pFT_Connection->SetText(DBA_RES(STR_NO_ADDITIONAL_SETTINGS)); { OUString sText = m_pFT_Connection->GetText(); sText = sText.replaceAll("%test",m_pTestConnection->GetText()); @@ -205,7 +207,7 @@ namespace dbaui break; case ::dbaccess::DST_JDBC: default: - m_pFT_Connection->SetText(OUString(ModuleRes(STR_COMMONURL))); + m_pFT_Connection->SetText(DBA_RES(STR_COMMONURL)); break; } @@ -305,9 +307,9 @@ namespace dbaui } #endif - const sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS; + const char* pMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS; const OSQLMessageBox::MessageType mt = bSuccess ? OSQLMessageBox::Info : OSQLMessageBox::Error; - ScopedVclPtrInstance< OSQLMessageBox > aMsg( this, OUString( ModuleRes( nMessage ) ), OUString(), WB_OK | WB_DEF_OK, mt ); + ScopedVclPtrInstance< OSQLMessageBox > aMsg( this, DBA_RES(pMessage), OUString(), WB_OK | WB_DEF_OK, mt ); aMsg->Execute(); } bool OConnectionTabPage::checkTestConnection() diff --git a/dbaccess/source/ui/dlg/ConnectionPage.src b/dbaccess/source/ui/dlg/ConnectionPage.src deleted file mode 100644 index 77078c5cc3d5..000000000000 --- a/dbaccess/source/ui/dlg/ConnectionPage.src +++ /dev/null @@ -1,63 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "dbaccess_helpid.hrc" -#include "dbu_dlg.hrc" - -String STR_CONNECTION_TEST -{ - Text [ en-US ] = "Connection Test"; -}; - -String STR_CONNECTION_SUCCESS -{ - Text [ en-US ] = "The connection was established successfully."; -}; - -String STR_CONNECTION_NO_SUCCESS -{ - Text [ en-US ] = "The connection could not be established."; -}; - -String STR_JDBCDRIVER_SUCCESS -{ - Text [ en-US ] = "The JDBC driver was loaded successfully."; -}; - -String STR_JDBCDRIVER_NO_SUCCESS -{ - Text [ en-US ] = "The JDBC driver could not be loaded."; -}; - -String STR_MSACCESS_FILTERNAME -{ - Text [ en-US ] = "MS Access file"; -}; - -String STR_MSACCESS_2007_FILTERNAME -{ - Text [ en-US ] = "MS Access 2007 file"; -}; - -String STR_FIREBIRD_FILTERNAME -{ - Text [ en-US ] = "Firebird Database"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx index e6a067c5cb9c..4305a4c3c5af 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx @@ -18,7 +18,9 @@ */ #include "ConnectionPageSetup.hxx" -#include "dbu_dlg.hrc" +#include "strings.hrc" +#include "core_resource.hxx" +#include "dbu_dlg.hxx" #include #include #include @@ -32,11 +34,11 @@ #include #include #include "sqlmessage.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "odbcconfig.hxx" #include "dsselect.hxx" #include -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include #include #include @@ -85,29 +87,29 @@ namespace dbaui VclPtr OConnectionTabPageSetup::CreateUserDefinedTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ) { - return VclPtr::Create( pParent, "ConnectionPage", "dbaccess/ui/dbwizconnectionpage.ui", _rAttrSet, USHRT_MAX, USHRT_MAX, STR_COMMONURL ); + return VclPtr::Create(pParent, "ConnectionPage", "dbaccess/ui/dbwizconnectionpage.ui", _rAttrSet, nullptr, nullptr, STR_COMMONURL); } - OConnectionTabPageSetup::OConnectionTabPageSetup(vcl::Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderResId, sal_uInt16 _nUrlResId) + OConnectionTabPageSetup::OConnectionTabPageSetup(vcl::Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs, const char* pHelpTextResId, const char* pHeaderResId, const char* pUrlResId) :OConnectionHelper(pParent, _rId, _rUIXMLDescription, _rCoreAttrs) { get(m_pHelpText, "helptext"); get(m_pHeaderText, "header"); - if ( USHRT_MAX != _nHelpTextResId ) + if (pHelpTextResId != nullptr) { - OUString sHelpText = ModuleRes(_nHelpTextResId); + OUString sHelpText = DBA_RES(pHelpTextResId); m_pHelpText->SetText(sHelpText); } else m_pHelpText->Hide(); - if ( USHRT_MAX != _nHeaderResId ) - m_pHeaderText->SetText(ModuleRes(_nHeaderResId)); + if (pHeaderResId != nullptr) + m_pHeaderText->SetText(DBA_RES(pHeaderResId)); - if ( USHRT_MAX != _nUrlResId ) + if (pUrlResId != nullptr) { - OUString sLabelText = ModuleRes(_nUrlResId); + OUString sLabelText = DBA_RES(pUrlResId); m_pFT_Connection->SetText(sLabelText); } else diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx index 3a34c73f4b8d..b9bf054bf79c 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx @@ -60,7 +60,7 @@ namespace dbaui virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) override; protected: - OConnectionTabPageSetup(vcl::Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderResId, sal_uInt16 _nUrlResId); + OConnectionTabPageSetup(vcl::Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs, const char* pHelpTextResId, const char* pHeaderResId, const char* pUrlResId); virtual bool checkTestConnection() override; // nControlFlags is a combination of the CBTP_xxx-constants }; diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index 24c5794b6968..b642e5d568f1 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -20,9 +20,11 @@ #include #include "DBSetupConnectionPages.hxx" +#include "core_resource.hxx" #include "sqlmessage.hxx" -#include "dbu_dlg.hrc" -#include "dbu_resource.hrc" +#include "dbu_dlg.hxx" +#include "strings.hrc" +#include "dbu_pageids.hxx" #include #include #include @@ -43,14 +45,14 @@ #include #include -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include #include #include #include #include "finteraction.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include #include #include "TextConnectionHelper.hxx" @@ -378,7 +380,7 @@ using namespace ::com::sun::star; } // OMySQLJDBCConnectionPageSetup - OGeneralSpecialJDBCConnectionPageSetup::OGeneralSpecialJDBCConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ,sal_uInt16 _nPortId, sal_uInt16 _nDefaultPortResId, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderTextResId, sal_uInt16 _nDriverClassId) + OGeneralSpecialJDBCConnectionPageSetup::OGeneralSpecialJDBCConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ,sal_uInt16 _nPortId, const char* pDefaultPortResId, const char* pHelpTextResId, const char* pHeaderTextResId, const char* pDriverClassId) :OGenericAdministrationPage(pParent, "SpecialJDBCConnectionPage", "dbaccess/ui/specialjdbcconnectionpage.ui", _rCoreAttrs) ,m_nPortId(_nPortId) { @@ -396,13 +398,13 @@ using namespace ::com::sun::star; get(m_pETDriverClass, "jdbcDriverEntry"); get(m_pPBTestJavaDriver, "testDriverButton"); - m_pFTDriverClass->SetText(OUString(ModuleRes(_nDriverClassId))); + m_pFTDriverClass->SetText(DBA_RES(pDriverClassId)); - m_pFTDefaultPortNumber->SetText(OUString(ModuleRes(_nDefaultPortResId))); - OUString sHelpText = OUString(ModuleRes(_nHelpTextResId)); + m_pFTDefaultPortNumber->SetText(DBA_RES(pDefaultPortResId)); + OUString sHelpText = DBA_RES(pHelpTextResId); m_pFTHelpText->SetText(sHelpText); //TODO this code snippet is redundant - m_pHeaderText->SetText(ModuleRes(_nHeaderTextResId)); + m_pHeaderText->SetText(DBA_RES(pHeaderTextResId)); m_pETDatabasename->SetModifyHdl(LINK(this, OGenericAdministrationPage, OnControlEditModifyHdl)); m_pETHostname->SetModifyHdl(LINK(this, OGenericAdministrationPage, OnControlEditModifyHdl)); @@ -552,9 +554,9 @@ using namespace ::com::sun::star; { } #endif - const sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS; + const char *pMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS; const OSQLMessageBox::MessageType mt = bSuccess ? OSQLMessageBox::Info : OSQLMessageBox::Error; - ScopedVclPtrInstance< OSQLMessageBox > aMsg( this, OUString( ModuleRes( nMessage ) ), OUString(), WB_OK | WB_DEF_OK, mt ); + ScopedVclPtrInstance aMsg(this, DBA_RES(pMessage), OUString(), WB_OK | WB_DEF_OK, mt); aMsg->Execute(); } @@ -675,8 +677,8 @@ using namespace ::com::sun::star; #else (void) bSuccess; #endif - sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS; - ScopedVclPtrInstance< OSQLMessageBox > aMsg( this, OUString( ModuleRes( nMessage ) ), OUString() ); + const char* pMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS; + ScopedVclPtrInstance aMsg(this, DBA_RES(pMessage), OUString()); aMsg->Execute(); } diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index 6c64ee8bd664..4dc43616001f 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -133,10 +133,10 @@ namespace dbaui OGeneralSpecialJDBCConnectionPageSetup( vcl::Window* pParent , const SfxItemSet& _rCoreAttrs , sal_uInt16 _nPortId - , sal_uInt16 _nDefaultPortResId - , sal_uInt16 _nHelpTextResId - , sal_uInt16 _nHeaderTextResId - , sal_uInt16 _nDriverClassId ); + , const char* pDefaultPortResId + , const char* pHelpTextResId + , const char* pHeaderTextResId + , const char* pDriverClassId ); virtual ~OGeneralSpecialJDBCConnectionPageSetup() override; virtual void dispose() override; static VclPtr CreateMySQLJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 848f07bbfaeb..7ef15fe23176 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -28,11 +28,14 @@ #include "DriverSettings.hxx" #include "IItemSetHelper.hxx" #include "UITools.hxx" -#include "dbu_dlg.hrc" -#include "dbustrings.hrc" +#include "core_resource.hxx" +#include "dbu_dlg.hxx" +#include "stringconstants.hxx" +#include "strings.hrc" +#include "strings.hxx" #include "dsitems.hxx" #include "dsnItem.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "optionalboolitem.hxx" #include "propertysetitem.hxx" #include "stringlistitem.hxx" @@ -245,7 +248,7 @@ bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< PropertyVal } OUString sName = pName ? pName->GetValue() : OUString(); - OUString sLoginRequest(ModuleRes(STR_ENTER_CONNECTION_PASSWORD)); + OUString sLoginRequest(DBA_RES(STR_ENTER_CONNECTION_PASSWORD)); OUString sTemp = sName; sName = ::dbaui::getStrippedDatabaseName(nullptr,sTemp); if ( !sName.isEmpty() ) @@ -381,7 +384,7 @@ Reference< XDriver > ODbDataSourceAdministrationHelper::getDriver(const OUString // get the global DriverManager Reference< XConnectionPool > xDriverManager; - OUString sCurrentActionError = ModuleRes(STR_COULDNOTCREATE_DRIVERMANAGER); + OUString sCurrentActionError = DBA_RES(STR_COULDNOTCREATE_DRIVERMANAGER); sCurrentActionError = sCurrentActionError.replaceFirst("#servicename#", "com.sun.star.sdbc.ConnectionPool"); try @@ -398,7 +401,7 @@ Reference< XDriver > ODbDataSourceAdministrationHelper::getDriver(const OUString Reference< XDriver > xDriver = xDriverManager->getDriverByURL(_sURL); if (!xDriver.is()) { - sCurrentActionError = ModuleRes(STR_NOREGISTEREDDRIVER); + sCurrentActionError = DBA_RES(STR_NOREGISTEREDDRIVER); sCurrentActionError = sCurrentActionError.replaceFirst("#connurl#", _sURL); // will be caught and translated into an SQLContext exception throw SQLException(sCurrentActionError, getORB(), "S1000", 0, Any()); diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx index de032266f634..398a3926566b 100644 --- a/dbaccess/source/ui/dlg/RelationDlg.cxx +++ b/dbaccess/source/ui/dlg/RelationDlg.cxx @@ -22,7 +22,7 @@ #include #include -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" #include "dbaccess_helpid.hrc" #include diff --git a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx index 8c36806c5e24..c22b06489fff 100644 --- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx +++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx @@ -26,7 +26,7 @@ #include "propertysetitem.hxx" -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" namespace dbaui { diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index 67a8ce11f480..80b7833ea4c3 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -19,11 +19,14 @@ #include -#include "moduledbu.hxx" +#include "core_resource.hxx" +#include "core_resource.hxx" #include "TextConnectionHelper.hxx" #include "sqlmessage.hxx" -#include "dbu_dlg.hrc" -#include "dbu_resource.hrc" +#include "dbu_dlg.hxx" +#include "strings.hrc" +#include "strings.hxx" +#include "dbu_pageids.hxx" #include #include #include @@ -57,9 +60,9 @@ namespace dbaui OTextConnectionHelper::OTextConnectionHelper( vcl::Window* pParent, const short _nAvailableSections ) :TabPage(pParent, "TextPage", "dbaccess/ui/textpage.ui") - ,m_aFieldSeparatorList (ModuleRes(STR_AUTOFIELDSEPARATORLIST)) - ,m_aTextSeparatorList (ModuleRes(STR_AUTOTEXTSEPARATORLIST)) - ,m_aTextNone (ModuleRes(STR_AUTOTEXT_FIELD_SEP_NONE)) + ,m_aFieldSeparatorList (DBA_RES(STR_AUTOFIELDSEPARATORLIST)) + ,m_aTextSeparatorList (STR_AUTOTEXTSEPARATORLIST) + ,m_aTextNone (DBA_RES(STR_AUTOTEXT_FIELD_SEP_NONE)) ,m_nAvailableSections( _nAvailableSections ) { get(m_pExtensionHeader, "extensionheader"); @@ -248,61 +251,61 @@ namespace dbaui OUString aDelText(m_pFieldSeparator->GetText()); if(aDelText.isEmpty()) { // No FieldSeparator - aErrorText = ModuleRes(STR_AUTODELIMITER_MISSING); + aErrorText = DBA_RES(STR_AUTODELIMITER_MISSING); aErrorText = aErrorText.replaceFirst("#1",m_pFieldSeparatorLabel->GetText()); pErrorWin = m_pFieldSeparator; } else if (m_pDecimalSeparator->GetText().isEmpty()) { // No DecimalSeparator - aErrorText = ModuleRes(STR_AUTODELIMITER_MISSING); + aErrorText = DBA_RES(STR_AUTODELIMITER_MISSING); aErrorText = aErrorText.replaceFirst("#1",m_pDecimalSeparatorLabel->GetText()); pErrorWin = m_pDecimalSeparator; } else if (m_pTextSeparator->GetText() == m_pFieldSeparator->GetText()) { // Field and TextSeparator must not be the same - aErrorText = ModuleRes(STR_AUTODELIMITER_MUST_DIFFER); + aErrorText = DBA_RES(STR_AUTODELIMITER_MUST_DIFFER); aErrorText = aErrorText.replaceFirst("#1",m_pTextSeparatorLabel->GetText()); aErrorText = aErrorText.replaceFirst("#2",m_pFieldSeparatorLabel->GetText()); pErrorWin = m_pTextSeparator; } else if (m_pDecimalSeparator->GetText() == m_pThousandsSeparator->GetText()) { // Thousands and DecimalSeparator must not be the same - aErrorText = ModuleRes(STR_AUTODELIMITER_MUST_DIFFER); + aErrorText = DBA_RES(STR_AUTODELIMITER_MUST_DIFFER); aErrorText = aErrorText.replaceFirst("#1",m_pDecimalSeparatorLabel->GetText()); aErrorText = aErrorText.replaceFirst("#2",m_pThousandsSeparatorLabel->GetText()); pErrorWin = m_pDecimalSeparator; } else if (m_pFieldSeparator->GetText() == m_pThousandsSeparator->GetText()) { // Thousands and FieldSeparator must not be the same - aErrorText = ModuleRes(STR_AUTODELIMITER_MUST_DIFFER); + aErrorText = DBA_RES(STR_AUTODELIMITER_MUST_DIFFER); aErrorText = aErrorText.replaceFirst("#1",m_pFieldSeparatorLabel->GetText()); aErrorText = aErrorText.replaceFirst("#2",m_pThousandsSeparatorLabel->GetText()); pErrorWin = m_pFieldSeparator; } else if (m_pFieldSeparator->GetText() == m_pDecimalSeparator->GetText()) { // Tenner and FieldSeparator must not be the same - aErrorText = ModuleRes(STR_AUTODELIMITER_MUST_DIFFER); + aErrorText = DBA_RES(STR_AUTODELIMITER_MUST_DIFFER); aErrorText = aErrorText.replaceFirst("#1",m_pFieldSeparatorLabel->GetText()); aErrorText = aErrorText.replaceFirst("#2",m_pDecimalSeparatorLabel->GetText()); pErrorWin = m_pFieldSeparator; } else if (m_pTextSeparator->GetText() == m_pThousandsSeparator->GetText()) { // Thousands and TextSeparator must not be the same - aErrorText = ModuleRes(STR_AUTODELIMITER_MUST_DIFFER); + aErrorText = DBA_RES(STR_AUTODELIMITER_MUST_DIFFER); aErrorText = aErrorText.replaceFirst("#1",m_pTextSeparatorLabel->GetText()); aErrorText = aErrorText.replaceFirst("#2",m_pThousandsSeparatorLabel->GetText()); pErrorWin = m_pTextSeparator; } else if (m_pTextSeparator->GetText() == m_pDecimalSeparator->GetText()) { // Tenner and TextSeparator must not be the same - aErrorText = ModuleRes(STR_AUTODELIMITER_MUST_DIFFER); + aErrorText = DBA_RES(STR_AUTODELIMITER_MUST_DIFFER); aErrorText = aErrorText.replaceFirst("#1",m_pTextSeparatorLabel->GetText()); aErrorText = aErrorText.replaceFirst("#2",m_pDecimalSeparatorLabel->GetText()); pErrorWin = m_pTextSeparator; } else if ((sExtension.indexOf('*') != -1) || (sExtension.indexOf('?') != -1)) { - aErrorText = ModuleRes(STR_AUTONO_WILDCARDS); + aErrorText = DBA_RES(STR_AUTONO_WILDCARDS); aErrorText = aErrorText.replaceFirst("#1",sExtension); pErrorWin = m_pOwnExtension; } diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index 0ebc917a1db7..62d4c3e31edc 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -19,7 +19,7 @@ #include "UserAdmin.hxx" #include "UITools.hxx" -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" #include #include #include @@ -32,9 +32,12 @@ #include #include #include -#include "dbustrings.hrc" +#include "stringconstants.hxx" +#include "strings.hrc" +#include "strings.hxx" +#include "core_resource.hxx" #include "dbadmin.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include #include @@ -100,7 +103,7 @@ IMPL_LINK_NOARG(OPasswordDialog, OKHdl_Impl, Button*, void) EndDialog( RET_OK ); else { - OUString aErrorMsg( ModuleRes( STR_ERROR_PASSWORDS_NOT_IDENTICAL)); + OUString aErrorMsg( DBA_RES( STR_ERROR_PASSWORDS_NOT_IDENTICAL)); ScopedVclPtrInstance< MessageDialog > aErrorBox(this, aErrorMsg); aErrorBox->Execute(); m_pEDPassword->SetText( OUString() ); @@ -256,7 +259,7 @@ IMPL_LINK( OUserAdmin, UserHdl, Button *, pButton, void ) Reference xDrop(m_xUsers,UNO_QUERY); if(xDrop.is()) { - ScopedVclPtrInstance< MessageDialog > aQry(this, ModuleRes(STR_QUERY_USERADMIN_DELETE_USER), VclMessageType::Question, VclButtonsType::YesNo); + ScopedVclPtrInstance< MessageDialog > aQry(this, DBA_RES(STR_QUERY_USERADMIN_DELETE_USER), VclMessageType::Question, VclButtonsType::YesNo); if(aQry->Execute() == RET_YES) xDrop->dropByName(GetUser()); } diff --git a/dbaccess/source/ui/dlg/UserAdmin.src b/dbaccess/source/ui/dlg/UserAdmin.src deleted file mode 100644 index a5a3695b053c..000000000000 --- a/dbaccess/source/ui/dlg/UserAdmin.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 "dbu_dlg.hrc" -#include "dbaccess_helpid.hrc" - -String STR_QUERY_USERADMIN_DELETE_USER -{ - Text[ en-US ] = "Do you really want to delete the user?"; -}; - -String STR_USERADMIN_NOT_AVAILABLE -{ - Text [ en-US ] = "The database does not support user administration." ; -}; - -String STR_ERROR_PASSWORDS_NOT_IDENTICAL -{ - Text [ en-US ] = "The passwords do not match. Please enter the password again."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx index 9e5b19611f16..e09ad9360c3c 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx +++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx @@ -17,9 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "core_resource.hxx" #include "adminpages.hxx" #include "DbAdminImpl.hxx" -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" +#include "strings.hrc" #include "DriverSettings.hxx" #include "dsitems.hxx" #include "propertysetitem.hxx" @@ -101,8 +103,8 @@ namespace dbaui ::dbtools::DatabaseMetaData aMetaData( createConnection().first ); if ( !aMetaData.supportsUserAdministration( getORB() ) ) { - OUString sError(ModuleRes(STR_USERADMIN_NOT_AVAILABLE)); - throw SQLException(sError,nullptr, "S1000" ,0,Any()); + OUString sError(DBA_RES(STR_USERADMIN_NOT_AVAILABLE)); + throw SQLException(sError, nullptr, "S1000", 0, Any()); } } catch(const SQLException&) diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx index 082d45b810e7..d6d4b1b091f6 100644 --- a/dbaccess/source/ui/dlg/admincontrols.cxx +++ b/dbaccess/source/ui/dlg/admincontrols.cxx @@ -18,9 +18,9 @@ */ #include "admincontrols.hxx" -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" #include "dsitems.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include #include diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index ec0ab9518dc9..f13a88ff9f9b 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -18,15 +18,17 @@ */ #include "adminpages.hxx" +#include "core_resource.hxx" #include "dbadmin.hxx" -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" +#include "strings.hrc" #include #include #include -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include "dsitems.hxx" #include "dsselect.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "odbcconfig.hxx" #include "optionalboolitem.hxx" #include "sqlmessage.hxx" @@ -126,7 +128,7 @@ namespace dbaui if (!aEnumeration.isLoaded()) { // show an error message - OUString sError( ModuleRes( STR_COULD_NOT_LOAD_ODBC_LIB ) ); + OUString sError(DBA_RES(STR_COULD_NOT_LOAD_ODBC_LIB)); sError = sError.replaceFirst("#lib#", aEnumeration.getLibraryName()); ScopedVclPtrInstance< MessageDialog > aDialog(this, sError); aDialog->Execute(); @@ -252,15 +254,15 @@ namespace dbaui { OSQLMessageBox::MessageType eImage = OSQLMessageBox::Info; OUString aMessage,sTitle; - sTitle = ModuleRes(STR_CONNECTION_TEST); + sTitle = DBA_RES(STR_CONNECTION_TEST); if ( bSuccess ) { - aMessage = ModuleRes(STR_CONNECTION_SUCCESS); + aMessage = DBA_RES(STR_CONNECTION_SUCCESS); } else { eImage = OSQLMessageBox::Error; - aMessage = ModuleRes(STR_CONNECTION_NO_SUCCESS); + aMessage = DBA_RES(STR_CONNECTION_NO_SUCCESS); } ScopedVclPtrInstance< OSQLMessageBox > aMsg( this, sTitle, aMessage, WB_OK, eImage ); aMsg->Execute(); diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index 8415d002f48e..76b7d7e117cc 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -21,9 +21,11 @@ #include "sqlmessage.hxx" #include #include +#include "core_resource.hxx" #include "dbaccess_helpid.hrc" -#include "dbu_resource.hrc" -#include "dbu_dlg.hrc" +#include "dbu_pageids.hxx" +#include "dbu_dlg.hxx" +#include "strings.hrc" #include #include "QueryTableView.hxx" #include "QueryDesignView.hxx" @@ -464,9 +466,9 @@ OUString OAddTableDlg::getDialogTitleForContext( IAddTableDialogContext& _rConte OUString sTitle; if ( _rContext.allowQueries() ) - sTitle = ModuleRes( STR_ADD_TABLE_OR_QUERY ); + sTitle = DBA_RES( STR_ADD_TABLE_OR_QUERY ); else - sTitle = ModuleRes( STR_ADD_TABLES ); + sTitle = DBA_RES( STR_ADD_TABLES ); return sTitle; } diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index 4e741c7b8d42..6b9a5d7371b6 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -23,13 +23,13 @@ #include "advancedsettings.hxx" #include "advancedsettingsdlg.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "dsitems.hxx" #include "DbAdminImpl.hxx" #include "DriverSettings.hxx" #include "optionalboolitem.hxx" -#include "dbu_resource.hrc" -#include "dbu_dlg.hrc" +#include "dbu_pageids.hxx" +#include "dbu_dlg.hxx" #include #include diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index 209bb50a5c72..016f973c10a5 100644 --- a/dbaccess/source/ui/dlg/dbadmin.cxx +++ b/dbaccess/source/ui/dlg/dbadmin.cxx @@ -22,14 +22,16 @@ #include "DriverSettings.hxx" #include "adminpages.hxx" #include "dbadmin.hxx" -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" #include #include #include -#include "dbustrings.hrc" +#include "core_resource.hxx" +#include "stringconstants.hxx" +#include "strings.hrc" #include "dsitems.hxx" #include "dsnItem.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "optionalboolitem.hxx" #include "propertysetitem.hxx" #include "stringlistitem.hxx" @@ -96,9 +98,9 @@ void ODbAdminDialog::PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) SfxTabDialog::PageCreated(_nId, _rPage); } -void ODbAdminDialog::addDetailPage(sal_uInt16 _nPageId, sal_uInt16 _nTextId, CreateTabPage _pCreateFunc) +void ODbAdminDialog::addDetailPage(sal_uInt16 _nPageId, const char* pTextId, CreateTabPage _pCreateFunc) { - AddTabPage(_nPageId, OUString(ModuleRes(_nTextId)), _pCreateFunc, nullptr); + AddTabPage(_nPageId, DBA_RES(pTextId), _pCreateFunc, nullptr); m_aCurrentDetailPages.push(_nPageId); } @@ -157,7 +159,7 @@ void ODbAdminDialog::impl_selectDataSource(const css::uno::Any& _aDataSourceName case ::dbaccess::DST_USERDEFINE9: case ::dbaccess::DST_USERDEFINE10: { - OUString aTitle(ModuleRes(STR_PAGETITLE_ADVANCED)); + OUString aTitle(DBA_RES(STR_PAGETITLE_ADVANCED)); AddTabPage(PAGE_USERDRIVER, aTitle, ODriversSettings::CreateUser, nullptr, 1); m_aCurrentDetailPages.push(PAGE_USERDRIVER); } @@ -203,7 +205,7 @@ void ODbAdminDialog::impl_resetPages(const Reference< XPropertySet >& _rxDatasou ::dbaccess::ODsnTypeCollection* pCollection = rCollectionItem.getCollection(); if ( pCollection->determineType(getDatasourceType( *m_pExampleSet )) == ::dbaccess::DST_MYSQL_NATIVE ) { - AddTabPage( PAGE_MYSQL_NATIVE, OUString( ModuleRes( STR_PAGETITLE_CONNECTION ) ), ODriversSettings::CreateMySQLNATIVE, nullptr ); + AddTabPage( PAGE_MYSQL_NATIVE, DBA_RES(STR_PAGETITLE_CONNECTION), ODriversSettings::CreateMySQLNATIVE, nullptr ); RemoveTabPage("advanced"); m_nMainPageID = PAGE_MYSQL_NATIVE; } diff --git a/dbaccess/source/ui/dlg/dbadmin.src b/dbaccess/source/ui/dlg/dbadmin.src deleted file mode 100644 index 9762e7271348..000000000000 --- a/dbaccess/source/ui/dlg/dbadmin.src +++ /dev/null @@ -1,80 +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 "dbaccess_helpid.hrc" -#include "dbu_dlg.hrc" -#include "browserids.hxx" - -String STR_DATABASE_TYPE_CHANGE -{ - Text [ en-US ] = "Database properties" ; -}; - -String STR_PARENTTITLE_GENERAL -{ - Text [ en-US ] = "Data Source Properties: #" ; -}; - -String STR_ERR_USE_CONNECT_TO -{ - Text [ en-US ] = "Please choose 'Connect to an existing database' to connect to an existing database instead."; -}; - -String STR_COULD_NOT_LOAD_ODBC_LIB -{ - Text [ en-US ] = "Could not load the program library #lib# or it is corrupted. The ODBC data source selection is not available."; -}; - -String STR_UNSUPPORTED_DATASOURCE_TYPE -{ - Text [ en-US ] = "This kind of data source is not supported on this platform.\nYou are allowed to change the settings, but you probably will not be able to connect to the database."; -}; - -String STR_AUTOTEXT_FIELD_SEP_NONE -{ - Text[ en-US ] = "{None}"; -}; - -String STR_AUTOTEXTSEPARATORLIST -{ - Text = "\"\t34\t'\t39" ; -}; - -String STR_AUTOFIELDSEPARATORLIST -{ - Text [ x-comment ] = "EM Dec 2002: 'Space' refers to what you get when you hit the space bar on your keyboard."; - Text [ en-US ] = ";\t59\t,\t44\t:\t58\t{Tab}\t9\t{Space}\t32" ; -}; - -String STR_AUTODELIMITER_MISSING -{ - Text[ en-US ] = "#1 must be set." ; -}; - -String STR_AUTODELIMITER_MUST_DIFFER -{ - Text[ en-US ] = "#1 and #2 must be different." ; -}; - -String STR_AUTONO_WILDCARDS -{ - Text[ en-US ] = "Wildcards such as ?,* are not allowed in #1." ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dbadmin2.src b/dbaccess/source/ui/dlg/dbadmin2.src deleted file mode 100644 index 4d09f3b74f0f..000000000000 --- a/dbaccess/source/ui/dlg/dbadmin2.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 "dbaccess_helpid.hrc" -#include "dbu_dlg.hrc" -#include "browserids.hxx" - -String STR_ENTER_CONNECTION_PASSWORD -{ - Text [ en-US ] = "A password is needed to connect to the data source \"$name$\"."; -}; - -String STR_ASK_FOR_DIRECTORY_CREATION -{ - Text [ en-US ] = "The directory\n\n$path$\n\ndoes not exist. Should it be created?"; -}; - -String STR_COULD_NOT_CREATE_DIRECTORY -{ - Text [ en-US ] = "The directory $name$ could not be created."; -}; - -String STR_ALREADYEXISTOVERWRITE -{ - Text [ en-US ] = "The file already exists. Overwrite?" ; -}; - -String STR_NEW_FOLDER -{ - Text [ en-US ] = "Folder" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dbadminsetup.src b/dbaccess/source/ui/dlg/dbadminsetup.src deleted file mode 100644 index a4903c5dc4d1..000000000000 --- a/dbaccess/source/ui/dlg/dbadminsetup.src +++ /dev/null @@ -1,218 +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 "dbu_dlg.hrc" - -String STR_DBWIZARDTITLE -{ - Text[ en-US ] = "Database Wizard" ; -}; - -String STR_PAGETITLE_INTROPAGE -{ - Text[ en-US ] = "Select database" ; -}; - -String STR_PAGETITLE_DBASE -{ - Text[ en-US ] = "Set up dBASE connection" ; -}; - -String STR_PAGETITLE_TEXT -{ - Text[ en-US ] = "Set up a connection to text files" ; -}; - -String STR_PAGETITLE_MSACCESS -{ - Text[ en-US ] = "Set up Microsoft Access connection" ; -}; - -String STR_PAGETITLE_LDAP -{ - Text[ en-US ] = "Set up LDAP connection" ; -}; - -String STR_PAGETITLE_ADO -{ - Text[ en-US ] = "Set up ADO connection" ; -}; - -String STR_PAGETITLE_JDBC -{ - Text[ en-US ] = "Set up JDBC connection" ; -}; - -String STR_PAGETITLE_ORACLE -{ - Text[ en-US ] = "Set up Oracle database connection" ; -}; - -String STR_PAGETITLE_MYSQL -{ - Text[ en-US ] = "Set up MySQL connection" ; -}; - -String STR_PAGETITLE_ODBC -{ - Text[ en-US ] = "Set up ODBC connection" ; -}; - -String STR_PAGETITLE_DOCUMENT_OR_SPREADSHEET -{ - Text[ en-US ] = "Set up Writer Document or Spreadsheet connection" ; -}; - -String STR_PAGETITLE_AUTHENTIFICATION -{ - Text[ en-US ] = "Set up user authentication" ; -}; - -String STR_PAGETITLE_MYSQL_NATIVE -{ - Text [ en-US ] = "Set up MySQL server data"; -}; - -String STR_PAGETITLE_FINAL -{ - Text[ en-US ] = "Save and proceed" ; -}; - -String STR_DATABASEDEFAULTNAME -{ - Text[ en-US ] = "New Database" ; -}; - - -String STR_MYSQLJDBC_HEADERTEXT -{ - Text[ en-US ] = "Set up connection to a MySQL database using JDBC" ; -}; - -String STR_MYSQLJDBC_HELPTEXT -{ - Text[ en-US ] = "Please enter the required information to connect to a MySQL database using JDBC. Note that a JDBC driver class must be installed on your system and registered with %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings."; -}; - -String STR_MYSQL_DRIVERCLASSTEXT -{ - Text [ en-US ] = "MySQL JDBC d~river class:"; -}; - -String STR_MYSQL_DEFAULT -{ - Text[ en-US ] = "Default: 3306"; -}; - -String STR_DBASE_HEADERTEXT -{ - Text[ en-US ] = "Set up a connection to dBASE files" ; -}; - -String STR_DBASE_HELPTEXT -{ - Text[ en-US ] = "Select the folder where the dBASE files are stored." ; -}; - -String STR_TEXT_HEADERTEXT -{ - Text[ en-US ] = "Set up a connection to text files" ; -}; - -String STR_TEXT_HELPTEXT -{ - Text[ en-US ] = "Select the folder where the CSV (Comma Separated Values) text files are stored. %PRODUCTNAME Base will open these files in read-only mode." ; -}; - -String STR_TEXT_PATH_OR_FILE -{ - Text[ en-US ] = "Path to text files"; -}; - -String STR_MSACCESS_HEADERTEXT -{ - Text[ en-US ] = "Set up a connection to a Microsoft Access database" ; -}; - -String STR_MSACCESS_HELPTEXT -{ - Text[ en-US ] = "Please select the Microsoft Access file you want to access."; -}; - -String STR_ADO_HEADERTEXT -{ - Text[ en-US ] = "Set up a connection to an ADO database" ; -}; - -String STR_ADO_HELPTEXT -{ - Text[ en-US ] = "Please enter the URL of the ADO data source you want to connect to.\nClick 'Browse' to configure provider-specific settings.\nPlease contact your system administrator if you are unsure about the following settings." ; -}; - -String STR_ODBC_HEADERTEXT -{ - Text[ en-US ] = "Set up a connection to an ODBC database" ; -}; - -String STR_ODBC_HELPTEXT{ - Text[ en-US ] = "Enter the name of the ODBC database you want to connect to.\nClick 'Browse...' to select an ODBC database that is already registered in %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings." ; -}; - -String STR_JDBC_HEADERTEXT -{ - Text[ en-US ] = "Set up a connection to a JDBC database" ; -}; - -String STR_JDBC_HELPTEXT{ - Text[ en-US ] = "Please enter the required information to connect to a JDBC database.\nPlease contact your system administrator if you are unsure about the following settings." ; -}; - -String STR_ORACLE_HEADERTEXT -{ - Text[ en-US ] = "Set up a connection to an Oracle database"; -}; - -String STR_ORACLE_DEFAULT -{ - Text[ en-US ] = "Default: 1521" ; -}; - -String STR_ORACLE_DRIVERCLASSTEXT -{ - Text [ en-US ] = "Oracle JDBC ~driver class"; -}; - -String STR_ORACLE_HELPTEXT{ - Text[ en-US ] = "Please enter the required information to connect to an Oracle database. Note that a JDBC Driver Class must be installed on your system and registered with %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings." ; -}; - -String STR_SPREADSHEET_HEADERTEXT -{ - Text[ en-US ] = "Set up a connection to spreadsheets"; -}; - -String STR_SPREADSHEET_HELPTEXT{ - Text[ en-US ] = "Click 'Browse...' to select a %PRODUCTNAME spreadsheet or Microsoft Excel workbook.\n%PRODUCTNAME will open this file in read-only mode." ; -}; - -String STR_SPREADSHEETPATH{ - Text[ en-US ] = "~Location and file name" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index 9754342c4bff..7e909b93176e 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -22,8 +22,8 @@ #include #include #include -#include "moduledbu.hxx" -#include "dbu_dlg.hrc" +#include "core_resource.hxx" +#include "dbu_dlg.hxx" #include #include #include diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index f9fabf950e11..20d103cce4ab 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -17,15 +17,18 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "core_resource.hxx" #include "dbwiz.hxx" -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" +#include "strings.hrc" +#include "strings.hxx" #include "dsitems.hxx" #include "dsnItem.hxx" #include #include #include #include -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include "adminpages.hxx" #include "generalpage.hxx" #include "stringlistitem.hxx" @@ -92,7 +95,7 @@ ODbTypeWizDialog::ODbTypeWizDialog(vcl::Window* _pParent m_pCollection = rCollectionItem.getCollection(); ActivatePage(); - setTitleBase(ModuleRes(STR_DATABASE_TYPE_CHANGE)); + setTitleBase(DBA_RES(STR_DATABASE_TYPE_CHANGE)); } ODbTypeWizDialog::~ODbTypeWizDialog() @@ -230,7 +233,7 @@ void ODbTypeWizDialog::clearPassword() VclPtr ODbTypeWizDialog::createPage(WizardState _nState) { - sal_uInt16 nStringId = STR_PAGETITLE_ADVANCED; + const char* pStringId = STR_PAGETITLE_ADVANCED; VclPtr pPage; switch(_nState) { @@ -239,12 +242,12 @@ VclPtr ODbTypeWizDialog::createPage(WizardState _nState) pPage = VclPtr::Create(this,*m_pOutSet); OGeneralPage* pGeneralPage = static_cast< OGeneralPage* >( pPage.get() ); pGeneralPage->SetTypeSelectHandler( LINK( this, ODbTypeWizDialog, OnTypeSelected)); - nStringId = STR_PAGETITLE_GENERAL; + pStringId = STR_PAGETITLE_GENERAL; } break; case CONNECTION_PAGE: pPage = OConnectionTabPage::Create(this,m_pOutSet); - nStringId = STR_PAGETITLE_CONNECTION; + pStringId = STR_PAGETITLE_CONNECTION; break; case ADDITIONAL_PAGE_DBASE: @@ -287,7 +290,7 @@ VclPtr ODbTypeWizDialog::createPage(WizardState _nState) { static_cast(pPage.get())->SetServiceFactory( m_pImpl->getORB() ); static_cast(pPage.get())->SetAdminDialog(this,this); - pPage->SetText(ModuleRes(nStringId)); + pPage->SetText(DBA_RES(pStringId)); defaultButton( _nState == START_PAGE ? WizardButtonFlags::NEXT : WizardButtonFlags::FINISH ); enableButtons( WizardButtonFlags::FINISH, _nState != START_PAGE); pPage->Show(); diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index deb931d51327..20b4c4575ada 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -17,10 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "core_resource.hxx" #include "dbwizsetup.hxx" #include "dsmeta.hxx" #include "DBSetupConnectionPages.hxx" -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" +#include "strings.hrc" +#include "strings.hxx" #include "dsitems.hxx" #include "dsnItem.hxx" @@ -29,7 +32,7 @@ #include #include #include -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include "adminpages.hxx" #include #include @@ -109,20 +112,20 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(vcl::Window* _pParent , m_pOutSet(nullptr) , m_bIsConnectable( false) - , m_sRM_IntroText( ModuleRes( STR_PAGETITLE_INTROPAGE ) ) - , m_sRM_dBaseText( ModuleRes( STR_PAGETITLE_DBASE ) ) - , m_sRM_TextText( ModuleRes( STR_PAGETITLE_TEXT ) ) - , m_sRM_MSAccessText( ModuleRes( STR_PAGETITLE_MSACCESS ) ) - , m_sRM_LDAPText( ModuleRes( STR_PAGETITLE_LDAP ) ) - , m_sRM_ADOText( ModuleRes( STR_PAGETITLE_ADO ) ) - , m_sRM_JDBCText( ModuleRes( STR_PAGETITLE_JDBC ) ) - , m_sRM_MySQLNativePageTitle( ModuleRes( STR_PAGETITLE_MYSQL_NATIVE ) ) - , m_sRM_OracleText( ModuleRes( STR_PAGETITLE_ORACLE ) ) - , m_sRM_MySQLText( ModuleRes( STR_PAGETITLE_MYSQL ) ) - , m_sRM_ODBCText( ModuleRes( STR_PAGETITLE_ODBC ) ) - , m_sRM_DocumentOrSpreadSheetText( ModuleRes( STR_PAGETITLE_DOCUMENT_OR_SPREADSHEET ) ) - , m_sRM_AuthentificationText( ModuleRes( STR_PAGETITLE_AUTHENTIFICATION ) ) - , m_sRM_FinalText( ModuleRes( STR_PAGETITLE_FINAL ) ) + , m_sRM_IntroText( DBA_RES( STR_PAGETITLE_INTROPAGE ) ) + , m_sRM_dBaseText( DBA_RES( STR_PAGETITLE_DBASE ) ) + , m_sRM_TextText( DBA_RES( STR_PAGETITLE_TEXT ) ) + , m_sRM_MSAccessText( DBA_RES( STR_PAGETITLE_MSACCESS ) ) + , m_sRM_LDAPText( DBA_RES( STR_PAGETITLE_LDAP ) ) + , m_sRM_ADOText( DBA_RES( STR_PAGETITLE_ADO ) ) + , m_sRM_JDBCText( DBA_RES( STR_PAGETITLE_JDBC ) ) + , m_sRM_MySQLNativePageTitle( DBA_RES( STR_PAGETITLE_MYSQL_NATIVE ) ) + , m_sRM_OracleText( DBA_RES( STR_PAGETITLE_ORACLE ) ) + , m_sRM_MySQLText( DBA_RES( STR_PAGETITLE_MYSQL ) ) + , m_sRM_ODBCText( DBA_RES( STR_PAGETITLE_ODBC ) ) + , m_sRM_DocumentOrSpreadSheetText( DBA_RES( STR_PAGETITLE_DOCUMENT_OR_SPREADSHEET ) ) + , m_sRM_AuthentificationText( DBA_RES( STR_PAGETITLE_AUTHENTIFICATION ) ) + , m_sRM_FinalText( DBA_RES( STR_PAGETITLE_FINAL ) ) , m_sWorkPath( SvtPathOptions().GetWorkPath() ) , m_pGeneralPage( nullptr ) , m_pMySQLIntroPage( nullptr ) @@ -173,7 +176,7 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(vcl::Window* _pParent m_pFinish->SetHelpId(HID_DBWIZ_FINISH); SetRoadmapInteractive( true ); ActivatePage(); - setTitleBase(ModuleRes(STR_DBWIZARDTITLE)); + setTitleBase(DBA_RES(STR_DBWIZARDTITLE)); } void ODbTypeWizDialogSetup::declareAuthDepPath( const OUString& _sURL, PathId _nPathId, const svt::RoadmapWizardTypes::WizardPath& _rPaths) @@ -247,7 +250,7 @@ OUString ODbTypeWizDialogSetup::getStateDisplayName( WizardState _nState ) const sRoadmapItem = m_sRM_AuthentificationText; break; case PAGE_DBSETUPWIZARD_USERDEFINED: - sRoadmapItem = ModuleRes(STR_PAGETITLE_CONNECTION); + sRoadmapItem = DBA_RES(STR_PAGETITLE_CONNECTION); break; case PAGE_DBSETUPWIZARD_FINAL: sRoadmapItem = m_sRM_FinalText; @@ -793,7 +796,7 @@ bool ODbTypeWizDialogSetup::SaveDatabaseDocument() INetURLObject aWorkURL( m_sWorkPath ); aFileDlg.SetDisplayFolder( aWorkURL.GetMainURL( INetURLObject::DecodeMechanism::NONE )); - OUString sDefaultName = ModuleRes( STR_DATABASEDEFAULTNAME ); + OUString sDefaultName = DBA_RES( STR_DATABASEDEFAULTNAME ); OUString sExtension = pFilter->GetDefaultExtension(); sDefaultName += sExtension.replaceAt( 0, 1, OUString() ); aWorkURL.Append( sDefaultName ); diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index 6cdc6efde692..47620a341e5d 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -18,6 +18,7 @@ */ #include +#include "core_resource.hxx" #include "detailpages.hxx" #include "sqlmessage.hxx" #include "dsmeta.hxx" @@ -26,10 +27,11 @@ #include "dsitems.hxx" #include "dbfindex.hxx" #include "dsnItem.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "dbaccess_helpid.hrc" -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" +#include "strings.hrc" #include #include @@ -540,9 +542,9 @@ namespace dbaui { } #endif - const sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS; + const char* pMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS; const OSQLMessageBox::MessageType mt = bSuccess ? OSQLMessageBox::Info : OSQLMessageBox::Error; - ScopedVclPtrInstance< OSQLMessageBox > aMsg( this, OUString( ModuleRes( nMessage ) ), OUString(), WB_OK | WB_DEF_OK, mt ); + ScopedVclPtrInstance aMsg(this, DBA_RES(pMessage), OUString(), WB_OK | WB_DEF_OK, mt); aMsg->Execute(); } void OGeneralSpecialJDBCDetailsPage::callModifiedHdl(void* pControl) diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index 72d9cc276b55..ceaee42f1f62 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -17,8 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "core_resource.hxx" #include "directsql.hxx" -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" +#include "strings.hrc" #include #include #include @@ -105,7 +107,7 @@ namespace dbaui "DirectSQLDialog::_disposing: where does this come from?"); { - OUString sMessage(ModuleRes(STR_DIRECTSQL_CONNECTIONLOST)); + OUString sMessage(DBA_RES(STR_DIRECTSQL_CONNECTIONLOST)); ScopedVclPtrInstance< MessageDialog > aError(this, sMessage); aError->Execute(); } @@ -228,7 +230,7 @@ namespace dbaui } // successful - sStatus = ModuleRes(STR_COMMAND_EXECUTED_SUCCESSFULLY); + sStatus = DBA_RES(STR_COMMAND_EXECUTED_SUCCESSFULLY); // dispose the statement ::comphelper::disposeComponent(xStatement); diff --git a/dbaccess/source/ui/dlg/directsql.src b/dbaccess/source/ui/dlg/directsql.src deleted file mode 100644 index 8bb0ed1633c0..000000000000 --- a/dbaccess/source/ui/dlg/directsql.src +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "dbu_dlg.hrc" - -String STR_COMMAND_EXECUTED_SUCCESSFULLY -{ - Text [ en-US ] = "Command successfully executed." ; -}; - -String STR_DIRECTSQL_CONNECTIONLOST -{ - Text [ en-US ] = "The connection to the database has been lost. This dialog will be closed."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx index af6113372c5b..b72eabe3c239 100644 --- a/dbaccess/source/ui/dlg/dlgattr.cxx +++ b/dbaccess/source/ui/dlg/dlgattr.cxx @@ -24,13 +24,13 @@ #include #include -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" #include #include #include #include #include -#include "moduledbu.hxx" +#include "core_resource.hxx" using namespace dbaui; diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx index 680766a3006a..ec7ab3babded 100644 --- a/dbaccess/source/ui/dlg/dlgsave.cxx +++ b/dbaccess/source/ui/dlg/dlgsave.cxx @@ -19,7 +19,9 @@ #include "dlgsave.hxx" #include -#include "dbu_dlg.hrc" +#include "core_resource.hxx" +#include "dbu_dlg.hxx" +#include "strings.hrc" #include #include #include "sqlmessage.hxx" @@ -33,7 +35,7 @@ #include #include #include -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "objectnamecheck.hxx" #include @@ -83,8 +85,8 @@ OSaveAsDlgImpl::OSaveAsDlgImpl(OSaveAsDlg* pParent, const OUString& rDefault, const IObjectNameCheck& _rObjectNameCheck, SADFlags _nFlags) - : m_aQryLabel(ModuleRes(STR_QRY_LABEL)) - , m_sTblLabel(ModuleRes(STR_TBL_LABEL)) + : m_aQryLabel(DBA_RES(STR_QRY_LABEL)) + , m_sTblLabel(DBA_RES(STR_TBL_LABEL)) , m_aName(rDefault) , m_rObjectNameCheck( _rObjectNameCheck ) , m_nType(_rType) @@ -117,8 +119,8 @@ OSaveAsDlgImpl::OSaveAsDlgImpl(OSaveAsDlg* pParent, const OUString& rDefault, const IObjectNameCheck& _rObjectNameCheck, SADFlags _nFlags) - : m_aQryLabel(ModuleRes(STR_QRY_LABEL)) - , m_sTblLabel(ModuleRes(STR_TBL_LABEL)) + : m_aQryLabel(DBA_RES(STR_QRY_LABEL)) + , m_sTblLabel(DBA_RES(STR_TBL_LABEL)) , m_aName(rDefault) , m_rObjectNameCheck( _rObjectNameCheck ) , m_nType(CommandType::COMMAND) @@ -330,9 +332,9 @@ void OSaveAsDlg::implInit() } if ( SADFlags::TitlePasteAs == ( m_pImpl->m_nFlags & SADFlags::TitlePasteAs ) ) - SetText( ModuleRes( STR_TITLE_PASTE_AS ) ); + SetText( DBA_RES( STR_TITLE_PASTE_AS ) ); else if ( SADFlags::TitleRename == ( m_pImpl->m_nFlags & SADFlags::TitleRename ) ) - SetText( ModuleRes( STR_TITLE_RENAME ) ); + SetText( DBA_RES( STR_TITLE_RENAME ) ); m_pImpl->m_pPB_OK->SetClickHdl(LINK(this,OSaveAsDlg,ButtonClickHdl)); m_pImpl->m_pTitle->SetModifyHdl(LINK(this,OSaveAsDlg,EditModifyHdl)); diff --git a/dbaccess/source/ui/dlg/dlgsize.cxx b/dbaccess/source/ui/dlg/dlgsize.cxx index 6c2293bf44b2..f34a03e1b202 100644 --- a/dbaccess/source/ui/dlg/dlgsize.cxx +++ b/dbaccess/source/ui/dlg/dlgsize.cxx @@ -18,8 +18,8 @@ */ #include "dlgsize.hxx" -#include "dbu_dlg.hrc" -#include "moduledbu.hxx" +#include "dbu_dlg.hxx" +#include "core_resource.hxx" namespace dbaui { diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx index 29c5a9314ef8..4e84f26691df 100644 --- a/dbaccess/source/ui/dlg/dsselect.cxx +++ b/dbaccess/source/ui/dlg/dsselect.cxx @@ -18,16 +18,15 @@ */ #include "dsselect.hxx" -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" #include -#include #include #include #include #include #include -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include #include #include diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index 8493190d4d56..a90c3842f7bc 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -17,14 +17,16 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "core_resource.hxx" #include "dsnItem.hxx" #include "generalpage.hxx" #include -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" +#include "strings.hrc" #include "dsitems.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include "dbadmin.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include #include #include @@ -195,12 +197,12 @@ namespace dbaui if ( eMessage != m_eLastMessage ) { - sal_uInt16 nResId = 0; + const char* pResId = nullptr; if ( smUnsupportedType == eMessage ) - nResId = STR_UNSUPPORTED_DATASOURCE_TYPE; + pResId = STR_UNSUPPORTED_DATASOURCE_TYPE; OUString sMessage; - if ( nResId ) - sMessage = ModuleRes( nResId ); + if ( pResId ) + sMessage = DBA_RES(pResId); m_pSpecialMessage->SetText( sMessage ); m_eLastMessage = eMessage; @@ -440,7 +442,7 @@ namespace dbaui const OUString sName = m_pCollection->getTypeDisplayName( _sURLPrefix ); if ( m_pAdminDialog ) { - OUString sMessage = OUString( ModuleRes( STR_PARENTTITLE_GENERAL ) ); + OUString sMessage = DBA_RES(STR_PARENTTITLE_GENERAL); m_pAdminDialog->setTitle( sMessage.replaceAll( "#", sName ) ); } } @@ -715,7 +717,7 @@ namespace dbaui OUString sPath = aFileDlg.GetPath(); if ( aFileDlg.GetCurrentFilter() != pFilter->GetUIName() || !pFilter->GetWildcard().Matches(sPath) ) { - OUString sMessage(ModuleRes(STR_ERR_USE_CONNECT_TO)); + OUString sMessage(DBA_RES(STR_ERR_USE_CONNECT_TO)); ScopedVclPtrInstance< InfoBox > aError(this, sMessage); aError->Execute(); m_pRB_ConnectDatabase->Check(); diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index 0c287c3ee20a..dbf55cd4501d 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -21,8 +21,10 @@ #include +#include "core_resource.hxx" #include "indexdialog.hxx" -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" +#include "strings.hrc" #include "bitmaps.hlst" #include "dbaccess_helpid.hrc" #include "indexfieldscontrol.hxx" @@ -366,7 +368,7 @@ namespace dbaui // get a new unique name for the new index OUString sNewIndexName; - const OUString sNewIndexNameBase(ModuleRes(STR_LOGICAL_INDEX_NAME)); + const OUString sNewIndexNameBase(DBA_RES(STR_LOGICAL_INDEX_NAME)); sal_Int32 i; for ( i = 1; i < 0x7FFFFFFF; ++i ) @@ -411,7 +413,7 @@ namespace dbaui // let the user confirm the drop if (_bConfirm) { - OUString sConfirm(ModuleRes(STR_CONFIRM_DROP_INDEX)); + OUString sConfirm(DBA_RES(STR_CONFIRM_DROP_INDEX)); sConfirm = sConfirm.replaceFirst("$name$", m_pIndexList->GetEntryText(pSelected)); ScopedVclPtrInstance< MessageDialog > aConfirm(this, sConfirm, VclMessageType::Question, VclButtonsType::YesNo); if (RET_YES != aConfirm->Execute()) @@ -615,7 +617,7 @@ namespace dbaui Indexes::const_iterator aSameName = m_pIndexes->find(sNewName); if ((aSameName != aPosition) && (m_pIndexes->end() != aSameName)) { - OUString sError(ModuleRes(STR_INDEX_NAME_ALREADY_USED)); + OUString sError(DBA_RES(STR_INDEX_NAME_ALREADY_USED)); sError = sError.replaceFirst("$name$", sNewName); ScopedVclPtrInstance< MessageDialog > aError(this, sError); aError->Execute(); @@ -678,7 +680,7 @@ namespace dbaui // need at least one field if (0 == _rPos->aFields.size()) { - ScopedVclPtrInstance< MessageDialog > aError(this, ModuleRes(STR_NEED_INDEX_FIELDS)); + ScopedVclPtrInstance< MessageDialog > aError(this, DBA_RES(STR_NEED_INDEX_FIELDS)); aError->Execute(); m_pFields->GrabFocus(); return false; @@ -694,7 +696,7 @@ namespace dbaui if (aExistentFields.end() != aExistentFields.find(aFieldCheck->sFieldName)) { // a column is specified twice ... won't work anyway, so prevent this here and now - OUString sMessage(ModuleRes(STR_INDEXDESIGN_DOUBLE_COLUMN_NAME)); + OUString sMessage(DBA_RES(STR_INDEXDESIGN_DOUBLE_COLUMN_NAME)); sMessage = sMessage.replaceFirst("$name$", aFieldCheck->sFieldName); ScopedVclPtrInstance< MessageDialog > aError(this, sMessage); aError->Execute(); diff --git a/dbaccess/source/ui/dlg/indexdialog.src b/dbaccess/source/ui/dlg/indexdialog.src deleted file mode 100644 index 2a9291883a9b..000000000000 --- a/dbaccess/source/ui/dlg/indexdialog.src +++ /dev/null @@ -1,70 +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 "dbu_dlg.hrc" -#include "browserids.hxx" -#include "dbaccess_helpid.hrc" - - -String STR_TAB_INDEX_SORTORDER -{ - Text [ en-US ] = "Sort order" ; -}; - -String STR_TAB_INDEX_FIELD -{ - Text [ en-US ] = "Index field" ; -}; - -String STR_ORDER_ASCENDING -{ - Text [ en-US ] = "Ascending" ; -}; - -String STR_ORDER_DESCENDING -{ - Text [ en-US ] = "Descending" ; -}; - -String STR_CONFIRM_DROP_INDEX -{ - Text [ en-US ] = "Do you really want to delete the index '$name$'?"; -}; - -String STR_LOGICAL_INDEX_NAME -{ - Text [ en-US ] = "index"; -}; - -String STR_NEED_INDEX_FIELDS -{ - Text [ en-US ] = "The index must contain at least one field."; -}; - -String STR_INDEX_NAME_ALREADY_USED -{ - Text [ en-US ] = "There is already another index named \"$name$\"."; -}; - -String STR_INDEXDESIGN_DOUBLE_COLUMN_NAME -{ - Text [ en-US ] = "In an index definition, no table column may occur more than once. However, you have entered column \"$name$\" twice."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index b04ed9814cba..990621d212d8 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -17,8 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "core_resource.hxx" #include "indexfieldscontrol.hxx" -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" +#include "strings.hrc" #include #include "dbaccess_helpid.hrc" #include @@ -199,11 +201,11 @@ namespace dbaui if ( m_bAddIndexAppendix ) { - m_sAscendingText = ModuleRes(STR_ORDER_ASCENDING); - m_sDescendingText = ModuleRes(STR_ORDER_DESCENDING); + m_sAscendingText = DBA_RES(STR_ORDER_ASCENDING); + m_sDescendingText = DBA_RES(STR_ORDER_DESCENDING); // the "sort order" column - OUString sColumnName = ModuleRes(STR_TAB_INDEX_SORTORDER); + OUString sColumnName = DBA_RES(STR_TAB_INDEX_SORTORDER); // the width of the order column is the maximum widths of the texts used // (the title of the column) sal_Int32 nSortOrderColumnWidth = GetTextWidth(sColumnName); @@ -228,7 +230,7 @@ namespace dbaui nFieldNameWidth -= aSystemStyle.GetScrollBarSize(); nFieldNameWidth -= 8; // the "field name" column - OUString sColumnName = ModuleRes(STR_TAB_INDEX_FIELD); + OUString sColumnName = DBA_RES(STR_TAB_INDEX_FIELD); InsertDataColumn(COLUMN_ID_FIELDNAME, sColumnName, nFieldNameWidth, HeaderBarItemBits::STDSTYLE, 0); // create the cell controllers diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx index c42e3d70d192..aa230db58365 100644 --- a/dbaccess/source/ui/dlg/paramdialog.cxx +++ b/dbaccess/source/ui/dlg/paramdialog.cxx @@ -17,15 +17,18 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "core_resource.hxx" #include "paramdialog.hxx" -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" +#include "strings.hrc" +#include "strings.hxx" #include "commontypes.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include #include #include #include -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include #include #include @@ -197,7 +200,7 @@ namespace dbaui DBG_UNHANDLED_EXCEPTION(); } - OUString sMessage(ModuleRes(STR_COULD_NOT_CONVERT_PARAM)); + OUString sMessage(DBA_RES(STR_COULD_NOT_CONVERT_PARAM)); sMessage = sMessage.replaceAll( "$name$", sName ); ScopedVclPtrInstance(nullptr, sMessage)->Execute(); m_pParam->GrabFocus(); diff --git a/dbaccess/source/ui/dlg/paramdialog.src b/dbaccess/source/ui/dlg/paramdialog.src deleted file mode 100644 index bd0bf0be883a..000000000000 --- a/dbaccess/source/ui/dlg/paramdialog.src +++ /dev/null @@ -1,27 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * 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 "dbu_dlg.hrc" - -String STR_COULD_NOT_CONVERT_PARAM -{ - Text [ en-US ] = "The entry could not be converted to a valid value for the \"$name$\" parameter"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx index a2f7c04fdd24..c9678ac2bfda 100644 --- a/dbaccess/source/ui/dlg/queryfilter.cxx +++ b/dbaccess/source/ui/dlg/queryfilter.cxx @@ -18,7 +18,7 @@ */ #include "queryfilter.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include #include #include @@ -35,7 +35,8 @@ #include #include #include -#include "dbustrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include using namespace dbaui; diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx index 5e3c1205a07c..cdf545f7fd98 100644 --- a/dbaccess/source/ui/dlg/queryorder.cxx +++ b/dbaccess/source/ui/dlg/queryorder.cxx @@ -17,14 +17,16 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "dbu_tbl.hrc" +#include "strings.hrc" +#include "strings.hxx" +#include "core_resource.hxx" #include "queryorder.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include #include #include #include -#include "moduledbu.hxx" +#include "core_resource.hxx" #include #include #include @@ -49,7 +51,7 @@ DlgOrderCrit::DlgOrderCrit(vcl::Window * pParent, const Reference< XSingleSelectQueryComposer >& _rxComposer, const Reference< XNameAccess>& _rxCols) : ModalDialog(pParent, "SortDialog", "dbaccess/ui/sortdialog.ui") - , aSTR_NOENTRY(ModuleRes(STR_VALUE_NONE)) + , aSTR_NOENTRY(DBA_RES(STR_VALUE_NONE)) , m_xQueryComposer(_rxComposer) , m_xColumns(_rxCols) , m_xConnection(_rxConnection) diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index b4a95c461dd4..0a8fa07cfd46 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -17,8 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "core_resource.hxx" #include "sqlmessage.hxx" -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" +#include "strings.hrc" #include "bitmaps.hlst" #include #include @@ -34,7 +36,7 @@ #include #include "dbaccess_helpid.hrc" #include "UITools.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include @@ -82,8 +84,8 @@ namespace private: OUString m_label; public: - explicit LabelProvider( sal_uInt16 _labelResourceID ) - :m_label( ModuleRes( _labelResourceID ) ) + explicit LabelProvider(const char* labelResourceID) + : m_label(DBA_RES(labelResourceID)) { } @@ -137,25 +139,25 @@ namespace std::shared_ptr< LabelProvider > const & getLabelProvider( SQLExceptionInfo::TYPE _eType, bool _bSubLabel ) const { std::shared_ptr< LabelProvider >* ppProvider( &m_pErrorLabel ); - sal_uInt16 nLabelID( STR_EXCEPTION_ERROR ); + const char* pLabelID( STR_EXCEPTION_ERROR ); switch ( _eType ) { case SQLExceptionInfo::TYPE::SQLWarning: ppProvider = &m_pWarningsLabel; - nLabelID = STR_EXCEPTION_WARNING; + pLabelID = STR_EXCEPTION_WARNING; break; case SQLExceptionInfo::TYPE::SQLContext: ppProvider = &m_pInfoLabel; - nLabelID = _bSubLabel ? STR_EXCEPTION_DETAILS : STR_EXCEPTION_INFO; + pLabelID = _bSubLabel ? STR_EXCEPTION_DETAILS : STR_EXCEPTION_INFO; break; default: break; } if ( !ppProvider->get() ) - ppProvider->reset( new LabelProvider( nLabelID ) ); + ppProvider->reset( new LabelProvider( pLabelID ) ); return *ppProvider; } @@ -312,8 +314,8 @@ OExceptionChainDialog::OExceptionChainDialog(vcl::Window* pParent, const Excepti m_pExceptionText->set_width_request(aTextSize.Width()); m_pExceptionText->set_height_request(aTextSize.Height()); - m_sStatusLabel = ModuleRes( STR_EXCEPTION_STATUS ); - m_sErrorCodeLabel = ModuleRes( STR_EXCEPTION_ERRORCODE ); + m_sStatusLabel = DBA_RES( STR_EXCEPTION_STATUS ); + m_sErrorCodeLabel = DBA_RES( STR_EXCEPTION_ERRORCODE ); m_pExceptionList->SetSelectionMode(SelectionMode::Single); m_pExceptionList->SetDragDropMode(DragDropMode::NONE); @@ -342,7 +344,7 @@ OExceptionChainDialog::OExceptionChainDialog(vcl::Window* pParent, const Excepti ProviderFactory aProviderFactory; ExceptionDisplayInfo aInfo22018; - aInfo22018.sMessage = ModuleRes( STR_EXPLAN_STRINGCONVERSION_ERROR ); + aInfo22018.sMessage = DBA_RES( STR_EXPLAN_STRINGCONVERSION_ERROR ); aInfo22018.pLabelProvider = aProviderFactory.getLabelProvider( SQLExceptionInfo::TYPE::SQLContext, false ); aInfo22018.pImageProvider = aProviderFactory.getImageProvider( SQLExceptionInfo::TYPE::SQLContext ); m_aExceptions.push_back( aInfo22018 ); @@ -690,13 +692,13 @@ IMPL_LINK_NOARG( OSQLMessageBox, ButtonClickHdl, Button *, void ) // OSQLWarningBox OSQLWarningBox::OSQLWarningBox( vcl::Window* _pParent, const OUString& _rMessage, WinBits _nStyle, const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo ) - :OSQLMessageBox( _pParent, ModuleRes( STR_EXCEPTION_WARNING ), _rMessage, _nStyle, OSQLMessageBox::Warning, _pAdditionalErrorInfo ) + :OSQLMessageBox( _pParent, DBA_RES( STR_EXCEPTION_WARNING ), _rMessage, _nStyle, OSQLMessageBox::Warning, _pAdditionalErrorInfo ) { } // OSQLErrorBox OSQLErrorBox::OSQLErrorBox( vcl::Window* _pParent, const OUString& _rMessage ) - :OSQLMessageBox( _pParent, ModuleRes( STR_EXCEPTION_ERROR ), _rMessage, WB_OK | WB_DEF_OK, OSQLMessageBox::Error, nullptr ) + :OSQLMessageBox( _pParent, DBA_RES( STR_EXCEPTION_ERROR ), _rMessage, WB_OK | WB_DEF_OK, OSQLMessageBox::Error, nullptr ) { } diff --git a/dbaccess/source/ui/dlg/sqlmessage.src b/dbaccess/source/ui/dlg/sqlmessage.src deleted file mode 100644 index 7a288b5e7f87..000000000000 --- a/dbaccess/source/ui/dlg/sqlmessage.src +++ /dev/null @@ -1,58 +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 "dbaccess_helpid.hrc" -#include "dbu_dlg.hrc" - -String STR_EXCEPTION_STATUS -{ - Text [ en-US ] = "SQL Status"; -}; - -String STR_EXCEPTION_ERRORCODE -{ - Text [ en-US ] = "Error code"; -}; - -String STR_EXPLAN_STRINGCONVERSION_ERROR -{ - Text [ en-US ] = "A frequent reason for this error is an inappropriate character set setting for the language of your database. Check the setting by choosing Edit - Database - Properties."; -}; - -String STR_EXCEPTION_ERROR -{ - Text [ en-US ] = "Error"; -}; - -String STR_EXCEPTION_WARNING -{ - Text [ en-US ] = "Warning"; -}; - -String STR_EXCEPTION_INFO -{ - Text [ en-US ] = "Information"; -}; - -String STR_EXCEPTION_DETAILS -{ - Text [ en-US ] = "Details"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 36be59392b21..88bd74ebb347 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -18,7 +18,7 @@ */ #include "tablespage.hxx" -#include "dbu_dlg.hrc" +#include "dbu_dlg.hxx" #include "dsitems.hxx" #include "browserids.hxx" #include "datasourceconnector.hxx" @@ -28,7 +28,8 @@ #include "stringlistitem.hxx" #include #include -#include "dbustrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include #include #include diff --git a/dbaccess/source/ui/dlg/textconnectionsettings.cxx b/dbaccess/source/ui/dlg/textconnectionsettings.cxx index 6c741ad71424..f2e0d8b8718a 100644 --- a/dbaccess/source/ui/dlg/textconnectionsettings.cxx +++ b/dbaccess/source/ui/dlg/textconnectionsettings.cxx @@ -19,10 +19,10 @@ #include "textconnectionsettings.hxx" #include "TextConnectionHelper.hxx" -#include "dbu_resource.hrc" -#include "moduledbu.hxx" +#include "dbu_pageids.hxx" +#include "core_resource.hxx" #include "dsitems.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx index 0603efee7195..6691a05c897a 100644 --- a/dbaccess/source/ui/inc/FieldControls.hxx +++ b/dbaccess/source/ui/inc/FieldControls.hxx @@ -23,18 +23,18 @@ #include #include #include "SqlNameEdit.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" namespace dbaui { class OPropColumnEditCtrl : public OSQLNameEdit { - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; short m_nPos; OUString m_strHelpText; public: - OPropColumnEditCtrl(vcl::Window* pParent, OUString& _rAllowedChars, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); + OPropColumnEditCtrl(vcl::Window* pParent, OUString& _rAllowedChars, const char* pHelpId, short nPosition = -1, WinBits nWinStyle = 0); virtual bool IsModified() const override { return IsValueChangedFromSaved(); } @@ -44,12 +44,12 @@ namespace dbaui class OPropEditCtrl : public Edit { - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; short m_nPos; OUString m_strHelpText; public: - OPropEditCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); + OPropEditCtrl(vcl::Window* pParent, const char* pHelpId, short nPosition = -1, WinBits nWinStyle = 0); virtual bool IsModified() const override { return IsValueChangedFromSaved(); } @@ -63,7 +63,7 @@ namespace dbaui OUString m_strHelpText; public: - OPropNumericEditCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); + OPropNumericEditCtrl(vcl::Window* pParent, const char* pHelpId, short nPosition = -1, WinBits nWinStyle = 0); virtual bool IsModified() const override { return IsValueChangedFromSaved(); } @@ -79,7 +79,7 @@ namespace dbaui OUString m_strHelpText; public: - OPropListBoxCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); + OPropListBoxCtrl(vcl::Window* pParent, const char* pHelpId, short nPosition = -1, WinBits nWinStyle = 0); bool IsModified() const { return IsValueChangedFromSaved(); } diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index 495a1e6428c7..7abbda015b36 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -133,8 +133,8 @@ namespace dbaui bool isTextFormat(const OFieldDescription* _pFieldDescr,sal_uInt32& _nFormatKey) const; void Contruct(); - VclPtr CreateNumericControl(sal_uInt16 _nHelpStr,short _nProperty,const OString& _sHelpId); - VclPtr CreateText(sal_uInt16 _nTextRes); + VclPtr CreateNumericControl(const char* pHelpId, short _nProperty, const OString& _sHelpId); + VclPtr CreateText(const char* pTextRes); void InitializeControl(Control* _pControl,const OString& _sHelpId,bool _bAddChangeHandler); protected: diff --git a/dbaccess/source/ui/inc/GeneralUndo.hxx b/dbaccess/source/ui/inc/GeneralUndo.hxx index 18f90fcc300a..cbea8346b2b0 100644 --- a/dbaccess/source/ui/inc/GeneralUndo.hxx +++ b/dbaccess/source/ui/inc/GeneralUndo.hxx @@ -20,7 +20,7 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_GENERALUNDO_HXX #include -#include "moduledbu.hxx" +#include "core_resource.hxx" namespace dbaui { @@ -29,13 +29,13 @@ namespace dbaui class OCommentUndoAction : public SfxUndoAction { - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; protected: OUString m_strComment; // undo, redo comment public: - OCommentUndoAction(sal_uInt16 nCommentID) { m_strComment = OUString(ModuleRes(nCommentID)); } + OCommentUndoAction(const char* pCommentID) { m_strComment = DBA_RES(pCommentID); } virtual OUString GetComment() const override { return m_strComment; } }; diff --git a/dbaccess/source/ui/inc/JoinController.hxx b/dbaccess/source/ui/inc/JoinController.hxx index ffe027d59f54..4af8a9846100 100644 --- a/dbaccess/source/ui/inc/JoinController.hxx +++ b/dbaccess/source/ui/inc/JoinController.hxx @@ -21,7 +21,7 @@ #include "singledoccontroller.hxx" #include -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "JoinTableView.hxx" #include "JoinDesignView.hxx" #include "TableConnectionData.hxx" @@ -43,7 +43,7 @@ namespace dbaui class OJoinController : public OJoinController_BASE { - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; protected: TTableConnectionData m_vTableConnectionData; TTableWindowData m_vTableData; diff --git a/dbaccess/source/ui/inc/RelationDlg.hxx b/dbaccess/source/ui/inc/RelationDlg.hxx index 469b5636c33e..46749fc1e3ec 100644 --- a/dbaccess/source/ui/inc/RelationDlg.hxx +++ b/dbaccess/source/ui/inc/RelationDlg.hxx @@ -26,7 +26,7 @@ #include #include "JoinTableView.hxx" #include "RelControliFace.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "RelationControl.hxx" namespace dbaui @@ -35,7 +35,7 @@ namespace dbaui class ORelationDialog : public ModalDialog ,public IRelationControlInterface { - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; std::unique_ptr m_xTableControl; OJoinTableView::OTableWindowMap* m_pTableMap; diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx index 4629155ca21c..613b8422ca7e 100644 --- a/dbaccess/source/ui/inc/TableController.hxx +++ b/dbaccess/source/ui/inc/TableController.hxx @@ -20,7 +20,7 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLECONTROLLER_HXX #include "singledoccontroller.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include #include #include @@ -38,7 +38,7 @@ namespace dbaui class OTableController : public OTableController_BASE { private: - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; std::vector< std::shared_ptr > m_vRowList; OTypeInfoMap m_aTypeInfo; std::vector m_aTypeInfoIndex; diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx index ed0fd74deb74..ee4850107f43 100644 --- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx +++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx @@ -27,7 +27,7 @@ #include #include #include -#include "moduledbu.hxx" +#include "core_resource.hxx" class Edit; namespace dbaui @@ -43,7 +43,7 @@ class OTableGrantControl : public ::svt::EditBrowseBox typedef std::map TTablePrivilegeMap; - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; css::uno::Reference< css::container::XNameAccess > m_xUsers; css::uno::Reference< css::container::XNameAccess > m_xTables; diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx index a9bb0effd649..1ef136e58abf 100644 --- a/dbaccess/source/ui/inc/TokenWriter.hxx +++ b/dbaccess/source/ui/inc/TokenWriter.hxx @@ -20,7 +20,7 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_TOKENWRITER_HXX #include "DExport.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "commontypes.hxx" #include @@ -183,7 +183,7 @@ namespace dbaui class ORowSetImportExport : public ODatabaseImportExport { - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; std::vector m_aColumnMapping; std::vector m_aColumnTypes; css::uno::Reference< css::sdbc::XResultSetUpdate > m_xTargetResultSetUpdate; diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx index 91d116c3b685..4dae7caf265f 100644 --- a/dbaccess/source/ui/inc/UITools.hxx +++ b/dbaccess/source/ui/inc/UITools.hxx @@ -309,9 +309,9 @@ namespace dbaui /** returns the result of the user action when view the query dialog. @param _pParent The parent of the dialog - @param _nTitle + @param pTitle A string resource id for the text which will be displayed as title. - @param _nText + @param pText A string resource id for the text which will be displayed above the buttons. When the string contains a #1. This will be replaced by the name. @param _bAll @@ -321,7 +321,7 @@ namespace dbaui @return RET_YES, RET_NO, RET_ALL */ - sal_Int32 askForUserAction(vcl::Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _nText,bool _bAll,const OUString& _sName); + sal_Int32 askForUserAction(vcl::Window* _pParent, const char* pTitle, const char* pText, bool _bAll, const OUString& _sName); /** creates a new view from a query or table @param _sName diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx index 81cafa3360b2..5c1ced4d136a 100644 --- a/dbaccess/source/ui/inc/UserAdminDlg.hxx +++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx @@ -24,7 +24,7 @@ #include "dsntypes.hxx" #include "IItemSetHelper.hxx" #include -#include "moduledbu.hxx" +#include "core_resource.hxx" #include namespace com { namespace sun { namespace star { @@ -43,9 +43,9 @@ namespace dbaui /** implements the user admin dialog */ - class OUserAdminDlg : public SfxTabDialog, public IItemSetHelper, public IDatabaseSettingsDialog,public dbaui::OModuleClient + class OUserAdminDlg : public SfxTabDialog, public IItemSetHelper, public IDatabaseSettingsDialog, public dbaccess::OModuleClient { - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; std::unique_ptr m_pImpl; SfxItemSet* m_pItemSet; css::uno::Reference< css::sdbc::XConnection> m_xConnection; diff --git a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx index 3e94b4f41cb1..5ac918089a28 100644 --- a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx +++ b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx @@ -21,7 +21,7 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_ADVANCEDSETTINGSDLG_HXX #include "IItemSetHelper.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include @@ -38,7 +38,7 @@ namespace dbaui ,public IItemSetHelper ,public IDatabaseSettingsDialog { - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; std::unique_ptr m_pImpl; protected: diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx index ae53e8ee88a6..f0f5160ae75b 100644 --- a/dbaccess/source/ui/inc/brwctrlr.hxx +++ b/dbaccess/source/ui/inc/brwctrlr.hxx @@ -21,7 +21,7 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_BRWCTRLR_HXX #include -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "brwview.hxx" #include "sbagrid.hxx" @@ -76,7 +76,7 @@ namespace dbaui // for implementing the XFormController class FormControllerImpl; friend class FormControllerImpl; - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; css::uno::Reference< css::sdbc::XRowSet > m_xRowSet; // our rowset css::uno::Reference< css::sdbcx::XColumnsSupplier > m_xColumnsSupplier; // queried from the rowset member diff --git a/dbaccess/source/ui/inc/brwview.hxx b/dbaccess/source/ui/inc/brwview.hxx index 5b51cf707a1a..f8701058b4e6 100644 --- a/dbaccess/source/ui/inc/brwview.hxx +++ b/dbaccess/source/ui/inc/brwview.hxx @@ -22,8 +22,6 @@ #include -#include - #include #include #include diff --git a/dbaccess/source/ui/inc/charsets.hxx b/dbaccess/source/ui/inc/charsets.hxx index 8d6771ad6039..5bce762d0c68 100644 --- a/dbaccess/source/ui/inc/charsets.hxx +++ b/dbaccess/source/ui/inc/charsets.hxx @@ -29,9 +29,7 @@ namespace dbaui // OCharsetDisplay typedef ::dbtools::OCharsetMap OCharsetDisplay_Base; - class OCharsetDisplay - :protected OCharsetDisplay_Base - ,protected SvxTextEncodingTable + class OCharsetDisplay : protected OCharsetDisplay_Base { protected: OUString m_aSystemDisplayName; diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx index 39d664240dc2..215b6c760d22 100644 --- a/dbaccess/source/ui/inc/dbadmin.hxx +++ b/dbaccess/source/ui/inc/dbadmin.hxx @@ -97,7 +97,7 @@ public: protected: // adds a new detail page and remove all the old ones - void addDetailPage(sal_uInt16 _nPageId,sal_uInt16 _nTextId,CreateTabPage pCreateFunc); + void addDetailPage(sal_uInt16 _nPageId, const char* pTextId, CreateTabPage pCreateFunc); virtual void PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) override; virtual short Ok() override; diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx index 100e21839e95..695a6a3e2734 100644 --- a/dbaccess/source/ui/inc/dbtreelistbox.hxx +++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx @@ -20,7 +20,7 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_DBTREELISTBOX_HXX #include "ScrollHelper.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include #include @@ -51,7 +51,7 @@ namespace dbaui class IContextMenuProvider; class DBTreeListBox :public SvTreeListBox { - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; OScrollHelper m_aScrollHelper; Timer m_aTimer; // is needed for table updates Point m_aMousePos; diff --git a/dbaccess/source/ui/inc/dbu_brw.hrc b/dbaccess/source/ui/inc/dbu_brw.hrc deleted file mode 100644 index e9db2315c125..000000000000 --- a/dbaccess/source/ui/inc/dbu_brw.hrc +++ /dev/null @@ -1,46 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_BRW_HRC -#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_BRW_HRC - -#include "dbu_resource.hrc" - - // FREE RID_STR_BRW_START + 0 -#define SBA_BROWSER_SETTING_ORDER RID_STR_BRW_START + 2 -#define SBA_BROWSER_SETTING_FILTER RID_STR_BRW_START + 3 -#define STR_DATASOURCE_GRIDCONTROL_DESC RID_STR_BRW_START + 4 -#define RID_STR_UNDO_MODIFY_RECORD RID_STR_BRW_START + 5 -#define STR_NO_COLUMNNAME_MATCHING RID_STR_BRW_START + 6 -#define RID_STR_SAVE_CURRENT_RECORD RID_STR_BRW_START + 7 -#define STR_DATASOURCE_GRIDCONTROL_NAME RID_STR_BRW_START + 8 -#define STR_OPENTABLES_WARNINGS RID_STR_BRW_START + 9 -#define STR_OPENTABLES_WARNINGS_DETAILS RID_STR_BRW_START + 10 -#define STR_CONNECTING_DATASOURCE RID_STR_BRW_START + 11 -#define STR_LOADING_QUERY RID_STR_BRW_START + 12 -#define STR_LOADING_TABLE RID_STR_BRW_START + 13 - -// please adjust checking before insert new strings - -#if STR_LOADING_TABLE > RID_STR_BRW_END -#error Resource ID overflow in #file, #line -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/dbu_control.hrc b/dbaccess/source/ui/inc/dbu_control.hrc deleted file mode 100644 index 8ae4595b628e..000000000000 --- a/dbaccess/source/ui/inc/dbu_control.hrc +++ /dev/null @@ -1,45 +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_DBACCESS_SOURCE_UI_INC_DBU_CONTROL_HRC -#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_CONTROL_HRC - -#include "dbu_resource.hrc" - -#define STR_TABLE_PRIV_NAME RID_STR_CONTROL_START -#define STR_TABLE_PRIV_INSERT RID_STR_CONTROL_START + 1 -#define STR_TABLE_PRIV_DELETE RID_STR_CONTROL_START + 2 -#define STR_TABLE_PRIV_UPDATE RID_STR_CONTROL_START + 3 -#define STR_TABLE_PRIV_ALTER RID_STR_CONTROL_START + 4 -#define STR_TABLE_PRIV_REFERENCE RID_STR_CONTROL_START + 5 -#define STR_TABLE_PRIV_DROP RID_STR_CONTROL_START + 6 -#define STR_TABLE_PRIV_SELECT RID_STR_CONTROL_START + 7 -#define STR_ALL_TABLES_AND_VIEWS RID_STR_CONTROL_START + 8 -#define STR_NOTABLEINFO RID_STR_CONTROL_START + 11 -#define STR_ALL_TABLES RID_STR_CONTROL_START + 12 -#define STR_ALL_VIEWS RID_STR_CONTROL_START + 13 - -// please adjust checking before insert new strings - -#if STR_ALL_VIEWS > RID_STR_CONTROL_END -#error Resource ID overflow in #file, #line -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/dbu_dlg.hrc b/dbaccess/source/ui/inc/dbu_dlg.hrc deleted file mode 100644 index 960c175a3ff6..000000000000 --- a/dbaccess/source/ui/inc/dbu_dlg.hrc +++ /dev/null @@ -1,155 +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_DBACCESS_SOURCE_UI_INC_DBU_DLG_HRC -#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_DLG_HRC - -#include "dbu_resource.hrc" - -#define PAGE_X 281 -#define PAGE_Y 215 -#define WIZARD_PAGE_X 225 -#define WIZARD_PAGE_Y 240 - -//constants for the wizards -#define INDENT_BELOW_RADIO 10 - -#define STR_PARENTTITLE_GENERAL RID_STR_DLG_START + 0 - // FREE - // FREE - // FREE - // FREE - // FREE - // FREE -#define STR_ERROR_PASSWORDS_NOT_IDENTICAL RID_STR_DLG_START + 7 -#define STR_INDEXDESIGN_DOUBLE_COLUMN_NAME RID_STR_DLG_START + 8 - // FREE - // FREE -#define STR_ERR_USE_CONNECT_TO RID_STR_DLG_START + 11 -#define STR_ALREADYEXISTOVERWRITE RID_STR_DLG_START + 12 -#define STR_COULD_NOT_LOAD_ODBC_LIB RID_STR_DLG_START + 13 -#define STR_INDEX_NAME_ALREADY_USED RID_STR_DLG_START + 14 -#define STR_ASK_FOR_DIRECTORY_CREATION RID_STR_DLG_START + 15 -#define STR_COULD_NOT_CREATE_DIRECTORY RID_STR_DLG_START + 16 -#define STR_UNSUPPORTED_DATASOURCE_TYPE RID_STR_DLG_START + 17 - // FREE - // FREE - // FREE - // FREE - // FREE -#define STR_COMMAND_EXECUTED_SUCCESSFULLY RID_STR_DLG_START + 23 -#define STR_DIRECTSQL_CONNECTIONLOST RID_STR_DLG_START + 24 -#define STR_ADD_TABLES RID_STR_DLG_START + 25 -#define STR_ADD_TABLE_OR_QUERY RID_STR_DLG_START + 26 -#define STR_USERADMIN_NOT_AVAILABLE RID_STR_DLG_START + 27 -#define STR_TAB_INDEX_SORTORDER RID_STR_DLG_START + 28 -#define STR_TAB_INDEX_FIELD RID_STR_DLG_START + 29 -#define STR_ORDER_ASCENDING RID_STR_DLG_START + 30 -#define STR_ORDER_DESCENDING RID_STR_DLG_START + 31 -#define STR_CONFIRM_DROP_INDEX RID_STR_DLG_START + 32 -#define STR_LOGICAL_INDEX_NAME RID_STR_DLG_START + 33 -#define STR_CONNECTION_TEST RID_STR_DLG_START + 34 -#define STR_CONNECTION_SUCCESS RID_STR_DLG_START + 35 - // FREE -#define STR_JDBCDRIVER_SUCCESS RID_STR_DLG_START + 37 -#define STR_JDBCDRIVER_NO_SUCCESS RID_STR_DLG_START + 38 -#define STR_MSACCESS_FILTERNAME RID_STR_DLG_START + 39 -#define STR_CONNECTION_NO_SUCCESS RID_STR_DLG_START + 40 -#define STR_DBASE_PATH_OR_FILE RID_STR_DLG_START + 41 -#define STR_TEXT_HEADERTEXT RID_STR_DLG_START + 42 -#define STR_TEXT_HELPTEXT RID_STR_DLG_START + 43 -#define STR_TEXT_PATH_OR_FILE RID_STR_DLG_START + 45 -#define STR_FLAT_PATH_OR_FILE RID_STR_DLG_START + 46 -#define STR_CALC_PATH_OR_FILE RID_STR_DLG_START + 47 -#define STR_NAME_OF_ODBC_DATASOURCE RID_STR_DLG_START + 48 -#define STR_MYSQL_DATABASE_NAME RID_STR_DLG_START + 49 -#define STR_ORACLE_DATABASE_NAME RID_STR_DLG_START + 50 -#define STR_WRITER_PATH_OR_FILE RID_STR_DLG_START + 51 -#define STR_MSACCESS_MDB_FILE RID_STR_DLG_START + 52 -#define STR_COMMONURL RID_STR_DLG_START + 53 -#define STR_DATABASEDEFAULTNAME RID_STR_DLG_START + 54 -#define STR_EXCEPTION_ERRORCODE RID_STR_DLG_START + 55 -#define STR_NO_ADDITIONAL_SETTINGS RID_STR_DLG_START + 56 -#define STR_HOSTNAME RID_STR_DLG_START + 57 -#define STR_EXCEPTION_STATUS RID_STR_DLG_START + 58 -#define STR_MOZILLA_PROFILE_NAME RID_STR_DLG_START + 59 -#define STR_THUNDERBIRD_PROFILE_NAME RID_STR_DLG_START + 60 -#define STR_EXPLAN_STRINGCONVERSION_ERROR RID_STR_DLG_START + 61 -#define STR_EXCEPTION_ERROR RID_STR_DLG_START + 62 -#define STR_EXCEPTION_WARNING RID_STR_DLG_START + 63 -#define STR_EXCEPTION_INFO RID_STR_DLG_START + 64 -#define STR_EXCEPTION_DETAILS RID_STR_DLG_START + 65 -#define STR_MSACCESS_2007_FILTERNAME RID_STR_DLG_START + 66 -#define STR_FIREBIRD_FILTERNAME RID_STR_DLG_START + 67 - -#define STR_DBWIZARDTITLE RID_STR_DLG_START + 68 -#define STR_PAGETITLE_INTROPAGE RID_STR_DLG_START + 69 -#define STR_PAGETITLE_DBASE RID_STR_DLG_START + 70 -#define STR_PAGETITLE_TEXT RID_STR_DLG_START + 71 -#define STR_PAGETITLE_MSACCESS RID_STR_DLG_START + 72 -#define STR_PAGETITLE_LDAP RID_STR_DLG_START + 73 -#define STR_PAGETITLE_ADO RID_STR_DLG_START + 74 -#define STR_PAGETITLE_JDBC RID_STR_DLG_START + 75 -#define STR_PAGETITLE_ORACLE RID_STR_DLG_START + 76 -#define STR_PAGETITLE_MYSQL RID_STR_DLG_START + 77 -#define STR_PAGETITLE_ODBC RID_STR_DLG_START + 78 -#define STR_PAGETITLE_DOCUMENT_OR_SPREADSHEET RID_STR_DLG_START + 79 -#define STR_PAGETITLE_AUTHENTIFICATION RID_STR_DLG_START + 80 -#define STR_PAGETITLE_MYSQL_NATIVE RID_STR_DLG_START + 81 -#define STR_PAGETITLE_FINAL RID_STR_DLG_START + 82 - -#define STR_DBASE_HEADERTEXT RID_STR_DLG_START + 83 -#define STR_DBASE_HELPTEXT RID_STR_DLG_START + 84 - -#define STR_MSACCESS_HEADERTEXT RID_STR_DLG_START + 85 -#define STR_MSACCESS_HELPTEXT RID_STR_DLG_START + 86 - -#define STR_ADO_HEADERTEXT RID_STR_DLG_START + 87 -#define STR_ADO_HELPTEXT RID_STR_DLG_START + 88 - -#define STR_ODBC_HEADERTEXT RID_STR_DLG_START + 89 -#define STR_ODBC_HELPTEXT RID_STR_DLG_START + 90 - -#define STR_JDBC_HEADERTEXT RID_STR_DLG_START + 91 -#define STR_JDBC_HELPTEXT RID_STR_DLG_START + 92 - -#define STR_MYSQLJDBC_HEADERTEXT RID_STR_DLG_START + 93 -#define STR_MYSQLJDBC_HELPTEXT RID_STR_DLG_START + 94 -#define STR_MYSQL_DRIVERCLASSTEXT RID_STR_DLG_START + 95 -#define STR_MYSQL_DEFAULT RID_STR_DLG_START + 96 - -#define STR_ORACLE_HEADERTEXT RID_STR_DLG_START + 97 -#define STR_ORACLE_DEFAULT RID_STR_DLG_START + 98 -#define STR_ORACLE_DRIVERCLASSTEXT RID_STR_DLG_START + 99 -#define STR_ORACLE_HELPTEXT RID_STR_DLG_START + 100 - -#define STR_DATABASE_TYPE_CHANGE RID_STR_DLG_START + 101 - -#define STR_COULD_NOT_CONVERT_PARAM RID_STR_DLG_START + 102 - -// please adjust checking before insert new strings - -#define LAST_STR_HERE RID_STR_DLG_START + 103 - -#if LAST_STR_HERE > RID_STR_DLG_END -#error Resource-Id Overflow in #file, #line -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/dbamiscres.hrc b/dbaccess/source/ui/inc/dbu_dlg.hxx similarity index 75% rename from dbaccess/source/core/inc/dbamiscres.hrc rename to dbaccess/source/ui/inc/dbu_dlg.hxx index 5d9b36fc4f28..2990728ff047 100644 --- a/dbaccess/source/core/inc/dbamiscres.hrc +++ b/dbaccess/source/ui/inc/dbu_dlg.hxx @@ -16,13 +16,18 @@ * 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_DBACCESS_SOURCE_UI_INC_DBU_DLG_HRC +#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_DLG_HRC -#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_DBAMISCRES_HRC -#define INCLUDED_DBACCESS_SOURCE_CORE_INC_DBAMISCRES_HRC +#include "dbu_pageids.hxx" -#define STR_MYSQL_NATIVE 24 +#define PAGE_X 281 +#define PAGE_Y 215 +#define WIZARD_PAGE_X 225 +#define WIZARD_PAGE_Y 240 -#define STR_END STR_MYSQL_NATIVE + 1 +//constants for the wizards +#define INDENT_BELOW_RADIO 10 #endif diff --git a/dbaccess/source/ui/inc/dbu_misc.hrc b/dbaccess/source/ui/inc/dbu_misc.hrc deleted file mode 100644 index ae37b93478f1..000000000000 --- a/dbaccess/source/ui/inc/dbu_misc.hrc +++ /dev/null @@ -1,53 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_MISC_HRC -#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_MISC_HRC - -#include "dbu_resource.hrc" - -#define STR_WIZ_COLUMN_SELECT_TITEL RID_STR_MISC_START + 2 -#define STR_WIZ_TYPE_SELECT_TITEL RID_STR_MISC_START + 3 -#define STR_WIZ_NAME_ALREADY_DEFINED RID_STR_MISC_START + 4 -#define STR_WIZ_NAME_MATCHING_TITEL RID_STR_MISC_START + 5 -#define STR_WIZ_TABLE_COPY RID_STR_MISC_START + 6 -#define STR_COPYTABLE_TITLE_COPY RID_STR_MISC_START + 7 -#define STR_COULDNOTOPEN_LINKEDDOC RID_STR_MISC_START + 8 -#define STR_SUGGEST_APPEND_TABLE_DATA RID_STR_MISC_START + 9 -#define STR_UNDO_COLON RID_STR_MISC_START + 10 -#define STR_REDO_COLON RID_STR_MISC_START + 11 -#define STR_UNKNOWN_TYPE_FOUND RID_STR_MISC_START + 12 -#define STR_FILE_DOES_NOT_EXIST RID_STR_MISC_START + 13 -#define STR_WARNINGS_DURING_CONNECT RID_STR_MISC_START + 14 -#define STR_NAMED_OBJECT_ALREADY_EXISTS RID_STR_MISC_START + 15 -#define STR_INVALID_TABLE_NAME RID_STR_MISC_START + 16 -#define STR_INVALID_TABLE_NAME_LENGTH RID_STR_MISC_START + 17 - -#define STR_WIZ_PB_PREV RID_STR_MISC_START + 18 -#define STR_WIZ_PB_NEXT RID_STR_MISC_START + 19 -#define STR_WIZ_PB_OK RID_STR_MISC_START + 20 - -// please adjust checking before insert new strings - -#if STR_INVALID_TABLE_NAME_LENGTH > RID_STR_MISC_END -#error Resource ID overflow in #file, #line -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/dbu_pageids.hxx b/dbaccess/source/ui/inc/dbu_pageids.hxx new file mode 100644 index 000000000000..710a582d933a --- /dev/null +++ b/dbaccess/source/ui/inc/dbu_pageids.hxx @@ -0,0 +1,38 @@ +/* -*- 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_DBACCESS_SOURCE_UI_INC_DBU_RESOURCE_HRC +#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_RESOURCE_HRC + +// tab pages + +#define PAGE_DBASE 1001 +#define PAGE_ODBC 1003 +#define PAGE_TEXT 1004 +#define PAGE_ADO 1007 +#define PAGE_LDAP 1015 +#define PAGE_MYSQL_ODBC 1017 +#define PAGE_USERDRIVER 1019 +#define PAGE_MYSQL_JDBC 1020 +#define PAGE_MYSQL_NATIVE 1024 +#define PAGE_ORACLE_JDBC 1027 + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/dbu_qry.hrc b/dbaccess/source/ui/inc/dbu_qry.hrc deleted file mode 100644 index 306fd9fb6057..000000000000 --- a/dbaccess/source/ui/inc/dbu_qry.hrc +++ /dev/null @@ -1,78 +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_DBACCESS_SOURCE_UI_INC_DBU_QRY_HRC -#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_QRY_HRC - -#include "dbu_resource.hrc" - -#define STR_QUERY_UNDO_MOVETABWIN RID_STR_QRY_START + 2 -#define STR_QUERY_UNDO_SIZETABWIN RID_STR_QRY_START + 3 -#define STR_QUERY_UNDO_INSERTCONNECTION RID_STR_QRY_START + 4 -#define STR_QUERY_UNDO_REMOVECONNECTION RID_STR_QRY_START + 5 -#define STR_QUERY_UNDO_TABWINSHOW RID_STR_QRY_START + 6 -#define STR_QUERY_UNDO_TABWINDELETE RID_STR_QRY_START + 7 -#define STR_QUERY_UNDO_MODIFY_CELL RID_STR_QRY_START + 8 -#define STR_QUERY_UNDO_SIZE_COLUMN RID_STR_QRY_START + 9 -#define STR_QUERY_UNDO_TABFIELDDELETE RID_STR_QRY_START + 10 -#define STR_QUERY_UNDO_TABFIELDCREATE RID_STR_QRY_START + 11 -#define STR_QRY_TOOCOMPLEX RID_STR_QRY_START + 12 -#define RID_STR_FIELD_DOESNT_EXIST RID_STR_QRY_START + 14 -#define STR_QUERY_INNER_JOIN RID_STR_QRY_START + 16 -#define STR_QUERY_LEFTRIGHT_JOIN RID_STR_QRY_START + 17 -#define STR_QUERY_FULL_JOIN RID_STR_QRY_START + 18 -#define STR_QUERY_SORTTEXT RID_STR_QRY_START + 19 -#define STR_QUERY_FUNCTIONS RID_STR_QRY_START + 20 -#define STR_QUERY_NOTABLE RID_STR_QRY_START + 21 -#define STR_QRY_ORDERBY_UNRELATED RID_STR_QRY_START + 22 -#define STR_QUERY_HANDLETEXT RID_STR_QRY_START + 23 -#define STR_QUERY_LIMIT_ALL RID_STR_QRY_START + 24 -// free -#define STR_QRY_TOO_MANY_COLUMNS RID_STR_QRY_START + 26 -#define STR_SVT_SQL_SYNTAX_ERROR RID_STR_QRY_START + 27 -#define STR_QUERYDESIGN_NO_VIEW_SUPPORT RID_STR_QRY_START + 28 -#define STR_QUERYDESIGN_NO_VIEW_ASK RID_STR_QRY_START + 29 -#define STR_QRY_NOSELECT RID_STR_QRY_START + 30 -#define STR_QRY_COLUMN_NOT_FOUND RID_STR_QRY_START + 31 -#define STR_QRY_JOIN_COLUMN_COMPARE RID_STR_QRY_START + 32 -#define STR_QRY_LIKE_LEFT_NO_COLUMN RID_STR_QRY_START + 33 -#define STR_QRY_CHECK_CASESENSITIVE RID_STR_QRY_START + 34 -#define STR_QUERY_UNDO_TABFIELDMOVED RID_STR_QRY_START + 35 -#define STR_QRY_ILLEGAL_JOIN RID_STR_QRY_START + 36 -#define STR_QRY_TOO_LONG_STATEMENT RID_STR_QRY_START + 37 -#define STR_QRY_SYNTAX RID_STR_QRY_START + 38 -#define STR_QRY_NATIVE RID_STR_QRY_START + 39 -#define STR_QRY_TOO_MANY_TABLES RID_STR_QRY_START + 40 -// empty -#define STR_JOIN_TYPE_HINT RID_STR_QRY_START + 44 -#define STR_QUERY_SAVEMODIFIED RID_STR_QRY_START + 45 -#define STR_ERROR_PARSING_STATEMENT RID_STR_QRY_START + 46 -#define STR_INFO_OPENING_IN_SQL_VIEW RID_STR_QRY_START + 47 -#define STR_STATEMENT_WITHOUT_RESULT_SET RID_STR_QRY_START + 48 -// empty -#define STR_NO_ALTER_VIEW_SUPPORT RID_STR_QRY_START + 50 -#define STR_QUERY_CROSS_JOIN RID_STR_QRY_START + 51 - // please adjust checking when inserting new strings - -#if STR_QUERY_CROSS_JOIN > RID_STR_QRY_END -#error resource id overflow in #file, #line -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/dbu_rel.hrc b/dbaccess/source/ui/inc/dbu_rel.hrc deleted file mode 100644 index f8586e40f8cd..000000000000 --- a/dbaccess/source/ui/inc/dbu_rel.hrc +++ /dev/null @@ -1,39 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_REL_HRC -#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_REL_HRC - -#include "dbu_resource.hrc" - -#define STR_QUERY_REL_EDIT_RELATION RID_STR_REL_START -#define STR_RELATIONDESIGN RID_STR_REL_START + 1 -#define STR_RELATIONDESIGN_NOT_AVAILABLE RID_STR_REL_START + 2 -#define STR_QUERY_REL_DELETE_WINDOW RID_STR_REL_START + 3 -#define STR_QUERY_REL_EDIT RID_STR_REL_START + 4 -#define STR_QUERY_REL_CREATE RID_STR_REL_START + 5 -#define STR_QUERY_REL_COULD_NOT_CREATE RID_STR_REL_START + 6 -// please adjust checking before insert new strings - -#if STR_QUERY_REL_COULD_NOT_CREATE > RID_STR_REL_END -#error Resource ID overflow in #file, #line -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc deleted file mode 100644 index d339c94cf65f..000000000000 --- a/dbaccess/source/ui/inc/dbu_resource.hrc +++ /dev/null @@ -1,172 +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_DBACCESS_SOURCE_UI_INC_DBU_RESOURCE_HRC -#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_RESOURCE_HRC - -#include - -#define RID_PAGE_START RID_DBACCESS_START -#define RID_ERRORBOX_START RID_DBACCESS_START -#define RID_QUERYBOX_START RID_DBACCESS_START -#define RID_TOOLBOX_START RID_DBACCESS_START -#define RID_BITMAP_START RID_DBACCESS_START -#define RID_IMAGE_START RID_DBACCESS_START -#define RID_IMAGELIST_START RID_DBACCESS_START -#define RID_MENU_START RID_DBACCESS_START -#define RID_STRING_START RID_DBACCESS_START -#define RID_UNTYPED_START RID_DBACCESS_START -#define RID_WARN_START RID_DBACCESS_START -#define RID_CONTROL_START RID_DBACCESS_START -#define RID_MISC_START RID_DBACCESS_START - -// new defines to make the strings folder specific -#define RID_STR_BRW_START RID_DBACCESS_START -#define RID_STR_BRW_END RID_STR_BRW_START + 40 // 0 - 39 - -#define RID_STR_CONTROL_START RID_STR_BRW_END -#define RID_STR_CONTROL_END RID_STR_CONTROL_START + 30 // 40 - 69 - -#define RID_STR_DLG_START RID_STR_CONTROL_END -#define RID_STR_DLG_END RID_STR_DLG_START + 144 // 70 - 183 + 30 free - -#define RID_STR_MISC_START RID_STR_DLG_END -#define RID_STR_MISC_END RID_STR_MISC_START + 20 // 214 - 233 - -#define RID_STR_QRY_START RID_STR_MISC_END -#define RID_STR_QRY_END RID_STR_QRY_START + 80 // 234 - 313 - -#define RID_STR_TBL_START RID_STR_QRY_END -#define RID_STR_TBL_END RID_STR_TBL_START + 80 // 314 - 393 - -#define RID_STR_REL_START RID_STR_TBL_END -#define RID_STR_REL_END RID_STR_REL_START + 10 // 394 - 413 - -#define RID_STR_UNO_START RID_STR_REL_END -#define RID_STR_UNO_END RID_STR_UNO_START + 20 // 414 - 433 - -#define RID_STR_GEN_START RID_STR_UNO_END -#define RID_STR_GEN_END RID_STR_GEN_START + 75 // 434 - 503 - -#define RID_STR_APP_START RID_STR_GEN_END -#define RID_STR_APP_END RID_STR_APP_START + 50 // 504 - 543 - -#if RID_STR_GEN_END > RID_DBACCESS_END -#error Resource ID overflow in #file, #line -#endif - -// tab pages - - // FREE -#define PAGE_DBASE RID_PAGE_START + 1 -#define PAGE_ODBC RID_PAGE_START + 3 -#define PAGE_TEXT RID_PAGE_START + 4 - // FREE -#define PAGE_ADO RID_PAGE_START + 7 - // FREE - // FREE - // FREE -#define PAGE_LDAP RID_PAGE_START + 15 -#define PAGE_MYSQL_ODBC RID_PAGE_START + 17 -#define PAGE_USERDRIVER RID_PAGE_START + 19 -#define PAGE_MYSQL_JDBC RID_PAGE_START + 20 - // FREE - // FREE -#define PAGE_MYSQL_NATIVE RID_PAGE_START + 24 - // FREE -#define PAGE_ORACLE_JDBC RID_PAGE_START + 27 - - // FREE - -// strings -#define STR_TBL_TITLE RID_STR_GEN_START -#define STR_ERROR_DURING_CREATION RID_STR_GEN_START + 1 -#define RID_STR_CONNECTION_LOST RID_STR_GEN_START + 2 -#define STR_NAME_ALREADY_EXISTS RID_STR_GEN_START + 3 -#define STR_PAGETITLE_GENERAL RID_STR_GEN_START + 4 -#define STR_TITLE_CONFIRM_DELETION RID_STR_GEN_START + 5 -#define STR_TABLEDESIGN_DATASOURCE_DELETED RID_STR_GEN_START + 7 -#define STR_TABLEDESIGN_DBFIELDTYPES RID_STR_GEN_START + 8 -#define STR_QRY_CONTINUE RID_STR_GEN_START + 9 -#define STR_COLUMN_NAME RID_STR_GEN_START + 10 -#define STR_ERROR_OCCURRED_WHILE_COPYING RID_STR_GEN_START + 11 -#define STR_MISSING_TABLES_XDROP RID_STR_GEN_START + 12 -#define STR_QUERY_DELETE_TABLE RID_STR_GEN_START + 13 -#define STR_BUTTON_TEXT_ALL RID_STR_GEN_START + 14 -#define STR_COULDNOTCREATE_DRIVERMANAGER RID_STR_GEN_START + 15 -#define STR_UNEXPECTED_ERROR RID_STR_GEN_START + 16 -#define STR_ENTER_CONNECTION_PASSWORD RID_STR_GEN_START + 18 -#define STR_NOREGISTEREDDRIVER RID_STR_GEN_START + 19 -#define STR_DATASOURCE_DELETED RID_STR_GEN_START + 20 -#define STR_QUERY_UNDO_MODIFYSQLEDIT RID_STR_GEN_START + 21 -#define STR_QRY_TITLE RID_STR_GEN_START + 22 -#define STR_VIEW_TITLE RID_STR_GEN_START + 23 -#define STR_SUB_DOCS_WITH_SCRIPTS RID_STR_GEN_START + 24 -#define STR_SUB_DOCS_WITH_SCRIPTS_DETAIL RID_STR_GEN_START + 25 -#define STR_TABLEDESIGN_DUPLICATE_NAME RID_STR_GEN_START + 26 -#define STR_COULDNOTCONNECT_DATASOURCE RID_STR_GEN_START + 27 -#define STR_NO_TABLE_FORMAT_INSIDE RID_STR_GEN_START + 28 -#define RID_STR_QUERIES_CONTAINER RID_STR_GEN_START + 29 -#define RID_STR_TABLES_CONTAINER RID_STR_GEN_START + 30 -#define STR_NEW_FOLDER RID_STR_GEN_START + 31 -#define RID_STR_FORM RID_STR_GEN_START + 32 -#define RID_STR_REPORT RID_STR_GEN_START + 33 -#define STR_FRM_LABEL RID_STR_GEN_START + 34 -#define STR_RPT_LABEL RID_STR_GEN_START + 35 -#define STR_FOLDER_LABEL RID_STR_GEN_START + 36 -#define STR_TABLEDESIGN_NO_PRIM_KEY_HEAD RID_STR_GEN_START + 37 -#define STR_TABLEDESIGN_NO_PRIM_KEY RID_STR_GEN_START + 38 -#define STR_PAGETITLE_ADVANCED RID_STR_GEN_START + 39 -#define RID_STR_EXTENSION_NOT_PRESENT RID_STR_GEN_START + 40 -#define STR_PAGETITLE_CONNECTION RID_STR_GEN_START + 41 -#define STR_TBL_LABEL RID_STR_GEN_START + 42 -#define STR_QRY_LABEL RID_STR_GEN_START + 44 -#define STR_TITLE_RENAME RID_STR_GEN_START + 45 -#define STR_TITLE_PASTE_AS RID_STR_GEN_START + 46 -#define STR_AUTOFIELDSEPARATORLIST RID_STR_GEN_START + 47 -#define STR_AUTOTEXTSEPARATORLIST RID_STR_GEN_START + 48 -#define STR_AUTOTEXT_FIELD_SEP_NONE RID_STR_GEN_START + 49 -#define STR_AUTODELIMITER_MISSING RID_STR_GEN_START + 50 -#define STR_AUTODELIMITER_MUST_DIFFER RID_STR_GEN_START + 51 -#define STR_AUTONO_WILDCARDS RID_STR_GEN_START + 52 -#define STR_SPREADSHEET_HEADERTEXT RID_STR_GEN_START + 53 -#define STR_SPREADSHEET_HELPTEXT RID_STR_GEN_START + 54 -#define STR_SPREADSHEETPATH RID_STR_GEN_START + 55 -#define STR_RSC_CHARSETS RID_STR_GEN_START + 56 -#define STR_QRY_CRITERIA_ON_ASTERISK RID_STR_GEN_START + 57 -#define STR_QRY_ORDERBY_ON_ASTERISK RID_STR_GEN_START + 58 -#define STR_NEED_INDEX_FIELDS RID_STR_GEN_START + 59 -#define STR_QUERY_CLOSEDOCUMENTS RID_STR_GEN_START + 60 -#define STR_QUERY_BRW_DELETE_ROWS RID_STR_GEN_START + 61 -#define STR_QUERY_CONNECTION_LOST RID_STR_GEN_START + 62 -#define STR_QUERY_USERADMIN_DELETE_USER RID_STR_GEN_START + 63 -#define STR_QUERY_SAVE_TABLE_EDIT_INDEXES RID_STR_GEN_START + 64 -#define RID_STR_TABLE_FORMAT RID_STR_GEN_START + 65 -#define RID_STR_ROW_HEIGHT RID_STR_GEN_START + 66 -#define RID_STR_COPY RID_STR_GEN_START + 67 -#define RID_STR_COLUMN_FORMAT RID_STR_GEN_START + 68 -#define RID_STR_COLUMN_WIDTH RID_STR_GEN_START + 69 - -// untyped resources - -#define RSC_QUERY_OBJECT_TYPE RID_UNTYPED_START + 4 - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/dbu_tbl.hrc b/dbaccess/source/ui/inc/dbu_tbl.hrc deleted file mode 100644 index 88821d2df8ef..000000000000 --- a/dbaccess/source/ui/inc/dbu_tbl.hrc +++ /dev/null @@ -1,81 +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_DBACCESS_SOURCE_UI_INC_DBU_TBL_HRC -#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_TBL_HRC - -#include "dbu_resource.hrc" - -#define STR_HELP_AUTOINCREMENT_VALUE RID_STR_TBL_START -#define STR_TABLEDESIGN_UNDO_PRIMKEY RID_STR_TBL_START + 1 -#define STR_VALUE_YES RID_STR_TBL_START + 2 -#define STR_VALUE_NO RID_STR_TBL_START + 3 -#define STR_VALUE_NONE RID_STR_TBL_START + 6 -#define STR_TAB_FIELD_NAME RID_STR_TBL_START + 7 -#define STR_TAB_FIELD_DATATYPE RID_STR_TBL_START + 8 -#define STR_TAB_HELP_TEXT RID_STR_TBL_START + 10 -#define STR_FIELD_AUTOINCREMENT RID_STR_TBL_START + 12 -#define STR_TAB_PROPERTIES RID_STR_TBL_START + 13 -#define STR_TABED_UNDO_TYPE_CHANGED RID_STR_TBL_START + 17 -#define STR_TABED_UNDO_ROWDELETED RID_STR_TBL_START + 18 -#define STR_TABED_UNDO_ROWINSERTED RID_STR_TBL_START + 19 -#define STR_TABED_UNDO_NEWROWINSERTED RID_STR_TBL_START + 20 -#define STR_HELP_AUTOINCREMENT RID_STR_TBL_START + 22 -#define STR_HELP_FORMAT_CODE RID_STR_TBL_START + 23 -#define STR_HELP_SCALE RID_STR_TBL_START + 24 -#define STR_HELP_LENGTH RID_STR_TBL_START + 25 -#define STR_HELP_NUMERIC_TYPE RID_STR_TBL_START + 26 -#define STR_HELP_TEXT_LENGTH RID_STR_TBL_START + 27 -#define STR_HELP_FIELD_REQUIRED RID_STR_TBL_START + 28 -#define STR_HELP_DEFAULT_VALUE RID_STR_TBL_START + 29 -#define STR_HELP_BOOL_DEFAULT RID_STR_TBL_START + 30 -#define STR_FORMAT RID_STR_TBL_START + 31 -#define STR_SCALE RID_STR_TBL_START + 32 -#define STR_LENGTH RID_STR_TBL_START + 33 -#define STR_NUMERIC_TYPE RID_STR_TBL_START + 34 -#define STR_TEXT_LENGTH RID_STR_TBL_START + 35 -#define STR_FIELD_REQUIRED RID_STR_TBL_START + 36 -#define STR_DEFAULT_VALUE RID_STR_TBL_START + 37 -#define STR_TABED_UNDO_CELLMODIFIED RID_STR_TBL_START + 38 -#define STR_TAB_FIELD_COLUMN_NAME RID_STR_TBL_START + 39 -#define STR_TBL_COLUMN_IS_KEYCOLUMN RID_STR_TBL_START + 40 -#define STR_TBL_COLUMN_IS_KEYCOLUMN_TITLE RID_STR_TBL_START + 41 -#define STR_TABLEDESIGN_ALTER_ERROR RID_STR_TBL_START + 42 -#define STR_AUTOINCREMENT_VALUE RID_STR_TBL_START + 43 -#define STR_HELP_FORMAT_BUTTON RID_STR_TBL_START + 44 -#define STR_TABLEDESIGN_CONNECTION_MISSING RID_STR_TBL_START + 45 -#define STR_TAB_FIELD_COLUMN_DATATYPE RID_STR_TBL_START + 46 -#define STR_NO_TYPE_INFO_AVAILABLE RID_STR_TBL_START + 48 -#define STR_CHANGE_COLUMN_NAME RID_STR_TBL_START + 49 -#define STR_CHANGE_COLUMN_TYPE RID_STR_TBL_START + 50 -#define STR_CHANGE_COLUMN_DESCRIPTION RID_STR_TBL_START + 51 -#define STR_CHANGE_COLUMN_ATTRIBUTE RID_STR_TBL_START + 52 -#define STR_TABLEDESIGN_SAVE_ERROR RID_STR_TBL_START + 53 -#define STR_TABLEDESIGN_COULD_NOT_DROP_COL RID_STR_TBL_START + 54 -#define STR_COLUMN_DESCRIPTION RID_STR_TBL_START + 55 -#define STR_BUTTON_FORMAT RID_STR_TBL_START + 56 - -// please adjust checking before insert new strings - -#if STR_BUTTON_FORMAT > RID_STR_TBL_END -#error Resource ID overflow in #file, #line -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/dbu_uno.hrc b/dbaccess/source/ui/inc/dbu_uno.hrc deleted file mode 100644 index 923828ac871d..000000000000 --- a/dbaccess/source/ui/inc/dbu_uno.hrc +++ /dev/null @@ -1,45 +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_DBACCESS_SOURCE_UI_INC_DBU_UNO_HRC -#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_UNO_HRC - -#include "dbu_resource.hrc" - -#define STR_CTW_NO_VIEWS_SUPPORT ( RID_STR_UNO_START + 1 ) -#define STR_CTW_NO_PRIMARY_KEY_SUPPORT ( RID_STR_UNO_START + 2 ) -#define STR_CTW_INVALID_DATA_ACCESS_DESCRIPTOR ( RID_STR_UNO_START + 3 ) -#define STR_CTW_ONLY_TABLES_AND_QUERIES_SUPPORT ( RID_STR_UNO_START + 4 ) -#define STR_CTW_COPY_SOURCE_NEEDS_BOOKMARKS ( RID_STR_UNO_START + 5 ) -#define STR_CTW_UNSUPPORTED_COLUMN_TYPE ( RID_STR_UNO_START + 6 ) -#define STR_CTW_ILLEGAL_PARAMETER_COUNT ( RID_STR_UNO_START + 7 ) -#define STR_CTW_ERROR_DURING_INITIALIZATION ( RID_STR_UNO_START + 8 ) -#define STR_CTW_ERROR_UNSUPPORTED_SETTING ( RID_STR_UNO_START + 9 ) -#define STR_CTW_ERROR_NO_QUERY ( RID_STR_UNO_START + 10 ) -#define STR_CTW_ERROR_INVALID_INTERACTIONHANDLER ( RID_STR_UNO_START + 11 ) - -// please adjust when inserting new strings: -#define RID_STR_UNO_LAST_USED STR_CTW_ERROR_INVALID_INTERACTIONHANDLER - -#if RID_STR_UNO_LAST_USED >= RID_STR_UNO_END -#error too many resources in uno .... -#endif - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx index 956158f40e3f..29280e01c897 100644 --- a/dbaccess/source/ui/inc/dbwiz.hxx +++ b/dbaccess/source/ui/inc/dbwiz.hxx @@ -25,7 +25,7 @@ #include "IItemSetHelper.hxx" #include #include -#include "moduledbu.hxx" +#include "core_resource.hxx" #include namespace com { namespace sun { namespace star { @@ -52,10 +52,10 @@ class OGeneralPage; class ODbDataSourceAdministrationHelper; /** tab dialog for administrating the office wide registered data sources */ -class ODbTypeWizDialog : public svt::OWizardMachine , public IItemSetHelper, public IDatabaseSettingsDialog,public dbaui::OModuleClient +class ODbTypeWizDialog : public svt::OWizardMachine , public IItemSetHelper, public IDatabaseSettingsDialog, public dbaccess::OModuleClient { private: - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; std::unique_ptr m_pImpl; SfxItemSet* m_pOutSet; ::dbaccess::ODsnTypeCollection* diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx index b02986503b0d..ec4fe02bca21 100644 --- a/dbaccess/source/ui/inc/dbwizsetup.hxx +++ b/dbaccess/source/ui/inc/dbwizsetup.hxx @@ -28,7 +28,7 @@ #include #include #include -#include "moduledbu.hxx" +#include "core_resource.hxx" namespace com { namespace sun { namespace star { namespace beans { @@ -56,11 +56,10 @@ class ODbDataSourceAdministrationHelper; class OMySQLIntroPageSetup; class OFinalDBPageSetup; -class ODbTypeWizDialogSetup : public svt::RoadmapWizard , public IItemSetHelper, public IDatabaseSettingsDialog,public dbaui::OModuleClient +class ODbTypeWizDialogSetup : public svt::RoadmapWizard , public IItemSetHelper, public IDatabaseSettingsDialog, public dbaccess::OModuleClient { - private: - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; std::unique_ptr m_pImpl; SfxItemSet* m_pOutSet; OUString m_sURL; diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx index 21c2f083cb10..88cf84be00c0 100644 --- a/dbaccess/source/ui/inc/directsql.hxx +++ b/dbaccess/source/ui/inc/directsql.hxx @@ -32,7 +32,7 @@ #include #include -#include "moduledbu.hxx" +#include "core_resource.hxx" #include #include @@ -46,7 +46,7 @@ namespace dbaui ,public ::utl::OEventListenerAdapter { protected: - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; ::osl::Mutex m_aMutex; VclPtr m_pSQL; diff --git a/dbaccess/source/ui/inc/formadapter.hxx b/dbaccess/source/ui/inc/formadapter.hxx index 20aaf70cac7d..2ceea1f294e6 100644 --- a/dbaccess/source/ui/inc/formadapter.hxx +++ b/dbaccess/source/ui/inc/formadapter.hxx @@ -58,7 +58,7 @@ #include #include #include -#include "moduledbu.hxx" +#include "core_resource.hxx" namespace dbaui { @@ -120,7 +120,7 @@ namespace dbaui ,public SbaXFormAdapter_BASE3 { private: - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; css::uno::Reference< css::sdbc::XRowSet > m_xMainForm; ::osl::Mutex m_aMutex; diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx index 39f7bd96fd80..034e28bb0856 100644 --- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx +++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_INDEXFIELDSCONTROL_HXX #define INCLUDED_DBACCESS_SOURCE_UI_INC_INDEXFIELDSCONTROL_HXX -#include "moduledbu.hxx" +#include "core_resource.hxx" #include #include "indexcollection.hxx" #include @@ -33,7 +33,7 @@ namespace dbaui // IndexFieldsControl class IndexFieldsControl : public ::svt::EditBrowseBox { - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; protected: IndexFields m_aSavedValue; diff --git a/dbaccess/source/ui/inc/moduledbu.hxx b/dbaccess/source/ui/inc/moduledbu.hxx deleted file mode 100644 index d4e7463eb301..000000000000 --- a/dbaccess/source/ui/inc/moduledbu.hxx +++ /dev/null @@ -1,85 +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_DBACCESS_SOURCE_UI_INC_MODULEDBU_HXX -#define INCLUDED_DBACCESS_SOURCE_UI_INC_MODULEDBU_HXX - -#include -#include - -class ResMgr; - -namespace dbaui -{ - -// OModule -class OModuleImpl; -class OModule -{ - friend class OModuleClient; - -private: - OModule() = delete; //TODO: get rid of this class - -protected: - static ::osl::Mutex s_aMutex; /// access safety - static sal_Int32 s_nClients; /// number of registered clients - static OModuleImpl* s_pImpl; /// impl class. lives as long as at least one client for the module is registered - -public: - /// get the vcl res manager of the module - static ResMgr* getResManager(); - -protected: - /// register a client for the module - static void registerClient(); - /// revoke a client for the module - static void revokeClient(); - -private: - /** ensure that the impl class exists - @precond m_aMutex is guarded when this method gets called - */ - static void ensureImpl(); -}; - -// OModuleClient -/** base class for objects which uses any global module-specific resources -*/ -class OModuleClient -{ -public: - OModuleClient() { OModule::registerClient(); } - ~OModuleClient() { OModule::revokeClient(); } -}; - -// ModuleRes -/** specialized ResId, using the resource manager provided by the global module -*/ -class ModuleRes : public ::ResId -{ -public: - ModuleRes(sal_uInt16 _nId) : ResId(_nId, *OModule::getResManager()) { } -}; - -} // namespace dbaui - -#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_MODULEDBU_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/undosqledit.hxx b/dbaccess/source/ui/inc/undosqledit.hxx index 2309ba1176a2..6fb2ef9c915f 100644 --- a/dbaccess/source/ui/inc/undosqledit.hxx +++ b/dbaccess/source/ui/inc/undosqledit.hxx @@ -20,8 +20,8 @@ #define INCLUDED_DBACCESS_SOURCE_UI_INC_UNDOSQLEDIT_HXX #include "GeneralUndo.hxx" -#include "dbu_control.hrc" #include +#include "strings.hrc" namespace dbaui { diff --git a/dbaccess/source/ui/inc/unoadmin.hxx b/dbaccess/source/ui/inc/unoadmin.hxx index 4629cb6419d0..d4d75f32b720 100644 --- a/dbaccess/source/ui/inc/unoadmin.hxx +++ b/dbaccess/source/ui/inc/unoadmin.hxx @@ -23,7 +23,7 @@ #include #include #include "dsntypes.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" class SfxItemSet; class SfxItemPool; @@ -37,7 +37,7 @@ typedef ::svt::OGenericUnoDialog ODatabaseAdministrationDialogBase; class ODatabaseAdministrationDialog :public ODatabaseAdministrationDialogBase { - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; protected: SfxItemSet* m_pDatasourceItems; // item set for the dialog SfxItemPool* m_pItemPool; // item pool for the item set for the dialog diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx index 44e6250748ca..0731c1405b43 100644 --- a/dbaccess/source/ui/inc/unosqlmessage.hxx +++ b/dbaccess/source/ui/inc/unosqlmessage.hxx @@ -22,7 +22,7 @@ #include #include -#include "moduledbu.hxx" +#include "core_resource.hxx" namespace dbaui { @@ -32,7 +32,7 @@ class OSQLMessageDialog :public OSQLMessageDialogBase ,public ::comphelper::OPropertyArrayUsageHelper< OSQLMessageDialog > { - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; protected: // css::uno::Any m_aException; diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index 1e8cc8d585e7..7851fc23e46f 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -18,7 +18,7 @@ */ #include "DExport.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include #include @@ -33,8 +33,10 @@ #include #include #include -#include "dbustrings.hrc" -#include "dbu_misc.hrc" +#include "core_resource.hxx" +#include "stringconstants.hxx" +#include "strings.hrc" +#include "strings.hxx" #include #include #include @@ -746,7 +748,7 @@ void ODatabaseExport::showErrorDialog(const css::sdbc::SQLException& e) { OUString aMsg = e.Message + "\n" - + OUString(ModuleRes( STR_QRY_CONTINUE )); + + DBA_RES( STR_QRY_CONTINUE ); ScopedVclPtrInstance< OSQLWarningBox > aBox( nullptr, aMsg, WB_YES_NO | WB_DEF_NO ); if (aBox->Execute() == RET_YES) diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx index fc14c73d3775..e7fa222acbe8 100644 --- a/dbaccess/source/ui/misc/HtmlReader.cxx +++ b/dbaccess/source/ui/misc/HtmlReader.cxx @@ -25,11 +25,11 @@ #include #include #include -#include "dbu_misc.hrc" -#include "dbustrings.hrc" +#include "strings.hrc" +#include "stringconstants.hxx" #include #include -#include "moduledbu.hxx" +#include "core_resource.hxx" #include #include #include @@ -52,6 +52,7 @@ #include "QEnumTypes.hxx" #include "WCPage.hxx" #include +#include "core_resource.hxx" #include "UITools.hxx" #include #include @@ -390,7 +391,7 @@ sal_Int16 OHTMLReader::GetWidthPixel( const HTMLOption& rOption ) bool OHTMLReader::CreateTable(HtmlTokenId nToken) { - OUString aTempName(ModuleRes(STR_TBL_TITLE)); + OUString aTempName(DBA_RES(STR_TBL_TITLE)); aTempName = aTempName.getToken(0,' '); aTempName = ::dbtools::createUniqueName(m_xTables, aTempName); @@ -429,7 +430,7 @@ bool OHTMLReader::CreateTable(HtmlTokenId nToken) { aColumnName = comphelper::string::strip(aColumnName, ' ' ); if (aColumnName.isEmpty() || m_bAppendFirstLine ) - aColumnName = ModuleRes(STR_COLUMN_NAME); + aColumnName = DBA_RES(STR_COLUMN_NAME); else if ( !m_sCurrent.isEmpty() ) aColumnName = m_sCurrent; diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx index 10915243142d..94f6b2182b35 100644 --- a/dbaccess/source/ui/misc/RowSetDrop.cxx +++ b/dbaccess/source/ui/misc/RowSetDrop.cxx @@ -21,10 +21,12 @@ #include "TokenWriter.hxx" #include #include -#include "dbu_misc.hrc" +#include "core_resource.hxx" +#include "strings.hrc" +#include "strings.hxx" #include "sqlmessage.hxx" #include -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include #include @@ -61,7 +63,7 @@ void ORowSetImportExport::initialize() m_xTargetResultSetMetaData = Reference(m_xTargetResultSetUpdate,UNO_QUERY)->getMetaData(); if(!m_xTargetResultSetMetaData.is() || !xColumnLocate.is() || !m_xResultSetMetaData.is() ) - throw SQLException(ModuleRes(STR_UNEXPECTED_ERROR),*this,"S1000",0,Any()); + throw SQLException(DBA_RES(STR_UNEXPECTED_ERROR),*this,"S1000",0,Any()); sal_Int32 nCount = m_xTargetResultSetMetaData->getColumnCount(); m_aColumnMapping.reserve(nCount); @@ -236,7 +238,7 @@ bool ORowSetImportExport::insertNewRow() { if(!m_bAlreadyAsked) { - OUString sAskIfContinue = ModuleRes(STR_ERROR_OCCURRED_WHILE_COPYING); + OUString sAskIfContinue = DBA_RES(STR_ERROR_OCCURRED_WHILE_COPYING); ScopedVclPtrInstance< OSQLWarningBox > aDlg( m_pParent, sAskIfContinue, WB_YES_NO | WB_DEF_YES ); if(aDlg->Execute() == RET_YES) m_bAlreadyAsked = true; diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx index 613af226b697..1cf32f7846f5 100644 --- a/dbaccess/source/ui/misc/RtfReader.cxx +++ b/dbaccess/source/ui/misc/RtfReader.cxx @@ -31,10 +31,11 @@ #include #include #include -#include "dbustrings.hrc" +#include "core_resource.hxx" +#include "stringconstants.hxx" #include #include -#include "dbu_misc.hrc" +#include "strings.hrc" #include #include #include @@ -42,7 +43,7 @@ #include #include #include "WExtendPages.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "QEnumTypes.hxx" #include "UITools.hxx" #include @@ -243,7 +244,7 @@ void ORTFReader::NextToken( int nToken ) bool ORTFReader::CreateTable(int nToken) { - OUString aTableName(ModuleRes(STR_TBL_TITLE)); + OUString aTableName(DBA_RES(STR_TBL_TITLE)); aTableName = aTableName.getToken(0,' '); aTableName = ::dbtools::createUniqueName(m_xTables, aTableName); @@ -274,7 +275,7 @@ bool ORTFReader::CreateTable(int nToken) { aColumnName = comphelper::string::strip(aColumnName, ' '); if (aColumnName.isEmpty() || m_bAppendFirstLine ) - aColumnName = ModuleRes(STR_COLUMN_NAME); + aColumnName = DBA_RES(STR_COLUMN_NAME); CreateDefaultColumn(aColumnName); aColumnName.clear(); @@ -305,7 +306,7 @@ bool ORTFReader::CreateTable(int nToken) if ( !aColumnName.isEmpty() ) { if ( m_bAppendFirstLine ) - aColumnName = ModuleRes(STR_COLUMN_NAME); + aColumnName = DBA_RES(STR_COLUMN_NAME); CreateDefaultColumn(aColumnName); } diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx index a52e7c8176ab..9fc346f5440e 100644 --- a/dbaccess/source/ui/misc/TableCopyHelper.cxx +++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx @@ -18,7 +18,10 @@ */ #include "TableCopyHelper.hxx" -#include "dbustrings.hrc" +#include "core_resource.hxx" +#include "stringconstants.hxx" +#include "strings.hrc" +#include "strings.hxx" #include "sqlmessage.hxx" #include #include "WCopyTable.hxx" @@ -35,7 +38,7 @@ #include "TokenWriter.hxx" #include "UITools.hxx" #include -#include "dbu_resource.hrc" +#include "dbu_pageids.hxx" #include #include #include @@ -204,7 +207,7 @@ void OTableCopyHelper::pasteTable( SotClipboardFormatId _nFormatId aTrans.bHtml = SotClipboardFormatId::HTML == _nFormatId; aTrans.sDefaultTableName = GetTableNameForAppend(); if ( !bOk || !copyTagTable(aTrans,false,_xConnection) ) - m_pController->showError(SQLException(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE), *m_pController, "S1000", 0, Any())); + m_pController->showError(SQLException(DBA_RES(STR_NO_TABLE_FORMAT_INSIDE), *m_pController, "S1000", 0, Any())); } catch(const SQLException&) { @@ -216,7 +219,7 @@ void OTableCopyHelper::pasteTable( SotClipboardFormatId _nFormatId } } else - m_pController->showError(SQLException(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE), *m_pController, "S1000", 0, Any())); + m_pController->showError(SQLException(DBA_RES(STR_NO_TABLE_FORMAT_INSIDE), *m_pController, "S1000", 0, Any())); } void OTableCopyHelper::pasteTable( const TransferableDataHelper& _rTransData @@ -313,7 +316,7 @@ void OTableCopyHelper::asyncCopyTagTable( DropDescriptor& _rDesc else if ( !_rDesc.bError ) pasteTable(_rDesc.aDroppedData,i_rDestDataSource,_xConnection); else - m_pController->showError(SQLException(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE), *m_pController, "S1000", 0, Any())); + m_pController->showError(SQLException(DBA_RES(STR_NO_TABLE_FORMAT_INSIDE), *m_pController, "S1000", 0, Any())); } } // namespace dbaui diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index 83da3ae851a0..8bbf60e1eb56 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -24,7 +24,8 @@ #include #include "RtfReader.hxx" #include "HtmlReader.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include #include #include diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 7881de2c27df..671be050b77c 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -20,8 +20,9 @@ #include "UITools.hxx" #include #include "callbacks.hxx" -#include "dbustrings.hrc" -#include "dbu_resource.hrc" +#include "core_resource.hxx" +#include "stringconstants.hxx" +#include "dbu_pageids.hxx" #include "dlgsave.hxx" #include "dbtreelistbox.hxx" #include "defaultobjectnamecheck.hxx" @@ -87,7 +88,7 @@ #include #include #include -#include "dbu_misc.hrc" +#include "strings.hrc" #include "sqlmessage.hxx" #include #include @@ -227,7 +228,7 @@ Reference< XDataSource > getDataSourceByName( const OUString& _rDataSourceName, ) ) { - OUString sErrorMessage( ModuleRes( STR_FILE_DOES_NOT_EXIST ) ); + OUString sErrorMessage( DBA_RES( STR_FILE_DOES_NOT_EXIST ) ); OFileNotation aTransformer( e.Message ); sErrorMessage = sErrorMessage.replaceFirst( "$file$", aTransformer.get( OFileNotation::N_SYSTEM ) ); aSQLError = SQLExceptionInfo( sErrorMessage ).get(); @@ -933,7 +934,7 @@ bool appendToFilter(const Reference& _xConnection, { if(! ::dbaui::checkDataSourceAvailable(::comphelper::getString(xProp->getPropertyValue(PROPERTY_NAME)),_rxContext)) { - OUString aMessage(ModuleRes(STR_TABLEDESIGN_DATASOURCE_DELETED)); + OUString aMessage(DBA_RES(STR_TABLEDESIGN_DATASOURCE_DELETED)); ScopedVclPtrInstance(_pParent, aMessage)->Execute(); bRet = false; } @@ -1204,15 +1205,15 @@ TOTypeInfoSP queryTypeInfoByType(sal_Int32 _nDataType,const OTypeInfoMap& _rType return pTypeInfo; } -sal_Int32 askForUserAction(vcl::Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _nText,bool _bAll,const OUString& _sName) +sal_Int32 askForUserAction(vcl::Window* _pParent, const char* pTitle, const char* pText, bool _bAll, const OUString& _sName) { SolarMutexGuard aGuard; - OUString aMsg = ModuleRes(_nText); + OUString aMsg = DBA_RES(pText); aMsg = aMsg.replaceFirst("%1", _sName); - ScopedVclPtrInstance< OSQLMessageBox > aAsk(_pParent, ModuleRes(_nTitle ), aMsg,WB_YES_NO | WB_DEF_YES,OSQLMessageBox::Query); + ScopedVclPtrInstance aAsk(_pParent, DBA_RES(pTitle), aMsg,WB_YES_NO | WB_DEF_YES,OSQLMessageBox::Query); if ( _bAll ) { - aAsk->AddButton(ModuleRes(STR_BUTTON_TEXT_ALL), RET_ALL); + aAsk->AddButton(DBA_RES(STR_BUTTON_TEXT_ALL), RET_ALL); aAsk->GetPushButton(RET_ALL)->SetHelpId(HID_CONFIRM_DROP_BUTTON_ALL); } return aAsk->Execute(); @@ -1346,8 +1347,8 @@ bool insertHierachyElement( vcl::Window* _pParent, const Reference< XComponentCo if ( !sNewName.isEmpty() ) sTargetName = sNewName; else - sTargetName = ModuleRes( _bCollection ? STR_NEW_FOLDER : ((_bForm) ? RID_STR_FORM : RID_STR_REPORT)); - sLabel = ModuleRes( _bCollection ? STR_FOLDER_LABEL : ((_bForm) ? STR_FRM_LABEL : STR_RPT_LABEL)); + sTargetName = DBA_RES( _bCollection ? STR_NEW_FOLDER : ((_bForm) ? RID_STR_FORM : RID_STR_REPORT)); + sLabel = DBA_RES( _bCollection ? STR_FOLDER_LABEL : ((_bForm) ? STR_FRM_LABEL : STR_RPT_LABEL)); sTargetName = ::dbtools::createUniqueName(xNameAccess,sTargetName); // here we have everything needed to create a new query object ... @@ -1369,7 +1370,7 @@ bool insertHierachyElement( vcl::Window* _pParent, const Reference< XComponentCo } else if ( xNameAccess->hasByName(sNewName) ) { - OUString sError(ModuleRes(STR_NAME_ALREADY_EXISTS)); + OUString sError(DBA_RES(STR_NAME_ALREADY_EXISTS)); sError = sError.replaceFirst("#",sNewName); throw SQLException(sError,nullptr,"S1000",0,Any()); } diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx index 14918971caaf..e76ba60e5c64 100644 --- a/dbaccess/source/ui/misc/WCPage.cxx +++ b/dbaccess/source/ui/misc/WCPage.cxx @@ -24,7 +24,8 @@ #include "defaultobjectnamecheck.hxx" #include "dbaccess_helpid.hrc" -#include "dbu_misc.hrc" +#include "strings.hrc" +#include "core_resource.hxx" #include #include #include @@ -35,7 +36,7 @@ #include #include #include "UITools.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include using namespace ::dbaui; @@ -95,7 +96,7 @@ OCopyTable::OCopyTable(vcl::Window * pParent) m_pEdKeyName->SetMaxTextLen(nMaxLen ? nMaxLen : EDIT_NOLIMIT); } - SetText(ModuleRes(STR_COPYTABLE_TITLE_COPY)); + SetText(DBA_RES(STR_COPYTABLE_TITLE_COPY)); } OCopyTable::~OCopyTable() @@ -169,7 +170,7 @@ bool OCopyTable::LeavePage() SQLExceptionInfo aErrorInfo; if ( !aNameCheck.isNameValid( m_pEdTableName->GetText(), aErrorInfo ) ) { - aErrorInfo.append( SQLExceptionInfo::TYPE::SQLContext, ModuleRes( STR_SUGGEST_APPEND_TABLE_DATA ) ); + aErrorInfo.append( SQLExceptionInfo::TYPE::SQLContext, DBA_RES( STR_SUGGEST_APPEND_TABLE_DATA ) ); m_pParent->showError(aErrorInfo.get()); return false; @@ -189,7 +190,7 @@ bool OCopyTable::LeavePage() sal_Int32 nMaxLength = xMeta->getMaxTableNameLength(); if ( nMaxLength && sTable.getLength() > nMaxLength ) { - m_pParent->showError(ModuleRes(STR_INVALID_TABLE_NAME_LENGTH)); + m_pParent->showError(DBA_RES(STR_INVALID_TABLE_NAME_LENGTH)); return false; } @@ -197,7 +198,7 @@ bool OCopyTable::LeavePage() if ( m_pParent->m_bCreatePrimaryKeyColumn && m_pParent->m_aKeyName != m_pParent->createUniqueName(m_pParent->m_aKeyName) ) { - m_pParent->showError(OUString(ModuleRes(STR_WIZ_NAME_ALREADY_DEFINED)) + " " + m_pParent->m_aKeyName); + m_pParent->showError(DBA_RES(STR_WIZ_NAME_ALREADY_DEFINED) + " " + m_pParent->m_aKeyName); return false; } } @@ -228,7 +229,7 @@ bool OCopyTable::LeavePage() if(m_pParent->m_sName.isEmpty()) { - m_pParent->showError(ModuleRes(STR_INVALID_TABLE_NAME)); + m_pParent->showError(DBA_RES(STR_INVALID_TABLE_NAME)); return false; } @@ -245,7 +246,7 @@ void OCopyTable::ActivatePage() OUString OCopyTable::GetTitle() const { - return ModuleRes(STR_WIZ_TABLE_COPY); + return DBA_RES(STR_WIZ_TABLE_COPY); } void OCopyTable::Reset() @@ -301,7 +302,7 @@ bool OCopyTable::checkAppendData() if ( !xTable.is() ) { - m_pParent->showError(ModuleRes(STR_INVALID_TABLE_NAME)); + m_pParent->showError(DBA_RES(STR_INVALID_TABLE_NAME)); return false; } return true; diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx index 127d6ffee4ef..f9fcff3e4f1f 100644 --- a/dbaccess/source/ui/misc/WColumnSelect.cxx +++ b/dbaccess/source/ui/misc/WColumnSelect.cxx @@ -18,17 +18,18 @@ */ #include "WColumnSelect.hxx" -#include "dbu_misc.hrc" +#include "strings.hrc" #include #include "WCopyTable.hxx" #include #include #include -#include "moduledbu.hxx" +#include "core_resource.hxx" #include #include #include -#include "dbustrings.hrc" +#include "core_resource.hxx" +#include "stringconstants.hxx" #include using namespace ::com::sun::star::uno; @@ -40,7 +41,7 @@ using namespace dbaui; namespace CopyTableOperation = ::com::sun::star::sdb::application::CopyTableOperation; -OUString OWizColumnSelect::GetTitle() const { return ModuleRes(STR_WIZ_COLUMN_SELECT_TITEL); } +OUString OWizColumnSelect::GetTitle() const { return DBA_RES(STR_WIZ_COLUMN_SELECT_TITEL); } OWizardPage::OWizardPage(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription) : TabPage(pParent, rID, rUIXMLDescription) diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 196da5dfbd3f..40c7b42119ba 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -17,9 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "dbu_misc.hrc" -#include "dbustrings.hrc" -#include "moduledbu.hxx" +#include "strings.hrc" +#include "strings.hxx" +#include "stringconstants.hxx" +#include "core_resource.hxx" +#include "core_resource.hxx" #include "sqlmessage.hxx" #include "UITools.hxx" #include "WColumnSelect.hxx" @@ -509,7 +511,7 @@ OCopyTableWizard::OCopyTableWizard( vcl::Window * pParent, const OUString& _rDef ,m_xFormatter( getNumberFormatter( _xConnection, _rxContext ) ) ,m_xContext(_rxContext) ,m_xInteractionHandler(_xInteractionHandler) - ,m_sTypeNames(ModuleRes(STR_TABLEDESIGN_DBFIELDTYPES)) + ,m_sTypeNames(DBA_RES(STR_TABLEDESIGN_DBFIELDTYPES)) ,m_nPageCount(0) ,m_bDeleteSourceColumns(true) ,m_bInterConnectionCopy( _xSourceConnection != _xConnection ) @@ -601,7 +603,7 @@ OCopyTableWizard::OCopyTableWizard( vcl::Window* pParent, const OUString& _rDefa ,m_rSourceObject( DummyCopySource::Instance() ) ,m_xFormatter(_xFormatter) ,m_xContext(_rxContext) - ,m_sTypeNames(ModuleRes(STR_TABLEDESIGN_DBFIELDTYPES)) + ,m_sTypeNames(DBA_RES(STR_TABLEDESIGN_DBFIELDTYPES)) ,m_nPageCount(0) ,m_bDeleteSourceColumns(false) ,m_bInterConnectionCopy( false ) @@ -651,9 +653,9 @@ void OCopyTableWizard::construct() m_pbNext->SetSizePixel( LogicToPixel( Size( 50, 14 ), MapUnit::MapAppFont ) ); m_pbFinish->SetSizePixel( LogicToPixel( Size( 50, 14 ), MapUnit::MapAppFont ) ); - m_pbPrev->SetText(ModuleRes(STR_WIZ_PB_PREV)); - m_pbNext->SetText(ModuleRes(STR_WIZ_PB_NEXT)); - m_pbFinish->SetText(ModuleRes(STR_WIZ_PB_OK)); + m_pbPrev->SetText(DBA_RES(STR_WIZ_PB_PREV)); + m_pbNext->SetText(DBA_RES(STR_WIZ_PB_NEXT)); + m_pbFinish->SetText(DBA_RES(STR_WIZ_PB_OK)); m_pbHelp->Show(); m_pbCancel->Show(); @@ -878,7 +880,7 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl, Button*, void) if ( aFind == m_vDestColumns.end() && m_xInteractionHandler.is() ) { - OUString sMsg(ModuleRes(STR_TABLEDESIGN_NO_PRIM_KEY)); + OUString sMsg(DBA_RES(STR_TABLEDESIGN_NO_PRIM_KEY)); SQLContext aError; aError.Message = sMsg; ::rtl::Reference< ::comphelper::OInteractionRequest > xRequest( new ::comphelper::OInteractionRequest( makeAny( aError ) ) ); @@ -1543,7 +1545,7 @@ OUString OCopyTableWizard::createUniqueName(const OUString& _sName) void OCopyTableWizard::showColumnTypeNotSupported(const OUString& _rColumnName) { - OUString sMessage( ModuleRes( STR_UNKNOWN_TYPE_FOUND ) ); + OUString sMessage( DBA_RES( STR_UNKNOWN_TYPE_FOUND ) ); sMessage = sMessage.replaceFirst("#1",_rColumnName); showError(sMessage); } diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx index 1a5938d3914e..f06388a5e9a9 100644 --- a/dbaccess/source/ui/misc/WNameMatch.cxx +++ b/dbaccess/source/ui/misc/WNameMatch.cxx @@ -22,7 +22,8 @@ #include "FieldDescriptions.hxx" #include "WCopyTable.hxx" #include "dbaccess_helpid.hrc" -#include "dbu_misc.hrc" +#include "core_resource.hxx" +#include "strings.hrc" #include "bitmaps.hlst" #include #include @@ -201,7 +202,7 @@ bool OWizNameMatching::LeavePage() return true; } -OUString OWizNameMatching::GetTitle() const { return ModuleRes(STR_WIZ_NAME_MATCHING_TITEL); } +OUString OWizNameMatching::GetTitle() const { return DBA_RES(STR_WIZ_NAME_MATCHING_TITEL); } IMPL_LINK( OWizNameMatching, ButtonClickHdl, Button *, pButton, void ) { diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index 31c58ed4a6c7..f10fcd592d62 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -18,17 +18,18 @@ */ #include "WTypeSelect.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include "bitmaps.hlst" #include #include #include "FieldDescriptions.hxx" #include "WCopyTable.hxx" #include "dbaccess_helpid.hrc" -#include "dbu_misc.hrc" +#include "strings.hrc" #include #include #include "UITools.hxx" +#include "core_resource.hxx" #include "sqlmessage.hxx" #include "FieldControls.hxx" #include @@ -138,7 +139,7 @@ void OWizTypeSelectControl::CellModified(long nRow, sal_uInt16 nColId ) if ( bDoubleName ) { - OUString strMessage = ModuleRes(STR_TABLEDESIGN_DUPLICATE_NAME); + OUString strMessage = DBA_RES(STR_TABLEDESIGN_DUPLICATE_NAME); strMessage = strMessage.replaceFirst("$column$", sNewName); pWiz->showError(strMessage); pCurFieldDescr->SetName(sName); @@ -274,7 +275,7 @@ void OWizTypeSelect::dispose() OUString OWizTypeSelect::GetTitle() const { - return ModuleRes(STR_WIZ_TYPE_SELECT_TITEL); + return DBA_RES(STR_WIZ_TYPE_SELECT_TITEL); } IMPL_LINK_NOARG( OWizTypeSelect, ColumnSelectHdl, ListBox&, void ) diff --git a/dbaccess/source/ui/misc/WizardPages.src b/dbaccess/source/ui/misc/WizardPages.src deleted file mode 100644 index 5f1b15426ee4..000000000000 --- a/dbaccess/source/ui/misc/WizardPages.src +++ /dev/null @@ -1,83 +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 "dbu_misc.hrc" -#include "dbaccess_helpid.hrc" -#include "dbaccess_slotid.hrc" - -String STR_WIZ_COLUMN_SELECT_TITEL -{ - Text [ en-US ] = "Apply columns"; -}; - -String STR_WIZ_TYPE_SELECT_TITEL -{ - Text [ en-US ] = "Type formatting"; -}; - -String STR_WIZ_NAME_ALREADY_DEFINED -{ - Text [ en-US ] = "Enter a unique name for the new primary key data field.\nThe following name is already in use:"; -}; - -String STR_WIZ_NAME_MATCHING_TITEL -{ - Text [ en-US ] = "Assign columns" ; -}; - -String STR_WIZ_PB_PREV -{ - Text [ en-US ] = "< ~Back"; -}; - -String STR_WIZ_PB_NEXT -{ - Text [ en-US ] = "~Next>"; -}; - -String STR_WIZ_PB_OK -{ - Text [ en-US ] = "C~reate"; -}; - -String STR_WIZ_TABLE_COPY -{ - Text [ en-US ] = "Copy table" ; -}; - -String STR_COPYTABLE_TITLE_COPY -{ - Text [ en-US ] = "Copy table" ; -}; - -String STR_INVALID_TABLE_NAME -{ - Text [ en-US ] = "This table name is not valid in the current database."; -}; -String STR_SUGGEST_APPEND_TABLE_DATA -{ - Text [ en-US ] = "Choose the option 'Append data' on the first page to append data to an existing table."; -}; - -String STR_INVALID_TABLE_NAME_LENGTH -{ - Text [ en-US ] = "Please change the table name. It is too long."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/charsets.cxx b/dbaccess/source/ui/misc/charsets.cxx index fd5801a5cad7..78f60be945bd 100644 --- a/dbaccess/source/ui/misc/charsets.cxx +++ b/dbaccess/source/ui/misc/charsets.cxx @@ -18,11 +18,11 @@ */ #include "charsets.hxx" +#include "core_resource.hxx" #include -#include "dbu_misc.hrc" +#include "strings.hrc" #include -#include -#include "moduledbu.hxx" +#include "core_resource.hxx" namespace dbaui { @@ -30,9 +30,8 @@ namespace dbaui // OCharsetDisplay OCharsetDisplay::OCharsetDisplay() - :OCharsetMap() - ,SvxTextEncodingTable() - , m_aSystemDisplayName(ModuleRes( STR_RSC_CHARSETS )) + : OCharsetMap() + , m_aSystemDisplayName(DBA_RES( STR_RSC_CHARSETS )) { } @@ -44,7 +43,7 @@ namespace dbaui if ( RTL_TEXTENCODING_DONTKNOW == _eEncoding ) return true; - return !GetTextString(_eEncoding).isEmpty(); + return !SvxTextEncodingTable::GetTextString(_eEncoding).isEmpty(); } OCharsetDisplay::const_iterator OCharsetDisplay::begin() const @@ -74,7 +73,7 @@ namespace dbaui rtl_TextEncoding eEncoding = RTL_TEXTENCODING_DONTKNOW; if ( _rDisplayName != m_aSystemDisplayName ) { - eEncoding = GetTextEncoding( _rDisplayName ); + eEncoding = SvxTextEncodingTable::GetTextEncoding(_rDisplayName); OSL_ENSURE( RTL_TEXTENCODING_DONTKNOW != eEncoding, "OCharsetDisplay::find: non-empty display name, but DONTKNOW!" ); } @@ -116,7 +115,7 @@ namespace dbaui rtl_TextEncoding eEncoding = (*m_aPosition).getEncoding(); return CharsetDisplayDerefHelper( *m_aPosition, - RTL_TEXTENCODING_DONTKNOW == eEncoding ? m_pContainer->m_aSystemDisplayName : m_pContainer->GetTextString( eEncoding ) + RTL_TEXTENCODING_DONTKNOW == eEncoding ? m_pContainer->m_aSystemDisplayName : SvxTextEncodingTable::GetTextString(eEncoding) ); } diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx b/dbaccess/source/ui/misc/databaseobjectview.cxx index d92e9b244a81..745d31adc9a5 100644 --- a/dbaccess/source/ui/misc/databaseobjectview.cxx +++ b/dbaccess/source/ui/misc/databaseobjectview.cxx @@ -18,7 +18,8 @@ */ #include "databaseobjectview.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include "asyncmodaldialog.hxx" #include diff --git a/dbaccess/source/ui/misc/datasourceconnector.cxx b/dbaccess/source/ui/misc/datasourceconnector.cxx index 174e92c72d86..e0992eb01a15 100644 --- a/dbaccess/source/ui/misc/datasourceconnector.cxx +++ b/dbaccess/source/ui/misc/datasourceconnector.cxx @@ -17,9 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "core_resource.hxx" #include "datasourceconnector.hxx" #include -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include #include #include @@ -39,8 +40,9 @@ #include #include #include -#include "dbu_misc.hrc" -#include "moduledbu.hxx" +#include "strings.hrc" +#include "strings.hxx" +#include "core_resource.hxx" namespace dbaui { @@ -159,7 +161,7 @@ namespace dbaui Any aWarnings( xConnectionWarnings->getWarnings() ); if ( aWarnings.hasValue() ) { - OUString sMessage( ModuleRes( STR_WARNINGS_DURING_CONNECT ) ); + OUString sMessage( DBA_RES( STR_WARNINGS_DURING_CONNECT ) ); sMessage = sMessage.replaceFirst( "$buttontext$", Button::GetStandardText( StandardButtonType::More ) ); sMessage = OutputDevice::GetNonMnemonicString( sMessage ); diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx index 2e780c7a0b2a..6ef9d424d536 100644 --- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx +++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx @@ -19,10 +19,12 @@ #include "browserids.hxx" #include "commontypes.hxx" +#include "core_resource.hxx" #include -#include "dbu_misc.hrc" -#include "dbustrings.hrc" -#include "moduledbu.hxx" +#include "strings.hrc" +#include "strings.hxx" +#include "stringconstants.hxx" +#include "core_resource.hxx" #include #include @@ -124,7 +126,7 @@ namespace dbaui ::boost::optional< bool > m_aDocScriptSupport; public: - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; ::dbtools::SQLExceptionInfo m_aCurrentError; ::comphelper::OInterfaceContainerHelper2 @@ -303,7 +305,7 @@ namespace dbaui bool bReConnect = true; if ( _bUI ) { - ScopedVclPtrInstance< MessageDialog > aQuery(getView(), ModuleRes(STR_QUERY_CONNECTION_LOST), VclMessageType::Question, VclButtonsType::YesNo); + ScopedVclPtrInstance< MessageDialog > aQuery(getView(), DBA_RES(STR_QUERY_CONNECTION_LOST), VclMessageType::Question, VclButtonsType::YesNo); bReConnect = ( RET_YES == aQuery->Execute() ); } @@ -444,7 +446,7 @@ namespace dbaui } void DBSubComponentController::connectionLostMessage() const { - OUString aMessage(ModuleRes(RID_STR_CONNECTION_LOST)); + OUString aMessage(DBA_RES(RID_STR_CONNECTION_LOST)); Reference< XWindow > xWindow = getTopMostContainerWindow(); vcl::Window* pWin = nullptr; if ( xWindow.is() ) diff --git a/dbaccess/source/ui/misc/dbumiscres.src b/dbaccess/source/ui/misc/dbumiscres.src deleted file mode 100644 index 5a4e1c9dd688..000000000000 --- a/dbaccess/source/ui/misc/dbumiscres.src +++ /dev/null @@ -1,88 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "dbu_misc.hrc" - -String STR_RSC_CHARSETS -{ - Text [ en-US ] = "System"; -}; - -String STR_ERROR_DURING_CREATION -{ - Text [ en-US ] = "Error during creation"; -}; - -String STR_UNEXPECTED_ERROR -{ - Text [ en-US ] = "An unexpected error occurred. The operation could not be performed."; -}; - -String STR_COULDNOTOPEN_LINKEDDOC -{ - Text [ en-US ] = "The document \"$file$\" could not be opened."; -}; - -String STR_MISSING_TABLES_XDROP -{ - Text [ en-US ] = "The table cannot be deleted because the database connection does not support this."; -}; - -String STR_BUTTON_TEXT_ALL -{ - Text [ en-US ] = "~All"; -}; - -String STR_UNDO_COLON -{ - Text [ en-US ] = "Undo:"; -}; - -String STR_REDO_COLON -{ - Text [ en-US ] = "Redo:"; -}; - -String STR_UNKNOWN_TYPE_FOUND -{ - Text [ en-US ] = "No corresponding column type could be found for column '#1'." ; -}; - -String STR_FILE_DOES_NOT_EXIST -{ - Text[ en-US ] = "The file \"$file$\" does not exist."; -}; - -String STR_WARNINGS_DURING_CONNECT -{ - Text [ en-US ] = "Warnings were encountered while connecting to the data source. Press \"$buttontext$\" to view them."; -}; - -String STR_NAMED_OBJECT_ALREADY_EXISTS -{ - Text [ en-US ] = "The name '$#$' already exists.\nPlease enter another name." ; -}; - -String RID_STR_EXTENSION_NOT_PRESENT -{ - // #i96130# use hard coded name - Text [ en-US ] = "The report, \"$file$\", requires the Oracle Report Builder feature."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx index 59f10c042cba..d4325e99090a 100644 --- a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx +++ b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx @@ -17,11 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "core_resource.hxx" #include "defaultobjectnamecheck.hxx" -#include "dbu_misc.hrc" +#include "strings.hrc" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include #include @@ -61,7 +62,7 @@ namespace dbaui void lcl_fillNameExistsError( const OUString& _rObjectName, SQLExceptionInfo& _out_rErrorToDisplay ) { SQLException aError; - OUString sErrorMessage = ModuleRes(STR_NAMED_OBJECT_ALREADY_EXISTS); + OUString sErrorMessage = DBA_RES(STR_NAMED_OBJECT_ALREADY_EXISTS); aError.Message = sErrorMessage.replaceAll("$#$", _rObjectName); _out_rErrorToDisplay = aError; } diff --git a/dbaccess/source/ui/misc/imageprovider.cxx b/dbaccess/source/ui/misc/imageprovider.cxx index 80ceaa47f7e5..cc9de382e17d 100644 --- a/dbaccess/source/ui/misc/imageprovider.cxx +++ b/dbaccess/source/ui/misc/imageprovider.cxx @@ -18,9 +18,9 @@ */ #include "imageprovider.hxx" -#include "dbu_resource.hrc" -#include "moduledbu.hxx" -#include "dbustrings.hrc" +#include "dbu_pageids.hxx" +#include "core_resource.hxx" +#include "stringconstants.hxx" #include "bitmaps.hlst" #include diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx index 0e006a5a95ef..3c70c3f10c8d 100644 --- a/dbaccess/source/ui/misc/linkeddocuments.cxx +++ b/dbaccess/source/ui/misc/linkeddocuments.cxx @@ -17,11 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "core_resource.hxx" #include "linkeddocuments.hxx" #include #include #include -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include #include #include @@ -36,11 +37,12 @@ #include #include #include -#include "dbu_misc.hrc" +#include "strings.hrc" +#include "strings.hxx" #include #include "browserids.hxx" #include -#include "moduledbu.hxx" +#include "core_resource.hxx" #include #include #include @@ -319,7 +321,7 @@ namespace dbaui xRet = impl_open( _rLinkName, _xDefinition, _eOpenMode, _rAdditionalArgs ); if ( !xRet.is() ) { - OUString sMessage = ModuleRes(STR_COULDNOTOPEN_LINKEDDOC); + OUString sMessage = DBA_RES(STR_COULDNOTOPEN_LINKEDDOC); sMessage = sMessage.replaceFirst("$file$",_rLinkName); css::sdbc::SQLException aSQLException; @@ -336,11 +338,11 @@ namespace dbaui aInfo = dbtools::SQLExceptionInfo(aSQLException); // more like a hack, insert an empty message - OUString sText( ModuleRes( RID_STR_EXTENSION_NOT_PRESENT ) ); + OUString sText( DBA_RES( RID_STR_EXTENSION_NOT_PRESENT ) ); sText = sText.replaceFirst("$file$",_rLinkName); aInfo.prepend(sText); - OUString sMessage = ModuleRes(STR_COULDNOTOPEN_LINKEDDOC); + OUString sMessage = DBA_RES(STR_COULDNOTOPEN_LINKEDDOC); sMessage = sMessage.replaceFirst("$file$",_rLinkName); aInfo.prepend(sMessage); } @@ -358,7 +360,7 @@ namespace dbaui // more like a hack, insert an empty message aInfo.prepend(" \n"); - OUString sMessage = ModuleRes(STR_COULDNOTOPEN_LINKEDDOC); + OUString sMessage = DBA_RES(STR_COULDNOTOPEN_LINKEDDOC); sMessage = sMessage.replaceFirst("$file$",_rLinkName); aInfo.prepend(sMessage); } diff --git a/dbaccess/source/ui/misc/moduledbu.cxx b/dbaccess/source/ui/misc/moduledbu.cxx deleted file mode 100644 index 340990a2c39e..000000000000 --- a/dbaccess/source/ui/misc/moduledbu.cxx +++ /dev/null @@ -1,101 +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 -#include "moduledbu.hxx" - -#include -#include - -#define ENTER_MOD_METHOD() \ - ::osl::MutexGuard aGuard(s_aMutex); \ - ensureImpl() - -namespace dbaui -{ - -// OModuleImpl -/** implementation for OModule. not threadsafe, has to be guarded by its owner -*/ -class OModuleImpl -{ - std::unique_ptr m_pResources; - -public: - /// ctor - OModuleImpl(); - - /// get the manager for the resources of the module - ResMgr* getResManager(); -}; - -OModuleImpl::OModuleImpl() - :m_pResources(nullptr) -{ - -} - -ResMgr* OModuleImpl::getResManager() -{ - // note that this method is not threadsafe, which counts for the whole class ! - - if (!m_pResources) - { - // create a manager with a fixed prefix - m_pResources.reset( ResMgr::CreateResMgr("dbu") ); - } - return m_pResources.get(); -} - -// OModule -::osl::Mutex OModule::s_aMutex; -sal_Int32 OModule::s_nClients = 0; -OModuleImpl* OModule::s_pImpl = nullptr; -ResMgr* OModule::getResManager() -{ - ENTER_MOD_METHOD(); - return s_pImpl->getResManager(); -} - -void OModule::registerClient() -{ - ::osl::MutexGuard aGuard(s_aMutex); - ++s_nClients; -} - -void OModule::revokeClient() -{ - ::osl::MutexGuard aGuard(s_aMutex); - if (!--s_nClients && s_pImpl) - { - delete s_pImpl; - s_pImpl = nullptr; - } -} - -void OModule::ensureImpl() -{ - if (s_pImpl) - return; - s_pImpl = new OModuleImpl(); -} - -} // namespace dbaui - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/singledoccontroller.cxx b/dbaccess/source/ui/misc/singledoccontroller.cxx index a76c75343ada..4575f44872fe 100644 --- a/dbaccess/source/ui/misc/singledoccontroller.cxx +++ b/dbaccess/source/ui/misc/singledoccontroller.cxx @@ -19,11 +19,12 @@ #include #include +#include "core_resource.hxx" #include "singledoccontroller.hxx" #include "browserids.hxx" -#include "dbu_misc.hrc" -#include "dbustrings.hrc" -#include "moduledbu.hxx" +#include "strings.hrc" +#include "stringconstants.hxx" +#include "core_resource.hxx" #include @@ -104,7 +105,7 @@ namespace dbaui aReturn.bEnabled = isEditable() && GetUndoManager().GetUndoActionCount() != 0; if ( aReturn.bEnabled ) { - OUString sUndo(ModuleRes(STR_UNDO_COLON)); + OUString sUndo(DBA_RES(STR_UNDO_COLON)); sUndo += " "; sUndo += GetUndoManager().GetUndoActionComment(); aReturn.sTitle = sUndo; @@ -115,7 +116,7 @@ namespace dbaui aReturn.bEnabled = isEditable() && GetUndoManager().GetRedoActionCount() != 0; if ( aReturn.bEnabled ) { - OUString sRedo(ModuleRes(STR_REDO_COLON)); + OUString sRedo(DBA_RES(STR_REDO_COLON)); sRedo += " "; sRedo += GetUndoManager().GetRedoActionComment(); aReturn.sTitle = sRedo; diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index 7241301b61c5..bd74faf16769 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -18,10 +18,10 @@ */ #include -#include "dbu_qry.hrc" +#include "strings.hrc" #include "browserids.hxx" #include -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include #include #include diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx index f8573dcec78b..1661a3a6aad1 100644 --- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx +++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx @@ -25,7 +25,7 @@ #include #include #include "browserids.hxx" -#include "dbu_qry.hrc" +#include "strings.hrc" #include #include #include @@ -34,7 +34,7 @@ #include "ConnectionLine.hxx" #include "ConnectionLineData.hxx" #include "TableConnectionData.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include #include "UITools.hxx" #include diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index cf51c60fee1f..9061365658c5 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -21,7 +21,7 @@ #include #include "querycontroller.hxx" #include "JoinDesignView.hxx" -#include "dbu_qry.hrc" +#include "strings.hrc" #include "TableWindow.hxx" #include "TableWindowListBox.hxx" #include "TableConnection.hxx" diff --git a/dbaccess/source/ui/querydesign/LimitBox.cxx b/dbaccess/source/ui/querydesign/LimitBox.cxx index 83661aa0eb12..7c2a991db627 100644 --- a/dbaccess/source/ui/querydesign/LimitBox.cxx +++ b/dbaccess/source/ui/querydesign/LimitBox.cxx @@ -9,10 +9,11 @@ #include #include "LimitBox.hxx" -#include "dbu_qry.hrc" -#include "moduledbu.hxx" +#include "strings.hrc" +#include "core_resource.hxx" +#include "core_resource.hxx" -#define ALL_STRING ModuleRes(STR_QUERY_LIMIT_ALL) +#define ALL_STRING DBA_RES(STR_QUERY_LIMIT_ALL) #define ALL_INT -1 namespace global{ diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx index c45b2f11a33a..30f98e857eab 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.cxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx @@ -19,7 +19,7 @@ #include "QTableWindow.hxx" #include "QueryTableView.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include #include "dbaccess_helpid.hrc" #include "QueryDesignView.hxx" @@ -27,7 +27,8 @@ #include "querycontroller.hxx" #include #include "TableWindowListBox.hxx" -#include "dbu_qry.hrc" +#include "strings.hrc" +#include "strings.hxx" #include #include #include diff --git a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx index 543e6a7ca9b6..582ca7912a32 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx @@ -20,7 +20,7 @@ #define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYDESIGNFIELDUNDOACT_HXX #include "GeneralUndo.hxx" -#include "dbu_qry.hrc" +#include "strings.hrc" #include "SelectionBrowseBox.hxx" namespace dbaui @@ -37,7 +37,7 @@ namespace dbaui virtual void Redo() override = 0; public: - OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, sal_uInt16 nCommentID); + OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, const char* pCommentID); virtual ~OQueryDesignFieldUndoAct() override; void SetColumnPosition(sal_uInt16 _nColumnPosition) @@ -92,7 +92,7 @@ namespace dbaui OTableFieldDescRef pDescr; // the deleted column description public: - OTabFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, sal_uInt16 nCommentID) : OQueryDesignFieldUndoAct(pSelBrwBox, nCommentID) { } + OTabFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, const char* pCommentID) : OQueryDesignFieldUndoAct(pSelBrwBox, pCommentID) { } void SetTabFieldDescr(OTableFieldDescRef const & pDescription) { pDescr = pDescription; } }; diff --git a/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx b/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx index 9166a2e782c4..f5ab95bd49d1 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx +++ b/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx @@ -32,7 +32,7 @@ namespace dbaui VclPtr m_pOwner; // in this container it all happens public: - OQueryDesignUndoAction(OJoinTableView* pOwner, sal_uInt16 nCommentID) : OCommentUndoAction(nCommentID), m_pOwner(pOwner) { } + OQueryDesignUndoAction(OJoinTableView* pOwner, const char* pCommentID) : OCommentUndoAction(pCommentID), m_pOwner(pOwner) { } }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYDESIGNUNDOACTION_HXX diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 6cce6ebd7c9a..add95f7cac3a 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -34,7 +34,8 @@ #include #include "browserids.hxx" #include "SelectionBrowseBox.hxx" -#include "dbu_qry.hrc" +#include "strings.hrc" +#include "strings.hxx" #include #include #include @@ -50,7 +51,8 @@ #include "ConnectionLine.hxx" #include "ConnectionLineData.hxx" #include "QTableConnectionData.hxx" -#include "dbustrings.hrc" +#include "core_resource.hxx" +#include "stringconstants.hxx" #include "UITools.hxx" #include "querycontainerwindow.hxx" #include "sqlmessage.hxx" @@ -265,7 +267,7 @@ namespace if ( !bErg ) { eErrorCode = eColumnNotFound; - OUString sError(ModuleRes(STR_QRY_COLUMN_NOT_FOUND)); + OUString sError(DBA_RES(STR_QRY_COLUMN_NOT_FOUND)); sError = sError.replaceFirst("$name$",aColumnName); _pView->getController().appendError( sError ); @@ -273,7 +275,7 @@ namespace { Reference xMeta = _pView->getController().getConnection()->getMetaData(); if ( xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers() ) - _pView->getController().appendError( OUString( ModuleRes( STR_QRY_CHECK_CASESENSITIVE ) ) ); + _pView->getController().appendError(DBA_RES(STR_QRY_CHECK_CASESENSITIVE)); } catch(Exception&) { @@ -565,7 +567,7 @@ namespace SQL_ISRULE(pNode->getChild(2),column_ref) && pNode->getChild(1)->getNodeType() == SQLNodeType::Equal)) { - OUString sError(ModuleRes(STR_QRY_JOIN_COLUMN_COMPARE)); + OUString sError(DBA_RES(STR_QRY_JOIN_COLUMN_COMPARE)); _pView->getController().appendError( sError ); return eIllegalJoin; } @@ -749,7 +751,7 @@ namespace { // only show the messagebox the first time if (!bCritsOnAsterikWarning) - ScopedVclPtrInstance(_pView, ModuleRes( STR_QRY_CRITERIA_ON_ASTERISK))->Execute(); + ScopedVclPtrInstance(_pView, DBA_RES(STR_QRY_CRITERIA_ON_ASTERISK))->Execute(); bCritsOnAsterikWarning = true; continue; } @@ -903,7 +905,7 @@ namespace { // only show the MessageBox the first time if (!bCritsOnAsterikWarning) - ScopedVclPtrInstance(_pView, ModuleRes( STR_QRY_ORDERBY_ON_ASTERISK))->Execute(); + ScopedVclPtrInstance(_pView, DBA_RES(STR_QRY_ORDERBY_ON_ASTERISK))->Execute(); bCritsOnAsterikWarning = true; continue; } @@ -1396,7 +1398,7 @@ namespace else { eErrorCode = eNoColumnInLike; - OUString sError(ModuleRes(STR_QRY_LIKE_LEFT_NO_COLUMN)); + OUString sError(DBA_RES(STR_QRY_LIKE_LEFT_NO_COLUMN)); _pView->getController().appendError( sError ); } } @@ -2403,47 +2405,46 @@ namespace OUString getParseErrorMessage( SqlParseError _eErrorCode ) { - sal_uInt16 nResId; - switch(_eErrorCode) + const char* pResId; + switch (_eErrorCode) { case eIllegalJoin: - nResId = STR_QRY_ILLEGAL_JOIN; + pResId = STR_QRY_ILLEGAL_JOIN; break; case eStatementTooLong: - nResId = STR_QRY_TOO_LONG_STATEMENT; + pResId = STR_QRY_TOO_LONG_STATEMENT; break; case eNoConnection: - nResId = STR_QRY_SYNTAX; + pResId = STR_QRY_SYNTAX; break; case eNoSelectStatement: - nResId = STR_QRY_NOSELECT; + pResId = STR_QRY_NOSELECT; break; case eNoColumnInLike: - nResId = STR_QRY_SYNTAX; + pResId = STR_QRY_SYNTAX; break; case eColumnNotFound: - nResId = STR_QRY_SYNTAX; + pResId = STR_QRY_SYNTAX; break; case eNativeMode: - nResId = STR_QRY_NATIVE; + pResId = STR_QRY_NATIVE; break; case eTooManyTables: - nResId = STR_QRY_TOO_MANY_TABLES; + pResId = STR_QRY_TOO_MANY_TABLES; break; case eTooManyColumns: - nResId = STR_QRY_TOO_MANY_COLUMNS; + pResId = STR_QRY_TOO_MANY_COLUMNS; break; case eStatementTooComplex: - nResId = STR_QRY_TOOCOMPLEX; + pResId = STR_QRY_TOOCOMPLEX; break; default: - nResId = STR_QRY_SYNTAX; + pResId = STR_QRY_SYNTAX; break; } ; - return OUString( ModuleRes( nResId ) ); + return DBA_RES(pResId); } - } // end of anonymouse namespace diff --git a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx index a1790f977a6c..b97ae8b42e10 100644 --- a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx @@ -20,7 +20,7 @@ #define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYMOVETABWINUNDOACT_HXX #include "QueryDesignUndoAction.hxx" -#include "dbu_qry.hrc" +#include "strings.hrc" #include namespace dbaui diff --git a/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx index 7cc039a01343..4ea75f11e4bc 100644 --- a/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx @@ -20,7 +20,7 @@ #define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYSIZETABWINUNDOACT_HXX #include "QueryDesignUndoAction.hxx" -#include "dbu_qry.hrc" +#include "strings.hrc" namespace dbaui { diff --git a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx index 4ce5d3eb75a3..6f7eeec54f96 100644 --- a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx +++ b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx @@ -23,7 +23,7 @@ #include "QueryTableView.hxx" #include "QueryAddTabConnUndoAction.hxx" #include "QueryTabWinShowUndoAct.hxx" -#include "dbu_qry.hrc" +#include "strings.hrc" using namespace dbaui; @@ -36,8 +36,8 @@ OQueryTabConnUndoAction::~OQueryTabConnUndoAction() } } -OQueryTabConnUndoAction::OQueryTabConnUndoAction(OQueryTableView* pOwner, sal_uInt16 nCommentID) - :OQueryDesignUndoAction(pOwner, nCommentID) +OQueryTabConnUndoAction::OQueryTabConnUndoAction(OQueryTableView* pOwner, const char* pCommentID) + :OQueryDesignUndoAction(pOwner, pCommentID) ,m_pConnection(nullptr) ,m_bOwnerOfConn(false) { diff --git a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx index 729153968588..d71068b24ba2 100644 --- a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx +++ b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx @@ -33,7 +33,7 @@ namespace dbaui // am I the only owner of the connection? (changes with every redo and undo) public: - OQueryTabConnUndoAction(OQueryTableView* pOwner, sal_uInt16 nCommentID); + OQueryTabConnUndoAction(OQueryTableView* pOwner, const char* pCommentID); virtual ~OQueryTabConnUndoAction() override; virtual void Undo() override = 0; diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx index 079d7a392bae..8b7ec538d769 100644 --- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx +++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx @@ -27,8 +27,8 @@ #include "QueryTableView.hxx" using namespace dbaui; -OQueryDesignFieldUndoAct::OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, sal_uInt16 nCommentID) - : OCommentUndoAction(nCommentID) +OQueryDesignFieldUndoAct::OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, const char* pCommentID) + : OCommentUndoAction(pCommentID) , pOwner(pSelBrwBox) , m_nColumnPosition(BROWSER_INVALIDID) { @@ -39,8 +39,8 @@ OQueryDesignFieldUndoAct::~OQueryDesignFieldUndoAct() pOwner = nullptr; } -OQueryTabWinUndoAct::OQueryTabWinUndoAct(OQueryTableView* pOwner, sal_uInt16 nCommentID) - : OQueryDesignUndoAction(pOwner, nCommentID) +OQueryTabWinUndoAct::OQueryTabWinUndoAct(OQueryTableView* pOwner, const char* pCommentID) + : OQueryDesignUndoAction(pOwner, pCommentID) , m_pTabWin(nullptr) , m_bOwnerOfObjects(false) { diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx index e0bfd9658a19..3b637c62d6ce 100644 --- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx @@ -39,7 +39,7 @@ namespace dbaui // am I the only owner of the managed objects? (changes with every redo or undo) public: - OQueryTabWinUndoAct(OQueryTableView* pOwner, sal_uInt16 nCommentID); + OQueryTabWinUndoAct(OQueryTableView* pOwner, const char* pCommentID); virtual ~OQueryTabWinUndoAct() override; void SetOwnership(bool bTakeIt) { m_bOwnerOfObjects = bTakeIt; } diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx index 4d84cd288de2..330acaa7a626 100644 --- a/dbaccess/source/ui/querydesign/QueryTableView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx @@ -40,13 +40,14 @@ #include #include #include -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include #include #include "querydlg.hxx" #include "JoinExchange.hxx" #include -#include "dbu_qry.hrc" +#include "strings.hrc" +#include "strings.hxx" #include #include "svtools/treelistentry.hxx" @@ -696,7 +697,7 @@ void OQueryTableView::RemoveTabWin(OTableWindow* pTabWin) OQueryDesignView* pParent = static_cast(getDesignView()); SfxUndoManager& rUndoMgr = m_pView->getController().GetUndoManager(); - rUndoMgr.EnterListAction( OUString( ModuleRes(STR_QUERY_UNDO_TABWINDELETE) ), OUString(), 0, ViewShellId(-1) ); + rUndoMgr.EnterListAction(DBA_RES(STR_QUERY_UNDO_TABWINDELETE) , OUString(), 0, ViewShellId(-1)); // add the Undo-Action OQueryTabWinDelUndoAct* pUndoAction = new OQueryTabWinDelUndoAct(this); @@ -902,7 +903,7 @@ bool OQueryTableView::ExistsAVisitedConn(const OQueryTableWindow* pFrom) const void OQueryTableView::onNoColumns_throw() { - OUString sError( ModuleRes( STR_STATEMENT_WITHOUT_RESULT_SET ) ); + OUString sError(DBA_RES(STR_STATEMENT_WITHOUT_RESULT_SET)); ::dbtools::throwSQLException( sError, ::dbtools::StandardSQLState::GENERAL_ERROR, nullptr ); } diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx index c92eeaf1dfb6..0ce7d09ab064 100644 --- a/dbaccess/source/ui/querydesign/QueryTextView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx @@ -24,8 +24,8 @@ #include "undosqledit.hxx" #include "browserids.hxx" #include "querycontroller.hxx" -#include "dbu_qry.hrc" -#include "dbustrings.hrc" +#include "strings.hrc" +#include "stringconstants.hxx" #include #include #include diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx index 15763e629518..d5463f10415a 100644 --- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx +++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx @@ -21,7 +21,7 @@ #include "QueryDesignView.hxx" #include "QueryTextView.hxx" #include "querycontainerwindow.hxx" -#include "dbu_qry.hrc" +#include "strings.hrc" #include "browserids.hxx" #include "adtabdlg.hxx" #include "querycontroller.hxx" diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 3d9f49ec3a7c..4c66586c9a8e 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -30,10 +30,11 @@ #include #include #include "TableFieldInfo.hxx" -#include "dbu_qry.hrc" +#include "strings.hrc" +#include "strings.hxx" #include "dbaccess_helpid.hrc" #include -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include "QTableWindow.hxx" #include #include @@ -98,7 +99,7 @@ OSelectionBrowseBox::OSelectionBrowseBox( vcl::Window* pParent ) BrowserMode::HIDECURSOR | BrowserMode::HLINES | BrowserMode::VLINES ) ,m_nSeekRow(0) ,m_nMaxColumns(0) - ,m_aFunctionStrings(ModuleRes(STR_QUERY_FUNCTIONS)) + ,m_aFunctionStrings(DBA_RES(STR_QUERY_FUNCTIONS)) ,m_nVisibleCount(0) ,m_nLastSortColumn(SORT_COLUMN_NONE) ,m_bOrderByUnRelated(true) @@ -135,7 +136,7 @@ OSelectionBrowseBox::OSelectionBrowseBox( vcl::Window* pParent ) aTitleFont.SetFontSize(Size(0, 6)); SetTitleFont(aTitleFont); - OUString aTxt(ModuleRes(STR_QUERY_SORTTEXT)); + OUString aTxt(DBA_RES(STR_QUERY_SORTTEXT)); sal_Int32 nCount = comphelper::string::getTokenCount(aTxt, ';'); for (sal_Int32 nIdx = 0; nIdx < nCount; nIdx++) m_pOrderCell->InsertEntry(aTxt.getToken(nIdx, ';')); @@ -498,11 +499,11 @@ void OSelectionBrowseBox::InitController(CellControllerRef& /*rController*/, lon for(;aIter != aEnd;++aIter) m_pTableCell->InsertEntry(static_cast(aIter->second.get())->GetAliasName()); - m_pTableCell->InsertEntry(OUString(ModuleRes(STR_QUERY_NOTABLE)), 0); + m_pTableCell->InsertEntry(DBA_RES(STR_QUERY_NOTABLE), 0); if (!pEntry->GetAlias().isEmpty()) m_pTableCell->SelectEntry(pEntry->GetAlias()); else - m_pTableCell->SelectEntry(OUString(ModuleRes(STR_QUERY_NOTABLE))); + m_pTableCell->SelectEntry(DBA_RES(STR_QUERY_NOTABLE)); } } break; case BROW_VIS_ROW: @@ -520,7 +521,7 @@ void OSelectionBrowseBox::InitController(CellControllerRef& /*rController*/, lon m_pVisibleCell->GetBox().SaveValue(); m_pVisibleCell->GetBox().Disable(); m_pVisibleCell->GetBox().EnableInput(false); - OUString aMessage(ModuleRes(STR_QRY_ORDERBY_UNRELATED)); + OUString aMessage(DBA_RES(STR_QRY_ORDERBY_UNRELATED)); OQueryDesignView* paDView = getDesignView(); ScopedVclPtrInstance(paDView, aMessage)->Execute(); } @@ -610,7 +611,7 @@ bool OSelectionBrowseBox::fillColumnRef(const OUString& _sColumnName, const OUSt sal_uInt16 nTabCount = 0; if ( !static_cast(getDesignView()->getTableView())->FindTableFromField(_sColumnName,_pEntry,nTabCount) ) // error occurred: column not in table window { - OUString sErrorMsg(ModuleRes(RID_STR_FIELD_DOESNT_EXIST)); + OUString sErrorMsg(DBA_RES(RID_STR_FIELD_DOESNT_EXIST)); sErrorMsg = sErrorMsg.replaceFirst("$name$",_sColumnName); ScopedVclPtrInstance(this, sErrorMsg)->Execute(); bError = true; @@ -714,7 +715,7 @@ bool OSelectionBrowseBox::saveField(OUString& _sFieldName ,OTableFieldDescRef& _ if ( pParseNode == nullptr ) { // something different which we have to check - OUString sErrorMessage( ModuleRes( STR_QRY_COLUMN_NOT_FOUND ) ); + OUString sErrorMessage( DBA_RES( STR_QRY_COLUMN_NOT_FOUND ) ); sErrorMessage = sErrorMessage.replaceFirst("$name$",_sFieldName); ScopedVclPtrInstance(this, sErrorMessage)->Execute(); @@ -870,7 +871,7 @@ bool OSelectionBrowseBox::saveField(OUString& _sFieldName ,OTableFieldDescRef& _ if ( i > 0 && !InsertField(aSelEntry,BROWSER_INVALIDID,true,false).is() ) // may we have to append more than one field { // the field could not be inserted - OUString sErrorMessage( ModuleRes( RID_STR_FIELD_DOESNT_EXIST ) ); + OUString sErrorMessage( DBA_RES( RID_STR_FIELD_DOESNT_EXIST ) ); sErrorMessage = sErrorMessage.replaceFirst("$name$",aSelEntry->GetField()); ScopedVclPtrInstance(this, sErrorMessage)->Execute(); bError = true; @@ -1231,7 +1232,7 @@ void OSelectionBrowseBox::PaintStatusCell(OutputDevice& rDev, const tools::Recta { tools::Rectangle aRect(rRect); aRect.TopLeft().Y() -= 2; - OUString aLabel(ModuleRes(STR_QUERY_HANDLETEXT)); + OUString aLabel(DBA_RES(STR_QUERY_HANDLETEXT)); // from BROW_CRIT2_ROW onwards all rows are shown "or" sal_Int32 nToken = (m_nSeekRow >= GetBrowseRow(BROW_CRIT2_ROW)) @@ -2127,7 +2128,7 @@ OUString OSelectionBrowseBox::GetCellText(long nRow, sal_uInt16 nColId) const } break; case BROW_ORDER_ROW: if (pEntry->GetOrderDir() != ORDER_NONE) - aText = OUString(ModuleRes(STR_QUERY_SORTTEXT)).getToken(sal::static_int_cast< sal_uInt16 >(pEntry->GetOrderDir()), ';'); + aText = DBA_RES(STR_QUERY_SORTTEXT).getToken(sal::static_int_cast< sal_uInt16 >(pEntry->GetOrderDir()), ';'); break; case BROW_VIS_ROW: break; @@ -2560,7 +2561,7 @@ void OSelectionBrowseBox::DeactivateCell(bool _bUpdate) OUString OSelectionBrowseBox::GetRowDescription( sal_Int32 _nRow ) const { - OUString aLabel(ModuleRes(STR_QUERY_HANDLETEXT)); + OUString aLabel(DBA_RES(STR_QUERY_HANDLETEXT)); // from BROW_CRIT2_ROW onwards all rows are shown as "or" sal_Int32 nToken = (_nRow >= GetBrowseRow(BROW_CRIT2_ROW)) diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index 01c7c45465fd..e821efc8b5f6 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -35,8 +35,8 @@ #include #include #include "querycontroller.hxx" -#include "dbu_qry.hrc" -#include "dbustrings.hrc" +#include "strings.hrc" +#include "stringconstants.hxx" #include "bitmaps.hlst" #include #include "UITools.hxx" diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx index 1998abcf86c7..121807118f94 100644 --- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx @@ -30,7 +30,7 @@ #include #include #include -#include "dbu_qry.hrc" +#include "strings.hrc" namespace dbaui { diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx index 06e67b7f7c9b..231952f62f65 100644 --- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx @@ -24,10 +24,10 @@ #include #include #include -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include "TableWindowListBox.hxx" #include "TableConnection.hxx" -#include "dbu_qry.hrc" +#include "strings.hrc" #include "QueryDesignView.hxx" #include "JoinController.hxx" diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx index 4ad0049a1eef..e1a8517e3d35 100644 --- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx +++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx @@ -21,7 +21,7 @@ #include "LimitBox.hxx" #include "dbu_reghelper.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" using namespace ::com::sun::star; diff --git a/dbaccess/source/ui/querydesign/query.src b/dbaccess/source/ui/querydesign/query.src deleted file mode 100644 index 6dfe7c0aa48d..000000000000 --- a/dbaccess/source/ui/querydesign/query.src +++ /dev/null @@ -1,241 +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 "dbu_qry.hrc" -#include "browserids.hxx" -#include "dbaccess_helpid.hrc" - -String STR_QUERY_UNDO_TABWINSHOW -{ - Text [ en-US ] = "Add Table Window" ; -}; - -String STR_QUERY_UNDO_MOVETABWIN -{ - Text [ en-US ] = "Move table window" ; -}; -String STR_QUERY_UNDO_INSERTCONNECTION -{ - Text [ en-US ] = "Insert Join" ; -}; - -String STR_QUERY_UNDO_REMOVECONNECTION -{ - Text [ en-US ] = "Delete Join" ; -}; - -String STR_QUERY_UNDO_SIZETABWIN -{ - Text [ en-US ] = "Resize table window" ; -}; -String STR_QUERY_UNDO_TABFIELDDELETE -{ - Text [ en-US ] = "Delete Column" ; -}; - -String STR_QUERY_UNDO_TABFIELDMOVED -{ - Text [ en-US ] = "Move column"; -}; - -String STR_QUERY_UNDO_TABFIELDCREATE -{ - Text [ en-US ] = "Add Column" ; -}; - -String RID_STR_FIELD_DOESNT_EXIST -{ - Text [ en-US ] = "Invalid expression, field name '$name$' does not exist."; -}; - -String STR_QUERY_UNDO_TABWINDELETE -{ - Text [ en-US ] = "Delete Table Window" ; -}; - -String STR_QUERY_UNDO_MODIFY_CELL -{ - Text [ en-US ] = "Edit Column Description"; -}; - -String STR_QUERY_UNDO_SIZE_COLUMN -{ - Text [ en-US ] = "Adjust column width"; -}; - -String STR_QUERY_SORTTEXT -{ - Text [ en-US ] = "(not sorted);ascending;descending" ; -}; - -String STR_QUERY_FUNCTIONS -{ - Text [ en-US ] = "(no function);Group"; -}; - -String STR_QUERY_NOTABLE -{ - Text [ en-US ] = "(no table)"; -}; - -String STR_QRY_ORDERBY_UNRELATED -{ - Text [ en-US ] = "The database only supports sorting for visible fields."; -}; - -String STR_QUERY_HANDLETEXT -{ - Text [ en-US ] = "Field;Alias;Table;Sort;Visible;Function;Criterion;Or;Or"; -}; - -String STR_QUERY_LIMIT_ALL -{ - Text [ en-US ] = "All"; -}; - -String STR_QRY_TOO_MANY_COLUMNS -{ - Text [ en-US ] = "There are too many columns."; -}; - -String STR_QRY_CRITERIA_ON_ASTERISK -{ - Text [ en-US ] = "A condition cannot be applied to field [*]" ; -}; - -String STR_QRY_TOO_LONG_STATEMENT -{ - Text [ en-US ] = "The SQL statement created is too long."; -}; - -String STR_QRY_TOOCOMPLEX -{ - Text [ en-US ] = "Query is too complex" ; -}; - -String STR_QRY_NOSELECT -{ - Text [ en-US ] = "Nothing has been selected." ; -}; - -String STR_QRY_SYNTAX -{ - Text [ en-US ] = "SQL syntax error" ; -}; - -String STR_QRY_ORDERBY_ON_ASTERISK -{ - Text [ en-US ] = "[*] cannot be used as a sort criterion."; -}; - -String STR_QRY_TOO_MANY_TABLES -{ - Text [ en-US ] = "There are too many tables."; -}; - -String STR_QRY_NATIVE -{ - Text [ en-US ] = "The statement will not be applied when querying in the SQL dialect of the database." ; -}; - -String STR_QRY_ILLEGAL_JOIN -{ - Text [ en-US ] = "Join could not be processed" ; -}; - -String STR_SVT_SQL_SYNTAX_ERROR -{ - Text [ en-US ] = "Syntax error in SQL statement" ; -}; - -String STR_QUERYDESIGN_NO_VIEW_SUPPORT -{ - Text [ en-US ] = "This database does not support table views."; -}; - -String STR_NO_ALTER_VIEW_SUPPORT -{ - Text [ en-US ] = "This database does not support altering of existing table views."; -}; - -String STR_QUERYDESIGN_NO_VIEW_ASK -{ - Text [ en-US ] = "Do you want to create a query instead?"; -}; - -String STR_DATASOURCE_DELETED -{ - Text [ en-US ] = "The corresponding data source has been deleted. Therefore, data relevant to that data source cannot be saved."; -}; - -String STR_QRY_COLUMN_NOT_FOUND -{ - Text [ en-US ] = "The column '$name$' is unknown."; -}; - -String STR_QRY_JOIN_COLUMN_COMPARE -{ - Text [ en-US ] = "Columns can only be compared using '='."; -}; - -String STR_QRY_LIKE_LEFT_NO_COLUMN -{ - Text [ en-US ] = "You must use a column name before 'LIKE'."; -}; - -String STR_QRY_CHECK_CASESENSITIVE -{ - Text [ en-US ] = "The column could not be found. Please note that the database is case-sensitive."; -}; - -String STR_QUERY_SAVEMODIFIED -{ - Text [ en-US ] = "$object$ has been changed.\nDo you want to save the changes?" ; - Text [ x-comment ] = "For $object$, one of the values of the RSC_QUERY_OBJECT_TYPE resource will be inserted."; -}; - -String STR_ERROR_PARSING_STATEMENT -{ - Text [ en-US ] = "$object$ is based on an SQL command which could not be parsed."; - Text [ x-comment ] = "For $object$, one of the values of the RSC_QUERY_OBJECT_TYPE resource " - "(except \"SQL command\", which doesn't make sense here) will be inserted."; -}; - -String STR_INFO_OPENING_IN_SQL_VIEW -{ - Text [ en-US ] = "$object$ will be opened in SQL view."; - Text [ x-comment ] = "For $object$, one of the values of the RSC_QUERY_OBJECT_TYPE resource " - "(except \"SQL command\", which doesn't make sense here) will be inserted."; -}; - -StringArray RSC_QUERY_OBJECT_TYPE -{ - ItemList [ en-US ] = - { - < "The table view"; >; - < "The query"; >; - < "The SQL statement"; >; - }; -}; - -String STR_STATEMENT_WITHOUT_RESULT_SET -{ - Text [ en-US ] = "The query does not create a result set, and thus cannot be part of another query."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx index f6d30e1e3c32..03b504faaa51 100644 --- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx +++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx @@ -23,7 +23,8 @@ #include #include "JoinController.hxx" #include -#include "dbustrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include #include #include "UITools.hxx" diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index f2a3300374e0..4472d9375441 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -19,9 +19,12 @@ #include "adtabdlg.hxx" #include "browserids.hxx" -#include "dbu_qry.hrc" +#include "core_resource.hxx" +#include "strings.hrc" +#include "query.hrc" #include "dbu_reghelper.hxx" -#include "dbustrings.hrc" +#include "dbu_pageids.hxx" +#include "stringconstants.hxx" #include "defaultobjectnamecheck.hxx" #include "dlgsave.hxx" #include "uiservices.hxx" @@ -72,7 +75,6 @@ #include #include #include -#include #include #include #include @@ -209,12 +211,10 @@ namespace dbaui namespace { - OUString lcl_getObjectResourceString( sal_uInt16 _nResId, sal_Int32 _nCommandType ) + OUString lcl_getObjectResourceString(const char* pResId, sal_Int32 _nCommandType) { - OUString sMessageText = ModuleRes( _nResId ); - ModuleRes aResId(RSC_QUERY_OBJECT_TYPE); - ResStringArray aResList(aResId); - OUString sObjectType = aResList.GetString(_nCommandType); + OUString sMessageText = DBA_RES(pResId); + OUString sObjectType = DBA_RES(RSC_QUERY_OBJECT_TYPE[_nCommandType]); sMessageText = sMessageText.replaceFirst( "$object$", sObjectType ); return sMessageText; } @@ -601,7 +601,7 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& if ( m_pSqlIterator->getStatementType() != OSQLStatementType::Select || rTabs.begin() == rTabs.end() ) { aError = SQLException( - ModuleRes( STR_QRY_NOSELECT ), + DBA_RES(STR_QRY_NOSELECT), nullptr, "S1000", 1000, @@ -624,7 +624,7 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& else { aError = SQLException( - ModuleRes( STR_QRY_SYNTAX ), + DBA_RES(STR_QRY_SYNTAX), nullptr, "S1000", 1000, @@ -654,7 +654,7 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& break; case SID_BROWSER_CLEAR_QUERY: { - GetUndoManager().EnterListAction( OUString( ModuleRes(STR_QUERY_UNDO_TABWINDELETE) ), OUString(), 0, ViewShellId(-1) ); + GetUndoManager().EnterListAction(DBA_RES(STR_QUERY_UNDO_TABWINDELETE), OUString(), 0, ViewShellId(-1) ); getContainer()->clear(); GetUndoManager().LeaveListAction(); @@ -938,8 +938,8 @@ void OQueryController::impl_initialize() m_nCommandType = CommandType::QUERY; bool bClose = false; { - OUString aTitle( ModuleRes( STR_QUERYDESIGN_NO_VIEW_SUPPORT ) ); - OUString aMessage( ModuleRes( STR_QUERYDESIGN_NO_VIEW_ASK ) ); + OUString aTitle(DBA_RES(STR_QUERYDESIGN_NO_VIEW_SUPPORT)); + OUString aMessage(DBA_RES(STR_QUERYDESIGN_NO_VIEW_ASK)); ODataView* pWindow = getView(); ScopedVclPtrInstance< OSQLMessageBox > aDlg( pWindow, aTitle, aMessage, WB_YES_NO | WB_DEF_YES, OSQLMessageBox::Query ); bClose = aDlg->Execute() == RET_NO; @@ -956,7 +956,7 @@ void OQueryController::impl_initialize() if ( !( aView >>= m_xAlterView ) ) { throw IllegalArgumentException( - ModuleRes( STR_NO_ALTER_VIEW_SUPPORT ), + DBA_RES(STR_NO_ALTER_VIEW_SUPPORT), *this, 1 ); @@ -1034,7 +1034,7 @@ OUString OQueryController::getPrivateTitle( ) const { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); - OUString aDefaultName = ModuleRes( editingView() ? STR_VIEW_TITLE : STR_QRY_TITLE ); + OUString aDefaultName = DBA_RES(editingView() ? STR_VIEW_TITLE : STR_QRY_TITLE); sName = aDefaultName.getToken(0,' '); sName += OUString::number(getCurrentStartNumber()); } @@ -1331,7 +1331,7 @@ bool OQueryController::askForNewName(const Reference& _xElements, b aDefaultName = m_sName; else { - OUString sName = ModuleRes( editingView() ? STR_VIEW_TITLE : STR_QRY_TITLE ); + OUString sName = DBA_RES(editingView() ? STR_VIEW_TITLE : STR_QRY_TITLE); aDefaultName = sName.getToken(0,' '); aDefaultName = ::dbtools::createUniqueName(_xElements,aDefaultName); } @@ -1365,7 +1365,7 @@ bool OQueryController::doSaveAsDoc(bool _bSaveAs) OSL_ENSURE(isEditable(),"Slot ID_BROWSER_SAVEDOC should not be enabled!"); if ( !editingCommand() && !haveDataSource() ) { - OUString aMessage(ModuleRes(STR_DATASOURCE_DELETED)); + OUString aMessage(DBA_RES(STR_DATASOURCE_DELETED)); ScopedVclPtrInstance(getView(), aMessage)->Execute(); return false; } @@ -1715,9 +1715,7 @@ OUString OQueryController::translateStatement( bool _bFireStatementChange ) } else if(m_sStatement.isEmpty()) { - ModuleRes aModuleRes(STR_QRY_NOSELECT); - OUString sTmpStr(aModuleRes); - showError(SQLException(sTmpStr,nullptr,"S1000",1000,Any())); + showError(SQLException(DBA_RES(STR_QRY_NOSELECT), nullptr, "S1000", 1000, Any())); } else sTranslatedStmt = m_sStatement; @@ -1851,7 +1849,7 @@ void OQueryController::impl_reset( const bool i_bForceCurrentControllerSettings { if ( !i_bForceCurrentControllerSettings && !editingView() ) { - OUString aTitle(ModuleRes(STR_SVT_SQL_SYNTAX_ERROR)); + OUString aTitle(DBA_RES(STR_SVT_SQL_SYNTAX_ERROR)); ScopedVclPtrInstance< OSQLMessageBox > aDlg(getView(),aTitle,aErrorMsg); aDlg->Execute(); } diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx index 3906b93061f0..9880cfa59349 100644 --- a/dbaccess/source/ui/querydesign/querydlg.cxx +++ b/dbaccess/source/ui/querydesign/querydlg.cxx @@ -18,10 +18,11 @@ */ #include "querydlg.hxx" -#include "dbu_qry.hrc" +#include "strings.hrc" #include #include #include "QTableConnectionData.hxx" +#include "core_resource.hxx" #include "querycontroller.hxx" #include "QueryTableView.hxx" #include "QueryDesignView.hxx" @@ -165,7 +166,7 @@ IMPL_LINK_NOARG( DlgQryJoin, LBChangeHdl, ListBox&, void ) OUString sFirstWinName = m_pConnData->getReferencingTable()->GetWinName(); OUString sSecondWinName = m_pConnData->getReferencedTable()->GetWinName(); const EJoinType eOldJoinType = eJoinType; - sal_uInt16 nResId = 0; + const char* pResId = nullptr; const sal_Int32 nPos = m_pLB_JoinType->GetSelectEntryPos(); const sal_IntPtr nJoinType = reinterpret_cast(m_pLB_JoinType->GetEntryData(nPos)); bool bAddHint = true; @@ -173,17 +174,17 @@ IMPL_LINK_NOARG( DlgQryJoin, LBChangeHdl, ListBox&, void ) { default: case ID_INNER_JOIN: - nResId = STR_QUERY_INNER_JOIN; + pResId = STR_QUERY_INNER_JOIN; bAddHint = false; eJoinType = INNER_JOIN; break; case ID_LEFT_JOIN: - nResId = STR_QUERY_LEFTRIGHT_JOIN; + pResId = STR_QUERY_LEFTRIGHT_JOIN; eJoinType = LEFT_JOIN; break; case ID_RIGHT_JOIN: { - nResId = STR_QUERY_LEFTRIGHT_JOIN; + pResId = STR_QUERY_LEFTRIGHT_JOIN; eJoinType = RIGHT_JOIN; OUString sTemp = sFirstWinName; sFirstWinName = sSecondWinName; @@ -191,12 +192,12 @@ IMPL_LINK_NOARG( DlgQryJoin, LBChangeHdl, ListBox&, void ) } break; case ID_FULL_JOIN: - nResId = STR_QUERY_FULL_JOIN; + pResId = STR_QUERY_FULL_JOIN; eJoinType = FULL_JOIN; break; case ID_CROSS_JOIN: { - nResId = STR_QUERY_CROSS_JOIN; + pResId = STR_QUERY_CROSS_JOIN; eJoinType = CROSS_JOIN; m_pConnData->ResetConnLines(); @@ -223,7 +224,7 @@ IMPL_LINK_NOARG( DlgQryJoin, LBChangeHdl, ListBox&, void ) m_pTableControl->Invalidate(); - OUString sHelpText = ModuleRes( nResId ); + OUString sHelpText = DBA_RES(pResId); if( nPos ) { sHelpText = sHelpText.replaceFirst( "%1", sFirstWinName ); @@ -232,7 +233,7 @@ IMPL_LINK_NOARG( DlgQryJoin, LBChangeHdl, ListBox&, void ) if ( bAddHint ) { sHelpText += "\n"; - sHelpText += ModuleRes( STR_JOIN_TYPE_HINT ); + sHelpText += DBA_RES( STR_JOIN_TYPE_HINT ); } m_pML_HelpText->SetText( sHelpText ); diff --git a/dbaccess/source/ui/querydesign/querydlg.src b/dbaccess/source/ui/querydesign/querydlg.src deleted file mode 100644 index a7ff1bd957a5..000000000000 --- a/dbaccess/source/ui/querydesign/querydlg.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 "dbu_qry.hrc" -#include "dbaccess_helpid.hrc" - -String STR_JOIN_TYPE_HINT -{ - Text [ en-US ] = "Please note that some databases may not support this join type."; -}; - -String STR_QUERY_INNER_JOIN -{ - Text [ en-US ] = "Includes only records for which the contents of the related fields of both tables are identical."; -}; - -String STR_QUERY_LEFTRIGHT_JOIN -{ - Text [ en-US ] = "Contains ALL records from table '%1' but only records from table '%2' where the values in the related fields are matching."; -}; - -String STR_QUERY_FULL_JOIN -{ - Text [ en-US ] = "Contains ALL records from '%1' and from '%2'."; -}; - -String STR_QUERY_CROSS_JOIN -{ - Text [ en-US ] = "Contains the Cartesian product of ALL records from '%1' and from '%2'."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx index 1cdcc075e11d..18edc5813369 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx +++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx @@ -26,10 +26,12 @@ #include #include #include -#include "dbustrings.hrc" -#include "dbu_rel.hrc" +#include "stringconstants.hxx" +#include "strings.hrc" +#include "strings.hxx" #include "UITools.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" +#include "core_resource.hxx" #include #include @@ -373,7 +375,7 @@ xKey.clear(); if ( bDropRelation ) { DropRelation(); - OUString sError(ModuleRes(STR_QUERY_REL_COULD_NOT_CREATE)); + OUString sError(DBA_RES(STR_QUERY_REL_COULD_NOT_CREATE)); ::dbtools::throwGenericSQLException(sError,nullptr); } diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index 0f171ef16410..5c9d57ff2cb9 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -25,11 +25,13 @@ #include "dbu_reghelper.hxx" #include "uiservices.hxx" #include -#include "dbu_rel.hrc" +#include "strings.hrc" +#include "strings.hxx" #include #include "browserids.hxx" #include -#include "dbustrings.hrc" +#include "core_resource.hxx" +#include "stringconstants.hxx" #include #include #include @@ -158,7 +160,7 @@ void ORelationController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue OSL_ENSURE(isEditable(),"Slot ID_BROWSER_SAVEDOC should not be enabled!"); if(!::dbaui::checkDataSourceAvailable(::comphelper::getString(getDataSource()->getPropertyValue(PROPERTY_NAME)), getORB())) { - OUString aMessage(ModuleRes(STR_DATASOURCE_DELETED)); + OUString aMessage(DBA_RES(STR_DATASOURCE_DELETED)); ScopedVclPtrInstance(getView(), aMessage)->Execute(); } else @@ -202,9 +204,9 @@ void ORelationController::impl_initialize() setEditable(false); m_bRelationsPossible = false; { - OUString sTitle(ModuleRes(STR_RELATIONDESIGN)); + OUString sTitle(DBA_RES(STR_RELATIONDESIGN)); sTitle = sTitle.copy(3); - ScopedVclPtrInstance< OSQLMessageBox > aDlg(nullptr,sTitle,ModuleRes(STR_RELATIONDESIGN_NOT_AVAILABLE)); + ScopedVclPtrInstance< OSQLMessageBox > aDlg(nullptr,sTitle,DBA_RES(STR_RELATIONDESIGN_NOT_AVAILABLE)); aDlg->Execute(); } disconnect(); diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx index 377687dae9e8..56759e745b81 100644 --- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx @@ -24,7 +24,7 @@ #include #include #include "browserids.hxx" -#include "dbu_rel.hrc" +#include "strings.hrc" #include #include #include @@ -33,7 +33,7 @@ #include "ConnectionLine.hxx" #include "ConnectionLineData.hxx" #include "RTableConnectionData.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include #include "UITools.hxx" diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index 9a898328d11c..988347f399cf 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -20,6 +20,7 @@ #include "RelationTableView.hxx" #include "JoinExchange.hxx" #include +#include "core_resource.hxx" #include "browserids.hxx" #include #include @@ -29,7 +30,7 @@ #include #include #include -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include #include #include "dbaccess_helpid.hrc" @@ -41,7 +42,7 @@ #include "RTableConnectionData.hxx" #include "RelationDlg.hxx" #include "sqlmessage.hxx" -#include "dbu_rel.hrc" +#include "strings.hrc" #include "UITools.hxx" #include #include "RTableWindow.hxx" @@ -322,7 +323,7 @@ void ORelationTableView::AddTabWin(const OUString& _rComposedName, const OUStrin void ORelationTableView::RemoveTabWin( OTableWindow* pTabWin ) { - ScopedVclPtrInstance< OSQLWarningBox > aDlg( this, ModuleRes( STR_QUERY_REL_DELETE_WINDOW ), WB_YES_NO | WB_DEF_YES ); + ScopedVclPtrInstance< OSQLWarningBox > aDlg( this, DBA_RES( STR_QUERY_REL_DELETE_WINDOW ), WB_YES_NO | WB_DEF_YES ); if ( m_bInRemove || aDlg->Execute() == RET_YES ) { m_pView->getController().ClearUndoManager(); @@ -338,13 +339,13 @@ void ORelationTableView::lookForUiActivities() { if(m_pExistingConnection) { - OUString sTitle(ModuleRes(STR_RELATIONDESIGN)); + OUString sTitle(DBA_RES(STR_RELATIONDESIGN)); sTitle = sTitle.copy(3); - ScopedVclPtrInstance< OSQLMessageBox > aDlg(this,ModuleRes(STR_QUERY_REL_EDIT_RELATION),OUString(),0); + ScopedVclPtrInstance< OSQLMessageBox > aDlg(this,DBA_RES(STR_QUERY_REL_EDIT_RELATION),OUString(),0); aDlg->SetText(sTitle); aDlg->RemoveButton(aDlg->GetButtonId(0)); - aDlg->AddButton( ModuleRes(STR_QUERY_REL_EDIT), RET_OK, ButtonDialogFlags::Default | ButtonDialogFlags::Focus); - aDlg->AddButton( ModuleRes(STR_QUERY_REL_CREATE), RET_YES); + aDlg->AddButton( DBA_RES(STR_QUERY_REL_EDIT), RET_OK, ButtonDialogFlags::Default | ButtonDialogFlags::Focus); + aDlg->AddButton( DBA_RES(STR_QUERY_REL_CREATE), RET_YES); aDlg->AddButton( StandardButtonType::Cancel,RET_CANCEL); sal_uInt16 nRet = aDlg->Execute(); if( nRet == RET_CANCEL) diff --git a/dbaccess/source/ui/relationdesign/relation.src b/dbaccess/source/ui/relationdesign/relation.src deleted file mode 100644 index d40689dc433c..000000000000 --- a/dbaccess/source/ui/relationdesign/relation.src +++ /dev/null @@ -1,58 +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 "dbu_rel.hrc" -#include "browserids.hxx" -#include "dbaccess_helpid.hrc" - -String STR_QUERY_REL_EDIT_RELATION -{ - Text [ en-US ] = "This relation already exists. Do you want to edit it or create a new one?" ; -}; - -String STR_QUERY_REL_EDIT -{ - Text [ en-US ] = "Edit..." ; -}; - -String STR_QUERY_REL_CREATE -{ - Text [ en-US ] = "Create..." ; -}; - -String STR_RELATIONDESIGN -{ - Text [ en-US ] = " - %PRODUCTNAME Base: Relation design" ; -}; - -String STR_RELATIONDESIGN_NOT_AVAILABLE -{ - Text [ en-US ] = "The database does not support relations." ; -}; - -String STR_QUERY_REL_DELETE_WINDOW -{ - Text [ en-US ] = "When you delete this table all corresponding relations will be deleted as well. Continue?"; -}; - -String STR_QUERY_REL_COULD_NOT_CREATE -{ - Text [ en-US ] = "The database could not create the relation. Maybe foreign keys for this kind of table aren't supported.\nPlease check your documentation of the database."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx index 24b50f0a04c0..13feb588adb2 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx @@ -20,9 +20,10 @@ #include "FieldDescriptions.hxx" #include #include -#include "dbu_tbl.hrc" +#include "strings.hrc" +#include "strings.hxx" #include -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include #include #include "UITools.hxx" diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 7dc3db669f73..d9f35d6a4a2a 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -26,8 +26,9 @@ #include #include #include -#include "dbu_tbl.hrc" -#include "dbustrings.hrc" +#include "strings.hrc" +#include "strings.hxx" +#include "stringconstants.hxx" #include "browserids.hxx" #include "dbaccess_helpid.hrc" #include @@ -107,17 +108,17 @@ void OTableEditorCtrl::Init() SetReadOnly( bRead ); // Insert the columns - InsertDataColumn( FIELD_NAME, ModuleRes(STR_TAB_FIELD_COLUMN_NAME), FIELDNAME_WIDTH ); + InsertDataColumn( FIELD_NAME, DBA_RES(STR_TAB_FIELD_COLUMN_NAME), FIELDNAME_WIDTH ); - InsertDataColumn( FIELD_TYPE, ModuleRes(STR_TAB_FIELD_COLUMN_DATATYPE), FIELDTYPE_WIDTH ); + InsertDataColumn( FIELD_TYPE, DBA_RES(STR_TAB_FIELD_COLUMN_DATATYPE), FIELDTYPE_WIDTH ); ::dbaccess::ODsnTypeCollection aDsnTypes(GetView()->getController().getORB()); bool bShowColumnDescription = aDsnTypes.supportsColumnDescription(::comphelper::getString(GetView()->getController().getDataSource()->getPropertyValue(PROPERTY_URL))); - InsertDataColumn( HELP_TEXT, ModuleRes(STR_TAB_HELP_TEXT), bShowColumnDescription ? FIELDTYPE_WIDTH : FIELDDESCR_WIDTH ); + InsertDataColumn( HELP_TEXT, DBA_RES(STR_TAB_HELP_TEXT), bShowColumnDescription ? FIELDTYPE_WIDTH : FIELDDESCR_WIDTH ); if ( bShowColumnDescription ) { - InsertDataColumn( COLUMN_DESCRIPTION, ModuleRes(STR_COLUMN_DESCRIPTION), FIELDTYPE_WIDTH ); + InsertDataColumn( COLUMN_DESCRIPTION, DBA_RES(STR_COLUMN_DESCRIPTION), FIELDTYPE_WIDTH ); } InitCellController(); @@ -638,11 +639,11 @@ void OTableEditorCtrl::CellModified( long nRow, sal_uInt16 nColId ) OUString sActionDescription; switch ( nColId ) { - case FIELD_NAME: sActionDescription = ModuleRes( STR_CHANGE_COLUMN_NAME ); break; - case FIELD_TYPE: sActionDescription = ModuleRes( STR_CHANGE_COLUMN_TYPE ); break; + case FIELD_NAME: sActionDescription = DBA_RES( STR_CHANGE_COLUMN_NAME ); break; + case FIELD_TYPE: sActionDescription = DBA_RES( STR_CHANGE_COLUMN_TYPE ); break; case HELP_TEXT: - case COLUMN_DESCRIPTION: sActionDescription = ModuleRes( STR_CHANGE_COLUMN_DESCRIPTION ); break; - default: sActionDescription = ModuleRes( STR_CHANGE_COLUMN_ATTRIBUTE ); break; + case COLUMN_DESCRIPTION: sActionDescription = DBA_RES( STR_CHANGE_COLUMN_DESCRIPTION ); break; + default: sActionDescription = DBA_RES( STR_CHANGE_COLUMN_ATTRIBUTE ); break; } GetUndoManager().EnterListAction( sActionDescription, OUString(), 0, ViewShellId(-1) ); @@ -954,7 +955,7 @@ void OTableEditorCtrl::SetCellData( long nRow, sal_uInt16 nColId, const css::uno case FIELD_PROPERTY_AUTOINC: { sValue = ::comphelper::getString(_rNewData); - pFieldDescr->SetAutoIncrement(sValue == ModuleRes(STR_VALUE_YES)); + pFieldDescr->SetAutoIncrement(sValue == DBA_RES(STR_VALUE_YES)); } break; case FIELD_PROPERTY_SCALE: @@ -991,8 +992,8 @@ Any OTableEditorCtrl::GetCellData( long nRow, sal_uInt16 nColId ) nRow = GetCurRow(); SetDataPtr( nRow ); - static const OUString strYes(ModuleRes(STR_VALUE_YES)); - static const OUString strNo(ModuleRes(STR_VALUE_NO)); + static const OUString strYes(DBA_RES(STR_VALUE_YES)); + static const OUString strNo(DBA_RES(STR_VALUE_NO)); OUString sValue; // Read out the fields switch( nColId ) diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index 4e7865fe1a98..41982efe4631 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -25,9 +25,10 @@ #include "TypeInfo.hxx" #include "UITools.hxx" #include "browserids.hxx" +#include "core_resource.hxx" #include "dbu_reghelper.hxx" -#include "dbu_tbl.hrc" -#include "dbustrings.hrc" +#include "stringconstants.hxx" +#include "strings.hrc" #include "defaultobjectnamecheck.hxx" #include "dlgsave.hxx" #include "dsmeta.hxx" @@ -133,7 +134,7 @@ Reference< XInterface > SAL_CALL OTableController::Create(const Reference& _rM) : OTableController_BASE(_rM) - ,m_sTypeNames(ModuleRes(STR_TABLEDESIGN_DBFIELDTYPES)) + ,m_sTypeNames(DBA_RES(STR_TABLEDESIGN_DBFIELDTYPES)) ,m_pTypeInfo() ,m_bAllowAutoIncrementValue(false) ,m_bNew(true) @@ -271,7 +272,7 @@ bool OTableController::doSaveDoc(bool _bSaveAs) if (!xTablesSup.is()) { - OUString aMessage(ModuleRes(STR_TABLEDESIGN_CONNECTION_MISSING)); + OUString aMessage(DBA_RES(STR_TABLEDESIGN_CONNECTION_MISSING)); ScopedVclPtrInstance(getView(), aMessage )->Execute(); return false; } @@ -299,7 +300,7 @@ bool OTableController::doSaveDoc(bool _bSaveAs) aDefaultName = m_sName; else { - OUString aName = ModuleRes(STR_TBL_TITLE); + OUString aName = DBA_RES(STR_TBL_TITLE); aDefaultName = aName.getToken(0,' '); aDefaultName = ::dbtools::createUniqueName(xTables,aDefaultName); } @@ -400,9 +401,9 @@ bool OTableController::doSaveDoc(bool _bSaveAs) } catch(const ElementExistException& ) { - OUString sText( ModuleRes( STR_NAME_ALREADY_EXISTS ) ); + OUString sText( DBA_RES( STR_NAME_ALREADY_EXISTS ) ); sText = sText.replaceFirst( "#" , m_sName); - ScopedVclPtrInstance< OSQLMessageBox > aDlg( getView(), OUString( ModuleRes( STR_ERROR_DURING_CREATION ) ), sText, WB_OK, OSQLMessageBox::Error ); + ScopedVclPtrInstance< OSQLMessageBox > aDlg( getView(), DBA_RES( STR_ERROR_DURING_CREATION ), sText, WB_OK, OSQLMessageBox::Error ); aDlg->Execute(); bError = true; @@ -414,7 +415,7 @@ bool OTableController::doSaveDoc(bool _bSaveAs) } if ( aInfo.isValid() ) - aInfo.prepend( OUString( ModuleRes( STR_TABLEDESIGN_SAVE_ERROR ) ) ); + aInfo.prepend( DBA_RES( STR_TABLEDESIGN_SAVE_ERROR ) ); showError(aInfo); if (aInfo.isValid() || bError) @@ -434,7 +435,7 @@ void OTableController::doEditIndexes() // table needs to be saved before editing indexes if (m_bNew || isModified()) { - ScopedVclPtrInstance< MessageDialog > aAsk(getView(), ModuleRes(STR_QUERY_SAVE_TABLE_EDIT_INDEXES), VclMessageType::Question, VclButtonsType::YesNo); + ScopedVclPtrInstance< MessageDialog > aAsk(getView(), DBA_RES(STR_QUERY_SAVE_TABLE_EDIT_INDEXES), VclMessageType::Question, VclButtonsType::YesNo); if (RET_YES != aAsk->Execute()) return; @@ -509,7 +510,7 @@ void OTableController::impl_initialize() } catch(const SQLException&) { - ScopedVclPtrInstance(getView(), ModuleRes( STR_NO_TYPE_INFO_AVAILABLE ))->Execute(); + ScopedVclPtrInstance(getView(), DBA_RES( STR_NO_TYPE_INFO_AVAILABLE ))->Execute(); throw; } try @@ -920,7 +921,7 @@ bool OTableController::checkColumns(bool _bNew) OFieldDescription* pCompareDesc = (*aIter2)->GetActFieldDescr(); if (pCompareDesc && bCase(pCompareDesc->GetName(),pFieldDesc->GetName())) { - OUString strMessage = ModuleRes(STR_TABLEDESIGN_DUPLICATE_NAME); + OUString strMessage = DBA_RES(STR_TABLEDESIGN_DUPLICATE_NAME); strMessage = strMessage.replaceFirst("$column$", pFieldDesc->GetName()); ScopedVclPtrInstance(getView(), strMessage)->Execute(); return false; @@ -930,8 +931,8 @@ bool OTableController::checkColumns(bool _bNew) } if ( _bNew && !bFoundPKey && aMetaData.supportsPrimaryKeys() ) { - OUString sTitle(ModuleRes(STR_TABLEDESIGN_NO_PRIM_KEY_HEAD)); - OUString sMsg(ModuleRes(STR_TABLEDESIGN_NO_PRIM_KEY)); + OUString sTitle(DBA_RES(STR_TABLEDESIGN_NO_PRIM_KEY_HEAD)); + OUString sMsg(DBA_RES(STR_TABLEDESIGN_NO_PRIM_KEY)); ScopedVclPtrInstance< OSQLMessageBox > aBox(getView(), sTitle,sMsg, WB_YES_NO_CANCEL | WB_DEF_YES); switch ( aBox->Execute() ) @@ -1060,7 +1061,7 @@ void OTableController::alterColumns() { if(xDrop.is() && xAppend.is()) { - OUString aMessage( ModuleRes( STR_TABLEDESIGN_ALTER_ERROR ) ); + OUString aMessage( DBA_RES( STR_TABLEDESIGN_ALTER_ERROR ) ); aMessage = aMessage.replaceFirst( "$column$", pField->GetName() ); SQLExceptionInfo aError( ::cppu::getCaughtException() ); @@ -1119,7 +1120,7 @@ void OTableController::alterColumns() bReload = true; if(xDrop.is() && xAppend.is()) { - OUString aMessage(ModuleRes(STR_TABLEDESIGN_ALTER_ERROR)); + OUString aMessage(DBA_RES(STR_TABLEDESIGN_ALTER_ERROR)); aMessage = aMessage.replaceFirst("$column$",pField->GetName()); ScopedVclPtrInstance< OSQLWarningBox > aMsg( getView(), aMessage, WB_YES_NO | WB_DEF_YES, &aError); if ( aMsg->Execute() != RET_YES ) @@ -1185,9 +1186,9 @@ void OTableController::alterColumns() { if(xKeyColumns.is() && xKeyColumns->hasByName(*pIter)) // check if this column is a member of the primary key { - OUString aMsgT(ModuleRes(STR_TBL_COLUMN_IS_KEYCOLUMN)); + OUString aMsgT(DBA_RES(STR_TBL_COLUMN_IS_KEYCOLUMN)); aMsgT = aMsgT.replaceFirst("$column$",*pIter); - OUString aTitle(ModuleRes(STR_TBL_COLUMN_IS_KEYCOLUMN_TITLE)); + OUString aTitle(DBA_RES(STR_TBL_COLUMN_IS_KEYCOLUMN_TITLE)); ScopedVclPtrInstance< OSQLMessageBox > aMsg(getView(),aTitle,aMsgT,WB_YES_NO| WB_DEF_YES); if(aMsg->Execute() == RET_YES) { @@ -1206,7 +1207,7 @@ void OTableController::alterColumns() } catch (const SQLException&) { - OUString sError( ModuleRes( STR_TABLEDESIGN_COULD_NOT_DROP_COL ) ); + OUString sError( DBA_RES( STR_TABLEDESIGN_COULD_NOT_DROP_COL ) ); sError = sError.replaceFirst( "$column$", *pIter ); SQLException aNewException; @@ -1489,7 +1490,7 @@ OUString OTableController::getPrivateTitle() const } if ( sTitle.isEmpty() ) { - OUString aName = ModuleRes(STR_TBL_TITLE); + OUString aName = DBA_RES(STR_TBL_TITLE); sTitle = aName.getToken(0,' ') + OUString::number(getCurrentStartNumber()); } } diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx index 604314e1a6f2..317ebe73a6e2 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx @@ -18,7 +18,7 @@ */ #include "TableDesignControl.hxx" -#include "dbu_tbl.hrc" +#include "strings.hrc" #include "TableDesignView.hxx" #include "TableController.hxx" #include "browserids.hxx" diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx index c013589cd796..1ebbccea3b15 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx @@ -21,7 +21,8 @@ #include "TableController.hxx" #include "TableDesignView.hxx" #include "TEditControl.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include #include #include diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx index 2b674638efd4..dced4032fc46 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx @@ -20,12 +20,13 @@ #include "TableFieldDescWin.hxx" #include #include "FieldDescriptions.hxx" -#include "dbu_tbl.hrc" +#include "strings.hrc" #include "TableDesignHelpBar.hxx" #include #include #include "dbaccess_helpid.hrc" -#include "moduledbu.hxx" +#include "core_resource.hxx" +#include "core_resource.hxx" #define STANDARD_MARGIN 6 #define DETAILS_HEADER_HEIGHT 25 @@ -50,7 +51,7 @@ OTableFieldDescWin::OTableFieldDescWin( vcl::Window* pParent) { // Header m_pHeader = VclPtr::Create( this, WB_CENTER ); - m_pHeader->SetText( OUString(ModuleRes(STR_TAB_PROPERTIES)) ); + m_pHeader->SetText(DBA_RES(STR_TAB_PROPERTIES)); m_pHeader->Show(); // HelpBar diff --git a/dbaccess/source/ui/tabledesign/TableUndo.cxx b/dbaccess/source/ui/tabledesign/TableUndo.cxx index d6aff9b08216..4c121fb6b2d3 100644 --- a/dbaccess/source/ui/tabledesign/TableUndo.cxx +++ b/dbaccess/source/ui/tabledesign/TableUndo.cxx @@ -18,7 +18,7 @@ */ #include "TableUndo.hxx" -#include "dbu_tbl.hrc" +#include "strings.hrc" #include "TEditControl.hxx" #include "TableRow.hxx" #include "browserids.hxx" @@ -31,8 +31,9 @@ using namespace ::svt; // class OTableDesignUndoAct -OTableDesignUndoAct::OTableDesignUndoAct( OTableRowView* pOwner,sal_uInt16 nCommentID ) : OCommentUndoAction(nCommentID) - ,m_pTabDgnCtrl( pOwner ) +OTableDesignUndoAct::OTableDesignUndoAct(OTableRowView* pOwner, const char* pCommentID) + : OCommentUndoAction(pCommentID) + , m_pTabDgnCtrl(pOwner) { m_pTabDgnCtrl->m_nCurUndoActId++; } @@ -108,9 +109,9 @@ void OTableDesignCellUndoAct::Redo() } // class OTableEditorUndoAct -OTableEditorUndoAct::OTableEditorUndoAct( OTableEditorCtrl* pOwner,sal_uInt16 _nCommentID ) : - OTableDesignUndoAct( pOwner ,_nCommentID) - ,pTabEdCtrl(pOwner) +OTableEditorUndoAct::OTableEditorUndoAct(OTableEditorCtrl* pOwner, const char* pCommentID) + : OTableDesignUndoAct(pOwner, pCommentID) + , pTabEdCtrl(pOwner) { } diff --git a/dbaccess/source/ui/tabledesign/TableUndo.hxx b/dbaccess/source/ui/tabledesign/TableUndo.hxx index 37b990a586f8..3f8abc23a78f 100644 --- a/dbaccess/source/ui/tabledesign/TableUndo.hxx +++ b/dbaccess/source/ui/tabledesign/TableUndo.hxx @@ -40,7 +40,7 @@ namespace dbaui virtual void Undo() override; virtual void Redo() override; public: - OTableDesignUndoAct( OTableRowView* pOwner ,sal_uInt16 nCommentID); + OTableDesignUndoAct(OTableRowView* pOwner, const char* pCommentID); virtual ~OTableDesignUndoAct() override; }; @@ -51,7 +51,7 @@ namespace dbaui VclPtr pTabEdCtrl; public: - OTableEditorUndoAct( OTableEditorCtrl* pOwner,sal_uInt16 nCommentID ); + OTableEditorUndoAct(OTableEditorCtrl* pOwner, const char* pCommentID); virtual ~OTableEditorUndoAct() override; }; diff --git a/dbaccess/source/ui/tabledesign/table.src b/dbaccess/source/ui/tabledesign/table.src deleted file mode 100644 index 0d3375196f9f..000000000000 --- a/dbaccess/source/ui/tabledesign/table.src +++ /dev/null @@ -1,306 +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 "dbu_tbl.hrc" -#include "dbaccess_helpid.hrc" -#include "dbaccess_slotid.hrc" -#include "browserids.hxx" - -String STR_TABLEDESIGN_DBFIELDTYPES -{ - Text [ en-US ] = "Unknown;Text;Number;Date/Time;Date;Time;Yes/No;Currency;Memo;Counter;Image;Text (fix);Decimal;Binary (fix);Binary;BigInt;Double;Float;Real;Integer;Small Integer;Tiny Integer;SQL Null;Object;Distinct;Structure;Field;BLOB;CLOB;REF;OTHER;Bit (fix)"; -}; - -String STR_TABLEDESIGN_UNDO_PRIMKEY -{ - Text [ en-US ] = "Insert/remove primary key" ; -}; - -String STR_VALUE_YES -{ - Text [ en-US ] = "Yes" ; -}; - -String STR_VALUE_NO -{ - Text [ en-US ] = "No" ; -}; - -String STR_VALUE_NONE -{ - // Note: should somehow fit to the word "value" in other languages as well: value - none .... - Text [ en-US ] = ""; -}; - -String STR_TAB_FIELD_NAME -{ - Text [ en-US ] = "Field name" ; -}; - -String STR_TAB_FIELD_COLUMN_NAME -{ - Text [ en-US ] = "Field Name" ; -}; - -String STR_TAB_FIELD_DATATYPE -{ - Text [ en-US ] = "Field ~type" ; -}; - -String STR_TAB_FIELD_COLUMN_DATATYPE -{ - Text [ en-US ] = "Field Type" ; -}; - -String STR_TAB_HELP_TEXT -{ - Text [ en-US ] = "Description" ; -}; - -String STR_COLUMN_DESCRIPTION -{ - Text [ en-US ] = "Column Description" ; -}; - -String STR_FIELD_AUTOINCREMENT -{ - Text [ en-US ] = "~AutoValue"; -}; - -String STR_TAB_PROPERTIES -{ - Text [ en-US ] = "Field Properties" ; -}; - -String STR_TABED_UNDO_CELLMODIFIED -{ - Text [ en-US ] = "Modify cell" ; -}; - -String STR_TABED_UNDO_ROWDELETED -{ - Text [ en-US ] = "Delete row" ; -}; - -String STR_TABED_UNDO_TYPE_CHANGED -{ - Text [ en-US ] = "Modify field type"; -}; - -String STR_TABED_UNDO_ROWINSERTED -{ - Text [ en-US ] = "Insert row" ; -}; - -String STR_TABED_UNDO_NEWROWINSERTED -{ - Text [ en-US ] = "Insert new row" ; -}; - -String STR_DEFAULT_VALUE -{ - Text [ en-US ] = "~Default value" ; -}; - -String STR_FIELD_REQUIRED -{ - Text [ en-US ] = "~Entry required" ; -}; - -String STR_TEXT_LENGTH -{ - Text [ en-US ] = "~Length" ; -}; - -String STR_NUMERIC_TYPE -{ - Text [ en-US ] = "~Type" ; -}; - -String STR_LENGTH -{ - Text [ en-US ] = "~Length" ; -}; - -String STR_SCALE -{ - Text [ en-US ] = "Decimal ~places" ; -}; - -String STR_FORMAT -{ - Text [ en-US ] = "Format example"; -}; - -String STR_HELP_BOOL_DEFAULT -{ - Text [ en-US ] = "Select a value that is to appear in all new records as default.\nIf the field is not to have a default value, select the empty string."; -}; - -String STR_HELP_DEFAULT_VALUE -{ - Text [ en-US ] = "Enter a default value for this field.\n\nWhen you later enter data in the table, this string will be used in each new record for the field selected. It should, therefore, correspond to the cell format that needs to be entered below." ; -}; - -String STR_HELP_FIELD_REQUIRED -{ - Text [ en-US ] = "Activate this option if this field cannot contain NULL values, i.e. the user must always enter data." ; -}; - -String STR_HELP_TEXT_LENGTH -{ - Text [ en-US ] = "Enter the maximum text length permitted." ; -}; - -String STR_HELP_NUMERIC_TYPE -{ - Text [ en-US ] = "Enter the number format." ; -}; - -String STR_HELP_LENGTH -{ - Text [ en-US ] = "Determine the length data can have in this field.\n\nIf decimal fields, then the maximum length of the number to be entered, if binary fields, then the length of the data block.\nThe value will be corrected accordingly when it exceeds the maximum for this database." ; -}; - -String STR_HELP_SCALE -{ - Text [ en-US ] = "Specify the number of decimal places permitted in this field." ; -}; - -String STR_HELP_FORMAT_CODE -{ - Text [ en-US ] = "This is where you see how the data would be displayed in the current format (use the button on the right to modify the format)."; -}; - -String STR_HELP_FORMAT_BUTTON -{ - Text [ en-US ] = "This is where you determine the output format of the data."; -}; - -String STR_HELP_AUTOINCREMENT -{ - Text [ en-US ] = "Choose if this field should contain AutoIncrement values.\n\nYou can not enter data in fields of this type. An intrinsic value will be assigned to each new record automatically (resulting from the increment of the previous record)." ; -}; - -String STR_BUTTON_FORMAT -{ - Text [ en-US ] = "~..."; -}; - -String STR_TABLEDESIGN_DUPLICATE_NAME -{ - Text [ en-US ] = "The table cannot be saved because column name \"$column$\" was assigned twice."; -}; - -String STR_TBL_COLUMN_IS_KEYCOLUMN -{ - Text [ en-US ] = "The column \"$column$\" belongs to the primary key. If the column is deleted, the primary key will also be deleted. Do you really want to continue?"; -}; - -String STR_TBL_COLUMN_IS_KEYCOLUMN_TITLE -{ - Text [ en-US ] = "Primary Key Affected"; -}; - -String STR_COLUMN_NAME -{ - Text [ en-US ] = "Column"; -}; - -String STR_QRY_CONTINUE -{ - Text [ en-US ] = "Continue anyway?" ; -}; - -String STR_TABLEDESIGN_CONNECTION_MISSING -{ - Text [ en-US ] = "The table could not be saved due to problems connecting to the database."; -}; - -String STR_TABLEDESIGN_DATASOURCE_DELETED -{ - Text [ en-US ] = "The table filter could not be adjusted because the data source has been deleted."; -}; - -String STR_QUERY_SAVE_TABLE_EDIT_INDEXES -{ - Text [ en-US ] = "Before you can edit the indexes of a table, you have to save it.\nDo you want to save the changes now?"; -}; - -String STR_TABLEDESIGN_NO_PRIM_KEY_HEAD -{ - Text [ en-US ] = "No primary key" ; -}; - -String STR_TABLEDESIGN_NO_PRIM_KEY -{ - Text [ en-US ] = "A unique index or primary key is required for data record identification in this database.\nYou can only enter data into this table when one of these two structural conditions has been met.\n\nShould a primary key be created now?" ; -}; - -String STR_TABLEDESIGN_ALTER_ERROR -{ - Text [ en-US ] = "The column \"$column$\" could not be changed. Should the column instead be deleted and the new format appended?" ; -}; - -String STR_TABLEDESIGN_SAVE_ERROR -{ - Text [ en-US ] = "Error while saving the table design"; -}; - -String STR_TABLEDESIGN_COULD_NOT_DROP_COL -{ - Text [ en-US ] = "The column $column$ could not be deleted."; -}; - -String STR_AUTOINCREMENT_VALUE -{ - Text [ en-US ] = "A~uto-increment statement"; -}; - -String STR_HELP_AUTOINCREMENT_VALUE -{ - Text [ en-US ] = "Enter an SQL statement for the auto-increment field.\n\nThis statement will be directly transferred to the database when the table is created."; -}; - -String STR_NO_TYPE_INFO_AVAILABLE -{ - Text [ en-US ] = "No type information could be retrieved from the database.\nThe table design mode is not available for this data source."; -}; - -String STR_CHANGE_COLUMN_NAME -{ - Text [ en-US ] = "change field name"; -}; - -String STR_CHANGE_COLUMN_TYPE -{ - Text [ en-US ] = "change field type"; -}; - -String STR_CHANGE_COLUMN_DESCRIPTION -{ - Text [ en-US ] = "change field description"; -}; - -String STR_CHANGE_COLUMN_ATTRIBUTE -{ - Text [ en-US ] = "change field attribute"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx index e5b94f995e51..deb5184edf53 100644 --- a/dbaccess/source/ui/uno/ColumnControl.cxx +++ b/dbaccess/source/ui/uno/ColumnControl.cxx @@ -19,7 +19,7 @@ #include "ColumnControl.hxx" #include "ColumnPeer.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include "uiservices.hxx" #include "apitools.hxx" #include diff --git a/dbaccess/source/ui/uno/ColumnModel.cxx b/dbaccess/source/ui/uno/ColumnModel.cxx index c42af2059b46..0556c0e6b61a 100644 --- a/dbaccess/source/ui/uno/ColumnModel.cxx +++ b/dbaccess/source/ui/uno/ColumnModel.cxx @@ -25,7 +25,7 @@ #include #include -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include "dbu_reghelper.hxx" #include #include diff --git a/dbaccess/source/ui/uno/ColumnPeer.cxx b/dbaccess/source/ui/uno/ColumnPeer.cxx index 1e7bae1ca536..7ae3187fb240 100644 --- a/dbaccess/source/ui/uno/ColumnPeer.cxx +++ b/dbaccess/source/ui/uno/ColumnPeer.cxx @@ -20,7 +20,8 @@ #include "ColumnPeer.hxx" #include "ColumnControlWindow.hxx" #include -#include "dbustrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include "FieldDescriptions.hxx" namespace dbaui diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx index 1cdc2984e090..42d71cea3199 100644 --- a/dbaccess/source/ui/uno/composerdialogs.cxx +++ b/dbaccess/source/ui/uno/composerdialogs.cxx @@ -22,7 +22,7 @@ #include "dbu_reghelper.hxx" #include -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include "queryfilter.hxx" #include "queryorder.hxx" #include diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx index 4d59b432f596..c274edca67b7 100644 --- a/dbaccess/source/ui/uno/composerdialogs.hxx +++ b/dbaccess/source/ui/uno/composerdialogs.hxx @@ -27,7 +27,7 @@ #include #include -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "apitools.hxx" namespace dbaui @@ -41,7 +41,7 @@ namespace dbaui :public svt::OGenericUnoDialog ,public ComposerDialog_PBASE { - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; protected: // css::uno::Reference< css::sdb::XSingleSelectQueryComposer > diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index f1f81c6d3991..60462ff3781c 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -19,10 +19,12 @@ #include #include "dbu_reghelper.hxx" -#include "dbu_resource.hrc" -#include "dbu_uno.hrc" -#include "dbustrings.hrc" -#include "moduledbu.hxx" +#include "dbu_pageids.hxx" +#include "strings.hrc" +#include "strings.hxx" +#include "stringconstants.hxx" +#include "core_resource.hxx" +#include "core_resource.hxx" #include "sqlmessage.hxx" #include "uiservices.hxx" #include "WCopyTable.hxx" @@ -460,7 +462,7 @@ void SAL_CALL CopyTableWizard::setOperation( ::sal_Int16 _operation ) && !OCopyTableWizard::supportsViews( m_xDestConnection ) ) throw IllegalArgumentException( - ModuleRes( STR_CTW_NO_VIEWS_SUPPORT ), + DBA_RES( STR_CTW_NO_VIEWS_SUPPORT ), *this, 1 ); @@ -492,7 +494,7 @@ void SAL_CALL CopyTableWizard::setCreatePrimaryKey( const Optional< OUString >& if ( _newPrimaryKey.IsPresent && !OCopyTableWizard::supportsPrimaryKey( m_xDestConnection ) ) throw IllegalArgumentException( - ModuleRes( STR_CTW_NO_PRIMARY_KEY_SUPPORT ), + DBA_RES( STR_CTW_NO_PRIMARY_KEY_SUPPORT ), *this, 1 ); @@ -657,7 +659,7 @@ Reference< XPropertySet > CopyTableWizard::impl_ensureDataAccessDescriptor_throw if ( !bIsValid ) { throw IllegalArgumentException( - ModuleRes( STR_CTW_INVALID_DATA_ACCESS_DESCRIPTOR ), + DBA_RES( STR_CTW_INVALID_DATA_ACCESS_DESCRIPTOR ), *const_cast< CopyTableWizard* >( this ), _nArgPos + 1 ); @@ -701,7 +703,7 @@ void CopyTableWizard::impl_checkForUnsupportedSettings_throw( const Reference< X if ( !sUnsupportedSetting.isEmpty() ) { OUString sMessage( - OUString(ModuleRes(STR_CTW_ERROR_UNSUPPORTED_SETTING)). + DBA_RES(STR_CTW_ERROR_UNSUPPORTED_SETTING). replaceFirst("$name$", sUnsupportedSetting)); throw IllegalArgumentException( sMessage, @@ -749,7 +751,7 @@ std::unique_ptr< ICopyTableSourceObject > CopyTableWizard::impl_extractSourceObj break; default: throw IllegalArgumentException( - ModuleRes( STR_CTW_ONLY_TABLES_AND_QUERIES_SUPPORT ), + DBA_RES( STR_CTW_ONLY_TABLES_AND_QUERIES_SUPPORT ), *const_cast< CopyTableWizard* >( this ), 1 ); @@ -768,7 +770,7 @@ std::unique_ptr< ICopyTableSourceObject > CopyTableWizard::impl_extractSourceObj if ( _out_rCommandType == CommandType::QUERY ) // we cannot copy a query if the connection cannot provide it ... throw IllegalArgumentException( - ModuleRes( STR_CTW_ERROR_NO_QUERY ), + DBA_RES( STR_CTW_ERROR_NO_QUERY ), *const_cast< CopyTableWizard* >( this ), 1 ); @@ -806,7 +808,7 @@ void CopyTableWizard::impl_extractSourceResultSet_throw( const Reference< XPrope if ( !xRowLocate.is() ) { ::dbtools::throwGenericSQLException( - OUString( ModuleRes( STR_CTW_COPY_SOURCE_NEEDS_BOOKMARKS ) ), + DBA_RES(STR_CTW_COPY_SOURCE_NEEDS_BOOKMARKS), *this ); } @@ -1045,7 +1047,7 @@ bool CopyTableWizard::impl_processCopyError_nothrow( const CopyTableRowEvent& _r { SQLContext aError; aError.Context = *this; - aError.Message = OUString( ModuleRes( STR_ERROR_OCCURRED_WHILE_COPYING ) ); + aError.Message = DBA_RES(STR_ERROR_OCCURRED_WHILE_COPYING); ::dbtools::SQLExceptionInfo aInfo( _rEvent.Error ); if ( aInfo.isValid() ) @@ -1276,7 +1278,7 @@ void CopyTableWizard::impl_copyRows_throw( const Reference< XResultSet >& _rxSou default: { - OUString aMessage( ModuleRes( STR_CTW_UNSUPPORTED_COLUMN_TYPE ) ); + OUString aMessage( DBA_RES( STR_CTW_UNSUPPORTED_COLUMN_TYPE ) ); aMessage = aMessage.replaceFirst( "$type$", OUString::number( aSourceColTypes[ nSourceColumn ] ) ); aMessage = aMessage.replaceFirst( "$pos$", OUString::number( nSourceColumn ) ); @@ -1458,7 +1460,7 @@ void SAL_CALL CopyTableWizard::initialize( const Sequence< Any >& _rArguments ) sal_Int32 nArgCount( _rArguments.getLength() ); if ( ( nArgCount != 2 ) && ( nArgCount != 3 ) ) throw IllegalArgumentException( - ModuleRes( STR_CTW_ILLEGAL_PARAMETER_COUNT ), + DBA_RES( STR_CTW_ILLEGAL_PARAMETER_COUNT ), *this, 1 ); @@ -1469,7 +1471,7 @@ void SAL_CALL CopyTableWizard::initialize( const Sequence< Any >& _rArguments ) { // ->createWithInteractionHandler if ( !( _rArguments[2] >>= m_xInteractionHandler ) ) throw IllegalArgumentException( - ModuleRes( STR_CTW_ERROR_INVALID_INTERACTIONHANDLER ), + DBA_RES( STR_CTW_ERROR_INVALID_INTERACTIONHANDLER ), *this, 3 ); @@ -1494,7 +1496,7 @@ void SAL_CALL CopyTableWizard::initialize( const Sequence< Any >& _rArguments ) catch( const Exception& ) { throw WrappedTargetException( - ModuleRes( STR_CTW_ERROR_DURING_INITIALIZATION ), + DBA_RES( STR_CTW_ERROR_DURING_INITIALIZATION ), *this, ::cppu::getCaughtException() ); diff --git a/dbaccess/source/ui/uno/copytablewizard.src b/dbaccess/source/ui/uno/copytablewizard.src deleted file mode 100644 index 4d5a09b6cf01..000000000000 --- a/dbaccess/source/ui/uno/copytablewizard.src +++ /dev/null @@ -1,77 +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 "dbu_uno.hrc" - -String STR_CTW_NO_VIEWS_SUPPORT -{ - Text [ en-US ] = "The destination database does not support views."; -}; - -String STR_CTW_NO_PRIMARY_KEY_SUPPORT -{ - Text [ en-US ] = "The destination database does not support primary keys."; -}; - -String STR_CTW_INVALID_DATA_ACCESS_DESCRIPTOR -{ - Text [ en-US ] = "no data access descriptor found, or no data access descriptor able to provide all necessary information"; -}; - -String STR_CTW_ONLY_TABLES_AND_QUERIES_SUPPORT -{ - Text [ en-US ] = "Only tables and queries are supported at the moment."; -}; - -String STR_CTW_COPY_SOURCE_NEEDS_BOOKMARKS -{ - Text [ en-US ] = "The copy source's result set must support bookmarks."; -}; - -String STR_CTW_UNSUPPORTED_COLUMN_TYPE -{ - Text [ en-US ] = "Unsupported source column type ($type$) at column position $pos$."; -}; - -String STR_CTW_ILLEGAL_PARAMETER_COUNT -{ - Text [ en-US ] = "Illegal number of initialization parameters."; -}; - -String STR_CTW_ERROR_DURING_INITIALIZATION -{ - Text [ en-US ] = "An error occurred during initialization."; -}; - -String STR_CTW_ERROR_UNSUPPORTED_SETTING -{ - Text [ en-US ] = "Unsupported setting in the copy source descriptor: $name$."; -}; - -String STR_CTW_ERROR_NO_QUERY -{ - Text [ en-US ] = "To copy a query, your connection must be able to provide queries."; -}; - -String STR_CTW_ERROR_INVALID_INTERACTIONHANDLER -{ - Text [ en-US ] = "The given interaction handler is invalid."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx index f4e413fd1273..119a729f699b 100644 --- a/dbaccess/source/ui/uno/dbinteraction.cxx +++ b/dbaccess/source/ui/uno/dbinteraction.cxx @@ -33,7 +33,7 @@ #include #include #include -#include "dbu_uno.hrc" +#include "strings.hrc" #include "paramdialog.hxx" #include #include "CollectionView.hxx" diff --git a/dbaccess/source/ui/uno/dbinteraction.hxx b/dbaccess/source/ui/uno/dbinteraction.hxx index 5166a6bde184..a3ebfeb8100b 100644 --- a/dbaccess/source/ui/uno/dbinteraction.hxx +++ b/dbaccess/source/ui/uno/dbinteraction.hxx @@ -22,7 +22,7 @@ #include -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "apitools.hxx" #include @@ -62,7 +62,7 @@ namespace dbaui class BasicInteractionHandler :public BasicInteractionHandler_Base { - const OModuleClient m_aModuleClient; + const dbaccess::OModuleClient m_aModuleClient; const css::uno::Reference< css::uno::XComponentContext > m_xContext; const bool m_bFallbackToGeneric; diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx index 7f6c4a6eb5e8..7ad3241312f1 100644 --- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx +++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx @@ -20,10 +20,10 @@ #include "textconnectionsettings.hxx" #include "uiservices.hxx" #include "dbu_reghelper.hxx" -#include "moduledbu.hxx" +#include "core_resource.hxx" #include "apitools.hxx" #include "unoadmin.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include "propertystorage.hxx" #include @@ -63,7 +63,7 @@ namespace dbaui ,public OTextConnectionSettingsDialog_PBASE ,public ::cppu::WeakImplHelper< css::sdb::XTextConnectionSettings > { - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; PropertyValues m_aPropertyValues; protected: diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx b/dbaccess/source/ui/uno/unoDirectSql.cxx index 1858bf9de2ce..3c3360d82268 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.cxx +++ b/dbaccess/source/ui/uno/unoDirectSql.cxx @@ -27,7 +27,7 @@ #include #include #include "directsql.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include "datasourceconnector.hxx" #include #include diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx index 96e198e8a34a..5b1e9d126ff0 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.hxx +++ b/dbaccess/source/ui/uno/unoDirectSql.hxx @@ -25,7 +25,7 @@ #include #include #include -#include "moduledbu.hxx" +#include "core_resource.hxx" #include namespace dbaui @@ -40,7 +40,7 @@ namespace dbaui :public ODirectSQLDialog_BASE ,public ODirectSQLDialog_PBASE { - OModuleClient m_aModuleClient; + dbaccess::OModuleClient m_aModuleClient; OUString m_sInitialSelection; css::uno::Reference< css::sdbc::XConnection > m_xActiveConnection; protected: diff --git a/dbaccess/source/ui/uno/unoadmin.cxx b/dbaccess/source/ui/uno/unoadmin.cxx index fde168b9fa21..59e2647324c6 100644 --- a/dbaccess/source/ui/uno/unoadmin.cxx +++ b/dbaccess/source/ui/uno/unoadmin.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "dbustrings.hrc" +#include "stringconstants.hxx" #include #include "dbu_reghelper.hxx" #include "unoadmin.hxx" diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx index 4494a2eedda3..7d7f003a5f57 100644 --- a/dbaccess/source/ui/uno/unosqlmessage.cxx +++ b/dbaccess/source/ui/uno/unosqlmessage.cxx @@ -21,7 +21,8 @@ #include "uiservices.hxx" #include "unosqlmessage.hxx" #include "dbu_reghelper.hxx" -#include "dbustrings.hrc" +#include "stringconstants.hxx" +#include "strings.hxx" #include #include #include diff --git a/dbaccess/uiconfig/ui/admindialog.ui b/dbaccess/uiconfig/ui/admindialog.ui index 72040da64410..c08b37610ebf 100644 --- a/dbaccess/uiconfig/ui/admindialog.ui +++ b/dbaccess/uiconfig/ui/admindialog.ui @@ -1,11 +1,11 @@ - + False 6 - Database Properties + Database Properties False dialog @@ -84,7 +84,7 @@ True False 0.4699999988079071 - Advanced Properties + Advanced Properties False diff --git a/dbaccess/uiconfig/ui/advancedsettingsdialog.ui b/dbaccess/uiconfig/ui/advancedsettingsdialog.ui index 8a49dd6d1048..35eb669b99cb 100644 --- a/dbaccess/uiconfig/ui/advancedsettingsdialog.ui +++ b/dbaccess/uiconfig/ui/advancedsettingsdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Advanced Settings + Advanced Settings False dialog @@ -83,7 +83,7 @@ True False - Generated Values + Generated Values False @@ -97,7 +97,7 @@ True False 0.4699999988079071 - Special Settings + Special Settings 1 diff --git a/dbaccess/uiconfig/ui/applycolpage.ui b/dbaccess/uiconfig/ui/applycolpage.ui index 8ea2520ee504..a4d11991122e 100644 --- a/dbaccess/uiconfig/ui/applycolpage.ui +++ b/dbaccess/uiconfig/ui/applycolpage.ui @@ -1,6 +1,6 @@ - + True @@ -159,7 +159,7 @@ True False - Existing Columns + Existing Columns diff --git a/dbaccess/uiconfig/ui/authentificationpage.ui b/dbaccess/uiconfig/ui/authentificationpage.ui index dfee010e87e1..86faa208e262 100644 --- a/dbaccess/uiconfig/ui/authentificationpage.ui +++ b/dbaccess/uiconfig/ui/authentificationpage.ui @@ -1,5 +1,5 @@ - + True @@ -15,7 +15,7 @@ False start 12 - Set up the user authentication + Set up the user authentication @@ -32,7 +32,7 @@ False 6 0 - Some databases require you to enter a user name. + Some databases require you to enter a user name. True 60 @@ -57,7 +57,7 @@ True False start - _User name + _User name True generalUserNameEntry @@ -83,7 +83,7 @@ - Password re_quired + Password re_quired False True True @@ -108,7 +108,7 @@ - _Test Connection + _Test Connection False True True diff --git a/dbaccess/uiconfig/ui/autocharsetpage.ui b/dbaccess/uiconfig/ui/autocharsetpage.ui index 327e1153e849..3987b3e7e7b2 100644 --- a/dbaccess/uiconfig/ui/autocharsetpage.ui +++ b/dbaccess/uiconfig/ui/autocharsetpage.ui @@ -1,6 +1,6 @@ - + @@ -35,7 +35,7 @@ True False - _Character set: + _Character set: True charset @@ -65,7 +65,7 @@ True False - Data Conversion + Data Conversion diff --git a/dbaccess/uiconfig/ui/backuppage.ui b/dbaccess/uiconfig/ui/backuppage.ui index f76b1f71d766..562b965013aa 100644 --- a/dbaccess/uiconfig/ui/backuppage.ui +++ b/dbaccess/uiconfig/ui/backuppage.ui @@ -1,6 +1,6 @@ - + @@ -15,7 +15,7 @@ False True 0 - Backup Your Document + Backup Your Document @@ -32,7 +32,7 @@ True 0 0 - To allow you to go back to the state before the migration, the database document will be backed up to a location of your choice. Every change done by the wizard will be made to the original document, the backup will stay untouched. + To allow you to go back to the state before the migration, the database document will be backed up to a location of your choice. Every change done by the wizard will be made to the original document, the backup will stay untouched. True 64 @@ -48,7 +48,7 @@ True 0 0 - Press 'Next' to save a copy of your document, and to begin the migration. + Press 'Next' to save a copy of your document, and to begin the migration. True 64 @@ -73,7 +73,7 @@ True False 0 - Save to: + Save to: True location @@ -107,7 +107,7 @@ - Browse... + Browse... True True True diff --git a/dbaccess/uiconfig/ui/choosedatasourcedialog.ui b/dbaccess/uiconfig/ui/choosedatasourcedialog.ui index db9ebc386c3a..844aaffbef27 100644 --- a/dbaccess/uiconfig/ui/choosedatasourcedialog.ui +++ b/dbaccess/uiconfig/ui/choosedatasourcedialog.ui @@ -1,11 +1,11 @@ - + False 6 - Data Source + Data Source False dialog @@ -64,7 +64,7 @@ - Or_ganize... + Or_ganize... True True True @@ -97,7 +97,7 @@ True False 0 - Choose a data source: + Choose a data source: True treeview:border diff --git a/dbaccess/uiconfig/ui/collectionviewdialog.ui b/dbaccess/uiconfig/ui/collectionviewdialog.ui index d51688aeb4a3..7ffd69952459 100644 --- a/dbaccess/uiconfig/ui/collectionviewdialog.ui +++ b/dbaccess/uiconfig/ui/collectionviewdialog.ui @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ True True 6 - Save + Save dialog @@ -23,7 +23,7 @@ end - _Save + _Save False True True @@ -116,7 +116,7 @@ True True True - Create New Directory + Create New Directory False @@ -132,7 +132,7 @@ True True True - Up One Level + Up One Level False @@ -173,7 +173,7 @@ True False - File _name: + File _name: True fileNameEntry diff --git a/dbaccess/uiconfig/ui/colwidthdialog.ui b/dbaccess/uiconfig/ui/colwidthdialog.ui index 86dd9b3b9c9a..0e8f07fd6145 100644 --- a/dbaccess/uiconfig/ui/colwidthdialog.ui +++ b/dbaccess/uiconfig/ui/colwidthdialog.ui @@ -1,6 +1,6 @@ - + 0.10000000000000001 @@ -12,7 +12,7 @@ False 6 - Column Width + Column Width False dialog @@ -91,7 +91,7 @@ True False 1 - _Width: + _Width: True value:0.00cm @@ -116,7 +116,7 @@ - _Automatic + _Automatic True True False diff --git a/dbaccess/uiconfig/ui/connectionpage.ui b/dbaccess/uiconfig/ui/connectionpage.ui index e8ef60d53ecc..619a99842287 100644 --- a/dbaccess/uiconfig/ui/connectionpage.ui +++ b/dbaccess/uiconfig/ui/connectionpage.ui @@ -1,6 +1,6 @@ - + @@ -38,7 +38,7 @@ True False start - Path to the dBASE files: + Path to the dBASE files: True browseurl @@ -61,7 +61,7 @@ - _Create New + _Create New False True True @@ -75,7 +75,7 @@ - _Browse… + _Browse… False True True @@ -95,7 +95,7 @@ True False - General + General @@ -137,7 +137,7 @@ True False 1 - _User name: + _User name: True userNameEntry @@ -159,7 +159,7 @@ - Password required + Password required False True True @@ -183,7 +183,7 @@ True False - User Authentication + User Authentication @@ -224,7 +224,7 @@ True False 1 - _JDBC driver class: + _JDBC driver class: True driverEntry @@ -249,7 +249,7 @@ - Test Class + Test Class False True True @@ -269,7 +269,7 @@ True False - JDBC Properties + JDBC Properties @@ -284,7 +284,7 @@ - Test Connection + Test Connection False True True diff --git a/dbaccess/uiconfig/ui/copytablepage.ui b/dbaccess/uiconfig/ui/copytablepage.ui index dd082b499998..cb245ff021f8 100644 --- a/dbaccess/uiconfig/ui/copytablepage.ui +++ b/dbaccess/uiconfig/ui/copytablepage.ui @@ -1,6 +1,6 @@ - + True @@ -32,7 +32,7 @@ 6 - De_finition and data + De_finition and data True True False @@ -49,7 +49,7 @@ - Def_inition + Def_inition True True False @@ -65,7 +65,7 @@ - A_s table view + A_s table view True True False @@ -81,7 +81,7 @@ - Append _data + Append _data True True False @@ -97,7 +97,7 @@ - Use first _line as column names + Use first _line as column names True True False @@ -112,7 +112,7 @@ - Crea_te new field as primary key + Crea_te new field as primary key True True False @@ -140,7 +140,7 @@ True False 1 - Name: + Name: True keyname @@ -172,7 +172,7 @@ True False 0 - Existing data fields can be set as primary key on the type formatting step (third page) of the wizard. + Existing data fields can be set as primary key on the type formatting step (third page) of the wizard. True 72 @@ -189,7 +189,7 @@ True False - Options + Options @@ -212,7 +212,7 @@ True False 1 - Ta_ble name: + Ta_ble name: True name diff --git a/dbaccess/uiconfig/ui/dbaseindexdialog.ui b/dbaccess/uiconfig/ui/dbaseindexdialog.ui index 1fd8fa59db74..b49681c93e4c 100644 --- a/dbaccess/uiconfig/ui/dbaseindexdialog.ui +++ b/dbaccess/uiconfig/ui/dbaseindexdialog.ui @@ -1,6 +1,6 @@ - + True @@ -25,7 +25,7 @@ False 6 - Indexes + Indexes dialog @@ -104,7 +104,7 @@ True False 0 - _Table: + _Table: True table @@ -159,7 +159,7 @@ True False 0 - T_able indexes + T_able indexes True tableindex:border @@ -173,7 +173,7 @@ True False 0 - _Free indexes + _Free indexes True freeindex:border @@ -291,7 +291,7 @@ True False - Assignment + Assignment diff --git a/dbaccess/uiconfig/ui/dbasepage.ui b/dbaccess/uiconfig/ui/dbasepage.ui index 1d45b963129b..3a1fb14676c8 100644 --- a/dbaccess/uiconfig/ui/dbasepage.ui +++ b/dbaccess/uiconfig/ui/dbasepage.ui @@ -1,6 +1,6 @@ - + @@ -35,7 +35,7 @@ True False - _Character set: + _Character set: True charset @@ -65,7 +65,7 @@ True False - Data Conversion + Data Conversion @@ -101,7 +101,7 @@ 6 - Display deleted records as well + Display deleted records as well False True True @@ -120,7 +120,7 @@ True False 0 - Note: When deleted, and thus inactive, records are displayed, you will not be able to delete records from the data source. + Note: When deleted, and thus inactive, records are displayed, you will not be able to delete records from the data source. True 60 @@ -138,7 +138,7 @@ True False - Optional Settings + Optional Settings @@ -153,7 +153,7 @@ - Indexes... + Indexes... False True True diff --git a/dbaccess/uiconfig/ui/dbwizconnectionpage.ui b/dbaccess/uiconfig/ui/dbwizconnectionpage.ui index 5b3916d424f8..25fe3afe3fdf 100644 --- a/dbaccess/uiconfig/ui/dbwizconnectionpage.ui +++ b/dbaccess/uiconfig/ui/dbwizconnectionpage.ui @@ -1,6 +1,6 @@ - + @@ -33,7 +33,7 @@ False 6 0 - label + label True 60 @@ -54,7 +54,7 @@ True False start - Path to the dBASE files: + Path to the dBASE files: True browseurl @@ -77,7 +77,7 @@ - _Create New + _Create New False True True @@ -91,7 +91,7 @@ - _Browse… + _Browse… False True True diff --git a/dbaccess/uiconfig/ui/dbwizmysqlintropage.ui b/dbaccess/uiconfig/ui/dbwizmysqlintropage.ui index 3d9d43f6a11c..344d99206937 100644 --- a/dbaccess/uiconfig/ui/dbwizmysqlintropage.ui +++ b/dbaccess/uiconfig/ui/dbwizmysqlintropage.ui @@ -1,6 +1,6 @@ - + True @@ -35,7 +35,7 @@ True False 0 - You can connect to a MySQL database using either ODBC or JDBC. + You can connect to a MySQL database using either ODBC or JDBC. Please contact your system administrator if you are unsure about the following settings. True 100 @@ -66,7 +66,7 @@ Please contact your system administrator if you are unsure about the following s 6 - Connect using ODBC (Open Database Connectivity) + Connect using ODBC (Open Database Connectivity) False True True @@ -82,7 +82,7 @@ Please contact your system administrator if you are unsure about the following s - Connect using JDBC (Java Database Connectivity) + Connect using JDBC (Java Database Connectivity) False True True @@ -100,7 +100,7 @@ Please contact your system administrator if you are unsure about the following s - Connect directly + Connect directly False True False @@ -122,7 +122,7 @@ Please contact your system administrator if you are unsure about the following s True False - How do you want to connect to your MySQL database? + How do you want to connect to your MySQL database? @@ -140,7 +140,7 @@ Please contact your system administrator if you are unsure about the following s True False - Set Up a Connection to a MySQL Database + Set Up a Connection to a MySQL Database diff --git a/dbaccess/uiconfig/ui/dbwizmysqlnativepage.ui b/dbaccess/uiconfig/ui/dbwizmysqlnativepage.ui index 4e8a2895c376..6320d321a33b 100644 --- a/dbaccess/uiconfig/ui/dbwizmysqlnativepage.ui +++ b/dbaccess/uiconfig/ui/dbwizmysqlnativepage.ui @@ -1,6 +1,6 @@ - + True @@ -38,7 +38,7 @@ False start 0 - Please enter the required information to connect to a MySQL database. + Please enter the required information to connect to a MySQL database. True 100 @@ -73,7 +73,7 @@ True False - Set Up a Connection to a MySQL Database + Set Up a Connection to a MySQL Database diff --git a/dbaccess/uiconfig/ui/dbwizspreadsheetpage.ui b/dbaccess/uiconfig/ui/dbwizspreadsheetpage.ui index f66783b100e4..8fe4fe8d0041 100644 --- a/dbaccess/uiconfig/ui/dbwizspreadsheetpage.ui +++ b/dbaccess/uiconfig/ui/dbwizspreadsheetpage.ui @@ -1,5 +1,5 @@ - + @@ -71,7 +71,7 @@ - Browse + Browse False True True @@ -87,7 +87,7 @@ - Create New + Create New False True True @@ -145,7 +145,7 @@ - _Password required + _Password required False True True diff --git a/dbaccess/uiconfig/ui/dbwiztextpage.ui b/dbaccess/uiconfig/ui/dbwiztextpage.ui index d266b35374d5..5f53c07f5f9a 100644 --- a/dbaccess/uiconfig/ui/dbwiztextpage.ui +++ b/dbaccess/uiconfig/ui/dbwiztextpage.ui @@ -1,5 +1,5 @@ - + @@ -71,7 +71,7 @@ - Browse + Browse False True True @@ -87,7 +87,7 @@ - Create New + Create New False True True diff --git a/dbaccess/uiconfig/ui/deleteallrowsdialog.ui b/dbaccess/uiconfig/ui/deleteallrowsdialog.ui index 9b263be4b01c..1d4ccc4ad04a 100644 --- a/dbaccess/uiconfig/ui/deleteallrowsdialog.ui +++ b/dbaccess/uiconfig/ui/deleteallrowsdialog.ui @@ -1,6 +1,6 @@ - + False @@ -9,7 +9,7 @@ dialog True question - You are trying to delete all the columns in the table. A table cannot exist without columns. Should the table be deleted from the database? If not, the table will remain unchanged. + You are trying to delete all the columns in the table. A table cannot exist without columns. Should the table be deleted from the database? If not, the table will remain unchanged. False diff --git a/dbaccess/uiconfig/ui/designsavemodifieddialog.ui b/dbaccess/uiconfig/ui/designsavemodifieddialog.ui index a3bb08e5eaa9..7719a809c283 100644 --- a/dbaccess/uiconfig/ui/designsavemodifieddialog.ui +++ b/dbaccess/uiconfig/ui/designsavemodifieddialog.ui @@ -1,6 +1,6 @@ - + False @@ -9,8 +9,8 @@ dialog True question - Do you want to save the changes? - The relation design has been changed. + Do you want to save the changes? + The relation design has been changed. False diff --git a/dbaccess/uiconfig/ui/directsqldialog.ui b/dbaccess/uiconfig/ui/directsqldialog.ui index 96979d66ff93..ec973ae33211 100644 --- a/dbaccess/uiconfig/ui/directsqldialog.ui +++ b/dbaccess/uiconfig/ui/directsqldialog.ui @@ -1,12 +1,12 @@ - + False 6 - Execute SQL Statement + Execute SQL Statement False dialog @@ -89,7 +89,7 @@ True False 0 - _Command to execute: + _Command to execute: True sql:border @@ -105,7 +105,7 @@ 12 - _Show output of "select" statements + _Show output of "select" statements True True False @@ -120,7 +120,7 @@ - _Execute + _Execute True True True @@ -155,7 +155,7 @@ True False 0 - _Previous commands: + _Previous commands: True sqlhistory @@ -172,7 +172,7 @@ True False - SQL Command + SQL Command @@ -217,7 +217,7 @@ True False - Status + Status @@ -262,7 +262,7 @@ True False - Output + Output diff --git a/dbaccess/uiconfig/ui/emptypage.ui b/dbaccess/uiconfig/ui/emptypage.ui index 1d6294e8a8c2..6f522155fbda 100644 --- a/dbaccess/uiconfig/ui/emptypage.ui +++ b/dbaccess/uiconfig/ui/emptypage.ui @@ -1,5 +1,5 @@ - + True diff --git a/dbaccess/uiconfig/ui/fielddialog.ui b/dbaccess/uiconfig/ui/fielddialog.ui index dd47d82a8fd0..c903fa498d4b 100644 --- a/dbaccess/uiconfig/ui/fielddialog.ui +++ b/dbaccess/uiconfig/ui/fielddialog.ui @@ -1,11 +1,11 @@ - + False 6 - Field Format + Field Format False dialog @@ -102,7 +102,7 @@ True False - Format + Format False @@ -116,7 +116,7 @@ True False 0.4699999988079071 - Alignment + Alignment 1 @@ -134,7 +134,7 @@ False True - Table Format + Table Format False diff --git a/dbaccess/uiconfig/ui/finalpagewizard.ui b/dbaccess/uiconfig/ui/finalpagewizard.ui index 765d165f0a46..3e3c45585cb9 100644 --- a/dbaccess/uiconfig/ui/finalpagewizard.ui +++ b/dbaccess/uiconfig/ui/finalpagewizard.ui @@ -1,6 +1,6 @@ - + 400 @@ -14,7 +14,7 @@ True False 0 - Decide How to Proceed After Saving the Database + Decide How to Proceed After Saving the Database True @@ -41,7 +41,7 @@ True False 0 - Do you want the wizard to register the database in %PRODUCTNAME? + Do you want the wizard to register the database in %PRODUCTNAME? True word-char 72 @@ -53,7 +53,7 @@ - _Yes, register the database for me + _Yes, register the database for me True True False @@ -71,7 +71,7 @@ - N_o, do not register the database + N_o, do not register the database True True False @@ -102,7 +102,7 @@ True False 0 - After the database file has been saved, what do you want to do? + After the database file has been saved, what do you want to do? True 72 @@ -113,7 +113,7 @@ - Open the database for editing + Open the database for editing True True False @@ -129,7 +129,7 @@ - Create tables using the table wizard + Create tables using the table wizard True True False @@ -153,7 +153,7 @@ True False 0 - Click 'Finish' to save the database. + Click 'Finish' to save the database. 0 diff --git a/dbaccess/uiconfig/ui/generalpagedialog.ui b/dbaccess/uiconfig/ui/generalpagedialog.ui index 12578f72435e..40705b0a1a6a 100644 --- a/dbaccess/uiconfig/ui/generalpagedialog.ui +++ b/dbaccess/uiconfig/ui/generalpagedialog.ui @@ -1,6 +1,6 @@ - + True @@ -14,7 +14,7 @@ False 0 0 - Select the type of database to which you want to establish a connection. + Select the type of database to which you want to establish a connection. 0 @@ -28,7 +28,7 @@ False 48 0 - Database _type: + Database _type: True datasourceType @@ -56,7 +56,7 @@ 6 0 0 - On the following pages, you can make detailed settings for the connection. + On the following pages, you can make detailed settings for the connection. The new settings you make will overwrite your existing settings. diff --git a/dbaccess/uiconfig/ui/generalpagewizard.ui b/dbaccess/uiconfig/ui/generalpagewizard.ui index ea43f35d5d38..c23594bf0b44 100644 --- a/dbaccess/uiconfig/ui/generalpagewizard.ui +++ b/dbaccess/uiconfig/ui/generalpagewizard.ui @@ -1,6 +1,6 @@ - + @@ -15,7 +15,7 @@ True False 0 - Welcome to the %PRODUCTNAME Database Wizard + Welcome to the %PRODUCTNAME Database Wizard True @@ -32,7 +32,7 @@ True False 0 - Use the Database Wizard to create a new database, open an existing database file, or connect to a database stored on a server. + Use the Database Wizard to create a new database, open an existing database file, or connect to a database stored on a server. True 72 @@ -47,7 +47,7 @@ True False 0 - What do you want to do? + What do you want to do? True @@ -58,7 +58,7 @@ - Create a n_ew database + Create a n_ew database True True False @@ -85,7 +85,7 @@ True False 0 - _Embedded database: + _Embedded database: True embeddeddbList @@ -115,7 +115,7 @@ - Open an existing database _file + Open an existing database _file True True False @@ -143,7 +143,7 @@ True False 0 - _Recently used: + _Recently used: True documentList @@ -176,7 +176,7 @@ - Open + Open True True True @@ -192,7 +192,7 @@ - Connect to an e_xisting database + Connect to an e_xisting database True True False diff --git a/dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui b/dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui index d4655620df6c..e81362cc8388 100644 --- a/dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui +++ b/dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui @@ -1,6 +1,6 @@ - + @@ -36,7 +36,7 @@ True False 1 - _Host name: + _Host name: True hostNameEntry @@ -50,7 +50,7 @@ True False 1 - _Port number: + _Port number: True portNumberSpinbutton @@ -75,7 +75,7 @@ True False 1 - Socket: + Socket: 0 @@ -87,7 +87,7 @@ True False 1 - MySQL JDBC d_river class: + MySQL JDBC d_river class: True jdbcDriverClassEntry @@ -109,7 +109,7 @@ - Test Class + Test Class False True True @@ -159,7 +159,7 @@ True False - Connection Settings + Connection Settings @@ -196,7 +196,7 @@ True False - _Character set: + _Character set: True charset @@ -226,7 +226,7 @@ True False - Data Conversion + Data Conversion diff --git a/dbaccess/uiconfig/ui/generatedvaluespage.ui b/dbaccess/uiconfig/ui/generatedvaluespage.ui index 88cefb1e7a8c..d5ae90eff699 100644 --- a/dbaccess/uiconfig/ui/generatedvaluespage.ui +++ b/dbaccess/uiconfig/ui/generatedvaluespage.ui @@ -1,6 +1,6 @@ - + True @@ -26,7 +26,7 @@ 12 - Re_trieve generated values + Re_trieve generated values True True False @@ -62,7 +62,7 @@ True False 0 - _Auto-increment statement: + _Auto-increment statement: True statement @@ -100,7 +100,7 @@ True False 0 - _Query of generated values: + _Query of generated values: True query @@ -143,7 +143,7 @@ True False - Settings + Settings diff --git a/dbaccess/uiconfig/ui/indexdesigndialog.ui b/dbaccess/uiconfig/ui/indexdesigndialog.ui index a0d34a83f70e..e607195ddcca 100644 --- a/dbaccess/uiconfig/ui/indexdesigndialog.ui +++ b/dbaccess/uiconfig/ui/indexdesigndialog.ui @@ -1,12 +1,12 @@ - + False 6 - Indexes + Indexes False dialog @@ -77,7 +77,7 @@ False start .index:createNew - New Index + New Index True dbaccess/res/sc036.png @@ -92,7 +92,7 @@ False start .index:dropCurrent - Delete Current Index + Delete Current Index True dbaccess/res/sc037.png @@ -107,7 +107,7 @@ False start .index:renameCurrent - Rename Current Index + Rename Current Index True dbaccess/res/sc038.png @@ -122,7 +122,7 @@ False start .index:saveCurrent - Save Current Index + Save Current Index True dbaccess/res/sc039.png @@ -137,7 +137,7 @@ False start .index:resetCurrent - Reset Current Index + Reset Current Index True dbaccess/res/sc040.png @@ -273,7 +273,7 @@ False start 0 - Index identifier: + Index identifier: 0 @@ -294,7 +294,7 @@ - _Unique + _Unique False True True @@ -316,7 +316,7 @@ False start 0 - Fields: + Fields: True @@ -349,7 +349,7 @@ True False - Index Details + Index Details diff --git a/dbaccess/uiconfig/ui/jdbcconnectionpage.ui b/dbaccess/uiconfig/ui/jdbcconnectionpage.ui index 945bae1895b8..740671b2701e 100644 --- a/dbaccess/uiconfig/ui/jdbcconnectionpage.ui +++ b/dbaccess/uiconfig/ui/jdbcconnectionpage.ui @@ -1,6 +1,6 @@ - + @@ -17,7 +17,7 @@ False start 6 - Set Up a Connection to a JDBC Database + Set Up a Connection to a JDBC Database @@ -33,7 +33,7 @@ True False 0 - Please enter the required information to connect to a JDBC database. Please contact your system administrator if you are unsure about the following settings. + Please enter the required information to connect to a JDBC database. Please contact your system administrator if you are unsure about the following settings. True 60 @@ -54,7 +54,7 @@ True False start - Path to the dBASE files: + Path to the dBASE files: True browseurl @@ -77,7 +77,7 @@ - _Create New + _Create New False True True @@ -91,7 +91,7 @@ - _Browse… + _Browse… False True True @@ -123,7 +123,7 @@ True False start - JDBC d_river class: + JDBC d_river class: True jdbcEntry @@ -153,7 +153,7 @@ - _Test Class + _Test Class False True True diff --git a/dbaccess/uiconfig/ui/joindialog.ui b/dbaccess/uiconfig/ui/joindialog.ui index c2695e7f5c07..7a1057385039 100644 --- a/dbaccess/uiconfig/ui/joindialog.ui +++ b/dbaccess/uiconfig/ui/joindialog.ui @@ -1,6 +1,6 @@ - + @@ -12,23 +12,23 @@ - Inner join + Inner join 1 - Left join + Left join 2 - Right join + Right join 3 - Full (outer) join + Full (outer) join 4 - Cross join + Cross join 5 @@ -36,7 +36,7 @@ False 6 - Join Properties + Join Properties False dialog @@ -159,7 +159,7 @@ True False - Tables Involved + Tables Involved @@ -225,7 +225,7 @@ True False - Fields Involved + Fields Involved @@ -261,7 +261,7 @@ False True 1 - _Type: + _Type: True type @@ -284,7 +284,7 @@ - Natural + Natural True True False @@ -308,7 +308,7 @@ True False - Options + Options diff --git a/dbaccess/uiconfig/ui/jointablemenu.ui b/dbaccess/uiconfig/ui/jointablemenu.ui index b9df6f291084..9096f879ad46 100644 --- a/dbaccess/uiconfig/ui/jointablemenu.ui +++ b/dbaccess/uiconfig/ui/jointablemenu.ui @@ -1,6 +1,6 @@ - + True @@ -9,7 +9,7 @@ True False - _Delete + _Delete True diff --git a/dbaccess/uiconfig/ui/joinviewmenu.ui b/dbaccess/uiconfig/ui/joinviewmenu.ui index 6c1e88d76353..07ecae3fb9dc 100644 --- a/dbaccess/uiconfig/ui/joinviewmenu.ui +++ b/dbaccess/uiconfig/ui/joinviewmenu.ui @@ -1,6 +1,6 @@ - + True @@ -9,7 +9,7 @@ True False - _Delete + _Delete True @@ -17,7 +17,7 @@ True False - Edit... + Edit... True diff --git a/dbaccess/uiconfig/ui/keymenu.ui b/dbaccess/uiconfig/ui/keymenu.ui index 301ad667518a..8836c57b1ceb 100644 --- a/dbaccess/uiconfig/ui/keymenu.ui +++ b/dbaccess/uiconfig/ui/keymenu.ui @@ -1,6 +1,6 @@ - + True @@ -9,7 +9,7 @@ True False - Primary Key + Primary Key True diff --git a/dbaccess/uiconfig/ui/ldapconnectionpage.ui b/dbaccess/uiconfig/ui/ldapconnectionpage.ui index 43763f251d17..8415169a8ffe 100644 --- a/dbaccess/uiconfig/ui/ldapconnectionpage.ui +++ b/dbaccess/uiconfig/ui/ldapconnectionpage.ui @@ -1,6 +1,6 @@ - + True @@ -15,7 +15,7 @@ False start 6 - Set Up a Connection to an LDAP Directory + Set Up a Connection to an LDAP Directory @@ -31,7 +31,7 @@ True False 0 - Please enter the required information to connect to an LDAP directory. Please contact your system administrator if you are unsure about the following settings. + Please enter the required information to connect to an LDAP directory. Please contact your system administrator if you are unsure about the following settings. True 80 @@ -54,7 +54,7 @@ True False 1 - _Server: + _Server: True hostNameEntry @@ -68,7 +68,7 @@ True False 1 - _Port number: + _Port number: True portNumEntry @@ -110,7 +110,7 @@ True False - Default: 389 + Default: 389 False @@ -129,7 +129,7 @@ True False 1 - Base _DN: + Base _DN: True baseDNEntry @@ -158,7 +158,7 @@ - Use _secure connection (SSL) + Use _secure connection (SSL) False True True diff --git a/dbaccess/uiconfig/ui/ldappage.ui b/dbaccess/uiconfig/ui/ldappage.ui index 686faf8061b6..de4f4de7739c 100644 --- a/dbaccess/uiconfig/ui/ldappage.ui +++ b/dbaccess/uiconfig/ui/ldappage.ui @@ -1,6 +1,6 @@ - + True @@ -36,7 +36,7 @@ True False 1 - _Base DN: + _Base DN: True baseDNEntry @@ -58,7 +58,7 @@ - Use secure connection (SSL) + Use secure connection (SSL) False True True @@ -77,7 +77,7 @@ True False 1 - _Port number: + _Port number: True portNumberSpinbutton @@ -102,7 +102,7 @@ True False 1 - Maximum number of _records: + Maximum number of _records: True LDAPRowCountspinbutton @@ -130,7 +130,7 @@ True False - Connection Settings + Connection Settings diff --git a/dbaccess/uiconfig/ui/migratepage.ui b/dbaccess/uiconfig/ui/migratepage.ui index a4f47ee23759..e74c8e79e13e 100644 --- a/dbaccess/uiconfig/ui/migratepage.ui +++ b/dbaccess/uiconfig/ui/migratepage.ui @@ -1,6 +1,6 @@ - + True @@ -14,7 +14,7 @@ False True 0 - Migration Progress + Migration Progress @@ -31,7 +31,7 @@ True 0 0 - The database document contains $forms$ form(s) and $reports$ report(s), which are currently being processed: + The database document contains $forms$ form(s) and $reports$ report(s), which are currently being processed: True 64 @@ -47,7 +47,7 @@ True 0 0 - All forms and reports have been successfully processed. Press 'Next' to show a detailed summary. + All forms and reports have been successfully processed. Press 'Next' to show a detailed summary. True 64 @@ -68,7 +68,7 @@ True False 0 - Overall progress: + Overall progress: 0 @@ -80,7 +80,7 @@ True False 0 - document $current$ of $overall$ + document $current$ of $overall$ 1 @@ -120,7 +120,7 @@ True False 0 - Current progress: + Current progress: 0 @@ -171,7 +171,7 @@ True False 0 - Current object: + Current object: 0 diff --git a/dbaccess/uiconfig/ui/mysqlnativepage.ui b/dbaccess/uiconfig/ui/mysqlnativepage.ui index d124b52c7f1f..bd27b83382b4 100644 --- a/dbaccess/uiconfig/ui/mysqlnativepage.ui +++ b/dbaccess/uiconfig/ui/mysqlnativepage.ui @@ -1,6 +1,6 @@ - + @@ -45,7 +45,7 @@ True False - Connection Settings + Connection Settings @@ -87,7 +87,7 @@ True False 1 - _User name: + _User name: True username @@ -110,7 +110,7 @@ - Password required + Password required False True True @@ -134,7 +134,7 @@ True False - User Authentication + User Authentication @@ -173,7 +173,7 @@ True False 1 - _Character set: + _Character set: True charset @@ -203,7 +203,7 @@ True False - Data Conversion + Data Conversion diff --git a/dbaccess/uiconfig/ui/mysqlnativesettings.ui b/dbaccess/uiconfig/ui/mysqlnativesettings.ui index 4e7dff50fab6..a4574f879641 100644 --- a/dbaccess/uiconfig/ui/mysqlnativesettings.ui +++ b/dbaccess/uiconfig/ui/mysqlnativesettings.ui @@ -1,6 +1,6 @@ - + True @@ -22,7 +22,7 @@ False start 0 - _Database name: + _Database name: True dbname @@ -60,7 +60,7 @@ 6 - Se_rver/port + Se_rver/port False True True @@ -93,7 +93,7 @@ True False 1 - _Server: + _Server: True server @@ -107,7 +107,7 @@ True False 1 - _Port: + _Port: True port @@ -135,7 +135,7 @@ False start 0 - Default: 3306 + Default: 3306 2 @@ -179,7 +179,7 @@ 12 - So_cket: + So_cket: False True True @@ -222,7 +222,7 @@ 12 - Named p_ipe: + Named p_ipe: False True True diff --git a/dbaccess/uiconfig/ui/namematchingpage.ui b/dbaccess/uiconfig/ui/namematchingpage.ui index 259511daca8a..caffe5e4ab85 100644 --- a/dbaccess/uiconfig/ui/namematchingpage.ui +++ b/dbaccess/uiconfig/ui/namematchingpage.ui @@ -1,5 +1,5 @@ - + True @@ -45,7 +45,7 @@ - _All + _All False True True @@ -62,7 +62,7 @@ - Non_e + Non_e False True True @@ -98,7 +98,7 @@ False start 0 - Source table: + Source table: False @@ -143,7 +143,7 @@ False start 0 - Destination table: + Destination table: False diff --git a/dbaccess/uiconfig/ui/odbcpage.ui b/dbaccess/uiconfig/ui/odbcpage.ui index d399cf792201..5365d776176d 100644 --- a/dbaccess/uiconfig/ui/odbcpage.ui +++ b/dbaccess/uiconfig/ui/odbcpage.ui @@ -1,6 +1,6 @@ - + @@ -35,7 +35,7 @@ True False - _Character set: + _Character set: True charset @@ -65,7 +65,7 @@ True False - Data Conversion + Data Conversion @@ -109,7 +109,7 @@ True False - ODBC _options: + ODBC _options: True options @@ -140,7 +140,7 @@ - Use catalog for file-based databases + Use catalog for file-based databases False True True @@ -162,7 +162,7 @@ True False - Optional Settings + Optional Settings diff --git a/dbaccess/uiconfig/ui/parametersdialog.ui b/dbaccess/uiconfig/ui/parametersdialog.ui index 51dcd61402ab..e9460dacce22 100644 --- a/dbaccess/uiconfig/ui/parametersdialog.ui +++ b/dbaccess/uiconfig/ui/parametersdialog.ui @@ -1,13 +1,13 @@ - + False True True 6 - Parameter Input + Parameter Input dialog north @@ -119,7 +119,7 @@ True False start - _Value: + _Value: True paramEntry @@ -150,7 +150,7 @@ - _Next + _Next False True True @@ -178,7 +178,7 @@ True False - _Parameters + _Parameters True allParamTreeview diff --git a/dbaccess/uiconfig/ui/password.ui b/dbaccess/uiconfig/ui/password.ui index aedf72255f94..6ee159306ce0 100644 --- a/dbaccess/uiconfig/ui/password.ui +++ b/dbaccess/uiconfig/ui/password.ui @@ -1,11 +1,11 @@ - + False 6 - Change Password + Change Password dialog @@ -117,7 +117,7 @@ True False 1 - Old p_assword: + Old p_assword: True oldpassword @@ -131,7 +131,7 @@ True False 1 - _Password: + _Password: True newpassword @@ -145,7 +145,7 @@ True False 1 - _Confirm password: + _Confirm password: True confirmpassword @@ -174,7 +174,7 @@ True False - User “$name$: $” + User “$name$: $” diff --git a/dbaccess/uiconfig/ui/preparepage.ui b/dbaccess/uiconfig/ui/preparepage.ui index b8fc6261ab76..2c31af455881 100644 --- a/dbaccess/uiconfig/ui/preparepage.ui +++ b/dbaccess/uiconfig/ui/preparepage.ui @@ -1,6 +1,6 @@ - + True @@ -14,7 +14,7 @@ False True 0 - Welcome to the Database Macro Migration Wizard + Welcome to the Database Macro Migration Wizard @@ -31,7 +31,7 @@ True 0 0 - This wizard will guide you through the task of migrating your macros. + This wizard will guide you through the task of migrating your macros. After you finished it, all macros which were formerly embedded into the forms and reports of the current database document will have been moved to the document itself. In this course, libraries will be renamed as needed. @@ -53,7 +53,7 @@ Before the migration can start, all forms, reports, queries and tables belonging True 0 0 - Not all objects could be closed. Please close them manually, and re-start the wizard. + Not all objects could be closed. Please close them manually, and re-start the wizard. True 64 diff --git a/dbaccess/uiconfig/ui/querycolmenu.ui b/dbaccess/uiconfig/ui/querycolmenu.ui index 8044db9e1d95..ba4eef9b5188 100644 --- a/dbaccess/uiconfig/ui/querycolmenu.ui +++ b/dbaccess/uiconfig/ui/querycolmenu.ui @@ -1,6 +1,6 @@ - + True @@ -9,7 +9,7 @@ True False - Column _Width... + Column _Width... True @@ -23,7 +23,7 @@ True False - _Delete + _Delete True diff --git a/dbaccess/uiconfig/ui/queryfilterdialog.ui b/dbaccess/uiconfig/ui/queryfilterdialog.ui index 5497b1ff3d4a..7f713ac445f3 100644 --- a/dbaccess/uiconfig/ui/queryfilterdialog.ui +++ b/dbaccess/uiconfig/ui/queryfilterdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Standard Filter + Standard Filter dialog @@ -93,7 +93,7 @@ True False 0 - Operator + Operator end @@ -105,7 +105,7 @@ True False - Field name + Field name end @@ -117,7 +117,7 @@ True False - Condition + Condition end @@ -131,7 +131,7 @@ False True - - none - + - none - @@ -145,16 +145,16 @@ False True - = - <> - < - <= - > - >= - like - not like - null - not null + = + <> + < + <= + > + >= + like + not like + null + not null @@ -168,7 +168,7 @@ False True - - none - + - none - @@ -182,7 +182,7 @@ False True - - none - + - none - @@ -216,7 +216,7 @@ True False - Value + Value end @@ -260,8 +260,8 @@ False True - AND - OR + AND + OR @@ -275,8 +275,8 @@ False True - AND - OR + AND + OR @@ -295,7 +295,7 @@ True False - Criteria + Criteria diff --git a/dbaccess/uiconfig/ui/queryfuncmenu.ui b/dbaccess/uiconfig/ui/queryfuncmenu.ui index dc8793f312d7..0da36d211a60 100644 --- a/dbaccess/uiconfig/ui/queryfuncmenu.ui +++ b/dbaccess/uiconfig/ui/queryfuncmenu.ui @@ -1,6 +1,6 @@ - + True @@ -9,7 +9,7 @@ True False - Functions + Functions True @@ -23,7 +23,7 @@ True False - Table Name + Table Name True @@ -31,7 +31,7 @@ True False - Alias + Alias True @@ -45,7 +45,7 @@ True False - Distinct Values + Distinct Values True diff --git a/dbaccess/uiconfig/ui/querypropertiesdialog.ui b/dbaccess/uiconfig/ui/querypropertiesdialog.ui index 03f6a3a47e01..d0d03462b501 100644 --- a/dbaccess/uiconfig/ui/querypropertiesdialog.ui +++ b/dbaccess/uiconfig/ui/querypropertiesdialog.ui @@ -1,12 +1,12 @@ - + False 6 - Query Properties + Query Properties False True dialog @@ -98,7 +98,7 @@ True False 1 - Limit: + Limit: 0 @@ -114,7 +114,7 @@ start - Yes + Yes True True False @@ -130,7 +130,7 @@ - No + No True True False @@ -157,7 +157,7 @@ True False 1 - Distinct values: + Distinct values: 0 diff --git a/dbaccess/uiconfig/ui/relationdialog.ui b/dbaccess/uiconfig/ui/relationdialog.ui index 1ff9948b965e..d7f2f2c65c0c 100644 --- a/dbaccess/uiconfig/ui/relationdialog.ui +++ b/dbaccess/uiconfig/ui/relationdialog.ui @@ -1,12 +1,12 @@ - + False 6 - Relations + Relations False dialog @@ -129,7 +129,7 @@ True False - Tables Involved + Tables Involved @@ -170,7 +170,7 @@ True False - Fields Involved + Fields Involved @@ -208,7 +208,7 @@ 6 - _No action + _No action True True False @@ -225,7 +225,7 @@ - _Update cascade + _Update cascade True True False @@ -241,7 +241,7 @@ - _Set null + _Set null True True False @@ -257,7 +257,7 @@ - Set _default + Set _default True True False @@ -279,7 +279,7 @@ True False - Update Options + Update Options @@ -312,7 +312,7 @@ 6 - _No action + _No action True True False @@ -328,7 +328,7 @@ - Delete _cascade + Delete _cascade True True False @@ -343,7 +343,7 @@ - _Set null + _Set null True True False @@ -358,7 +358,7 @@ - Set _default + Set _default True True False @@ -379,7 +379,7 @@ True False - Delete Options + Delete Options @@ -432,23 +432,23 @@ - Inner join + Inner join 1 - Left join + Left join 2 - Right join + Right join 3 - Full (outer) join + Full (outer) join 4 - Cross join + Cross join 5 diff --git a/dbaccess/uiconfig/ui/rowheightdialog.ui b/dbaccess/uiconfig/ui/rowheightdialog.ui index a7dd46b4a9fe..f96f4b4cd846 100644 --- a/dbaccess/uiconfig/ui/rowheightdialog.ui +++ b/dbaccess/uiconfig/ui/rowheightdialog.ui @@ -1,6 +1,6 @@ - + 0.10000000000000001 @@ -12,7 +12,7 @@ False 6 - Row Height + Row Height False dialog @@ -91,7 +91,7 @@ True False 1 - _Height: + _Height: True value:0.00cm @@ -116,7 +116,7 @@ - _Automatic + _Automatic True True False diff --git a/dbaccess/uiconfig/ui/rtfcopytabledialog.ui b/dbaccess/uiconfig/ui/rtfcopytabledialog.ui index 7a6a17fbdc96..4822640f46f9 100644 --- a/dbaccess/uiconfig/ui/rtfcopytabledialog.ui +++ b/dbaccess/uiconfig/ui/rtfcopytabledialog.ui @@ -1,12 +1,12 @@ - + False True True 6 - Copy RTF Table + Copy RTF Table dialog diff --git a/dbaccess/uiconfig/ui/savedialog.ui b/dbaccess/uiconfig/ui/savedialog.ui index 86f95ca061b5..71cf1092560d 100644 --- a/dbaccess/uiconfig/ui/savedialog.ui +++ b/dbaccess/uiconfig/ui/savedialog.ui @@ -1,12 +1,12 @@ - + False 6 - Save As + Save As False dialog @@ -82,7 +82,7 @@ True False 0 - Please enter a name for the object to be created: + Please enter a name for the object to be created: True 52 @@ -97,7 +97,7 @@ True False 1 - _Catalog: + _Catalog: True catalog @@ -111,7 +111,7 @@ True False 1 - _Schema: + _Schema: True schema diff --git a/dbaccess/uiconfig/ui/saveindexdialog.ui b/dbaccess/uiconfig/ui/saveindexdialog.ui index 6e198346243a..55b4aa026e54 100644 --- a/dbaccess/uiconfig/ui/saveindexdialog.ui +++ b/dbaccess/uiconfig/ui/saveindexdialog.ui @@ -1,16 +1,16 @@ - + False 6 - Exit Index Design + Exit Index Design False dialog True question - Do you want to save the changes made to the current index? + Do you want to save the changes made to the current index? False diff --git a/dbaccess/uiconfig/ui/savemodifieddialog.ui b/dbaccess/uiconfig/ui/savemodifieddialog.ui index e33b1530fd5a..9683244795cd 100644 --- a/dbaccess/uiconfig/ui/savemodifieddialog.ui +++ b/dbaccess/uiconfig/ui/savemodifieddialog.ui @@ -1,6 +1,6 @@ - + False @@ -9,8 +9,8 @@ dialog True question - Do you want to save the changes? - The current record has been changed. + Do you want to save the changes? + The current record has been changed. False diff --git a/dbaccess/uiconfig/ui/sortdialog.ui b/dbaccess/uiconfig/ui/sortdialog.ui index 202910e65013..f742ae4ca18b 100644 --- a/dbaccess/uiconfig/ui/sortdialog.ui +++ b/dbaccess/uiconfig/ui/sortdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Sort Order + Sort Order False dialog @@ -93,7 +93,7 @@ True False - Operator + Operator end @@ -106,7 +106,7 @@ True False 1 - and then + and then end @@ -119,7 +119,7 @@ True False 1 - and then + and then end @@ -131,7 +131,7 @@ True False - Field name + Field name end @@ -143,7 +143,7 @@ True False - Order + Order end @@ -168,8 +168,8 @@ False True - ascending - descending + ascending + descending @@ -205,8 +205,8 @@ False True - ascending - descending + ascending + descending @@ -220,8 +220,8 @@ False True - ascending - descending + ascending + descending @@ -240,7 +240,7 @@ True False - Sort Order + Sort Order diff --git a/dbaccess/uiconfig/ui/specialjdbcconnectionpage.ui b/dbaccess/uiconfig/ui/specialjdbcconnectionpage.ui index a5c73cc4453c..b34c7576ebdb 100644 --- a/dbaccess/uiconfig/ui/specialjdbcconnectionpage.ui +++ b/dbaccess/uiconfig/ui/specialjdbcconnectionpage.ui @@ -1,6 +1,6 @@ - + True @@ -16,7 +16,7 @@ False start 6 - Set up connection to a MySQL database using JDBC + Set up connection to a MySQL database using JDBC @@ -32,7 +32,7 @@ True False 0 - Please enter the required information to connect to a MySQL database using JDBC. Note that a JDBC driver class must be installed on your system and registered with %PRODUCTNAME. Please contact your system administrator if you are unsure about the following settings. + Please enter the required information to connect to a MySQL database using JDBC. Note that a JDBC driver class must be installed on your system and registered with %PRODUCTNAME. Please contact your system administrator if you are unsure about the following settings. True 80 @@ -55,7 +55,7 @@ True False 1 - _Database name: + _Database name: True dbNameEntry @@ -69,7 +69,7 @@ True False 1 - _Server: + _Server: True hostNameEntry @@ -83,7 +83,7 @@ True False 1 - _Port number: + _Port number: True portNumEntry @@ -136,7 +136,7 @@ True False - Default: 3306 + Default: 3306 False @@ -170,7 +170,7 @@ True False start - MySQL JDBC d_river class: + MySQL JDBC d_river class: True jdbcDriverEntry @@ -192,7 +192,7 @@ - _Test Class + _Test Class False True True diff --git a/dbaccess/uiconfig/ui/specialsettingspage.ui b/dbaccess/uiconfig/ui/specialsettingspage.ui index b6ef198c38ca..5594f5b11019 100644 --- a/dbaccess/uiconfig/ui/specialsettingspage.ui +++ b/dbaccess/uiconfig/ui/specialsettingspage.ui @@ -1,6 +1,6 @@ - + True @@ -15,7 +15,7 @@ 6 - Use SQL92 naming constraints + Use SQL92 naming constraints True False True @@ -32,7 +32,7 @@ - Append the table alias name on SELECT statements + Append the table alias name on SELECT statements True False True @@ -49,7 +49,7 @@ - Use keyword AS before table alias names + Use keyword AS before table alias names True False True @@ -66,7 +66,7 @@ - Use Outer Join syntax '{oj }' + Use Outer Join syntax '{oj }' True False True @@ -83,7 +83,7 @@ - Ignore the privileges from the database driver + Ignore the privileges from the database driver True False True @@ -100,7 +100,7 @@ - Replace named parameters with '?' + Replace named parameters with '?' True False True @@ -117,7 +117,7 @@ - Display version columns (when available) + Display version columns (when available) True False True @@ -134,7 +134,7 @@ - Use catalog name in SELECT statements + Use catalog name in SELECT statements True False True @@ -151,7 +151,7 @@ - Use schema name in SELECT statements + Use schema name in SELECT statements True False True @@ -168,7 +168,7 @@ - Create index with ASC or DESC statement + Create index with ASC or DESC statement True False True @@ -185,7 +185,7 @@ - End text lines with CR+LF + End text lines with CR+LF True False True @@ -202,7 +202,7 @@ - Ignore currency field information + Ignore currency field information True False True @@ -219,7 +219,7 @@ - Form data input checks for required fields + Form data input checks for required fields True False True @@ -236,7 +236,7 @@ - Use ODBC conformant date/time literals + Use ODBC conformant date/time literals True False True @@ -253,7 +253,7 @@ - Supports primary keys + Supports primary keys True False True @@ -270,7 +270,7 @@ - Respect the result set type from the database driver + Respect the result set type from the database driver True False True @@ -296,7 +296,7 @@ False True 1 - Comparison of Boolean values: + Comparison of Boolean values: True comparison @@ -312,10 +312,10 @@ False True - Default - SQL - Mixed - MS Access + Default + SQL + Mixed + MS Access @@ -330,7 +330,7 @@ False True 1 - Rows to scan column types: + Rows to scan column types: True rows diff --git a/dbaccess/uiconfig/ui/sqlexception.ui b/dbaccess/uiconfig/ui/sqlexception.ui index 8c7dfa4a26e3..d89c28e1bff3 100644 --- a/dbaccess/uiconfig/ui/sqlexception.ui +++ b/dbaccess/uiconfig/ui/sqlexception.ui @@ -1,12 +1,12 @@ - + False 6 - Error Details + Error Details False dialog @@ -55,7 +55,7 @@ True False 0 - Error _list: + Error _list: True list:border @@ -69,7 +69,7 @@ True False 0 - _Description: + _Description: True description:border diff --git a/dbaccess/uiconfig/ui/summarypage.ui b/dbaccess/uiconfig/ui/summarypage.ui index d0e9461a8574..ac03bfdaccda 100644 --- a/dbaccess/uiconfig/ui/summarypage.ui +++ b/dbaccess/uiconfig/ui/summarypage.ui @@ -1,6 +1,6 @@ - + True @@ -14,7 +14,7 @@ False True 0 - Summary + Summary @@ -31,7 +31,7 @@ True 0 0 - The migration was successful. Below is a log of the actions which have been taken to your document. + The migration was successful. Below is a log of the actions which have been taken to your document. True 64 @@ -47,7 +47,7 @@ True 0 0 - The migration was not successful. Examine the migration log below for details. + The migration was not successful. Examine the migration log below for details. True 64 diff --git a/dbaccess/uiconfig/ui/tabledesignrowmenu.ui b/dbaccess/uiconfig/ui/tabledesignrowmenu.ui index 37bc014058c2..0ff43e2db4f4 100644 --- a/dbaccess/uiconfig/ui/tabledesignrowmenu.ui +++ b/dbaccess/uiconfig/ui/tabledesignrowmenu.ui @@ -1,6 +1,6 @@ - + True @@ -9,7 +9,7 @@ True False - Cu_t + Cu_t True @@ -17,7 +17,7 @@ True False - _Copy + _Copy True @@ -25,21 +25,21 @@ True False - _Paste + _Paste True False - _Delete + _Delete True False - Insert Rows + Insert Rows @@ -52,7 +52,7 @@ True False - Primary Key + Primary Key diff --git a/dbaccess/uiconfig/ui/tabledesignsavemodifieddialog.ui b/dbaccess/uiconfig/ui/tabledesignsavemodifieddialog.ui index 9c5129757bc3..066ebe2e22d5 100644 --- a/dbaccess/uiconfig/ui/tabledesignsavemodifieddialog.ui +++ b/dbaccess/uiconfig/ui/tabledesignsavemodifieddialog.ui @@ -1,6 +1,6 @@ - + False @@ -9,8 +9,8 @@ dialog True question - Do you want to save the changes? - The table has been changed. + Do you want to save the changes? + The table has been changed. False diff --git a/dbaccess/uiconfig/ui/tablesfilterdialog.ui b/dbaccess/uiconfig/ui/tablesfilterdialog.ui index 7d7f93a31a99..3e9f1f6a4eb8 100644 --- a/dbaccess/uiconfig/ui/tablesfilterdialog.ui +++ b/dbaccess/uiconfig/ui/tablesfilterdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Tables Filter + Tables Filter False dialog diff --git a/dbaccess/uiconfig/ui/tablesfilterpage.ui b/dbaccess/uiconfig/ui/tablesfilterpage.ui index 8478940376a4..f8b795e31d52 100644 --- a/dbaccess/uiconfig/ui/tablesfilterpage.ui +++ b/dbaccess/uiconfig/ui/tablesfilterpage.ui @@ -1,6 +1,6 @@ - + @@ -31,7 +31,7 @@ True False 0 - Mark the tables that should be visible for the applications. + Mark the tables that should be visible for the applications. True 56 @@ -67,7 +67,7 @@ True False - Tables and Table Filter + Tables and Table Filter diff --git a/dbaccess/uiconfig/ui/tablesjoindialog.ui b/dbaccess/uiconfig/ui/tablesjoindialog.ui index e074c563e5d2..c3544601cc8d 100644 --- a/dbaccess/uiconfig/ui/tablesjoindialog.ui +++ b/dbaccess/uiconfig/ui/tablesjoindialog.ui @@ -1,6 +1,6 @@ - + @@ -79,7 +79,7 @@ 6 - Tables + Tables True True False @@ -96,7 +96,7 @@ - Queries + Queries True True False @@ -129,7 +129,7 @@ False True - Add Tables + Add Tables 0 @@ -140,7 +140,7 @@ False True - Add Table or Query + Add Table or Query 0 diff --git a/dbaccess/uiconfig/ui/textconnectionsettings.ui b/dbaccess/uiconfig/ui/textconnectionsettings.ui index b8fb81fe4129..31f9f35f6101 100644 --- a/dbaccess/uiconfig/ui/textconnectionsettings.ui +++ b/dbaccess/uiconfig/ui/textconnectionsettings.ui @@ -1,11 +1,11 @@ - + False 6 - Text Connection Settings + Text Connection Settings False dialog diff --git a/dbaccess/uiconfig/ui/textpage.ui b/dbaccess/uiconfig/ui/textpage.ui index d4a5bd6e8c6b..7c43df5ff7c7 100644 --- a/dbaccess/uiconfig/ui/textpage.ui +++ b/dbaccess/uiconfig/ui/textpage.ui @@ -1,6 +1,6 @@ - + @@ -36,7 +36,7 @@ 12 - Plain text files (*.txt) + Plain text files (*.txt) False True True @@ -53,7 +53,7 @@ - Comma-separated value files (*.csv) + Comma-separated value files (*.csv) False True True @@ -70,7 +70,7 @@ - Custom: + Custom: False True True @@ -103,7 +103,7 @@ True False False - Custom: *.abc + Custom: *.abc 2 @@ -118,7 +118,7 @@ True False - Specify the Type of Files You Want to Access + Specify the Type of Files You Want to Access @@ -156,7 +156,7 @@ 12 - _Text contains headers + _Text contains headers False True True @@ -178,7 +178,7 @@ True False 1 - Field separator: + Field separator: True fieldseparator @@ -192,7 +192,7 @@ True False 1 - Text separator: + Text separator: True textseparator @@ -206,7 +206,7 @@ True False 1 - Decimal separator: + Decimal separator: True decimalseparator @@ -220,7 +220,7 @@ True False 1 - Thousands separator: + Thousands separator: True thousandsseparator @@ -270,10 +270,10 @@ True True - . - , - ; - : + . + , + ; + : @@ -293,8 +293,8 @@ True True - . - , + . + , @@ -315,7 +315,7 @@ True False - Row Format + Row Format @@ -356,7 +356,7 @@ False start 0 - _Character set: + _Character set: True charset @@ -386,7 +386,7 @@ True False - Data Conversion + Data Conversion diff --git a/dbaccess/uiconfig/ui/typeselectpage.ui b/dbaccess/uiconfig/ui/typeselectpage.ui index 0b4ef073b34f..7d7ba2f06d17 100644 --- a/dbaccess/uiconfig/ui/typeselectpage.ui +++ b/dbaccess/uiconfig/ui/typeselectpage.ui @@ -1,6 +1,6 @@ - + @@ -68,7 +68,7 @@ True False - Column Information + Column Information @@ -107,7 +107,7 @@ False start 0 - Lines (ma_x.): + Lines (ma_x.): True auto @@ -118,7 +118,7 @@ - _Auto + _Auto False True True @@ -150,7 +150,7 @@ True False - Automatic Type Recognition + Automatic Type Recognition diff --git a/dbaccess/uiconfig/ui/useradmindialog.ui b/dbaccess/uiconfig/ui/useradmindialog.ui index 2538acc2a361..d46db29c5351 100644 --- a/dbaccess/uiconfig/ui/useradmindialog.ui +++ b/dbaccess/uiconfig/ui/useradmindialog.ui @@ -1,11 +1,11 @@ - + False 6 - User Administration + User Administration False dialog @@ -84,7 +84,7 @@ True False 0.4699999988079071 - User Settings + User Settings False diff --git a/dbaccess/uiconfig/ui/useradminpage.ui b/dbaccess/uiconfig/ui/useradminpage.ui index 6962482e14d5..0bd5b2737587 100644 --- a/dbaccess/uiconfig/ui/useradminpage.ui +++ b/dbaccess/uiconfig/ui/useradminpage.ui @@ -1,6 +1,6 @@ - + True @@ -44,7 +44,7 @@ start True 0 - Us_er: + Us_er: True @@ -80,7 +80,7 @@ 12 - _Add User... + _Add User... False True True @@ -95,7 +95,7 @@ - Change _Password... + Change _Password... False True True @@ -110,7 +110,7 @@ - _Delete User... + _Delete User... False True True @@ -138,7 +138,7 @@ True False - User Selection + User Selection @@ -177,7 +177,7 @@ True False - Access Rights for Selected User + Access Rights for Selected User diff --git a/dbaccess/uiconfig/ui/userdetailspage.ui b/dbaccess/uiconfig/ui/userdetailspage.ui index e4edec5cbde2..5e0b81393f97 100644 --- a/dbaccess/uiconfig/ui/userdetailspage.ui +++ b/dbaccess/uiconfig/ui/userdetailspage.ui @@ -1,6 +1,6 @@ - + @@ -37,7 +37,7 @@ False start 1 - _Host name: + _Host name: True hostname end @@ -53,7 +53,7 @@ False start 1 - _Port number: + _Port number: True portnumber @@ -86,7 +86,7 @@ - _Use catalog + _Use catalog True True False @@ -106,7 +106,7 @@ False start 1 - _Driver settings: + _Driver settings: True options @@ -134,7 +134,7 @@ True False - Connection Settings + Connection Settings @@ -172,7 +172,7 @@ True False 1 - _Character set: + _Character set: True charset @@ -202,7 +202,7 @@ True False - Data conversion + Data conversion diff --git a/desktop/AllLangMoTarget_dkt.mk b/desktop/AllLangMoTarget_dkt.mk new file mode 100644 index 000000000000..b951648dbd8c --- /dev/null +++ b/desktop/AllLangMoTarget_dkt.mk @@ -0,0 +1,13 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# 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/. + +$(eval $(call gb_AllLangMoTarget_AllLangMoTarget,dkt)) + +$(eval $(call gb_AllLangMoTarget_set_polocation,dkt,desktop)) + +# vim: set noet sw=4 ts=4: diff --git a/desktop/AllLangResTarget_deployment.mk b/desktop/AllLangResTarget_deployment.mk deleted file mode 100644 index 2b7832799177..000000000000 --- a/desktop/AllLangResTarget_deployment.mk +++ /dev/null @@ -1,40 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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/. -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,deployment)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,deployment,desktop)) - -$(eval $(call gb_AllLangResTarget_add_srs,deployment,\ - deployment/res \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,deployment/res)) - -$(eval $(call gb_SrsTarget_set_include,deployment/res,\ - $$(INCLUDE) \ - -I$(SRCDIR)/desktop/inc \ - -I$(SRCDIR)/desktop/source/deployment/registry/inc \ - -I$(SRCDIR)/desktop/source/inc \ -)) - -$(eval $(call gb_SrsTarget_add_files,deployment/res,\ - desktop/source/deployment/manager/dp_manager.src \ - desktop/source/deployment/misc/dp_misc.src \ - desktop/source/deployment/registry/component/dp_component.src \ - desktop/source/deployment/registry/configuration/dp_configuration.src \ - desktop/source/deployment/registry/dp_registry.src \ - desktop/source/deployment/registry/help/dp_help.src \ - desktop/source/deployment/registry/package/dp_package.src \ - desktop/source/deployment/registry/script/dp_script.src \ - desktop/source/deployment/registry/sfwk/dp_sfwk.src \ - desktop/source/deployment/unopkg/unopkg.src \ -)) - -# vim: set ts=4 sw=4 et: diff --git a/desktop/AllLangResTarget_deploymentgui.mk b/desktop/AllLangResTarget_deploymentgui.mk deleted file mode 100644 index d5296e845a60..000000000000 --- a/desktop/AllLangResTarget_deploymentgui.mk +++ /dev/null @@ -1,34 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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/. -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,deploymentgui)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,deploymentgui,desktop)) - -$(eval $(call gb_AllLangResTarget_add_srs,deploymentgui,\ - deploymentgui/res \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,deploymentgui/res)) - -$(eval $(call gb_SrsTarget_set_include,deploymentgui/res,\ - $$(INCLUDE) \ - -I$(SRCDIR)/desktop/inc \ - -I$(SRCDIR)/desktop/source/deployment/registry/inc \ - -I$(SRCDIR)/desktop/source/inc \ -)) - -$(eval $(call gb_SrsTarget_add_files,deploymentgui/res,\ - desktop/source/deployment/gui/dp_gui_dialog.src \ - desktop/source/deployment/gui/dp_gui_updatedialog.src \ - desktop/source/deployment/gui/dp_gui_updateinstalldialog.src \ - desktop/source/deployment/gui/dp_gui_versionboxes.src \ -)) - -# vim: set ts=4 sw=4 et: diff --git a/desktop/AllLangResTarget_dkt.mk b/desktop/AllLangResTarget_dkt.mk deleted file mode 100644 index f44a6e017b9d..000000000000 --- a/desktop/AllLangResTarget_dkt.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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/. -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,dkt)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,dkt,desktop)) - -$(eval $(call gb_AllLangResTarget_add_srs,dkt,\ - dkt/res \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,dkt/res)) - -$(eval $(call gb_SrsTarget_add_files,dkt/res,\ - desktop/source/app/desktop.src \ -)) - -# vim: set ts=4 sw=4 et: diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk index dbc55a700e04..8095676d3d79 100644 --- a/desktop/Library_deployment.mk +++ b/desktop/Library_deployment.mk @@ -32,6 +32,7 @@ $(eval $(call gb_Library_use_libraries,deployment,\ tl \ ucbhelper \ utl \ + vcl \ xmlscript \ i18nlangtag \ )) diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk index b3754912f54c..8624f47ac6e4 100644 --- a/desktop/Library_deploymentmisc.mk +++ b/desktop/Library_deploymentmisc.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,deploymentmisc,\ tl \ ucbhelper \ utl \ + vcl \ xmlscript \ i18nlangtag \ )) diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index 7b76aedc4d33..1c88d4e1a421 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -105,7 +105,6 @@ $(eval $(call gb_Library_add_exception_objects,sofficeapp,\ desktop/source/app/cmdlineargs \ desktop/source/app/cmdlinehelp \ desktop/source/app/desktopcontext \ - desktop/source/app/desktopresid \ desktop/source/app/dispatchwatcher \ desktop/source/app/langselect \ desktop/source/app/lockfile2 \ diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index a5a688394947..e18b23126dff 100644 --- a/desktop/Module_desktop.mk +++ b/desktop/Module_desktop.mk @@ -23,13 +23,11 @@ $(eval $(call gb_Module_add_targets,desktop,\ $(if $(ENABLE_HEADLESS),,Library_spl) \ Package_branding \ $(if $(CUSTOM_BRAND_DIR),Package_branding_custom) \ + UIConfig_deployment \ )) $(eval $(call gb_Module_add_l10n_targets,desktop,\ - AllLangResTarget_deployment \ - AllLangResTarget_deploymentgui \ - AllLangResTarget_dkt \ - UIConfig_deployment \ + AllLangMoTarget_dkt \ )) ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index 974d0ef3fac0..f4af4bcecc9d 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -90,7 +90,6 @@ class Desktop : public Application DECL_STATIC_LINK( Desktop, EnableAcceptors_Impl, void*, void); static void HandleAppEvent( const ApplicationEvent& rAppEvent ); - static ResMgr* GetDesktopResManager(); static CommandLineArgs& GetCommandLineArgs(); static void HandleBootstrapErrors( @@ -176,8 +175,6 @@ class Desktop : public Application std::unique_ptr m_xLockfile; Timer m_firstRunTimer; std::thread m_aUpdateThread; - - static ResMgr* pResMgr; }; OUString GetURL_Impl( diff --git a/desktop/inc/deployment.hrc b/desktop/inc/deployment.hrc deleted file mode 100644 index 42ca22890f16..000000000000 --- a/desktop/inc/deployment.hrc +++ /dev/null @@ -1,63 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_DEPLOYMENT_HRC -#define INCLUDED_DEPLOYMENT_HRC - -#define RID_DEPLOYMENT_START 2000 - -#define RID_DEPLOYMENT_GUI_START RID_DEPLOYMENT_START -// RID_DEPLOYMENT_MISC_START (RID_DEPLOYMENT_START+500) -#define RID_DEPLOYMENT_MANAGER_START (RID_DEPLOYMENT_START+1000) -#define RID_DEPLOYMENT_REGISTRY_START (RID_DEPLOYMENT_START+1500) - -#define RID_DEPLOYMENT_BUNDLE_START (RID_DEPLOYMENT_START+2000) - -#define RID_DEPLOYMENT_SCRIPT_START (RID_DEPLOYMENT_START+2500) - -#define RID_DEPLOYMENT_CONF_START (RID_DEPLOYMENT_START+3000) - -#define RID_DEPLOYMENT_COMPONENT_START (RID_DEPLOYMENT_START+3500) - -#define RID_DEPLOYMENT_UNOPKG_START (RID_DEPLOYMENT_START+4000) -#define RID_STR_UNOPKG_ACCEPT_LIC_1 (RID_DEPLOYMENT_UNOPKG_START+1) -#define RID_STR_UNOPKG_ACCEPT_LIC_2 (RID_DEPLOYMENT_UNOPKG_START+2) -#define RID_STR_UNOPKG_ACCEPT_LIC_3 (RID_DEPLOYMENT_UNOPKG_START+3) -#define RID_STR_UNOPKG_ACCEPT_LIC_4 (RID_DEPLOYMENT_UNOPKG_START+4) -#define RID_STR_UNOPKG_ACCEPT_LIC_YES (RID_DEPLOYMENT_UNOPKG_START+5) -#define RID_STR_UNOPKG_ACCEPT_LIC_Y (RID_DEPLOYMENT_UNOPKG_START+6) -#define RID_STR_UNOPKG_ACCEPT_LIC_NO (RID_DEPLOYMENT_UNOPKG_START+7) -#define RID_STR_UNOPKG_ACCEPT_LIC_N (RID_DEPLOYMENT_UNOPKG_START+8) -#define RID_STR_UNOPKG_ERROR (RID_DEPLOYMENT_UNOPKG_START+9) -#define RID_STR_CONCURRENTINSTANCE (RID_DEPLOYMENT_UNOPKG_START+10) - -#define RID_DEPLOYMENT_DEPENDENCIES_START (RID_DEPLOYMENT_START + 4400) -#define RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN RID_DEPLOYMENT_DEPENDENCIES_START -#define RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN \ - (RID_DEPLOYMENT_DEPENDENCIES_START+1) -#define RID_DEPLOYMENT_DEPENDENCIES_OOO_MAX \ - (RID_DEPLOYMENT_DEPENDENCIES_START+2) -#define RID_DEPLOYMENT_DEPENDENCIES_LO_MIN (RID_DEPLOYMENT_DEPENDENCIES_START+3) - -#define RID_DEPLOYMENT_LICENSE_START (RID_DEPLOYMENT_START+4500) - -#define RID_DEPLOYMENT_HELP_START (RID_DEPLOYMENT_START+5000) -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/inc/dp_gui.hrc b/desktop/inc/dp_gui.hrc deleted file mode 100644 index a22629cb1e7a..000000000000 --- a/desktop/inc/dp_gui.hrc +++ /dev/null @@ -1,90 +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_DP_GUI_HRC -#define INCLUDED_DP_GUI_HRC - -#include "deployment.hrc" -#include "helpid.hrc" - -#define RID_STR_WARNING_VERSION_LESS (RID_DEPLOYMENT_GUI_START + 3) -#define RID_STR_WARNINGBOX_VERSION_LESS_DIFFERENT_NAMES (RID_DEPLOYMENT_GUI_START + 4) -#define RID_STR_WARNING_VERSION_EQUAL (RID_DEPLOYMENT_GUI_START + 5) -#define RID_STR_WARNINGBOX_VERSION_EQUAL_DIFFERENT_NAMES (RID_DEPLOYMENT_GUI_START + 6) -#define RID_STR_WARNING_VERSION_GREATER (RID_DEPLOYMENT_GUI_START + 7) -#define RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES (RID_DEPLOYMENT_GUI_START + 8) -#define RID_STR_WARNING_INSTALL_EXTENSION (RID_DEPLOYMENT_GUI_START + 9) -#define RID_STR_WARNING_INSTALL_EXTENSION_DISABLED (RID_DEPLOYMENT_GUI_START + 10) -#define RID_STR_WARNING_REMOVE_EXTENSION_DISABLED (RID_DEPLOYMENT_GUI_START + 11) - -#define RID_DLG_UPDATE_NONE (RID_DEPLOYMENT_GUI_START + 13) -#define RID_DLG_UPDATE_NOINSTALLABLE (RID_DEPLOYMENT_GUI_START + 14) -#define RID_DLG_UPDATE_FAILURE (RID_DEPLOYMENT_GUI_START + 15) -#define RID_DLG_UPDATE_UNKNOWNERROR (RID_DEPLOYMENT_GUI_START + 16) -#define RID_DLG_UPDATE_NODESCRIPTION (RID_DEPLOYMENT_GUI_START + 17) -#define RID_DLG_UPDATE_NOINSTALL (RID_DEPLOYMENT_GUI_START + 18) -#define RID_DLG_UPDATE_NODEPENDENCY (RID_DEPLOYMENT_GUI_START + 19) -#define RID_DLG_UPDATE_NODEPENDENCY_CUR_VER (RID_DEPLOYMENT_GUI_START + 20) -#define RID_DLG_UPDATE_BROWSERBASED (RID_DEPLOYMENT_GUI_START + 21) -#define RID_DLG_UPDATE_VERSION (RID_DEPLOYMENT_GUI_START + 22) -#define RID_DLG_UPDATE_IGNORE (RID_DEPLOYMENT_GUI_START + 23) -#define RID_DLG_UPDATE_ENABLE (RID_DEPLOYMENT_GUI_START + 24) -#define RID_DLG_UPDATE_IGNORE_ALL (RID_DEPLOYMENT_GUI_START + 25) -#define RID_DLG_UPDATE_IGNORED_UPDATE (RID_DEPLOYMENT_GUI_START + 36) - -#define RID_DLG_UPDATE_INSTALL_INSTALLING (RID_DEPLOYMENT_GUI_START + 37) -#define RID_DLG_UPDATE_INSTALL_FINISHED (RID_DEPLOYMENT_GUI_START + 38) -#define RID_DLG_UPDATE_INSTALL_NO_ERRORS (RID_DEPLOYMENT_GUI_START + 39) -#define RID_DLG_UPDATE_INSTALL_THIS_ERROR_OCCURRED (RID_DEPLOYMENT_GUI_START + 40) -#define RID_DLG_UPDATE_INSTALL_ERROR_DOWNLOAD (RID_DEPLOYMENT_GUI_START + 41) -#define RID_DLG_UPDATE_INSTALL_ERROR_INSTALLATION (RID_DEPLOYMENT_GUI_START + 42) -#define RID_DLG_UPDATE_INSTALL_ERROR_LIC_DECLINED (RID_DEPLOYMENT_GUI_START + 43) -#define RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL (RID_DEPLOYMENT_GUI_START + 44) - -#define RID_STR_ADD_PACKAGES (RID_DEPLOYMENT_GUI_START+70) - -#define RID_CTX_ITEM_REMOVE (RID_DEPLOYMENT_GUI_START+80) -#define RID_CTX_ITEM_ENABLE (RID_DEPLOYMENT_GUI_START+81) -#define RID_CTX_ITEM_DISABLE (RID_DEPLOYMENT_GUI_START+82) -#define RID_CTX_ITEM_CHECK_UPDATE (RID_DEPLOYMENT_GUI_START+83) -//There is a gap here - -#define RID_STR_ADDING_PACKAGES (RID_DEPLOYMENT_GUI_START+85) -#define RID_STR_REMOVING_PACKAGES (RID_DEPLOYMENT_GUI_START+86) -#define RID_STR_ENABLING_PACKAGES (RID_DEPLOYMENT_GUI_START+87) -#define RID_STR_DISABLING_PACKAGES (RID_DEPLOYMENT_GUI_START+88) -#define RID_STR_ACCEPT_LICENSE (RID_DEPLOYMENT_GUI_START+89) - -#define RID_STR_ERROR_UNKNOWN_STATUS (RID_DEPLOYMENT_GUI_START+92) -#define RID_STR_CLOSE_BTN (RID_DEPLOYMENT_GUI_START+93) -#define RID_STR_EXIT_BTN (RID_DEPLOYMENT_GUI_START+94) -#define RID_STR_NO_ADMIN_PRIVILEGE (RID_DEPLOYMENT_GUI_START+95) -#define RID_STR_ERROR_MISSING_DEPENDENCIES (RID_DEPLOYMENT_GUI_START+96) -#define RID_STR_ERROR_MISSING_LICENSE (RID_DEPLOYMENT_GUI_START+97) -#define RID_STR_SHOW_LICENSE_CMD (RID_DEPLOYMENT_GUI_START+98) - -#define RID_STR_UNSUPPORTED_PLATFORM (RID_DEPLOYMENT_GUI_START+101) -#define RID_STR_WARNING_REMOVE_EXTENSION (RID_DEPLOYMENT_GUI_START+103) -#define RID_STR_WARNING_REMOVE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+104) -#define RID_STR_WARNING_ENABLE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+105) -#define RID_STR_WARNING_DISABLE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+106) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/inc/dp_gui_shared.hxx b/desktop/inc/dp_shared.hxx similarity index 72% rename from desktop/inc/dp_gui_shared.hxx rename to desktop/inc/dp_shared.hxx index 63496c860867..425cda8ea906 100644 --- a/desktop/inc/dp_gui_shared.hxx +++ b/desktop/inc/dp_shared.hxx @@ -20,25 +20,27 @@ #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_SHARED_HXX #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_SHARED_HXX +#include #include #include +#include +#include +namespace dp { -namespace dp_gui { - -struct DeploymentGuiResMgr : - public ::rtl::StaticWithInit< ResMgr *, DeploymentGuiResMgr > { - ResMgr * operator () () { - return ResMgr::CreateResMgr( "deploymentgui" ); +struct DeploymentLocale : + public ::rtl::StaticWithInit { + std::locale operator () () { + return Translate::Create("dkt", Application::GetSettings().GetUILanguageTag()); } }; -inline OUString DpGuiResId(sal_uInt16 nId) -{ - return ResId(nId, *DeploymentGuiResMgr::get()); -} +} // namespace dp -} // namespace dp_gui +inline OUString DpResId(const char* pId) +{ + return Translate::get(pId, dp::DeploymentLocale::get()); +} #endif diff --git a/desktop/inc/pch/precompiled_deploymentgui.hxx b/desktop/inc/pch/precompiled_deploymentgui.hxx index 9a18b5e1186b..0227276894c8 100644 --- a/desktop/inc/pch/precompiled_deploymentgui.hxx +++ b/desktop/inc/pch/precompiled_deploymentgui.hxx @@ -108,7 +108,6 @@ #include #include #include -#include #include #include #include diff --git a/desktop/inc/pch/precompiled_sofficeapp.hxx b/desktop/inc/pch/precompiled_sofficeapp.hxx index f7b322eb66fb..95e6c6fa7892 100644 --- a/desktop/inc/pch/precompiled_sofficeapp.hxx +++ b/desktop/inc/pch/precompiled_sofficeapp.hxx @@ -229,7 +229,6 @@ #include #include #include -#include #include #include #include @@ -247,7 +246,6 @@ #include #include #include -#include #include #include #include diff --git a/desktop/inc/strings.hrc b/desktop/inc/strings.hrc new file mode 100644 index 000000000000..40504ce36815 --- /dev/null +++ b/desktop/inc/strings.hrc @@ -0,0 +1,197 @@ +/* -*- 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_VCL_INC_STRINGS_HRC +#define INCLUDED_VCL_INC_STRINGS_HRC + +#define NC_(Context, String) (Context "\004" u8##String) + +#define RID_STR_COPYING_PACKAGE NC_("RID_STR_COPYING_PACKAGE", "Copying: ") +#define RID_STR_ERROR_WHILE_ADDING NC_("RID_STR_ERROR_WHILE_ADDING", "Error while adding: ") +#define RID_STR_ERROR_WHILE_REMOVING NC_("RID_STR_ERROR_WHILE_REMOVING", "Error while removing: ") +#define RID_STR_PACKAGE_ALREADY_ADDED NC_("RID_STR_PACKAGE_ALREADY_ADDED", "Extension has already been added: ") +#define RID_STR_NO_SUCH_PACKAGE NC_("RID_STR_NO_SUCH_PACKAGE", "There is no such extension deployed: ") +#define RID_STR_SYNCHRONIZING_REPOSITORY NC_("RID_STR_SYNCHRONIZING_REPOSITORY", "Synchronizing repository for %NAME extensions") + +#define RID_STR_REGISTERING_PACKAGE NC_("RID_STR_REGISTERING_PACKAGE", "Enabling: ") +#define RID_STR_REVOKING_PACKAGE NC_("RID_STR_REVOKING_PACKAGE", "Disabling: ") +#define RID_STR_CANNOT_DETECT_MEDIA_TYPE NC_("RID_STR_CANNOT_DETECT_MEDIA_TYPE", "Cannot detect media-type: ") +#define RID_STR_UNSUPPORTED_MEDIA_TYPE NC_("RID_STR_UNSUPPORTED_MEDIA_TYPE", "This media-type is not supported: ") +#define RID_STR_ERROR_WHILE_REGISTERING NC_("RID_STR_ERROR_WHILE_REGISTERING", "An error occurred while enabling: ") +#define RID_STR_ERROR_WHILE_REVOKING NC_("RID_STR_ERROR_WHILE_REVOKING", "An error occurred while disabling: ") + +#define RID_STR_CONF_SCHEMA NC_("RID_STR_CONF_SCHEMA", "Configuration Schema") +#define RID_STR_CONF_DATA NC_("RID_STR_CONF_DATA", "Configuration Data") + +#define RID_STR_BASIC_LIB NC_("RID_STR_BASIC_LIB", "%PRODUCTNAME Basic Library") +#define RID_STR_DIALOG_LIB NC_("RID_STR_DIALOG_LIB", "Dialog Library") +#define RID_STR_CANNOT_DETERMINE_LIBNAME NC_("RID_STR_CANNOT_DETERMINE_LIBNAME", "The library name could not be determined.") + +#define RID_STR_PACKAGE_BUNDLE NC_("RID_STR_PACKAGE_BUNDLE", "Extension") + +#define RID_STR_DYN_COMPONENT NC_("RID_STR_DYN_COMPONENT", "UNO Dynamic Library Component") +#define RID_STR_JAVA_COMPONENT NC_("RID_STR_JAVA_COMPONENT", "UNO Java Component") +#define RID_STR_PYTHON_COMPONENT NC_("RID_STR_PYTHON_COMPONENT", "UNO Python Component") +#define RID_STR_COMPONENTS NC_("RID_STR_COMPONENTS", "UNO Components") +#define RID_STR_RDB_TYPELIB NC_("RID_STR_RDB_TYPELIB", "UNO RDB Type Library") +#define RID_STR_JAVA_TYPELIB NC_("RID_STR_JAVA_TYPELIB", "UNO Java Type Library") + +#define RID_STR_SFWK_LIB NC_("RID_STR_SFWK_LIB", "%MACROLANG Library") + +#define RID_STR_HELP NC_("RID_STR_HELP", "Help") +#define RID_STR_HELPPROCESSING_GENERAL_ERROR NC_("RID_STR_HELPPROCESSING_GENERAL_ERROR", "The extension cannot be installed because:\n") +#define RID_STR_HELPPROCESSING_XMLPARSING_ERROR NC_("RID_STR_HELPPROCESSING_XMLPARSING_ERROR", "The extension will not be installed because an error occurred in the Help files:\n") + +#define RID_STR_ADD_PACKAGES NC_("RID_STR_ADD_PACKAGES", "Add Extension(s)") +#define RID_CTX_ITEM_REMOVE NC_("RID_CTX_ITEM_REMOVE", "~Remove") +#define RID_CTX_ITEM_ENABLE NC_("RID_CTX_ITEM_ENABLE", "~Enable") +#define RID_CTX_ITEM_DISABLE NC_("RID_CTX_ITEM_DISABLE", "~Disable") +#define RID_CTX_ITEM_CHECK_UPDATE NC_("RID_CTX_ITEM_CHECK_UPDATE", "~Update...") +#define RID_STR_ADDING_PACKAGES NC_("RID_STR_ADDING_PACKAGES", "Adding %EXTENSION_NAME") +#define RID_STR_REMOVING_PACKAGES NC_("RID_STR_REMOVING_PACKAGES", "Removing %EXTENSION_NAME") +#define RID_STR_ENABLING_PACKAGES NC_("RID_STR_ENABLING_PACKAGES", "Enabling %EXTENSION_NAME") +#define RID_STR_DISABLING_PACKAGES NC_("RID_STR_DISABLING_PACKAGES", "Disabling %EXTENSION_NAME") +#define RID_STR_ACCEPT_LICENSE NC_("RID_STR_ACCEPT_LICENSE", "Accept license for %EXTENSION_NAME") +#define RID_STR_ERROR_UNKNOWN_STATUS NC_("RID_STR_ERROR_UNKNOWN_STATUS", "Error: The status of this extension is unknown") +#define RID_STR_CLOSE_BTN NC_("RID_STR_CLOSE_BTN", "Close") +#define RID_STR_EXIT_BTN NC_("RID_STR_EXIT_BTN", "Quit") +#define RID_STR_NO_ADMIN_PRIVILEGE NC_("RID_STR_NO_ADMIN_PRIVILEGE", "%PRODUCTNAME has been updated to a new version. " \ + "Some shared %PRODUCTNAME extensions are not compatible with this version and need to be updated before %PRODUCTNAME can be started.\n\n" \ + "Updating of shared extension requires administrator privileges. Contact your system administrator to update the following shared extensions:") +#define RID_STR_ERROR_MISSING_DEPENDENCIES NC_("RID_STR_ERROR_MISSING_DEPENDENCIES", "The extension cannot be enabled as the following system dependencies are not fulfilled:") +#define RID_STR_ERROR_MISSING_LICENSE NC_("RID_STR_ERROR_MISSING_LICENSE", "This extension is disabled because you haven't accepted the license yet.\n") +#define RID_STR_SHOW_LICENSE_CMD NC_("RID_STR_SHOW_LICENSE_CMD", "Show license") +#define RID_STR_WARNING_INSTALL_EXTENSION NC_("RID_STR_WARNING_INSTALL_EXTENSION", "You are about to install the extension '%NAME'.\n" \ + "Click 'OK' to proceed with the installation.\n" \ + "Click 'Cancel' to stop the installation.") +#define RID_STR_WARNING_INSTALL_EXTENSION_DISABLED NC_("RID_STR_WARNING_INSTALL_EXTENSION_DISABLED", "Extension installation is currently disabled. " \ + "Please consult your system administrator for more information.") +#define RID_STR_WARNING_REMOVE_EXTENSION_DISABLED NC_("RID_STR_WARNING_REMOVE_EXTENSION_DISABLED", "Extension removal is currently disabled. " \ + "Please consult your system administrator for more information.") +#define RID_STR_WARNING_REMOVE_EXTENSION NC_("RID_STR_WARNING_REMOVE_EXTENSION", "You are about to remove the extension '%NAME'.\n" \ + "Click 'OK' to remove the extension.\n" \ + "Click 'Cancel' to stop removing the extension.") +#define RID_STR_WARNING_REMOVE_SHARED_EXTENSION NC_("RID_STR_WARNING_REMOVE_SHARED_EXTENSION", "Make sure that no further users are working with the same " \ + "%PRODUCTNAME, when changing shared extensions in a multi user environment.\n" \ + "Click 'OK' to remove the extension.\n" \ + "Click 'Cancel' to stop removing the extension.") +#define RID_STR_WARNING_ENABLE_SHARED_EXTENSION NC_("RID_STR_WARNING_ENABLE_SHARED_EXTENSION", "Make sure that no further users are working with the same " \ + "%PRODUCTNAME, when changing shared extensions in a multi user environment.\n" \ + "Click 'OK' to enable the extension.\n" \ + "Click 'Cancel' to stop enabling the extension.") +#define RID_STR_WARNING_DISABLE_SHARED_EXTENSION NC_("RID_STR_WARNING_DISABLE_SHARED_EXTENSION", "Make sure that no further users are working with the same " \ + "%PRODUCTNAME, when changing shared extensions in a multi user environment.\n" \ + "Click 'OK' to disable the extension.\n" \ + "Click 'Cancel' to stop disabling the extension.") +#define RID_STR_UNSUPPORTED_PLATFORM NC_("RID_STR_UNSUPPORTED_PLATFORM", "The extension '%Name' does not work on this computer.") + +#define RID_DLG_UPDATE_INSTALL_INSTALLING NC_("RID_DLG_UPDATE_INSTALL_INSTALLING", "Installing extensions...") +#define RID_DLG_UPDATE_INSTALL_FINISHED NC_("RID_DLG_UPDATE_INSTALL_FINISHED", "Installation finished") +#define RID_DLG_UPDATE_INSTALL_NO_ERRORS NC_("RID_DLG_UPDATE_INSTALL_NO_ERRORS", "No errors.") +#define RID_DLG_UPDATE_INSTALL_ERROR_DOWNLOAD NC_("RID_DLG_UPDATE_INSTALL_ERROR_DOWNLOAD", "Error while downloading extension %NAME. ") +#define RID_DLG_UPDATE_INSTALL_THIS_ERROR_OCCURRED NC_("RID_DLG_UPDATE_INSTALL_THIS_ERROR_OCCURRED", "The error message is: ") +#define RID_DLG_UPDATE_INSTALL_ERROR_INSTALLATION NC_("RID_DLG_UPDATE_INSTALL_ERROR_INSTALLATION", "Error while installing extension %NAME. ") +#define RID_DLG_UPDATE_INSTALL_ERROR_LIC_DECLINED NC_("RID_DLG_UPDATE_INSTALL_ERROR_LIC_DECLINED", "The license agreement for extension %NAME was refused. ") +#define RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL NC_("RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL", "The extension will not be installed.") + +#define RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN NC_("RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN", "Unknown") +#define RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN NC_("RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN", "Extension requires at least OpenOffice.org reference version %VERSION") +#define RID_DEPLOYMENT_DEPENDENCIES_OOO_MAX NC_("RID_DEPLOYMENT_DEPENDENCIES_OOO_MAX", "Extension does not support OpenOffice.org reference versions greater than %VERSION") +#define RID_DEPLOYMENT_DEPENDENCIES_LO_MIN NC_("RID_DEPLOYMENT_DEPENDENCIES_LO_MIN", "Extension requires at least %PRODUCTNAME version %VERSION") + +#define RID_STR_WARNING_VERSION_LESS NC_("RID_STR_WARNING_VERSION_LESS", "You are about to install version $NEW of the extension '$NAME'.\n" \ + "The newer version $DEPLOYED is already installed.\n"\ + "Click 'OK' to replace the installed extension.\n"\ + "Click 'Cancel' to stop the installation.") +#define RID_STR_WARNINGBOX_VERSION_LESS_DIFFERENT_NAMES NC_("RID_STR_WARNINGBOX_VERSION_LESS_DIFFERENT_NAMES", "You are about to install version $NEW of the extension '$NAME'.\n" \ + "The newer version $DEPLOYED, named '$OLDNAME', is already installed.\n" \ + "Click 'OK' to replace the installed extension.\n" \ + "Click 'Cancel' to stop the installation.") +#define RID_STR_WARNING_VERSION_EQUAL NC_("RID_STR_WARNING_VERSION_EQUAL", "You are about to install version $NEW of the extension '$NAME'.\n" \ + "That version is already installed.\n" \ + "Click 'OK' to replace the installed extension.\n" \ + "Click 'Cancel' to stop the installation.") +#define RID_STR_WARNINGBOX_VERSION_EQUAL_DIFFERENT_NAMES NC_("RID_STR_WARNINGBOX_VERSION_EQUAL_DIFFERENT_NAMES", "You are about to install version $NEW of the extension '$NAME'.\n" \ + "That version, named '$OLDNAME', is already installed.\n" \ + "Click 'OK' to replace the installed extension.\n" \ + "Click 'Cancel' to stop the installation.") +#define RID_STR_WARNING_VERSION_GREATER NC_("RID_STR_WARNING_VERSION_GREATER", "You are about to install version $NEW of the extension '$NAME'.\n" \ + "The older version $DEPLOYED is already installed.\n" \ + "Click 'OK' to replace the installed extension.\n" \ + "Click 'Cancel' to stop the installation.") +#define RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES NC_("RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES", "You are about to install version $NEW of the extension '$NAME'.\n" \ + "The older version $DEPLOYED, named '$OLDNAME', is already installed.\n" \ + "Click 'OK' to replace the installed extension.\n" \ + "Click 'Cancel' to stop the installation.") + +#define RID_DLG_UPDATE_NONE NC_("RID_DLG_UPDATE_NONE", "No new updates are available.") +#define RID_DLG_UPDATE_NOINSTALLABLE NC_("RID_DLG_UPDATE_NOINSTALLABLE", "No installable updates are available. To see ignored or disabled updates, mark the check box 'Show all updates'.") +#define RID_DLG_UPDATE_FAILURE NC_("RID_DLG_UPDATE_FAILURE", "An error occurred:") +#define RID_DLG_UPDATE_UNKNOWNERROR NC_("RID_DLG_UPDATE_UNKNOWNERROR", "Unknown error.") +#define RID_DLG_UPDATE_NODESCRIPTION NC_("RID_DLG_UPDATE_NODESCRIPTION", "No more details are available for this update.") +#define RID_DLG_UPDATE_NOINSTALL NC_("RID_DLG_UPDATE_NOINSTALL", "The extension cannot be updated because:") +#define RID_DLG_UPDATE_NODEPENDENCY NC_("RID_DLG_UPDATE_NODEPENDENCY", "Required %PRODUCTNAME version doesn't match:") +#define RID_DLG_UPDATE_NODEPENDENCY_CUR_VER NC_("RID_DLG_UPDATE_NODEPENDENCY_CUR_VER", "You have %PRODUCTNAME %VERSION") +#define RID_DLG_UPDATE_BROWSERBASED NC_("RID_DLG_UPDATE_BROWSERBASED", "browser based update") +#define RID_DLG_UPDATE_VERSION NC_("RID_DLG_UPDATE_VERSION", "Version") +#define RID_DLG_UPDATE_IGNORE NC_("RID_DLG_UPDATE_IGNORE", "Ignore this Update") +#define RID_DLG_UPDATE_IGNORE_ALL NC_("RID_DLG_UPDATE_IGNORE_ALL", "Ignore all Updates") +#define RID_DLG_UPDATE_ENABLE NC_("RID_DLG_UPDATE_ENABLE", "Enable Updates") +#define RID_DLG_UPDATE_IGNORED_UPDATE NC_("RID_DLG_UPDATE_IGNORED_UPDATE", "This update will be ignored.\n") + +#define STR_BOOTSTRAP_ERR_CANNOT_START NC_("STR_BOOTSTRAP_ERR_CANNOT_START", "The application cannot be started. ") +#define STR_BOOTSTRAP_ERR_DIR_MISSING NC_("STR_BOOTSTRAP_ERR_DIR_MISSING", "The configuration directory \"$1\" could not be found.") +#define STR_BOOTSTRAP_ERR_PATH_INVALID NC_("STR_BOOTSTRAP_ERR_PATH_INVALID", "The installation path is invalid.") +#define STR_BOOTSTRAP_ERR_INTERNAL NC_("STR_BOOTSTRAP_ERR_INTERNAL", "An internal error occurred.") +#define STR_BOOTSTRAP_ERR_FILE_CORRUPT NC_("STR_BOOTSTRAP_ERR_FILE_CORRUPT", "The configuration file \"$1\" is corrupt.") +#define STR_BOOTSTRAP_ERR_FILE_MISSING NC_("STR_BOOTSTRAP_ERR_FILE_MISSING", "The configuration file \"$1\" was not found.") +#define STR_BOOTSTRAP_ERR_NO_SUPPORT NC_("STR_BOOTSTRAP_ERR_NO_SUPPORT", "The configuration file \"$1\" does not support the current version.") +#define STR_BOOTSTRAP_ERR_LANGUAGE_MISSING NC_("STR_BOOTSTRAP_ERR_LANGUAGE_MISSING", "The user interface language cannot be determined.") +#define STR_BOOTSTRAP_ERR_USERINSTALL_FAILED NC_("STR_BOOTSTRAP_ERR_USERINSTALL_FAILED", "User installation could not be completed. ") +#define STR_BOOTSTRAP_ERR_NO_CFG_SERVICE NC_("STR_BOOTSTRAP_ERR_NO_CFG_SERVICE", "The configuration service is not available.") +#define STR_ASK_START_SETUP_MANUALLY NC_("STR_ASK_START_SETUP_MANUALLY", "Start the setup application to repair the installation from the CD or the folder containing the installation packages.") +#define STR_CONFIG_ERR_ACCESS_GENERAL NC_("STR_CONFIG_ERR_ACCESS_GENERAL", "A general error occurred while accessing your central configuration. ") +#define STR_BOOTSTRAP_ERR_CFG_DATAACCESS NC_("STR_BOOTSTRAP_ERR_CFG_DATAACCESS", "%PRODUCTNAME cannot be started due to an error in accessing the %PRODUCTNAME configuration data.\n\nPlease contact your system administrator." ) +#define STR_INTERNAL_ERRMSG NC_("STR_INTERNAL_ERRMSG", "The following internal error has occurred: " ) +#define STR_LO_MUST_BE_RESTARTED NC_("STR_LO_MUST_BE_RESTARTED", "%PRODUCTNAME must unfortunately be manually restarted once after installation or update." ) +#define STR_QUERY_USERDATALOCKED NC_("STR_QUERY_USERDATALOCKED", "Either another instance of %PRODUCTNAME is accessing your personal settings or your personal settings are locked.\nSimultaneous access can lead to inconsistencies in your personal settings. Before continuing, you should make sure user '$u' closes %PRODUCTNAME on host '$h'.\n\nDo you really want to continue?") +#define STR_TITLE_USERDATALOCKED NC_("STR_TITLE_USERDATALOCKED", "%PRODUCTNAME %PRODUCTVERSION") +#define STR_ERR_PRINTDISABLED NC_("STR_ERR_PRINTDISABLED", "Printing is disabled. No documents can be printed.") +#define STR_BOOTSTRAP_ERR_NO_PATHSET_SERVICE NC_("STR_BOOTSTRAP_ERR_NO_PATHSET_SERVICE", "The path manager is not available.\n") +#define STR_BOOSTRAP_ERR_NOTENOUGHDISKSPACE NC_("STR_BOOSTRAP_ERR_NOTENOUGHDISKSPACE", "%PRODUCTNAME user installation could not be completed due to insufficient free disk space. Please free more disc space at the following location and restart %PRODUCTNAME:\n\n") +#define STR_BOOSTRAP_ERR_NOACCESSRIGHTS NC_("STR_BOOSTRAP_ERR_NOACCESSRIGHTS", "%PRODUCTNAME user installation could not be processed due to missing access rights. Please make sure that you have sufficient access rights for the following location and restart %PRODUCTNAME:\n\n") + +#define RID_STR_UNOPKG_ACCEPT_LIC_1 NC_("RID_STR_UNOPKG_ACCEPT_LIC_1", "Extension Software License Agreement of $NAME:") +#define RID_STR_UNOPKG_ACCEPT_LIC_2 NC_("RID_STR_UNOPKG_ACCEPT_LIC_2", "Read the complete License Agreement displayed above. " \ + "Accept the License Agreement by typing \"yes\" on the console " \ + "then press the Return key. Type \"no\" to decline and to abort the " \ + "extension setup.") +#define RID_STR_UNOPKG_ACCEPT_LIC_3 NC_("RID_STR_UNOPKG_ACCEPT_LIC_3", "[Enter \"yes\" or \"no\"]:") +#define RID_STR_UNOPKG_ACCEPT_LIC_4 NC_("RID_STR_UNOPKG_ACCEPT_LIC_4", "Your input was not correct. Please enter \"yes\" or \"no\":") +#define RID_STR_UNOPKG_ACCEPT_LIC_YES NC_("RID_STR_UNOPKG_ACCEPT_LIC_YES", "YES") +#define RID_STR_UNOPKG_ACCEPT_LIC_Y NC_("RID_STR_UNOPKG_ACCEPT_LIC_Y", "Y") +#define RID_STR_UNOPKG_ACCEPT_LIC_NO NC_("RID_STR_UNOPKG_ACCEPT_LIC_NO", "NO") +#define RID_STR_UNOPKG_ACCEPT_LIC_N NC_("RID_STR_UNOPKG_ACCEPT_LIC_N", "N") +#define RID_STR_CONCURRENTINSTANCE NC_("RID_STR_CONCURRENTINSTANCE", "unopkg cannot be started. The lock file indicates it is already running. " \ + "If this does not apply, delete the lock file at:") +#define RID_STR_UNOPKG_ERROR NC_("RID_STR_UNOPKG_ERROR", "ERROR: ") + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index d39a8564366b..927912fcdc67 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -30,7 +30,8 @@ #endif #include "app.hxx" -#include "desktop.hrc" +#include "dp_shared.hxx" +#include "strings.hrc" #include "cmdlineargs.hxx" #include "cmdlinehelp.hxx" #include "dispatchwatcher.hxx" @@ -164,8 +165,6 @@ using namespace ::com::sun::star::ui; using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::container; -ResMgr* desktop::Desktop::pResMgr = nullptr; - namespace desktop { @@ -333,59 +332,14 @@ void DoRestartActionsIfNecessary(bool quickstart) { } - -ResMgr* Desktop::GetDesktopResManager() -{ - if ( !Desktop::pResMgr ) - { - // Create desktop resource manager and bootstrap process - // was successful. Use default way to get language specific message. - if ( Application::IsInExecute() ) - Desktop::pResMgr = ResMgr::CreateResMgr("dkt"); - - if ( !Desktop::pResMgr ) - { - // Use VCL to get the correct language specific message as we - // are in the bootstrap process and not able to get the installed - // language!! - OUString aUILocaleString = langselect::getEmergencyLocale(); - LanguageTag aLanguageTag( aUILocaleString); - //! ResMgr may modify the Locale for fallback! - Desktop::pResMgr = ResMgr::SearchCreateResMgr( "dkt", aLanguageTag); - } - } - - return Desktop::pResMgr; -} - namespace { -// Get a message string securely. There is a fallback string if the resource -// is not available. - -OUString GetMsgString( - sal_uInt16 nId, const OUString& aFallbackMsg, - bool bAlwaysUseFallbackMsg = false ) -{ - if ( !bAlwaysUseFallbackMsg ) - { - ResMgr* resMgr = Desktop::GetDesktopResManager(); - if ( resMgr ) - return ResId(nId, *resMgr); - } - return aFallbackMsg; -} - -OUString MakeStartupErrorMessage( - OUString const & aErrorMessage, bool bAlwaysUseFallbackMsg = false ) +OUString MakeStartupErrorMessage(OUString const & aErrorMessage) { OUStringBuffer aDiagnosticMessage( 100 ); - aDiagnosticMessage.append( - GetMsgString( - STR_BOOTSTRAP_ERR_CANNOT_START, "The program cannot be started.", - bAlwaysUseFallbackMsg ) ); + aDiagnosticMessage.append(DpResId(STR_BOOTSTRAP_ERR_CANNOT_START)); aDiagnosticMessage.append( "\n" ); @@ -398,20 +352,13 @@ OUString MakeStartupConfigAccessErrorMessage( OUString const & aInternalErrMsg ) { OUStringBuffer aDiagnosticMessage( 200 ); - ResMgr* pResMgr = Desktop::GetDesktopResManager(); - if ( pResMgr ) - aDiagnosticMessage.append( ResId(STR_BOOTSTRAP_ERR_CFG_DATAACCESS, *pResMgr) ); - else - aDiagnosticMessage.append( "The program cannot be started." ); + aDiagnosticMessage.append(DpResId(STR_BOOTSTRAP_ERR_CFG_DATAACCESS)); if ( !aInternalErrMsg.isEmpty() ) { - aDiagnosticMessage.append( "\n\n" ); - if ( pResMgr ) - aDiagnosticMessage.append( ResId(STR_INTERNAL_ERRMSG, *pResMgr) ); - else - aDiagnosticMessage.append( "The following internal error has occurred:\n\n" ); - aDiagnosticMessage.append( aInternalErrMsg ); + aDiagnosticMessage.append("\n\n"); + aDiagnosticMessage.append(DpResId(STR_INTERNAL_ERRMSG)); + aDiagnosticMessage.append(aInternalErrMsg); } return aDiagnosticMessage.makeStringAndClear(); @@ -731,8 +678,7 @@ OUString Desktop::CreateErrorMsgString( /// the shared installation directory could not be located case ::utl::Bootstrap::MISSING_INSTALL_DIRECTORY: { - aMsg = GetMsgString( STR_BOOTSTRAP_ERR_PATH_INVALID, - "The installation path is not available." ); + aMsg = DpResId(STR_BOOTSTRAP_ERR_PATH_INVALID); bFileInfo = false; } break; @@ -740,8 +686,7 @@ OUString Desktop::CreateErrorMsgString( /// the bootstrap INI file could not be found or read case ::utl::Bootstrap::MISSING_BOOTSTRAP_FILE: { - aMsg = GetMsgString( STR_BOOTSTRAP_ERR_FILE_MISSING, - "The configuration file \"$1\" is missing." ); + aMsg = DpResId(STR_BOOTSTRAP_ERR_FILE_MISSING); } break; @@ -750,40 +695,35 @@ OUString Desktop::CreateErrorMsgString( case ::utl::Bootstrap::MISSING_BOOTSTRAP_FILE_ENTRY: case ::utl::Bootstrap::INVALID_BOOTSTRAP_FILE_ENTRY: { - aMsg = GetMsgString( STR_BOOTSTRAP_ERR_FILE_CORRUPT, - "The configuration file \"$1\" is corrupt." ); + aMsg = DpResId(STR_BOOTSTRAP_ERR_FILE_CORRUPT); } break; /// the version locator INI file could not be found or read case ::utl::Bootstrap::MISSING_VERSION_FILE: { - aMsg = GetMsgString( STR_BOOTSTRAP_ERR_FILE_MISSING, - "The configuration file \"$1\" is missing." ); + aMsg = DpResId(STR_BOOTSTRAP_ERR_FILE_MISSING); } break; /// the version locator INI has no entry for this version - case ::utl::Bootstrap::MISSING_VERSION_FILE_ENTRY: + case ::utl::Bootstrap::MISSING_VERSION_FILE_ENTRY: { - aMsg = GetMsgString( STR_BOOTSTRAP_ERR_NO_SUPPORT, - "The main configuration file \"$1\" does not support the current version." ); + aMsg = DpResId(STR_BOOTSTRAP_ERR_NO_SUPPORT); } break; /// the user installation directory does not exist - case ::utl::Bootstrap::MISSING_USER_DIRECTORY: + case ::utl::Bootstrap::MISSING_USER_DIRECTORY: { - aMsg = GetMsgString( STR_BOOTSTRAP_ERR_DIR_MISSING, - "The configuration directory \"$1\" is missing." ); + aMsg = DpResId(STR_BOOTSTRAP_ERR_DIR_MISSING); } break; /// some bootstrap data was invalid in unexpected ways case ::utl::Bootstrap::INVALID_BOOTSTRAP_DATA: { - aMsg = GetMsgString( STR_BOOTSTRAP_ERR_INTERNAL, - "An internal failure occurred." ); + aMsg = DpResId(STR_BOOTSTRAP_ERR_INTERNAL); bFileInfo = false; } break; @@ -892,10 +832,7 @@ void Desktop::HandleBootstrapErrors( // Currently we are not able to display a message box with a service manager due to this limitations inside VCL. // When UNO is not properly initialized, all kinds of things can fail - // and cause the process to crash (e.g., a call to GetMsgString may - // crash when somewhere deep within that call Any::operator <= is used - // with a PropertyValue, and no binary UNO type description for - // PropertyValue is available). To give the user a hint even if + // and cause the process to crash. To give the user a hint even if // generating and displaying a message box below crashes, print a // hard-coded message on stderr first: std::cerr @@ -915,13 +852,7 @@ void Desktop::HandleBootstrapErrors( OUString aMessage; OUStringBuffer aDiagnosticMessage( 100 ); - OUString aErrorMsg; - - if ( aBootstrapError == BE_UNO_SERVICEMANAGER ) - aErrorMsg = "The service manager is not available."; - else - aErrorMsg = GetMsgString( STR_BOOTSTRAP_ERR_NO_CFG_SERVICE, - "The configuration service is not available." ); + OUString aErrorMsg = DpResId(STR_BOOTSTRAP_ERR_NO_CFG_SERVICE); aDiagnosticMessage.append( aErrorMsg ); aDiagnosticMessage.append( "\n" ); @@ -935,15 +866,10 @@ void Desktop::HandleBootstrapErrors( // Due to the fact the we haven't a backup applicat.rdb file anymore it is not possible to // repair the installation with the setup executable besides the office executable. Now // we have to ask the user to start the setup on CD/installation directory manually!! - OUString aStartSetupManually( GetMsgString( - STR_ASK_START_SETUP_MANUALLY, - "Start setup application to repair the installation from CD, or the folder containing the installation packages.", - aBootstrapError == BE_UNO_SERVICEMANAGER ) ); + OUString aStartSetupManually(DpResId(STR_ASK_START_SETUP_MANUALLY)); - aDiagnosticMessage.append( aStartSetupManually ); - aMessage = MakeStartupErrorMessage( - aDiagnosticMessage.makeStringAndClear(), - aBootstrapError == BE_UNO_SERVICEMANAGER ); + aDiagnosticMessage.append(aStartSetupManually); + aMessage = MakeStartupErrorMessage(aDiagnosticMessage.makeStringAndClear()); FatalError( aMessage); } @@ -957,11 +883,7 @@ void Desktop::HandleBootstrapErrors( // enter safe mode, too sfx2::SafeMode::putFlag(); - OUString msg( - GetMsgString( - STR_CONFIG_ERR_ACCESS_GENERAL, - ("A general error occurred while accessing your central" - " configuration. SafeMode is initiated."))); + OUString msg(DpResId(STR_CONFIG_ERR_ACCESS_GENERAL)); if (!aErrorMessage.isEmpty()) { msg += "\n(\"" + aErrorMessage + "\")"; } @@ -972,8 +894,7 @@ void Desktop::HandleBootstrapErrors( OUString aMessage; OUStringBuffer aDiagnosticMessage( 100 ); OUString aErrorMsg; - aErrorMsg = GetMsgString( STR_BOOTSTRAP_ERR_USERINSTALL_FAILED, - "User installation could not be completed" ); + aErrorMsg = DpResId(STR_BOOTSTRAP_ERR_USERINSTALL_FAILED); aDiagnosticMessage.append( aErrorMsg ); aMessage = MakeStartupErrorMessage( aDiagnosticMessage.makeStringAndClear() ); FatalError(aMessage); @@ -983,10 +904,9 @@ void Desktop::HandleBootstrapErrors( OUString aMessage; OUStringBuffer aDiagnosticMessage( 100 ); OUString aErrorMsg; - aErrorMsg = GetMsgString( + aErrorMsg = DpResId( //@@@ FIXME: should use an own resource string => #i36213# - STR_BOOTSTRAP_ERR_LANGUAGE_MISSING, - "Language could not be determined." ); + STR_BOOTSTRAP_ERR_LANGUAGE_MISSING); aDiagnosticMessage.append( aErrorMsg ); aMessage = MakeStartupErrorMessage( aDiagnosticMessage.makeStringAndClear() ); @@ -1004,13 +924,9 @@ void Desktop::HandleBootstrapErrors( utl::Bootstrap::locateUserInstallation( aUserInstallationURL ); if ( aBootstrapError == BE_USERINSTALL_NOTENOUGHDISKSPACE ) - aErrorMsg = GetMsgString( - STR_BOOSTRAP_ERR_NOTENOUGHDISKSPACE, - "User installation could not be completed due to insufficient free disk space." ); + aErrorMsg = DpResId(STR_BOOSTRAP_ERR_NOTENOUGHDISKSPACE); else - aErrorMsg = GetMsgString( - STR_BOOSTRAP_ERR_NOACCESSRIGHTS, - "User installation could not be processed due to missing access rights." ); + aErrorMsg = DpResId(STR_BOOSTRAP_ERR_NOACCESSRIGHTS); osl::File::getSystemPathFromFileURL( aUserInstallationURL, aUserInstallationPath ); @@ -1158,8 +1074,7 @@ void restartOnMac(bool passArguments) { RequestHandler::Disable(); #if HAVE_FEATURE_MACOSX_SANDBOX (void) passArguments; // avoid warnings - ResMgr *resMgr = Desktop::GetDesktopResManager(); - OUString aMessage = ResId(STR_LO_MUST_BE_RESTARTED, *resMgr); + OUString aMessage = DpResId(STR_LO_MUST_BE_RESTARTED); MessageDialog aRestartBox(NULL, aMessage); aRestartBox.Execute(); @@ -1399,7 +1314,7 @@ int Desktop::Main() } #endif - ResMgr::SetReadStringHook( ReplaceStringHookProc ); + Translate::SetReadStringHook(ReplaceStringHookProc); // Startup screen OpenSplashScreen(); @@ -1792,8 +1707,6 @@ int Desktop::doShutdown() pExecGlobals->xGlobalBroadcaster->documentEventOccured(aEvent); } - delete pResMgr; - pResMgr = nullptr; // Restore old value const CommandLineArgs& rCmdLineArgs = GetCommandLineArgs(); if ( rCmdLineArgs.IsHeadless() || rCmdLineArgs.IsEventTesting() ) @@ -2272,12 +2185,8 @@ void Desktop::OpenClients() { aRequest.aPrintList.clear(); aRequest.aPrintToList.clear(); - ResMgr* pDtResMgr = GetDesktopResManager(); - if( pDtResMgr ) - { - ScopedVclPtrInstance< MessageDialog > aBox(nullptr, ResId(STR_ERR_PRINTDISABLED, *pDtResMgr)); - aBox->Execute(); - } + ScopedVclPtrInstance< MessageDialog > aBox(nullptr, DpResId(STR_ERR_PRINTDISABLED)); + aBox->Execute(); } // Process request diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index 83bace868f04..5571b9460646 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -23,9 +23,9 @@ #include #include "app.hxx" +#include "dp_shared.hxx" #include "cmdlineargs.hxx" -#include "desktopresid.hxx" -#include "desktop.hrc" +#include "strings.hrc" #include #include #include @@ -45,8 +45,6 @@ #include #include -#include - #include #include #include @@ -238,13 +236,7 @@ void Desktop::CreateTemporaryDirectory() { // Catch runtime exception here: We have to add language dependent info // to the exception message. Fallback solution uses hard coded string. - OUString aMsg; - DesktopResId aResId( STR_BOOTSTRAP_ERR_NO_PATHSET_SERVICE ); - aResId.SetRT( RSC_STRING ); - if ( aResId.GetResMgr()->IsAvailable( aResId )) - aMsg = aResId; - else - aMsg = "The path manager is not available.\n"; + OUString aMsg = DpResId(STR_BOOTSTRAP_ERR_NO_PATHSET_SERVICE); e.Message = aMsg + e.Message; throw; } diff --git a/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc deleted file mode 100644 index 6863b1b6ed2c..000000000000 --- a/desktop/source/app/desktop.hrc +++ /dev/null @@ -1,60 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_DESKTOP_SOURCE_APP_DESKTOP_HRC -#define INCLUDED_DESKTOP_SOURCE_APP_DESKTOP_HRC - -#include - -// RID_FIRSTSTSTART_START 3000 -#define RID_DESKTOP_STRING_START 10000 - -#define STR_QUERY_USERDATALOCKED (RID_DESKTOP_STRING_START+2) - -#define STR_BOOTSTRAP_ERR_CANNOT_START (RID_DESKTOP_STRING_START+100) -#define STR_BOOTSTRAP_ERR_DIR_MISSING (RID_DESKTOP_STRING_START+101) -#define STR_BOOTSTRAP_ERR_PATH_INVALID (RID_DESKTOP_STRING_START+102) -#define STR_BOOTSTRAP_ERR_INTERNAL (RID_DESKTOP_STRING_START+104) -#define STR_BOOTSTRAP_ERR_FILE_CORRUPT (RID_DESKTOP_STRING_START+105) -#define STR_BOOTSTRAP_ERR_FILE_MISSING (RID_DESKTOP_STRING_START+106) -#define STR_BOOTSTRAP_ERR_NO_SUPPORT (RID_DESKTOP_STRING_START+107) -#define STR_BOOTSTRAP_ERR_LANGUAGE_MISSING (RID_DESKTOP_STRING_START+108) -#define STR_BOOTSTRAP_ERR_USERINSTALL_FAILED (RID_DESKTOP_STRING_START+109) - -#define STR_BOOTSTRAP_ERR_NO_CFG_SERVICE (RID_DESKTOP_STRING_START+121) -#define STR_BOOTSTRAP_ERR_CFG_DATAACCESS (RID_DESKTOP_STRING_START+122) -#define STR_BOOTSTRAP_ERR_NO_PATHSET_SERVICE (RID_DESKTOP_STRING_START+123) - -#define STR_ASK_START_SETUP_MANUALLY (RID_DESKTOP_STRING_START+152) - -#define STR_ERR_PRINTDISABLED (RID_DESKTOP_STRING_START+153) - -#define STR_INTERNAL_ERRMSG (RID_DESKTOP_STRING_START+161) -#define STR_LO_MUST_BE_RESTARTED (RID_DESKTOP_STRING_START+162) - -#define STR_CONFIG_ERR_ACCESS_GENERAL (RID_DESKTOP_STRING_START+187) - -#define STR_BOOSTRAP_ERR_NOTENOUGHDISKSPACE (RID_DESKTOP_STRING_START+189) -#define STR_BOOSTRAP_ERR_NOACCESSRIGHTS (RID_DESKTOP_STRING_START+190) - -#define STR_TITLE_USERDATALOCKED (RID_DESKTOP_STRING_START+206) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/app/desktop.src b/desktop/source/app/desktop.src deleted file mode 100644 index a4dd5da46f85..000000000000 --- a/desktop/source/app/desktop.src +++ /dev/null @@ -1,127 +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 "desktop.hrc" - -String STR_BOOTSTRAP_ERR_CANNOT_START -{ - Text [ en-US ] = "The application cannot be started. "; -}; - -String STR_BOOTSTRAP_ERR_DIR_MISSING -{ - Text [ en-US ] = "The configuration directory \"$1\" could not be found."; -}; - -String STR_BOOTSTRAP_ERR_PATH_INVALID -{ - Text [ en-US ] = "The installation path is invalid."; -}; - -String STR_BOOTSTRAP_ERR_INTERNAL -{ - Text [ en-US ] = "An internal error occurred."; -}; - -String STR_BOOTSTRAP_ERR_FILE_CORRUPT -{ - Text [ en-US ] = "The configuration file \"$1\" is corrupt."; -}; - -String STR_BOOTSTRAP_ERR_FILE_MISSING -{ - Text [ en-US ] = "The configuration file \"$1\" was not found."; -}; - -String STR_BOOTSTRAP_ERR_NO_SUPPORT -{ - Text [ en-US ] = "The configuration file \"$1\" does not support the current version."; -}; - -String STR_BOOTSTRAP_ERR_LANGUAGE_MISSING -{ - Text [ en-US ] = "The user interface language cannot be determined."; -}; - -String STR_BOOTSTRAP_ERR_USERINSTALL_FAILED -{ - Text [ en-US ] = "User installation could not be completed. "; -}; - -String STR_BOOTSTRAP_ERR_NO_CFG_SERVICE -{ - Text [ en-US ] = "The configuration service is not available."; -}; - -String STR_ASK_START_SETUP_MANUALLY -{ - Text [ en-US ] = "Start the setup application to repair the installation from the CD or the folder containing the installation packages."; -}; - -String STR_CONFIG_ERR_ACCESS_GENERAL -{ - Text [ en-US ] = "A general error occurred while accessing your central configuration. "; -}; - -String STR_BOOTSTRAP_ERR_CFG_DATAACCESS -{ - Text [ en-US ] = "%PRODUCTNAME cannot be started due to an error in accessing the %PRODUCTNAME configuration data.\n\nPlease contact your system administrator." ; -}; - -String STR_INTERNAL_ERRMSG -{ - Text [ en-US ] = "The following internal error has occurred: " ; -}; - -String STR_LO_MUST_BE_RESTARTED -{ - Text [ en-US ] = "%PRODUCTNAME must unfortunately be manually restarted once after installation or update." ; -}; - -String STR_QUERY_USERDATALOCKED -{ - Text [ en-US ] = "Either another instance of %PRODUCTNAME is accessing your personal settings or your personal settings are locked.\nSimultaneous access can lead to inconsistencies in your personal settings. Before continuing, you should make sure user '$u' closes %PRODUCTNAME on host '$h'.\n\nDo you really want to continue?"; -}; - -String STR_TITLE_USERDATALOCKED -{ - Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION"; -}; - -String STR_ERR_PRINTDISABLED -{ - Text [ en-US ] = "Printing is disabled. No documents can be printed."; -}; - -String STR_BOOTSTRAP_ERR_NO_PATHSET_SERVICE -{ - Text [ en-US ] = "The path manager is not available.\n"; -}; - -String STR_BOOSTRAP_ERR_NOTENOUGHDISKSPACE -{ - Text [ en-US ] = "%PRODUCTNAME user installation could not be completed due to insufficient free disk space. Please free more disc space at the following location and restart %PRODUCTNAME:\n\n"; -}; - -String STR_BOOSTRAP_ERR_NOACCESSRIGHTS -{ - Text [ en-US ] = "%PRODUCTNAME user installation could not be processed due to missing access rights. Please make sure that you have sufficient access rights for the following location and restart %PRODUCTNAME:\n\n"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/app/desktopresid.cxx b/desktop/source/app/desktopresid.cxx deleted file mode 100644 index 87784a83cbe5..000000000000 --- a/desktop/source/app/desktopresid.cxx +++ /dev/null @@ -1,34 +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 "desktopresid.hxx" -#include "app.hxx" - - -namespace desktop -{ - -DesktopResId::DesktopResId( sal_uInt16 nId ) : - ResId( nId, *Desktop::GetDesktopResManager() ) -{ -} - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/app/lockfile2.cxx b/desktop/source/app/lockfile2.cxx index fbcd5633f524..42f3081fb7d5 100644 --- a/desktop/source/app/lockfile2.cxx +++ b/desktop/source/app/lockfile2.cxx @@ -19,8 +19,8 @@ #include -#include "desktopresid.hxx" -#include "desktop.hrc" +#include "dp_shared.hxx" +#include "strings.hrc" #include #include "lockfile.hxx" @@ -38,10 +38,10 @@ bool Lockfile_execWarning( Lockfile const * that ) OString aTime = aConfig.ReadKey( LOCKFILE_TIMEKEY ); // display warning and return response - ScopedVclPtrInstance aBox(nullptr, DesktopResId(STR_QUERY_USERDATALOCKED), + ScopedVclPtrInstance aBox(nullptr, DpResId(STR_QUERY_USERDATALOCKED), VclMessageType::Question, VclButtonsType::YesNo); // set box title - OUString aTitle = OUString( DesktopResId( STR_TITLE_USERDATALOCKED )); + OUString aTitle = DpResId(STR_TITLE_USERDATALOCKED); aBox->SetText( aTitle ); // insert values... OUString aMsgText = aBox->get_primary_text(); diff --git a/desktop/source/deployment/gui/dp_gui.h b/desktop/source/deployment/gui/dp_gui.h index 8ab6ee063825..8f1820387c5c 100644 --- a/desktop/source/deployment/gui/dp_gui.h +++ b/desktop/source/deployment/gui/dp_gui.h @@ -22,7 +22,7 @@ #include "dp_gui_updatedata.hxx" #include "dp_misc.h" -#include "dp_gui.hrc" +#include "strings.hrc" #include #include #include diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx index 56db76bd1b64..a5720c7532a2 100644 --- a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx @@ -24,12 +24,11 @@ #include #include -#include #include -#include "dp_gui.hrc" +#include "strings.hrc" #include "dp_gui_dependencydialog.hxx" -#include "dp_gui_shared.hxx" +#include "dp_shared.hxx" namespace vcl { class Window; } diff --git a/desktop/source/deployment/gui/dp_gui_dialog.src b/desktop/source/deployment/gui/dp_gui_dialog.src deleted file mode 100644 index 27ebb4b7f6f1..000000000000 --- a/desktop/source/deployment/gui/dp_gui_dialog.src +++ /dev/null @@ -1,164 +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 -#include "dp_gui.hrc" - -String RID_STR_ADD_PACKAGES -{ - Text [ en-US ] = "Add Extension(s)"; -}; - -String RID_CTX_ITEM_REMOVE -{ - Text [ en-US ] = "~Remove"; -}; - -String RID_CTX_ITEM_ENABLE -{ - Text [ en-US ] = "~Enable"; -}; - -String RID_CTX_ITEM_DISABLE -{ - Text [ en-US ] = "~Disable"; -}; - -String RID_CTX_ITEM_CHECK_UPDATE -{ - Text [ en-US ] = "~Update..."; -}; - -String RID_STR_ADDING_PACKAGES -{ - Text [ en-US ] = "Adding %EXTENSION_NAME"; -}; - -String RID_STR_REMOVING_PACKAGES -{ - Text [ en-US ] = "Removing %EXTENSION_NAME"; -}; - -String RID_STR_ENABLING_PACKAGES -{ - Text [ en-US ] = "Enabling %EXTENSION_NAME"; -}; - -String RID_STR_DISABLING_PACKAGES -{ - Text [ en-US ] = "Disabling %EXTENSION_NAME"; -}; - -String RID_STR_ACCEPT_LICENSE -{ - Text [ en-US ] = "Accept license for %EXTENSION_NAME"; -}; - -String RID_STR_ERROR_UNKNOWN_STATUS -{ - Text [ en-US ] = "Error: The status of this extension is unknown"; -}; - -String RID_STR_CLOSE_BTN -{ - Text [ en-US ] = "Close"; -}; - -String RID_STR_EXIT_BTN -{ - Text [ en-US ] = "Quit"; -}; - -String RID_STR_NO_ADMIN_PRIVILEGE -{ - Text [ en-US ] = "%PRODUCTNAME has been updated to a new version. " - "Some shared %PRODUCTNAME extensions are not compatible with this version and need to be updated before %PRODUCTNAME can be started.\n\n" - "Updating of shared extension requires administrator privileges. Contact your system administrator to update the following shared extensions:"; -}; - -String RID_STR_ERROR_MISSING_DEPENDENCIES -{ - Text [ en-US ] = "The extension cannot be enabled as the following system dependencies are not fulfilled:"; -}; - -String RID_STR_ERROR_MISSING_LICENSE -{ - Text [ en-US ] = "This extension is disabled because you haven't accepted the license yet.\n"; -}; - -String RID_STR_SHOW_LICENSE_CMD -{ - Text [ en-US ] = "Show license"; -}; - -String RID_STR_WARNING_INSTALL_EXTENSION -{ - Text [en-US] = "You are about to install the extension '%NAME'.\n" - "Click 'OK' to proceed with the installation.\n" - "Click 'Cancel' to stop the installation."; -}; - -String RID_STR_WARNING_INSTALL_EXTENSION_DISABLED -{ - Text [en-US] = "Extension installation is currently disabled. " - "Please consult your system administrator for more information."; -}; - -String RID_STR_WARNING_REMOVE_EXTENSION -{ - Text [en-US] = "You are about to remove the extension '%NAME'.\n" - "Click 'OK' to remove the extension.\n" - "Click 'Cancel' to stop removing the extension."; -}; - -String RID_STR_WARNING_REMOVE_EXTENSION_DISABLED -{ - Text [en-US] = "Extension removal is currently disabled. " - "Please consult your system administrator for more information."; -}; - -String RID_STR_WARNING_REMOVE_SHARED_EXTENSION -{ - Text [en-US] = "Make sure that no further users are working with the same " - "%PRODUCTNAME, when changing shared extensions in a multi user environment.\n" - "Click 'OK' to remove the extension.\n" - "Click 'Cancel' to stop removing the extension."; -}; - -String RID_STR_WARNING_ENABLE_SHARED_EXTENSION -{ - Text [en-US] = "Make sure that no further users are working with the same " - "%PRODUCTNAME, when changing shared extensions in a multi user environment.\n" - "Click 'OK' to enable the extension.\n" - "Click 'Cancel' to stop enabling the extension."; -}; - -String RID_STR_WARNING_DISABLE_SHARED_EXTENSION -{ - Text [en-US] = "Make sure that no further users are working with the same " - "%PRODUCTNAME, when changing shared extensions in a multi user environment.\n" - "Click 'OK' to disable the extension.\n" - "Click 'Cancel' to stop disabling the extension."; -}; - -String RID_STR_UNSUPPORTED_PLATFORM -{ - Text [ en-US ] = "The extension '%Name' does not work on this computer."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index f5c1f5f07c1c..04bd0a2354f7 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -17,14 +17,15 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "dp_gui.hrc" -#include -#include +#include "strings.hrc" +#include "helpid.hrc" +#include +#include #include "dp_gui.h" #include "dp_gui_dialog2.hxx" #include "dp_gui_extlistbox.hxx" -#include "dp_gui_shared.hxx" +#include "dp_shared.hxx" #include "dp_gui_theextmgr.hxx" #include "dp_gui_extensioncmdqueue.hxx" #include "dp_misc.h" @@ -33,6 +34,8 @@ #include "dp_identifier.hxx" #include "dp_descriptioninfoset.hxx" +#include "fpicker/fpicker.hrc" + #include #include #include @@ -92,16 +95,13 @@ struct StrAllFiles : public rtl::StaticWithInit< OUString, StrAllFiles > { const OUString operator () () { const SolarMutexGuard guard; - std::unique_ptr< ResMgr > const resmgr( ResMgr::CreateResMgr( "fps_office" ) ); - OSL_ASSERT( resmgr.get() != nullptr ); - return ResId(STR_FILTERNAME_ALL, *resmgr.get()); + std::locale loc = Translate::Create("fps", Application::GetSettings().GetUILanguageTag()); + return Translate::get(STR_FILTERNAME_ALL, loc); } }; - // ExtBoxWithBtns_Impl - enum MENU_COMMAND { CMD_NONE = 0, @@ -250,7 +250,7 @@ MENU_COMMAND ExtBoxWithBtns_Impl::ShowPopupMenu( const Point & rPos, const long ScopedVclPtrInstance aPopup; #if ENABLE_EXTENSION_UPDATE - aPopup->InsertItem( CMD_UPDATE, DialogHelper::getResourceString( RID_CTX_ITEM_CHECK_UPDATE ) ); + aPopup->InsertItem( CMD_UPDATE, DpResId( RID_CTX_ITEM_CHECK_UPDATE ) ); #endif if ( ! GetEntryData( nPos )->m_bLocked ) @@ -258,18 +258,18 @@ MENU_COMMAND ExtBoxWithBtns_Impl::ShowPopupMenu( const Point & rPos, const long if ( GetEntryData( nPos )->m_bUser ) { if ( GetEntryData( nPos )->m_eState == REGISTERED ) - aPopup->InsertItem( CMD_DISABLE, DialogHelper::getResourceString( RID_CTX_ITEM_DISABLE ) ); + aPopup->InsertItem( CMD_DISABLE, DpResId( RID_CTX_ITEM_DISABLE ) ); else if ( GetEntryData( nPos )->m_eState != NOT_AVAILABLE ) - aPopup->InsertItem( CMD_ENABLE, DialogHelper::getResourceString( RID_CTX_ITEM_ENABLE ) ); + aPopup->InsertItem( CMD_ENABLE, DpResId( RID_CTX_ITEM_ENABLE ) ); } if (!officecfg::Office::ExtensionManager::ExtensionSecurity::DisableExtensionRemoval::get()) { - aPopup->InsertItem( CMD_REMOVE, DialogHelper::getResourceString( RID_CTX_ITEM_REMOVE ) ); + aPopup->InsertItem( CMD_REMOVE, DpResId( RID_CTX_ITEM_REMOVE ) ); } } if ( !GetEntryData( nPos )->m_sLicenseText.isEmpty() ) - aPopup->InsertItem( CMD_SHOW_LICENSE, DialogHelper::getResourceString( RID_STR_SHOW_LICENSE_CMD ) ); + aPopup->InsertItem( CMD_SHOW_LICENSE, DpResId( RID_STR_SHOW_LICENSE_CMD ) ); return (MENU_COMMAND) aPopup->Execute( this, rPos ); } @@ -352,25 +352,6 @@ DialogHelper::~DialogHelper() } -ResId DialogHelper::getResId( sal_uInt16 nId ) -{ - const SolarMutexGuard guard; - return ResId( nId, *DeploymentGuiResMgr::get() ); -} - - -OUString DialogHelper::getResourceString(sal_uInt16 id) -{ - const SolarMutexGuard guard; - OUString ret(ResId(id, *DeploymentGuiResMgr::get())); - if (ret.indexOf("%PRODUCTNAME" ) != -1) - { - ret = ret.replaceAll("%PRODUCTNAME", utl::ConfigManager::getProductName()); - } - return ret; -} - - bool DialogHelper::IsSharedPkgMgr( const uno::Reference< deployment::XPackage > &xPackage ) { return xPackage->getRepositoryName() == SHARED_PACKAGE_MANAGER; @@ -379,13 +360,13 @@ bool DialogHelper::IsSharedPkgMgr( const uno::Reference< deployment::XPackage > bool DialogHelper::continueOnSharedExtension( const uno::Reference< deployment::XPackage > &xPackage, vcl::Window *pParent, - const sal_uInt16 nResID, + const char* pResID, bool &bHadWarning ) { if ( !bHadWarning && IsSharedPkgMgr( xPackage ) ) { const SolarMutexGuard guard; - ScopedVclPtrInstance aInfoBox(pParent, getResId(nResID), + ScopedVclPtrInstance aInfoBox(pParent, DpResId(pResID), VclMessageType::Warning, VclButtonsType::OkCancel); bHadWarning = true; @@ -427,14 +408,14 @@ bool DialogHelper::installExtensionWarn( const OUString &rExtensionName ) const // Check if extension installation is disabled in the expert configurations if (officecfg::Office::ExtensionManager::ExtensionSecurity::DisableExtensionInstallation::get()) { - ScopedVclPtrInstance aWarn(m_pVCLWindow, getResId(RID_STR_WARNING_INSTALL_EXTENSION_DISABLED), + ScopedVclPtrInstance aWarn(m_pVCLWindow, DpResId(RID_STR_WARNING_INSTALL_EXTENSION_DISABLED), VclMessageType::Warning, VclButtonsType::Ok); aWarn->Execute(); return false; } - ScopedVclPtrInstance aInfo(m_pVCLWindow, getResId(RID_STR_WARNING_INSTALL_EXTENSION), + ScopedVclPtrInstance aInfo(m_pVCLWindow, DpResId(RID_STR_WARNING_INSTALL_EXTENSION), VclMessageType::Warning, VclButtonsType::OkCancel); OUString sText(aInfo->get_primary_text()); @@ -470,7 +451,7 @@ void DialogHelper::PostUserEvent( const Link& rLink, void* pCaller ) ExtMgrDialog::ExtMgrDialog(vcl::Window *pParent, TheExtensionManager *pManager, Dialog::InitFlag eFlag) : ModelessDialog(pParent, "ExtensionManagerDialog", "desktop/ui/extensionmanager.ui", eFlag) , DialogHelper(pManager->getContext(), static_cast(this)) - , m_sAddPackages(getResourceString(RID_STR_ADD_PACKAGES)) + , m_sAddPackages(DpResId(RID_STR_ADD_PACKAGES)) , m_bHasProgress(false) , m_bProgressChanged(false) , m_bStartProgress(false) @@ -529,12 +510,12 @@ ExtMgrDialog::ExtMgrDialog(vcl::Window *pParent, TheExtensionManager *pManager, if (officecfg::Office::ExtensionManager::ExtensionSecurity::DisableExtensionInstallation::get()) { m_pAddBtn->Disable(); - m_pAddBtn->SetQuickHelpText(getResId(RID_STR_WARNING_INSTALL_EXTENSION_DISABLED)); + m_pAddBtn->SetQuickHelpText(DpResId(RID_STR_WARNING_INSTALL_EXTENSION_DISABLED)); } if (officecfg::Office::ExtensionManager::ExtensionSecurity::DisableExtensionRemoval::get()) { m_pRemoveBtn->Disable(); - m_pRemoveBtn->SetQuickHelpText(getResId(RID_STR_WARNING_REMOVE_EXTENSION_DISABLED)); + m_pRemoveBtn->SetQuickHelpText(DpResId(RID_STR_WARNING_REMOVE_EXTENSION_DISABLED)); } m_aIdle.SetPriority(TaskPriority::LOWEST); @@ -607,7 +588,7 @@ void ExtMgrDialog::checkEntries() bool ExtMgrDialog::removeExtensionWarn( const OUString &rExtensionName ) const { const SolarMutexGuard guard; - ScopedVclPtrInstance aInfo(const_cast(this), getResId(RID_STR_WARNING_REMOVE_EXTENSION), + ScopedVclPtrInstance aInfo(const_cast(this), DpResId(RID_STR_WARNING_REMOVE_EXTENSION), VclMessageType::Warning, VclButtonsType::OkCancel); OUString sText(aInfo->get_primary_text()); @@ -767,7 +748,7 @@ void ExtMgrDialog::enableRemoveButton( bool bEnable ) if (officecfg::Office::ExtensionManager::ExtensionSecurity::DisableExtensionRemoval::get()) { - m_pRemoveBtn->SetQuickHelpText(getResId(RID_STR_WARNING_REMOVE_EXTENSION_DISABLED)); + m_pRemoveBtn->SetQuickHelpText(DpResId(RID_STR_WARNING_REMOVE_EXTENSION_DISABLED)); } else { @@ -784,12 +765,12 @@ void ExtMgrDialog::enableButtontoEnable( bool bEnable ) { if (bEnable) { - m_pEnableBtn->SetText( DialogHelper::getResourceString( RID_CTX_ITEM_ENABLE ) ); + m_pEnableBtn->SetText( DpResId( RID_CTX_ITEM_ENABLE ) ); m_pEnableBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_ENABLE ); } else { - m_pEnableBtn->SetText( DialogHelper::getResourceString( RID_CTX_ITEM_DISABLE ) ); + m_pEnableBtn->SetText( DpResId( RID_CTX_ITEM_DISABLE ) ); m_pEnableBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_DISABLE ); } } @@ -840,7 +821,7 @@ IMPL_LINK( ExtMgrDialog, startProgress, void*, _bLockInterface, void ) m_pAddBtn->Enable( !bLockInterface && !officecfg::Office::ExtensionManager::ExtensionSecurity::DisableExtensionInstallation::get()); if (officecfg::Office::ExtensionManager::ExtensionSecurity::DisableExtensionInstallation::get()) { - m_pAddBtn->SetQuickHelpText(getResId(RID_STR_WARNING_INSTALL_EXTENSION_DISABLED)); + m_pAddBtn->SetQuickHelpText(DpResId(RID_STR_WARNING_INSTALL_EXTENSION_DISABLED)); } else { @@ -1066,7 +1047,7 @@ bool ExtMgrDialog::Close() UpdateRequiredDialog::UpdateRequiredDialog(vcl::Window *pParent, TheExtensionManager *pManager) : ModalDialog(pParent, "UpdateRequiredDialog", "desktop/ui/updaterequireddialog.ui") , DialogHelper(pManager->getContext(), static_cast(this)) - , m_sCloseText(getResourceString(RID_STR_CLOSE_BTN)) + , m_sCloseText(DpResId(RID_STR_CLOSE_BTN)) , m_bHasProgress(false) , m_bProgressChanged(false) , m_bStartProgress(false) @@ -1338,8 +1319,8 @@ short UpdateRequiredDialog::Execute() if ( m_bHasLockedEntries ) { // Set other text, disable update btn, remove not shared entries from list; - m_pUpdateNeeded->SetText( DialogHelper::getResourceString( RID_STR_NO_ADMIN_PRIVILEGE ) ); - m_pCloseBtn->SetText( DialogHelper::getResourceString( RID_STR_EXIT_BTN ) ); + m_pUpdateNeeded->SetText( DpResId( RID_STR_NO_ADMIN_PRIVILEGE ) ); + m_pCloseBtn->SetText( DpResId( RID_STR_EXIT_BTN ) ); m_pUpdateBtn->Enable( false ); m_pExtensionBox->RemoveUnlocked(); Resize(); diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx index 5b9a8cc403e3..60a87d75b6e5 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx @@ -83,12 +83,10 @@ public: virtual void prepareChecking() = 0; virtual void checkEntries() = 0; - static ResId getResId( sal_uInt16 nId ); - static OUString getResourceString( sal_uInt16 id ); static bool IsSharedPkgMgr( const css::uno::Reference< css::deployment::XPackage > &); static bool continueOnSharedExtension( const css::uno::Reference< css::deployment::XPackage > &, vcl::Window *pParent, - const sal_uInt16 nResID, + const char* pResID, bool &bHadWarning ); void setBusy( const bool bBusy ) { m_bIsBusy = bBusy; } diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index 65b8053306ef..d6b620e1e69b 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -69,7 +69,7 @@ #include "dp_gui_extensioncmdqueue.hxx" #include "dp_gui_dependencydialog.hxx" #include "dp_gui_dialog2.hxx" -#include "dp_gui_shared.hxx" +#include "dp_shared.hxx" #include "dp_gui_theextmgr.hxx" #include "dp_gui_updatedialog.hxx" #include "dp_gui_updateinstalldialog.hxx" @@ -405,7 +405,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & } else if (request >>= verExc) { - sal_uInt32 id; + const char* id; switch (dp_misc::compareVersions( verExc.NewVersion, verExc.Deployed->getVersion() )) { @@ -425,26 +425,26 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & { SolarMutexGuard guard; ScopedVclPtrInstance box(m_pDialogHelper? m_pDialogHelper->getWindow() : nullptr, - ResId(id, *DeploymentGuiResMgr::get()), VclMessageType::Warning, VclButtonsType::OkCancel); + DpResId(id), VclMessageType::Warning, VclButtonsType::OkCancel); OUString s; if (bEqualNames) { s = box->get_primary_text(); } - else if (id == RID_STR_WARNING_VERSION_EQUAL) + else if (!strcmp(id, RID_STR_WARNING_VERSION_EQUAL)) { //hypothetical: requires two instances of an extension with the same //version to have different display names. Probably the developer forgot //to change the version. - s = ResId(RID_STR_WARNINGBOX_VERSION_EQUAL_DIFFERENT_NAMES, *DeploymentGuiResMgr::get()); + s = DpResId(RID_STR_WARNINGBOX_VERSION_EQUAL_DIFFERENT_NAMES); } - else if (id == RID_STR_WARNING_VERSION_LESS) + else if (!strcmp(id, RID_STR_WARNING_VERSION_LESS)) { - s = ResId(RID_STR_WARNINGBOX_VERSION_LESS_DIFFERENT_NAMES, *DeploymentGuiResMgr::get()); + s = DpResId(RID_STR_WARNINGBOX_VERSION_LESS_DIFFERENT_NAMES); } - else if (id == RID_STR_WARNING_VERSION_GREATER) + else if (!strcmp(id, RID_STR_WARNING_VERSION_GREATER)) { - s = ResId(RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES, *DeploymentGuiResMgr::get()); + s = DpResId(RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES); } s = s.replaceAll("$NAME", verExc.NewDisplayName); s = s.replaceAll("$OLDNAME", verExc.Deployed->getDisplayName()); @@ -477,7 +477,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & else if (request >>= platExc) { SolarMutexGuard guard; - OUString sMsg(ResId(RID_STR_UNSUPPORTED_PLATFORM, *DeploymentGuiResMgr::get())); + OUString sMsg(DpResId(RID_STR_UNSUPPORTED_PLATFORM)); sMsg = sMsg.replaceAll("%Name", platExc.package->getDisplayName()); ScopedVclPtrInstance< MessageDialog > box(m_pDialogHelper? m_pDialogHelper->getWindow() : nullptr, sMsg); box->Execute(); @@ -569,12 +569,12 @@ ExtensionCmdQueue::Thread::Thread( DialogHelper *pDialogHelper, m_xContext( rContext ), m_pDialogHelper( pDialogHelper ), m_pManager( pManager ), - m_sEnablingPackages( DialogHelper::getResourceString( RID_STR_ENABLING_PACKAGES ) ), - m_sDisablingPackages( DialogHelper::getResourceString( RID_STR_DISABLING_PACKAGES ) ), - m_sAddingPackages( DialogHelper::getResourceString( RID_STR_ADDING_PACKAGES ) ), - m_sRemovingPackages( DialogHelper::getResourceString( RID_STR_REMOVING_PACKAGES ) ), - m_sDefaultCmd( DialogHelper::getResourceString( RID_STR_ADD_PACKAGES ) ), - m_sAcceptLicense( DialogHelper::getResourceString( RID_STR_ACCEPT_LICENSE ) ), + m_sEnablingPackages( DpResId( RID_STR_ENABLING_PACKAGES ) ), + m_sDisablingPackages( DpResId( RID_STR_DISABLING_PACKAGES ) ), + m_sAddingPackages( DpResId( RID_STR_ADDING_PACKAGES ) ), + m_sRemovingPackages( DpResId( RID_STR_REMOVING_PACKAGES ) ), + m_sDefaultCmd( DpResId( RID_STR_ADD_PACKAGES ) ), + m_sAcceptLicense( DpResId( RID_STR_ACCEPT_LICENSE ) ), m_eInput( NONE ), m_bStopped( false ), m_bWorking( false ) diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 38db5652b192..49f27bb49669 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -17,8 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include +#include +#include "dp_shared.hxx" #include "dp_gui.h" #include "dp_gui_extlistbox.hxx" #include "dp_gui_theextmgr.hxx" @@ -96,7 +97,7 @@ Entry_Impl::Entry_Impl( const uno::Reference< deployment::XPackage > &xPackage, m_aIcon = Image( xGraphic ); if ( eState == AMBIGUOUS ) - m_sErrorText = DialogHelper::getResourceString( RID_STR_ERROR_UNKNOWN_STATUS ); + m_sErrorText = DpResId( RID_STR_ERROR_UNKNOWN_STATUS ); else if ( eState == NOT_REGISTERED ) checkDependencies(); } @@ -138,7 +139,7 @@ void Entry_Impl::checkDependencies() deployment::DependencyException depExc; if ( e.Cause >>= depExc ) { - OUString aMissingDep( DialogHelper::getResourceString( RID_STR_ERROR_MISSING_DEPENDENCIES ) ); + OUString aMissingDep( DpResId( RID_STR_ERROR_MISSING_DEPENDENCIES ) ); for ( sal_Int32 i = 0; i < depExc.UnsatisfiedDependencies.getLength(); ++i ) { aMissingDep += "\n"; @@ -951,7 +952,7 @@ void ExtensionBox_Impl::addEntry( const uno::Reference< deployment::XPackage > & pEntry->m_bMissingLic = bLicenseMissing; if ( bLicenseMissing ) - pEntry->m_sErrorText = DialogHelper::getResourceString( RID_STR_ERROR_MISSING_LICENSE ); + pEntry->m_sErrorText = DpResId( RID_STR_ERROR_MISSING_LICENSE ); //access to m_nActive must be guarded if ( !m_bInCheckMode && m_bHasActive && ( m_nActive >= nPos ) ) @@ -982,7 +983,7 @@ void ExtensionBox_Impl::updateEntry( const uno::Reference< deployment::XPackage (*iIndex)->m_bMissingLic = false; if ( eState == AMBIGUOUS ) - (*iIndex)->m_sErrorText = DialogHelper::getResourceString( RID_STR_ERROR_UNKNOWN_STATUS ); + (*iIndex)->m_sErrorText = DpResId( RID_STR_ERROR_UNKNOWN_STATUS ); else if ( ! (*iIndex)->m_bMissingLic ) (*iIndex)->m_sErrorText.clear(); diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx index 1673d46ef63f..bf6061634d17 100644 --- a/desktop/source/deployment/gui/dp_gui_service.cxx +++ b/desktop/source/deployment/gui/dp_gui_service.cxx @@ -19,7 +19,7 @@ #include -#include "dp_gui_shared.hxx" +#include "dp_shared.hxx" #include "dp_gui.h" #include "dp_gui_theextmgr.hxx" #include @@ -175,9 +175,9 @@ ServiceImpl::ServiceImpl( Sequence const& args, } catch ( const css::lang::IllegalArgumentException & ) { } - ResHookProc pProc = ResMgr::GetReadStringHook(); + ResHookProc pProc = Translate::GetReadStringHook(); if ( !pProc ) - ResMgr::SetReadStringHook( ReplaceProductNameHookProc ); + Translate::SetReadStringHook(ReplaceProductNameHookProc); } // XAsynchronousExecutableDialog diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index 31ac8641f60b..16bcc0b5e687 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -82,11 +82,10 @@ #include #include #include -#include +#include #include #include #include -#include #include #include #include @@ -106,11 +105,11 @@ #include "dp_update.hxx" #include "dp_gui.h" -#include "dp_gui.hrc" +#include "strings.hrc" #include "bitmaps.hlst" #include "dp_gui_updatedata.hxx" #include "dp_gui_updatedialog.hxx" -#include "dp_gui_shared.hxx" +#include "dp_shared.hxx" class KeyEvent; class MouseEvent; @@ -479,17 +478,17 @@ UpdateDialog::UpdateDialog( std::vector< dp_gui::UpdateData > * updateData): ModalDialog(parent, "UpdateDialog", "desktop/ui/updatedialog.ui"), m_context(context), - m_none(DpGuiResId(RID_DLG_UPDATE_NONE)), - m_noInstallable(DpGuiResId(RID_DLG_UPDATE_NOINSTALLABLE)), - m_failure(DpGuiResId(RID_DLG_UPDATE_FAILURE)), - m_unknownError(DpGuiResId(RID_DLG_UPDATE_UNKNOWNERROR)), - m_noDescription(DpGuiResId(RID_DLG_UPDATE_NODESCRIPTION)), - m_noInstall(DpGuiResId(RID_DLG_UPDATE_NOINSTALL)), - m_noDependency(DpGuiResId(RID_DLG_UPDATE_NODEPENDENCY)), - m_noDependencyCurVer(DpGuiResId(RID_DLG_UPDATE_NODEPENDENCY_CUR_VER)), - m_browserbased(DpGuiResId(RID_DLG_UPDATE_BROWSERBASED)), - m_version(DpGuiResId(RID_DLG_UPDATE_VERSION)), - m_ignoredUpdate(DpGuiResId(RID_DLG_UPDATE_IGNORED_UPDATE)), + m_none(DpResId(RID_DLG_UPDATE_NONE)), + m_noInstallable(DpResId(RID_DLG_UPDATE_NOINSTALLABLE)), + m_failure(DpResId(RID_DLG_UPDATE_FAILURE)), + m_unknownError(DpResId(RID_DLG_UPDATE_UNKNOWNERROR)), + m_noDescription(DpResId(RID_DLG_UPDATE_NODESCRIPTION)), + m_noInstall(DpResId(RID_DLG_UPDATE_NOINSTALL)), + m_noDependency(DpResId(RID_DLG_UPDATE_NODEPENDENCY)), + m_noDependencyCurVer(DpResId(RID_DLG_UPDATE_NODEPENDENCY_CUR_VER)), + m_browserbased(DpResId(RID_DLG_UPDATE_BROWSERBASED)), + m_version(DpResId(RID_DLG_UPDATE_VERSION)), + m_ignoredUpdate(DpResId(RID_DLG_UPDATE_IGNORED_UPDATE)), m_updateData(*updateData), m_thread( new UpdateDialog::Thread( @@ -594,9 +593,9 @@ short UpdateDialog::Execute() { UpdateDialog::CheckListBox::CheckListBox( vcl::Window* pParent, UpdateDialog & dialog): SvxCheckListBox( pParent, WinBits(WB_BORDER) ), - m_ignoreUpdate( DpGuiResId( RID_DLG_UPDATE_IGNORE ) ), - m_ignoreAllUpdates( DpGuiResId( RID_DLG_UPDATE_IGNORE_ALL ) ), - m_enableUpdate( DpGuiResId( RID_DLG_UPDATE_ENABLE ) ), + m_ignoreUpdate( DpResId( RID_DLG_UPDATE_IGNORE ) ), + m_ignoreAllUpdates( DpResId( RID_DLG_UPDATE_IGNORE_ALL ) ), + m_enableUpdate( DpResId( RID_DLG_UPDATE_ENABLE ) ), m_dialog(dialog) { SetNormalStaticImage(Image(BitmapEx(RID_DLG_UPDATE_NORMALALERT))); diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.src b/desktop/source/deployment/gui/dp_gui_updatedialog.src deleted file mode 100644 index 7100eb4cfff2..000000000000 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.src +++ /dev/null @@ -1,80 +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 - -#include "dp_gui.hrc" - -String RID_DLG_UPDATE_NONE { - Text[en-US] = "No new updates are available."; -}; - -String RID_DLG_UPDATE_NOINSTALLABLE { - Text[en-US] = "No installable updates are available. To see ignored or disabled updates, mark the check box 'Show all updates'."; -}; - -String RID_DLG_UPDATE_FAILURE { - Text[en-US] = "An error occurred:"; -}; - -String RID_DLG_UPDATE_UNKNOWNERROR { - Text[en-US] = "Unknown error."; -}; - -String RID_DLG_UPDATE_NODESCRIPTION { - Text[en-US] = "No more details are available for this update."; -}; - -String RID_DLG_UPDATE_NOINSTALL { - Text[en-US] = "The extension cannot be updated because:"; -}; - -String RID_DLG_UPDATE_NODEPENDENCY { - Text[en-US] = "Required %PRODUCTNAME version doesn't match:"; -}; - -String RID_DLG_UPDATE_NODEPENDENCY_CUR_VER { - Text[en-US] = "You have %PRODUCTNAME %VERSION"; -}; - -String RID_DLG_UPDATE_BROWSERBASED { - Text[en-US] = "browser based update"; -}; - -String RID_DLG_UPDATE_VERSION { - Text[en-US] = "Version"; -}; - -String RID_DLG_UPDATE_IGNORE { - Text[en-US] = "Ignore this Update"; -}; - -String RID_DLG_UPDATE_IGNORE_ALL { - Text[en-US] = "Ignore all Updates"; -}; - -String RID_DLG_UPDATE_ENABLE { - Text[en-US] = "Enable Updates"; -}; - -String RID_DLG_UPDATE_IGNORED_UPDATE { - Text[en-US] = "This update will be ignored.\n"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx index e112cd38d389..c433384da5e5 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include @@ -54,9 +53,9 @@ #include #include "dp_descriptioninfoset.hxx" -#include "dp_gui.hrc" +#include "strings.hrc" #include "dp_gui_updateinstalldialog.hxx" -#include "dp_gui_shared.hxx" +#include "dp_shared.hxx" #include "dp_ucb.h" #include "dp_misc.h" #include "dp_version.hxx" @@ -204,14 +203,14 @@ UpdateInstallDialog::UpdateInstallDialog( m_thread(new Thread(xCtx, *this, aVecUpdateData)), m_bError(false), m_bNoEntry(true), - m_sInstalling(DpGuiResId(RID_DLG_UPDATE_INSTALL_INSTALLING)), - m_sFinished(DpGuiResId(RID_DLG_UPDATE_INSTALL_FINISHED)), - m_sNoErrors(DpGuiResId(RID_DLG_UPDATE_INSTALL_NO_ERRORS)), - m_sErrorDownload(DpGuiResId(RID_DLG_UPDATE_INSTALL_ERROR_DOWNLOAD)), - m_sErrorInstallation(DpGuiResId(RID_DLG_UPDATE_INSTALL_ERROR_INSTALLATION)), - m_sErrorLicenseDeclined(DpGuiResId(RID_DLG_UPDATE_INSTALL_ERROR_LIC_DECLINED)), - m_sNoInstall(DpGuiResId(RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL)), - m_sThisErrorOccurred(DpGuiResId(RID_DLG_UPDATE_INSTALL_THIS_ERROR_OCCURRED)) + m_sInstalling(DpResId(RID_DLG_UPDATE_INSTALL_INSTALLING)), + m_sFinished(DpResId(RID_DLG_UPDATE_INSTALL_FINISHED)), + m_sNoErrors(DpResId(RID_DLG_UPDATE_INSTALL_NO_ERRORS)), + m_sErrorDownload(DpResId(RID_DLG_UPDATE_INSTALL_ERROR_DOWNLOAD)), + m_sErrorInstallation(DpResId(RID_DLG_UPDATE_INSTALL_ERROR_INSTALLATION)), + m_sErrorLicenseDeclined(DpResId(RID_DLG_UPDATE_INSTALL_ERROR_LIC_DECLINED)), + m_sNoInstall(DpResId(RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL)), + m_sThisErrorOccurred(DpResId(RID_DLG_UPDATE_INSTALL_THIS_ERROR_OCCURRED)) { get(m_pFt_action, "DOWNLOADING"); get(m_pStatusbar, "STATUSBAR"); diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src deleted file mode 100644 index e8d52761777d..000000000000 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src +++ /dev/null @@ -1,54 +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 "dp_gui.hrc" - -String RID_DLG_UPDATE_INSTALL_INSTALLING { - Text[en-US] = "Installing extensions..."; -}; - -String RID_DLG_UPDATE_INSTALL_FINISHED { - Text[en-US] = "Installation finished"; -}; - -String RID_DLG_UPDATE_INSTALL_NO_ERRORS { - Text[en-US] = "No errors."; -}; - -String RID_DLG_UPDATE_INSTALL_ERROR_DOWNLOAD { - Text[en-US] = "Error while downloading extension %NAME. "; -}; - -String RID_DLG_UPDATE_INSTALL_THIS_ERROR_OCCURRED { - Text[en-US] = "The error message is: "; -}; - -String RID_DLG_UPDATE_INSTALL_ERROR_INSTALLATION { - Text[en-US] = "Error while installing extension %NAME. "; -}; - -String RID_DLG_UPDATE_INSTALL_ERROR_LIC_DECLINED { - Text[en-US] = "The license agreement for extension %NAME was refused. "; -}; - -String RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL{ - Text[en-US] = "The extension will not be installed."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_versionboxes.src b/desktop/source/deployment/gui/dp_gui_versionboxes.src deleted file mode 100644 index 7e18fa6ae53d..000000000000 --- a/desktop/source/deployment/gui/dp_gui_versionboxes.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 "dp_gui.hrc" - -String RID_STR_WARNING_VERSION_LESS -{ - Text [en-US] = "You are about to install version $NEW of the extension '$NAME'.\n" - "The newer version $DEPLOYED is already installed.\n" - "Click 'OK' to replace the installed extension.\n" - "Click 'Cancel' to stop the installation."; -}; - -String RID_STR_WARNINGBOX_VERSION_LESS_DIFFERENT_NAMES { - Text [en-US] = "You are about to install version $NEW of the extension '$NAME'.\n" - "The newer version $DEPLOYED, named '$OLDNAME', is already installed.\n" - "Click 'OK' to replace the installed extension.\n" - "Click 'Cancel' to stop the installation."; -}; - -String RID_STR_WARNING_VERSION_EQUAL -{ - Text [en-US] = "You are about to install version $NEW of the extension '$NAME'.\n" - "That version is already installed.\n" - "Click 'OK' to replace the installed extension.\n" - "Click 'Cancel' to stop the installation."; -}; - -String RID_STR_WARNINGBOX_VERSION_EQUAL_DIFFERENT_NAMES { - Text [en-US] = "You are about to install version $NEW of the extension '$NAME'.\n" - "That version, named '$OLDNAME', is already installed.\n" - "Click 'OK' to replace the installed extension.\n" - "Click 'Cancel' to stop the installation."; -}; - -String RID_STR_WARNING_VERSION_GREATER -{ - Text [en-US] = "You are about to install version $NEW of the extension '$NAME'.\n" - "The older version $DEPLOYED is already installed.\n" - "Click 'OK' to replace the installed extension.\n" - "Click 'Cancel' to stop the installation."; -}; - -String RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES -{ - Text [en-US] = "You are about to install version $NEW of the extension '$NAME'.\n" - "The older version $DEPLOYED, named '$OLDNAME', is already installed.\n" - "Click 'OK' to replace the installed extension.\n" - "Click 'Cancel' to stop the installation."; -}; -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index 8d97f786fd60..f3e741324aff 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -34,9 +34,9 @@ #include #include -#include "dp_gui_shared.hxx" +#include "dp_shared.hxx" #include "license_dialog.hxx" -#include "dp_gui.hrc" +#include "strings.hrc" #include diff --git a/desktop/source/deployment/inc/dp_resource.h b/desktop/source/deployment/inc/dp_resource.h index c6ecfcdee645..b1aacd579de9 100644 --- a/desktop/source/deployment/inc/dp_resource.h +++ b/desktop/source/deployment/inc/dp_resource.h @@ -20,28 +20,13 @@ #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_RESOURCE_H #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_RESOURCE_H -#include #include #include "dp_misc.h" #include "dp_misc_api.hxx" namespace dp_misc { - -ResId getResId( sal_uInt16 id ); - - -DESKTOP_DEPLOYMENTMISC_DLLPUBLIC OUString getResourceString( sal_uInt16 id ); - -template -struct StaticResourceString : - public ::rtl::StaticWithInit< OUString, Unique > { - const OUString operator () () { return getResourceString(id); } -}; - - -DESKTOP_DEPLOYMENTMISC_DLLPUBLIC -const LanguageTag & getOfficeLanguageTag(); +DESKTOP_DEPLOYMENTMISC_DLLPUBLIC const LanguageTag & getOfficeLanguageTag(); } diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index 34f862c8f6f6..e770bad31ef9 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -1229,13 +1229,13 @@ sal_Bool ExtensionManager::synchronize( try { ::osl::MutexGuard guard(getMutex()); - OUString sSynchronizingShared(StrSyncRepository::get()); + OUString sSynchronizingShared(StrSyncRepository()); sSynchronizingShared = sSynchronizingShared.replaceAll("%NAME", "shared"); dp_misc::ProgressLevel progressShared(xCmdEnv, sSynchronizingShared); bool bModified = getSharedRepository()->synchronize(xAbortChannel, xCmdEnv); progressShared.update("\n\n"); - OUString sSynchronizingBundled(StrSyncRepository::get()); + OUString sSynchronizingBundled(StrSyncRepository()); sSynchronizingBundled = sSynchronizingBundled.replaceAll("%NAME", "bundled"); dp_misc::ProgressLevel progressBundled(xCmdEnv, sSynchronizingBundled); bModified |= (bool)getBundledRepository()->synchronize(xAbortChannel, xCmdEnv); @@ -1314,12 +1314,12 @@ void ExtensionManager::checkInstall( { OSL_ASSERT( !approve && !abort ); throw css::deployment::DeploymentException( - dp_misc::getResourceString(RID_STR_ERROR_WHILE_ADDING) + displayName, + DpResId(RID_STR_ERROR_WHILE_ADDING) + displayName, static_cast(this), request ); } if (abort || !approve) throw ucb::CommandFailedException( - dp_misc::getResourceString(RID_STR_ERROR_WHILE_ADDING) + displayName, + DpResId(RID_STR_ERROR_WHILE_ADDING) + displayName, static_cast(this), request ); } @@ -1336,7 +1336,7 @@ void ExtensionManager::checkUpdate( // package already deployed, interact --force: uno::Any request( (css::deployment::VersionException( - dp_misc::getResourceString( + DpResId( RID_STR_PACKAGE_ALREADY_ADDED ) + newDisplayName, static_cast(this), newVersion, newDisplayName, oldExtension ) ) ); @@ -1346,13 +1346,13 @@ void ExtensionManager::checkUpdate( xCmdEnv, &replace, &abort )) { OSL_ASSERT( !replace && !abort ); throw css::deployment::DeploymentException( - dp_misc::getResourceString( + DpResId( RID_STR_ERROR_WHILE_ADDING) + newDisplayName, static_cast(this), request ); } if (abort || !replace) throw ucb::CommandFailedException( - dp_misc::getResourceString( + DpResId( RID_STR_PACKAGE_ALREADY_ADDED) + newDisplayName, static_cast(this), request ); } diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx index fd060446a9a2..a31172e55b83 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.hxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx @@ -20,8 +20,9 @@ #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_EXTENSIONMANAGER_HXX #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_EXTENSIONMANAGER_HXX -#include "dp_manager.hrc" +#include "strings.hrc" #include "dp_misc.h" +#include "dp_shared.hxx" #include "dp_interact.h" #include "dp_activepackages.hxx" #include @@ -137,8 +138,7 @@ public: private: - struct StrSyncRepository : public ::dp_misc::StaticResourceString< - StrSyncRepository, RID_STR_SYNCHRONIZING_REPOSITORY> {}; + static OUString StrSyncRepository() { return DpResId(RID_STR_SYNCHRONIZING_REPOSITORY); } css::uno::Reference< css::uno::XComponentContext> m_xContext; css::uno::Reference m_xPackageManagerFactory; diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index a0eb96fdcc02..8244d4f88ee3 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -20,6 +20,7 @@ #include #include "dp_registry.hxx" +#include "dp_shared.hxx" #include "dp_ucb.h" #include "dp_resource.h" #include "dp_platform.hxx" @@ -738,7 +739,7 @@ Reference PackageManagerImpl::addPackage( Reference xPackage; // copy file: progressUpdate( - getResourceString(RID_STR_COPYING_PACKAGE) + title, xCmdEnv ); + DpResId(RID_STR_COPYING_PACKAGE) + title, xCmdEnv ); if (m_activePackages.isEmpty()) { ::ucbhelper::Content docFolderContent; @@ -829,7 +830,7 @@ Reference PackageManagerImpl::addPackage( Any exc( ::cppu::getCaughtException() ); logIntern( exc ); throw deployment::DeploymentException( - getResourceString(RID_STR_ERROR_WHILE_ADDING) + url, + DpResId(RID_STR_ERROR_WHILE_ADDING) + url, static_cast(this), exc ); } } @@ -928,7 +929,7 @@ void PackageManagerImpl::removePackage( Any exc( ::cppu::getCaughtException() ); logIntern( exc ); throw deployment::DeploymentException( - getResourceString(RID_STR_ERROR_WHILE_REMOVING) + id, + DpResId(RID_STR_ERROR_WHILE_REMOVING) + id, static_cast(this), exc ); } } @@ -962,7 +963,7 @@ Reference PackageManagerImpl::getDeployedPackage_( return getDeployedPackage_( id, val, xCmdEnv ); } throw lang::IllegalArgumentException( - getResourceString(RID_STR_NO_SUCH_PACKAGE) + id, + DpResId(RID_STR_NO_SUCH_PACKAGE) + id, static_cast(this), static_cast(-1) ); } @@ -980,7 +981,7 @@ Reference PackageManagerImpl::getDeployedPackage_( auto const iter = params.find(OString("platform")); if (iter != params.end() && !platform_fits(iter->second.m_sValue)) throw lang::IllegalArgumentException( - getResourceString(RID_STR_NO_SUCH_PACKAGE) + id, + DpResId(RID_STR_NO_SUCH_PACKAGE) + id, static_cast(this), static_cast(-1) ); } diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h index c10122454ea3..4e584a6e1d14 100644 --- a/desktop/source/deployment/manager/dp_manager.h +++ b/desktop/source/deployment/manager/dp_manager.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_MANAGER_H #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_MANAGER_H -#include "dp_manager.hrc" +#include "strings.hrc" #include "dp_misc.h" #include "dp_interact.h" #include "dp_activepackages.hxx" diff --git a/desktop/source/deployment/manager/dp_manager.hrc b/desktop/source/deployment/manager/dp_manager.hrc deleted file mode 100644 index ef0945b483b6..000000000000 --- a/desktop/source/deployment/manager/dp_manager.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_DP_MANAGER_HRC -#define INCLUDED_DP_MANAGER_HRC - -#include "deployment.hrc" - -#define RID_STR_ERROR_WHILE_ADDING (RID_DEPLOYMENT_MANAGER_START+0) -#define RID_STR_ERROR_WHILE_REMOVING (RID_DEPLOYMENT_MANAGER_START+1) -#define RID_STR_PACKAGE_ALREADY_ADDED (RID_DEPLOYMENT_MANAGER_START+2) -#define RID_STR_COPYING_PACKAGE (RID_DEPLOYMENT_MANAGER_START+3) -#define RID_STR_NO_SUCH_PACKAGE (RID_DEPLOYMENT_MANAGER_START+4) -#define RID_STR_SYNCHRONIZING_REPOSITORY (RID_DEPLOYMENT_MANAGER_START+5) -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/manager/dp_manager.src b/desktop/source/deployment/manager/dp_manager.src deleted file mode 100644 index e01a160d26dd..000000000000 --- a/desktop/source/deployment/manager/dp_manager.src +++ /dev/null @@ -1,52 +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 "dp_manager.hrc" - -String RID_STR_COPYING_PACKAGE -{ - Text [ en-US ] = "Copying: "; -}; - -String RID_STR_ERROR_WHILE_ADDING -{ - Text [ en-US ] = "Error while adding: "; -}; - -String RID_STR_ERROR_WHILE_REMOVING -{ - Text [ en-US ] = "Error while removing: "; -}; - -String RID_STR_PACKAGE_ALREADY_ADDED -{ - Text [ en-US ] = "Extension has already been added: "; -}; - -String RID_STR_NO_SUCH_PACKAGE -{ - Text [ en-US ] = "There is no such extension deployed: "; -}; - -String RID_STR_SYNCHRONIZING_REPOSITORY -{ - Text [ en-US ] = "Synchronizing repository for %NAME extensions"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx index 6112ad114593..1b858319f894 100644 --- a/desktop/source/deployment/misc/dp_dependencies.cxx +++ b/desktop/source/deployment/misc/dp_dependencies.cxx @@ -30,11 +30,11 @@ #include #include #include -#include #include -#include "deployment.hrc" +#include "strings.hrc" #include "dp_resource.h" +#include "dp_shared.hxx" #include "dp_dependencies.hxx" #include "dp_descriptioninfoset.hxx" @@ -85,7 +85,7 @@ OUString produceErrorText( { return reason.replaceFirst("%VERSION", (version.isEmpty() - ? dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN) + ? DpResId(RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN) : version)); } @@ -156,27 +156,27 @@ OUString getErrorText( if ( dependency->getNamespaceURI() == namespaceOpenOfficeOrg && dependency->getTagName() == minimalVersionOpenOfficeOrg ) { return produceErrorText( - dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN), + DpResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN), dependency->getAttribute("value")); } else if (dependency->getNamespaceURI() == namespaceOpenOfficeOrg && dependency->getTagName() == maximalVersionOpenOfficeOrg ) { return produceErrorText( - dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MAX), + DpResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MAX), dependency->getAttribute("value")); } else if (dependency->getNamespaceURI() == namespaceLibreOffice && dependency->getTagName() == minimalVersionLibreOffice ) { return produceErrorText( - dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_LO_MIN), + DpResId(RID_DEPLOYMENT_DEPENDENCIES_LO_MIN), dependency->getAttribute("value")); } else if (dependency->hasAttributeNS(namespaceOpenOfficeOrg, minimalVersionOpenOfficeOrg)) { return produceErrorText( - dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN), + DpResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN), dependency->getAttributeNS(namespaceOpenOfficeOrg, minimalVersionOpenOfficeOrg)); } else { - return dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN); + return DpResId(RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN); } } diff --git a/desktop/source/deployment/misc/dp_misc.src b/desktop/source/deployment/misc/dp_misc.src deleted file mode 100644 index 498e042009dd..000000000000 --- a/desktop/source/deployment/misc/dp_misc.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 "deployment.hrc" - -String RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN { - Text[en-US] = "Unknown"; -}; - -String RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN { - Text[en-US] = "Extension requires at least OpenOffice.org reference version %VERSION"; -}; - -String RID_DEPLOYMENT_DEPENDENCIES_OOO_MAX { - Text[en-US] = "Extension does not support OpenOffice.org reference versions greater than %VERSION"; -}; - -String RID_DEPLOYMENT_DEPENDENCIES_LO_MIN { - Text[en-US] = "Extension requires at least %PRODUCTNAME version %VERSION"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/misc/dp_resource.cxx b/desktop/source/deployment/misc/dp_resource.cxx index b7f3739c85a2..2d37cd6685b5 100644 --- a/desktop/source/deployment/misc/dp_resource.cxx +++ b/desktop/source/deployment/misc/dp_resource.cxx @@ -46,32 +46,8 @@ struct OfficeLocale : } }; -struct DeploymentResMgr : public rtl::StaticWithInit< - ResMgr *, DeploymentResMgr> { - ResMgr * operator () () { - return ResMgr::CreateResMgr( "deployment", OfficeLocale::get() ); - } -}; - -class theResourceMutex : public rtl::Static {}; - } // anon namespace - -ResId getResId( sal_uInt16 id ) -{ - const osl::MutexGuard guard( theResourceMutex::get() ); - return ResId( id, *DeploymentResMgr::get() ); -} - - -OUString getResourceString( sal_uInt16 id ) -{ - const osl::MutexGuard guard(theResourceMutex::get()); - OUString ret(ResId(id, *DeploymentResMgr::get())); - return ret.replaceAll("%PRODUCTNAME", utl::ConfigManager::getProductName()); -} - const LanguageTag & getOfficeLanguageTag() { return OfficeLocale::get(); diff --git a/desktop/source/deployment/misc/dp_ucb.cxx b/desktop/source/deployment/misc/dp_ucb.cxx index 2028d18c2192..d74bfc5e3f3d 100644 --- a/desktop/source/deployment/misc/dp_ucb.cxx +++ b/desktop/source/deployment/misc/dp_ucb.cxx @@ -18,7 +18,7 @@ */ -#include "deployment.hrc" +#include "strings.hrc" #include "dp_misc.h" #include "dp_ucb.h" #include diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index 60a2686ca99a..24949b8e9586 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -18,7 +18,8 @@ */ -#include "dp_component.hrc" +#include "strings.hrc" +#include "dp_shared.hxx" #include "dp_backend.h" #include "dp_platform.hxx" #include "dp_services.hxx" @@ -495,33 +496,33 @@ BackendImpl::BackendImpl( "application/vnd.sun.star.uno-component;type=native;platform=" + getPlatformString(), "*" SAL_DLLEXTENSION, - getResourceString(RID_STR_DYN_COMPONENT) + DpResId(RID_STR_DYN_COMPONENT) ) ), m_xJavaComponentTypeInfo( new Package::TypeInfo( "application/vnd.sun.star.uno-component;type=Java", "*.jar", - getResourceString(RID_STR_JAVA_COMPONENT) + DpResId(RID_STR_JAVA_COMPONENT) ) ), m_xPythonComponentTypeInfo( new Package::TypeInfo( "application/vnd.sun.star.uno-component;type=Python", "*.py", - getResourceString( + DpResId( RID_STR_PYTHON_COMPONENT) ) ), m_xComponentsTypeInfo( new Package::TypeInfo( "application/vnd.sun.star.uno-components", "*.components", - getResourceString(RID_STR_COMPONENTS) + DpResId(RID_STR_COMPONENTS) ) ), m_xRDBTypelibTypeInfo( new Package::TypeInfo( "application/vnd.sun.star.uno-typelibrary;type=RDB", "*.rdb", - getResourceString(RID_STR_RDB_TYPELIB) + DpResId(RID_STR_RDB_TYPELIB) ) ), m_xJavaTypelibTypeInfo( new Package::TypeInfo( "application/vnd.sun.star.uno-typelibrary;type=Java", "*.jar", - getResourceString(RID_STR_JAVA_TYPELIB) + DpResId(RID_STR_JAVA_TYPELIB) ) ), m_typeInfos( 6 ) { @@ -629,7 +630,7 @@ Reference BackendImpl::bindPackage_( } if (mediaType.isEmpty()) throw lang::IllegalArgumentException( - StrCannotDetectMediaType::get() + url, + StrCannotDetectMediaType() + url, static_cast(this), static_cast(-1) ); } @@ -721,7 +722,7 @@ Reference BackendImpl::bindPackage_( } } throw lang::IllegalArgumentException( - StrUnsupportedMediaType::get() + mediaType, + StrUnsupportedMediaType() + mediaType, static_cast(this), static_cast(-1) ); } diff --git a/desktop/source/deployment/registry/component/dp_component.hrc b/desktop/source/deployment/registry/component/dp_component.hrc deleted file mode 100644 index 91caa2082402..000000000000 --- a/desktop/source/deployment/registry/component/dp_component.hrc +++ /dev/null @@ -1,34 +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_DP_COMPONENT_HRC -#define INCLUDED_DP_COMPONENT_HRC - -#include "deployment.hrc" - -#define RID_STR_DYN_COMPONENT (RID_DEPLOYMENT_COMPONENT_START+10) -#define RID_STR_JAVA_COMPONENT (RID_DEPLOYMENT_COMPONENT_START+11) -#define RID_STR_PYTHON_COMPONENT (RID_DEPLOYMENT_COMPONENT_START+12) -#define RID_STR_COMPONENTS (RID_DEPLOYMENT_COMPONENT_START+13) -#define RID_STR_RDB_TYPELIB (RID_DEPLOYMENT_COMPONENT_START+20) -#define RID_STR_JAVA_TYPELIB (RID_DEPLOYMENT_COMPONENT_START+21) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/component/dp_component.src b/desktop/source/deployment/registry/component/dp_component.src deleted file mode 100644 index fea67f326600..000000000000 --- a/desktop/source/deployment/registry/component/dp_component.src +++ /dev/null @@ -1,52 +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 "dp_component.hrc" - -String RID_STR_DYN_COMPONENT -{ - Text [ en-US ] = "UNO Dynamic Library Component"; -}; - -String RID_STR_JAVA_COMPONENT -{ - Text [ en-US ] = "UNO Java Component"; -}; - -String RID_STR_PYTHON_COMPONENT -{ - Text [ en-US ] = "UNO Python Component"; -}; - -String RID_STR_COMPONENTS -{ - Text [ en-US ] = "UNO Components"; -}; - -String RID_STR_RDB_TYPELIB -{ - Text [ en-US ] = "UNO RDB Type Library"; -}; - -String RID_STR_JAVA_TYPELIB -{ - Text [ en-US ] = "UNO Java Type Library"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx index ad372fa73297..cdf61b289ec7 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx @@ -22,7 +22,6 @@ #include -#include "dp_configuration.hrc" #include "dp_backend.h" #if HAVE_FEATURE_EXTENSIONS #include "dp_persmap.h" @@ -186,12 +185,12 @@ BackendImpl::BackendImpl( m_xConfDataTypeInfo( new Package::TypeInfo( "application/vnd.sun.star.configuration-data", "*.xcu", - getResourceString(RID_STR_CONF_DATA) + DpResId(RID_STR_CONF_DATA) ) ), m_xConfSchemaTypeInfo( new Package::TypeInfo( "application/vnd.sun.star.configuration-schema", "*.xcs", - getResourceString(RID_STR_CONF_SCHEMA) + DpResId(RID_STR_CONF_SCHEMA) ) ), m_typeInfos( 2 ) { @@ -317,7 +316,7 @@ Reference BackendImpl::bindPackage_( } if (mediaType.isEmpty()) throw lang::IllegalArgumentException( - StrCannotDetectMediaType::get() + url, + StrCannotDetectMediaType() + url, static_cast(this), static_cast(-1) ); } @@ -349,7 +348,7 @@ Reference BackendImpl::bindPackage_( } } throw lang::IllegalArgumentException( - StrUnsupportedMediaType::get() + mediaType, + StrUnsupportedMediaType() + mediaType, static_cast(this), static_cast(-1) ); } diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.src b/desktop/source/deployment/registry/configuration/dp_configuration.src deleted file mode 100644 index be4ae80eebf1..000000000000 --- a/desktop/source/deployment/registry/configuration/dp_configuration.src +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "dp_configuration.hrc" - -String RID_STR_CONF_SCHEMA -{ - Text [ en-US ] = "Configuration Schema"; -}; - -String RID_STR_CONF_DATA -{ - Text [ en-US ] = "Configuration Data"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx index 9078d61b8f79..bbd752f3d07c 100644 --- a/desktop/source/deployment/registry/dp_backend.cxx +++ b/desktop/source/deployment/registry/dp_backend.cxx @@ -628,8 +628,8 @@ void Package::processPackage_impl( ProgressLevel progress( xCmdEnv, (doRegisterPackage - ? PackageRegistryBackend::StrRegisteringPackage::get() - : PackageRegistryBackend::StrRevokingPackage::get()) + ? PackageRegistryBackend::StrRegisteringPackage() + : PackageRegistryBackend::StrRevokingPackage()) + displayName ); processPackage_( guard, doRegisterPackage, @@ -642,8 +642,8 @@ void Package::processPackage_impl( Any e(cppu::getCaughtException()); throw deployment::DeploymentException( ((doRegisterPackage - ? getResourceString(RID_STR_ERROR_WHILE_REGISTERING) - : getResourceString(RID_STR_ERROR_WHILE_REVOKING)) + ? DpResId(RID_STR_ERROR_WHILE_REGISTERING) + : DpResId(RID_STR_ERROR_WHILE_REVOKING)) + getDisplayName()), static_cast< OWeakObject * >(this), e); } @@ -666,8 +666,8 @@ void Package::processPackage_impl( Any exc( ::cppu::getCaughtException() ); throw deployment::DeploymentException( (doRegisterPackage - ? getResourceString(RID_STR_ERROR_WHILE_REGISTERING) - : getResourceString(RID_STR_ERROR_WHILE_REVOKING)) + ? DpResId(RID_STR_ERROR_WHILE_REGISTERING) + : DpResId(RID_STR_ERROR_WHILE_REVOKING)) + getDisplayName(), static_cast(this), exc ); } } diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx index da6c96195158..745dc66a8717 100644 --- a/desktop/source/deployment/registry/dp_registry.cxx +++ b/desktop/source/deployment/registry/dp_registry.cxx @@ -19,8 +19,9 @@ #include +#include "dp_shared.hxx" #include "dp_package.hxx" -#include "dp_registry.hrc" +#include "strings.hrc" #include "dp_registry.hxx" #include "dp_misc.h" #include "dp_resource.h" @@ -494,7 +495,7 @@ Reference PackageRegistryImpl::bindPackage( } } throw lang::IllegalArgumentException( - getResourceString(RID_STR_CANNOT_DETECT_MEDIA_TYPE) + url, + DpResId(RID_STR_CANNOT_DETECT_MEDIA_TYPE) + url, static_cast(this), static_cast(-1) ); } else @@ -514,7 +515,7 @@ Reference PackageRegistryImpl::bindPackage( } if (iFind == m_mediaType2backend.end()) { throw lang::IllegalArgumentException( - getResourceString(RID_STR_UNSUPPORTED_MEDIA_TYPE) + mediaType, + DpResId(RID_STR_UNSUPPORTED_MEDIA_TYPE) + mediaType, static_cast(this), static_cast(-1) ); } return iFind->second->bindPackage( url, mediaType, bRemoved, diff --git a/desktop/source/deployment/registry/dp_registry.src b/desktop/source/deployment/registry/dp_registry.src deleted file mode 100644 index a8cf5d2deb15..000000000000 --- a/desktop/source/deployment/registry/dp_registry.src +++ /dev/null @@ -1,52 +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 "dp_registry.hrc" - -String RID_STR_REGISTERING_PACKAGE -{ - Text [ en-US ] = "Enabling: "; -}; - -String RID_STR_REVOKING_PACKAGE -{ - Text [ en-US ] = "Disabling: "; -}; - -String RID_STR_CANNOT_DETECT_MEDIA_TYPE -{ - Text [ en-US ] = "Cannot detect media-type: "; -}; - -String RID_STR_UNSUPPORTED_MEDIA_TYPE -{ - Text [ en-US ] = "This media-type is not supported: "; -}; - -String RID_STR_ERROR_WHILE_REGISTERING -{ - Text [ en-US ] = "An error occurred while enabling: "; -}; - -String RID_STR_ERROR_WHILE_REVOKING -{ - Text [ en-US ] = "An error occurred while disabling: "; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx index a5bac639d480..fbdb4614455e 100644 --- a/desktop/source/deployment/registry/executable/dp_executable.cxx +++ b/desktop/source/deployment/registry/executable/dp_executable.cxx @@ -159,7 +159,7 @@ Reference BackendImpl::bindPackage_( if (mediaType.isEmpty()) { throw lang::IllegalArgumentException( - StrCannotDetectMediaType::get() + url, + StrCannotDetectMediaType() + url, static_cast(this), static_cast(-1) ); } diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx index f7b64bb3a59d..88b9e59f24c6 100644 --- a/desktop/source/deployment/registry/help/dp_help.cxx +++ b/desktop/source/deployment/registry/help/dp_help.cxx @@ -20,7 +20,7 @@ #include #include -#include "dp_help.hrc" +#include "strings.hrc" #include "dp_backend.h" #include "dp_helpbackenddb.hxx" #include "dp_services.hxx" @@ -128,7 +128,7 @@ BackendImpl::BackendImpl( : PackageRegistryBackend( args, xComponentContext ), m_xHelpTypeInfo( new Package::TypeInfo("application/vnd.sun.star.help", OUString(), - getResourceString(RID_STR_HELP) + DpResId(RID_STR_HELP) ) ), m_typeInfos( 1 ) { @@ -173,7 +173,7 @@ Reference BackendImpl::bindPackage_( // we don't support auto detection: if (mediaType_.isEmpty()) throw lang::IllegalArgumentException( - StrCannotDetectMediaType::get() + url, + StrCannotDetectMediaType() + url, static_cast(this), static_cast(-1) ); OUString type, subType; @@ -199,7 +199,7 @@ Reference BackendImpl::bindPackage_( } } throw lang::IllegalArgumentException( - StrUnsupportedMediaType::get() + mediaType_, + StrUnsupportedMediaType() + mediaType_, static_cast(this), static_cast(-1) ); } @@ -370,7 +370,7 @@ void BackendImpl::implProcessHelp( OUString aExpandedHelpURL = dp_misc::expandUnoRcUrl( aHelpURL ); if( !xSFA->isFolder( aExpandedHelpURL ) ) { - OUString aErrStr = getResourceString( RID_STR_HELPPROCESSING_GENERAL_ERROR ); + OUString aErrStr = DpResId( RID_STR_HELPPROCESSING_GENERAL_ERROR ); aErrStr += "No help folder"; OWeakObject* oWeakThis = static_cast(this); throw deployment::DeploymentException( OUString(), oWeakThis, @@ -475,18 +475,18 @@ void BackendImpl::implProcessHelp( if( !bSuccess ) { - sal_uInt16 nErrStrId = 0; + const char* pErrStrId = nullptr; switch( aErrorInfo.m_eErrorClass ) { - case HelpProcessingErrorClass::General: nErrStrId = RID_STR_HELPPROCESSING_GENERAL_ERROR; break; - case HelpProcessingErrorClass::XmlParsing: nErrStrId = RID_STR_HELPPROCESSING_XMLPARSING_ERROR; break; + case HelpProcessingErrorClass::General: pErrStrId = RID_STR_HELPPROCESSING_GENERAL_ERROR; break; + case HelpProcessingErrorClass::XmlParsing: pErrStrId = RID_STR_HELPPROCESSING_XMLPARSING_ERROR; break; default: ; }; OUString aErrStr; - if( nErrStrId != 0 ) + if (pErrStrId) { - aErrStr = getResourceString( nErrStrId ); + aErrStr = DpResId(pErrStrId); // Remove CR/LF OUString aErrMsg( aErrorInfo.m_aErrorMsg ); @@ -506,7 +506,7 @@ void BackendImpl::implProcessHelp( aErrMsg = aErrMsg.copy( 0, nCopy ); } aErrStr += aErrMsg; - if( nErrStrId == RID_STR_HELPPROCESSING_XMLPARSING_ERROR && !aErrorInfo.m_aXMLParsingFile.isEmpty() ) + if (!strcmp(pErrStrId, RID_STR_HELPPROCESSING_XMLPARSING_ERROR) && !aErrorInfo.m_aXMLParsingFile.isEmpty() ) { aErrStr += " in "; diff --git a/desktop/source/deployment/registry/help/dp_help.src b/desktop/source/deployment/registry/help/dp_help.src deleted file mode 100644 index 0d8d663c4107..000000000000 --- a/desktop/source/deployment/registry/help/dp_help.src +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "dp_help.hrc" - -String RID_STR_HELP -{ - Text [ en-US ] = "Help"; -}; - -String RID_STR_HELPPROCESSING_GENERAL_ERROR -{ - Text [ en-US ] = "The extension cannot be installed because:\n"; -}; - -String RID_STR_HELPPROCESSING_XMLPARSING_ERROR -{ - Text [ en-US ] = "The extension will not be installed because an error occurred in the Help files:\n"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h index 33ea1e5a7a37..6aebe1124026 100644 --- a/desktop/source/deployment/registry/inc/dp_backend.h +++ b/desktop/source/deployment/registry/inc/dp_backend.h @@ -22,6 +22,7 @@ #include "dp_misc.h" #include "dp_resource.h" +#include "dp_shared.hxx" #include "dp_interact.h" #include #include @@ -33,7 +34,7 @@ #include #include #include -#include "dp_registry.hrc" +#include "strings.hrc" namespace dp_registry { @@ -221,10 +222,8 @@ protected: Unknown, User, Shared, Bundled, Tmp, Document } m_eContext; - struct StrCannotDetectMediaType : public ::dp_misc::StaticResourceString< - StrCannotDetectMediaType, RID_STR_CANNOT_DETECT_MEDIA_TYPE> {}; - struct StrUnsupportedMediaType : public ::dp_misc::StaticResourceString< - StrUnsupportedMediaType, RID_STR_UNSUPPORTED_MEDIA_TYPE> {}; + static OUString StrCannotDetectMediaType() { return DpResId(RID_STR_CANNOT_DETECT_MEDIA_TYPE); } + static OUString StrUnsupportedMediaType() { return DpResId(RID_STR_UNSUPPORTED_MEDIA_TYPE); } // @@@ to be implemented by specific backend: virtual css::uno::Reference bindPackage_( @@ -261,10 +260,8 @@ protected: OUString const & folderUrl); public: - struct StrRegisteringPackage : public ::dp_misc::StaticResourceString< - StrRegisteringPackage, RID_STR_REGISTERING_PACKAGE> {}; - struct StrRevokingPackage : public ::dp_misc::StaticResourceString< - StrRevokingPackage, RID_STR_REVOKING_PACKAGE> {}; + static OUString StrRegisteringPackage() { return DpResId(RID_STR_REGISTERING_PACKAGE); } + static OUString StrRevokingPackage() { return DpResId(RID_STR_REVOKING_PACKAGE); } css::uno::Reference const & getComponentContext() const { return m_xComponentContext; } diff --git a/desktop/source/deployment/registry/inc/dp_registry.hrc b/desktop/source/deployment/registry/inc/dp_registry.hrc deleted file mode 100644 index c6a8d67ea77a..000000000000 --- a/desktop/source/deployment/registry/inc/dp_registry.hrc +++ /dev/null @@ -1,34 +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_DP_REGISTRY_HRC -#define INCLUDED_DP_REGISTRY_HRC - -#include "deployment.hrc" - -#define RID_STR_CANNOT_DETECT_MEDIA_TYPE (RID_DEPLOYMENT_REGISTRY_START+0) -#define RID_STR_UNSUPPORTED_MEDIA_TYPE (RID_DEPLOYMENT_REGISTRY_START+1) -#define RID_STR_ERROR_WHILE_REGISTERING (RID_DEPLOYMENT_REGISTRY_START+2) -#define RID_STR_ERROR_WHILE_REVOKING (RID_DEPLOYMENT_REGISTRY_START+3) -#define RID_STR_REGISTERING_PACKAGE (RID_DEPLOYMENT_REGISTRY_START+4) -#define RID_STR_REVOKING_PACKAGE (RID_DEPLOYMENT_REGISTRY_START+5) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index 8d051bc2ee45..e5c061d021f9 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -18,7 +18,7 @@ */ -#include "dp_package.hrc" +#include "strings.hrc" #include "dp_package.hxx" #include "dp_backend.h" #include "dp_ucb.h" @@ -270,7 +270,7 @@ BackendImpl::BackendImpl( m_xBundleTypeInfo( new Package::TypeInfo( "application/vnd.sun.star.package-bundle", "*.oxt;*.uno.pkg", - getResourceString(RID_STR_PACKAGE_BUNDLE) + DpResId(RID_STR_PACKAGE_BUNDLE) ) ), m_xLegacyBundleTypeInfo( new Package::TypeInfo( "application/vnd.sun.star.legacy-package-bundle", @@ -375,7 +375,7 @@ Reference BackendImpl::bindPackage_( } if (mediaType.isEmpty()) throw lang::IllegalArgumentException( - StrCannotDetectMediaType::get() + url, + StrCannotDetectMediaType() + url, static_cast(this), static_cast(-1) ); } @@ -410,7 +410,7 @@ Reference BackendImpl::bindPackage_( } } throw lang::IllegalArgumentException( - StrUnsupportedMediaType::get() + mediaType, + StrUnsupportedMediaType() + mediaType, static_cast(this), static_cast(-1) ); } diff --git a/desktop/source/deployment/registry/package/dp_package.hrc b/desktop/source/deployment/registry/package/dp_package.hrc deleted file mode 100644 index 253dccb9e3a2..000000000000 --- a/desktop/source/deployment/registry/package/dp_package.hrc +++ /dev/null @@ -1,29 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_DP_PACKAGE_HRC -#define INCLUDED_DP_PACKAGE_HRC - -#include "deployment.hrc" - -#define RID_STR_PACKAGE_BUNDLE (RID_DEPLOYMENT_BUNDLE_START+10) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/package/dp_package.src b/desktop/source/deployment/registry/package/dp_package.src deleted file mode 100644 index c091c1b14acb..000000000000 --- a/desktop/source/deployment/registry/package/dp_package.src +++ /dev/null @@ -1,27 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * 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 "dp_package.hrc" - -String RID_STR_PACKAGE_BUNDLE -{ - Text [ en-US ] = "Extension"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/script/dp_lib_container.cxx b/desktop/source/deployment/registry/script/dp_lib_container.cxx index b743ad2f1eed..8843b04b6b0c 100644 --- a/desktop/source/deployment/registry/script/dp_lib_container.cxx +++ b/desktop/source/deployment/registry/script/dp_lib_container.cxx @@ -21,8 +21,9 @@ #include #include -#include "dp_script.hrc" +#include "strings.hrc" #include "dp_resource.h" +#include "dp_shared.hxx" #include "dp_xml.h" #include "dp_lib_container.h" @@ -41,11 +42,9 @@ namespace backend { namespace script { namespace { -struct StrCannotDetermineLibName : public StaticResourceString< - StrCannotDetermineLibName, RID_STR_CANNOT_DETERMINE_LIBNAME> {}; + OUString StrCannotDetermineLibName() { return DpResId(RID_STR_CANNOT_DETERMINE_LIBNAME); } } - OUString LibraryContainer::get_libname( OUString const & url, Reference const & xCmdEnv, @@ -56,7 +55,7 @@ OUString LibraryContainer::get_libname( xml_parse( ::xmlscript::importLibrary( import ), ucb_content, xContext ); if (import.aName.isEmpty()) { - throw Exception( StrCannotDetermineLibName::get(), + throw Exception( StrCannotDetermineLibName(), Reference() ); } return import.aName; diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx index 332a6057a01e..e806617845f2 100644 --- a/desktop/source/deployment/registry/script/dp_script.cxx +++ b/desktop/source/deployment/registry/script/dp_script.cxx @@ -18,7 +18,7 @@ */ -#include "dp_script.hrc" +#include "strings.hrc" #include "dp_services.hxx" #include "dp_lib_container.h" #include "dp_backend.h" @@ -144,12 +144,12 @@ BackendImpl::BackendImpl( m_xBasicLibTypeInfo( new Package::TypeInfo( "application/vnd.sun.star.basic-library", OUString() /* no file filter */, - getResourceString(RID_STR_BASIC_LIB) + DpResId(RID_STR_BASIC_LIB) ) ), m_xDialogLibTypeInfo( new Package::TypeInfo( "application/vnd.sun.star.dialog-library", OUString() /* no file filter */, - getResourceString(RID_STR_DIALOG_LIB) + DpResId(RID_STR_DIALOG_LIB) ) ), m_typeInfos( 2 ) { @@ -233,7 +233,7 @@ Reference BackendImpl::bindPackage_( } if (mediaType.isEmpty()) throw lang::IllegalArgumentException( - StrCannotDetectMediaType::get() + url, + StrCannotDetectMediaType() + url, static_cast(this), static_cast(-1) ); } @@ -272,7 +272,7 @@ Reference BackendImpl::bindPackage_( } } throw lang::IllegalArgumentException( - StrUnsupportedMediaType::get() + mediaType, + StrUnsupportedMediaType() + mediaType, static_cast(this), static_cast(-1) ); } diff --git a/desktop/source/deployment/registry/script/dp_script.hrc b/desktop/source/deployment/registry/script/dp_script.hrc deleted file mode 100644 index 7f75edb38ac0..000000000000 --- a/desktop/source/deployment/registry/script/dp_script.hrc +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_DP_SCRIPT_HRC -#define INCLUDED_DP_SCRIPT_HRC - -#include "deployment.hrc" - -#define RID_STR_BASIC_LIB (RID_DEPLOYMENT_SCRIPT_START+10) -#define RID_STR_DIALOG_LIB (RID_DEPLOYMENT_SCRIPT_START+11) - -#define RID_STR_CANNOT_DETERMINE_LIBNAME (RID_DEPLOYMENT_SCRIPT_START+16) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/script/dp_script.src b/desktop/source/deployment/registry/script/dp_script.src deleted file mode 100644 index f3162f8f86e3..000000000000 --- a/desktop/source/deployment/registry/script/dp_script.src +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "dp_script.hrc" - -String RID_STR_BASIC_LIB -{ - Text [ en-US ] = "%PRODUCTNAME Basic Library"; -}; - -String RID_STR_DIALOG_LIB -{ - Text [ en-US ] = "Dialog Library"; -}; - -String RID_STR_CANNOT_DETERMINE_LIBNAME -{ - Text [ en-US ] = "The library name could not be determined."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx index 274ee2f827c2..d5a8a5df2843 100644 --- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx +++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx @@ -20,7 +20,7 @@ #include #include "dp_services.hxx" -#include "dp_sfwk.hrc" +#include "strings.hrc" #include "dp_backend.h" #include "dp_ucb.h" #include "dp_parceldesc.hxx" @@ -208,7 +208,7 @@ Reference BackendImpl::bindPackage_( } if (mediaType.isEmpty()) throw lang::IllegalArgumentException( - StrCannotDetectMediaType::get() + url, + StrCannotDetectMediaType() + url, static_cast(this), static_cast(-1) ); } @@ -251,7 +251,7 @@ Reference BackendImpl::bindPackage_( } } - OUString sfwkLibType = getResourceString( RID_STR_SFWK_LIB ); + OUString sfwkLibType = DpResId( RID_STR_SFWK_LIB ); // replace %MACRONAME placeholder with language name OUString MACRONAME( "%MACROLANG" ); sal_Int32 startOfReplace = sfwkLibType.indexOf( MACRONAME ); @@ -266,7 +266,7 @@ Reference BackendImpl::bindPackage_( } } throw lang::IllegalArgumentException( - StrUnsupportedMediaType::get() + mediaType, + StrUnsupportedMediaType() + mediaType, static_cast(this), static_cast(-1) ); } diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.hrc b/desktop/source/deployment/registry/sfwk/dp_sfwk.hrc deleted file mode 100644 index 505c54015b95..000000000000 --- a/desktop/source/deployment/registry/sfwk/dp_sfwk.hrc +++ /dev/null @@ -1,29 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_DP_SFWK_HRC -#define INCLUDED_DP_SFWK_HRC - -#include "deployment.hrc" - -#define RID_STR_SFWK_LIB (RID_DEPLOYMENT_SCRIPT_START+20) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.src b/desktop/source/deployment/registry/sfwk/dp_sfwk.src deleted file mode 100644 index 23cd3197eabe..000000000000 --- a/desktop/source/deployment/registry/sfwk/dp_sfwk.src +++ /dev/null @@ -1,27 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * 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 "dp_sfwk.hrc" - -String RID_STR_SFWK_LIB -{ - Text [ en-US ] = "%MACROLANG Library"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/unopkg/unopkg.src b/desktop/source/deployment/unopkg/unopkg.src deleted file mode 100644 index d000036f6481..000000000000 --- a/desktop/source/deployment/unopkg/unopkg.src +++ /dev/null @@ -1,76 +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 "deployment.hrc" - -String RID_STR_UNOPKG_ACCEPT_LIC_1 -{ - Text [ en-US ] = "Extension Software License Agreement of $NAME:"; -}; - -String RID_STR_UNOPKG_ACCEPT_LIC_2 -{ - Text [ en-US ] = "Read the complete License Agreement displayed above. " - "Accept the License Agreement by typing \"yes\" on the console " - "then press the Return key. Type \"no\" to decline and to abort the " - "extension setup."; -}; - -String RID_STR_UNOPKG_ACCEPT_LIC_3 -{ - Text [ en-US ] = "[Enter \"yes\" or \"no\"]:"; -}; - -String RID_STR_UNOPKG_ACCEPT_LIC_4 -{ - Text [ en-US ] = "Your input was not correct. Please enter \"yes\" or \"no\":"; -}; - -String RID_STR_UNOPKG_ACCEPT_LIC_YES -{ - Text [ en-US ] = "YES"; -}; - -String RID_STR_UNOPKG_ACCEPT_LIC_Y -{ - Text [ en-US ] = "Y"; -}; - -String RID_STR_UNOPKG_ACCEPT_LIC_NO -{ - Text [ en-US ] = "NO"; -}; - -String RID_STR_UNOPKG_ACCEPT_LIC_N -{ - Text [ en-US ] = "N"; -}; - -String RID_STR_CONCURRENTINSTANCE -{ - Text [ en-US ] = "unopkg cannot be started. The lock file indicates it is already running. " - "If this does not apply, delete the lock file at:"; -}; - -String RID_STR_UNOPKG_ERROR -{ - Text [ en-US ] = "ERROR: "; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index fd62da29d704..36aca9643248 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -64,6 +64,7 @@ #include #include #include +#include #include #include #include @@ -2997,8 +2998,6 @@ static void force_c_locale() { // force locale (and resource files loaded) to en-US OUString aLangISO("en-US"); - LanguageTag aLocale(aLangISO); - ResMgr::SetDefaultLocale(aLocale); SvtSysLocaleOptions aLocalOptions; aLocalOptions.SetLocaleConfigString(aLangISO); aLocalOptions.SetUILocaleConfigString(aLangISO); diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx index d501c1954c64..9bb354d7db70 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx @@ -18,8 +18,8 @@ */ -#include "dp_gui.hrc" -#include "dp_gui_shared.hxx" +#include "strings.hrc" +#include "dp_shared.hxx" #include "unopkg_shared.h" #include #include @@ -40,7 +40,8 @@ #include #include -#include "deployment.hrc" +#include "strings.hrc" +#include "dp_shared.hxx" #include "dp_version.hxx" using namespace ::com::sun::star; @@ -134,16 +135,15 @@ CommandEnvironmentImpl::~CommandEnvironmentImpl() void CommandEnvironmentImpl::printLicense( const OUString & sName, const OUString& sLicense, bool & accept, bool &decline) { - ResMgr * pResMgr = DeploymentResMgr::get(); - OUString s1tmp(ResId(RID_STR_UNOPKG_ACCEPT_LIC_1, *pResMgr)); + OUString s1tmp(DpResId(RID_STR_UNOPKG_ACCEPT_LIC_1)); OUString s1(s1tmp.replaceAll("$NAME", sName)); - OUString s2 = ResId(RID_STR_UNOPKG_ACCEPT_LIC_2, *pResMgr); - OUString s3 = ResId(RID_STR_UNOPKG_ACCEPT_LIC_3, *pResMgr); - OUString s4 = ResId(RID_STR_UNOPKG_ACCEPT_LIC_4, *pResMgr); - OUString sYES = ResId(RID_STR_UNOPKG_ACCEPT_LIC_YES, *pResMgr); - OUString sY = ResId(RID_STR_UNOPKG_ACCEPT_LIC_Y, *pResMgr); - OUString sNO = ResId(RID_STR_UNOPKG_ACCEPT_LIC_NO, *pResMgr); - OUString sN = ResId(RID_STR_UNOPKG_ACCEPT_LIC_N, *pResMgr); + OUString s2 = DpResId(RID_STR_UNOPKG_ACCEPT_LIC_2); + OUString s3 = DpResId(RID_STR_UNOPKG_ACCEPT_LIC_3); + OUString s4 = DpResId(RID_STR_UNOPKG_ACCEPT_LIC_4); + OUString sYES = DpResId(RID_STR_UNOPKG_ACCEPT_LIC_YES); + OUString sY = DpResId(RID_STR_UNOPKG_ACCEPT_LIC_Y); + OUString sNO = DpResId(RID_STR_UNOPKG_ACCEPT_LIC_NO); + OUString sN = DpResId(RID_STR_UNOPKG_ACCEPT_LIC_N); OUString sNewLine("\n"); @@ -262,7 +262,7 @@ void CommandEnvironmentImpl::handle( } else if (request >>= platExc) { - OUString sMsg(ResId(RID_STR_UNSUPPORTED_PLATFORM, *dp_gui::DeploymentGuiResMgr::get())); + OUString sMsg(DpResId(RID_STR_UNSUPPORTED_PLATFORM)); sMsg = sMsg.replaceAll("%Name", platExc.package->getDisplayName()); dp_misc::writeConsole("\n" + sMsg + "\n\n"); approve = true; diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx index 8e692cdf2fc8..2e9fdda4dadb 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx @@ -38,10 +38,11 @@ #include #include -#include "deployment.hrc" +#include "strings.hrc" #include "unopkg_shared.h" #include "dp_identifier.hxx" -#include "dp_gui.hrc" +#include "dp_shared.hxx" +#include "strings.hrc" #include "lockfile.hxx" using namespace ::com::sun::star; @@ -441,10 +442,8 @@ Reference getUNO( { if (! s_lockfile.check( nullptr )) { - OUString sMsg(ResId(RID_STR_CONCURRENTINSTANCE, *DeploymentResMgr::get())); - //Create this string before we call DeInitVCL, because this will kill - //the ResMgr - OUString sError(ResId(RID_STR_UNOPKG_ERROR, *DeploymentResMgr::get())); + OUString sMsg(DpResId(RID_STR_CONCURRENTINSTANCE)); + OUString sError(DpResId(RID_STR_UNOPKG_ERROR)); sMsg += "\n" + getLockFilePath(); diff --git a/desktop/source/pkgchk/unopkg/unopkg_shared.h b/desktop/source/pkgchk/unopkg/unopkg_shared.h index 1bd6a04b46bd..20ade0b5e4fd 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_shared.h +++ b/desktop/source/pkgchk/unopkg/unopkg_shared.h @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -31,14 +32,6 @@ namespace unopkg { -struct DeploymentResMgr : public rtl::StaticWithInit< ResMgr *, DeploymentResMgr > -{ - ResMgr * operator () () { - return ResMgr::CreateResMgr( - "deployment", LanguageTag( utl::ConfigManager::getLocale() ) ); - } -}; - struct OptionInfo { char const * m_name; diff --git a/desktop/uiconfig/ui/dependenciesdialog.ui b/desktop/uiconfig/ui/dependenciesdialog.ui index cdc6bf35362f..d810db078d54 100644 --- a/desktop/uiconfig/ui/dependenciesdialog.ui +++ b/desktop/uiconfig/ui/dependenciesdialog.ui @@ -1,12 +1,12 @@ - + False True True 6 - System dependencies check + System dependencies check dialog @@ -57,7 +57,7 @@ True False 0 - The extension cannot be installed as the following system dependencies are not fulfilled: + The extension cannot be installed as the following system dependencies are not fulfilled: True 60 diff --git a/desktop/uiconfig/ui/extensionmanager.ui b/desktop/uiconfig/ui/extensionmanager.ui index f40b38679134..d4aa71991655 100644 --- a/desktop/uiconfig/ui/extensionmanager.ui +++ b/desktop/uiconfig/ui/extensionmanager.ui @@ -1,12 +1,12 @@ - + False 6 - Extension Manager + Extension Manager dialog @@ -79,7 +79,7 @@ start - _Options + _Options True True True @@ -93,7 +93,7 @@ - Check for _Updates + Check for _Updates True True True @@ -108,7 +108,7 @@ - _Add + _Add True True True @@ -125,7 +125,7 @@ - _Remove + _Remove True True True @@ -140,7 +140,7 @@ - _Enable + _Enable True True True @@ -184,7 +184,7 @@ 12 - Installed for all users + Installed for all users True True False @@ -200,7 +200,7 @@ - Installed for current user + Installed for current user True True False @@ -216,7 +216,7 @@ - Bundled with %PRODUCTNAME + Bundled with %PRODUCTNAME True True False @@ -238,7 +238,7 @@ True False - Display Extensions + Display Extensions @@ -260,7 +260,7 @@ False True - Adding %EXTENSION_NAME + Adding %EXTENSION_NAME right @@ -295,7 +295,7 @@ - Get more extensions online... + Get more extensions online... True True True diff --git a/desktop/uiconfig/ui/installforalldialog.ui b/desktop/uiconfig/ui/installforalldialog.ui index 354afcf280cb..c3d3576db024 100644 --- a/desktop/uiconfig/ui/installforalldialog.ui +++ b/desktop/uiconfig/ui/installforalldialog.ui @@ -1,6 +1,6 @@ - + False @@ -9,8 +9,8 @@ dialog True question - For whom do you want to install the extension? - Make sure that no further users are working with the same %PRODUCTNAME, when installing an extension for all users in a multi user environment. + For whom do you want to install the extension? + Make sure that no further users are working with the same %PRODUCTNAME, when installing an extension for all users in a multi user environment. False @@ -22,7 +22,7 @@ end - _For all users + _For all users True True True @@ -36,7 +36,7 @@ - _Only for me + _Only for me True True True diff --git a/desktop/uiconfig/ui/licensedialog.ui b/desktop/uiconfig/ui/licensedialog.ui index bc357838da06..3dac862f09ff 100644 --- a/desktop/uiconfig/ui/licensedialog.ui +++ b/desktop/uiconfig/ui/licensedialog.ui @@ -1,11 +1,11 @@ - + False 6 - Extension Software License Agreement + Extension Software License Agreement dialog @@ -18,7 +18,7 @@ end - Accept + Accept True True True @@ -33,7 +33,7 @@ - Decline + Decline True True True @@ -64,7 +64,7 @@ True False 0 - Please follow these steps to proceed with the installation of the extension: + Please follow these steps to proceed with the installation of the extension: 0 @@ -87,7 +87,7 @@ False start 0 - 1. + 1. 1 @@ -102,7 +102,7 @@ False start 0 - 2. + 2. 1 @@ -146,7 +146,7 @@ start True 0 - Read the complete License Agreement. Use the scroll bar or the 'Scroll Down' button in this dialog to view the entire license text. + Read the complete License Agreement. Use the scroll bar or the 'Scroll Down' button in this dialog to view the entire license text. True 55 @@ -164,7 +164,7 @@ start True 0 - Accept the License Agreement for the extension by pressing the 'Accept' button. + Accept the License Agreement for the extension by pressing the 'Accept' button. True 55 @@ -177,7 +177,7 @@ - _Scroll Down + _Scroll Down True True True diff --git a/desktop/uiconfig/ui/showlicensedialog.ui b/desktop/uiconfig/ui/showlicensedialog.ui index e6dc728f9c40..eef638282720 100644 --- a/desktop/uiconfig/ui/showlicensedialog.ui +++ b/desktop/uiconfig/ui/showlicensedialog.ui @@ -1,10 +1,10 @@ - + False 6 - Extension Software License Agreement + Extension Software License Agreement dialog diff --git a/desktop/uiconfig/ui/updatedialog.ui b/desktop/uiconfig/ui/updatedialog.ui index 9fb3b6bcefdc..ee9a1b16fa57 100644 --- a/desktop/uiconfig/ui/updatedialog.ui +++ b/desktop/uiconfig/ui/updatedialog.ui @@ -1,13 +1,13 @@ - + False True True 6 - Extension Update + Extension Update dialog @@ -35,7 +35,7 @@ - _Install + _Install True False True @@ -101,7 +101,7 @@ False start True - _Available extension updates + _Available extension updates True @@ -114,7 +114,7 @@ True False end - Checking... + Checking... 1 @@ -157,7 +157,7 @@ - _Show all updates + _Show all updates False True False @@ -193,7 +193,7 @@ True False start - Description + Description False @@ -211,7 +211,7 @@ True False start - Publisher: + Publisher: True PUBLISHER_LINK @@ -222,7 +222,7 @@ - button + button True True True @@ -239,7 +239,7 @@ True False start - What is new: + What is new: True RELEASE_NOTES_LINK @@ -250,7 +250,7 @@ - Release notes + Release notes True True True diff --git a/desktop/uiconfig/ui/updateinstalldialog.ui b/desktop/uiconfig/ui/updateinstalldialog.ui index 42dc29937624..d96a85edef67 100644 --- a/desktop/uiconfig/ui/updateinstalldialog.ui +++ b/desktop/uiconfig/ui/updateinstalldialog.ui @@ -1,11 +1,11 @@ - + False 6 - Download and Installation + Download and Installation dialog @@ -84,7 +84,7 @@ True False start - Downloading extensions... + Downloading extensions... True STATUSBAR @@ -122,7 +122,7 @@ True False start - Result + Result True INFO diff --git a/desktop/uiconfig/ui/updaterequireddialog.ui b/desktop/uiconfig/ui/updaterequireddialog.ui index b1c82d62657e..58e9ced957b9 100644 --- a/desktop/uiconfig/ui/updaterequireddialog.ui +++ b/desktop/uiconfig/ui/updaterequireddialog.ui @@ -1,12 +1,12 @@ - + False 5 - Extension Update Required + Extension Update Required dialog @@ -23,7 +23,7 @@ True False 0 - %PRODUCTNAME has been updated to a new version. Some installed %PRODUCTNAME extensions are not compatible with this version and need to be updated before they can be used. + %PRODUCTNAME has been updated to a new version. Some installed %PRODUCTNAME extensions are not compatible with this version and need to be updated before they can be used. True 95 @@ -59,7 +59,7 @@ False True 0 - Adding %EXTENSION_NAME + Adding %EXTENSION_NAME True @@ -103,7 +103,7 @@ end - Check for _Updates... + Check for _Updates... True True True @@ -119,7 +119,7 @@ - Disable all + Disable all True True True diff --git a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx index 7eaa2c729a20..ea4fe9578815 100644 --- a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx +++ b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx @@ -119,13 +119,11 @@ #include #include #include -#include #include #include #include #include #include -#include #include #include #include diff --git a/editeng/AllLangMoTarget_editeng.mk b/editeng/AllLangMoTarget_editeng.mk new file mode 100644 index 000000000000..b2e00ba32c6c --- /dev/null +++ b/editeng/AllLangMoTarget_editeng.mk @@ -0,0 +1,11 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# 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/. + +$(eval $(call gb_AllLangMoTarget_AllLangMoTarget,editeng)) + +# vim: set noet sw=4 ts=4: diff --git a/editeng/AllLangResTarget_editeng.mk b/editeng/AllLangResTarget_editeng.mk deleted file mode 100644 index 881579cffe01..000000000000 --- a/editeng/AllLangResTarget_editeng.mk +++ /dev/null @@ -1,42 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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 . -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,editeng)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,editeng,svx)) - -$(eval $(call gb_AllLangResTarget_add_srs,editeng, editeng/res)) -$(eval $(call gb_SrsTarget_SrsTarget,editeng/res)) - -$(eval $(call gb_SrsTarget_set_include,editeng/res,\ - $$(INCLUDE) \ - -I$(SRCDIR)/editeng/inc \ -)) - -# add src files here (complete path relative to repository root) -$(eval $(call gb_SrsTarget_add_files,editeng/res,\ - editeng/source/accessibility/accessibility.src \ - editeng/source/editeng/editeng.src \ - editeng/source/items/page.src \ - editeng/source/items/svxitems.src \ - editeng/source/misc/lingu.src \ - editeng/source/outliner/outliner.src \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk index 81cbf9332255..7e5790e81339 100644 --- a/editeng/Library_editeng.mk +++ b/editeng/Library_editeng.mk @@ -157,7 +157,4 @@ $(eval $(call gb_Library_use_externals,editeng,\ libxml2 \ )) -# Runtime dependency for unit-tests -$(eval $(call gb_Library_use_restarget,editeng,editeng)) - # vim: set noet sw=4 ts=4: diff --git a/editeng/Module_editeng.mk b/editeng/Module_editeng.mk index 4bed89d70b1b..6fedbcb6043e 100644 --- a/editeng/Module_editeng.mk +++ b/editeng/Module_editeng.mk @@ -22,11 +22,11 @@ $(eval $(call gb_Module_Module,editeng)) $(eval $(call gb_Module_add_targets,editeng,\ CustomTarget_generated \ Library_editeng \ + UIConfig_editeng \ )) $(eval $(call gb_Module_add_l10n_targets,editeng,\ - AllLangResTarget_editeng \ - UIConfig_editeng \ + AllLangMoTarget_editeng \ )) $(eval $(call gb_Module_add_check_targets,editeng,\ diff --git a/editeng/inc/editeng.hrc b/editeng/inc/editeng.hxx similarity index 90% rename from editeng/inc/editeng.hrc rename to editeng/inc/editeng.hxx index 18c62082623e..6c59982d679e 100644 --- a/editeng/inc/editeng.hrc +++ b/editeng/inc/editeng.hxx @@ -16,10 +16,8 @@ * 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_EDITENG_INC_EDITENG_HRC -#define INCLUDED_EDITENG_INC_EDITENG_HRC - -#include +#ifndef INCLUDED_EDITENG_INC_EDITENG_HXX +#define INCLUDED_EDITENG_INC_EDITENG_HXX #define MN_WORDLANGUAGE 998 #define MN_PARALANGUAGE 999 diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx index 7386631bfac4..a30afe4d008c 100644 --- a/editeng/inc/pch/precompiled_editeng.hxx +++ b/editeng/inc/pch/precompiled_editeng.hxx @@ -249,8 +249,6 @@ #include #include #include -#include -#include #include #include #include @@ -275,7 +273,6 @@ #include #include #include -#include #include #include #include diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index c1a5a5265c22..a23dfecff852 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -66,7 +66,7 @@ #include using namespace std; -#include "editeng.hrc" +#include #include #include #include diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx index 2a6c50de1eaf..fe88afb6f37d 100644 --- a/editeng/source/accessibility/AccessibleImageBullet.cxx +++ b/editeng/source/accessibility/AccessibleImageBullet.cxx @@ -40,7 +40,7 @@ #include #include #include -#include "editeng.hrc" +#include #include @@ -136,7 +136,7 @@ namespace accessibility SolarMutexGuard aGuard; // Get the string from the resource for the specified id. - return EditResId::GetString(RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION); + return EditResId(RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION); } OUString SAL_CALL AccessibleImageBullet::getAccessibleName() @@ -145,7 +145,7 @@ namespace accessibility SolarMutexGuard aGuard; // Get the string from the resource for the specified id. - return EditResId::GetString(RID_SVXSTR_A11Y_IMAGEBULLET_NAME); + return EditResId(RID_SVXSTR_A11Y_IMAGEBULLET_NAME); } uno::Reference< XAccessibleRelationSet > SAL_CALL AccessibleImageBullet::getAccessibleRelationSet() diff --git a/editeng/source/accessibility/accessibility.src b/editeng/source/accessibility/accessibility.src deleted file mode 100644 index f1ff0daff47f..000000000000 --- a/editeng/source/accessibility/accessibility.src +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "editeng.hrc" - -String RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION -{ - Text [ en-US ] = "Image bullet in paragraph" ; -}; - -String RID_SVXSTR_A11Y_IMAGEBULLET_NAME -{ - Text [ en-US ] = "Image bullet" ; -}; - -String RID_SVXSTR_A11Y_PARAGRAPH_DESCRIPTION -{ - Text [ en-US ] = "Paragraph: $(ARG) " ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index e5727ee0ba9b..7828eb843b45 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -34,7 +34,8 @@ #include #include #include -#include +#include +#include #include #include #include @@ -2513,12 +2514,12 @@ OUString EditEngine::GetUndoComment( sal_uInt16 nId ) const case EDITUNDO_DELCONTENT: case EDITUNDO_DELETE: case EDITUNDO_CUT: - aComment = EditResId::GetString(RID_EDITUNDO_DEL); + aComment = EditResId(RID_EDITUNDO_DEL); break; case EDITUNDO_MOVEPARAGRAPHS: case EDITUNDO_MOVEPARAS: case EDITUNDO_DRAGANDDROP: - aComment = EditResId::GetString(RID_EDITUNDO_MOVE); + aComment = EditResId(RID_EDITUNDO_MOVE); break; case EDITUNDO_INSERTFEATURE: case EDITUNDO_SPLITPARA: @@ -2526,27 +2527,27 @@ OUString EditEngine::GetUndoComment( sal_uInt16 nId ) const case EDITUNDO_PASTE: case EDITUNDO_INSERT: case EDITUNDO_READ: - aComment = EditResId::GetString(RID_EDITUNDO_INSERT); + aComment = EditResId(RID_EDITUNDO_INSERT); break; case EDITUNDO_REPLACEALL: - aComment = EditResId::GetString(RID_EDITUNDO_REPLACE); + aComment = EditResId(RID_EDITUNDO_REPLACE); break; case EDITUNDO_ATTRIBS: case EDITUNDO_PARAATTRIBS: - aComment = EditResId::GetString(RID_EDITUNDO_SETATTRIBS); + aComment = EditResId(RID_EDITUNDO_SETATTRIBS); break; case EDITUNDO_RESETATTRIBS: - aComment = EditResId::GetString(RID_EDITUNDO_RESETATTRIBS); + aComment = EditResId(RID_EDITUNDO_RESETATTRIBS); break; case EDITUNDO_STYLESHEET: - aComment = EditResId::GetString(RID_EDITUNDO_SETSTYLE); + aComment = EditResId(RID_EDITUNDO_SETSTYLE); break; case EDITUNDO_TRANSLITERATE: - aComment = EditResId::GetString(RID_EDITUNDO_TRANSLITERATE); + aComment = EditResId(RID_EDITUNDO_TRANSLITERATE); break; case EDITUNDO_INDENTBLOCK: case EDITUNDO_UNINDENTBLOCK: - aComment = EditResId::GetString(RID_EDITUNDO_INDENT); + aComment = EditResId(RID_EDITUNDO_INDENT); break; } return aComment; diff --git a/editeng/source/editeng/editeng.src b/editeng/source/editeng/editeng.src deleted file mode 100644 index bcf45d9b8abc..000000000000 --- a/editeng/source/editeng/editeng.src +++ /dev/null @@ -1,83 +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 -#include - -String RID_EDITUNDO_DEL -{ - Text [ en-US ] = "Delete" ; -}; - -String RID_EDITUNDO_MOVE -{ - Text [ en-US ] = "Move" ; -}; - -String RID_EDITUNDO_INSERT -{ - Text [ en-US ] = "Insert" ; -}; - -String RID_EDITUNDO_REPLACE -{ - Text [ en-US ] = "Replace" ; -}; - -String RID_EDITUNDO_SETATTRIBS -{ - Text [ en-US ] = "Apply attributes" ; -}; - -String RID_EDITUNDO_RESETATTRIBS -{ - Text [ en-US ] = "Reset attributes" ; -}; - -String RID_EDITUNDO_INDENT -{ - Text [ en-US ] = "Indent" ; -}; - -String RID_EDITUNDO_SETSTYLE -{ - Text [ en-US ] = "Apply Styles" ; -}; - -String RID_EDITUNDO_TRANSLITERATE -{ - Text [ en-US ] = "Change Case"; -}; - -String RID_STR_WORD -{ - Text [ en-US ] = "Word is %x"; -}; - -String RID_STR_PARAGRAPH -{ - Text [ en-US ] = "Paragraph is %x"; -}; - -String RID_SVXSTR_AUTOMATIC -{ - Text [ en-US ] = "Automatic"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 77cabbec1123..11697dc95edd 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -47,7 +47,8 @@ #include #include #include -#include +#include +#include #include #include #include @@ -887,9 +888,9 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, LinkInsertSeparator(); OUString aTmpWord( SvtLanguageTable::GetLanguageString( nGuessLangWord ) ); OUString aTmpPara( SvtLanguageTable::GetLanguageString( nGuessLangPara ) ); - OUString aWordStr( EditResId::GetString( RID_STR_WORD ) ); + OUString aWordStr( EditResId( RID_STR_WORD ) ); aWordStr = aWordStr.replaceFirst( "%x", aTmpWord ); - OUString aParaStr( EditResId::GetString( RID_STR_PARAGRAPH ) ); + OUString aParaStr( EditResId( RID_STR_PARAGRAPH ) ); aParaStr = aParaStr.replaceFirst( "%x", aTmpPara ); aPopupMenu->InsertItem( MN_WORDLANGUAGE, aWordStr ); aPopupMenu->SetHelpId( MN_WORDLANGUAGE, HID_EDITENG_SPELLER_WORDLANGUAGE ); diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx index 2027cab81a50..d23885ea1fec 100644 --- a/editeng/source/editeng/eerdll.cxx +++ b/editeng/source/editeng/eerdll.cxx @@ -18,6 +18,7 @@ */ +#include #include #include #include @@ -192,9 +193,9 @@ uno::Reference< linguistic2::XLanguageGuessing > const & GlobalEditData::GetLang return xLanguageGuesser; } -EditResId::EditResId(sal_uInt16 nId) - : ResId(nId, *EditDLL::GetResMgr()) +OUString EditResId(const char *pId) { + return Translate::get(pId, EditDLL::GetResLocale()); } EditDLL::EditDLL() @@ -206,13 +207,10 @@ EditDLL::~EditDLL() { } -static ResMgr* pResMgr=nullptr; - -ResMgr* EditDLL::GetResMgr() +std::locale& EditDLL::GetResLocale() { - if (!pResMgr) - pResMgr = ResMgr::CreateResMgr("editeng", Application::GetSettings().GetUILanguageTag()); - return pResMgr; + static std::locale loc = Translate::Create("editeng", Application::GetSettings().GetUILanguageTag()); + return loc; } diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx index 0cb38a0f445e..caa86bcce036 100644 --- a/editeng/source/items/borderline.cxx +++ b/editeng/source/items/borderline.cxx @@ -637,7 +637,7 @@ OUString SvxBorderLine::GetValueString(MapUnit eSrcUnit, const IntlWrapper* pIntl, bool bMetricStr) const { - static const sal_uInt16 aStyleIds[] = + static const char* aStyleIds[] = { RID_SOLID, RID_DOTTED, @@ -662,12 +662,12 @@ OUString SvxBorderLine::GetValueString(MapUnit eSrcUnit, if ( (int)m_nStyle < int(SAL_N_ELEMENTS(aStyleIds)) ) { - sal_uInt16 nResId = aStyleIds[(int)m_nStyle]; - aStr += EditResId::GetString(nResId); + const char* pResId = aStyleIds[(int)m_nStyle]; + aStr += EditResId(pResId); } else { - OUString sMetric = EditResId::GetString(GetMetricId( eDestUnit )); + OUString sMetric = EditResId(GetMetricId( eDestUnit )); aStr += GetMetricText( (long)GetInWidth(), eSrcUnit, eDestUnit, pIntl ); if ( bMetricStr ) aStr += sMetric; diff --git a/editeng/source/items/charhiddenitem.cxx b/editeng/source/items/charhiddenitem.cxx index 41e8e9b479d9..c27a188af5aa 100644 --- a/editeng/source/items/charhiddenitem.cxx +++ b/editeng/source/items/charhiddenitem.cxx @@ -41,11 +41,11 @@ bool SvxCharHiddenItem::GetPresentation const IntlWrapper * /*pIntl*/ ) const { - sal_uInt16 nId = RID_SVXITEMS_CHARHIDDEN_FALSE; + const char* pId = RID_SVXITEMS_CHARHIDDEN_FALSE; if ( GetValue() ) - nId = RID_SVXITEMS_CHARHIDDEN_TRUE; - rText = EditResId::GetString(nId); + pId = RID_SVXITEMS_CHARHIDDEN_TRUE; + rText = EditResId(pId); return true; } diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index d14afbbcbe1b..0178499d1020 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -196,10 +196,10 @@ bool SvxPaperBinItem::GetPresentation sal_uInt8 nValue = GetValue(); if ( PAPERBIN_PRINTER_SETTINGS == nValue ) - rText = EditResId::GetString(RID_SVXSTR_PAPERBIN_SETTINGS); + rText = EditResId(RID_SVXSTR_PAPERBIN_SETTINGS); else { - rText = EditResId::GetString(RID_SVXSTR_PAPERBIN) + " " + OUString::number( nValue ); + rText = EditResId(RID_SVXSTR_PAPERBIN) + " " + OUString::number( nValue ); } return true; } @@ -333,13 +333,13 @@ bool SvxSizeItem::GetPresentation return true; case SfxItemPresentation::Complete: - rText = EditResId::GetString(RID_SVXITEMS_SIZE_WIDTH) + + rText = EditResId(RID_SVXITEMS_SIZE_WIDTH) + GetMetricText( aSize.Width(), eCoreUnit, ePresUnit, pIntl ) + - " " + EditResId::GetString(GetMetricId(ePresUnit)) + + " " + EditResId(GetMetricId(ePresUnit)) + cpDelimTmp + - EditResId::GetString(RID_SVXITEMS_SIZE_HEIGHT) + + EditResId(RID_SVXITEMS_SIZE_HEIGHT) + GetMetricText( aSize.Height(), eCoreUnit, ePresUnit, pIntl ) + - " " + EditResId::GetString(GetMetricId(ePresUnit)); + " " + EditResId(GetMetricId(ePresUnit)); return true; // no break necessary default: ; // prevent warning @@ -631,7 +631,7 @@ bool SvxLRSpaceItem::GetPresentation } case SfxItemPresentation::Complete: { - rText = EditResId::GetString(RID_SVXITEMS_LRSPACE_LEFT); + rText = EditResId(RID_SVXITEMS_LRSPACE_LEFT); if ( 100 != nPropLeftMargin ) rText += unicode::formatPercent(nPropLeftMargin, Application::GetSettings().GetUILanguageTag()); @@ -639,12 +639,12 @@ bool SvxLRSpaceItem::GetPresentation { rText = rText + GetMetricText( (long)nLeftMargin, eCoreUnit, ePresUnit, pIntl ) + - " " + EditResId::GetString(GetMetricId(ePresUnit)); + " " + EditResId(GetMetricId(ePresUnit)); } rText += OUString(cpDelim); if ( 100 != nPropFirstLineOfst || nFirstLineOfst ) { - rText += EditResId::GetString(RID_SVXITEMS_LRSPACE_FLINE); + rText += EditResId(RID_SVXITEMS_LRSPACE_FLINE); if ( 100 != nPropFirstLineOfst ) rText = rText + unicode::formatPercent(nPropFirstLineOfst, Application::GetSettings().GetUILanguageTag()); @@ -653,11 +653,11 @@ bool SvxLRSpaceItem::GetPresentation rText = rText + GetMetricText( (long)nFirstLineOfst, eCoreUnit, ePresUnit, pIntl ) + - " " + EditResId::GetString(GetMetricId(ePresUnit)); + " " + EditResId(GetMetricId(ePresUnit)); } rText += OUString(cpDelim); } - rText += EditResId::GetString(RID_SVXITEMS_LRSPACE_RIGHT); + rText += EditResId(RID_SVXITEMS_LRSPACE_RIGHT); if ( 100 != nPropRightMargin ) rText = rText + unicode::formatPercent(nPropRightMargin, Application::GetSettings().GetUILanguageTag()); @@ -666,7 +666,7 @@ bool SvxLRSpaceItem::GetPresentation rText = rText + GetMetricText( (long)nRightMargin, eCoreUnit, ePresUnit, pIntl ) + - " " + EditResId::GetString(GetMetricId(ePresUnit)); + " " + EditResId(GetMetricId(ePresUnit)); } return true; } @@ -998,7 +998,7 @@ bool SvxULSpaceItem::GetPresentation } case SfxItemPresentation::Complete: { - rText = EditResId::GetString(RID_SVXITEMS_ULSPACE_UPPER); + rText = EditResId(RID_SVXITEMS_ULSPACE_UPPER); if ( 100 != nPropUpper ) { rText += unicode::formatPercent(nPropUpper, @@ -1008,9 +1008,9 @@ bool SvxULSpaceItem::GetPresentation { rText = rText + GetMetricText( (long)nUpper, eCoreUnit, ePresUnit, pIntl ) + - " " + EditResId::GetString(GetMetricId(ePresUnit)); + " " + EditResId(GetMetricId(ePresUnit)); } - rText = rText + OUString(cpDelim) + EditResId::GetString(RID_SVXITEMS_ULSPACE_LOWER); + rText = rText + OUString(cpDelim) + EditResId(RID_SVXITEMS_ULSPACE_LOWER); if ( 100 != nPropLower ) { rText += unicode::formatPercent(nPropLower, @@ -1020,7 +1020,7 @@ bool SvxULSpaceItem::GetPresentation { rText = rText + GetMetricText( (long)nLower, eCoreUnit, ePresUnit, pIntl ) + - " " + EditResId::GetString(GetMetricId(ePresUnit)); + " " + EditResId(GetMetricId(ePresUnit)); } return true; } @@ -1124,11 +1124,11 @@ bool SvxPrintItem::GetPresentation OUString& rText, const IntlWrapper * ) const { - sal_uInt16 nId = RID_SVXITEMS_PRINT_FALSE; + const char* pId = RID_SVXITEMS_PRINT_FALSE; if ( GetValue() ) - nId = RID_SVXITEMS_PRINT_TRUE; - rText = EditResId::GetString(nId); + pId = RID_SVXITEMS_PRINT_TRUE; + rText = EditResId(pId); return true; } @@ -1162,11 +1162,11 @@ bool SvxOpaqueItem::GetPresentation OUString& rText, const IntlWrapper * ) const { - sal_uInt16 nId = RID_SVXITEMS_OPAQUE_FALSE; + const char* pId = RID_SVXITEMS_OPAQUE_FALSE; if ( GetValue() ) - nId = RID_SVXITEMS_OPAQUE_TRUE; - rText = EditResId::GetString(nId); + pId = RID_SVXITEMS_OPAQUE_TRUE; + rText = EditResId(pId); return true; } @@ -1232,21 +1232,21 @@ bool SvxProtectItem::GetPresentation OUString& rText, const IntlWrapper * ) const { - sal_uInt16 nId = RID_SVXITEMS_PROT_CONTENT_FALSE; + const char* pId = RID_SVXITEMS_PROT_CONTENT_FALSE; if ( bCntnt ) - nId = RID_SVXITEMS_PROT_CONTENT_TRUE; - rText = EditResId::GetString(nId) + OUString(cpDelim); - nId = RID_SVXITEMS_PROT_SIZE_FALSE; + pId = RID_SVXITEMS_PROT_CONTENT_TRUE; + rText = EditResId(pId) + OUString(cpDelim); + pId = RID_SVXITEMS_PROT_SIZE_FALSE; if ( bSize ) - nId = RID_SVXITEMS_PROT_SIZE_TRUE; - rText = rText + EditResId::GetString(nId) + OUString(cpDelim); - nId = RID_SVXITEMS_PROT_POS_FALSE; + pId = RID_SVXITEMS_PROT_SIZE_TRUE; + rText = rText + EditResId(pId) + OUString(cpDelim); + pId = RID_SVXITEMS_PROT_POS_FALSE; if ( bPos ) - nId = RID_SVXITEMS_PROT_POS_TRUE; - rText += EditResId::GetString(nId); + pId = RID_SVXITEMS_PROT_POS_TRUE; + rText += EditResId(pId); return true; } @@ -1449,6 +1449,14 @@ sal_uInt16 SvxShadowItem::CalcShadowSpace( SvxShadowItemSide nShadow ) const return nSpace; } +static const char* RID_SVXITEMS_SHADOW[] = +{ + RID_SVXITEMS_SHADOW_NONE, + RID_SVXITEMS_SHADOW_TOPLEFT, + RID_SVXITEMS_SHADOW_TOPRIGHT, + RID_SVXITEMS_SHADOW_BOTTOMLEFT, + RID_SVXITEMS_SHADOW_BOTTOMRIGHT +}; bool SvxShadowItem::GetPresentation ( @@ -1463,34 +1471,34 @@ bool SvxShadowItem::GetPresentation case SfxItemPresentation::Nameless: { rText = ::GetColorString( aShadowColor ) + OUString(cpDelim); - sal_uInt16 nId = RID_SVXITEMS_TRANSPARENT_FALSE; + const char* pId = RID_SVXITEMS_TRANSPARENT_FALSE; if ( aShadowColor.GetTransparency() ) - nId = RID_SVXITEMS_TRANSPARENT_TRUE; + pId = RID_SVXITEMS_TRANSPARENT_TRUE; rText = rText + - EditResId::GetString(nId) + + EditResId(pId) + OUString(cpDelim) + GetMetricText( (long)nWidth, eCoreUnit, ePresUnit, pIntl ) + OUString(cpDelim) + - EditResId::GetString(RID_SVXITEMS_SHADOW_BEGIN + (int)eLocation); + EditResId(RID_SVXITEMS_SHADOW[(int)eLocation]); return true; } case SfxItemPresentation::Complete: { - rText = EditResId::GetString(RID_SVXITEMS_SHADOW_COMPLETE) + + rText = EditResId(RID_SVXITEMS_SHADOW_COMPLETE) + ::GetColorString( aShadowColor ) + OUString(cpDelim); - sal_uInt16 nId = RID_SVXITEMS_TRANSPARENT_FALSE; + const char* pId = RID_SVXITEMS_TRANSPARENT_FALSE; if ( aShadowColor.GetTransparency() ) - nId = RID_SVXITEMS_TRANSPARENT_TRUE; + pId = RID_SVXITEMS_TRANSPARENT_TRUE; rText = rText + - EditResId::GetString(nId) + + EditResId(pId) + OUString(cpDelim) + GetMetricText( (long)nWidth, eCoreUnit, ePresUnit, pIntl ) + - " " + EditResId::GetString(GetMetricId(ePresUnit)) + + " " + EditResId(GetMetricId(ePresUnit)) + OUString(cpDelim) + - EditResId::GetString(RID_SVXITEMS_SHADOW_BEGIN + (int)eLocation); + EditResId(RID_SVXITEMS_SHADOW[(int)eLocation]); return true; } default: ; // prevent warning @@ -1545,14 +1553,13 @@ sal_uInt16 SvxShadowItem::GetValueCount() const return (sal_uInt16)SvxShadowLocation::End; // SvxShadowLocation::BottomRight + 1 } - OUString SvxShadowItem::GetValueTextByPos( sal_uInt16 nPos ) const { - DBG_ASSERT( nPos < (sal_uInt16)SvxShadowLocation::End, "enum overflow!" ); - return EditResId::GetString(RID_SVXITEMS_SHADOW_BEGIN + nPos ); + static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_SHADOW) == (size_t)SvxShadowLocation::End, "unexpected size"); + assert(nPos < (sal_uInt16)SvxShadowLocation::End && "enum overflow!"); + return EditResId(RID_SVXITEMS_SHADOW[nPos]); } - sal_uInt16 SvxShadowItem::GetEnumValue() const { return (sal_uInt16)GetLocation(); @@ -1571,7 +1578,7 @@ void SvxShadowItem::dumpAsXml(xmlTextWriterPtr pWriter) const xmlTextWriterWriteAttribute(pWriter, BAD_CAST("aShadowColor"), BAD_CAST(aShadowColor.AsRGBHexString().toUtf8().getStr())); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nWidth"), BAD_CAST(OString::number(nWidth).getStr())); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("eLocation"), BAD_CAST(OString::number((int)eLocation).getStr())); - xmlTextWriterWriteAttribute(pWriter, BAD_CAST("presentation"), BAD_CAST(EditResId::GetString(RID_SVXITEMS_SHADOW_BEGIN + (int)eLocation).toUtf8().getStr())); + xmlTextWriterWriteAttribute(pWriter, BAD_CAST("presentation"), BAD_CAST(EditResId(RID_SVXITEMS_SHADOW[(int)eLocation]).toUtf8().getStr())); xmlTextWriterEndElement(pWriter); } @@ -2106,11 +2113,11 @@ bool SvxBoxItem::GetPresentation { if( !(pTop || pBottom || pLeft || pRight) ) { - rText = EditResId::GetString(RID_SVXITEMS_BORDER_NONE) + cpDelimTmp; + rText = EditResId(RID_SVXITEMS_BORDER_NONE) + cpDelimTmp; } else { - rText = EditResId::GetString(RID_SVXITEMS_BORDER_COMPLETE); + rText = EditResId(RID_SVXITEMS_BORDER_COMPLETE); if( pTop && pBottom && pLeft && pRight && *pTop == *pBottom && *pTop == *pLeft && *pTop == *pRight ) { @@ -2121,65 +2128,65 @@ bool SvxBoxItem::GetPresentation if ( pTop ) { rText = rText + - EditResId::GetString(RID_SVXITEMS_BORDER_TOP) + + EditResId(RID_SVXITEMS_BORDER_TOP) + pTop->GetValueString( eCoreUnit, ePresUnit, pIntl, true ) + cpDelimTmp; } if ( pBottom ) { rText = rText + - EditResId::GetString(RID_SVXITEMS_BORDER_BOTTOM) + + EditResId(RID_SVXITEMS_BORDER_BOTTOM) + pBottom->GetValueString( eCoreUnit, ePresUnit, pIntl, true ) + cpDelimTmp; } if ( pLeft ) { rText = rText + - EditResId::GetString(RID_SVXITEMS_BORDER_LEFT) + + EditResId(RID_SVXITEMS_BORDER_LEFT) + pLeft->GetValueString( eCoreUnit, ePresUnit, pIntl, true ) + cpDelimTmp; } if ( pRight ) { rText = rText + - EditResId::GetString(RID_SVXITEMS_BORDER_RIGHT) + + EditResId(RID_SVXITEMS_BORDER_RIGHT) + pRight->GetValueString( eCoreUnit, ePresUnit, pIntl, true ) + cpDelimTmp; } } } - rText += EditResId::GetString(RID_SVXITEMS_BORDER_DISTANCE); + rText += EditResId(RID_SVXITEMS_BORDER_DISTANCE); if( nTopDist == nBottomDist && nTopDist == nLeftDist && nTopDist == nRightDist ) { rText = rText + GetMetricText( (long)nTopDist, eCoreUnit, ePresUnit, pIntl ) + - " " + EditResId::GetString(GetMetricId(ePresUnit)); + " " + EditResId(GetMetricId(ePresUnit)); } else { rText = rText + - EditResId::GetString(RID_SVXITEMS_BORDER_TOP) + + EditResId(RID_SVXITEMS_BORDER_TOP) + GetMetricText( (long)nTopDist, eCoreUnit, ePresUnit, pIntl ) + - " " + EditResId::GetString(GetMetricId(ePresUnit)) + + " " + EditResId(GetMetricId(ePresUnit)) + cpDelimTmp + - EditResId::GetString(RID_SVXITEMS_BORDER_BOTTOM) + + EditResId(RID_SVXITEMS_BORDER_BOTTOM) + GetMetricText( (long)nBottomDist, eCoreUnit, ePresUnit, pIntl ) + - " " + EditResId::GetString(GetMetricId(ePresUnit)) + + " " + EditResId(GetMetricId(ePresUnit)) + cpDelimTmp + - EditResId::GetString(RID_SVXITEMS_BORDER_LEFT) + + EditResId(RID_SVXITEMS_BORDER_LEFT) + GetMetricText( (long)nLeftDist, eCoreUnit, ePresUnit, pIntl ) + - " " + EditResId::GetString(GetMetricId(ePresUnit)) + + " " + EditResId(GetMetricId(ePresUnit)) + cpDelimTmp + - EditResId::GetString(RID_SVXITEMS_BORDER_RIGHT) + + EditResId(RID_SVXITEMS_BORDER_RIGHT) + GetMetricText( (long)nRightDist, eCoreUnit, ePresUnit, pIntl ) + - " " + EditResId::GetString(GetMetricId(ePresUnit)); + " " + EditResId(GetMetricId(ePresUnit)); } return true; } @@ -2933,14 +2940,23 @@ bool SvxFormatBreakItem::GetPresentation return true; } - OUString SvxFormatBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const { - DBG_ASSERT( nPos < (sal_uInt16)SvxBreak::End, "enum overflow!" ); - return EditResId::GetString(RID_SVXITEMS_BREAK_BEGIN + nPos); + static const char* RID_SVXITEMS_BREAK[] = + { + RID_SVXITEMS_BREAK_NONE, + RID_SVXITEMS_BREAK_COLUMN_BEFORE, + RID_SVXITEMS_BREAK_COLUMN_AFTER, + RID_SVXITEMS_BREAK_COLUMN_BOTH, + RID_SVXITEMS_BREAK_PAGE_BEFORE, + RID_SVXITEMS_BREAK_PAGE_AFTER, + RID_SVXITEMS_BREAK_PAGE_BOTH + }; + static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_BREAK) == (size_t)SvxBreak::End, "unexpected size"); + assert(nPos < (sal_uInt16)SvxBreak::End && "enum overflow!"); + return EditResId(RID_SVXITEMS_BREAK[nPos]); } - bool SvxFormatBreakItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { style::BreakType eBreak = style::BreakType_NONE; @@ -3059,11 +3075,11 @@ bool SvxFormatKeepItem::GetPresentation OUString& rText, const IntlWrapper * ) const { - sal_uInt16 nId = RID_SVXITEMS_FMTKEEP_FALSE; + const char* pId = RID_SVXITEMS_FMTKEEP_FALSE; if ( GetValue() ) - nId = RID_SVXITEMS_FMTKEEP_TRUE; - rText = EditResId::GetString(nId); + pId = RID_SVXITEMS_FMTKEEP_TRUE; + rText = EditResId(pId); return true; } @@ -3662,15 +3678,15 @@ bool SvxBrushItem::GetPresentation if ( GPOS_NONE == eGraphicPos ) { rText = ::GetColorString( aColor ) + OUString(cpDelim); - sal_uInt16 nId = RID_SVXITEMS_TRANSPARENT_FALSE; + const char* pId = RID_SVXITEMS_TRANSPARENT_FALSE; if ( aColor.GetTransparency() ) - nId = RID_SVXITEMS_TRANSPARENT_TRUE; - rText += EditResId::GetString(nId); + pId = RID_SVXITEMS_TRANSPARENT_TRUE; + rText += EditResId(pId); } else { - rText = EditResId::GetString(RID_SVXITEMS_GRAPHIC); + rText = EditResId(RID_SVXITEMS_GRAPHIC); } return true; @@ -4010,6 +4026,18 @@ sal_uInt16 SvxFrameDirectionItem::GetVersion( sal_uInt16 nFVer ) const return SOFFICE_FILEFORMAT_50 > nFVer ? USHRT_MAX : 0; } +const char* getFrmDirResId(size_t nIndex) +{ + const char* RID_SVXITEMS_FRMDIR[] = + { + RID_SVXITEMS_FRMDIR_HORI_LEFT_TOP, + RID_SVXITEMS_FRMDIR_HORI_RIGHT_TOP, + RID_SVXITEMS_FRMDIR_VERT_TOP_RIGHT, + RID_SVXITEMS_FRMDIR_VERT_TOP_LEFT, + RID_SVXITEMS_FRMDIR_ENVIRONMENT + }; + return RID_SVXITEMS_FRMDIR[nIndex]; +} bool SvxFrameDirectionItem::GetPresentation( SfxItemPresentation /*ePres*/, @@ -4017,11 +4045,10 @@ bool SvxFrameDirectionItem::GetPresentation( MapUnit /*ePresUnit*/, OUString& rText, const IntlWrapper *) const { - rText = EditResId::GetString( RID_SVXITEMS_FRMDIR_BEGIN + GetEnumValue() ); + rText = EditResId(getFrmDirResId(GetEnumValue())); return true; } - bool SvxFrameDirectionItem::PutValue( const css::uno::Any& rVal, sal_uInt8 ) { diff --git a/editeng/source/items/itemtype.cxx b/editeng/source/items/itemtype.cxx index 620cdadd8b7e..39126f065f1d 100644 --- a/editeng/source/items/itemtype.cxx +++ b/editeng/source/items/itemtype.cxx @@ -125,17 +125,15 @@ OUString GetMetricText( long nVal, MapUnit eSrcUnit, MapUnit eDestUnit, const In return sRet.makeStringAndClear(); } - -OUString GetSvxString( sal_uInt16 nId ) +OUString GetSvxString(const char* pId) { - return EditResId::GetString( nId ); + return EditResId(pId); } - OUString GetColorString( const Color& rCol ) { if (rCol.GetColor() == COL_AUTO) - return EditResId::GetString(RID_SVXSTR_AUTOMATIC); + return EditResId(RID_SVXSTR_AUTOMATIC); OUString sStr; @@ -155,8 +153,30 @@ OUString GetColorString( const Color& rCol ) nColor += 1; } + static const char* RID_SVXITEMS_COLORS[] = + { + RID_SVXITEMS_COLOR_BLACK, + RID_SVXITEMS_COLOR_BLUE, + RID_SVXITEMS_COLOR_GREEN, + RID_SVXITEMS_COLOR_CYAN, + RID_SVXITEMS_COLOR_RED, + RID_SVXITEMS_COLOR_MAGENTA, + RID_SVXITEMS_COLOR_BROWN, + RID_SVXITEMS_COLOR_GRAY, + RID_SVXITEMS_COLOR_LIGHTGRAY, + RID_SVXITEMS_COLOR_LIGHTBLUE, + RID_SVXITEMS_COLOR_LIGHTGREEN, + RID_SVXITEMS_COLOR_LIGHTCYAN, + RID_SVXITEMS_COLOR_LIGHTRED, + RID_SVXITEMS_COLOR_LIGHTMAGENTA, + RID_SVXITEMS_COLOR_YELLOW, + RID_SVXITEMS_COLOR_WHITE + }; + + static_assert(SAL_N_ELEMENTS(aColAry) == SAL_N_ELEMENTS(RID_SVXITEMS_COLORS), "must match"); + if ( nColor < SAL_N_ELEMENTS(aColAry) ) - sStr = EditResId::GetString( RID_SVXITEMS_COLOR_BEGIN + nColor + 1 ); + sStr = EditResId(RID_SVXITEMS_COLORS[nColor]); if ( sStr.isEmpty() ) { @@ -168,47 +188,45 @@ OUString GetColorString( const Color& rCol ) return sStr; } - -sal_uInt16 GetMetricId( MapUnit eUnit ) +const char* GetMetricId( MapUnit eUnit ) { - sal_uInt16 nId = RID_SVXITEMS_METRIC_MM; + const char* pId = RID_SVXITEMS_METRIC_MM; switch ( eUnit ) { case MapUnit::Map100thMM: case MapUnit::Map10thMM: case MapUnit::MapMM: - nId = RID_SVXITEMS_METRIC_MM; + pId = RID_SVXITEMS_METRIC_MM; break; case MapUnit::MapCM: - nId = RID_SVXITEMS_METRIC_CM; + pId = RID_SVXITEMS_METRIC_CM; break; case MapUnit::Map1000thInch: case MapUnit::Map100thInch: case MapUnit::Map10thInch: case MapUnit::MapInch: - nId = RID_SVXITEMS_METRIC_INCH; + pId = RID_SVXITEMS_METRIC_INCH; break; case MapUnit::MapPoint: - nId = RID_SVXITEMS_METRIC_POINT; + pId = RID_SVXITEMS_METRIC_POINT; break; case MapUnit::MapTwip: - nId = RID_SVXITEMS_METRIC_TWIP; + pId = RID_SVXITEMS_METRIC_TWIP; break; case MapUnit::MapPixel: - nId = RID_SVXITEMS_METRIC_PIXEL; + pId = RID_SVXITEMS_METRIC_PIXEL; break; default: OSL_FAIL( "not supported mapunit" ); } - return nId; + return pId; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/items/justifyitem.cxx b/editeng/source/items/justifyitem.cxx index b897fc5860d5..9d073ebda5c7 100644 --- a/editeng/source/items/justifyitem.cxx +++ b/editeng/source/items/justifyitem.cxx @@ -161,7 +161,7 @@ bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) OUString SvxHorJustifyItem::GetValueText( sal_uInt16 nVal ) { DBG_ASSERT( nVal <= (sal_uInt16)SvxCellHorJustify::Repeat, "enum overflow!" ); - return EditResId::GetString(RID_SVXITEMS_HORJUST_STANDARD + nVal); + return EditResId(RID_SVXITEMS_HORJUST_STANDARD + nVal); } @@ -297,7 +297,7 @@ bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) OUString SvxVerJustifyItem::GetValueText( sal_uInt16 nVal ) { DBG_ASSERT( nVal <= SVX_VER_JUSTIFY_BOTTOM, "enum overflow!" ); - return EditResId::GetString(RID_SVXITEMS_VERJUST_STANDARD + nVal); + return EditResId(RID_SVXITEMS_VERJUST_STANDARD + nVal); } @@ -379,7 +379,7 @@ bool SvxJustifyMethodItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId OUString SvxJustifyMethodItem::GetValueText( sal_uInt16 nVal ) { DBG_ASSERT( nVal <= SVX_VER_JUSTIFY_BOTTOM, "enum overflow!" ); - return EditResId::GetString(RID_SVXITEMS_JUSTMETHOD_AUTO + nVal); + return EditResId(RID_SVXITEMS_JUSTMETHOD_AUTO + nVal); } diff --git a/editeng/source/items/optitems.cxx b/editeng/source/items/optitems.cxx index 819f1aed7454..1736b80e741c 100644 --- a/editeng/source/items/optitems.cxx +++ b/editeng/source/items/optitems.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include #include #include @@ -120,9 +119,9 @@ bool SfxHyphenRegionItem::GetPresentation ) const { rText = rText + - EditResId::GetString(RID_SVXITEMS_HYPHEN_MINLEAD).replaceAll("%1", OUString::number(nMinLead)) + + EditResId(RID_SVXITEMS_HYPHEN_MINLEAD).replaceAll("%1", OUString::number(nMinLead)) + "," + - EditResId::GetString(RID_SVXITEMS_HYPHEN_MINTRAIL).replaceAll("%1", OUString::number(nMinTrail)); + EditResId(RID_SVXITEMS_HYPHEN_MINTRAIL).replaceAll("%1", OUString::number(nMinTrail)); return true; } diff --git a/editeng/source/items/page.src b/editeng/source/items/page.src deleted file mode 100644 index e58a618e753d..000000000000 --- a/editeng/source/items/page.src +++ /dev/null @@ -1,31 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include - -String RID_SVXSTR_PAPERBIN -{ - Text [ en-US ] = "Paper tray" ; -}; -String RID_SVXSTR_PAPERBIN_SETTINGS -{ - Text [ en-US ] = "[From printer settings]" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index 164b00a2d92c..eab2588de236 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -428,14 +428,21 @@ sal_uInt16 SvxAdjustItem::GetValueCount() const return (sal_uInt16)SvxAdjust::End; // SvxAdjust::BlockLine + 1 } - OUString SvxAdjustItem::GetValueTextByPos( sal_uInt16 nPos ) const { - DBG_ASSERT( nPos <= (sal_uInt16)SvxAdjust::BlockLine, "enum overflow!" ); - return EditResId::GetString(RID_SVXITEMS_ADJUST_BEGIN + nPos); + static const char* RID_SVXITEMS_ADJUST[] = + { + RID_SVXITEMS_ADJUST_LEFT, + RID_SVXITEMS_ADJUST_RIGHT, + RID_SVXITEMS_ADJUST_BLOCK, + RID_SVXITEMS_ADJUST_CENTER, + RID_SVXITEMS_ADJUST_BLOCKLINE + }; + static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_ADJUST) - 1 == (size_t)SvxAdjust::BlockLine, "unexpected size"); + assert(nPos <= (sal_uInt16)SvxAdjust::BlockLine && "enum overflow!"); + return EditResId(RID_SVXITEMS_ADJUST[nPos]); } - sal_uInt16 SvxAdjustItem::GetEnumValue() const { return (sal_uInt16)GetAdjust(); @@ -530,13 +537,13 @@ bool SvxWidowsItem::GetPresentation { case SfxItemPresentation::Nameless: { - rText = EditResId::GetString(RID_SVXITEMS_LINES); + rText = EditResId(RID_SVXITEMS_LINES); break; } case SfxItemPresentation::Complete: { - rText = EditResId::GetString(RID_SVXITEMS_WIDOWS_COMPLETE) + " " + EditResId::GetString(RID_SVXITEMS_LINES); + rText = EditResId(RID_SVXITEMS_WIDOWS_COMPLETE) + " " + EditResId(RID_SVXITEMS_LINES); break; } @@ -591,13 +598,13 @@ bool SvxOrphansItem::GetPresentation { case SfxItemPresentation::Nameless: { - rText = EditResId::GetString(RID_SVXITEMS_LINES); + rText = EditResId(RID_SVXITEMS_LINES); break; } case SfxItemPresentation::Complete: { - rText = EditResId::GetString(RID_SVXITEMS_ORPHANS_COMPLETE) + " " + EditResId::GetString(RID_SVXITEMS_LINES); + rText = EditResId(RID_SVXITEMS_ORPHANS_COMPLETE) + " " + EditResId(RID_SVXITEMS_LINES); break; } @@ -704,16 +711,16 @@ bool SvxHyphenZoneItem::GetPresentation { case SfxItemPresentation::Nameless: { - sal_uInt16 nId = RID_SVXITEMS_HYPHEN_FALSE; + const char* pId = RID_SVXITEMS_HYPHEN_FALSE; if ( bHyphen ) - nId = RID_SVXITEMS_HYPHEN_TRUE; - rText = EditResId::GetString(nId) + cpDelimTmp; - nId = RID_SVXITEMS_PAGE_END_FALSE; + pId = RID_SVXITEMS_HYPHEN_TRUE; + rText = EditResId(pId) + cpDelimTmp; + pId = RID_SVXITEMS_PAGE_END_FALSE; if ( bPageEnd ) - nId = RID_SVXITEMS_PAGE_END_TRUE; - rText = rText + EditResId::GetString(nId) + cpDelimTmp + + pId = RID_SVXITEMS_PAGE_END_TRUE; + rText = rText + EditResId(pId) + cpDelimTmp + OUString::number( nMinLead ) + cpDelimTmp + OUString::number( nMinTrail ) + cpDelimTmp + OUString::number( nMaxHyphens ); @@ -721,23 +728,23 @@ bool SvxHyphenZoneItem::GetPresentation } case SfxItemPresentation::Complete: { - sal_uInt16 nId = RID_SVXITEMS_HYPHEN_FALSE; + const char* pId = RID_SVXITEMS_HYPHEN_FALSE; if ( bHyphen ) - nId = RID_SVXITEMS_HYPHEN_TRUE; - rText = EditResId::GetString(nId) + cpDelimTmp; - nId = RID_SVXITEMS_PAGE_END_FALSE; + pId = RID_SVXITEMS_HYPHEN_TRUE; + rText = EditResId(pId) + cpDelimTmp; + pId = RID_SVXITEMS_PAGE_END_FALSE; if ( bPageEnd ) - nId = RID_SVXITEMS_PAGE_END_TRUE; + pId = RID_SVXITEMS_PAGE_END_TRUE; rText = rText + - EditResId::GetString(nId) + + EditResId(pId) + cpDelimTmp + - EditResId::GetString(RID_SVXITEMS_HYPHEN_MINLEAD).replaceAll("%1", OUString::number(nMinLead)) + + EditResId(RID_SVXITEMS_HYPHEN_MINLEAD).replaceAll("%1", OUString::number(nMinLead)) + cpDelimTmp + - EditResId::GetString(RID_SVXITEMS_HYPHEN_MINTRAIL).replaceAll("%1", OUString::number(nMinTrail)) + + EditResId(RID_SVXITEMS_HYPHEN_MINTRAIL).replaceAll("%1", OUString::number(nMinTrail)) + cpDelimTmp + - EditResId::GetString(RID_SVXITEMS_HYPHEN_MAX).replaceAll("%1", OUString::number(nMaxHyphens)); + EditResId(RID_SVXITEMS_HYPHEN_MAX).replaceAll("%1", OUString::number(nMaxHyphens)); return true; } default: ;//prevent warning @@ -1038,7 +1045,7 @@ bool SvxTabStopItem::GetPresentation ((*this)[i]).GetTabPos(), eCoreUnit, ePresUnit, pIntl ); if ( SfxItemPresentation::Complete == ePres ) { - rText += " " + EditResId::GetString(GetMetricId(ePresUnit)); + rText += " " + EditResId(GetMetricId(ePresUnit)); } bComma = true; } @@ -1182,11 +1189,11 @@ bool SvxFormatSplitItem::GetPresentation OUString& rText, const IntlWrapper * ) const { - sal_uInt16 nId = RID_SVXITEMS_FMTSPLIT_FALSE; + const char* pId = RID_SVXITEMS_FMTSPLIT_FALSE; if ( GetValue() ) - nId = RID_SVXITEMS_FMTSPLIT_TRUE; - rText = EditResId::GetString(nId); + pId = RID_SVXITEMS_FMTSPLIT_TRUE; + rText = EditResId(pId); return true; } @@ -1255,7 +1262,7 @@ bool SvxPageModelItem::GetPresentation case SfxItemPresentation::Complete: if ( bSet ) { - rText = EditResId::GetString(RID_SVXITEMS_PAGEMODEL_COMPLETE) + GetValue(); + rText = EditResId(RID_SVXITEMS_PAGEMODEL_COMPLETE) + GetValue(); } return true; default: ;//prevent warning @@ -1296,7 +1303,7 @@ bool SvxScriptSpaceItem::GetPresentation( MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString &rText, const IntlWrapper* /*pIntl*/ ) const { - rText = EditResId::GetString( !GetValue() + rText = EditResId( !GetValue() ? RID_SVXITEMS_SCRPTSPC_OFF : RID_SVXITEMS_SCRPTSPC_ON ); return true; @@ -1336,7 +1343,7 @@ bool SvxHangingPunctuationItem::GetPresentation( MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString &rText, const IntlWrapper* /*pIntl*/ ) const { - rText = EditResId::GetString( !GetValue() + rText = EditResId( !GetValue() ? RID_SVXITEMS_HNGPNCT_OFF : RID_SVXITEMS_HNGPNCT_ON ); return true; @@ -1376,7 +1383,7 @@ bool SvxForbiddenRuleItem::GetPresentation( MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString &rText, const IntlWrapper* /*pIntl*/ ) const { - rText = EditResId::GetString( !GetValue() + rText = EditResId( !GetValue() ? RID_SVXITEMS_FORBIDDEN_RULE_OFF : RID_SVXITEMS_FORBIDDEN_RULE_ON ); return true; @@ -1420,16 +1427,16 @@ bool SvxParaVertAlignItem::GetPresentation( MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/, OUString &rText, const IntlWrapper* ) const { - sal_uInt16 nTmp; + const char* pTmp; switch( GetValue() ) { - case Align::Automatic: nTmp = RID_SVXITEMS_PARAVERTALIGN_AUTO; break; - case Align::Top: nTmp = RID_SVXITEMS_PARAVERTALIGN_TOP; break; - case Align::Center: nTmp = RID_SVXITEMS_PARAVERTALIGN_CENTER; break; - case Align::Bottom: nTmp = RID_SVXITEMS_PARAVERTALIGN_BOTTOM; break; - default: nTmp = RID_SVXITEMS_PARAVERTALIGN_BASELINE; break; + case Align::Automatic: pTmp = RID_SVXITEMS_PARAVERTALIGN_AUTO; break; + case Align::Top: pTmp = RID_SVXITEMS_PARAVERTALIGN_TOP; break; + case Align::Center: pTmp = RID_SVXITEMS_PARAVERTALIGN_CENTER; break; + case Align::Bottom: pTmp = RID_SVXITEMS_PARAVERTALIGN_BOTTOM; break; + default: pTmp = RID_SVXITEMS_PARAVERTALIGN_BASELINE; break; } - rText = EditResId::GetString( nTmp ); + rText = EditResId(pTmp); return true; } @@ -1493,8 +1500,8 @@ bool SvxParaGridItem::GetPresentation( OUString &rText, const IntlWrapper* /*pIntl*/ ) const { rText = GetValue() ? - EditResId::GetString( RID_SVXITEMS_PARASNAPTOGRID_ON ) : - EditResId::GetString( RID_SVXITEMS_PARASNAPTOGRID_OFF ); + EditResId( RID_SVXITEMS_PARASNAPTOGRID_ON ) : + EditResId( RID_SVXITEMS_PARASNAPTOGRID_OFF ); return true; } diff --git a/editeng/source/items/svxitems.src b/editeng/source/items/svxitems.src deleted file mode 100644 index 3cb496325d97..000000000000 --- a/editeng/source/items/svxitems.src +++ /dev/null @@ -1,1028 +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 - - // enum SvxBreak ------------------------------------------------------------ -String RID_SVXITEMS_BREAK_NONE -{ - Text [ en-US ] = "No break" ; -}; -String RID_SVXITEMS_BREAK_COLUMN_BEFORE -{ - Text [ en-US ] = "Break before new column" ; -}; -String RID_SVXITEMS_BREAK_COLUMN_AFTER -{ - Text [ en-US ] = "Break after new column" ; -}; -String RID_SVXITEMS_BREAK_COLUMN_BOTH -{ - Text [ en-US ] = "Break before and after new column" ; -}; -String RID_SVXITEMS_BREAK_PAGE_BEFORE -{ - Text [ en-US ] = "Break before new page" ; -}; -String RID_SVXITEMS_BREAK_PAGE_AFTER -{ - Text [ en-US ] = "Break after new page" ; -}; -String RID_SVXITEMS_BREAK_PAGE_BOTH -{ - Text [ en-US ] = "Break before and after new page" ; -}; - // enum SvxShadowLocation --------------------------------------------------- -String RID_SVXITEMS_SHADOW_NONE -{ - Text [ en-US ] = "No Shadow" ; -}; -String RID_SVXITEMS_SHADOW_TOPLEFT -{ - Text [ en-US ] = "Shadow top left" ; -}; -String RID_SVXITEMS_SHADOW_TOPRIGHT -{ - Text [ en-US ] = "Shadow top right" ; -}; -String RID_SVXITEMS_SHADOW_BOTTOMLEFT -{ - Text [ en-US ] = "Shadow bottom left" ; -}; -String RID_SVXITEMS_SHADOW_BOTTOMRIGHT -{ - Text [ en-US ] = "Shadow bottom right" ; -}; - // enum ColorName ----------------------------------------------------------- -String RID_SVXITEMS_COLOR -{ - Text [ en-US ] = "Color " ; -}; -String RID_SVXITEMS_COLOR_BLACK -{ - Text [ en-US ] = "Black" ; -}; -String RID_SVXITEMS_COLOR_BLUE -{ - Text [ en-US ] = "Blue" ; -}; -String RID_SVXITEMS_COLOR_GREEN -{ - Text [ en-US ] = "Green" ; -}; -String RID_SVXITEMS_COLOR_CYAN -{ - Text [ en-US ] = "Cyan" ; -}; -String RID_SVXITEMS_COLOR_RED -{ - Text [ en-US ] = "Red" ; -}; -String RID_SVXITEMS_COLOR_MAGENTA -{ - Text [ en-US ] = "Magenta" ; -}; -String RID_SVXITEMS_COLOR_BROWN -{ - Text [ en-US ] = "Brown" ; -}; -String RID_SVXITEMS_COLOR_GRAY -{ - Text [ en-US ] = "Gray" ; -}; -String RID_SVXITEMS_COLOR_LIGHTGRAY -{ - Text [ en-US ] = "Light Gray" ; -}; -String RID_SVXITEMS_COLOR_LIGHTBLUE -{ - Text [ en-US ] = "Light Blue" ; -}; -String RID_SVXITEMS_COLOR_LIGHTGREEN -{ - Text [ en-US ] = "Light Green" ; -}; -String RID_SVXITEMS_COLOR_LIGHTCYAN -{ - Text [ en-US ] = "Light Cyan" ; -}; -String RID_SVXITEMS_COLOR_LIGHTRED -{ - Text [ en-US ] = "Light Red" ; -}; -String RID_SVXITEMS_COLOR_LIGHTMAGENTA -{ - Text [ en-US ] = "Light Magenta" ; -}; -String RID_SVXITEMS_COLOR_YELLOW -{ - Text [ en-US ] = "Yellow" ; -}; -String RID_SVXITEMS_COLOR_WHITE -{ - Text [ en-US ] = "White" ; -}; -String RID_SVXITEMS_COLOR_MENUBAR -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_MENUBARTEXT -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_POPUPMENU -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_POPUPMENUTEXT -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_WINDOWTEXT -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_WINDOWWORKSPACE -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_HIGHLIGHT -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_HIGHLIGHTTEXT -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_3DTEXT -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_3DFACE -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_3DLIGHT -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_3DSHADOW -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_SCROLLBAR -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_FIELD -{ - Text = "?" ; -}; -String RID_SVXITEMS_COLOR_FIELDTEXT -{ - Text = "?" ; -}; - // enum FontItalic ------------------------------------------------------- -String RID_SVXITEMS_ITALIC_NONE -{ - Text [ en-US ] = "Not Italic" ; -}; -String RID_SVXITEMS_ITALIC_OBLIQUE -{ - Text [ en-US ] = "Oblique italic" ; -}; -String RID_SVXITEMS_ITALIC_NORMAL -{ - Text [ en-US ] = "Italic" ; -}; - // enum FontWeight ------------------------------------------------------- -String RID_SVXITEMS_WEIGHT_DONTKNOW -{ - Text = "?" ; -}; -String RID_SVXITEMS_WEIGHT_THIN -{ - Text [ en-US ] = "thin" ; -}; -String RID_SVXITEMS_WEIGHT_ULTRALIGHT -{ - Text [ en-US ] = "ultra thin" ; -}; -String RID_SVXITEMS_WEIGHT_LIGHT -{ - Text [ en-US ] = "light" ; -}; -String RID_SVXITEMS_WEIGHT_SEMILIGHT -{ - Text [ en-US ] = "semi light" ; -}; -String RID_SVXITEMS_WEIGHT_NORMAL -{ - Text [ en-US ] = "normal" ; -}; -String RID_SVXITEMS_WEIGHT_MEDIUM -{ - Text [ en-US ] = "medium" ; -}; -String RID_SVXITEMS_WEIGHT_SEMIBOLD -{ - Text [ en-US ] = "semi bold" ; -}; -String RID_SVXITEMS_WEIGHT_BOLD -{ - Text [ en-US ] = "bold" ; -}; -String RID_SVXITEMS_WEIGHT_ULTRABOLD -{ - Text [ en-US ] = "ultra bold" ; -}; -String RID_SVXITEMS_WEIGHT_BLACK -{ - Text [ en-US ] = "black" ; -}; - // enum FontUnderline - used for underline ------------------------------ -String RID_SVXITEMS_UL_NONE -{ - Text [ en-US ] = "No underline" ; -}; -String RID_SVXITEMS_UL_SINGLE -{ - Text [ en-US ] = "Single underline" ; -}; -String RID_SVXITEMS_UL_DOUBLE -{ - Text [ en-US ] = "Double underline" ; -}; -String RID_SVXITEMS_UL_DOTTED -{ - Text [ en-US ] = "Dotted underline" ; -}; -String RID_SVXITEMS_UL_DONTKNOW -{ - Text [ en-US ] = "Underline"; -}; -String RID_SVXITEMS_UL_DASH -{ - Text [ en-US ] = "Underline (dashes)"; -}; -String RID_SVXITEMS_UL_LONGDASH -{ - Text [ en-US ] = "Underline (long dashes)"; -}; -String RID_SVXITEMS_UL_DASHDOT -{ - Text [ en-US ] = "Underline (dot dash)"; -}; -String RID_SVXITEMS_UL_DASHDOTDOT -{ - Text [ en-US ] = "Underline (dot dot dash)"; -}; -String RID_SVXITEMS_UL_SMALLWAVE -{ - Text [ en-US ] = "Underline (small wave)"; -}; -String RID_SVXITEMS_UL_WAVE -{ - Text [ en-US ] = "Underline (Wave)"; -}; -String RID_SVXITEMS_UL_DOUBLEWAVE -{ - Text [ en-US ] = "Underline (Double wave)"; -}; -String RID_SVXITEMS_UL_BOLD -{ - Text [ en-US ] = "Underlined (Bold)"; -}; -String RID_SVXITEMS_UL_BOLDDOTTED -{ - Text [ en-US ] = "Dotted underline (Bold)"; -}; -String RID_SVXITEMS_UL_BOLDDASH -{ - Text [ en-US ] = "Underline (Dash bold)"; -}; -String RID_SVXITEMS_UL_BOLDLONGDASH -{ - Text [ en-US ] = "Underline (long dash, bold)"; -}; -String RID_SVXITEMS_UL_BOLDDASHDOT -{ - Text [ en-US ] = "Underline (dot dash, bold)"; -}; -String RID_SVXITEMS_UL_BOLDDASHDOTDOT -{ - Text [ en-US ] = "Underline (dot dot dash, bold)"; -}; -String RID_SVXITEMS_UL_BOLDWAVE -{ - Text [ en-US ] = "Underline (wave, bold)"; -}; - // enum FontUnderline - used for overline ------------------------------- -String RID_SVXITEMS_OL_NONE -{ - Text [ en-US ] = "No overline" ; -}; -String RID_SVXITEMS_OL_SINGLE -{ - Text [ en-US ] = "Single overline" ; -}; -String RID_SVXITEMS_OL_DOUBLE -{ - Text [ en-US ] = "Double overline" ; -}; -String RID_SVXITEMS_OL_DOTTED -{ - Text [ en-US ] = "Dotted overline" ; -}; -String RID_SVXITEMS_OL_DONTKNOW -{ - Text [ en-US ] = "Overline"; -}; -String RID_SVXITEMS_OL_DASH -{ - Text [ en-US ] = "Overline (dashes)"; -}; -String RID_SVXITEMS_OL_LONGDASH -{ - Text [ en-US ] = "Overline (long dashes)"; -}; -String RID_SVXITEMS_OL_DASHDOT -{ - Text [ en-US ] = "Overline (dot dash)"; -}; -String RID_SVXITEMS_OL_DASHDOTDOT -{ - Text [ en-US ] = "Overline (dot dot dash)"; -}; -String RID_SVXITEMS_OL_SMALLWAVE -{ - Text [ en-US ] = "Overline (small wave)"; -}; -String RID_SVXITEMS_OL_WAVE -{ - Text [ en-US ] = "Overline (Wave)"; -}; -String RID_SVXITEMS_OL_DOUBLEWAVE -{ - Text [ en-US ] = "Overline (Double wave)"; -}; -String RID_SVXITEMS_OL_BOLD -{ - Text [ en-US ] = "Overlined (Bold)"; -}; -String RID_SVXITEMS_OL_BOLDDOTTED -{ - Text [ en-US ] = "Dotted overline (Bold)"; -}; -String RID_SVXITEMS_OL_BOLDDASH -{ - Text [ en-US ] = "Overline (Dash bold)"; -}; -String RID_SVXITEMS_OL_BOLDLONGDASH -{ - Text [ en-US ] = "Overline (long dash, bold)"; -}; -String RID_SVXITEMS_OL_BOLDDASHDOT -{ - Text [ en-US ] = "Overline (dot dash, bold)"; -}; -String RID_SVXITEMS_OL_BOLDDASHDOTDOT -{ - Text [ en-US ] = "Overline (dot dot dash, bold)"; -}; -String RID_SVXITEMS_OL_BOLDWAVE -{ - Text [ en-US ] = "Overline (wave, bold)"; -}; - // enum FontStrikeout ---------------------------------------------------- -String RID_SVXITEMS_STRIKEOUT_NONE -{ - Text [ en-US ] = "No strikethrough" ; -}; -String RID_SVXITEMS_STRIKEOUT_SINGLE -{ - Text [ en-US ] = "Single strikethrough" ; -}; -String RID_SVXITEMS_STRIKEOUT_DOUBLE -{ - Text [ en-US ] = "Double strikethrough" ; -}; -String RID_SVXITEMS_STRIKEOUT_BOLD -{ - Text [ en-US ] = "Bold strikethrough"; -}; -String RID_SVXITEMS_STRIKEOUT_SLASH -{ - Text [ en-US ] = "Strike through with slash"; -}; -String RID_SVXITEMS_STRIKEOUT_X -{ - Text [ en-US ] = "Strike through with Xes"; -}; - // enum CASEMAP ---------------------------------------------------------- -String RID_SVXITEMS_CASEMAP_NONE -{ - Text [ en-US ] = "None" ; -}; -String RID_SVXITEMS_CASEMAP_VERSALIEN -{ - Text [ en-US ] = "Caps" ; -}; -String RID_SVXITEMS_CASEMAP_GEMEINE -{ - Text [ en-US ] = "Lowercase" ; -}; -String RID_SVXITEMS_CASEMAP_TITEL -{ - Text [ en-US ] = "Title" ; -}; -String RID_SVXITEMS_CASEMAP_KAPITAELCHEN -{ - Text [ en-US ] = "Small caps" ; -}; - // enum ESCAPEMENT ------------------------------------------------------- -String RID_SVXITEMS_ESCAPEMENT_OFF -{ - Text [ en-US ] = "Normal position" ; -}; -String RID_SVXITEMS_ESCAPEMENT_SUPER -{ - Text [ en-US ] = "Superscript " ; -}; -String RID_SVXITEMS_ESCAPEMENT_SUB -{ - Text [ en-US ] = "Subscript " ; -}; -String RID_SVXITEMS_ESCAPEMENT_AUTO -{ - Text [ en-US ] = "automatic" ; -}; - // enum SvxAdjust ----------------------------------------------------------- -String RID_SVXITEMS_ADJUST_LEFT -{ - Text [ en-US ] = "Align left" ; -}; -String RID_SVXITEMS_ADJUST_RIGHT -{ - Text [ en-US ] = "Align right" ; -}; -String RID_SVXITEMS_ADJUST_BLOCK -{ - Text [ en-US ] = "Justify" ; -}; -String RID_SVXITEMS_ADJUST_CENTER -{ - Text [ en-US ] = "Centered" ; -}; -String RID_SVXITEMS_ADJUST_BLOCKLINE -{ - Text [ en-US ] = "Justify" ; -}; -String RID_SOLID -{ - Text [ en-US ] = "Single, solid" ; -}; -String RID_DOTTED -{ - Text [ en-US ] = "Single, dotted" ; -}; -String RID_DASHED -{ - Text [ en-US ] = "Single, dashed" ; -}; -String RID_DOUBLE -{ - Text [ en-US ] = "Double" ; -}; -String RID_THINTHICK_SMALLGAP -{ - Text [ en-US ] = "Double, inside: fine, outside: thick, spacing: small"; -}; -String RID_THINTHICK_MEDIUMGAP -{ - Text [ en-US ] = "Double, inside: fine, outside: thick, spacing: medium"; -}; -String RID_THINTHICK_LARGEGAP -{ - Text [ en-US ] = "Double, inside: fine, outside: thick, spacing: large"; -}; -String RID_THICKTHIN_SMALLGAP -{ - Text [ en-US ] = "Double, inside: thick, outside: fine, spacing: small"; -}; -String RID_THICKTHIN_MEDIUMGAP -{ - Text [ en-US ] = "Double, inside: thick, outside: fine, spacing: medium"; -}; -String RID_THICKTHIN_LARGEGAP -{ - Text [ en-US ] = "Double, inside: thick, outside: fine, spacing: large"; -}; -String RID_EMBOSSED -{ - Text [ en-US ] = "3D embossed" ; -}; -String RID_ENGRAVED -{ - Text [ en-US ] = "3D engraved" ; -}; -String RID_INSET -{ - Text [ en-US ] = "Inset" ; -}; -String RID_OUTSET -{ - Text [ en-US ] = "Outset" ; -}; -String RID_FINE_DASHED -{ - Text [ en-US ] = "Single, fine dashed"; -}; -String RID_DOUBLE_THIN -{ - Text [ en-US ] = "Double, fixed thin lines"; -}; -String RID_DASH_DOT -{ - Text [ en-US ] = "Single, dash-dot"; -}; -String RID_DASH_DOT_DOT -{ - Text [ en-US ] = "Single, dash-dot-dot"; -}; -String RID_SVXITEMS_METRIC_MM -{ - Text [ en-US ] = "mm" ; -}; -String RID_SVXITEMS_METRIC_CM -{ - Text [ en-US ] = "cm" ; -}; -String RID_SVXITEMS_METRIC_INCH -{ - Text [ en-US ] = "inch" ; -}; -String RID_SVXITEMS_METRIC_POINT -{ - Text [ en-US ] = "pt" ; -}; -String RID_SVXITEMS_METRIC_TWIP -{ - Text [ en-US ] = "twip" ; -}; -String RID_SVXITEMS_METRIC_PIXEL -{ - Text [ en-US ] = "pixel" ; -}; - // GetValueText of BoolItems -String RID_SVXITEMS_SHADOWED_TRUE -{ - Text [ en-US ] = "Shadowed" ; -}; -String RID_SVXITEMS_SHADOWED_FALSE -{ - Text [ en-US ] = "Not Shadowed" ; -}; -String RID_SVXITEMS_BLINK_TRUE -{ - Text [ en-US ] = "Blinking" ; -}; -String RID_SVXITEMS_BLINK_FALSE -{ - Text [ en-US ] = "Not Blinking" ; -}; -String RID_SVXITEMS_AUTOKERN_TRUE -{ - Text [ en-US ] = "Pair Kerning" ; -}; -String RID_SVXITEMS_AUTOKERN_FALSE -{ - Text [ en-US ] = "No pair kerning" ; -}; -String RID_SVXITEMS_WORDLINE_TRUE -{ - Text [ en-US ] = "Individual words" ; -}; -String RID_SVXITEMS_WORDLINE_FALSE -{ - Text [ en-US ] = "Not Words Only" ; -}; -String RID_SVXITEMS_CONTOUR_TRUE -{ - Text [ en-US ] = "Outline" ; -}; -String RID_SVXITEMS_CONTOUR_FALSE -{ - Text [ en-US ] = "No Outline" ; -}; -String RID_SVXITEMS_PRINT_TRUE -{ - Text [ en-US ] = "Print" ; -}; -String RID_SVXITEMS_PRINT_FALSE -{ - Text [ en-US ] = "Don't print" ; -}; -String RID_SVXITEMS_OPAQUE_TRUE -{ - Text [ en-US ] = "Opaque" ; -}; -String RID_SVXITEMS_OPAQUE_FALSE -{ - Text [ en-US ] = "Not Opaque" ; -}; -String RID_SVXITEMS_FMTKEEP_TRUE -{ - Text [ en-US ] = "Keep with next paragraph" ; -}; -String RID_SVXITEMS_FMTKEEP_FALSE -{ - Text [ en-US ] = "Don't Keep Paragraphs Together" ; -}; -String RID_SVXITEMS_FMTSPLIT_TRUE -{ - Text [ en-US ] = "Split paragraph" ; -}; -String RID_SVXITEMS_FMTSPLIT_FALSE -{ - Text [ en-US ] = "Don't split paragraph" ; -}; -String RID_SVXITEMS_PROT_CONTENT_TRUE -{ - Text [ en-US ] = "Contents protected" ; -}; -String RID_SVXITEMS_PROT_CONTENT_FALSE -{ - Text [ en-US ] = "Contents not protected" ; -}; -String RID_SVXITEMS_PROT_SIZE_TRUE -{ - Text [ en-US ] = "Size protected" ; -}; -String RID_SVXITEMS_PROT_SIZE_FALSE -{ - Text [ en-US ] = "Size not protected" ; -}; -String RID_SVXITEMS_PROT_POS_TRUE -{ - Text [ en-US ] = "Position protected" ; -}; -String RID_SVXITEMS_PROT_POS_FALSE -{ - Text [ en-US ] = "Position not protected" ; -}; -String RID_SVXITEMS_TRANSPARENT_TRUE -{ - Text [ en-US ] = "Transparent" ; -}; -String RID_SVXITEMS_TRANSPARENT_FALSE -{ - Text [ en-US ] = "Not Transparent" ; -}; -String RID_SVXITEMS_HYPHEN_TRUE -{ - Text [ en-US ] = "Hyphenation" ; -}; -String RID_SVXITEMS_HYPHEN_FALSE -{ - Text [ en-US ] = "No hyphenation" ; -}; -String RID_SVXITEMS_PAGE_END_TRUE -{ - Text [ en-US ] = "Page End" ; -}; -String RID_SVXITEMS_PAGE_END_FALSE -{ - Text [ en-US ] = "No Page End" ; -}; -String RID_SVXITEMS_SIZE_WIDTH -{ - Text [ en-US ] = "Width: " ; -}; -String RID_SVXITEMS_SIZE_HEIGHT -{ - Text [ en-US ] = "Height: " ; -}; -String RID_SVXITEMS_LRSPACE_LEFT -{ - Text [ en-US ] = "Indent left " ; -}; -String RID_SVXITEMS_LRSPACE_FLINE -{ - Text [ en-US ] = "First Line " ; -}; -String RID_SVXITEMS_LRSPACE_RIGHT -{ - Text [ en-US ] = "Indent right " ; -}; -String RID_SVXITEMS_SHADOW_COMPLETE -{ - Text [ en-US ] = "Shadow: " ; -}; -String RID_SVXITEMS_BORDER_COMPLETE -{ - Text [ en-US ] = "Borders " ; -}; -String RID_SVXITEMS_BORDER_NONE -{ - Text [ en-US ] = "No border"; -}; -String RID_SVXITEMS_BORDER_TOP -{ - Text [ en-US ] = "top " ; -}; -String RID_SVXITEMS_BORDER_BOTTOM -{ - Text [ en-US ] = "bottom " ; -}; -String RID_SVXITEMS_BORDER_LEFT -{ - Text [ en-US ] = "left " ; -}; -String RID_SVXITEMS_BORDER_RIGHT -{ - Text [ en-US ] = "right " ; -}; -String RID_SVXITEMS_BORDER_DISTANCE -{ - Text [ en-US ] = "Spacing " ; -}; -String RID_SVXITEMS_ULSPACE_UPPER -{ - Text [ en-US ] = "From top " ; -}; -String RID_SVXITEMS_ULSPACE_LOWER -{ - Text [ en-US ] = "From bottom " ; -}; -String RID_SVXITEMS_LINES -{ - Text [ en-US ] = "%1 Lines" ; - Text [ x-comment ] = "pb: %1 == will be replaced by the number of lines"; -}; -String RID_SVXITEMS_WIDOWS_COMPLETE -{ - Text [ en-US ] = "Widow control" ; -}; -String RID_SVXITEMS_ORPHANS_COMPLETE -{ - Text [ en-US ] = "Orphan control" ; -}; -String RID_SVXITEMS_HYPHEN_MINLEAD -{ - Text [ en-US ] = "%1 characters at end of line" ; -}; -String RID_SVXITEMS_HYPHEN_MINTRAIL -{ - Text [ en-US ] = "%1 characters at beginning of line" ; -}; -String RID_SVXITEMS_HYPHEN_MAX -{ - Text [ en-US ] = "%1 hyphens" ; -}; -String RID_SVXITEMS_PAGEMODEL_COMPLETE -{ - Text [ en-US ] = "Page Style: " ; -}; -String RID_SVXITEMS_KERNING_COMPLETE -{ - Text [ en-US ] = "Kerning " ; -}; -String RID_SVXITEMS_KERNING_EXPANDED -{ - Text [ en-US ] = "locked " ; -}; -String RID_SVXITEMS_KERNING_CONDENSED -{ - Text [ en-US ] = "Condensed " ; -}; -String RID_SVXITEMS_GRAPHIC -{ - Text [ en-US ] = "Graphic" ; -}; -String RID_SVXITEMS_EMPHASIS_NONE_STYLE -{ - Text [ en-US ] = "none"; -}; -String RID_SVXITEMS_EMPHASIS_DOT_STYLE -{ - Text [ en-US ] = "Dots "; -}; -String RID_SVXITEMS_EMPHASIS_CIRCLE_STYLE -{ - Text [ en-US ] = "Circle "; -}; -String RID_SVXITEMS_EMPHASIS_DISC_STYLE -{ -// ??? disc == filled ring - Text [ en-US ] = "Filled circle "; -}; -String RID_SVXITEMS_EMPHASIS_ACCENT_STYLE -{ - Text [ en-US ] = "Accent "; -}; -String RID_SVXITEMS_EMPHASIS_ABOVE_POS -{ - Text [ en-US ] = "Above"; -}; -String RID_SVXITEMS_EMPHASIS_BELOW_POS -{ - Text [ en-US ] = "Below"; -}; -String RID_SVXITEMS_TWOLINES_OFF -{ - Text [ en-US ] = "Double-lined off"; -}; -String RID_SVXITEMS_TWOLINES -{ - Text [ en-US ] = "Double-lined"; -}; -String RID_SVXITEMS_SCRPTSPC_OFF -{ - Text [ en-US ] = "No automatic character spacing"; -}; -String RID_SVXITEMS_SCRPTSPC_ON -{ - Text [ en-US ] = "No automatic character spacing"; -}; -String RID_SVXITEMS_HNGPNCT_OFF -{ - Text [ en-US ] = "No hanging punctuation at line end"; -}; -String RID_SVXITEMS_HNGPNCT_ON -{ - Text [ en-US ] = "Hanging punctuation at line end"; -}; -String RID_SVXITEMS_FORBIDDEN_RULE_OFF -{ - Text [ en-US ] = "Apply list of forbidden characters to beginning and end of lines"; -}; -String RID_SVXITEMS_FORBIDDEN_RULE_ON -{ - Text [ en-US ] = "Don't apply list of forbidden characters to beginning and end of lines"; -}; -String RID_SVXITEMS_CHARROTATE_OFF -{ - Text [ en-US ] = "No rotated characters"; -}; -String RID_SVXITEMS_CHARROTATE -{ - Text [ en-US ] = "Character rotated by $(ARG1)°"; -}; -String RID_SVXITEMS_CHARROTATE_FITLINE -{ - Text [ en-US ] = "Fit to line"; -}; -String RID_SVXITEMS_TEXTROTATE_OFF -{ - Text [ en-US ] = "Text is not rotated"; -}; -String RID_SVXITEMS_TEXTROTATE -{ - Text [ en-US ] = "Text is rotated by $(ARG1)°"; -}; -String RID_SVXITEMS_CHARSCALE -{ - Text [ en-US ] = "Characters scaled $(ARG1)%"; -}; -String RID_SVXITEMS_CHARSCALE_OFF -{ - Text [ en-US ] = "No scaled characters"; -}; -String RID_SVXITEMS_RELIEF_NONE -{ - Text [ en-US ] = "No relief"; -}; -String RID_SVXITEMS_RELIEF_EMBOSSED -{ - Text [ en-US ] = "Relief"; -}; -String RID_SVXITEMS_RELIEF_ENGRAVED -{ - Text [ en-US ] = "Engraved"; -}; -String RID_SVXITEMS_PARAVERTALIGN_AUTO -{ - Text [ en-US ] = "Automatic text alignment"; -}; -String RID_SVXITEMS_PARAVERTALIGN_BASELINE -{ - Text [ en-US ] = "Text aligned to base line"; -}; -String RID_SVXITEMS_PARAVERTALIGN_TOP -{ - Text [ en-US ] = "Text aligned top"; -}; -String RID_SVXITEMS_PARAVERTALIGN_CENTER -{ - Text [ en-US ] = "Text aligned middle"; -}; -String RID_SVXITEMS_PARAVERTALIGN_BOTTOM -{ - Text [ en-US ] = "Text aligned bottom"; -}; -String RID_SVXITEMS_FRMDIR_HORI_LEFT_TOP -{ - Text [ en-US ] = "Text direction left-to-right (horizontal)"; -}; -String RID_SVXITEMS_FRMDIR_HORI_RIGHT_TOP -{ - Text [ en-US ] = "Text direction right-to-left (horizontal)"; -}; -String RID_SVXITEMS_FRMDIR_VERT_TOP_RIGHT -{ - Text [ en-US ] = "Text direction right-to-left (vertical)"; -}; -String RID_SVXITEMS_FRMDIR_VERT_TOP_LEFT -{ - Text [ en-US ] = "Text direction left-to-right (vertical)"; -}; -String RID_SVXITEMS_FRMDIR_ENVIRONMENT -{ - Text [ en-US ] = "Use superordinate object text direction setting"; -}; -String RID_SVXITEMS_PARASNAPTOGRID_ON -{ - Text[ en-US ] = "Paragraph snaps to text grid (if active)"; -}; -String RID_SVXITEMS_PARASNAPTOGRID_OFF -{ - Text[ en-US ] = "Paragraph does not snap to text grid"; -}; -String RID_SVXITEMS_CHARHIDDEN_FALSE -{ - Text [ en-US ] = "Not hidden"; -}; -String RID_SVXITEMS_CHARHIDDEN_TRUE -{ - Text [ en-US ] = "Hidden"; -}; - // enum SvxCellHorJustify ---------------------------------------------------- -String RID_SVXITEMS_HORJUST_STANDARD -{ - Text [ en-US ] = "Horizontal alignment default" ; -}; -String RID_SVXITEMS_HORJUST_LEFT -{ - Text [ en-US ] = "Align left" ; -}; -String RID_SVXITEMS_HORJUST_CENTER -{ - Text [ en-US ] = "Centered horizontally" ; -}; -String RID_SVXITEMS_HORJUST_RIGHT -{ - Text [ en-US ] = "Align right" ; -}; -String RID_SVXITEMS_HORJUST_BLOCK -{ - Text [ en-US ] = "Justify" ; -}; -String RID_SVXITEMS_HORJUST_REPEAT -{ - Text [ en-US ] = "Repeat alignment" ; -}; - // enum SvxCellVerJustify ---------------------------------------------------- -String RID_SVXITEMS_VERJUST_STANDARD -{ - Text [ en-US ] = "Vertical alignment default" ; -}; -String RID_SVXITEMS_VERJUST_TOP -{ - Text [ en-US ] = "Align to top" ; -}; -String RID_SVXITEMS_VERJUST_CENTER -{ - Text [ en-US ] = "Centered vertically" ; -}; -String RID_SVXITEMS_VERJUST_BOTTOM -{ - Text [ en-US ] = "Align to bottom" ; -}; - // enum SvxCellJustifyMethod ---------------------------------------------------- -String RID_SVXITEMS_JUSTMETHOD_AUTO -{ - Text [ en-US ] = "Automatic" ; -}; -String RID_SVXITEMS_JUSTMETHOD_DISTRIBUTE -{ - Text [ en-US ] = "Distributed" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index aa1a478e887d..5821900f3902 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -490,17 +490,17 @@ OUString SvxPostureItem::GetValueTextByPos( sal_uInt16 nPos ) const DBG_ASSERT( nPos <= (sal_uInt16)ITALIC_NORMAL, "enum overflow!" ); FontItalic eItalic = (FontItalic)nPos; - sal_uInt16 nId = 0; + const char* pId = nullptr; switch ( eItalic ) { - case ITALIC_NONE: nId = RID_SVXITEMS_ITALIC_NONE; break; - case ITALIC_OBLIQUE: nId = RID_SVXITEMS_ITALIC_OBLIQUE; break; - case ITALIC_NORMAL: nId = RID_SVXITEMS_ITALIC_NORMAL; break; + case ITALIC_NONE: pId = RID_SVXITEMS_ITALIC_NONE; break; + case ITALIC_OBLIQUE: pId = RID_SVXITEMS_ITALIC_OBLIQUE; break; + case ITALIC_NORMAL: pId = RID_SVXITEMS_ITALIC_NORMAL; break; default: ;//prevent warning } - return nId ? EditResId::GetString(nId) : OUString(); + return pId ? EditResId(pId) : OUString(); } bool SvxPostureItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const @@ -619,7 +619,6 @@ SfxPoolItem* SvxWeightItem::Create(SvStream& rStrm, sal_uInt16) const return new SvxWeightItem( (FontWeight)nWeight, Which() ); } - bool SvxWeightItem::GetPresentation ( SfxItemPresentation /*ePres*/, @@ -632,11 +631,26 @@ bool SvxWeightItem::GetPresentation return true; } - OUString SvxWeightItem::GetValueTextByPos( sal_uInt16 nPos ) const { - DBG_ASSERT( nPos <= (sal_uInt16)WEIGHT_BLACK, "enum overflow!" ); - return EditResId::GetString(RID_SVXITEMS_WEIGHT_BEGIN + nPos); + static const char* RID_SVXITEMS_WEIGHTS[] = + { + RID_SVXITEMS_WEIGHT_DONTKNOW, + RID_SVXITEMS_WEIGHT_THIN, + RID_SVXITEMS_WEIGHT_ULTRALIGHT, + RID_SVXITEMS_WEIGHT_LIGHT, + RID_SVXITEMS_WEIGHT_SEMILIGHT, + RID_SVXITEMS_WEIGHT_NORMAL, + RID_SVXITEMS_WEIGHT_MEDIUM, + RID_SVXITEMS_WEIGHT_SEMIBOLD, + RID_SVXITEMS_WEIGHT_BOLD, + RID_SVXITEMS_WEIGHT_ULTRABOLD, + RID_SVXITEMS_WEIGHT_BLACK + }; + + static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_WEIGHTS) - 1 == WEIGHT_BLACK, "must match"); + assert(nPos <= (sal_uInt16)WEIGHT_BLACK && "enum overflow!" ); + return EditResId(RID_SVXITEMS_WEIGHTS[nPos]); } bool SvxWeightItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const @@ -999,7 +1013,7 @@ bool SvxFontHeightItem::GetPresentation if( MapUnit::MapRelative != ePropUnit ) { rText = OUString::number( (short)nProp ) + - " " + EditResId::GetString( GetMetricId( ePropUnit ) ); + " " + EditResId( GetMetricId( ePropUnit ) ); if( 0 <= (short)nProp ) rText = "+" + rText; } @@ -1007,7 +1021,7 @@ bool SvxFontHeightItem::GetPresentation { rText = GetMetricText( (long)nHeight, eCoreUnit, MapUnit::MapPoint, pIntl ) + - " " + EditResId::GetString(GetMetricId(MapUnit::MapPoint)); + " " + EditResId(GetMetricId(MapUnit::MapPoint)); } else rText = OUString::number( nProp ) + "%"; @@ -1185,7 +1199,7 @@ bool SvxFontWidthItem::GetPresentation { rText = GetMetricText( (long)nWidth, eCoreUnit, MapUnit::MapPoint, pIntl ) + - " " + EditResId::GetString(GetMetricId(MapUnit::MapPoint)); + " " + EditResId(GetMetricId(MapUnit::MapPoint)); } else rText = OUString::number( nProp ) + "%"; @@ -1363,8 +1377,31 @@ SfxPoolItem* SvxUnderlineItem::Create(SvStream& rStrm, sal_uInt16) const OUString SvxUnderlineItem::GetValueTextByPos( sal_uInt16 nPos ) const { - DBG_ASSERT( nPos <= (sal_uInt16)LINESTYLE_BOLDWAVE, "enum overflow!" ); - return EditResId::GetString(RID_SVXITEMS_UL_BEGIN + nPos); + static const char* RID_SVXITEMS_UL[] = + { + RID_SVXITEMS_UL_NONE, + RID_SVXITEMS_UL_SINGLE, + RID_SVXITEMS_UL_DOUBLE, + RID_SVXITEMS_UL_DOTTED, + RID_SVXITEMS_UL_DONTKNOW, + RID_SVXITEMS_UL_DASH, + RID_SVXITEMS_UL_LONGDASH, + RID_SVXITEMS_UL_DASHDOT, + RID_SVXITEMS_UL_DASHDOTDOT, + RID_SVXITEMS_UL_SMALLWAVE, + RID_SVXITEMS_UL_WAVE, + RID_SVXITEMS_UL_DOUBLEWAVE, + RID_SVXITEMS_UL_BOLD, + RID_SVXITEMS_UL_BOLDDOTTED, + RID_SVXITEMS_UL_BOLDDASH, + RID_SVXITEMS_UL_BOLDLONGDASH, + RID_SVXITEMS_UL_BOLDDASHDOT, + RID_SVXITEMS_UL_BOLDDASHDOTDOT, + RID_SVXITEMS_UL_BOLDWAVE + }; + static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_UL) - 1 == LINESTYLE_BOLDWAVE, "must match"); + assert(nPos <= (sal_uInt16)LINESTYLE_BOLDWAVE && "enum overflow!"); + return EditResId(RID_SVXITEMS_UL[nPos]); } // class SvxOverlineItem ------------------------------------------------ @@ -1393,8 +1430,31 @@ SfxPoolItem* SvxOverlineItem::Create(SvStream& rStrm, sal_uInt16) const OUString SvxOverlineItem::GetValueTextByPos( sal_uInt16 nPos ) const { - DBG_ASSERT( nPos <= (sal_uInt16)LINESTYLE_BOLDWAVE, "enum overflow!" ); - return EditResId::GetString(RID_SVXITEMS_OL_BEGIN + nPos); + static const char* RID_SVXITEMS_OL[] = + { + RID_SVXITEMS_OL_NONE, + RID_SVXITEMS_OL_SINGLE, + RID_SVXITEMS_OL_DOUBLE, + RID_SVXITEMS_OL_DOTTED, + RID_SVXITEMS_OL_DONTKNOW, + RID_SVXITEMS_OL_DASH, + RID_SVXITEMS_OL_LONGDASH, + RID_SVXITEMS_OL_DASHDOT, + RID_SVXITEMS_OL_DASHDOTDOT, + RID_SVXITEMS_OL_SMALLWAVE, + RID_SVXITEMS_OL_WAVE, + RID_SVXITEMS_OL_DOUBLEWAVE, + RID_SVXITEMS_OL_BOLD, + RID_SVXITEMS_OL_BOLDDOTTED, + RID_SVXITEMS_OL_BOLDDASH, + RID_SVXITEMS_OL_BOLDLONGDASH, + RID_SVXITEMS_OL_BOLDDASHDOT, + RID_SVXITEMS_OL_BOLDDASHDOTDOT, + RID_SVXITEMS_OL_BOLDWAVE + }; + static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_OL) - 1 == LINESTYLE_BOLDWAVE, "must match"); + assert(nPos <= (sal_uInt16)LINESTYLE_BOLDWAVE && "enum overflow!"); + return EditResId(RID_SVXITEMS_OL[nPos]); } // class SvxCrossedOutItem ----------------------------------------------- @@ -1462,11 +1522,21 @@ bool SvxCrossedOutItem::GetPresentation return true; } - OUString SvxCrossedOutItem::GetValueTextByPos( sal_uInt16 nPos ) const { - DBG_ASSERT( nPos <= (sal_uInt16)STRIKEOUT_X, "enum overflow!" ); - return EditResId::GetString(RID_SVXITEMS_STRIKEOUT_BEGIN + nPos); + static const char* RID_SVXITEMS_STRIKEOUT[] = + { + RID_SVXITEMS_STRIKEOUT_NONE, + RID_SVXITEMS_STRIKEOUT_SINGLE, + RID_SVXITEMS_STRIKEOUT_DOUBLE, + RID_SVXITEMS_STRIKEOUT_DONTKNOW, + RID_SVXITEMS_STRIKEOUT_BOLD, + RID_SVXITEMS_STRIKEOUT_SLASH, + RID_SVXITEMS_STRIKEOUT_X + }; + static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_STRIKEOUT) - 1 == STRIKEOUT_X, "must match"); + assert(nPos <= (sal_uInt16)STRIKEOUT_X && "enum overflow!"); + return EditResId(RID_SVXITEMS_STRIKEOUT[nPos]); } bool SvxCrossedOutItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const @@ -1540,11 +1610,11 @@ bool SvxShadowedItem::GetPresentation OUString& rText, const IntlWrapper * /*pIntl*/ ) const { - sal_uInt16 nId = RID_SVXITEMS_SHADOWED_FALSE; + const char* pId = RID_SVXITEMS_SHADOWED_FALSE; if ( GetValue() ) - nId = RID_SVXITEMS_SHADOWED_TRUE; - rText = EditResId::GetString(nId); + pId = RID_SVXITEMS_SHADOWED_TRUE; + rText = EditResId(pId); return true; } @@ -1585,11 +1655,11 @@ bool SvxAutoKernItem::GetPresentation OUString& rText, const IntlWrapper * /*pIntl*/ ) const { - sal_uInt16 nId = RID_SVXITEMS_AUTOKERN_FALSE; + const char* pId = RID_SVXITEMS_AUTOKERN_FALSE; if ( GetValue() ) - nId = RID_SVXITEMS_AUTOKERN_TRUE; - rText = EditResId::GetString(nId); + pId = RID_SVXITEMS_AUTOKERN_TRUE; + rText = EditResId(pId); return true; } @@ -1631,11 +1701,11 @@ bool SvxWordLineModeItem::GetPresentation OUString& rText, const IntlWrapper * /*pIntl*/ ) const { - sal_uInt16 nId = RID_SVXITEMS_WORDLINE_FALSE; + const char* pId = RID_SVXITEMS_WORDLINE_FALSE; if ( GetValue() ) - nId = RID_SVXITEMS_WORDLINE_TRUE; - rText = EditResId::GetString(nId); + pId = RID_SVXITEMS_WORDLINE_TRUE; + rText = EditResId(pId); return true; } @@ -1676,11 +1746,11 @@ bool SvxContourItem::GetPresentation OUString& rText, const IntlWrapper * /*pIntl*/ ) const { - sal_uInt16 nId = RID_SVXITEMS_CONTOUR_FALSE; + const char* pId = RID_SVXITEMS_CONTOUR_FALSE; if ( GetValue() ) - nId = RID_SVXITEMS_CONTOUR_TRUE; - rText = EditResId::GetString(nId); + pId = RID_SVXITEMS_CONTOUR_TRUE; + rText = EditResId(pId); return true; } @@ -2024,23 +2094,23 @@ bool SvxKerningItem::GetPresentation { case SfxItemPresentation::Nameless: rText = GetMetricText( (long)GetValue(), eCoreUnit, MapUnit::MapPoint, pIntl ) + - " " + EditResId::GetString(GetMetricId(MapUnit::MapPoint)); + " " + EditResId(GetMetricId(MapUnit::MapPoint)); return true; case SfxItemPresentation::Complete: { - rText = EditResId::GetString(RID_SVXITEMS_KERNING_COMPLETE); - sal_uInt16 nId = 0; + rText = EditResId(RID_SVXITEMS_KERNING_COMPLETE); + const char* pId = nullptr; if ( GetValue() > 0 ) - nId = RID_SVXITEMS_KERNING_EXPANDED; + pId = RID_SVXITEMS_KERNING_EXPANDED; else if ( GetValue() < 0 ) - nId = RID_SVXITEMS_KERNING_CONDENSED; + pId = RID_SVXITEMS_KERNING_CONDENSED; - if ( nId ) - rText += EditResId::GetString(nId); + if (pId) + rText += EditResId(pId); rText = rText + GetMetricText( (long)GetValue(), eCoreUnit, MapUnit::MapPoint, pIntl ) + - " " + EditResId::GetString(GetMetricId(MapUnit::MapPoint)); + " " + EditResId(GetMetricId(MapUnit::MapPoint)); return true; } default: ; //prevent warning @@ -2115,11 +2185,20 @@ bool SvxCaseMapItem::GetPresentation return true; } - OUString SvxCaseMapItem::GetValueTextByPos( sal_uInt16 nPos ) const { - DBG_ASSERT( nPos < (sal_uInt16)SvxCaseMap::End, "enum overflow!" ); - return EditResId::GetString(RID_SVXITEMS_CASEMAP_BEGIN + nPos); + static const char* RID_SVXITEMS_CASEMAP[] = + { + RID_SVXITEMS_CASEMAP_NONE, + RID_SVXITEMS_CASEMAP_VERSALIEN, + RID_SVXITEMS_CASEMAP_GEMEINE, + RID_SVXITEMS_CASEMAP_TITEL, + RID_SVXITEMS_CASEMAP_KAPITAELCHEN + }; + + static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_CASEMAP) == (size_t)SvxCaseMap::End, "must match"); + assert(nPos < (sal_uInt16)SvxCaseMap::End && "enum overflow!"); + return EditResId(RID_SVXITEMS_CASEMAP[nPos]); } bool SvxCaseMapItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const @@ -2248,20 +2327,26 @@ bool SvxEscapementItem::GetPresentation if ( nEsc != 0 ) { if( DFLT_ESC_AUTO_SUPER == nEsc || DFLT_ESC_AUTO_SUB == nEsc ) - rText += EditResId::GetString(RID_SVXITEMS_ESCAPEMENT_AUTO); + rText += EditResId(RID_SVXITEMS_ESCAPEMENT_AUTO); else rText = rText + OUString::number( nEsc ) + "%"; } return true; } - OUString SvxEscapementItem::GetValueTextByPos( sal_uInt16 nPos ) const { - DBG_ASSERT( nPos < (sal_uInt16)SvxEscapement::End, "enum overflow!" ); - return EditResId::GetString(RID_SVXITEMS_ESCAPEMENT_BEGIN + nPos); -} + static const char* RID_SVXITEMS_ESCAPEMENT[] = + { + RID_SVXITEMS_ESCAPEMENT_OFF, + RID_SVXITEMS_ESCAPEMENT_SUPER, + RID_SVXITEMS_ESCAPEMENT_SUB + }; + static_assert(SAL_N_ELEMENTS(RID_SVXITEMS_ESCAPEMENT) == (size_t)SvxEscapement::End, "must match"); + assert(nPos < (sal_uInt16)SvxEscapement::End && "enum overflow!"); + return EditResId(RID_SVXITEMS_ESCAPEMENT[nPos]); +} sal_uInt16 SvxEscapementItem::GetEnumValue() const { @@ -2559,11 +2644,11 @@ bool SvxBlinkItem::GetPresentation OUString& rText, const IntlWrapper * /*pIntl*/ ) const { - sal_uInt16 nId = RID_SVXITEMS_BLINK_FALSE; + const char* pId = RID_SVXITEMS_BLINK_FALSE; if ( GetValue() ) - nId = RID_SVXITEMS_BLINK_TRUE; - rText = EditResId::GetString(nId); + pId = RID_SVXITEMS_BLINK_TRUE; + rText = EditResId(pId); return true; } @@ -2607,20 +2692,28 @@ bool SvxEmphasisMarkItem::GetPresentation const IntlWrapper * /*pIntl*/ ) const { + static const char* RID_SVXITEMS_EMPHASIS[] = + { + RID_SVXITEMS_EMPHASIS_NONE_STYLE, + RID_SVXITEMS_EMPHASIS_DOT_STYLE, + RID_SVXITEMS_EMPHASIS_CIRCLE_STYLE, + RID_SVXITEMS_EMPHASIS_DISC_STYLE, + RID_SVXITEMS_EMPHASIS_ACCENT_STYLE + }; + FontEmphasisMark nVal = GetEmphasisMark(); - rText = EditResId::GetString( RID_SVXITEMS_EMPHASIS_BEGIN_STYLE + - (sal_uInt16)(FontEmphasisMark)( nVal & FontEmphasisMark::Style )); - sal_uInt16 nId = ( FontEmphasisMark::PosAbove & nVal ) + rText = EditResId(RID_SVXITEMS_EMPHASIS[ + (sal_uInt16)(FontEmphasisMark)( nVal & FontEmphasisMark::Style )]); + const char* pId = ( FontEmphasisMark::PosAbove & nVal ) ? RID_SVXITEMS_EMPHASIS_ABOVE_POS : ( FontEmphasisMark::PosBelow & nVal ) ? RID_SVXITEMS_EMPHASIS_BELOW_POS - : 0; - if( nId ) - rText += EditResId::GetString( nId ); + : nullptr; + if( pId ) + rText += EditResId( pId ); return true; } - bool SvxEmphasisMarkItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; @@ -2793,10 +2886,10 @@ bool SvxTwoLinesItem::GetPresentation( SfxItemPresentation /*ePres*/, OUString &rText, const IntlWrapper* /*pIntl*/ ) const { if( !GetValue() ) - rText = EditResId::GetString( RID_SVXITEMS_TWOLINES_OFF ); + rText = EditResId( RID_SVXITEMS_TWOLINES_OFF ); else { - rText = EditResId::GetString( RID_SVXITEMS_TWOLINES ); + rText = EditResId( RID_SVXITEMS_TWOLINES ); if( GetStartBracket() ) rText = OUStringLiteral1(GetStartBracket()) + rText; if( GetEndBracket() ) @@ -2869,10 +2962,10 @@ bool SvxTextRotateItem::GetPresentation( OUString &rText, const IntlWrapper*) const { if (!GetValue()) - rText = EditResId::GetString(RID_SVXITEMS_TEXTROTATE_OFF); + rText = EditResId(RID_SVXITEMS_TEXTROTATE_OFF); else { - rText = EditResId::GetString(RID_SVXITEMS_TEXTROTATE); + rText = EditResId(RID_SVXITEMS_TEXTROTATE); rText = rText.replaceFirst("$(ARG1)", OUString::number(GetValue() / 10)); } @@ -2974,14 +3067,14 @@ bool SvxCharRotateItem::GetPresentation( OUString &rText, const IntlWrapper* ) const { if( !GetValue() ) - rText = EditResId::GetString( RID_SVXITEMS_CHARROTATE_OFF ); + rText = EditResId( RID_SVXITEMS_CHARROTATE_OFF ); else { - rText = EditResId::GetString( RID_SVXITEMS_CHARROTATE ); + rText = EditResId( RID_SVXITEMS_CHARROTATE ); rText = rText.replaceFirst( "$(ARG1)", OUString::number( GetValue() / 10 )); if( IsFitToLine() ) - rText += EditResId::GetString( RID_SVXITEMS_CHARROTATE_FITLINE ); + rText += EditResId( RID_SVXITEMS_CHARROTATE_FITLINE ); } return true; } @@ -3107,10 +3200,10 @@ bool SvxCharScaleWidthItem::GetPresentation( OUString &rText, const IntlWrapper* ) const { if( !GetValue() ) - rText = EditResId::GetString( RID_SVXITEMS_CHARSCALE_OFF ); + rText = EditResId( RID_SVXITEMS_CHARSCALE_OFF ); else { - rText = EditResId::GetString( RID_SVXITEMS_CHARSCALE ); + rText = EditResId( RID_SVXITEMS_CHARSCALE ); rText = rText.replaceFirst( "$(ARG1)", OUString::number( GetValue() )); } @@ -3174,16 +3267,22 @@ sal_uInt16 SvxCharReliefItem::GetVersion( sal_uInt16 nFFVer ) const return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0; } -OUString SvxCharReliefItem::GetValueTextByPos( sal_uInt16 nPos ) const +static const char* RID_SVXITEMS_RELIEF[] = { - DBG_ASSERT( nPos < RID_SVXITEMS_RELIEF_ENGRAVED - RID_SVXITEMS_RELIEF_NONE, - "enum overflow" ); - return EditResId::GetString(RID_SVXITEMS_RELIEF_BEGIN + nPos); + RID_SVXITEMS_RELIEF_NONE, + RID_SVXITEMS_RELIEF_EMBOSSED, + RID_SVXITEMS_RELIEF_ENGRAVED +}; + +OUString SvxCharReliefItem::GetValueTextByPos(sal_uInt16 nPos) const +{ + assert(nPos < SAL_N_ELEMENTS(RID_SVXITEMS_RELIEF) && "enum overflow"); + return EditResId(RID_SVXITEMS_RELIEF[nPos]); } sal_uInt16 SvxCharReliefItem::GetValueCount() const { - return RID_SVXITEMS_RELIEF_ENGRAVED - RID_SVXITEMS_RELIEF_NONE; + return SAL_N_ELEMENTS(RID_SVXITEMS_RELIEF) - 1; } bool SvxCharReliefItem::GetPresentation diff --git a/editeng/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx index 57347f9dece7..fbac64aaba46 100644 --- a/editeng/source/items/writingmodeitem.cxx +++ b/editeng/source/items/writingmodeitem.cxx @@ -18,8 +18,10 @@ */ #include +#include #include #include +#include using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; @@ -69,7 +71,7 @@ bool SvxWritingModeItem::GetPresentation( SfxItemPresentation /*ePres*/, OUString &rText, const IntlWrapper * ) const { - rText = EditResId::GetString(RID_SVXITEMS_FRMDIR_BEGIN + (int)GetValue()); + rText = EditResId(getFrmDirResId((int)GetValue())); return true; } diff --git a/editeng/source/misc/lingu.src b/editeng/source/misc/lingu.src deleted file mode 100644 index f21f75f0dd66..000000000000 --- a/editeng/source/misc/lingu.src +++ /dev/null @@ -1,43 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include - -String RID_SVXSTR_QUERY_CONTINUE -{ - Text [ en-US ] = "Continue checking at beginning of document?" ; -}; -String RID_SVXSTR_QUERY_BW_CONTINUE -{ - Text [ en-US ] = "Continue checking at end of document?" ; -}; -String RID_SVXSTR_DIC_ERR_UNKNOWN -{ - Text [ en-US ] = "Word cannot be added to dictionary\ndue to unknown reason."; -}; -String RID_SVXSTR_DIC_ERR_FULL -{ - Text [ en-US ] = "The dictionary is already full."; -}; -String RID_SVXSTR_DIC_ERR_READONLY -{ - Text [ en-US ] = "The dictionary is read-only."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx index ca006a885549..a4db40002037 100644 --- a/editeng/source/misc/splwrap.cxx +++ b/editeng/source/misc/splwrap.cxx @@ -362,8 +362,8 @@ bool SvxSpellWrapper::SpellNext( ) // a BODY_area done, ask for the other BODY_area WAIT_OFF(); - sal_uInt16 nResId = bReverse ? RID_SVXSTR_QUERY_BW_CONTINUE : RID_SVXSTR_QUERY_CONTINUE; - ScopedVclPtrInstance< MessageDialog > aBox(pWin, EditResId(nResId), VclMessageType::Question, VclButtonsType::YesNo); + const char* pResId = bReverse ? RID_SVXSTR_QUERY_BW_CONTINUE : RID_SVXSTR_QUERY_CONTINUE; + ScopedVclPtrInstance< MessageDialog > aBox(pWin, EditResId(pResId), VclMessageType::Question, VclButtonsType::YesNo); if ( aBox->Execute() != RET_YES ) { // sacrifice the other area if necessary ask for special area diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx index e21de08007d1..7cf530d78aed 100644 --- a/editeng/source/misc/unolingu.cxx +++ b/editeng/source/misc/unolingu.cxx @@ -732,16 +732,16 @@ short SvxDicError( vcl::Window *pParent, linguistic::DictionaryError nError ) short nRes = 0; if (linguistic::DictionaryError::NONE != nError) { - int nRid; + const char* pRid; switch (nError) { - case linguistic::DictionaryError::FULL : nRid = RID_SVXSTR_DIC_ERR_FULL; break; - case linguistic::DictionaryError::READONLY : nRid = RID_SVXSTR_DIC_ERR_READONLY; break; + case linguistic::DictionaryError::FULL : pRid = RID_SVXSTR_DIC_ERR_FULL; break; + case linguistic::DictionaryError::READONLY : pRid = RID_SVXSTR_DIC_ERR_READONLY; break; default: - nRid = RID_SVXSTR_DIC_ERR_UNKNOWN; + pRid = RID_SVXSTR_DIC_ERR_UNKNOWN; SAL_WARN("editeng", "unexpected case"); } - nRes = ScopedVclPtrInstance(pParent, EditResId::GetString(nRid))->Execute(); + nRes = ScopedVclPtrInstance(pParent, EditResId(pRid))->Execute(); } return nRes; } diff --git a/editeng/source/outliner/outleeng.cxx b/editeng/source/outliner/outleeng.cxx index f9333e0c6857..185bef339690 100644 --- a/editeng/source/outliner/outleeng.cxx +++ b/editeng/source/outliner/outleeng.cxx @@ -127,19 +127,19 @@ OUString OutlinerEditEng::GetUndoComment( sal_uInt16 nUndoId ) const switch( nUndoId ) { case OLUNDO_DEPTH: - return EditResId::GetString(RID_OUTLUNDO_DEPTH); + return EditResId(RID_OUTLUNDO_DEPTH); case OLUNDO_EXPAND: - return EditResId::GetString(RID_OUTLUNDO_EXPAND); + return EditResId(RID_OUTLUNDO_EXPAND); case OLUNDO_COLLAPSE: - return EditResId::GetString(RID_OUTLUNDO_COLLAPSE); + return EditResId(RID_OUTLUNDO_COLLAPSE); case OLUNDO_ATTR: - return EditResId::GetString(RID_OUTLUNDO_ATTR); + return EditResId(RID_OUTLUNDO_ATTR); case OLUNDO_INSERT: - return EditResId::GetString(RID_OUTLUNDO_INSERT); + return EditResId(RID_OUTLUNDO_INSERT); default: return EditEngine::GetUndoComment( nUndoId ); diff --git a/editeng/source/outliner/outliner.src b/editeng/source/outliner/outliner.src deleted file mode 100644 index b01b3828c230..000000000000 --- a/editeng/source/outliner/outliner.src +++ /dev/null @@ -1,43 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include - -String RID_OUTLUNDO_DEPTH -{ - Text [ en-US ] = "Indent" ; -}; -String RID_OUTLUNDO_EXPAND -{ - Text [ en-US ] = "Show subpoints" ; -}; -String RID_OUTLUNDO_COLLAPSE -{ - Text [ en-US ] = "Collapse" ; -}; -String RID_OUTLUNDO_ATTR -{ - Text [ en-US ] = "Apply attributes" ; -}; -String RID_OUTLUNDO_INSERT -{ - Text [ en-US ] = "Insert" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/uiconfig/ui/spellmenu.ui b/editeng/uiconfig/ui/spellmenu.ui index 365de28b512f..07e964f42523 100644 --- a/editeng/uiconfig/ui/spellmenu.ui +++ b/editeng/uiconfig/ui/spellmenu.ui @@ -1,6 +1,6 @@ - + True @@ -9,14 +9,14 @@ True False - I_gnore All + I_gnore All True False - _Add to Dictionary + _Add to Dictionary True @@ -30,7 +30,7 @@ True False - _Add to Dictionary + _Add to Dictionary True @@ -38,7 +38,7 @@ True False - _Spellcheck... + _Spellcheck... True @@ -52,7 +52,7 @@ True False - AutoCorrect _To + AutoCorrect _To True @@ -66,7 +66,7 @@ True False - Auto_Correct Options... + Auto_Correct Options... True diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index f85414f7c43b..751c7c0fff5a 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -68,7 +68,7 @@ #include #include #include -#include +#include #include #include @@ -972,8 +972,8 @@ bool DocumentHolder::LoadDocToFrame( bool bInPlace ) if( xModelTitle.is() ) { LanguageTag aLocale( Application::GetSettings().GetUILanguageTag() ); - ResMgr* pResMgr = ResMgr::SearchCreateResMgr( "sfx", aLocale ); - OUString sEmbedded = ResId( STR_EMBEDDED_TITLE, *pResMgr ); + std::locale aResLoc = Translate::Create("sfx", aLocale); + OUString sEmbedded = Translate::get(STR_EMBEDDED_TITLE, aResLoc); xModelTitle->setTitle( m_pEmbedObj->getContainerName() + sEmbedded); m_aContainerName = m_pEmbedObj->getContainerName(); // TODO: get real m_aDocumentNamePart diff --git a/extensions/AllLangMoTarget_pcr.mk b/extensions/AllLangMoTarget_pcr.mk new file mode 100644 index 000000000000..d826748f7d65 --- /dev/null +++ b/extensions/AllLangMoTarget_pcr.mk @@ -0,0 +1,13 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# 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/. + +$(eval $(call gb_AllLangMoTarget_AllLangMoTarget,pcr)) + +$(eval $(call gb_AllLangMoTarget_set_polocation,pcr,extensions)) + +# vim: set noet sw=4 ts=4: diff --git a/extensions/AllLangResTarget_abp.mk b/extensions/AllLangResTarget_abp.mk deleted file mode 100644 index 61a4c340b042..000000000000 --- a/extensions/AllLangResTarget_abp.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# -# 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/. -# -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,abp)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,abp,extensions/res)) - -$(eval $(call gb_AllLangResTarget_add_srs,abp,abp/res)) - -$(eval $(call gb_SrsTarget_SrsTarget,abp/res)) - -$(eval $(call gb_SrsTarget_set_include,abp/res,\ - $$(INCLUDE) \ - -I$(SRCDIR)/extensions/inc \ -)) - -$(eval $(call gb_SrsTarget_add_files,abp/res,\ - extensions/source/abpilot/abspilot.src \ -)) - -# vim:set noet sw=4 ts=4: diff --git a/extensions/AllLangResTarget_bib.mk b/extensions/AllLangResTarget_bib.mk deleted file mode 100644 index 68ed52e6f9ad..000000000000 --- a/extensions/AllLangResTarget_bib.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# -# 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/. -# -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,bib)) - -$(eval $(call gb_AllLangResTarget_add_srs,bib,bib/res)) - -$(eval $(call gb_SrsTarget_SrsTarget,bib/res)) - -$(eval $(call gb_SrsTarget_set_include,bib/res,\ - $$(INCLUDE) \ - -I$(SRCDIR)/extensions/inc \ -)) - -$(eval $(call gb_SrsTarget_add_files,bib/res,\ - extensions/source/bibliography/bib.src \ - extensions/source/bibliography/sections.src \ -)) - -# vim:set noet sw=4 ts=4: diff --git a/extensions/AllLangResTarget_dbp.mk b/extensions/AllLangResTarget_dbp.mk deleted file mode 100644 index 01d93223705a..000000000000 --- a/extensions/AllLangResTarget_dbp.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# -# 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/. -# -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,dbp)) - -$(eval $(call gb_AllLangResTarget_add_srs,dbp,dbp/res)) - -$(eval $(call gb_SrsTarget_SrsTarget,dbp/res)) - -$(eval $(call gb_SrsTarget_set_include,dbp/res,\ - $$(INCLUDE) \ - -I$(SRCDIR)/extensions/inc \ -)) - -$(eval $(call gb_SrsTarget_add_files,dbp/res,\ - extensions/source/dbpilots/commonpagesdbp.src \ - extensions/source/dbpilots/dbpilots.src \ - extensions/source/dbpilots/gridpages.src \ - extensions/source/dbpilots/groupboxpages.src \ - extensions/source/dbpilots/listcombopages.src \ -)) - -# vim:set noet sw=4 ts=4: diff --git a/extensions/AllLangResTarget_pcr.mk b/extensions/AllLangResTarget_pcr.mk deleted file mode 100644 index a305fd9e38b9..000000000000 --- a/extensions/AllLangResTarget_pcr.mk +++ /dev/null @@ -1,35 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# -# 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/. -# -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,pcr)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,pcr,extensions)) - -$(eval $(call gb_AllLangResTarget_add_srs,pcr,\ - pcr/res \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,pcr/res)) - -$(eval $(call gb_SrsTarget_set_include,pcr/res,\ - -I$(SRCDIR)/extensions/inc \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_SrsTarget_add_files,pcr/res,\ - extensions/source/propctrlr/propres.src \ - extensions/source/propctrlr/formres.src \ - extensions/source/propctrlr/pcrmiscres.src \ - extensions/source/propctrlr/selectlabeldialog.src \ - extensions/source/propctrlr/formlinkdialog.src \ -)) - -# vim:set noet sw=4 ts=4: diff --git a/extensions/AllLangResTarget_scn.mk b/extensions/AllLangResTarget_scn.mk deleted file mode 100644 index be69430184ec..000000000000 --- a/extensions/AllLangResTarget_scn.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# -# 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/. -# -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,scn)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,scn,extensions/source/scanner)) - -$(eval $(call gb_AllLangResTarget_add_srs,scn,\ - scn/res \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,scn/res)) - -$(eval $(call gb_SrsTarget_set_include,scn/res,\ - $$(INCLUDE) \ - -I$(SRCDIR)/extensions/source/scanner \ -)) - -$(eval $(call gb_SrsTarget_add_files,scn/res,\ - extensions/source/scanner/strings.src \ -)) - -# vim:set noet sw=4 ts=4: diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk index 9d494e4e5257..18d312a0d019 100644 --- a/extensions/CppunitTest_extensions_test_update.mk +++ b/extensions/CppunitTest_extensions_test_update.mk @@ -23,7 +23,9 @@ $(eval $(call gb_CppunitTest_use_libraries,extensions_test_update, \ sal \ salhelper \ test \ + tl \ unotest \ + vcl \ )) $(eval $(call gb_CppunitTest_use_library_objects,extensions_test_update, \ diff --git a/extensions/Library_res.mk b/extensions/Library_res.mk deleted file mode 100644 index 80505f471350..000000000000 --- a/extensions/Library_res.mk +++ /dev/null @@ -1,36 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# -# 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/. -# -# - -$(eval $(call gb_Library_Library,res)) - -$(eval $(call gb_Library_set_componentfile,res,extensions/source/resource/res)) - -$(eval $(call gb_Library_use_external,res,boost_headers)) - -$(eval $(call gb_Library_use_sdk_api,res)) - -$(eval $(call gb_Library_use_libraries,res,\ - vcl \ - i18nlangtag \ - tl \ - comphelper \ - cppu \ - cppuhelper \ - sal \ -)) - -$(eval $(call gb_Library_add_exception_objects,res,\ - extensions/source/resource/ResourceIndexAccess \ - extensions/source/resource/oooresourceloader \ - extensions/source/resource/resourceservices \ -)) - -# vim:set noet sw=4 ts=4: diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk index ef17a0ee3d85..94fbaf0eddb4 100644 --- a/extensions/Library_scn.mk +++ b/extensions/Library_scn.mk @@ -16,6 +16,11 @@ $(eval $(call gb_Library_use_externals,scn,\ sane_headers \ )) +$(eval $(call gb_Library_set_include,scn,\ + -I$(SRCDIR)/extensions/inc \ + $$(INCLUDE) \ +)) + $(eval $(call gb_Library_set_componentfile,scn,extensions/source/scanner/scn)) $(eval $(call gb_Library_use_sdk_api,scn)) diff --git a/extensions/Library_updchk.mk b/extensions/Library_updchk.mk index 7647805df5c8..27928d1c94e2 100644 --- a/extensions/Library_updchk.mk +++ b/extensions/Library_updchk.mk @@ -23,6 +23,8 @@ $(eval $(call gb_Library_use_libraries,updchk,\ cppu \ sal \ salhelper \ + tl \ + vcl \ )) ifeq ($(OS),WNT) diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index 6c4e877dad64..3ab21f58a411 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -9,16 +9,8 @@ $(eval $(call gb_Module_Module,extensions)) -$(eval $(call gb_Module_add_targets,extensions,\ - Library_res \ -)) - $(eval $(call gb_Module_add_l10n_targets,extensions,\ - AllLangResTarget_abp \ - AllLangResTarget_scn \ - AllLangResTarget_upd \ - UIConfig_sabpilot \ - UIConfig_scanner \ + AllLangMoTarget_pcr \ )) ifneq ($(filter-out IOS ANDROID,$(OS)),) @@ -27,6 +19,8 @@ $(eval $(call gb_Module_add_targets,extensions,\ Library_ldapbe2 \ Library_log \ Library_scn \ + UIConfig_sabpilot \ + UIConfig_scanner \ )) endif @@ -35,11 +29,6 @@ $(eval $(call gb_Module_add_targets,extensions,\ Library_bib \ Library_dbp \ Library_pcr \ -)) -$(eval $(call gb_Module_add_l10n_targets,extensions,\ - AllLangResTarget_bib \ - AllLangResTarget_dbp \ - AllLangResTarget_pcr \ UIConfig_sbibliography \ UIConfig_spropctrlr \ )) diff --git a/desktop/source/app/desktopresid.hxx b/extensions/inc/command.hrc similarity index 73% rename from desktop/source/app/desktopresid.hxx rename to extensions/inc/command.hrc index 43114219f626..be373257e202 100644 --- a/desktop/source/app/desktopresid.hxx +++ b/extensions/inc/command.hrc @@ -17,22 +17,22 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_APP_DESKTOPRESID_HXX -#define INCLUDED_DESKTOP_SOURCE_APP_DESKTOPRESID_HXX +#ifndef INCLUDED_EXTENSIONS_INC_COMMAND_HRC +#define INCLUDED_EXTENSIONS_INC_COMMAND_HRC -#include +#define NC_(Context, String) (Context "\004" u8##String) -namespace desktop +namespace { + +const char* RID_RSC_ENUM_COMMAND_TYPE[] = { - -class DesktopResId : public ResId -{ - public: - explicit DesktopResId( sal_uInt16 nId ); + NC_("RID_RSC_ENUM_COMMAND_TYPE", "Table"), + NC_("RID_RSC_ENUM_COMMAND_TYPE", "Query"), + NC_("RID_RSC_ENUM_COMMAND_TYPE", "SQL command") }; } -#endif // INCLUDED_DESKTOP_SOURCE_APP_DESKTOPRESID_HXX +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/sdbtools/inc/sdbt_services.hxx b/extensions/inc/showhide.hrc similarity index 76% rename from dbaccess/source/sdbtools/inc/sdbt_services.hxx rename to extensions/inc/showhide.hrc index a6491e2f5cfc..6081f7d5c39a 100644 --- a/dbaccess/source/sdbtools/inc/sdbt_services.hxx +++ b/extensions/inc/showhide.hrc @@ -17,14 +17,20 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DBACCESS_SOURCE_SDBTOOLS_INC_SDBT_SERVICES_HXX -#define INCLUDED_DBACCESS_SOURCE_SDBTOOLS_INC_SDBT_SERVICES_HXX +#ifndef INCLUDED_EXTENSIONS_INC_SHOWHIDE_HRC +#define INCLUDED_EXTENSIONS_INC_SHOWHIDE_HRC -#include +#define NC_(Context, String) (Context "\004" u8##String) -#include +namespace { -extern "C" void SAL_CALL createRegistryInfo_ConnectionTools(); +const char* RID_RSC_ENUM_SHOWHIDE[] = +{ + NC_("RID_RSC_ENUM_SHOWHIDE", "Hide"), + NC_("RID_RSC_ENUM_SHOWHIDE", "Show") +}; + +} #endif diff --git a/extensions/inc/stringarrays.hrc b/extensions/inc/stringarrays.hrc new file mode 100644 index 000000000000..bcf3137dd761 --- /dev/null +++ b/extensions/inc/stringarrays.hrc @@ -0,0 +1,263 @@ +/* -*- 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_EXTENSIONS_INC_STRINGARRAYS_HRC +#define INCLUDED_EXTENSIONS_INC_STRINGARRAYS_HRC + +#define NC_(Context, String) (Context "\004" u8##String) + +const char* RID_RSC_ENUM_VERTICAL_ALIGN[] = +{ + NC_("RID_RSC_ENUM_VERTICAL_ALIGN", "Top"), + NC_("RID_RSC_ENUM_VERTICAL_ALIGN", "Middle"), + NC_("RID_RSC_ENUM_VERTICAL_ALIGN", "Bottom") +}; + +const char* RID_RSC_ENUM_ICONSIZE_TYPE[] = +{ + NC_("RID_RSC_ENUM_ICONSIZE_TYPE", "Small"), + NC_("RID_RSC_ENUM_ICONSIZE_TYPE", "Large") +}; + +const char* RID_RSC_ENUM_BORDER_TYPE[] = +{ + NC_("RID_RSC_ENUM_BORDER_TYPE", "Without frame"), + NC_("RID_RSC_ENUM_BORDER_TYPE", "3D look"), + NC_("RID_RSC_ENUM_BORDER_TYPE", "Flat") +}; + +const char* RID_RSC_ENUM_LISTSOURCE_TYPE[] = +{ + NC_("RID_RSC_ENUM_LISTSOURCE_TYPE", "Valuelist"), + NC_("RID_RSC_ENUM_LISTSOURCE_TYPE", "Table"), + NC_("RID_RSC_ENUM_LISTSOURCE_TYPE", "Query"), + NC_("RID_RSC_ENUM_LISTSOURCE_TYPE", "Sql"), + NC_("RID_RSC_ENUM_LISTSOURCE_TYPE", "Sql [Native]"), + NC_("RID_RSC_ENUM_LISTSOURCE_TYPE", "Tablefields" ) +}; + +const char* RID_RSC_ENUM_ALIGNMENT[] = +{ + NC_("RID_RSC_ENUM_ALIGNMENT", "Left"), + NC_("RID_RSC_ENUM_ALIGNMENT", "Center"), + NC_("RID_RSC_ENUM_ALIGNMENT", "Right" ) +}; + +const char* RID_RSC_ENUM_BUTTONTYPE[] = +{ + NC_("RID_RSC_ENUM_BUTTONTYPE", "None"), + NC_("RID_RSC_ENUM_BUTTONTYPE", "Submit form"), + NC_("RID_RSC_ENUM_BUTTONTYPE", "Reset form"), + NC_("RID_RSC_ENUM_BUTTONTYPE", "Open document/web page"), + NC_("RID_RSC_ENUM_BUTTONTYPE", "First record"), + NC_("RID_RSC_ENUM_BUTTONTYPE", "Previous record"), + NC_("RID_RSC_ENUM_BUTTONTYPE", "Next record"), + NC_("RID_RSC_ENUM_BUTTONTYPE", "Last record"), + NC_("RID_RSC_ENUM_BUTTONTYPE", "Save record"), + NC_("RID_RSC_ENUM_BUTTONTYPE", "Undo data entry"), + NC_("RID_RSC_ENUM_BUTTONTYPE", "New record"), + NC_("RID_RSC_ENUM_BUTTONTYPE", "Delete record"), + NC_("RID_RSC_ENUM_BUTTONTYPE", "Refresh form") +}; + +const char* RID_RSC_ENUM_SUBMIT_METHOD[] = +{ + NC_("RID_RSC_ENUM_SUBMIT_METHOD", "Get"), + NC_("RID_RSC_ENUM_SUBMIT_METHOD", "Post" ) +}; + +const char* RID_RSC_ENUM_SUBMIT_ENCODING[] = +{ + NC_("RID_RSC_ENUM_SUBMIT_ENCODING", "URL"), + NC_("RID_RSC_ENUM_SUBMIT_ENCODING", "Multipart"), + NC_("RID_RSC_ENUM_SUBMIT_ENCODING", "Text" ) +}; + +const char* RID_RSC_ENUM_DATEFORMAT_LIST[] = +{ + NC_("RID_RSC_ENUM_DATEFORMAT_LIST", "Standard (short)"), + NC_("RID_RSC_ENUM_DATEFORMAT_LIST", "Standard (short YY)"), + NC_("RID_RSC_ENUM_DATEFORMAT_LIST", "Standard (short YYYY)"), + NC_("RID_RSC_ENUM_DATEFORMAT_LIST", "Standard (long)"), + NC_("RID_RSC_ENUM_DATEFORMAT_LIST", "DD/MM/YY"), + NC_("RID_RSC_ENUM_DATEFORMAT_LIST", "MM/DD/YY"), + NC_("RID_RSC_ENUM_DATEFORMAT_LIST", "YY/MM/DD"), + NC_("RID_RSC_ENUM_DATEFORMAT_LIST", "DD/MM/YYYY"), + NC_("RID_RSC_ENUM_DATEFORMAT_LIST", "MM/DD/YYYY"), + NC_("RID_RSC_ENUM_DATEFORMAT_LIST", "YYYY/MM/DD"), + NC_("RID_RSC_ENUM_DATEFORMAT_LIST", "YY-MM-DD"), + NC_("RID_RSC_ENUM_DATEFORMAT_LIST", "YYYY-MM-DD" ), +}; + +const char* RID_RSC_ENUM_TIMEFORMAT_LIST[] = +{ + NC_("RID_RSC_ENUM_TIMEFORMAT_LIST", "13:45"), + NC_("RID_RSC_ENUM_TIMEFORMAT_LIST", "13:45:00"), + NC_("RID_RSC_ENUM_TIMEFORMAT_LIST", "01:45 PM"), + NC_("RID_RSC_ENUM_TIMEFORMAT_LIST", "01:45:00 PM" ), +}; + +const char* RID_RSC_ENUM_CHECKED[] = +{ + NC_("RID_RSC_ENUM_CHECKED", "Not Selected"), + NC_("RID_RSC_ENUM_CHECKED", "Selected"), + NC_("RID_RSC_ENUM_CHECKED", "Not Defined" ) +}; + +const char* RID_RSC_ENUM_CYCLE[] = +{ + NC_("RID_RSC_ENUM_CYCLE", "All records"), + NC_("RID_RSC_ENUM_CYCLE", "Active record"), + NC_("RID_RSC_ENUM_CYCLE", "Current page" ) +}; + +const char* RID_RSC_ENUM_NAVIGATION[] = +{ + NC_("RID_RSC_ENUM_NAVIGATION", "No"), + NC_("RID_RSC_ENUM_NAVIGATION", "Yes"), + NC_("RID_RSC_ENUM_NAVIGATION", "Parent Form") +}; + +const char* RID_RSC_ENUM_SUBMIT_TARGET[] = +{ + NC_("RID_RSC_ENUM_SUBMIT_TARGET", "_blank"), + NC_("RID_RSC_ENUM_SUBMIT_TARGET", "_parent"), + NC_("RID_RSC_ENUM_SUBMIT_TARGET", "_self"), + NC_("RID_RSC_ENUM_SUBMIT_TARGET", "_top") +}; + +const char* RID_RSC_ENUM_SELECTION_TYPE[] = +{ + NC_("RID_RSC_ENUM_SELECTION_TYPE", "None" ), + NC_("RID_RSC_ENUM_SELECTION_TYPE", "Single" ), + NC_("RID_RSC_ENUM_SELECTION_TYPE", "Multi" ), + NC_("RID_RSC_ENUM_SELECTION_TYPE", "Range" ) +}; + +const char* RID_RSC_ENUM_ORIENTATION[] = +{ + NC_("RID_RSC_ENUM_ORIENTATION", "Horizontal"), + NC_("RID_RSC_ENUM_ORIENTATION", "Vertical") +}; + +const char* RID_RSC_ENUM_PUSHBUTTONTYPE[] = +{ + NC_("RID_RSC_ENUM_PUSHBUTTONTYPE", "Default"), + NC_("RID_RSC_ENUM_PUSHBUTTONTYPE", "OK"), + NC_("RID_RSC_ENUM_PUSHBUTTONTYPE", "Cancel"), + NC_("RID_RSC_ENUM_PUSHBUTTONTYPE", "Help") +}; + +const char* RID_RSC_ENUM_CELL_EXCHANGE_TYPE[] = +{ + NC_("RID_RSC_ENUM_CELL_EXCHANGE_TYPE", "The selected entry"), + NC_("RID_RSC_ENUM_CELL_EXCHANGE_TYPE", "Position of the selected entry") +}; + +const char* RID_RSC_ENUM_TEXTTYPE[] = +{ + NC_("RID_RSC_ENUM_TEXTTYPE", "Single-line"), + NC_("RID_RSC_ENUM_TEXTTYPE", "Multi-line"), + NC_("RID_RSC_ENUM_TEXTTYPE", "Multi-line with formatting") +}; + +const char* RID_RSC_ENUM_LINEEND_FORMAT[] = +{ + NC_("RID_RSC_ENUM_LINEEND_FORMAT", "LF (Unix)"), + NC_("RID_RSC_ENUM_LINEEND_FORMAT", "CR+LF (Windows)") +}; + +const char* RID_RSC_ENUM_SCROLLBARS[] = +{ + NC_("RID_RSC_ENUM_SCROLLBARS", "None"), + NC_("RID_RSC_ENUM_SCROLLBARS", "Horizontal"), + NC_("RID_RSC_ENUM_SCROLLBARS", "Vertical"), + NC_("RID_RSC_ENUM_SCROLLBARS", "Both") +}; + +const char* RID_RSC_ENUM_VISUALEFFECT[] = +{ + NC_("RID_RSC_ENUM_VISUALEFFECT", "3D"), + NC_("RID_RSC_ENUM_VISUALEFFECT", "Flat"), +}; + +const char* RID_RSC_ENUM_IMAGE_POSITION[] = +{ + NC_("RID_RSC_ENUM_IMAGE_POSITION", "Left top"), + NC_("RID_RSC_ENUM_IMAGE_POSITION", "Left centered"), + NC_("RID_RSC_ENUM_IMAGE_POSITION", "Left bottom"), + NC_("RID_RSC_ENUM_IMAGE_POSITION", "Right top"), + NC_("RID_RSC_ENUM_IMAGE_POSITION", "Right centered"), + NC_("RID_RSC_ENUM_IMAGE_POSITION", "Right bottom"), + NC_("RID_RSC_ENUM_IMAGE_POSITION", "Above left"), + NC_("RID_RSC_ENUM_IMAGE_POSITION", "Above centered"), + NC_("RID_RSC_ENUM_IMAGE_POSITION", "Above right"), + NC_("RID_RSC_ENUM_IMAGE_POSITION", "Below left"), + NC_("RID_RSC_ENUM_IMAGE_POSITION", "Below centered"), + NC_("RID_RSC_ENUM_IMAGE_POSITION", "Below right"), + NC_("RID_RSC_ENUM_IMAGE_POSITION", "Centered"), + nullptr, +}; + +const char* RID_RSC_ENUM_WHITESPACE_HANDLING[] = +{ + NC_("RID_RSC_ENUM_WHITESPACE_HANDLING", "Preserve"), + NC_("RID_RSC_ENUM_WHITESPACE_HANDLING", "Replace"), + NC_("RID_RSC_ENUM_WHITESPACE_HANDLING", "Collapse") +}; + +const char* RID_RSC_ENUM_SCALE_MODE[] = +{ + NC_("RID_RSC_ENUM_SCALE_MODE", "No"), + NC_("RID_RSC_ENUM_SCALE_MODE", "Keep Ratio"), + NC_("RID_RSC_ENUM_SCALE_MODE", "Fit to Size") +}; + +const char* RID_RSC_ENUM_WRITING_MODE[] = +{ + NC_("RID_RSC_ENUM_WRITING_MODE", "Left-to-right"), + NC_("RID_RSC_ENUM_WRITING_MODE", "Right-to-left"), + NC_("RID_RSC_ENUM_WRITING_MODE", "Use superordinate object settings") +}; + +const char* RID_RSC_ENUM_WHEEL_BEHAVIOR[] = +{ + NC_("RID_RSC_ENUM_WHEEL_BEHAVIOR", "Never"), + NC_("RID_RSC_ENUM_WHEEL_BEHAVIOR", "When focused"), + NC_("RID_RSC_ENUM_WHEEL_BEHAVIOR", "Always") +}; + +const char* RID_RSC_ENUM_TEXT_ANCHOR_TYPE[] = +{ + NC_("RID_RSC_ENUM_TEXT_ANCHOR_TYPE", "To Paragraph"), + NC_("RID_RSC_ENUM_TEXT_ANCHOR_TYPE", "As Character"), + NC_("RID_RSC_ENUM_TEXT_ANCHOR_TYPE", "To Page"), + NC_("RID_RSC_ENUM_TEXT_ANCHOR_TYPE", "To Frame"), + NC_("RID_RSC_ENUM_TEXT_ANCHOR_TYPE", "To Character") +}; + +const char* RID_RSC_ENUM_SHEET_ANCHOR_TYPE[] = +{ + NC_("RID_RSC_ENUM_SHEET_ANCHOR_TYPE", "To Page"), + NC_("RID_RSC_ENUM_SHEET_ANCHOR_TYPE", "To Cell") +}; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/inc/strings.hrc b/extensions/inc/strings.hrc new file mode 100644 index 000000000000..a30a4b3e8e62 --- /dev/null +++ b/extensions/inc/strings.hrc @@ -0,0 +1,402 @@ +/* -*- 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_EXTENSIONS_INC_STRINGS_HRC +#define INCLUDED_EXTENSIONS_INC_STRINGS_HRC + +#define NC_(Context, String) (Context "\004" u8##String) + +#define RID_STR_EDITMASK NC_("RID_STR_EDITMASK", "Edit mask") +#define RID_STR_LITERALMASK NC_("RID_STR_LITERALMASK", "Literal mask") +#define RID_STR_READONLY NC_("RID_STR_READONLY", "Read-only") +#define RID_STR_ENABLED NC_("RID_STR_ENABLED", "Enabled") +#define RID_STR_ENABLE_VISIBLE NC_("RID_STR_ENABLE_VISIBLE", "Visible") +#define RID_STR_AUTOCOMPLETE NC_("RID_STR_AUTOCOMPLETE", "AutoFill") +#define RID_STR_LINECOUNT NC_("RID_STR_LINECOUNT", "Line count") +#define RID_STR_MAXTEXTLEN NC_("RID_STR_MAXTEXTLEN", "Max. text length") +#define RID_STR_SPIN NC_("RID_STR_SPIN", "Spin Button") +#define RID_STR_STRICTFORMAT NC_("RID_STR_STRICTFORMAT", "Strict format") +#define RID_STR_SHOWTHOUSANDSEP NC_("RID_STR_SHOWTHOUSANDSEP", "Thousands separator") +#define RID_STR_PRINTABLE NC_("RID_STR_PRINTABLE", "Printable") +#define RID_STR_TARGET_URL NC_("RID_STR_TARGET_URL", "URL") +#define RID_STR_TARGET_FRAME NC_("RID_STR_TARGET_FRAME", "Frame") +#define RID_STR_HELPTEXT NC_("RID_STR_HELPTEXT", "Help text") +#define RID_STR_HELPURL NC_("RID_STR_HELPURL", "Help URL") +#define RID_STR_TAG NC_("RID_STR_TAG", "Additional information") +#define RID_STR_ECHO_CHAR NC_("RID_STR_ECHO_CHAR", "Password character") +#define RID_STR_TRISTATE NC_("RID_STR_TRISTATE", "Tristate") +#define RID_STR_EMPTY_IS_NULL NC_("RID_STR_EMPTY_IS_NULL", "Empty string is NULL") +#define RID_STR_DECIMAL_ACCURACY NC_("RID_STR_DECIMAL_ACCURACY", "Decimal accuracy") +#define RID_STR_IMAGE_URL NC_("RID_STR_IMAGE_URL", "Graphics") +#define RID_STR_DEFAULT_SELECT_SEQ NC_("RID_STR_DEFAULT_SELECT_SEQ", "Default selection") +#define RID_STR_DEFAULT_BUTTON NC_("RID_STR_DEFAULT_BUTTON", "Default button") +#define RID_STR_LABELCONTROL NC_("RID_STR_LABELCONTROL", "Label Field") +#define RID_STR_LABEL NC_("RID_STR_LABEL", "Label") +#define RID_STR_ALIGN NC_("RID_STR_ALIGN", "Alignment") +#define RID_STR_VERTICAL_ALIGN NC_("RID_STR_VERTICAL_ALIGN", "Vert. Alignment") +#define RID_STR_IMAGEPOSITION NC_("RID_STR_IMAGEPOSITION", "Graphics alignment") +#define RID_STR_FONT NC_("RID_STR_FONT", "Font") +#define RID_STR_BACKGROUNDCOLOR NC_("RID_STR_BACKGROUNDCOLOR", "Background color") +#define RID_STR_BORDER NC_("RID_STR_BORDER", "Border") +#define RID_STR_ICONSIZE NC_("RID_STR_ICONSIZE", "Icon size") +#define RID_STR_SHOW_POSITION NC_("RID_STR_SHOW_POSITION", "Positioning") +#define RID_STR_SHOW_NAVIGATION NC_("RID_STR_SHOW_NAVIGATION", "Navigation") +#define RID_STR_SHOW_RECORDACTIONS NC_("RID_STR_SHOW_RECORDACTIONS", "Acting on a record") +#define RID_STR_SHOW_FILTERSORT NC_("RID_STR_SHOW_FILTERSORT", "Filtering / Sorting") +#define RID_STR_HSCROLL NC_("RID_STR_HSCROLL", "Horizontal scroll bar") +#define RID_STR_VSCROLL NC_("RID_STR_VSCROLL", "Vertical scroll bar") +#define RID_STR_WORDBREAK NC_("RID_STR_WORDBREAK", "Word break") +#define RID_STR_MULTILINE NC_("RID_STR_MULTILINE", "Multiline input") +#define RID_STR_MULTISELECTION NC_("RID_STR_MULTISELECTION", "Multiselection") +#define RID_STR_NAME NC_("RID_STR_NAME", "Name") +#define RID_STR_GROUP_NAME NC_("RID_STR_GROUP_NAME", "Group name") +#define RID_STR_TABINDEX NC_("RID_STR_TABINDEX", "Tab order") +#define RID_STR_WHEEL_BEHAVIOR NC_("RID_STR_WHEEL_BEHAVIOR", "Mouse wheel scroll") +#define RID_STR_FILTER NC_("RID_STR_FILTER", "Filter") +#define RID_STR_SORT_CRITERIA NC_("RID_STR_SORT_CRITERIA", "Sort") +#define RID_STR_RECORDMARKER NC_("RID_STR_RECORDMARKER", "Record marker") +#define RID_STR_FILTERPROPOSAL NC_("RID_STR_FILTERPROPOSAL", "Filter proposal") +#define RID_STR_NAVIGATION NC_("RID_STR_NAVIGATION", "Navigation bar") +#define RID_STR_CYCLE NC_("RID_STR_CYCLE", "Cycle") +#define RID_STR_TABSTOP NC_("RID_STR_TABSTOP", "Tabstop") +#define RID_STR_CONTROLSOURCE NC_("RID_STR_CONTROLSOURCE", "Data field") +#define RID_STR_DROPDOWN NC_("RID_STR_DROPDOWN", "Dropdown") +#define RID_STR_BOUNDCOLUMN NC_("RID_STR_BOUNDCOLUMN", "Bound field") +#define RID_STR_LISTSOURCE NC_("RID_STR_LISTSOURCE", "List content") +#define RID_STR_LISTSOURCETYPE NC_("RID_STR_LISTSOURCETYPE", "Type of list contents") +#define RID_STR_CURSORSOURCE NC_("RID_STR_CURSORSOURCE", "Content") +#define RID_STR_CURSORSOURCETYPE NC_("RID_STR_CURSORSOURCETYPE", "Content type") +#define RID_STR_ALLOW_ADDITIONS NC_("RID_STR_ALLOW_ADDITIONS", "Allow additions") +#define RID_STR_ALLOW_DELETIONS NC_("RID_STR_ALLOW_DELETIONS", "Allow deletions") +#define RID_STR_ALLOW_EDITS NC_("RID_STR_ALLOW_EDITS", "Allow modifications") +#define RID_STR_DATAENTRY NC_("RID_STR_DATAENTRY", "Add data only") +#define RID_STR_DATASOURCE NC_("RID_STR_DATASOURCE", "Data source") +#define RID_STR_MASTERFIELDS NC_("RID_STR_MASTERFIELDS", "Link master fields") +#define RID_STR_SLAVEFIELDS NC_("RID_STR_SLAVEFIELDS", "Link slave fields") +#define RID_STR_VALUEMIN NC_("RID_STR_VALUEMIN", "Value min.") +#define RID_STR_VALUEMAX NC_("RID_STR_VALUEMAX", "Value max.") +#define RID_STR_VALUESTEP NC_("RID_STR_VALUESTEP", "Incr./decrement value") +#define RID_STR_CURRENCYSYMBOL NC_("RID_STR_CURRENCYSYMBOL", "Currency symbol") +#define RID_STR_DATEMIN NC_("RID_STR_DATEMIN", "Date min.") +#define RID_STR_DATEMAX NC_("RID_STR_DATEMAX", "Date max.") +#define RID_STR_DATEFORMAT NC_("RID_STR_DATEFORMAT", "Date format") +#define RID_STR_SELECTEDITEMS NC_("RID_STR_SELECTEDITEMS", "Selection") +#define RID_STR_TIMEMIN NC_("RID_STR_TIMEMIN", "Time min.") +#define RID_STR_TIMEMAX NC_("RID_STR_TIMEMAX", "Time max.") +#define RID_STR_TIMEFORMAT NC_("RID_STR_TIMEFORMAT", "Time format") +#define RID_STR_CURRSYM_POSITION NC_("RID_STR_CURRSYM_POSITION", "Prefix symbol") +#define RID_STR_VALUE NC_("RID_STR_VALUE", "Value") +#define RID_STR_FORMATKEY NC_("RID_STR_FORMATKEY", "Formatting") +#define RID_STR_CLASSID NC_("RID_STR_CLASSID", "Class ID") +#define RID_STR_HEIGHT NC_("RID_STR_HEIGHT", "Height") +#define RID_STR_WIDTH NC_("RID_STR_WIDTH", "Width") +#define RID_STR_LISTINDEX NC_("RID_STR_LISTINDEX", "List index") +#define RID_STR_ROWHEIGHT NC_("RID_STR_ROWHEIGHT", "Row height") +#define RID_STR_FILLCOLOR NC_("RID_STR_FILLCOLOR", "Fill color") +#define RID_STR_LINECOLOR NC_("RID_STR_LINECOLOR", "Line color") +#define RID_STR_REFVALUE NC_("RID_STR_REFVALUE", "Reference value (on)") +#define RID_STR_UNCHECKEDREFVALUE NC_("RID_STR_UNCHECKEDREFVALUE", "Reference value (off)") +#define RID_STR_STRINGITEMLIST NC_("RID_STR_STRINGITEMLIST", "List entries") +#define RID_STR_BUTTONTYPE NC_("RID_STR_BUTTONTYPE", "Action") +#define RID_STR_SUBMIT_ACTION NC_("RID_STR_SUBMIT_ACTION", "URL") +#define RID_STR_SUBMIT_METHOD NC_("RID_STR_SUBMIT_METHOD", "Type of submission") +#define RID_STR_DEFAULT_STATE NC_("RID_STR_DEFAULT_STATE", "Default status") +#define RID_STR_SUBMIT_ENCODING NC_("RID_STR_SUBMIT_ENCODING", "Submission encoding") +#define RID_STR_DEFAULTVALUE NC_("RID_STR_DEFAULTVALUE", "Default value") +#define RID_STR_DEFAULTTEXT NC_("RID_STR_DEFAULTTEXT", "Default text") +#define RID_STR_DEFAULTDATE NC_("RID_STR_DEFAULTDATE", "Default date") +#define RID_STR_DEFAULTTIME NC_("RID_STR_DEFAULTTIME", "Default time") +#define RID_STR_SUBMIT_TARGET NC_("RID_STR_SUBMIT_TARGET", "Frame") +#define RID_STR_EVT_APPROVEPARAMETER NC_("RID_STR_EVT_APPROVEPARAMETER", "Fill parameters") +#define RID_STR_EVT_ACTIONPERFORMED NC_("RID_STR_EVT_ACTIONPERFORMED", "Execute action") +#define RID_STR_EVT_AFTERUPDATE NC_("RID_STR_EVT_AFTERUPDATE", "After updating") +#define RID_STR_EVT_BEFOREUPDATE NC_("RID_STR_EVT_BEFOREUPDATE", "Before updating") +#define RID_STR_EVT_APPROVEROWCHANGE NC_("RID_STR_EVT_APPROVEROWCHANGE", "Before record action") +#define RID_STR_EVT_ROWCHANGE NC_("RID_STR_EVT_ROWCHANGE", "After record action") +#define RID_STR_EVT_CONFIRMDELETE NC_("RID_STR_EVT_CONFIRMDELETE", "Confirm deletion") +#define RID_STR_EVT_ERROROCCURRED NC_("RID_STR_EVT_ERROROCCURRED", "Error occurred") +#define RID_STR_EVT_FOCUSGAINED NC_("RID_STR_EVT_FOCUSGAINED", "When receiving focus") +#define RID_STR_EVT_FOCUSLOST NC_("RID_STR_EVT_FOCUSLOST", "When losing focus") +#define RID_STR_EVT_ITEMSTATECHANGED NC_("RID_STR_EVT_ITEMSTATECHANGED", "Item status changed") +#define RID_STR_EVT_KEYTYPED NC_("RID_STR_EVT_KEYTYPED", "Key pressed") +#define RID_STR_EVT_KEYUP NC_("RID_STR_EVT_KEYUP", "Key released") +#define RID_STR_EVT_LOADED NC_("RID_STR_EVT_LOADED", "When loading") +#define RID_STR_EVT_RELOADING NC_("RID_STR_EVT_RELOADING", "Before reloading") +#define RID_STR_EVT_RELOADED NC_("RID_STR_EVT_RELOADED", "When reloading") +#define RID_STR_EVT_MOUSEDRAGGED NC_("RID_STR_EVT_MOUSEDRAGGED", "Mouse moved while key pressed") +#define RID_STR_EVT_MOUSEENTERED NC_("RID_STR_EVT_MOUSEENTERED", "Mouse inside") +#define RID_STR_EVT_MOUSEEXITED NC_("RID_STR_EVT_MOUSEEXITED", "Mouse outside") +#define RID_STR_EVT_MOUSEMOVED NC_("RID_STR_EVT_MOUSEMOVED", "Mouse moved") +#define RID_STR_EVT_MOUSEPRESSED NC_("RID_STR_EVT_MOUSEPRESSED", "Mouse button pressed") +#define RID_STR_EVT_MOUSERELEASED NC_("RID_STR_EVT_MOUSERELEASED", "Mouse button released") +#define RID_STR_EVT_POSITIONING NC_("RID_STR_EVT_POSITIONING", "Before record change") +#define RID_STR_EVT_POSITIONED NC_("RID_STR_EVT_POSITIONED", "After record change") +#define RID_STR_EVT_RESETTED NC_("RID_STR_EVT_RESETTED", "After resetting") +#define RID_STR_EVT_APPROVERESETTED NC_("RID_STR_EVT_APPROVERESETTED", "Prior to reset") +#define RID_STR_EVT_APPROVEACTIONPERFORMED NC_("RID_STR_EVT_APPROVEACTIONPERFORMED", "Approve action") +#define RID_STR_EVT_SUBMITTED NC_("RID_STR_EVT_SUBMITTED", "Before submitting") +#define RID_STR_EVT_TEXTCHANGED NC_("RID_STR_EVT_TEXTCHANGED", "Text modified") +#define RID_STR_EVT_UNLOADING NC_("RID_STR_EVT_UNLOADING", "Before unloading") +#define RID_STR_EVT_UNLOADED NC_("RID_STR_EVT_UNLOADED", "When unloading") +#define RID_STR_EVT_CHANGED NC_("RID_STR_EVT_CHANGED", "Changed") +#define RID_STR_EVENTS NC_("RID_STR_EVENTS", "Events") +#define RID_STR_ESCAPE_PROCESSING NC_("RID_STR_ESCAPE_PROCESSING", "Analyze SQL command") +#define RID_STR_POSITIONX NC_("RID_STR_POSITIONX", "PositionX") +#define RID_STR_POSITIONY NC_("RID_STR_POSITIONY", "PositionY") +#define RID_STR_TITLE NC_("RID_STR_TITLE", "Title") +#define RID_STR_STEP NC_("RID_STR_STEP", "Page (step)") +#define RID_STR_PROGRESSVALUE NC_("RID_STR_PROGRESSVALUE", "Progress value") +#define RID_STR_PROGRESSVALUE_MIN NC_("RID_STR_PROGRESSVALUE_MIN", "Progress value min.") +#define RID_STR_PROGRESSVALUE_MAX NC_("RID_STR_PROGRESSVALUE_MAX", "Progress value max.") +#define RID_STR_SCROLLVALUE NC_("RID_STR_SCROLLVALUE", "Scroll value") +#define RID_STR_SCROLLVALUE_MAX NC_("RID_STR_SCROLLVALUE_MAX", "Scroll value max.") +#define RID_STR_SCROLLVALUE_MIN NC_("RID_STR_SCROLLVALUE_MIN", "Scroll value min.") +#define RID_STR_SCROLL_WIDTH NC_("RID_STR_SCROLL_WIDTH", "Scroll width") +#define RID_STR_SCROLL_HEIGHT NC_("RID_STR_SCROLL_HEIGHT", "Scroll height") +#define RID_STR_SCROLL_TOP NC_("RID_STR_SCROLL_TOP", "Scroll top") +#define RID_STR_SCROLL_LEFT NC_("RID_STR_SCROLL_LEFT", "Scroll left") +#define RID_STR_DEFAULT_SCROLLVALUE NC_("RID_STR_DEFAULT_SCROLLVALUE", "Default scroll value") +#define RID_STR_LINEINCREMENT NC_("RID_STR_LINEINCREMENT", "Small change") +#define RID_STR_BLOCKINCREMENT NC_("RID_STR_BLOCKINCREMENT", "Large change") +#define RID_STR_REPEAT_DELAY NC_("RID_STR_REPEAT_DELAY", "Delay") +#define RID_STR_REPEAT NC_("RID_STR_REPEAT", "Repeat") +#define RID_STR_VISIBLESIZE NC_("RID_STR_VISIBLESIZE", "Visible size") +#define RID_STR_ORIENTATION NC_("RID_STR_ORIENTATION", "Orientation") +#define RID_STR_EVT_ADJUSTMENTVALUECHANGED NC_("RID_STR_EVT_ADJUSTMENTVALUECHANGED", "While adjusting") +#define RID_STR_DATE NC_("RID_STR_DATE", "Date") +#define RID_STR_STATE NC_("RID_STR_STATE", "State") +#define RID_STR_TIME NC_("RID_STR_TIME", "Time") +#define RID_STR_SCALEIMAGE NC_("RID_STR_SCALEIMAGE", "Scale") +#define RID_STR_PUSHBUTTONTYPE NC_("RID_STR_PUSHBUTTONTYPE", "Button type") +#define RID_STR_UNABLETOCONNECT NC_("RID_STR_UNABLETOCONNECT", "The connection to the data source \"$name$\" could not be established.") +#define RID_STR_TEXT NC_("RID_STR_TEXT", "Text") +#define RID_STR_BOUND_CELL NC_("RID_STR_BOUND_CELL", "Linked cell") +#define RID_STR_LIST_CELL_RANGE NC_("RID_STR_LIST_CELL_RANGE", "Source cell range") +#define RID_STR_CELL_EXCHANGE_TYPE NC_("RID_STR_CELL_EXCHANGE_TYPE", "Contents of the linked cell") +#define RID_STR_SYMBOLCOLOR NC_("RID_STR_SYMBOLCOLOR", "Symbol color") +#define RID_STR_LINEEND_FORMAT NC_("RID_STR_LINEEND_FORMAT", "Text lines end with") +#define RID_STR_TOGGLE NC_("RID_STR_TOGGLE", "Toggle") +#define RID_STR_FOCUSONCLICK NC_("RID_STR_FOCUSONCLICK", "Take Focus on Click") +#define RID_STR_HIDEINACTIVESELECTION NC_("RID_STR_HIDEINACTIVESELECTION", "Hide selection") +#define RID_STR_VISUALEFFECT NC_("RID_STR_VISUALEFFECT", "Style") +#define RID_STR_AUTOLINEBREAK NC_("RID_STR_AUTOLINEBREAK", "Wrap text automatically") +#define RID_STR_TEXTTYPE NC_("RID_STR_TEXTTYPE", "Text type") +#define RID_STR_XML_DATA_MODEL NC_("RID_STR_XML_DATA_MODEL", "XML data model") +#define RID_STR_BIND_EXPRESSION NC_("RID_STR_BIND_EXPRESSION", "Binding expression") +#define RID_STR_XSD_REQUIRED NC_("RID_STR_XSD_REQUIRED", "Required") +#define RID_STR_LIST_BINDING NC_("RID_STR_LIST_BINDING", "List entry source") +#define RID_STR_XSD_RELEVANT NC_("RID_STR_XSD_RELEVANT", "Relevant") +#define RID_STR_XSD_READONLY NC_("RID_STR_XSD_READONLY", "Read-only") +#define RID_STR_XSD_CONSTRAINT NC_("RID_STR_XSD_CONSTRAINT", "Constraint") +#define RID_STR_XSD_CALCULATION NC_("RID_STR_XSD_CALCULATION", "Calculation") +#define RID_STR_XSD_DATA_TYPE NC_("RID_STR_XSD_DATA_TYPE", "Data type") +#define RID_STR_XSD_WHITESPACES NC_("RID_STR_XSD_WHITESPACES", "Whitespaces") +#define RID_STR_SHOW_SCROLLBARS NC_("RID_STR_SHOW_SCROLLBARS", "Scrollbars") +#define RID_STR_XSD_PATTERN NC_("RID_STR_XSD_PATTERN", "Pattern") +#define RID_STR_XSD_LENGTH NC_("RID_STR_XSD_LENGTH", "Length") +#define RID_STR_XSD_MIN_LENGTH NC_("RID_STR_XSD_MIN_LENGTH", "Length (at least)") +#define RID_STR_XSD_MAX_LENGTH NC_("RID_STR_XSD_MAX_LENGTH", "Length (at most)") +#define RID_STR_XSD_TOTAL_DIGITS NC_("RID_STR_XSD_TOTAL_DIGITS", "Digits (total)") +#define RID_STR_XSD_FRACTION_DIGITS NC_("RID_STR_XSD_FRACTION_DIGITS", "Digits (fraction)") +#define RID_STR_XSD_MAX_INCLUSIVE NC_("RID_STR_XSD_MAX_INCLUSIVE", "Max. (inclusive)") +#define RID_STR_XSD_MAX_EXCLUSIVE NC_("RID_STR_XSD_MAX_EXCLUSIVE", "Max. (exclusive)") +#define RID_STR_XSD_MIN_INCLUSIVE NC_("RID_STR_XSD_MIN_INCLUSIVE", "Min. (inclusive)") +#define RID_STR_XSD_MIN_EXCLUSIVE NC_("RID_STR_XSD_MIN_EXCLUSIVE", "Min. (exclusive)") +#define RID_STR_SUBMISSION_ID NC_("RID_STR_SUBMISSION_ID", "Submission") +#define RID_STR_BINDING_NAME NC_("RID_STR_BINDING_NAME", "Binding") +#define RID_STR_SELECTION_TYPE NC_("RID_STR_SELECTION_TYPE", "Selection type") +#define RID_STR_ROOT_DISPLAYED NC_("RID_STR_ROOT_DISPLAYED", "Root displayed") +#define RID_STR_SHOWS_HANDLES NC_("RID_STR_SHOWS_HANDLES", "Show handles") +#define RID_STR_SHOWS_ROOT_HANDLES NC_("RID_STR_SHOWS_ROOT_HANDLES", "Show root handles") +#define RID_STR_EDITABLE NC_("RID_STR_EDITABLE", "Editable") +#define RID_STR_INVOKES_STOP_NOT_EDITING NC_("RID_STR_INVOKES_STOP_NOT_EDITING", "Invokes stop node editing") +#define RID_STR_DECORATION NC_("RID_STR_DECORATION", "With title bar") +#define RID_STR_NOLABEL NC_("RID_STR_NOLABEL", "No Label") +#define RID_STR_BORDERCOLOR NC_("RID_STR_BORDERCOLOR", "Border color") +#define RID_STR_INPUT_REQUIRED NC_("RID_STR_INPUT_REQUIRED", "Input required") +#define RID_STR_WRITING_MODE NC_("RID_STR_WRITING_MODE", "Text direction") +#define RID_STR_ANCHOR_TYPE NC_("RID_STR_ANCHOR_TYPE", "Anchor") +// To translators: That's the 'Regular' as used for a font style (as opposed to 'italic' and 'bold'), so please use a consistent translation. +#define RID_STR_FONTSTYLE_REGULAR NC_("RID_STR_FONTSTYLE_REGULAR", "Regular") +// To translators: That's the 'Bold Italic' as used for a font style, so please use a consistent translation. +#define RID_STR_FONTSTYLE_BOLD_ITALIC NC_("RID_STR_FONTSTYLE_BOLD_ITALIC", "Bold Italic") +// To translators: That's the 'Italic' as used for a font style, so please use a consistent translation. +#define RID_STR_FONTSTYLE_ITALIC NC_("RID_STR_FONTSTYLE_ITALIC", "Italic") +// To translators: That's the 'Bold' as used for a font style, so please use a consistent translation." +#define RID_STR_FONTSTYLE_BOLD NC_("RID_STR_FONTSTYLE_BOLD", "Bold") +#define RID_STR_FONT_DEFAULT NC_("RID_STR_FONT_DEFAULT", "(Default)") + +#define RID_STR_STANDARD NC_("RID_STR_STANDARD", "Default") +#define RID_STR_PROPPAGE_DEFAULT NC_("RID_STR_PROPPAGE_DEFAULT", "General") +#define RID_STR_PROPPAGE_DATA NC_("RID_STR_PROPPAGE_DATA", "Data") +#define RID_STR_HELP_SECTION_LABEL NC_("RID_STR_HELP_SECTION_LABEL", "Help") +#define RID_EMBED_IMAGE_PLACEHOLDER NC_("RID_EMBED_IMAGE_PLACEHOLDER", "") +#define RID_STR_TEXT_FORMAT NC_("RID_STR_TEXT_FORMAT", "Text") + +#define RID_STR_CONFIRM_DELETE_DATA_TYPE NC_("RID_STR_CONFIRM_DELETE_DATA_TYPE", "Do you want to delete the data type '#type#' from the model?\n" \ + "Please note that this will affect all controls which are bound to this data type.") +#define RID_STR_PROPTITLE_PUSHBUTTON NC_("RID_STR_PROPTITLE_PUSHBUTTON", "Button") +#define RID_STR_PROPTITLE_RADIOBUTTON NC_("RID_STR_PROPTITLE_RADIOBUTTON", "Option Button") +#define RID_STR_PROPTITLE_CHECKBOX NC_("RID_STR_PROPTITLE_CHECKBOX", "Check Box") +#define RID_STR_PROPTITLE_FIXEDTEXT NC_("RID_STR_PROPTITLE_FIXEDTEXT", "Label Field") +#define RID_STR_PROPTITLE_GROUPBOX NC_("RID_STR_PROPTITLE_GROUPBOX", "Group Box") +#define RID_STR_PROPTITLE_EDIT NC_("RID_STR_PROPTITLE_EDIT", "Text Box") +#define RID_STR_PROPTITLE_FORMATTED NC_("RID_STR_PROPTITLE_FORMATTED", "Formatted Field") +#define RID_STR_PROPTITLE_LISTBOX NC_("RID_STR_PROPTITLE_LISTBOX", "List Box") +#define RID_STR_PROPTITLE_COMBOBOX NC_("RID_STR_PROPTITLE_COMBOBOX", "Combo Box") +#define RID_STR_PROPTITLE_IMAGEBUTTON NC_("RID_STR_PROPTITLE_IMAGEBUTTON", "Image Button") +#define RID_STR_PROPTITLE_HIDDENCONTROL NC_("RID_STR_PROPTITLE_HIDDENCONTROL", "Hidden Control") +#define RID_STR_PROPTITLE_UNKNOWNCONTROL NC_("RID_STR_PROPTITLE_UNKNOWNCONTROL", "Control (unknown type)") +#define RID_STR_PROPTITLE_IMAGECONTROL NC_("RID_STR_PROPTITLE_IMAGECONTROL", "Image Control") +#define RID_STR_PROPTITLE_FILECONTROL NC_("RID_STR_PROPTITLE_FILECONTROL", "File Selection") +#define RID_STR_PROPTITLE_DATEFIELD NC_("RID_STR_PROPTITLE_DATEFIELD", "Date Field") +#define RID_STR_PROPTITLE_TIMEFIELD NC_("RID_STR_PROPTITLE_TIMEFIELD", "Time Field") +#define RID_STR_PROPTITLE_NUMERICFIELD NC_("RID_STR_PROPTITLE_NUMERICFIELD", "Numeric Field") +#define RID_STR_PROPTITLE_CURRENCYFIELD NC_("RID_STR_PROPTITLE_CURRENCYFIELD", "Currency Field") +#define RID_STR_PROPTITLE_PATTERNFIELD NC_("RID_STR_PROPTITLE_PATTERNFIELD", "Pattern Field") +#define RID_STR_PROPTITLE_DBGRID NC_("RID_STR_PROPTITLE_DBGRID", "Table Control ") + +#define STR_DETAIL_FORM NC_("STR_DETAIL_FORM", "Sub Form") +#define STR_MASTER_FORM NC_("STR_MASTER_FORM", "Master Form") +// To translators: # will be replace with a name. +#define STR_ERROR_RETRIEVING_COLUMNS NC_("STR_ERROR_RETRIEVING_COLUMNS", "The columns of '#' could not be retrieved.") + +#define RID_STR_FORMS NC_("RID_STR_FORMS", "Forms") + +#define RID_UPDATE_STR_CHECKING NC_("RID_UPDATE_STR_CHECKING", "Checking...") +#define RID_UPDATE_STR_CHECKING_ERR NC_("RID_UPDATE_STR_CHECKING_ERR", "Checking for an update failed.") +#define RID_UPDATE_STR_NO_UPD_FOUND NC_("RID_UPDATE_STR_NO_UPD_FOUND", "%PRODUCTNAME %PRODUCTVERSION is up to date.") +#define RID_UPDATE_STR_UPD_FOUND NC_("RID_UPDATE_STR_UPD_FOUND", "%PRODUCTNAME %NEXTVERSION is available.\n\nThe installed version is %PRODUCTNAME %PRODUCTVERSION.\n\nNote: Before downloading an update, please ensure that you have sufficient access rights to install it.\nA password, usually the administrator's or root password, may be required.") +#define RID_UPDATE_STR_DLG_TITLE NC_("RID_UPDATE_STR_DLG_TITLE", "Check for Updates") +#define RID_UPDATE_STR_DOWNLOAD_PAUSE NC_("RID_UPDATE_STR_DOWNLOAD_PAUSE", "Downloading %PRODUCTNAME %NEXTVERSION paused at...") +#define RID_UPDATE_STR_DOWNLOAD_ERR NC_("RID_UPDATE_STR_DOWNLOAD_ERR", "Downloading %PRODUCTNAME %NEXTVERSION stalled at") +#define RID_UPDATE_STR_DOWNLOAD_WARN NC_("RID_UPDATE_STR_DOWNLOAD_WARN", "The download location is: %DOWNLOAD_PATH.\n\nUnder Tools – Options... - %PRODUCTNAME – Online Update you can change the download location.") +#define RID_UPDATE_STR_DOWNLOAD_DESCR NC_("RID_UPDATE_STR_DOWNLOAD_DESCR", "%FILE_NAME has been downloaded to %DOWNLOAD_PATH.") +#define RID_UPDATE_STR_DOWNLOAD_UNAVAIL NC_("RID_UPDATE_STR_DOWNLOAD_UNAVAIL", "The automatic download of the update is currently not available.\n\nClick 'Download...' to download %PRODUCTNAME %NEXTVERSION manually from the web site.") +#define RID_UPDATE_STR_DOWNLOADING NC_("RID_UPDATE_STR_DOWNLOADING", "Downloading %PRODUCTNAME %NEXTVERSION...") +#define RID_UPDATE_STR_READY_INSTALL NC_("RID_UPDATE_STR_READY_INSTALL", "Download of %PRODUCTNAME %NEXTVERSION completed. Ready for installation.") +#define RID_UPDATE_STR_CANCEL_TITLE NC_("RID_UPDATE_STR_CANCEL_TITLE", "%PRODUCTNAME %PRODUCTVERSION") +#define RID_UPDATE_STR_CANCEL_DOWNLOAD NC_("RID_UPDATE_STR_CANCEL_DOWNLOAD", "Do you really want to cancel the download?") +#define RID_UPDATE_STR_BEGIN_INSTALL NC_("RID_UPDATE_STR_BEGIN_INSTALL", "To install the update, %PRODUCTNAME %PRODUCTVERSION needs to be closed. Do you want to install the update now?") +#define RID_UPDATE_STR_INSTALL_NOW NC_("RID_UPDATE_STR_INSTALL_NOW", "Install ~now") +#define RID_UPDATE_STR_INSTALL_LATER NC_("RID_UPDATE_STR_INSTALL_LATER", "Install ~later") +#define RID_UPDATE_STR_INSTALL_ERROR NC_("RID_UPDATE_STR_INSTALL_ERROR", "Could not run the installer application, please run %FILE_NAME in %DOWNLOAD_PATH manually.") +#define RID_UPDATE_STR_OVERWRITE_WARNING NC_("RID_UPDATE_STR_OVERWRITE_WARNING", "A file with that name already exists! Do you want to overwrite the existing file?") +#define RID_UPDATE_STR_RELOAD_WARNING NC_("RID_UPDATE_STR_RELOAD_WARNING", "A file with the name '%FILENAME' already exists in '%DOWNLOAD_PATH'! Do you want to continue with the download or delete and reload the file?") +#define RID_UPDATE_STR_RELOAD_RELOAD NC_("RID_UPDATE_STR_RELOAD_RELOAD", "Reload File") +#define RID_UPDATE_STR_RELOAD_CONTINUE NC_("RID_UPDATE_STR_RELOAD_CONTINUE", "Continue") +#define RID_UPDATE_STR_PERCENT NC_("RID_UPDATE_STR_PERCENT", "%PERCENT%") +#define RID_UPDATE_FT_STATUS NC_("RID_UPDATE_FT_STATUS", "Status") +#define RID_UPDATE_FT_DESCRIPTION NC_("RID_UPDATE_FT_DESCRIPTION", "Description") +#define RID_UPDATE_BTN_CLOSE NC_("RID_UPDATE_BTN_CLOSE", "Close") +#define RID_UPDATE_BTN_DOWNLOAD NC_("RID_UPDATE_BTN_DOWNLOAD", "~Download") +#define RID_UPDATE_BTN_INSTALL NC_("RID_UPDATE_BTN_INSTALL", "~Install") +#define RID_UPDATE_BTN_PAUSE NC_("RID_UPDATE_BTN_PAUSE", "~Pause") +#define RID_UPDATE_BTN_RESUME NC_("RID_UPDATE_BTN_RESUME", "~Resume") +#define RID_UPDATE_BTN_CANCEL NC_("RID_UPDATE_BTN_CANCEL", "Cancel") +#define RID_UPDATE_BUBBLE_T_UPDATE_AVAIL NC_("RID_UPDATE_BUBBLE_T_UPDATE_AVAIL", "%PRODUCTNAME update available") +#define RID_UPDATE_BUBBLE_UPDATE_AVAIL NC_("RID_UPDATE_BUBBLE_UPDATE_AVAIL", "Click the icon to start the download.") +#define RID_UPDATE_BUBBLE_T_UPDATE_NO_DOWN NC_("RID_UPDATE_BUBBLE_T_UPDATE_NO_DOWN", "%PRODUCTNAME update available") +#define RID_UPDATE_BUBBLE_UPDATE_NO_DOWN NC_("RID_UPDATE_BUBBLE_UPDATE_NO_DOWN", "Click the icon for more information.") +#define RID_UPDATE_BUBBLE_T_AUTO_START NC_("RID_UPDATE_BUBBLE_T_AUTO_START", "%PRODUCTNAME update available") +#define RID_UPDATE_BUBBLE_AUTO_START NC_("RID_UPDATE_BUBBLE_AUTO_START", "Download of update begins.") +#define RID_UPDATE_BUBBLE_T_DOWNLOADING NC_("RID_UPDATE_BUBBLE_T_DOWNLOADING", "Download of update in progress") +#define RID_UPDATE_BUBBLE_DOWNLOADING NC_("RID_UPDATE_BUBBLE_DOWNLOADING", "") +#define RID_UPDATE_BUBBLE_T_DOWNLOAD_PAUSED NC_("RID_UPDATE_BUBBLE_T_DOWNLOAD_PAUSED", "Download of update paused") +#define RID_UPDATE_BUBBLE_DOWNLOAD_PAUSED NC_("RID_UPDATE_BUBBLE_DOWNLOAD_PAUSED", "Click the icon to resume.") +#define RID_UPDATE_BUBBLE_T_ERROR_DOWNLOADING NC_("RID_UPDATE_BUBBLE_T_ERROR_DOWNLOADING", "Download of update stalled") +#define RID_UPDATE_BUBBLE_ERROR_DOWNLOADING NC_("RID_UPDATE_BUBBLE_ERROR_DOWNLOADING", "Click the icon for more information.") +#define RID_UPDATE_BUBBLE_T_DOWNLOAD_AVAIL NC_("RID_UPDATE_BUBBLE_T_DOWNLOAD_AVAIL", "Download of update completed") +#define RID_UPDATE_BUBBLE_DOWNLOAD_AVAIL NC_("RID_UPDATE_BUBBLE_DOWNLOAD_AVAIL", "Click the icon to start the installation.") +#define RID_UPDATE_BUBBLE_T_EXT_UPD_AVAIL NC_("RID_UPDATE_BUBBLE_T_EXT_UPD_AVAIL", "Updates for extensions available") +#define RID_UPDATE_BUBBLE_EXT_UPD_AVAIL NC_("RID_UPDATE_BUBBLE_EXT_UPD_AVAIL", "Click the icon for more information.") + +#define STR_COULD_NOT_BE_INIT NC_("STR_COULD_NOT_BE_INIT", "The SANE interface could not be initialized. Scanning is not possible.") +#define STR_SLOW_PREVIEW NC_("STR_SLOW_PREVIEW", "The device does not offer a preview option. Therefore, a normal scan will be used as a preview instead. This may take a considerable amount of time.") +#define STR_ERROR_SCAN NC_("STR_ERROR_SCAN", "An error occurred while scanning.") +#define STR_DEVICE_DESC NC_("STR_DEVICE_DESC", "Device: %s\nVendor: %s\nModel: %s\nType: %s") + +#define RID_BIB_STR_FRAME_TITLE NC_("RID_BIB_STR_FRAME_TITLE", "Bibliography Database") +#define RID_MAP_QUESTION NC_("RID_MAP_QUESTION", "Do you want to edit the column arrangement?") +#define RID_BIB_STR_NONE NC_("RID_BIB_STR_NONE", "") + +#define ST_ERROR_PREFIX NC_("ST_ERROR_PREFIX", "The following column names could not be assigned:\n") +#define ST_TYPE_ARTICLE NC_("ST_TYPE_ARTICLE", "Article") +#define ST_TYPE_BOOK NC_("ST_TYPE_BOOK", "Book") +#define ST_TYPE_BOOKLET NC_("ST_TYPE_BOOKLET", "Brochures") +#define ST_TYPE_CONFERENCE NC_("ST_TYPE_CONFERENCE", "Conference proceedings article (BiBTeX)") +#define ST_TYPE_INBOOK NC_("ST_TYPE_INBOOK", "Book excerpt") +#define ST_TYPE_INCOLLECTION NC_("ST_TYPE_INCOLLECTION", "Book excerpt with title") +#define ST_TYPE_INPROCEEDINGS NC_("ST_TYPE_INPROCEEDINGS", "Conference proceedings article") +#define ST_TYPE_JOURNAL NC_("ST_TYPE_JOURNAL", "Journal") +#define ST_TYPE_MANUAL NC_("ST_TYPE_MANUAL", "Techn. documentation") +#define ST_TYPE_MASTERSTHESIS NC_("ST_TYPE_MASTERSTHESIS", "Thesis") +#define ST_TYPE_MISC NC_("ST_TYPE_MISC", "Miscellaneous") +#define ST_TYPE_PHDTHESIS NC_("ST_TYPE_PHDTHESIS", "Dissertation") +#define ST_TYPE_PROCEEDINGS NC_("ST_TYPE_PROCEEDINGS", "Conference proceedings") +#define ST_TYPE_TECHREPORT NC_("ST_TYPE_TECHREPORT", "Research report") +#define ST_TYPE_UNPUBLISHED NC_("ST_TYPE_UNPUBLISHED", "Unpublished") +#define ST_TYPE_EMAIL NC_("ST_TYPE_EMAIL", "E-mail") +#define ST_TYPE_WWW NC_("ST_TYPE_WWW", "WWW document") +#define ST_TYPE_CUSTOM1 NC_("ST_TYPE_CUSTOM1", "User-defined1") +#define ST_TYPE_CUSTOM2 NC_("ST_TYPE_CUSTOM2", "User-defined2") +#define ST_TYPE_CUSTOM3 NC_("ST_TYPE_CUSTOM3", "User-defined3") +#define ST_TYPE_CUSTOM4 NC_("ST_TYPE_CUSTOM4", "User-defined4") +#define ST_TYPE_CUSTOM5 NC_("ST_TYPE_CUSTOM5", "User-defined5") +#define ST_TYPE_TITLE NC_("ST_TYPE_TITLE", "General") + +#define RID_STR_ABSOURCEDIALOGTITLE NC_("RID_STR_ABSOURCEDIALOGTITLE", "Address Book Data Source Wizard") +#define RID_STR_SELECT_ABTYPE NC_("RID_STR_SELECT_ABTYPE", "Address book type") +#define RID_STR_INVOKE_ADMIN_DIALOG NC_("RID_STR_INVOKE_ADMIN_DIALOG", "Connection Settings") +#define RID_STR_TABLE_SELECTION NC_("RID_STR_TABLE_SELECTION", "Table selection") +#define RID_STR_MANUAL_FIELD_MAPPING NC_("RID_STR_MANUAL_FIELD_MAPPING", "Field Assignment") +#define RID_STR_FINAL_CONFIRM NC_("RID_STR_FINAL_CONFIRM", "Data Source Title") +#define RID_STR_NEEDTYPESELECTION NC_("RID_STR_NEEDTYPESELECTION", "Please select a type of address book.") +#define RID_STR_QRY_NOTABLES NC_("RID_STR_QRY_NOTABLES", "The data source does not contain any tables.\nDo you want to set it up as an address data source, anyway?") +#define RID_STR_QRY_NO_EVO_GW NC_("RID_STR_QRY_NO_EVO_GW", "You don't seem to have any GroupWise account configured in Evolution.\nDo you want to set it up as an address data source, anyway?") +#define RID_STR_DEFAULT_NAME NC_("RID_STR_DEFAULT_NAME", "Addresses") +#define RID_STR_ADMINDIALOGTITLE NC_("RID_STR_ADMINDIALOGTITLE", "Create Address Data Source") +#define RID_STR_NOCONNECTION NC_("RID_STR_NOCONNECTION", "The connection could not be established.") +#define RID_STR_PLEASECHECKSETTINGS NC_("RID_STR_PLEASECHECKSETTINGS", "Please check the settings made for the data source.") +#define RID_STR_FIELDDIALOGTITLE NC_("RID_STR_FIELDDIALOGTITLE", "Address Data - Field Assignment") +#define RID_STR_NOFIELDSASSIGNED NC_("RID_STR_NOFIELDSASSIGNED", "There are no fields assigned at this time.\nYou can either assign fields now or do so later by first choosing:\n\"File - Template - Address Book Source...\"") + +#define RID_STR_OPTION_DB_FIELD_TITLE NC_("RID_STR_OPTION_DB_FIELD_TITLE", "Database Field") +#define RID_STR_TYPE_TABLE NC_("RID_STR_TYPE_TABLE", "Table") +#define RID_STR_TYPE_QUERY NC_("RID_STR_TYPE_QUERY", "Query") +#define RID_STR_TYPE_COMMAND NC_("RID_STR_TYPE_COMMAND", "SQL command") + +#define RID_STR_GROUPWIZARD_TITLE NC_("RID_STR_GROUPWIZARD_TITLE", "Group Element Wizard") +#define RID_STR_GRIDWIZARD_TITLE NC_("RID_STR_GRIDWIZARD_TITLE", "Table Element Wizard") +#define RID_STR_LISTWIZARD_TITLE NC_("RID_STR_LISTWIZARD_TITLE", "List Box Wizard") +#define RID_STR_COMBOWIZARD_TITLE NC_("RID_STR_COMBOWIZARD_TITLE", "Combo Box Wizard") +#define RID_STR_COULDNOTOPENTABLE NC_("RID_STR_COULDNOTOPENTABLE", "The table connection to the data source could not be established.") + +#define RID_STR_DATEPOSTFIX NC_("RID_STR_DATEPOSTFIX", " (Date)") +#define RID_STR_TIMEPOSTFIX NC_("RID_STR_TIMEPOSTFIX", " (Time)") + +#define RID_STR_FIELDINFO_COMBOBOX NC_("RID_STR_FIELDINFO_COMBOBOX", "The contents of the field selected will be shown in the combo box list.") +#define RID_STR_FIELDINFO_LISTBOX NC_("RID_STR_FIELDINFO_LISTBOX", "The contents of the selected field will be shown in the list box if the linked fields are identical.") +#define RID_STR_COMBOWIZ_DBFIELD NC_("RID_STR_COMBOWIZ_DBFIELD", "You can either save the value of the combo box in a database field or use it for display purposes.") + +#define RID_STR_GROUPWIZ_DBFIELD NC_("RID_STR_GROUPWIZ_DBFIELD", "You can either save the value of the option group in a database field or use it for a later action.") + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/inc/dialmgr.hxx b/extensions/inc/yesno.hrc similarity index 78% rename from sw/source/uibase/inc/dialmgr.hxx rename to extensions/inc/yesno.hrc index 91695bdeb4a7..8c6df7b537ae 100644 --- a/sw/source/uibase/inc/dialmgr.hxx +++ b/extensions/inc/yesno.hrc @@ -16,16 +16,22 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DIALMGR_HXX -#define INCLUDED_SW_SOURCE_UIBASE_INC_DIALMGR_HXX -#include +#ifndef INCLUDED_EXTENSIONS_INC_YESNO_HRC +#define INCLUDED_EXTENSIONS_INC_YESNO_HRC -struct SwDialogsResMgr +#define NC_(Context, String) (Context "\004" u8##String) + +namespace { + +const char* RID_RSC_ENUM_YESNO[] = { - static ResMgr* GetResMgr(); + NC_("RID_RSC_ENUM_YESNO", "No" ), + NC_("RID_RSC_ENUM_YESNO", "Yes" ) }; +} + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/abpresid.hrc b/extensions/source/abpilot/abpresid.hrc deleted file mode 100644 index 7657b47fdc7c..000000000000 --- a/extensions/source/abpilot/abpresid.hrc +++ /dev/null @@ -1,64 +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 EXTENSIONS_ABPRESID_HRC -#define EXTENSIONS_ABPRESID_HRC - -#include "abpilot.hrc" -#include "extensio.hrc" - -// basics - -#define RID_PAGE_START RID_ABP_START -#define RID_STRING_START RID_ABP_START - -// strings - -#define RID_STR_DEFAULT_NAME ( RID_STRING_START + 0 ) -#define RID_STR_ADMINDIALOGTITLE ( RID_STRING_START + 1 ) -#define RID_STR_NOCONNECTION ( RID_STRING_START + 2 ) -#define RID_STR_PLEASECHECKSETTINGS ( RID_STRING_START + 3 ) -#define RID_STR_FIELDDIALOGTITLE ( RID_STRING_START + 4 ) -#define RID_STR_NOFIELDSASSIGNED ( RID_STRING_START + 5 ) -#define RID_STR_ABSOURCEDIALOGTITLE ( RID_STRING_START + 6 ) -#define RID_STR_SELECT_ABTYPE ( RID_STRING_START + 7 ) -#define RID_STR_INVOKE_ADMIN_DIALOG ( RID_STRING_START + 8 ) -#define RID_STR_TABLE_SELECTION ( RID_STRING_START + 9 ) -#define RID_STR_MANUAL_FIELD_MAPPING ( RID_STRING_START + 10 ) -#define RID_STR_FINAL_CONFIRM ( RID_STRING_START + 11 ) -#define RID_STR_NEEDTYPESELECTION ( RID_STRING_START + 12 ) -#define RID_STR_QRY_NO_EVO_GW ( RID_STRING_START + 13 ) -#define RID_STR_QRY_NOTABLES ( RID_STRING_START + 14 ) -// please adjust RID_STRING_END (below) when adding new strings - -#define RID_STRING_END RID_STR_QRY_NOTABLES - -// range checks - -#if RID_STRING_END > RID_ABP_END - #error "please adjust the resource id ranges!!" -#endif - -// some defines -#define WINDOW_SIZE_X 240 -#define WINDOW_SIZE_Y 185 - -#endif // EXTENSIONS_ABPRESID_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/abspage.hxx b/extensions/source/abpilot/abspage.hxx index 68b4e4613f8b..8a7826ad93bf 100644 --- a/extensions/source/abpilot/abspage.hxx +++ b/extensions/source/abpilot/abspage.hxx @@ -22,7 +22,7 @@ #include #include -#include "abpresid.hrc" +#include "strings.hrc" #include "componentmodule.hxx" #include diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx index dd0da506bf4c..8223c1a35f0f 100644 --- a/extensions/source/abpilot/abspilot.cxx +++ b/extensions/source/abpilot/abspilot.cxx @@ -19,7 +19,7 @@ #include "abspilot.hxx" #include "abpilot.hrc" -#include "abpresid.hrc" +#include "strings.hrc" #include "componentmodule.hxx" #include #include @@ -49,6 +49,9 @@ namespace abp #define PATH_NO_FIELDS 3 #define PATH_NO_SETTINGS_NO_FIELDS 4 +#define WINDOW_SIZE_X 240 +#define WINDOW_SIZE_Y 185 + using namespace ::svt; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -123,21 +126,21 @@ namespace abp OUString OAddressBookSourcePilot::getStateDisplayName( WizardState _nState ) const { - sal_uInt16 nResId = 0; + const char* pResId = nullptr; switch ( _nState ) { - case STATE_SELECT_ABTYPE: nResId = RID_STR_SELECT_ABTYPE; break; - case STATE_INVOKE_ADMIN_DIALOG: nResId = RID_STR_INVOKE_ADMIN_DIALOG; break; - case STATE_TABLE_SELECTION: nResId = RID_STR_TABLE_SELECTION; break; - case STATE_MANUAL_FIELD_MAPPING: nResId = RID_STR_MANUAL_FIELD_MAPPING; break; - case STATE_FINAL_CONFIRM: nResId = RID_STR_FINAL_CONFIRM; break; + case STATE_SELECT_ABTYPE: pResId = RID_STR_SELECT_ABTYPE; break; + case STATE_INVOKE_ADMIN_DIALOG: pResId = RID_STR_INVOKE_ADMIN_DIALOG; break; + case STATE_TABLE_SELECTION: pResId = RID_STR_TABLE_SELECTION; break; + case STATE_MANUAL_FIELD_MAPPING: pResId = RID_STR_MANUAL_FIELD_MAPPING; break; + case STATE_FINAL_CONFIRM: pResId = RID_STR_FINAL_CONFIRM; break; } - DBG_ASSERT( nResId, "OAddressBookSourcePilot::getStateDisplayName: don't know this state!" ); + DBG_ASSERT( pResId, "OAddressBookSourcePilot::getStateDisplayName: don't know this state!" ); OUString sDisplayName; - if ( nResId ) + if (pResId) { - sDisplayName = compmodule::ModuleRes(nResId); + sDisplayName = compmodule::ModuleRes(pResId); } return sDisplayName; @@ -260,7 +263,7 @@ namespace abp if ( aTables.empty() ) { - if (RET_YES != ScopedVclPtrInstance(this, compmodule::ModuleRes(( getSettings().eType == AST_EVOLUTION_GROUPWISE ? RID_STR_QRY_NO_EVO_GW : RID_STR_QRY_NOTABLES)), VclMessageType::Question, VclButtonsType::YesNo)->Execute()) + if (RET_YES != ScopedVclPtrInstance(this, compmodule::ModuleRes(getSettings().eType == AST_EVOLUTION_GROUPWISE ? RID_STR_QRY_NO_EVO_GW : RID_STR_QRY_NOTABLES), VclMessageType::Question, VclButtonsType::YesNo)->Execute()) { // cannot ask the user, or the user chose to use this data source, though there are no tables bAllow = false; diff --git a/extensions/source/abpilot/abspilot.src b/extensions/source/abpilot/abspilot.src deleted file mode 100644 index 457e0e993f15..000000000000 --- a/extensions/source/abpilot/abspilot.src +++ /dev/null @@ -1,97 +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 "abpresid.hrc" - -String RID_STR_ABSOURCEDIALOGTITLE -{ - Text [ en-US ] = "Address Book Data Source Wizard"; -}; - -String RID_STR_SELECT_ABTYPE -{ - Text [ en-US ] = "Address book type"; -}; - -String RID_STR_INVOKE_ADMIN_DIALOG -{ - Text [ en-US ] = "Connection Settings"; -}; - - String RID_STR_TABLE_SELECTION -{ - Text [ en-US ] = "Table selection"; -}; - -String RID_STR_MANUAL_FIELD_MAPPING -{ - Text [ en-US ] = "Field Assignment"; -}; - -String RID_STR_FINAL_CONFIRM -{ - Text [ en-US ] = "Data Source Title"; -}; - -String RID_STR_NEEDTYPESELECTION -{ - Text [ en-US ] = "Please select a type of address book."; -}; - -String RID_STR_QRY_NOTABLES -{ - Text [ en-US ] = "The data source does not contain any tables.\nDo you want to set it up as an address data source, anyway?"; -}; - -String RID_STR_QRY_NO_EVO_GW -{ - Text [ en-US ] = "You don't seem to have any GroupWise account configured in Evolution.\nDo you want to set it up as an address data source, anyway?"; -}; - -String RID_STR_DEFAULT_NAME -{ - Text [ en-US ] = "Addresses"; -}; - -String RID_STR_ADMINDIALOGTITLE -{ - Text [ en-US ] = "Create Address Data Source"; -}; - -String RID_STR_NOCONNECTION -{ - Text [ en-US ] = "The connection could not be established."; -}; - -String RID_STR_PLEASECHECKSETTINGS -{ - Text [ en-US ] = "Please check the settings made for the data source."; -}; - -String RID_STR_FIELDDIALOGTITLE -{ - Text [ en-US ] = "Address Data - Field Assignment"; -}; - -String RID_STR_NOFIELDSASSIGNED -{ - Text [ en-US ] = "There are no fields assigned at this time.\nYou can either assign fields now or do so later by first choosing:\n\"File - Template - Address Book Source...\""; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx index 79c833731b87..d0d183985f5b 100644 --- a/extensions/source/abpilot/admininvokationimpl.cxx +++ b/extensions/source/abpilot/admininvokationimpl.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "abpresid.hrc" +#include "strings.hrc" #include "componentmodule.hxx" #include diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx index 2f95469d3054..dbefd25ae7d3 100644 --- a/extensions/source/abpilot/datasourcehandling.cxx +++ b/extensions/source/abpilot/datasourcehandling.cxx @@ -18,7 +18,7 @@ */ -#include "abpresid.hrc" +#include "strings.hrc" #include "abptypes.hxx" #include "componentmodule.hxx" #include "datasourcehandling.hxx" diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx index 4176323e5907..609beeeef162 100644 --- a/extensions/source/abpilot/fieldmappingimpl.cxx +++ b/extensions/source/abpilot/fieldmappingimpl.cxx @@ -29,7 +29,7 @@ #include #include #include -#include "abpresid.hrc" +#include "strings.hrc" #include "componentmodule.hxx" #include #include "sal/macros.h" diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx index 1390bb75cf3a..43bf22986392 100644 --- a/extensions/source/abpilot/unodialogabp.cxx +++ b/extensions/source/abpilot/unodialogabp.cxx @@ -150,8 +150,6 @@ org_openoffice_comp_abp_OAddressBookSourcePilot( css::uno::XComponentContext *context, css::uno::Sequence const &) { - compmodule::OModule::setResourceFilePrefix("abp"); - return cppu::acquire(new abp::OABSPilotUno(context)); } diff --git a/extensions/source/bibliography/bib.hrc b/extensions/source/bibliography/bib.hrc deleted file mode 100644 index 78f54a95524b..000000000000 --- a/extensions/source/bibliography/bib.hrc +++ /dev/null @@ -1,61 +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 BIB_HRC -#define BIB_HRC - -#include "bibliography.hrc" -#include -#ifndef RID_BIB_START -#define RID_BIB_START RID_EXTENSIONS_START -#endif - -// Strings (500) -#define RID_BIB_STRING (RID_BIB_START + 200) -#define RID_BIB_STR_NONE (RID_BIB_STRING + 1) -#define RID_BIB_STR_FRAME_TITLE (RID_BIB_STRING + 4) -#define RID_MAP_QUESTION (RID_BIB_STRING + 5) - -#define ST_ERROR_PREFIX (RID_BIB_STRING + 37) -#define ST_TYPE_ARTICLE (RID_BIB_STRING + 38) -#define ST_TYPE_BOOK (RID_BIB_STRING + 39) -#define ST_TYPE_BOOKLET (RID_BIB_STRING + 40) -#define ST_TYPE_CONFERENCE (RID_BIB_STRING + 41) -#define ST_TYPE_INBOOK (RID_BIB_STRING + 42) -#define ST_TYPE_INCOLLECTION (RID_BIB_STRING + 43) -#define ST_TYPE_INPROCEEDINGS (RID_BIB_STRING + 44) -#define ST_TYPE_JOURNAL (RID_BIB_STRING + 45) -#define ST_TYPE_MANUAL (RID_BIB_STRING + 46) -#define ST_TYPE_MASTERSTHESIS (RID_BIB_STRING + 47) -#define ST_TYPE_MISC (RID_BIB_STRING + 48) -#define ST_TYPE_PHDTHESIS (RID_BIB_STRING + 49) -#define ST_TYPE_PROCEEDINGS (RID_BIB_STRING + 50) -#define ST_TYPE_TECHREPORT (RID_BIB_STRING + 51) -#define ST_TYPE_UNPUBLISHED (RID_BIB_STRING + 52) -#define ST_TYPE_EMAIL (RID_BIB_STRING + 53) -#define ST_TYPE_WWW (RID_BIB_STRING + 54) -#define ST_TYPE_CUSTOM1 (RID_BIB_STRING + 55) -#define ST_TYPE_CUSTOM2 (RID_BIB_STRING + 56) -#define ST_TYPE_CUSTOM3 (RID_BIB_STRING + 57) -#define ST_TYPE_CUSTOM4 (RID_BIB_STRING + 58) -#define ST_TYPE_CUSTOM5 (RID_BIB_STRING + 59) -#define ST_TYPE_TITLE (RID_BIB_STRING + 60) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/bib.src b/extensions/source/bibliography/bib.src deleted file mode 100644 index 1a5deb89c8a2..000000000000 --- a/extensions/source/bibliography/bib.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 "bib.hrc" - -String RID_BIB_STR_FRAME_TITLE -{ - Text [ en-US ] = "Bibliography Database"; -}; -String RID_MAP_QUESTION -{ - Text [ en-US ] = "Do you want to edit the column arrangement?"; -}; - -String RID_BIB_STR_NONE -{ - Text [ en-US ] = ""; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index 830cd0a4295f..eeb13f2fc7b7 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -52,7 +52,7 @@ #include #include "bibresid.hxx" -#include "bib.hrc" +#include "strings.hrc" #include "bibcont.hxx" #include "bibbeam.hxx" #include "bibmod.hxx" diff --git a/extensions/source/bibliography/bibmod.cxx b/extensions/source/bibliography/bibmod.cxx index 06638a88f7d1..9e0c7e30f3a1 100644 --- a/extensions/source/bibliography/bibmod.cxx +++ b/extensions/source/bibliography/bibmod.cxx @@ -19,6 +19,8 @@ #include #include +#include +#include #include #include #include @@ -60,21 +62,20 @@ void CloseBibModul(HdlBibModul ppBibModul) } } -OUString BibResId(sal_uInt16 nId) +OUString BibResId(const char* pId) { - return ResId(nId, *pBibModul->GetResMgr()); + return Translate::get(pId, pBibModul->GetResLocale()); } BibConfig* BibModul::pBibConfig = nullptr; BibModul::BibModul() + : m_aResLocale(Translate::Create("pcr", Application::GetSettings().GetUILanguageTag())) { - pResMgr = ResMgr::CreateResMgr( "bib" ); } BibModul::~BibModul() { - delete pResMgr; if (pBibConfig && pBibConfig->IsModified()) pBibConfig->Commit(); delete pBibConfig; diff --git a/extensions/source/bibliography/bibmod.hxx b/extensions/source/bibliography/bibmod.hxx index 7a2758d72681..4df21e1d7f12 100644 --- a/extensions/source/bibliography/bibmod.hxx +++ b/extensions/source/bibliography/bibmod.hxx @@ -20,22 +20,20 @@ #ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBMOD_HXX #define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBMOD_HXX - -class ResMgr; class BibDataManager; class BibConfig; class BibModul { private: - ResMgr* pResMgr; + std::locale m_aResLocale; static BibConfig* pBibConfig; public: BibModul(); ~BibModul(); - ResMgr* GetResMgr(){return pResMgr;} + const std::locale& GetResLocale() { return m_aResLocale; } static BibConfig* GetConfig(); static BibDataManager* createDataManager(); diff --git a/extensions/source/bibliography/bibresid.hxx b/extensions/source/bibliography/bibresid.hxx index 1855a8427b88..b555e632d97c 100644 --- a/extensions/source/bibliography/bibresid.hxx +++ b/extensions/source/bibliography/bibresid.hxx @@ -22,7 +22,7 @@ #include -OUString BibResId(sal_uInt16 nId); +OUString BibResId(const char* pId); #endif // INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBRESID_HXX diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx index 04f4f5e2698f..1a9d478afb99 100644 --- a/extensions/source/bibliography/bibview.cxx +++ b/extensions/source/bibliography/bibview.cxx @@ -18,7 +18,7 @@ */ -#include "bib.hrc" +#include "strings.hrc" #include "bibcont.hxx" #include "bibbeam.hxx" #include "general.hxx" diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 5c520b5d0c7c..87d7e1b1eafa 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -69,7 +69,7 @@ #include "bibconfig.hxx" #include "bibbeam.hxx" #include "general.hxx" -#include "bib.hrc" +#include "strings.hrc" #include "bibliography.hrc" #include #include diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index 131fec773caf..23e00ac58232 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -27,7 +27,7 @@ #include "datman.hxx" #include "bibview.hxx" #include "bibresid.hxx" -#include "bib.hrc" +#include "strings.hrc" #include #include "bibconfig.hxx" #include diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index 8c14735756b2..55389976bab9 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -33,7 +33,7 @@ #include "datman.hxx" #include "bibconfig.hxx" #include "bibprop.hrc" -#include "bib.hrc" +#include "strings.hrc" #include "bibmod.hxx" #include "bibview.hxx" #include "bibtools.hxx" diff --git a/extensions/source/bibliography/sections.src b/extensions/source/bibliography/sections.src deleted file mode 100644 index cf5da97dec6d..000000000000 --- a/extensions/source/bibliography/sections.src +++ /dev/null @@ -1,118 +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 "bib.hrc" -String ST_ERROR_PREFIX -{ - Text [ en-US ] = "The following column names could not be assigned:\n"; -}; -String ST_TYPE_ARTICLE -{ - Text [ en-US ] = "Article"; -}; -String ST_TYPE_BOOK -{ - Text [ en-US ] = "Book"; -}; -String ST_TYPE_BOOKLET -{ - Text [ en-US ] = "Brochures"; -}; -String ST_TYPE_CONFERENCE -{ - Text [ en-US ] = "Conference proceedings article (BiBTeX)"; -}; -String ST_TYPE_INBOOK -{ - Text [ en-US ] = "Book excerpt"; -}; -String ST_TYPE_INCOLLECTION -{ - Text [ en-US ] = "Book excerpt with title"; -}; -String ST_TYPE_INPROCEEDINGS -{ - Text [ en-US ] = "Conference proceedings article"; -}; -String ST_TYPE_JOURNAL -{ - Text [ en-US ] = "Journal"; -}; -String ST_TYPE_MANUAL -{ - Text [ en-US ] = "Techn. documentation"; -}; -String ST_TYPE_MASTERSTHESIS -{ - Text [ en-US ] = "Thesis"; -}; -String ST_TYPE_MISC -{ - Text [ en-US ] = "Miscellaneous"; -}; -String ST_TYPE_PHDTHESIS -{ - Text [ en-US ] = "Dissertation"; -}; -String ST_TYPE_PROCEEDINGS -{ - Text [ en-US ] = "Conference proceedings"; -}; -String ST_TYPE_TECHREPORT -{ - Text [ en-US ] = "Research report"; -}; -String ST_TYPE_UNPUBLISHED -{ - Text [ en-US ] = "Unpublished"; -}; -String ST_TYPE_EMAIL -{ - Text [ en-US ] = "E-mail"; -}; -String ST_TYPE_WWW -{ - Text [ en-US ] = "WWW document"; -}; -String ST_TYPE_CUSTOM1 -{ - Text [ en-US ] = "User-defined1"; -}; -String ST_TYPE_CUSTOM2 -{ - Text [ en-US ] = "User-defined2"; -}; -String ST_TYPE_CUSTOM3 -{ - Text [ en-US ] = "User-defined3"; -}; -String ST_TYPE_CUSTOM4 -{ - Text [ en-US ] = "User-defined4"; -}; -String ST_TYPE_CUSTOM5 -{ - Text [ en-US ] = "User-defined5"; -}; -String ST_TYPE_TITLE -{ - Text [ en-US ] = "General"; -}; -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index 86b82b7e28a5..b7f9771d6c56 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -34,7 +34,7 @@ #include "bibbeam.hxx" #include "bibview.hxx" #include "bibresid.hxx" -#include "bib.hrc" +#include "strings.hrc" #include "bitmaps.hlst" #include "bibtools.hxx" diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx index 7813f16b810e..c7e78ec28f7b 100644 --- a/extensions/source/dbpilots/commonpagesdbp.cxx +++ b/extensions/source/dbpilots/commonpagesdbp.cxx @@ -18,7 +18,7 @@ */ #include "commonpagesdbp.hxx" -#include "dbpresid.hrc" +#include "strings.hrc" #include "bitmaps.hlst" #include "componentmodule.hxx" #include diff --git a/extensions/source/dbpilots/commonpagesdbp.src b/extensions/source/dbpilots/commonpagesdbp.src deleted file mode 100644 index 723e972684c6..000000000000 --- a/extensions/source/dbpilots/commonpagesdbp.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 "dbpresid.hrc" - -String RID_STR_OPTION_DB_FIELD_TITLE -{ - Text [ en-US ] = "Database Field"; -}; - -String RID_STR_TYPE_TABLE -{ - Text [ en-US ] = "Table"; -}; - -String RID_STR_TYPE_QUERY -{ - Text [ en-US ] = "Query"; -}; - -String RID_STR_TYPE_COMMAND -{ - Text [ en-US ] = "SQL command"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx index ed66dd5986b7..e3b9b80bcd07 100644 --- a/extensions/source/dbpilots/controlwizard.cxx +++ b/extensions/source/dbpilots/controlwizard.cxx @@ -45,6 +45,9 @@ #include #include +#define WINDOW_SIZE_X 240 +#define WINDOW_SIZE_Y 185 + namespace dbp { using namespace ::com::sun::star::uno; @@ -215,22 +218,22 @@ namespace dbp m_pFormDatasource->SetText(sDataSource); m_pFormTable->SetText(sCommand); - ::svt::WizardTypes::WizardState nCommandTypeResourceId = 0; + const char* pCommandTypeResourceId = nullptr; switch (nCommandType) { case CommandType::TABLE: - nCommandTypeResourceId = RID_STR_TYPE_TABLE; + pCommandTypeResourceId = RID_STR_TYPE_TABLE; break; case CommandType::QUERY: - nCommandTypeResourceId = RID_STR_TYPE_QUERY; + pCommandTypeResourceId = RID_STR_TYPE_QUERY; break; default: - nCommandTypeResourceId = RID_STR_TYPE_COMMAND; + pCommandTypeResourceId = RID_STR_TYPE_COMMAND; break; } - m_pFormContentType->SetText(compmodule::ModuleRes(nCommandTypeResourceId)); + m_pFormContentType->SetText(compmodule::ModuleRes(pCommandTypeResourceId)); } OControlWizardPage_Base::initializePage(); diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx index 117f6170a39b..faebb6edd7f2 100644 --- a/extensions/source/dbpilots/controlwizard.hxx +++ b/extensions/source/dbpilots/controlwizard.hxx @@ -31,7 +31,7 @@ #include #include #include "dbptypes.hxx" -#include "dbpresid.hrc" +#include "strings.hrc" #include "componentmodule.hxx" #include "wizardcontext.hxx" diff --git a/extensions/source/dbpilots/dbpilots.src b/extensions/source/dbpilots/dbpilots.src deleted file mode 100644 index aeca267fc215..000000000000 --- a/extensions/source/dbpilots/dbpilots.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 "dbpresid.hrc" - -String RID_STR_GROUPWIZARD_TITLE -{ - Text [ en-US ] = "Group Element Wizard"; -}; - -String RID_STR_GRIDWIZARD_TITLE -{ - Text [ en-US ] = "Table Element Wizard"; -}; - -String RID_STR_LISTWIZARD_TITLE -{ - Text [ en-US ] = "List Box Wizard"; -}; - -String RID_STR_COMBOWIZARD_TITLE -{ - Text [ en-US ] = "Combo Box Wizard"; -}; - -String RID_STR_COULDNOTOPENTABLE -{ - Text [ en-US ] = "The table connection to the data source could not be established."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/dbpresid.hrc b/extensions/source/dbpilots/dbpresid.hrc deleted file mode 100644 index 3cdc47cd1430..000000000000 --- a/extensions/source/dbpilots/dbpresid.hrc +++ /dev/null @@ -1,70 +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_EXTENSIONS_SOURCE_DBPILOTS_DBPRESID_HRC -#define INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_DBPRESID_HRC - -#include "dbpilots.hrc" -#include "extensio.hrc" - -// basics - -#define RID_DIALOG_START RID_DBP_START -#define RID_PAGE_START RID_DBP_START -#define RID_STRING_START RID_DBP_START - -// strings - -#define RID_STR_GROUPWIZ_DBFIELD (RID_STRING_START + 1 ) -#define RID_STR_COMBOWIZ_DBFIELD (RID_STRING_START + 2 ) -#define RID_STR_LISTWIZARD_TITLE (RID_STRING_START + 3 ) -#define RID_STR_COMBOWIZARD_TITLE (RID_STRING_START + 4 ) -#define RID_STR_COULDNOTOPENTABLE (RID_STRING_START + 5 ) -#define RID_STR_DATEPOSTFIX (RID_STRING_START + 6 ) -#define RID_STR_TIMEPOSTFIX (RID_STRING_START + 7 ) -#define RID_STR_TYPE_QUERY (RID_STRING_START + 8 ) -#define RID_STR_TYPE_TABLE (RID_STRING_START + 9 ) -#define RID_STR_TYPE_COMMAND (RID_STRING_START + 10 ) -#define RID_STR_FIELDINFO_LISTBOX (RID_STRING_START + 11 ) -#define RID_STR_FIELDINFO_COMBOBOX (RID_STRING_START + 12 ) -#define RID_STR_GRIDWIZARD_TITLE (RID_STRING_START + 13 ) -#define RID_STR_GROUPWIZARD_TITLE (RID_STRING_START + 14 ) -#define RID_STR_OPTION_DB_FIELD_TITLE (RID_STRING_START + 15 ) - -// please adjust RID_STRING_END (below) when adding new strings -#define RID_STRING_END RID_STR_OPTION_DB_FIELD_TITLE - -// please adjust RID_DIALOG_END (below) when adding new dialogs -#define RID_DIALOG_END ( RID_DIALOG_START + 3 ) - -// range checks - -#if RID_STRING_END > RID_DBP_END - #error "please adjust the resource id ranges!!" -#endif -#if RID_DIALOG_END > RID_DBP_END - #error "please adjust the resource id ranges!!" -#endif - -#define WINDOW_SIZE_X 260 -#define WINDOW_SIZE_Y 185 - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/dbpservices.cxx b/extensions/source/dbpilots/dbpservices.cxx index 4956b6b8d198..d898bc89cacc 100644 --- a/extensions/source/dbpilots/dbpservices.cxx +++ b/extensions/source/dbpilots/dbpservices.cxx @@ -32,7 +32,6 @@ extern "C" void SAL_CALL dbp_initializeModule() createRegistryInfo_OGroupBoxWizard(); createRegistryInfo_OListComboWizard(); createRegistryInfo_OGridWizard(); - compmodule::OModule::setResourceFilePrefix("dbp"); s_bInit = true; } } diff --git a/extensions/source/dbpilots/gridpages.src b/extensions/source/dbpilots/gridpages.src deleted file mode 100644 index bdcb8004c0af..000000000000 --- a/extensions/source/dbpilots/gridpages.src +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "dbpresid.hrc" - -String RID_STR_DATEPOSTFIX -{ - Text [ en-US ] = " (Date)"; -}; - -String RID_STR_TIMEPOSTFIX -{ - Text [ en-US ] = " (Time)"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/groupboxpages.src b/extensions/source/dbpilots/groupboxpages.src deleted file mode 100644 index 06d442d8ee17..000000000000 --- a/extensions/source/dbpilots/groupboxpages.src +++ /dev/null @@ -1,27 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * 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 "dbpresid.hrc" - -String RID_STR_GROUPWIZ_DBFIELD -{ - Text [ en-US ] = "You can either save the value of the option group in a database field or use it for a later action."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/listcombopages.src b/extensions/source/dbpilots/listcombopages.src deleted file mode 100644 index c2357982750f..000000000000 --- a/extensions/source/dbpilots/listcombopages.src +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "dbpresid.hrc" - -String RID_STR_FIELDINFO_COMBOBOX -{ - Text [ en-US ] = "The contents of the field selected will be shown in the combo box list."; -}; - -String RID_STR_FIELDINFO_LISTBOX -{ - Text [ en-US ] = "The contents of the selected field will be shown in the list box if the linked fields are identical."; -}; - -String RID_STR_COMBOWIZ_DBFIELD -{ - Text [ en-US ] = "You can either save the value of the combo box in a database field or use it for display purposes."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index f03327d566f8..a3899444c1d1 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.cxx @@ -508,27 +508,23 @@ namespace dbp setDescriptionText(compmodule::ModuleRes(RID_STR_COMBOWIZ_DBFIELD)); } - OUString& OComboDBFieldPage::getDBFieldSetting() { return static_cast(getDialog())->getSettings().sLinkedFormField; } - void OComboDBFieldPage::ActivatePage() { ODBFieldPage::ActivatePage(); getDialog()->enableButtons(WizardButtonFlags::FINISH, true); } - bool OComboDBFieldPage::canAdvance() const { // we're on the last page here, no travelNext allowed ... return false; } - } // namespace dbp diff --git a/extensions/source/inc/componentmodule.cxx b/extensions/source/inc/componentmodule.cxx index 7ed33cf63fe7..619c5472ab6d 100644 --- a/extensions/source/inc/componentmodule.cxx +++ b/extensions/source/inc/componentmodule.cxx @@ -20,6 +20,8 @@ #include #include "componentmodule.hxx" #include +#include +#include #include #include #include @@ -43,80 +45,51 @@ namespace compmodule // implementation for OModule. not threadsafe, has to be guarded by its owner class OModuleImpl { - std::unique_ptr m_pResources; + std::locale m_aResLocale; bool m_bInitialized; - OString m_sFilePrefix; public: /// ctor OModuleImpl(); - ~OModuleImpl(); /// get the manager for the resources of the module - ResMgr* getResManager(); - void setResourceFilePrefix(const OString& _rPrefix) { m_sFilePrefix = _rPrefix; } + const std::locale& getResLocale(); }; OModuleImpl::OModuleImpl() - :m_pResources(nullptr) - ,m_bInitialized(false) + : m_bInitialized(false) { } - - OModuleImpl::~OModuleImpl() - { - } - - - ResMgr* OModuleImpl::getResManager() + const std::locale& OModuleImpl::getResLocale() { // note that this method is not threadsafe, which counts for the whole class ! - if (!m_pResources && !m_bInitialized) + if (!m_bInitialized) { - DBG_ASSERT(!m_sFilePrefix.isEmpty(), "OModuleImpl::getResManager: no resource file prefix!"); // create a manager with a fixed prefix - m_pResources.reset( ResMgr::CreateResMgr(m_sFilePrefix.getStr()) ); - DBG_ASSERT(m_pResources, - OStringBuffer("OModuleImpl::getResManager: could not create the resource manager (file name: ") - .append(m_sFilePrefix) - .append(")!").getStr()); - + m_aResLocale = Translate::Create("pcr", Application::GetSettings().GetUILanguageTag()); m_bInitialized = true; } - return m_pResources.get(); + return m_aResLocale; } - ::osl::Mutex OModule::s_aMutex; sal_Int32 OModule::s_nClients = 0; OModuleImpl* OModule::s_pImpl = nullptr; - OString OModule::s_sResPrefix; - ResMgr* OModule::getResManager() + const std::locale& OModule::getResLocale() { ENTER_MOD_METHOD(); - return s_pImpl->getResManager(); + return s_pImpl->getResLocale(); } - - void OModule::setResourceFilePrefix(const OString& _rPrefix) - { - ::osl::MutexGuard aGuard(s_aMutex); - s_sResPrefix = _rPrefix; - if (s_pImpl) - s_pImpl->setResourceFilePrefix(_rPrefix); - } - - void OModule::registerClient() { ::osl::MutexGuard aGuard(s_aMutex); ++s_nClients; } - void OModule::revokeClient() { ::osl::MutexGuard aGuard(s_aMutex); @@ -127,16 +100,13 @@ namespace compmodule } } - void OModule::ensureImpl() { if (s_pImpl) return; s_pImpl = new OModuleImpl(); - s_pImpl->setResourceFilePrefix(s_sResPrefix); } - //- registration helper diff --git a/extensions/source/inc/componentmodule.hxx b/extensions/source/inc/componentmodule.hxx index 66b232c481c5..163b394f7f15 100644 --- a/extensions/source/inc/componentmodule.hxx +++ b/extensions/source/inc/componentmodule.hxx @@ -26,7 +26,7 @@ */ #include -#include +#include #include #include #include @@ -35,13 +35,9 @@ #include #include -class ResMgr; - - namespace compmodule { - typedef css::uno::Reference< css::lang::XSingleServiceFactory > (SAL_CALL *FactoryInstantiation) ( const css::uno::Reference< css::lang::XMultiServiceFactory >& _rServiceManager, @@ -64,7 +60,6 @@ typedef css::uno::Reference< css::lang::XSingleServiceFactory > (SAL_CALL *Facto static ::osl::Mutex s_aMutex; /// access safety static sal_Int32 s_nClients; /// number of registered clients static OModuleImpl* s_pImpl; /// impl class. lives as long as at least one client for the module is registered - static OString s_sResPrefix; // auto registration administration static std::vector< OUString >* @@ -77,11 +72,8 @@ typedef css::uno::Reference< css::lang::XSingleServiceFactory > (SAL_CALL *Facto s_pFactoryFunctionPointers; public: - // can be set as long as no resource has been accessed ... - static void setResourceFilePrefix(const OString& _rPrefix); - - /// get the vcl res manager of the module - static ResMgr* getResManager(); + /// get the resource locale of the module + static const std::locale& getResLocale(); /** register a component implementing a service with the given data. @param _rImplementationName @@ -144,13 +136,11 @@ typedef css::uno::Reference< css::lang::XSingleServiceFactory > (SAL_CALL *Facto }; - // specialized ResId, using the resource manager provided by the global module - class ModuleRes : public ::ResId + // specialized ResId, using the resource locale provided by the global module + static inline OUString ModuleRes(const char* pId) { - public: - explicit ModuleRes(sal_uInt16 _nId) : ResId(_nId, *OModule::getResManager()) { } - }; - + return Translate::get(pId, OModule::getResLocale()); + } template class OMultiInstanceAutoRegistration diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index 231cf2ee360a..6abce4412afe 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -18,7 +18,7 @@ */ #include "browserlistbox.hxx" -#include "propresid.hrc" +#include "strings.hrc" #include "proplinelistener.hxx" #include "propcontrolobserver.hxx" #include "linedescriptor.hxx" diff --git a/extensions/source/propctrlr/browserview.hxx b/extensions/source/propctrlr/browserview.hxx index d88ce3c4012f..394d3ebf4aa4 100644 --- a/extensions/source/propctrlr/browserview.hxx +++ b/extensions/source/propctrlr/browserview.hxx @@ -22,7 +22,6 @@ #include #include -#include #include diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx index 0527b1268590..21c2eaf2331a 100644 --- a/extensions/source/propctrlr/defaultforminspection.cxx +++ b/extensions/source/propctrlr/defaultforminspection.cxx @@ -20,8 +20,8 @@ #include "defaultforminspection.hxx" #include "pcrcommon.hxx" #include "pcrservices.hxx" -#include "propresid.hrc" -#include "formresid.hrc" +#include "strings.hrc" +#include "strings.hrc" #include "modulepcr.hxx" #include "propctrlr.hrc" #include "formmetadata.hxx" @@ -159,7 +159,7 @@ namespace pcr struct { const sal_Char* programmaticName; - sal_uInt16 uiNameResId; + const char* uiNameResId; const sal_Char* helpId; } aCategories[] = { { "General", RID_STR_PROPPAGE_DEFAULT, HID_FM_PROPDLG_TAB_GENERAL }, diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx index bceddfcde856..0704887e0d1c 100644 --- a/extensions/source/propctrlr/eformshelper.cxx +++ b/extensions/source/propctrlr/eformshelper.cxx @@ -20,7 +20,7 @@ #include #include "eformshelper.hxx" #include "formstrings.hxx" -#include "formresid.hrc" +#include "strings.hrc" #include "modulepcr.hxx" #include "propeventtranslation.hxx" #include "formbrowsertools.hxx" @@ -541,7 +541,7 @@ namespace pcr if ( xBinding.is() ) { // find a nice name for it - OUString sBaseName(PcrRes(RID_STR_BINDING_UI_NAME)); + OUString sBaseName(PcrRes(RID_STR_BINDING_NAME)); sBaseName += " "; OUString sNewName; sal_Int32 nNumber = 1; diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index 5ede817d6009..b33fc45f1605 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -22,7 +22,7 @@ #include "pcrservices.hxx" #include "propctrlr.hrc" #include "formbrowsertools.hxx" -#include "formresid.hrc" +#include "strings.hrc" #include "formstrings.hxx" #include "handlerhelper.hxx" #include "modulepcr.hxx" @@ -137,8 +137,8 @@ namespace pcr namespace FormComponentType = css::form::FormComponentType; EventDescription::EventDescription( EventId _nId, const sal_Char* _pListenerNamespaceAscii, const sal_Char* _pListenerClassAsciiName, - const sal_Char* _pListenerMethodAsciiName, sal_uInt16 _nDisplayNameResId, const OString& _sHelpId, const OString& _sUniqueBrowseId ) - :sDisplayName(PcrRes( _nDisplayNameResId )) + const sal_Char* _pListenerMethodAsciiName, const char* pDisplayNameResId, const OString& _sHelpId, const OString& _sUniqueBrowseId ) + :sDisplayName(PcrRes( pDisplayNameResId )) ,sListenerMethodName( OUString::createFromAscii( _pListenerMethodAsciiName ) ) ,sHelpId( _sHelpId ) ,sUniqueBrowseId( _sUniqueBrowseId ) diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx index fb41f0e1e2f6..c1d3c72214b6 100644 --- a/extensions/source/propctrlr/eventhandler.hxx +++ b/extensions/source/propctrlr/eventhandler.hxx @@ -60,7 +60,7 @@ namespace pcr const sal_Char* _pListenerNamespaceAscii, const sal_Char* _pListenerClassAsciiName, const sal_Char* _pListenerMethodAsciiName, - sal_uInt16 _nDisplayNameResId, + const char* pDisplayNameResId, const OString& _sHelpId, const OString& _sUniqueBrowseId ); }; diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx index c393654fbdce..8be50c9f502b 100644 --- a/extensions/source/propctrlr/fontdialog.cxx +++ b/extensions/source/propctrlr/fontdialog.cxx @@ -19,7 +19,7 @@ #include #include "fontdialog.hxx" -#include "formresid.hrc" +#include "strings.hrc" #include "modulepcr.hxx" #include #include diff --git a/extensions/source/propctrlr/formbrowsertools.cxx b/extensions/source/propctrlr/formbrowsertools.cxx index fd01daebb8af..c7801df339ff 100644 --- a/extensions/source/propctrlr/formbrowsertools.cxx +++ b/extensions/source/propctrlr/formbrowsertools.cxx @@ -21,7 +21,8 @@ #include #include #include -#include "formresid.hrc" +#include +#include "strings.hrc" #include "modulepcr.hxx" #include "formstrings.hxx" diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 125c96519988..cf53f9428941 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -26,7 +26,9 @@ #include "formcomponenthandler.hxx" #include "formlinkdialog.hxx" #include "formmetadata.hxx" -#include "formresid.hrc" +#include "strings.hrc" +#include "showhide.hrc" +#include "yesno.hrc" #include "formstrings.hxx" #include "handlerhelper.hxx" #include "listselectiondlg.hxx" @@ -95,7 +97,6 @@ #include #include #include -#include #include #include #include @@ -536,9 +537,8 @@ namespace pcr OUString sControlValue; OSL_VERIFY( _rControlValue >>= sControlValue ); - ResStringArray aListEntries(PcrRes(RID_RSC_ENUM_SHOWHIDE)); - OSL_ENSURE( aListEntries.Count() == 2, "FormComponentPropertyHandler::convertToPropertyValue: broken resource for Show/Hide!" ); - bool bShow = ( aListEntries.Count() < 2 ) || ( sControlValue == aListEntries.GetString(1) ); + assert(SAL_N_ELEMENTS(RID_RSC_ENUM_SHOWHIDE) == 2 && "FormComponentPropertyHandler::convertToPropertyValue: broken resource for Show/Hide!"); + bool bShow = sControlValue == PcrRes(RID_RSC_ENUM_SHOWHIDE[1]); aPropertyValue <<= bShow; } @@ -640,16 +640,11 @@ namespace pcr case PROPERTY_ID_SHOW_RECORDACTIONS: case PROPERTY_ID_SHOW_FILTERSORT: { - ResStringArray aListEntries(PcrRes(RID_RSC_ENUM_SHOWHIDE)); - OSL_ENSURE( aListEntries.Count() == 2, "FormComponentPropertyHandler::convertToControlValue: broken resource for Show/Hide!" ); - - if (aListEntries.Count() == 2) - { - OUString sControlValue = ::comphelper::getBOOL( _rPropertyValue ) - ? aListEntries.GetString(1) - : aListEntries.GetString(0); - aControlValue <<= sControlValue; - } + assert(SAL_N_ELEMENTS(RID_RSC_ENUM_SHOWHIDE) == 2 && "FormComponentPropertyHandler::convertToPropertyValue: broken resource for Show/Hide!"); + OUString sControlValue = ::comphelper::getBOOL(_rPropertyValue) + ? PcrRes(RID_RSC_ENUM_SHOWHIDE[1]) + : PcrRes(RID_RSC_ENUM_SHOWHIDE[0]); + aControlValue <<= sControlValue; } break; @@ -756,20 +751,20 @@ namespace pcr // font style ::FontWeight eWeight = vcl::unohelper::ConvertFontWeight( aFont.Weight ); - sal_uInt16 nStyleResID = RID_STR_FONTSTYLE_REGULAR; + const char* pStyleResID = RID_STR_FONTSTYLE_REGULAR; if ( aFont.Slant == FontSlant_ITALIC ) { if ( eWeight > WEIGHT_NORMAL ) - nStyleResID = RID_STR_FONTSTYLE_BOLD_ITALIC; + pStyleResID = RID_STR_FONTSTYLE_BOLD_ITALIC; else - nStyleResID = RID_STR_FONTSTYLE_ITALIC; + pStyleResID = RID_STR_FONTSTYLE_ITALIC; } else { if ( eWeight > WEIGHT_NORMAL ) - nStyleResID = RID_STR_FONTSTYLE_BOLD; + pStyleResID = RID_STR_FONTSTYLE_BOLD; } - displayName.append(PcrRes(nStyleResID)); + displayName.append(PcrRes(pStyleResID)); // font size if ( aFont.Height ) @@ -1199,21 +1194,19 @@ namespace pcr if ( eType == TypeClass_SEQUENCE ) nControlType = PropertyControlType::StringListField; - // boolean values if ( eType == TypeClass_BOOLEAN ) { - sal_uInt16 nResId = RID_RSC_ENUM_YESNO; if ( ( nPropId == PROPERTY_ID_SHOW_POSITION ) || ( nPropId == PROPERTY_ID_SHOW_NAVIGATION ) || ( nPropId == PROPERTY_ID_SHOW_RECORDACTIONS ) || ( nPropId == PROPERTY_ID_SHOW_FILTERSORT ) ) - nResId = RID_RSC_ENUM_SHOWHIDE; - - PcrRes aRes(nResId); - ResStringArray aListEntries(aRes); - aDescriptor.Control = PropertyHandlerHelper::createListBoxControl(_rxControlFactory, aListEntries, false, false); + { + aDescriptor.Control = PropertyHandlerHelper::createListBoxControl(_rxControlFactory, RID_RSC_ENUM_SHOWHIDE, SAL_N_ELEMENTS(RID_RSC_ENUM_SHOWHIDE), false, false); + } + else + aDescriptor.Control = PropertyHandlerHelper::createListBoxControl(_rxControlFactory, RID_RSC_ENUM_YESNO, SAL_N_ELEMENTS(RID_RSC_ENUM_YESNO), false, false); bNeedDefaultStringIfVoidAllowed = true; } @@ -2391,7 +2384,7 @@ namespace pcr INetURLObject aParser( sDataSourceName ); if ( aParser.GetProtocol() != INetProtocol::NotValid ) sDataSourceName = aParser.getBase( INetURLObject::LAST_SEGMENT, true, INetURLObject::DecodeMechanism::WithCharset ); - OUString sInfo(PcrRes(RID_STR_UNABLETOCONNECT).toString().replaceAll("$name$", sDataSourceName)); + OUString sInfo(PcrRes(RID_STR_UNABLETOCONNECT).replaceAll("$name$", sDataSourceName)); SQLContext aContext; aContext.Message = sInfo; aContext.NextException = aError.get(); diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx index 601e4585b1d8..b22fdf9fc892 100644 --- a/extensions/source/propctrlr/formlinkdialog.cxx +++ b/extensions/source/propctrlr/formlinkdialog.cxx @@ -21,7 +21,7 @@ #include "formlinkdialog.hxx" #include "modulepcr.hxx" -#include "formresid.hrc" +#include "strings.hrc" #include "formstrings.hxx" #include #include diff --git a/extensions/source/propctrlr/formlinkdialog.src b/extensions/source/propctrlr/formlinkdialog.src deleted file mode 100644 index 4584a8272703..000000000000 --- a/extensions/source/propctrlr/formlinkdialog.src +++ /dev/null @@ -1,39 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "formresid.hrc" -#include "propctrlr.hrc" - -String STR_DETAIL_FORM -{ - Text [ en-US ] = "Sub Form"; -}; - -String STR_MASTER_FORM -{ - Text [ en-US ] = "Master Form"; -}; - -String STR_ERROR_RETRIEVING_COLUMNS -{ - Text [ en-US ] = "The columns of '#' could not be retrieved."; - Text [ x-comment ] ="# will be replace with a name."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index 7aea41c8c6e5..d0f375f2bcde 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -19,10 +19,12 @@ #include "formmetadata.hxx" #include "formstrings.hxx" -#include "formresid.hrc" +#include "command.hrc" +#include "strings.hrc" +#include "stringarrays.hrc" #include "propctrlr.hrc" -#include #include +#include #include #include @@ -78,7 +80,7 @@ namespace pcr #define DEF_INFO( ident, uinameres, pos, helpid, flags ) \ OPropertyInfoImpl( PROPERTY_##ident, PROPERTY_ID_##ident, \ - PcrRes( RID_STR_##uinameres ).toString(), pos, HID_PROP_##helpid, flags ) + PcrRes( RID_STR_##uinameres ), pos, HID_PROP_##helpid, flags ) #define DEF_INFO_1( ident, uinameres, pos, helpid, flag1 ) \ DEF_INFO( ident, uinameres, pos, helpid, PROP_FLAG_##flag1 ) @@ -371,126 +373,122 @@ namespace pcr return (pInfo) ? pInfo->sTranslation : OUString(); } - OString OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId) const { const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId); return (pInfo) ? pInfo->sHelpId : OString(); } - sal_Int16 OPropertyInfoService::getPropertyPos(sal_Int32 _nId) const { const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId); return (pInfo) ? pInfo->nPos : 0xFFFF; } - sal_uInt32 OPropertyInfoService::getPropertyUIFlags(sal_Int32 _nId) const { const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId); return (pInfo) ? pInfo->nUIFlags : 0; } - std::vector< OUString > OPropertyInfoService::getPropertyEnumRepresentations(sal_Int32 _nId) const { OSL_ENSURE( ( ( getPropertyUIFlags( _nId ) & PROP_FLAG_ENUM ) != 0 ) || ( _nId == PROPERTY_ID_TARGET_FRAME ), "OPropertyInfoService::getPropertyEnumRepresentations: this is no enum property!" ); - sal_Int16 nStringItemsResId = 0; + const char** pStringItemsResId = nullptr; switch ( _nId ) { case PROPERTY_ID_IMAGEPOSITION: - nStringItemsResId = RID_RSC_ENUM_IMAGE_POSITION; + pStringItemsResId = RID_RSC_ENUM_IMAGE_POSITION; break; case PROPERTY_ID_BORDER: - nStringItemsResId = RID_RSC_ENUM_BORDER_TYPE; + pStringItemsResId = RID_RSC_ENUM_BORDER_TYPE; break; case PROPERTY_ID_ICONSIZE: - nStringItemsResId = RID_RSC_ENUM_ICONSIZE_TYPE; + pStringItemsResId = RID_RSC_ENUM_ICONSIZE_TYPE; break; case PROPERTY_ID_COMMANDTYPE: - nStringItemsResId = RID_RSC_ENUM_COMMAND_TYPE; + pStringItemsResId = RID_RSC_ENUM_COMMAND_TYPE; break; case PROPERTY_ID_LISTSOURCETYPE: - nStringItemsResId = RID_RSC_ENUM_LISTSOURCE_TYPE; + pStringItemsResId = RID_RSC_ENUM_LISTSOURCE_TYPE; break; case PROPERTY_ID_ALIGN: - nStringItemsResId = RID_RSC_ENUM_ALIGNMENT; + pStringItemsResId = RID_RSC_ENUM_ALIGNMENT; break; case PROPERTY_ID_VERTICAL_ALIGN: - nStringItemsResId = RID_RSC_ENUM_VERTICAL_ALIGN; + pStringItemsResId = RID_RSC_ENUM_VERTICAL_ALIGN; break; case PROPERTY_ID_BUTTONTYPE: - nStringItemsResId = RID_RSC_ENUM_BUTTONTYPE; + pStringItemsResId = RID_RSC_ENUM_BUTTONTYPE; break; case PROPERTY_ID_PUSHBUTTONTYPE: - nStringItemsResId = RID_RSC_ENUM_PUSHBUTTONTYPE; + pStringItemsResId = RID_RSC_ENUM_PUSHBUTTONTYPE; break; case PROPERTY_ID_SUBMIT_METHOD: - nStringItemsResId = RID_RSC_ENUM_SUBMIT_METHOD; + pStringItemsResId = RID_RSC_ENUM_SUBMIT_METHOD; break; case PROPERTY_ID_SUBMIT_ENCODING: - nStringItemsResId = RID_RSC_ENUM_SUBMIT_ENCODING; + pStringItemsResId = RID_RSC_ENUM_SUBMIT_ENCODING; break; case PROPERTY_ID_DATEFORMAT: - nStringItemsResId = RID_RSC_ENUM_DATEFORMAT_LIST; + pStringItemsResId = RID_RSC_ENUM_DATEFORMAT_LIST; break; case PROPERTY_ID_TIMEFORMAT: - nStringItemsResId = RID_RSC_ENUM_TIMEFORMAT_LIST; + pStringItemsResId = RID_RSC_ENUM_TIMEFORMAT_LIST; break; case PROPERTY_ID_DEFAULT_STATE: case PROPERTY_ID_STATE: - nStringItemsResId = RID_RSC_ENUM_CHECKED; + pStringItemsResId = RID_RSC_ENUM_CHECKED; break; case PROPERTY_ID_CYCLE: - nStringItemsResId = RID_RSC_ENUM_CYCLE; + pStringItemsResId = RID_RSC_ENUM_CYCLE; break; case PROPERTY_ID_NAVIGATION: - nStringItemsResId = RID_RSC_ENUM_NAVIGATION; + pStringItemsResId = RID_RSC_ENUM_NAVIGATION; break; case PROPERTY_ID_TARGET_FRAME: - nStringItemsResId = RID_RSC_ENUM_SUBMIT_TARGET; + pStringItemsResId = RID_RSC_ENUM_SUBMIT_TARGET; break; case PROPERTY_ID_ORIENTATION: - nStringItemsResId = RID_RSC_ENUM_ORIENTATION; + pStringItemsResId = RID_RSC_ENUM_ORIENTATION; break; case PROPERTY_ID_CELL_EXCHANGE_TYPE: - nStringItemsResId = RID_RSC_ENUM_CELL_EXCHANGE_TYPE; + pStringItemsResId = RID_RSC_ENUM_CELL_EXCHANGE_TYPE; break; case PROPERTY_ID_SHOW_SCROLLBARS: - nStringItemsResId = RID_RSC_ENUM_SCROLLBARS; + pStringItemsResId = RID_RSC_ENUM_SCROLLBARS; break; case PROPERTY_ID_VISUALEFFECT: - nStringItemsResId = RID_RSC_ENUM_VISUALEFFECT; + pStringItemsResId = RID_RSC_ENUM_VISUALEFFECT; break; case PROPERTY_ID_TEXTTYPE: - nStringItemsResId = RID_RSC_ENUM_TEXTTYPE; + pStringItemsResId = RID_RSC_ENUM_TEXTTYPE; break; case PROPERTY_ID_LINEEND_FORMAT: - nStringItemsResId = RID_RSC_ENUM_LINEEND_FORMAT; + pStringItemsResId = RID_RSC_ENUM_LINEEND_FORMAT; break; case PROPERTY_ID_XSD_WHITESPACES: - nStringItemsResId = RID_RSC_ENUM_WHITESPACE_HANDLING; + pStringItemsResId = RID_RSC_ENUM_WHITESPACE_HANDLING; break; case PROPERTY_ID_SELECTION_TYPE: - nStringItemsResId = RID_RSC_ENUM_SELECTION_TYPE; + pStringItemsResId = RID_RSC_ENUM_SELECTION_TYPE; break; case PROPERTY_ID_SCALE_MODE: - nStringItemsResId = RID_RSC_ENUM_SCALE_MODE; + pStringItemsResId = RID_RSC_ENUM_SCALE_MODE; break; case PROPERTY_ID_WRITING_MODE: - nStringItemsResId = RID_RSC_ENUM_WRITING_MODE; + pStringItemsResId = RID_RSC_ENUM_WRITING_MODE; break; case PROPERTY_ID_WHEEL_BEHAVIOR: - nStringItemsResId = RID_RSC_ENUM_WHEEL_BEHAVIOR; + pStringItemsResId = RID_RSC_ENUM_WHEEL_BEHAVIOR; break; case PROPERTY_ID_TEXT_ANCHOR_TYPE: - nStringItemsResId = RID_RSC_ENUM_TEXT_ANCHOR_TYPE; + pStringItemsResId = RID_RSC_ENUM_TEXT_ANCHOR_TYPE; break; case PROPERTY_ID_SHEET_ANCHOR_TYPE: - nStringItemsResId = RID_RSC_ENUM_SHEET_ANCHOR_TYPE; + pStringItemsResId = RID_RSC_ENUM_SHEET_ANCHOR_TYPE; break; default: OSL_FAIL( "OPropertyInfoService::getPropertyEnumRepresentations: unknown enum property!" ); @@ -499,18 +497,17 @@ namespace pcr std::vector< OUString > aReturn; - if (nStringItemsResId) + if (!pStringItemsResId) + return aReturn; + + while (*pStringItemsResId) { - PcrRes aResId(nStringItemsResId); - ResStringArray aResList(aResId); - for (sal_uInt32 i = 0; i < aResList.Count(); ++i) - aReturn.push_back(aResList.GetString(i)); + aReturn.push_back(PcrRes(*pStringItemsResId++)); } return aReturn; } - bool OPropertyInfoService::isComposeable( const OUString& _rPropertyName ) const { sal_Int32 nId = getPropertyId( _rPropertyName ); diff --git a/extensions/source/propctrlr/formres.src b/extensions/source/propctrlr/formres.src deleted file mode 100644 index d09d7f9f7f1e..000000000000 --- a/extensions/source/propctrlr/formres.src +++ /dev/null @@ -1,1287 +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 "formresid.hrc" - -String RID_STR_EDITMASK -{ - Text [ en-US ] = "Edit mask" ; -}; -String RID_STR_LITERALMASK -{ - Text [ en-US ] = "Literal mask" ; -}; -String RID_STR_READONLY -{ - Text [ en-US ] = "Read-only" ; -}; -String RID_STR_ENABLED -{ - Text [ en-US ] = "Enabled" ; -}; -String RID_STR_ENABLE_VISIBLE -{ - Text [ en-US ] = "Visible" ; -}; -String RID_STR_AUTOCOMPLETE -{ - Text [ en-US ] = "AutoFill" ; -}; -String RID_STR_LINECOUNT -{ - Text [ en-US ] = "Line count" ; -}; -String RID_STR_MAXTEXTLEN -{ - Text [ en-US ] = "Max. text length" ; -}; -String RID_STR_SPIN -{ - Text [ en-US ] = "Spin Button" ; -}; -String RID_STR_STRICTFORMAT -{ - Text [ en-US ] = "Strict format" ; -}; -String RID_STR_SHOWTHOUSANDSEP -{ - Text [ en-US ] = "Thousands separator" ; -}; -String RID_STR_PRINTABLE -{ - Text [ en-US ] = "Printable" ; -}; -String RID_STR_TARGET_URL -{ - Text [ en-US ] = "URL" ; -}; -String RID_STR_TARGET_FRAME -{ - Text [ en-US ] = "Frame" ; -}; -String RID_STR_HELPTEXT -{ - Text [ en-US ] = "Help text" ; -}; -String RID_STR_HELPURL -{ - Text [ en-US ] = "Help URL"; -}; -String RID_STR_TAG -{ - Text [ en-US ] = "Additional information" ; -}; -String RID_STR_ECHO_CHAR -{ - Text [ en-US ] = "Password character" ; -}; - -String RID_STR_TRISTATE -{ - Text [ en-US ] = "Tristate" ; -}; -String RID_STR_EMPTY_IS_NULL -{ - Text [ en-US ] = "Empty string is NULL" ; -}; -String RID_STR_DECIMAL_ACCURACY -{ - Text [ en-US ] = "Decimal accuracy" ; -}; -String RID_STR_IMAGE_URL -{ - Text [ en-US ] = "Graphics" ; -}; -String RID_STR_DEFAULT_SELECT_SEQ -{ - Text [ en-US ] = "Default selection" ; -}; -String RID_STR_DEFAULT_BUTTON -{ - Text [ en-US ] = "Default button" ; -}; -String RID_STR_LABELCONTROL -{ - Text [ en-US ] = "Label Field"; -}; -String RID_STR_LABEL -{ - Text [ en-US ] = "Label" ; -}; -String RID_STR_ALIGN -{ - Text [ en-US ] = "Alignment" ; -}; -String RID_STR_VERTICAL_ALIGN -{ - Text [ en-US ] = "Vert. Alignment" ; -}; - -StringArray RID_RSC_ENUM_VERTICAL_ALIGN -{ - ItemList [ en-US ] = - { - < "Top"; >; - < "Middle"; >; - < "Bottom"; >; - }; -}; - -String RID_STR_IMAGEPOSITION -{ - Text [ en-US ] = "Graphics alignment"; -}; -String RID_STR_FONT -{ - Text [ en-US ] = "Font" ; -}; -String RID_STR_BACKGROUNDCOLOR -{ - Text [ en-US ] = "Background color" ; -}; -String RID_STR_BORDER -{ - Text [ en-US ] = "Border" ; -}; -String RID_STR_ICONSIZE -{ - Text [ en-US ] = "Icon size" ; -}; - -StringArray RID_RSC_ENUM_ICONSIZE_TYPE -{ - ItemList [ en-US ] = - { - < "Small" ; >; - < "Large" ; >; - }; -}; - -String RID_STR_SHOW_POSITION -{ - Text [ en-US ] = "Positioning"; -}; -String RID_STR_SHOW_NAVIGATION -{ - Text [ en-US ] = "Navigation"; -}; -String RID_STR_SHOW_RECORDACTIONS -{ - Text [ en-US ] = "Acting on a record"; -}; -String RID_STR_SHOW_FILTERSORT -{ - Text [ en-US ] = "Filtering / Sorting"; -}; -String RID_STR_HSCROLL -{ - Text [ en-US ] = "Horizontal scroll bar" ; -}; -String RID_STR_VSCROLL -{ - Text [ en-US ] = "Vertical scroll bar" ; -}; -String RID_STR_WORDBREAK -{ - Text [ en-US ] = "Word break"; -}; -String RID_STR_MULTILINE -{ - Text [ en-US ] = "Multiline input" ; -}; -String RID_STR_MULTISELECTION -{ - Text [ en-US ] = "Multiselection" ; -}; -String RID_STR_NAME -{ - Text [ en-US ] = "Name" ; -}; -String RID_STR_GROUP_NAME -{ - Text [ en-US ] = "Group name" ; -}; -String RID_STR_TABINDEX -{ - Text [ en-US ] = "Tab order" ; -}; -String RID_STR_WHEEL_BEHAVIOR -{ - Text [ en-US ] = "Mouse wheel scroll" ; -}; -String RID_STR_FILTER -{ - Text [ en-US ] = "Filter" ; -}; -String RID_STR_SORT_CRITERIA -{ - Text [ en-US ] = "Sort" ; -}; -String RID_STR_RECORDMARKER -{ - Text [ en-US ] = "Record marker"; -}; -String RID_STR_FILTERPROPOSAL -{ - Text [ en-US ] = "Filter proposal"; -}; -String RID_STR_NAVIGATION -{ - Text [ en-US ] = "Navigation bar" ; -}; -String RID_STR_CYCLE -{ - Text [ en-US ] = "Cycle" ; -}; -String RID_STR_TABSTOP -{ - Text [ en-US ] = "Tabstop" ; -}; -String RID_STR_CONTROLSOURCE -{ - Text [ en-US ] = "Data field" ; -}; -String RID_STR_DROPDOWN -{ - Text [ en-US ] = "Dropdown" ; -}; -String RID_STR_BOUNDCOLUMN -{ - Text [ en-US ] = "Bound field" ; -}; -String RID_STR_LISTSOURCE -{ - Text [ en-US ] = "List content" ; -}; -String RID_STR_LISTSOURCETYPE -{ - Text [ en-US ] = "Type of list contents" ; -}; -String RID_STR_CURSORSOURCE -{ - Text [ en-US ] = "Content" ; -}; -String RID_STR_CURSORSOURCETYPE -{ - Text [ en-US ] = "Content type"; -}; -String RID_STR_ALLOW_ADDITIONS -{ - Text [ en-US ] = "Allow additions" ; -}; -String RID_STR_ALLOW_DELETIONS -{ - Text [ en-US ] = "Allow deletions" ; -}; -String RID_STR_ALLOW_EDITS -{ - Text [ en-US ] = "Allow modifications" ; -}; -String RID_STR_DATAENTRY -{ - Text [ en-US ] = "Add data only" ; -}; -String RID_STR_DATASOURCE -{ - Text [ en-US ] = "Data source"; -}; -String RID_STR_MASTERFIELDS -{ - Text [ en-US ] = "Link master fields" ; -}; -String RID_STR_SLAVEFIELDS -{ - Text [ en-US ] = "Link slave fields" ; -}; -String RID_STR_VALUEMIN -{ - Text [ en-US ] = "Value min." ; -}; -String RID_STR_VALUEMAX -{ - Text [ en-US ] = "Value max." ; -}; -String RID_STR_VALUESTEP -{ - Text [ en-US ] = "Incr./decrement value" ; -}; -String RID_STR_CURRENCYSYMBOL -{ - Text [ en-US ] = "Currency symbol" ; -}; -String RID_STR_DATEMIN -{ - Text [ en-US ] = "Date min." ; -}; -String RID_STR_DATEMAX -{ - Text [ en-US ] = "Date max." ; -}; -String RID_STR_DATEFORMAT -{ - Text [ en-US ] = "Date format" ; -}; -String RID_STR_SELECTEDITEMS -{ - Text [ en-US ] = "Selection" ; -}; -String RID_STR_TIMEMIN -{ - Text [ en-US ] = "Time min." ; -}; -String RID_STR_TIMEMAX -{ - Text [ en-US ] = "Time max." ; -}; -String RID_STR_TIMEFORMAT -{ - Text [ en-US ] = "Time format" ; -}; -String RID_STR_CURRSYM_POSITION -{ - Text [ en-US ] = "Prefix symbol"; -}; -String RID_STR_VALUE -{ - Text [ en-US ] = "Value" ; -}; -String RID_STR_FORMATKEY -{ - Text [ en-US ] = "Formatting" ; -}; -String RID_STR_CLASSID -{ - Text [ en-US ] = "Class ID" ; -}; -String RID_STR_HEIGHT -{ - Text [ en-US ] = "Height" ; -}; -String RID_STR_WIDTH -{ - Text [ en-US ] = "Width" ; -}; -String RID_STR_LISTINDEX -{ - Text [ en-US ] = "List index" ; -}; -String RID_STR_ROWHEIGHT -{ - Text [ en-US ] = "Row height" ; -}; -String RID_STR_FILLCOLOR -{ - Text [ en-US ] = "Fill color" ; -}; -String RID_STR_LINECOLOR -{ - Text [ en-US ] = "Line color" ; -}; -String RID_STR_REFVALUE -{ - Text [ en-US ] = "Reference value (on)" ; -}; -String RID_STR_UNCHECKEDREFVALUE -{ - Text [ en-US ] = "Reference value (off)"; -}; -String RID_STR_STRINGITEMLIST -{ - Text [ en-US ] = "List entries" ; -}; -String RID_STR_BUTTONTYPE -{ - Text [ en-US ] = "Action"; -}; -String RID_STR_SUBMIT_ACTION -{ - Text [ en-US ] = "URL" ; -}; -String RID_STR_SUBMIT_METHOD -{ - Text [ en-US ] = "Type of submission" ; -}; -String RID_STR_DEFAULT_STATE -{ - Text [ en-US ] = "Default status" ; -}; -String RID_STR_SUBMIT_ENCODING -{ - Text [ en-US ] = "Submission encoding" ; -}; -String RID_STR_DEFAULTVALUE -{ - Text [ en-US ] = "Default value" ; -}; -String RID_STR_DEFAULTTEXT -{ - Text [ en-US ] = "Default text"; -}; -String RID_STR_DEFAULTDATE -{ - Text [ en-US ] = "Default date"; -}; -String RID_STR_DEFAULTTIME -{ - Text [ en-US ] = "Default time"; -}; -String RID_STR_SUBMIT_TARGET -{ - Text [ en-US ] = "Frame" ; -}; - -StringArray RID_RSC_ENUM_BORDER_TYPE -{ - ItemList [ en-US ] = - { - < "Without frame" ; >; - < "3D look" ; >; - < "Flat" ; >; - }; -}; - -StringArray RID_RSC_ENUM_LISTSOURCE_TYPE -{ - ItemList [ en-US ] = - { - < "Valuelist"; >; - < "Table"; >; - < "Query"; >; - < "Sql"; >; - < "Sql [Native]"; >; - < "Tablefields" ; >; - }; -}; - -StringArray RID_RSC_ENUM_ALIGNMENT -{ - ItemList [ en-US ] = - { - < "Left"; >; - < "Center"; >; - < "Right" ; >; - }; -}; - -StringArray RID_RSC_ENUM_BUTTONTYPE -{ - ItemList [ en-US ] = - { - < "None"; >; - < "Submit form"; >; - < "Reset form"; >; - < "Open document/web page"; >; - < "First record"; >; - < "Previous record"; >; - < "Next record"; >; - < "Last record"; >; - < "Save record"; >; - < "Undo data entry"; >; - < "New record"; >; - < "Delete record"; >; - < "Refresh form"; >; - }; -}; - -StringArray RID_RSC_ENUM_SUBMIT_METHOD -{ - ItemList [ en-US ] = - { - < "Get"; >; - < "Post" ; >; - }; -}; - -StringArray RID_RSC_ENUM_SUBMIT_ENCODING -{ - ItemList [ en-US ] = - { - < "URL"; >; - < "Multipart"; >; - < "Text" ; >; - }; -}; - -StringArray RID_RSC_ENUM_DATEFORMAT_LIST -{ - ItemList [ en-US ] = - { - < "Standard (short)"; >; - < "Standard (short YY)"; >; - < "Standard (short YYYY)"; >; - < "Standard (long)"; >; - < "DD/MM/YY"; >; - < "MM/DD/YY"; >; - < "YY/MM/DD"; >; - < "DD/MM/YYYY"; >; - < "MM/DD/YYYY"; >; - < "YYYY/MM/DD"; >; - < "YY-MM-DD"; >; - < "YYYY-MM-DD" ; >; - }; -}; - -StringArray RID_RSC_ENUM_TIMEFORMAT_LIST -{ - ItemList [ en-US ] = - { - < "13:45"; >; - < "13:45:00"; >; - < "01:45 PM"; >; - < "01:45:00 PM" ; >; - }; -}; - -StringArray RID_RSC_ENUM_CHECKED -{ - ItemList [ en-US ] = - { - < "Not Selected"; >; - < "Selected"; >; - < "Not Defined" ; >; - }; -}; - -StringArray RID_RSC_ENUM_CYCLE -{ - ItemList [ en-US ] = - { - < "All records"; >; - < "Active record"; >; - < "Current page" ; >; - }; -}; - -StringArray RID_RSC_ENUM_NAVIGATION -{ - ItemList [ en-US ] = - { - < "No"; >; - < "Yes"; >; - < "Parent Form"; >; - }; -}; - -StringArray RID_RSC_ENUM_SUBMIT_TARGET -{ - ItemList [ en-US ] = - { - < "_blank"; >; - < "_parent"; >; - < "_self"; >; - < "_top"; >; - }; -}; - -StringArray RID_RSC_ENUM_SELECTION_TYPE -{ - ItemList [ en-US ] = - { - < "None" ; >; - < "Single" ; >; - < "Multi" ; >; - < "Range" ; >; - }; - -}; - -String RID_STR_EVT_APPROVEPARAMETER -{ - Text [ en-US ] = "Fill parameters" ; -}; -String RID_STR_EVT_ACTIONPERFORMED -{ - Text [ en-US ] = "Execute action" ; -}; -String RID_STR_EVT_AFTERUPDATE -{ - Text [ en-US ] = "After updating" ; -}; -String RID_STR_EVT_BEFOREUPDATE -{ - Text [ en-US ] = "Before updating" ; -}; -String RID_STR_EVT_APPROVEROWCHANGE -{ - Text [ en-US ] = "Before record action" ; -}; -String RID_STR_EVT_ROWCHANGE -{ - Text [ en-US ] = "After record action" ; -}; -String RID_STR_EVT_CONFIRMDELETE -{ - Text [ en-US ] = "Confirm deletion" ; -}; -String RID_STR_EVT_ERROROCCURRED -{ - Text [ en-US ] = "Error occurred" ; -}; -String RID_STR_EVT_FOCUSGAINED -{ - Text [ en-US ] = "When receiving focus" ; -}; -String RID_STR_EVT_FOCUSLOST -{ - Text [ en-US ] = "When losing focus" ; -}; -String RID_STR_EVT_ITEMSTATECHANGED -{ - Text [ en-US ] = "Item status changed" ; -}; -String RID_STR_EVT_KEYTYPED -{ - Text [ en-US ] = "Key pressed" ; -}; -String RID_STR_EVT_KEYUP -{ - Text [ en-US ] = "Key released" ; -}; -String RID_STR_EVT_LOADED -{ - Text [ en-US ] = "When loading" ; -}; -String RID_STR_EVT_RELOADING -{ - Text [ en-US ] = "Before reloading" ; -}; -String RID_STR_EVT_RELOADED -{ - Text [ en-US ] = "When reloading" ; -}; -String RID_STR_EVT_MOUSEDRAGGED -{ - Text [ en-US ] = "Mouse moved while key pressed" ; -}; -String RID_STR_EVT_MOUSEENTERED -{ - Text [ en-US ] = "Mouse inside" ; -}; -String RID_STR_EVT_MOUSEEXITED -{ - Text [ en-US ] = "Mouse outside" ; -}; -String RID_STR_EVT_MOUSEMOVED -{ - Text [ en-US ] = "Mouse moved" ; -}; -String RID_STR_EVT_MOUSEPRESSED -{ - Text [ en-US ] = "Mouse button pressed" ; -}; -String RID_STR_EVT_MOUSERELEASED -{ - Text [ en-US ] = "Mouse button released" ; -}; -String RID_STR_EVT_POSITIONING -{ - Text [ en-US ] = "Before record change" ; -}; -String RID_STR_EVT_POSITIONED -{ - Text [ en-US ] = "After record change" ; -}; -String RID_STR_EVT_RESETTED -{ - Text [ en-US ] = "After resetting" ; -}; -String RID_STR_EVT_APPROVERESETTED -{ - Text [ en-US ] = "Prior to reset" ; -}; -String RID_STR_EVT_APPROVEACTIONPERFORMED -{ - Text [ en-US ] = "Approve action" ; -}; -String RID_STR_EVT_SUBMITTED -{ - Text [ en-US ] = "Before submitting" ; -}; -String RID_STR_EVT_TEXTCHANGED -{ - Text [ en-US ] = "Text modified" ; -}; -String RID_STR_EVT_UNLOADING -{ - Text [ en-US ] = "Before unloading" ; -}; -String RID_STR_EVT_UNLOADED -{ - Text [ en-US ] = "When unloading" ; -}; -String RID_STR_EVT_CHANGED -{ - Text [ en-US ] = "Changed" ; -}; -String RID_STR_EVENTS -{ - Text [ en-US ] = "Events" ; -}; -String RID_STR_ESCAPE_PROCESSING -{ - Text [ en-US ] = "Analyze SQL command"; -}; -String RID_STR_POSITIONX -{ - Text [ en-US ] = "PositionX"; -}; -String RID_STR_POSITIONY -{ - Text [ en-US ] = "PositionY"; -}; -String RID_STR_TITLE -{ - Text [ en-US ] = "Title"; -}; -String RID_STR_STEP -{ - Text [ en-US ] = "Page (step)"; -}; -String RID_STR_PROGRESSVALUE -{ - Text [ en-US ] = "Progress value"; -}; -String RID_STR_PROGRESSVALUE_MIN -{ - Text [ en-US ] = "Progress value min."; -}; -String RID_STR_PROGRESSVALUE_MAX -{ - Text [ en-US ] = "Progress value max."; -}; -String RID_STR_SCROLLVALUE -{ - Text [ en-US ] = "Scroll value"; -}; -String RID_STR_SCROLLVALUE_MAX -{ - Text [ en-US ] = "Scroll value max."; -}; -String RID_STR_SCROLLVALUE_MIN -{ - Text [ en-US ] = "Scroll value min."; -}; -String RID_STR_SCROLL_WIDTH -{ - Text [ en-US ] = "Scroll width"; -}; -String RID_STR_SCROLL_HEIGHT -{ - Text [ en-US ] = "Scroll height"; -}; -String RID_STR_SCROLL_TOP -{ - Text [ en-US ] = "Scroll top"; -}; -String RID_STR_SCROLL_LEFT -{ - Text [ en-US ] = "Scroll left"; -}; -String RID_STR_DEFAULT_SCROLLVALUE -{ - Text [ en-US ] = "Default scroll value"; -}; -String RID_STR_LINEINCREMENT -{ - Text [ en-US ] = "Small change"; -}; -String RID_STR_BLOCKINCREMENT -{ - Text [ en-US ] = "Large change"; -}; -String RID_STR_REPEAT_DELAY -{ - Text [ en-US ] = "Delay"; -}; -String RID_STR_REPEAT -{ - Text [ en-US ] = "Repeat"; -}; -String RID_STR_VISIBLESIZE -{ - Text [ en-US ] = "Visible size"; -}; -String RID_STR_ORIENTATION -{ - Text [ en-US ] = "Orientation"; -}; - -StringArray RID_RSC_ENUM_ORIENTATION -{ - ItemList [ en-US ] = - { - < "Horizontal"; >; - < "Vertical"; >; - }; -}; - -String RID_STR_EVT_ADJUSTMENTVALUECHANGED -{ - Text [ en-US ] = "While adjusting"; -}; -String RID_STR_DATE -{ - Text [ en-US ] = "Date"; -}; -String RID_STR_STATE -{ - Text [ en-US ] = "State"; -}; -String RID_STR_TIME -{ - Text [ en-US ] = "Time"; -}; -String RID_STR_SCALEIMAGE -{ - Text [ en-US ] = "Scale"; -}; -String RID_STR_PUSHBUTTONTYPE -{ - Text [ en-US ] = "Button type"; -}; - -StringArray RID_RSC_ENUM_PUSHBUTTONTYPE -{ - ItemList [ en-US ] = - { - < "Default"; >; - < "OK"; >; - < "Cancel"; >; - < "Help"; >; - }; -}; - -String RID_STR_UNABLETOCONNECT -{ - Text [ en-US ] = "The connection to the data source \"$name$\" could not be established."; -}; - -String RID_STR_TEXT -{ - Text [ en-US ] = "Text"; -}; - -String RID_STR_BOUND_CELL -{ - Text [ en-US ] = "Linked cell"; -}; - -String RID_STR_LIST_CELL_RANGE -{ - Text [ en-US ] = "Source cell range"; -}; - -String RID_STR_CELL_EXCHANGE_TYPE -{ - Text [ en-US ] = "Contents of the linked cell"; -}; - -StringArray RID_RSC_ENUM_CELL_EXCHANGE_TYPE -{ - ItemList [ en-US ] = - { - < "The selected entry"; >; - < "Position of the selected entry"; >; - }; -}; - -String RID_STR_SHOW_SCROLLBARS -{ - Text [ en-US ] = "Scrollbars"; -}; - -StringArray RID_RSC_ENUM_TEXTTYPE -{ - ItemList [ en-US ] = - { - < "Single-line"; >; - < "Multi-line"; >; - < "Multi-line with formatting"; >; - }; -}; - -String RID_STR_SYMBOLCOLOR -{ - Text [ en-US ] = "Symbol color" ; -}; - -String RID_STR_LINEEND_FORMAT -{ - Text [ en-US ] = "Text lines end with"; -}; - -StringArray RID_RSC_ENUM_LINEEND_FORMAT -{ - ItemList [ en-US ] = - { - < "LF (Unix)"; >; - < "CR+LF (Windows)"; >; - }; -}; - -StringArray RID_RSC_ENUM_SCROLLBARS -{ - ItemList [ en-US ] = - { - < "None"; >; - < "Horizontal"; >; - < "Vertical"; >; - < "Both"; >; - }; -}; - -StringArray RID_RSC_ENUM_COMMAND_TYPE -{ - ItemList [ en-US ] = - { - < "Table"; >; - < "Query"; >; - < "SQL command"; >; - }; -}; - -String RID_STR_TOGGLE -{ - Text [ en-US ] = "Toggle"; -}; - -String RID_STR_FOCUSONCLICK -{ - Text [ en-US ] = "Take Focus on Click"; -}; - -String RID_STR_HIDEINACTIVESELECTION -{ - Text [ en-US ] = "Hide selection"; -}; - -String RID_STR_VISUALEFFECT -{ - Text [ en-US ] = "Style"; -}; - -StringArray RID_RSC_ENUM_VISUALEFFECT -{ - ItemList [ en-US ] = - { - < "3D"; >; - < "Flat"; >; - }; -}; - -String RID_STR_BORDERCOLOR -{ - Text [ en-US ] = "Border color"; -}; - -StringArray RID_RSC_ENUM_IMAGE_POSITION -{ - ItemList [ en-US ] = - { - < "Left top"; >; - < "Left centered"; >; - < "Left bottom"; >; - < "Right top"; >; - < "Right centered"; >; - < "Right bottom"; >; - < "Above left"; >; - < "Above centered"; >; - < "Above right"; >; - < "Below left"; >; - < "Below centered"; >; - < "Below right"; >; - < "Centered"; >; - }; -}; - -String RID_STR_AUTOLINEBREAK -{ - Text [ en-US ] = "Wrap text automatically"; -}; - -String RID_STR_TEXTTYPE -{ - Text [ en-US ] = "Text type"; -}; - -StringArray RID_RSC_ENUM_SHOWHIDE -{ - ItemList [ en-US ] = - { - < "Hide" ; >; - < "Show" ; >; - }; -}; - -String RID_STR_XML_DATA_MODEL -{ - Text [ en-US ] = "XML data model"; -}; - -String RID_STR_BIND_EXPRESSION -{ - Text [ en-US ] = "Binding expression"; -}; - -String RID_STR_XSD_REQUIRED -{ - Text [ en-US ] = "Required"; -}; - -String RID_STR_LIST_BINDING -{ - Text [ en-US ] = "List entry source"; -}; - -String RID_STR_XSD_RELEVANT -{ - Text [ en-US ] = "Relevant"; -}; - -String RID_STR_XSD_READONLY -{ - Text [ en-US ] = "Read-only"; -}; - -String RID_STR_XSD_CONSTRAINT -{ - Text [ en-US ] = "Constraint"; -}; - -String RID_STR_XSD_CALCULATION -{ - Text [ en-US ] = "Calculation"; -}; - -String RID_STR_XSD_DATA_TYPE -{ - Text [ en-US ] = "Data type"; -}; - -String RID_STR_XSD_WHITESPACES -{ - Text [ en-US ] = "Whitespaces"; -}; - -StringArray RID_RSC_ENUM_WHITESPACE_HANDLING -{ - ItemList [ en-US ] = - { - < "Preserve"; >; - < "Replace"; >; - < "Collapse"; >; - }; -}; - -String RID_STR_XSD_PATTERN -{ - Text [ en-US ] = "Pattern"; -}; - -String RID_STR_XSD_LENGTH -{ - Text [ en-US ] = "Length"; -}; - -String RID_STR_XSD_MIN_LENGTH -{ - Text [ en-US ] = "Length (at least)"; -}; - -String RID_STR_XSD_MAX_LENGTH -{ - Text [ en-US ] = "Length (at most)"; -}; - -String RID_STR_XSD_TOTAL_DIGITS -{ - Text [ en-US ] = "Digits (total)"; -}; - -String RID_STR_XSD_FRACTION_DIGITS -{ - Text [ en-US ] = "Digits (fraction)"; -}; - -String RID_STR_XSD_MAX_INCLUSIVE -{ - Text [ en-US ] = "Max. (inclusive)"; -}; - -String RID_STR_XSD_MAX_EXCLUSIVE -{ - Text [ en-US ] = "Max. (exclusive)"; -}; - -String RID_STR_XSD_MIN_INCLUSIVE -{ - Text [ en-US ] = "Min. (inclusive)"; -}; - -String RID_STR_XSD_MIN_EXCLUSIVE -{ - Text [ en-US ] = "Min. (exclusive)"; -}; - -String RID_STR_SUBMISSION_ID -{ - Text [ en-US ] = "Submission"; -}; - -String RID_STR_BINDING_UI_NAME -{ - Text [ en-US ] = "Binding" ; -}; - -String RID_STR_SELECTION_TYPE -{ - Text [ en-US ] = "Selection type" ; -}; - -String RID_STR_ROOT_DISPLAYED -{ - Text [ en-US ] = "Root displayed" ; -}; - -String RID_STR_SHOWS_HANDLES -{ - Text [ en-US ] = "Show handles" ; -}; - -String RID_STR_SHOWS_ROOT_HANDLES -{ - Text [ en-US ] = "Show root handles" ; -}; - -String RID_STR_EDITABLE -{ - Text [ en-US ] = "Editable" ; -}; - -String RID_STR_INVOKES_STOP_NOT_EDITING -{ - Text [ en-US ] = "Invokes stop node editing" ; -}; - -String RID_STR_DECORATION -{ - Text [ en-US ] = "With title bar" ; -}; - -String RID_STR_NOLABEL -{ - Text [ en-US ] = "No Label" ; -}; - -StringArray RID_RSC_ENUM_SCALE_MODE -{ - ItemList [ en-US ] = - { - < "No"; >; - < "Keep Ratio"; >; - < "Fit to Size"; >; - }; -}; - -String RID_STR_INPUT_REQUIRED -{ - Text [ en-US ] = "Input required"; -}; - -String RID_STR_WRITING_MODE -{ - Text [ en-US ] = "Text direction"; -}; - -StringArray RID_RSC_ENUM_WRITING_MODE -{ - ItemList [ en-US ] = - { - < "Left-to-right"; >; - < "Right-to-left"; >; - < "Use superordinate object settings"; >; - }; -}; - -StringArray RID_RSC_ENUM_WHEEL_BEHAVIOR -{ - ItemList [ en-US ] = - { - < "Never"; >; - < "When focused"; >; - < "Always"; >; - }; -}; - -String RID_STR_ANCHOR_TYPE -{ - Text [ en-US ] = "Anchor"; -}; - -StringArray RID_RSC_ENUM_TEXT_ANCHOR_TYPE -{ - ItemList [ en-US ] = - { - < "To Paragraph"; >; - < "As Character"; >; - < "To Page"; >; - < "To Frame"; >; - < "To Character"; >; - }; -}; - -StringArray RID_RSC_ENUM_SHEET_ANCHOR_TYPE -{ - ItemList [ en-US ] = - { - < "To Page"; >; - < "To Cell"; >; - }; -}; - -String RID_STR_FONTSTYLE_REGULAR -{ - Text [ en-US ] = "Regular"; - Text [ x-comment ] = "That's the 'Regular' as used for a font style (as opposed to 'italic' and 'bold'), so please use a consistent translation."; -}; - -String RID_STR_FONTSTYLE_BOLD_ITALIC -{ - Text [ en-US ] = "Bold Italic"; - Text [ x-comment ] = "That's the 'Bold Italic' as used for a font style, so please use a consistent translation."; -}; - -String RID_STR_FONTSTYLE_ITALIC -{ - Text [ en-US ] = "Italic"; - Text [ x-comment ] = "That's the 'Italic' as used for a font style, so please use a consistent translation."; -}; - -String RID_STR_FONTSTYLE_BOLD -{ - Text [ en-US ] = "Bold"; - Text [ x-comment ] = "That's the 'Bold' as used for a font style, so please use a consistent translation."; -}; - -String RID_STR_FONT_DEFAULT -{ - Text [ en-US ] = "(Default)"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/formresid.hrc b/extensions/source/propctrlr/formresid.hrc deleted file mode 100644 index 893dedf84c3b..000000000000 --- a/extensions/source/propctrlr/formresid.hrc +++ /dev/null @@ -1,315 +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_EXTENSIONS_SOURCE_PROPCTRLR_FORMRESID_HRC -#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FORMRESID_HRC - -#include "propresid.hrc" - -// - Strings - -#define RID_STR_FORMS ( RID_FORMBROWSER_START + 1 ) -#define RID_STR_PROPTITLE_DBGRID ( RID_FORMBROWSER_START + 2 ) -#define RID_STR_PROPTITLE_PATTERNFIELD ( RID_FORMBROWSER_START + 3 ) -#define RID_STR_PROPTITLE_CURRENCYFIELD ( RID_FORMBROWSER_START + 4 ) -#define RID_STR_PROPTITLE_NUMERICFIELD ( RID_FORMBROWSER_START + 5 ) -#define RID_STR_PROPTITLE_TIMEFIELD ( RID_FORMBROWSER_START + 6 ) -#define RID_STR_PROPTITLE_DATEFIELD ( RID_FORMBROWSER_START + 7 ) -#define RID_STR_PROPTITLE_FILECONTROL ( RID_FORMBROWSER_START + 8 ) -#define RID_STR_PROPTITLE_IMAGECONTROL ( RID_FORMBROWSER_START + 9 ) -#define RID_STR_PROPTITLE_IMAGEBUTTON ( RID_FORMBROWSER_START + 10 ) -#define RID_STR_PROPTITLE_COMBOBOX ( RID_FORMBROWSER_START + 11 ) -#define RID_STR_PROPTITLE_LISTBOX ( RID_FORMBROWSER_START + 12 ) -#define RID_STR_PROPTITLE_FORMATTED ( RID_FORMBROWSER_START + 13 ) -#define RID_STR_PROPTITLE_EDIT ( RID_FORMBROWSER_START + 14 ) -#define RID_STR_PROPTITLE_GROUPBOX ( RID_FORMBROWSER_START + 15 ) -#define RID_STR_PROPTITLE_FIXEDTEXT ( RID_FORMBROWSER_START + 16 ) -#define RID_STR_PROPTITLE_CHECKBOX ( RID_FORMBROWSER_START + 17 ) -#define RID_STR_PROPTITLE_RADIOBUTTON ( RID_FORMBROWSER_START + 18 ) -#define RID_STR_PROPTITLE_PUSHBUTTON ( RID_FORMBROWSER_START + 19 ) -#define RID_STR_PROPTITLE_HIDDENCONTROL ( RID_FORMBROWSER_START + 30 ) -#define RID_STR_PROPTITLE_UNKNOWNCONTROL ( RID_FORMBROWSER_START + 31 ) - -#define RID_STR_NAME ( RID_FORMBROWSER_START + 32 ) -#define RID_STR_LABEL ( RID_FORMBROWSER_START + 33 ) -#define RID_STR_LABELCONTROL ( RID_FORMBROWSER_START + 34 ) -#define RID_STR_MAXTEXTLEN ( RID_FORMBROWSER_START + 35 ) -#define RID_STR_EDITMASK ( RID_FORMBROWSER_START + 36 ) -#define RID_STR_LITERALMASK ( RID_FORMBROWSER_START + 37 ) -#define RID_STR_STRICTFORMAT ( RID_FORMBROWSER_START + 38 ) -#define RID_STR_ENABLED ( RID_FORMBROWSER_START + 39 ) -#define RID_STR_READONLY ( RID_FORMBROWSER_START + 40 ) -#define RID_STR_PRINTABLE ( RID_FORMBROWSER_START + 41 ) -#define RID_STR_CONTROLSOURCE ( RID_FORMBROWSER_START + 42 ) -#define RID_STR_TABSTOP ( RID_FORMBROWSER_START + 43 ) -#define RID_STR_TABINDEX ( RID_FORMBROWSER_START + 44 ) -#define RID_STR_DATASOURCE ( RID_FORMBROWSER_START + 45 ) -#define RID_STR_CURSORSOURCE ( RID_FORMBROWSER_START + 46 ) -#define RID_STR_CURSORSOURCETYPE ( RID_FORMBROWSER_START + 47 ) -#define RID_STR_FILTER ( RID_FORMBROWSER_START + 48 ) -#define RID_STR_SORT_CRITERIA ( RID_FORMBROWSER_START + 49 ) -#define RID_STR_ALLOW_ADDITIONS ( RID_FORMBROWSER_START + 50 ) -#define RID_STR_ALLOW_EDITS ( RID_FORMBROWSER_START + 51 ) -#define RID_STR_ALLOW_DELETIONS ( RID_FORMBROWSER_START + 52 ) -#define RID_STR_DATAENTRY ( RID_FORMBROWSER_START + 53 ) -#define RID_STR_CYCLE ( RID_FORMBROWSER_START + 54 ) -#define RID_STR_VALUE ( RID_FORMBROWSER_START + 55 ) -#define RID_STR_VALUESTEP ( RID_FORMBROWSER_START + 56 ) -#define RID_STR_DECIMAL_ACCURACY ( RID_FORMBROWSER_START + 57 ) -#define RID_STR_SHOWTHOUSANDSEP ( RID_FORMBROWSER_START + 58 ) -#define RID_STR_REFVALUE ( RID_FORMBROWSER_START + 59 ) -#define RID_STR_CURRENCYSYMBOL ( RID_FORMBROWSER_START + 60 ) -#define RID_STR_CURRSYM_POSITION ( RID_FORMBROWSER_START + 61 ) -#define RID_STR_DATEMIN ( RID_FORMBROWSER_START + 62 ) -#define RID_STR_DATEMAX ( RID_FORMBROWSER_START + 63 ) -#define RID_STR_DATEFORMAT ( RID_FORMBROWSER_START + 64 ) -#define RID_STR_SELECTEDITEMS ( RID_FORMBROWSER_START + 65 ) -#define RID_STR_TIMEMIN ( RID_FORMBROWSER_START + 66 ) -#define RID_STR_TIMEMAX ( RID_FORMBROWSER_START + 67 ) -#define RID_STR_TIMEFORMAT ( RID_FORMBROWSER_START + 68 ) -#define RID_STR_VALUEMIN ( RID_FORMBROWSER_START + 69 ) -#define RID_STR_VALUEMAX ( RID_FORMBROWSER_START + 70 ) -#define RID_STR_FORMATKEY ( RID_FORMBROWSER_START + 71 ) -#define RID_STR_CLASSID ( RID_FORMBROWSER_START + 72 ) -#define RID_STR_HEIGHT ( RID_FORMBROWSER_START + 73 ) -#define RID_STR_WIDTH ( RID_FORMBROWSER_START + 74 ) -#define RID_STR_BOUNDCOLUMN ( RID_FORMBROWSER_START + 75 ) -#define RID_STR_LISTSOURCETYPE ( RID_FORMBROWSER_START + 76 ) -#define RID_STR_LISTSOURCE ( RID_FORMBROWSER_START + 77 ) -#define RID_STR_LISTINDEX ( RID_FORMBROWSER_START + 78 ) -#define RID_STR_STRINGITEMLIST ( RID_FORMBROWSER_START + 79 ) -#define RID_STR_DEFAULTVALUE ( RID_FORMBROWSER_START + 80 ) -#define RID_STR_FONT ( RID_FORMBROWSER_START + 81 ) -#define RID_STR_ALIGN ( RID_FORMBROWSER_START + 82 ) -#define RID_STR_ROWHEIGHT ( RID_FORMBROWSER_START + 83 ) -#define RID_STR_BACKGROUNDCOLOR ( RID_FORMBROWSER_START + 84 ) -#define RID_STR_FILLCOLOR ( RID_FORMBROWSER_START + 85 ) -#define RID_STR_LINECOLOR ( RID_FORMBROWSER_START + 86 ) -#define RID_STR_BORDER ( RID_FORMBROWSER_START + 87 ) -#define RID_STR_DROPDOWN ( RID_FORMBROWSER_START + 88 ) -#define RID_STR_AUTOCOMPLETE ( RID_FORMBROWSER_START + 89 ) -#define RID_STR_LINECOUNT ( RID_FORMBROWSER_START + 90 ) -#define RID_STR_MULTILINE ( RID_FORMBROWSER_START + 91 ) -#define RID_STR_MULTISELECTION ( RID_FORMBROWSER_START + 92 ) -#define RID_STR_BUTTONTYPE ( RID_FORMBROWSER_START + 93 ) -#define RID_STR_HSCROLL ( RID_FORMBROWSER_START + 94 ) -#define RID_STR_VSCROLL ( RID_FORMBROWSER_START + 95 ) -#define RID_STR_SPIN ( RID_FORMBROWSER_START + 96 ) -#define RID_STR_AUTOLINEBREAK ( RID_FORMBROWSER_START + 97 ) -#define RID_STR_TARGET_URL ( RID_FORMBROWSER_START + 98 ) -#define RID_STR_TARGET_FRAME ( RID_FORMBROWSER_START + 99 ) -#define RID_STR_SUBMIT_ACTION ( RID_FORMBROWSER_START + 100 ) -#define RID_STR_SUBMIT_TARGET ( RID_FORMBROWSER_START + 101 ) -#define RID_STR_SUBMIT_METHOD ( RID_FORMBROWSER_START + 102 ) -#define RID_STR_SUBMIT_ENCODING ( RID_FORMBROWSER_START + 103 ) -#define RID_STR_DEFAULT_STATE ( RID_FORMBROWSER_START + 104 ) -#define RID_STR_DEFAULT_BUTTON ( RID_FORMBROWSER_START + 105 ) -#define RID_STR_IMAGE_URL ( RID_FORMBROWSER_START + 106 ) -#define RID_STR_DEFAULT_SELECT_SEQ ( RID_FORMBROWSER_START + 107 ) -#define RID_STR_ECHO_CHAR ( RID_FORMBROWSER_START + 108 ) -#define RID_STR_EMPTY_IS_NULL ( RID_FORMBROWSER_START + 109 ) -#define RID_STR_TRISTATE ( RID_FORMBROWSER_START + 110 ) -#define RID_STR_MASTERFIELDS ( RID_FORMBROWSER_START + 111 ) -#define RID_STR_SLAVEFIELDS ( RID_FORMBROWSER_START + 112 ) -#define RID_STR_NAVIGATION ( RID_FORMBROWSER_START + 113 ) -#define RID_STR_RECORDMARKER ( RID_FORMBROWSER_START + 114 ) -#define RID_STR_FILTERPROPOSAL ( RID_FORMBROWSER_START + 115 ) -#define RID_STR_TAG ( RID_FORMBROWSER_START + 116 ) -#define RID_STR_HELPTEXT ( RID_FORMBROWSER_START + 117 ) -#define RID_STR_HELPURL ( RID_FORMBROWSER_START + 118 ) -#define RID_STR_INPUT_REQUIRED ( RID_FORMBROWSER_START + 119 ) -#define RID_STR_UNCHECKEDREFVALUE ( RID_FORMBROWSER_START + 120 ) -#define RID_STR_ENABLE_VISIBLE ( RID_FORMBROWSER_START + 122 ) -#define RID_STR_WHEEL_BEHAVIOR ( RID_FORMBROWSER_START + 123 ) -#define RID_STR_GROUP_NAME ( RID_FORMBROWSER_START + 124 ) - // FREE -#define RID_STR_EVT_APPROVEACTIONPERFORMED ( RID_FORMBROWSER_START + 132 ) -#define RID_STR_EVT_ACTIONPERFORMED ( RID_FORMBROWSER_START + 133 ) -#define RID_STR_EVT_CHANGED ( RID_FORMBROWSER_START + 134 ) -#define RID_STR_EVT_TEXTCHANGED ( RID_FORMBROWSER_START + 135 ) -#define RID_STR_EVT_ITEMSTATECHANGED ( RID_FORMBROWSER_START + 136 ) -#define RID_STR_EVT_FOCUSGAINED ( RID_FORMBROWSER_START + 137 ) -#define RID_STR_EVT_FOCUSLOST ( RID_FORMBROWSER_START + 138 ) -#define RID_STR_EVT_KEYTYPED ( RID_FORMBROWSER_START + 139 ) -#define RID_STR_EVT_KEYUP ( RID_FORMBROWSER_START + 140 ) -#define RID_STR_EVT_MOUSEENTERED ( RID_FORMBROWSER_START + 141 ) -#define RID_STR_EVT_MOUSEDRAGGED ( RID_FORMBROWSER_START + 142 ) -#define RID_STR_EVT_MOUSEMOVED ( RID_FORMBROWSER_START + 143 ) -#define RID_STR_EVT_MOUSEPRESSED ( RID_FORMBROWSER_START + 144 ) -#define RID_STR_EVT_MOUSERELEASED ( RID_FORMBROWSER_START + 145 ) -#define RID_STR_EVT_MOUSEEXITED ( RID_FORMBROWSER_START + 146 ) -#define RID_STR_EVT_APPROVERESETTED ( RID_FORMBROWSER_START + 147 ) -#define RID_STR_EVT_RESETTED ( RID_FORMBROWSER_START + 148 ) -#define RID_STR_EVT_SUBMITTED ( RID_FORMBROWSER_START + 149 ) -#define RID_STR_EVT_BEFOREUPDATE ( RID_FORMBROWSER_START + 150 ) -#define RID_STR_EVT_AFTERUPDATE ( RID_FORMBROWSER_START + 151 ) -#define RID_STR_EVT_LOADED ( RID_FORMBROWSER_START + 152 ) -#define RID_STR_EVT_RELOADING ( RID_FORMBROWSER_START + 153 ) -#define RID_STR_EVT_RELOADED ( RID_FORMBROWSER_START + 154 ) -#define RID_STR_EVT_UNLOADING ( RID_FORMBROWSER_START + 155 ) -#define RID_STR_EVT_UNLOADED ( RID_FORMBROWSER_START + 156 ) -#define RID_STR_EVT_CONFIRMDELETE ( RID_FORMBROWSER_START + 157 ) -#define RID_STR_EVT_APPROVEROWCHANGE ( RID_FORMBROWSER_START + 158 ) -#define RID_STR_EVT_ROWCHANGE ( RID_FORMBROWSER_START + 159 ) -#define RID_STR_EVT_POSITIONING ( RID_FORMBROWSER_START + 160 ) -#define RID_STR_EVT_POSITIONED ( RID_FORMBROWSER_START + 161 ) -#define RID_STR_EVT_APPROVEPARAMETER ( RID_FORMBROWSER_START + 162 ) -#define RID_STR_EVT_ERROROCCURRED ( RID_FORMBROWSER_START + 163 ) -#define RID_STR_EVENTS ( RID_FORMBROWSER_START + 164 ) -#define RID_STR_ESCAPE_PROCESSING ( RID_FORMBROWSER_START + 165 ) - // FREE -#define RID_STR_POSITIONX ( RID_FORMBROWSER_START + 167 ) -#define RID_STR_POSITIONY ( RID_FORMBROWSER_START + 168 ) -#define RID_STR_TITLE ( RID_FORMBROWSER_START + 169 ) -#define RID_STR_STEP ( RID_FORMBROWSER_START + 170 ) -#define RID_STR_PROGRESSVALUE ( RID_FORMBROWSER_START + 171 ) -#define RID_STR_PROGRESSVALUE_MIN ( RID_FORMBROWSER_START + 172 ) -#define RID_STR_PROGRESSVALUE_MAX ( RID_FORMBROWSER_START + 173 ) -#define RID_STR_SCROLLVALUE ( RID_FORMBROWSER_START + 174 ) -#define RID_STR_SCROLLVALUE_MAX ( RID_FORMBROWSER_START + 175 ) -#define RID_STR_LINEINCREMENT ( RID_FORMBROWSER_START + 176 ) -#define RID_STR_BLOCKINCREMENT ( RID_FORMBROWSER_START + 177 ) -#define RID_STR_VISIBLESIZE ( RID_FORMBROWSER_START + 178 ) -#define RID_STR_ORIENTATION ( RID_FORMBROWSER_START + 179 ) - // FREE -#define RID_STR_VERTICAL_ALIGN ( RID_FORMBROWSER_START + 181 ) -#define RID_STR_EVT_ADJUSTMENTVALUECHANGED ( RID_FORMBROWSER_START + 182 ) -#define RID_STR_DATE ( RID_FORMBROWSER_START + 183 ) -#define RID_STR_STATE ( RID_FORMBROWSER_START + 184 ) -#define RID_STR_TIME ( RID_FORMBROWSER_START + 185 ) -#define RID_STR_SCALEIMAGE ( RID_FORMBROWSER_START + 186 ) -#define RID_STR_PUSHBUTTONTYPE ( RID_FORMBROWSER_START + 187 ) -#define RID_STR_UNABLETOCONNECT ( RID_FORMBROWSER_START + 189 ) -#define RID_STR_TEXT ( RID_FORMBROWSER_START + 190 ) -#define RID_STR_BOUND_CELL ( RID_FORMBROWSER_START + 191 ) -#define RID_STR_LIST_CELL_RANGE ( RID_FORMBROWSER_START + 192 ) -#define RID_STR_CELL_EXCHANGE_TYPE ( RID_FORMBROWSER_START + 193 ) -#define RID_STR_ANCHOR_TYPE ( RID_FORMBROWSER_START + 194 ) -#define RID_STR_SCROLLVALUE_MIN ( RID_FORMBROWSER_START + 195 ) -#define RID_STR_DEFAULT_SCROLLVALUE ( RID_FORMBROWSER_START + 196 ) -#define RID_STR_REPEAT_DELAY ( RID_FORMBROWSER_START + 197 ) -#define RID_STR_SYMBOLCOLOR ( RID_FORMBROWSER_START + 198 ) -#define RID_STR_REPEAT ( RID_FORMBROWSER_START + 199 ) -#define RID_STR_IMAGEPOSITION ( RID_FORMBROWSER_START + 200 ) -#define RID_STR_DEFAULTTEXT ( RID_FORMBROWSER_START + 201 ) -#define RID_STR_DEFAULTDATE ( RID_FORMBROWSER_START + 202 ) -#define RID_STR_DEFAULTTIME ( RID_FORMBROWSER_START + 203 ) -#define RID_STR_WORDBREAK ( RID_FORMBROWSER_START + 204 ) -#define RID_STR_SHOW_SCROLLBARS ( RID_FORMBROWSER_START + 205 ) -#define RID_STR_ICONSIZE ( RID_FORMBROWSER_START + 207 ) -#define RID_STR_WRITING_MODE ( RID_FORMBROWSER_START + 208 ) -#define RID_STR_SHOW_POSITION ( RID_FORMBROWSER_START + 209 ) -#define RID_STR_SHOW_NAVIGATION ( RID_FORMBROWSER_START + 210 ) -#define RID_STR_SHOW_RECORDACTIONS ( RID_FORMBROWSER_START + 211 ) -#define RID_STR_SHOW_FILTERSORT ( RID_FORMBROWSER_START + 212 ) -#define RID_STR_TEXTTYPE ( RID_FORMBROWSER_START + 213 ) -#define RID_STR_LINEEND_FORMAT ( RID_FORMBROWSER_START + 214 ) -#define RID_STR_TOGGLE ( RID_FORMBROWSER_START + 215 ) -#define RID_STR_FOCUSONCLICK ( RID_FORMBROWSER_START + 216 ) -#define RID_STR_HIDEINACTIVESELECTION ( RID_FORMBROWSER_START + 217 ) -#define RID_STR_VISUALEFFECT ( RID_FORMBROWSER_START + 218 ) -#define RID_STR_BORDERCOLOR ( RID_FORMBROWSER_START + 219 ) - // FREE -#define RID_STR_XML_DATA_MODEL ( RID_FORMBROWSER_START + 221 ) -#define RID_STR_BIND_EXPRESSION ( RID_FORMBROWSER_START + 222 ) -#define RID_STR_XSD_REQUIRED ( RID_FORMBROWSER_START + 223 ) -#define RID_STR_XSD_RELEVANT ( RID_FORMBROWSER_START + 224 ) -#define RID_STR_XSD_READONLY ( RID_FORMBROWSER_START + 225 ) -#define RID_STR_XSD_CONSTRAINT ( RID_FORMBROWSER_START + 226 ) -#define RID_STR_XSD_CALCULATION ( RID_FORMBROWSER_START + 227 ) -#define RID_STR_XSD_DATA_TYPE ( RID_FORMBROWSER_START + 228 ) -#define RID_STR_XSD_WHITESPACES ( RID_FORMBROWSER_START + 229 ) -#define RID_STR_XSD_PATTERN ( RID_FORMBROWSER_START + 230 ) -#define RID_STR_XSD_LENGTH ( RID_FORMBROWSER_START + 231 ) -#define RID_STR_XSD_MIN_LENGTH ( RID_FORMBROWSER_START + 232 ) -#define RID_STR_XSD_MAX_LENGTH ( RID_FORMBROWSER_START + 233 ) -#define RID_STR_XSD_TOTAL_DIGITS ( RID_FORMBROWSER_START + 234 ) -#define RID_STR_XSD_FRACTION_DIGITS ( RID_FORMBROWSER_START + 235 ) -#define RID_STR_XSD_MAX_INCLUSIVE ( RID_FORMBROWSER_START + 236 ) -#define RID_STR_XSD_MAX_EXCLUSIVE ( RID_FORMBROWSER_START + 237 ) -#define RID_STR_XSD_MIN_INCLUSIVE ( RID_FORMBROWSER_START + 238 ) -#define RID_STR_XSD_MIN_EXCLUSIVE ( RID_FORMBROWSER_START + 239 ) -#define RID_STR_SUBMISSION_ID ( RID_FORMBROWSER_START + 240 ) -#define RID_STR_LIST_BINDING ( RID_FORMBROWSER_START + 241 ) -#define RID_STR_BINDING_UI_NAME ( RID_FORMBROWSER_START + 242 ) -#define RID_STR_BINDING_NAME RID_STR_BINDING_UI_NAME -#define RID_STR_DECORATION ( RID_FORMBROWSER_START + 243 ) -#define RID_STR_SELECTION_TYPE ( RID_FORMBROWSER_START + 244 ) -#define RID_STR_ROOT_DISPLAYED ( RID_FORMBROWSER_START + 245 ) -#define RID_STR_SHOWS_HANDLES ( RID_FORMBROWSER_START + 246 ) -#define RID_STR_SHOWS_ROOT_HANDLES ( RID_FORMBROWSER_START + 247 ) -#define RID_STR_EDITABLE ( RID_FORMBROWSER_START + 248 ) -#define RID_STR_INVOKES_STOP_NOT_EDITING ( RID_FORMBROWSER_START + 249 ) -#define RID_STR_NOLABEL ( RID_FORMBROWSER_START + 250 ) -#define RID_STR_FONTSTYLE_REGULAR ( RID_FORMBROWSER_START + 251 ) -#define RID_STR_FONTSTYLE_BOLD_ITALIC ( RID_FORMBROWSER_START + 252 ) -#define RID_STR_FONTSTYLE_ITALIC ( RID_FORMBROWSER_START + 253 ) -#define RID_STR_FONTSTYLE_BOLD ( RID_FORMBROWSER_START + 254 ) -#define RID_STR_FONT_DEFAULT ( RID_FORMBROWSER_START + 255 ) -#define RID_STR_SCROLL_WIDTH ( RID_FORMBROWSER_START + 256 ) -#define RID_STR_SCROLL_HEIGHT ( RID_FORMBROWSER_START + 257 ) -#define RID_STR_SCROLL_TOP ( RID_FORMBROWSER_START + 258 ) -#define RID_STR_SCROLL_LEFT ( RID_FORMBROWSER_START + 259 ) -#define STR_DETAIL_FORM ( RID_FORMBROWSER_START + 260 ) -#define STR_MASTER_FORM ( RID_FORMBROWSER_START + 261 ) -#define STR_ERROR_RETRIEVING_COLUMNS ( RID_FORMBROWSER_START + 262 ) - -// - message strings - -#define RID_STR_CONFIRM_DELETE_DATA_TYPE ( RID_FORMBROWSER_START + 500 ) - -// - untyped resources - -#define RID_RSC_ENUM_SCROLLBARS ( RID_PROPCONTROLLER_START + 0 ) -#define RID_RSC_ENUM_COMMAND_TYPE ( RID_PROPCONTROLLER_START + 1 ) -#define RID_RSC_ENUM_LINEEND_FORMAT ( RID_PROPCONTROLLER_START + 2 ) -#define RID_RSC_ENUM_TEXTTYPE ( RID_PROPCONTROLLER_START + 3 ) -#define RID_RSC_ENUM_VISUALEFFECT ( RID_PROPCONTROLLER_START + 4 ) -#define RID_RSC_ENUM_IMAGE_POSITION ( RID_PROPCONTROLLER_START + 5 ) -//available -#define RID_RSC_ENUM_WHITESPACE_HANDLING ( RID_PROPCONTROLLER_START + 7 ) -#define RID_RSC_ENUM_VERTICAL_ALIGN ( RID_PROPCONTROLLER_START + 8 ) -#define RID_RSC_ENUM_BORDER_TYPE ( RID_PROPCONTROLLER_START + 9 ) -#define RID_RSC_ENUM_ICONSIZE_TYPE ( RID_PROPCONTROLLER_START + 10 ) -#define RID_RSC_ENUM_LISTSOURCE_TYPE ( RID_PROPCONTROLLER_START + 11 ) -#define RID_RSC_ENUM_ALIGNMENT ( RID_PROPCONTROLLER_START + 12 ) -#define RID_RSC_ENUM_BUTTONTYPE ( RID_PROPCONTROLLER_START + 13 ) -#define RID_RSC_ENUM_PUSHBUTTONTYPE ( RID_PROPCONTROLLER_START + 14 ) -#define RID_RSC_ENUM_SUBMIT_METHOD ( RID_PROPCONTROLLER_START + 15 ) -#define RID_RSC_ENUM_SUBMIT_ENCODING ( RID_PROPCONTROLLER_START + 16 ) -#define RID_RSC_ENUM_DATEFORMAT_LIST ( RID_PROPCONTROLLER_START + 17 ) -#define RID_RSC_ENUM_TIMEFORMAT_LIST ( RID_PROPCONTROLLER_START + 18 ) -#define RID_RSC_ENUM_CHECKED ( RID_PROPCONTROLLER_START + 19 ) -#define RID_RSC_ENUM_CYCLE ( RID_PROPCONTROLLER_START + 20 ) -#define RID_RSC_ENUM_NAVIGATION ( RID_PROPCONTROLLER_START + 21 ) -#define RID_RSC_ENUM_ORIENTATION ( RID_PROPCONTROLLER_START + 22 ) -#define RID_RSC_ENUM_CELL_EXCHANGE_TYPE ( RID_PROPCONTROLLER_START + 23 ) -#define RID_RSC_ENUM_SUBMIT_TARGET ( RID_PROPCONTROLLER_START + 24 ) -#define RID_RSC_ENUM_SELECTION_TYPE ( RID_PROPCONTROLLER_START + 25 ) -#define RID_RSC_ENUM_SCALE_MODE ( RID_PROPCONTROLLER_START + 26 ) -#define RID_RSC_ENUM_YESNO ( RID_PROPCONTROLLER_START + 27 ) -#define RID_RSC_ENUM_SHOWHIDE ( RID_PROPCONTROLLER_START + 28 ) -#define RID_RSC_ENUM_WRITING_MODE ( RID_PROPCONTROLLER_START + 29 ) -#define RID_RSC_ENUM_WHEEL_BEHAVIOR ( RID_PROPCONTROLLER_START + 30 ) -#define RID_RSC_ENUM_TEXT_ANCHOR_TYPE ( RID_PROPCONTROLLER_START + 31 ) -#define RID_RSC_ENUM_SHEET_ANCHOR_TYPE ( RID_PROPCONTROLLER_START + 32 ) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx index 83a3c6fa9aac..157e5362bf1e 100644 --- a/extensions/source/propctrlr/handlerhelper.cxx +++ b/extensions/source/propctrlr/handlerhelper.cxx @@ -18,8 +18,8 @@ */ #include "handlerhelper.hxx" -#include "propresid.hrc" -#include "formresid.hrc" +#include "strings.hrc" +#include "yesno.hrc" #include #include "modulepcr.hxx" #include "enumrepresentation.hxx" @@ -35,7 +35,6 @@ #include #include #include -#include #include #include @@ -72,8 +71,7 @@ namespace pcr // special handling for booleans (this will become a list) if ( _rProperty.Type.getTypeClass() == TypeClass_BOOLEAN ) { - ResStringArray aListEntries(PcrRes(RID_RSC_ENUM_YESNO)); - _out_rDescriptor.Control = createListBoxControl(_rxControlFactory, aListEntries, bReadOnlyControl, false); + _out_rDescriptor.Control = createListBoxControl(_rxControlFactory, RID_RSC_ENUM_YESNO, SAL_N_ELEMENTS(RID_RSC_ENUM_YESNO), bReadOnlyControl, false); return; } @@ -147,11 +145,11 @@ namespace pcr } Reference< XPropertyControl > PropertyHandlerHelper::createListBoxControl( const Reference< XPropertyControlFactory >& _rxControlFactory, - const ResStringArray& _rInitialListEntries, bool _bReadOnlyControl, bool _bSorted ) + const char** pTransIds, size_t nElements, bool _bReadOnlyControl, bool _bSorted ) { std::vector aInitialListEntries; - for (sal_uInt32 i = 0; i < _rInitialListEntries.Count(); ++i) - aInitialListEntries.push_back(_rInitialListEntries.GetString(i)); + for (size_t i = 0; i < nElements; ++i) + aInitialListEntries.push_back(PcrRes(pTransIds[i])); return lcl_implCreateListLikeControl(_rxControlFactory, aInitialListEntries, _bReadOnlyControl, _bSorted, true); } diff --git a/extensions/source/propctrlr/handlerhelper.hxx b/extensions/source/propctrlr/handlerhelper.hxx index 5d4ad7cbfa43..eaf15afbbeb9 100644 --- a/extensions/source/propctrlr/handlerhelper.hxx +++ b/extensions/source/propctrlr/handlerhelper.hxx @@ -37,8 +37,6 @@ namespace com { namespace sun { namespace star { } } } } -class ResStringArray; - namespace pcr { @@ -105,8 +103,11 @@ namespace pcr @param _rxControlFactory A control factory. Must not be . - @param _rInitialListEntries - the initial values of the control + @param pTransIds + the initial translation ids for the value of the control + + @param nElements + the count of initial values of the control @param _bReadOnlyControl determines whether the control should be read-only @@ -120,7 +121,7 @@ namespace pcr static css::uno::Reference< css::inspection::XPropertyControl > createListBoxControl( const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory, - const ResStringArray& _rInitialListEntries, + const char** pTransIds, size_t nElements, bool _bReadOnlyControl, bool _bSorted ); diff --git a/extensions/source/propctrlr/inspectorhelpwindow.cxx b/extensions/source/propctrlr/inspectorhelpwindow.cxx index d15a8190c824..26b4b47379c0 100644 --- a/extensions/source/propctrlr/inspectorhelpwindow.cxx +++ b/extensions/source/propctrlr/inspectorhelpwindow.cxx @@ -18,7 +18,7 @@ */ #include "inspectorhelpwindow.hxx" #include "modulepcr.hxx" -#include "propresid.hrc" +#include "strings.hrc" namespace pcr diff --git a/extensions/source/propctrlr/listselectiondlg.cxx b/extensions/source/propctrlr/listselectiondlg.cxx index 88bdf1573b9e..4685b169fe68 100644 --- a/extensions/source/propctrlr/listselectiondlg.cxx +++ b/extensions/source/propctrlr/listselectiondlg.cxx @@ -20,7 +20,7 @@ #include "listselectiondlg.hxx" #include "modulepcr.hxx" -#include "formresid.hrc" +#include "strings.hrc" #include "formstrings.hxx" #include #include diff --git a/extensions/source/propctrlr/modulepcr.cxx b/extensions/source/propctrlr/modulepcr.cxx index 515d8460e2e8..87ec308dbe36 100644 --- a/extensions/source/propctrlr/modulepcr.cxx +++ b/extensions/source/propctrlr/modulepcr.cxx @@ -21,16 +21,20 @@ #include #include - +#include +#include +#include namespace pcr { - - IMPLEMENT_MODULE( PcrModule, "pcr" ) + OUString PcrRes(const char* pId) + { + return Translate::get(pId, PcrModule::getInstance().getResLocale()); + + } } // namespace pcr - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/modulepcr.hxx b/extensions/source/propctrlr/modulepcr.hxx index 92e33bb9c20d..69665e075887 100644 --- a/extensions/source/propctrlr/modulepcr.hxx +++ b/extensions/source/propctrlr/modulepcr.hxx @@ -22,17 +22,13 @@ #include - namespace pcr { + DEFINE_MODULE(PcrModule, PcrClient) - - DEFINE_MODULE( PcrModule, PcrClient, PcrRes ) - - + OUString PcrRes(const char* pId); } // namespace pcr - #endif // _ INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_MODULEPCR_HXX_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/newdatatype.cxx b/extensions/source/propctrlr/newdatatype.cxx index 1f109ce39a08..693b6284baae 100644 --- a/extensions/source/propctrlr/newdatatype.cxx +++ b/extensions/source/propctrlr/newdatatype.cxx @@ -19,7 +19,7 @@ #include "newdatatype.hxx" #include "modulepcr.hxx" -#include "formresid.hrc" +#include "strings.hrc" namespace pcr { diff --git a/extensions/source/propctrlr/pcrcommon.cxx b/extensions/source/propctrlr/pcrcommon.cxx index f37b6038927f..6dbfae996320 100644 --- a/extensions/source/propctrlr/pcrcommon.cxx +++ b/extensions/source/propctrlr/pcrcommon.cxx @@ -19,7 +19,7 @@ #include "pcrcommon.hxx" #include "modulepcr.hxx" -#include "propresid.hrc" +#include "strings.hrc" #include #include diff --git a/extensions/source/propctrlr/pcrmiscres.src b/extensions/source/propctrlr/pcrmiscres.src deleted file mode 100644 index a37b6783d1ff..000000000000 --- a/extensions/source/propctrlr/pcrmiscres.src +++ /dev/null @@ -1,108 +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 "formresid.hrc" - -String RID_STR_CONFIRM_DELETE_DATA_TYPE -{ - Text [ en-US ] = "Do you want to delete the data type '#type#' from the model?\n" - "Please note that this will affect all controls which are bound to this data type."; -}; -String RID_STR_PROPTITLE_PUSHBUTTON -{ - Text [ en-US ] = "Button" ; -}; -String RID_STR_PROPTITLE_RADIOBUTTON -{ - Text [ en-US ] = "Option Button" ; -}; -String RID_STR_PROPTITLE_CHECKBOX -{ - Text [ en-US ] = "Check Box" ; -}; -String RID_STR_PROPTITLE_FIXEDTEXT -{ - Text [ en-US ] = "Label Field" ; -}; -String RID_STR_PROPTITLE_GROUPBOX -{ - Text [ en-US ] = "Group Box" ; -}; -String RID_STR_PROPTITLE_EDIT -{ - Text [ en-US ] = "Text Box" ; -}; -String RID_STR_PROPTITLE_FORMATTED -{ - Text [ en-US ] = "Formatted Field"; -}; -String RID_STR_PROPTITLE_LISTBOX -{ - Text [ en-US ] = "List Box" ; -}; -String RID_STR_PROPTITLE_COMBOBOX -{ - Text [ en-US ] = "Combo Box" ; -}; -String RID_STR_PROPTITLE_IMAGEBUTTON -{ - Text [ en-US ] = "Image Button" ; -}; -String RID_STR_PROPTITLE_HIDDENCONTROL -{ - Text [ en-US ] = "Hidden Control" ; -}; -String RID_STR_PROPTITLE_UNKNOWNCONTROL -{ - Text [ en-US ] = "Control (unknown type)" ; -}; -String RID_STR_PROPTITLE_IMAGECONTROL -{ - Text [ en-US ] = "Image Control" ; -}; -String RID_STR_PROPTITLE_FILECONTROL -{ - Text [ en-US ] = "File Selection" ; -}; -String RID_STR_PROPTITLE_DATEFIELD -{ - Text [ en-US ] = "Date Field" ; -}; -String RID_STR_PROPTITLE_TIMEFIELD -{ - Text [ en-US ] = "Time Field" ; -}; -String RID_STR_PROPTITLE_NUMERICFIELD -{ - Text [ en-US ] = "Numeric Field" ; -}; -String RID_STR_PROPTITLE_CURRENCYFIELD -{ - Text [ en-US ] = "Currency Field" ; -}; -String RID_STR_PROPTITLE_PATTERNFIELD -{ - Text [ en-US ] = "Pattern Field" ; -}; -String RID_STR_PROPTITLE_DBGRID -{ - Text [ en-US ] = "Table Control " ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index f3fa6941ff2e..ba61efe5debe 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -22,8 +22,8 @@ #include "pcrstrings.hxx" #include "standardcontrol.hxx" #include "linedescriptor.hxx" -#include "propresid.hrc" -#include "formresid.hrc" +#include "strings.hrc" +#include "strings.hrc" #include "propertyeditor.hxx" #include "modulepcr.hxx" #include "formstrings.hxx" diff --git a/extensions/source/propctrlr/propres.src b/extensions/source/propctrlr/propres.src deleted file mode 100644 index 7881300c4189..000000000000 --- a/extensions/source/propctrlr/propres.src +++ /dev/null @@ -1,57 +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 "propresid.hrc" -#include "formresid.hrc" - -String RID_STR_STANDARD -{ - Text [ en-US ] = "Default" ; -}; -String RID_STR_PROPPAGE_DEFAULT -{ - Text [ en-US ] = "General" ; -}; -String RID_STR_PROPPAGE_DATA -{ - Text [ en-US ] = "Data" ; -}; -StringArray RID_RSC_ENUM_YESNO -{ - ItemList [ en-US ] = - { - < "No" ; >; - < "Yes" ; >; - }; -}; -String RID_STR_HELP_SECTION_LABEL -{ - Text [ en-US ] = "Help"; -}; -String RID_EMBED_IMAGE_PLACEHOLDER -{ - Text [ en-US ] = ""; -}; - -String RID_STR_TEXT_FORMAT -{ - Text [ en-US ] = "Text"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/propresid.hrc b/extensions/source/propctrlr/propresid.hrc deleted file mode 100644 index d4548649a7f9..000000000000 --- a/extensions/source/propctrlr/propresid.hrc +++ /dev/null @@ -1,40 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef EXTENSIONS_PROPRESID_HRC -#define EXTENSIONS_PROPRESID_HRC - -// TODO: create a new resource range in - -#define RID_PROPCONTROLLER_START 1000 - // arbitrary at the moment -#define RID_FORMBROWSER_START RID_PROPCONTROLLER_START + 2000 - -// - Strings - -#define RID_STR_STANDARD ( RID_PROPCONTROLLER_START + 0 ) -#define RID_STR_PROPPAGE_DEFAULT ( RID_PROPCONTROLLER_START + 1 ) -#define RID_STR_PROPPAGE_DATA ( RID_PROPCONTROLLER_START + 2 ) -#define RID_STR_HELP_SECTION_LABEL ( RID_PROPCONTROLLER_START + 3 ) -#define RID_EMBED_IMAGE_PLACEHOLDER ( RID_PROPCONTROLLER_START + 4 ) -#define RID_STR_TEXT_FORMAT ( RID_PROPCONTROLLER_START + 5 ) - -#endif // EXTENSIONS_PROPRESID_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx index a9d42ca70813..f38ce6c48777 100644 --- a/extensions/source/propctrlr/selectlabeldialog.cxx +++ b/extensions/source/propctrlr/selectlabeldialog.cxx @@ -18,7 +18,7 @@ */ #include "selectlabeldialog.hxx" -#include "formresid.hrc" +#include "strings.hrc" #include "bitmaps.hlst" #include "formbrowsertools.hxx" #include "formstrings.hxx" diff --git a/extensions/source/propctrlr/selectlabeldialog.src b/extensions/source/propctrlr/selectlabeldialog.src deleted file mode 100644 index c8de64659f4c..000000000000 --- a/extensions/source/propctrlr/selectlabeldialog.src +++ /dev/null @@ -1,27 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * 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 "formresid.hrc" - -String RID_STR_FORMS -{ - Text [ en-US ] = "Forms" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/sqlcommanddesign.cxx b/extensions/source/propctrlr/sqlcommanddesign.cxx index d17bd3312531..ef129eb18935 100644 --- a/extensions/source/propctrlr/sqlcommanddesign.cxx +++ b/extensions/source/propctrlr/sqlcommanddesign.cxx @@ -19,7 +19,8 @@ #include "sqlcommanddesign.hxx" #include "formstrings.hxx" -#include "formresid.hrc" +#include "command.hrc" +#include "strings.hrc" #include "modulepcr.hxx" #include "unourl.hxx" @@ -37,7 +38,6 @@ #include #include -#include #include #include @@ -261,10 +261,8 @@ namespace pcr Reference< XTitle> xTitle(xQueryDesign,UNO_QUERY); if ( xTitle.is() ) { - PcrRes aResId(RID_RSC_ENUM_COMMAND_TYPE); - ResStringArray aResList(aResId); - OUString sDisplayName = aResList.GetString(CommandType::COMMAND); - xTitle->setTitle( sDisplayName ); + OUString sDisplayName = PcrRes(RID_RSC_ENUM_COMMAND_TYPE[CommandType::COMMAND]); + xTitle->setTitle(sDisplayName); } } catch( const Exception& ) diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx index 946c8b6422f5..045622d612e6 100644 --- a/extensions/source/propctrlr/stringrepresentation.cxx +++ b/extensions/source/propctrlr/stringrepresentation.cxx @@ -36,8 +36,8 @@ #include #include #include -#include -#include "formresid.hrc" +#include "strings.hrc" +#include "yesno.hrc" #include "pcrservices.hxx" #include #include "modulepcr.hxx" @@ -376,11 +376,10 @@ bool StringRepresentation::convertGenericValueToString( const uno::Any& _rValue, case uno::TypeClass_BOOLEAN: { - ResStringArray aListEntries(PcrRes(RID_RSC_ENUM_YESNO)); bool bValue = false; _rValue >>= bValue; - _rStringRep = bValue ? aListEntries.GetString(1) - : aListEntries.GetString(0); + _rStringRep = bValue ? PcrRes(RID_RSC_ENUM_YESNO[1]) + : PcrRes(RID_RSC_ENUM_YESNO[0]); } break; @@ -515,8 +514,7 @@ bool StringRepresentation::convertStringToGenericValue( const OUString& _rString case uno::TypeClass_BOOLEAN: { - ResStringArray aListEntries(PcrRes(RID_RSC_ENUM_YESNO)); - _rValue <<= aListEntries.GetString(0) != _rStringRep; + _rValue <<= PcrRes(RID_RSC_ENUM_YESNO[0]) != _rStringRep; } break; diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx index b78f8e49f80d..9e3cd26170a9 100644 --- a/extensions/source/propctrlr/taborder.cxx +++ b/extensions/source/propctrlr/taborder.cxx @@ -20,7 +20,7 @@ #include "taborder.hxx" #include "modulepcr.hxx" -#include "formresid.hrc" +#include "strings.hrc" #include "bitmaps.hlst" #include "formstrings.hxx" #include diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx index 0a4e231bf5fa..66186a56cdbc 100644 --- a/extensions/source/propctrlr/usercontrol.cxx +++ b/extensions/source/propctrlr/usercontrol.cxx @@ -27,7 +27,7 @@ #include #include #include "modulepcr.hxx" -#include "propresid.hrc" +#include "strings.hrc" namespace pcr diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx index 9b81f7b9dff0..c9a077234fe2 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx @@ -25,7 +25,7 @@ #include "formmetadata.hxx" #include "xsddatatypes.hxx" #include "modulepcr.hxx" -#include "formresid.hrc" +#include "strings.hrc" #include "propctrlr.hrc" #include "newdatatype.hxx" #include "xsdvalidationhelper.hxx" diff --git a/extensions/source/resource/ResourceIndexAccess.cxx b/extensions/source/resource/ResourceIndexAccess.cxx deleted file mode 100644 index e935131668f1..000000000000 --- a/extensions/source/resource/ResourceIndexAccess.cxx +++ /dev/null @@ -1,117 +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 - -#include -#include -#include -#include -#include -#include -#include -#include - -using namespace ::extensions::resource; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::container; - -namespace -{ - std::shared_ptr GetResMgr(Sequence const& rArgs) - { - if(rArgs.getLength()!=1) - return std::shared_ptr(); - OUString sFilename; - rArgs[0] >>= sFilename; - SolarMutexGuard aGuard; - const OString sEncName(OUStringToOString(sFilename, osl_getThreadTextEncoding())); - return std::shared_ptr(ResMgr::CreateResMgr(sEncName.getStr())); - } - - class ResourceStringIndexAccess : public cppu::WeakImplHelper< css::container::XIndexAccess> - { - public: - explicit ResourceStringIndexAccess(const std::shared_ptr& pResMgr) - : m_pResMgr(pResMgr) - { - OSL_ENSURE(m_pResMgr, "no resource manager given"); - } - - // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) override - { return m_pResMgr.get() ? SAL_MAX_UINT16 : 0; }; - virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override; - // XElementAccess - virtual sal_Bool SAL_CALL hasElements( ) override - { return static_cast(m_pResMgr.get()); }; - virtual css::uno::Type SAL_CALL getElementType( ) override - { return ::cppu::UnoType::get(); }; - private: - // m_pResMgr should never be NULL - const std::shared_ptr m_pResMgr; - }; -} - -ResourceIndexAccess::ResourceIndexAccess(Sequence const& rArgs, Reference const&) - : m_pResMgr(GetResMgr(rArgs)) -{}; - -Any SAL_CALL ResourceIndexAccess::getByName(const OUString& aName) -{ - const Sequence aNames(getElementNames()); - Reference xResult; - switch(std::find(aNames.begin(), aNames.end(), aName) - aNames.begin()) - { - case 0: - xResult.set(new ResourceStringIndexAccess(m_pResMgr)); - break; - default: - throw NoSuchElementException(); - } - return makeAny(xResult); -} - -Sequence SAL_CALL ResourceIndexAccess::getElementNames( ) -{ - static Sequence aResult; - if( aResult.getLength() == 0) - { - aResult.realloc(1); - aResult[0] = "String"; - } - return aResult; -} - -sal_Bool SAL_CALL ResourceIndexAccess::hasByName(const OUString& aName) -{ - const Sequence aNames(getElementNames()); - return (std::find(aNames.begin(), aNames.end(), aName) != aNames.end()); -} - -Any SAL_CALL ResourceStringIndexAccess::getByIndex(sal_Int32 nIdx) -{ - if(nIdx > SAL_MAX_UINT16 || nIdx < 0) - throw IndexOutOfBoundsException(); - SolarMutexGuard aGuard; - if(!m_pResMgr.get()) - throw RuntimeException("resource manager not available"); - - const ResId aId(static_cast(nIdx), *m_pResMgr); - aId.SetRT(RSC_STRING); - - if(!m_pResMgr->IsAvailable(aId)) - throw RuntimeException("string resource for id not available"); - - return makeAny(aId.toString()); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/resource/ResourceIndexAccess.hxx b/extensions/source/resource/ResourceIndexAccess.hxx deleted file mode 100644 index 6d89f1b90508..000000000000 --- a/extensions/source/resource/ResourceIndexAccess.hxx +++ /dev/null @@ -1,53 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#ifndef INCLUDED_EXTENSIONS_SOURCE_RESOURCE_RESOURCEINDEXACCESS_HXX -#define INCLUDED_EXTENSIONS_SOURCE_RESOURCE_RESOURCEINDEXACCESS_HXX - - -#include -#include -#include -#include -#include -#include - -namespace com { namespace sun { namespace star { namespace uno { - class XComponentContext; -} } } } -class ResMgr; - -namespace extensions { namespace resource -{ - /** This class provides access to tools library text resources */ - class ResourceIndexAccess : public cppu::WeakImplHelper< css::container::XNameAccess> - { - public: - /** The ctor takes a sequence with one element: the name of the resource, e.g. svt */ - ResourceIndexAccess(css::uno::Sequence< css::uno::Any> const& rArgs, css::uno::Reference< css::uno::XComponentContext> const&); - // XNameAccess - // The XNameAccess provides access to one named elements: - // "String" returns a XIndexAccess to String resources - virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; - // XElementAccess - virtual css::uno::Type SAL_CALL getElementType( ) override - { return cppu::UnoType::get(); }; - virtual sal_Bool SAL_CALL hasElements( ) override - { return static_cast(m_pResMgr.get()); }; - - private: - // m_pResMgr should never be NULL - const std::shared_ptr m_pResMgr; - }; -}} - -#endif -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/resource/oooresourceloader.cxx b/extensions/source/resource/oooresourceloader.cxx deleted file mode 100644 index 1f86f1460b5b..000000000000 --- a/extensions/source/resource/oooresourceloader.cxx +++ /dev/null @@ -1,313 +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 -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::resource; -using namespace ::com::sun::star::container; -using namespace ::com::sun::star::lang; - - -namespace extensions { namespace resource -{ - /** encapsulates access to a fixed resource type - */ - class StringResourceAccess - { - public: - StringResourceAccess(); - - /** returns the RESOURCE_TYPE associated with this instance - */ - static RESOURCE_TYPE getResourceType() { return RSC_STRING; } - /** reads a single resource from the given resource manager - @param _resourceManager - the resource manager to read from - @param _resourceId - the id of the resource to read - @return - the required resource - @precond - the caller checked via _resourceManager.IsAvailable( getResourceType(), _resourceId ) - that the required resource really exists - */ - static Any getResource( SimpleResMgr& _resourceManager, sal_Int32 _resourceId ); - }; - - StringResourceAccess::StringResourceAccess() - { - } - - Any StringResourceAccess::getResource( SimpleResMgr& _resourceManager, sal_Int32 _resourceId ) - { - OSL_PRECOND( _resourceManager.IsAvailable( getResourceType(), _resourceId ), "StringResourceAccess::getResource: precondition not met!" ); - Any aResource; - aResource <<= _resourceManager.ReadString( _resourceId ); - return aResource; - } - - typedef ::cppu::WeakImplHelper < XResourceBundle - > OpenOfficeResourceBundle_Base; - class OpenOfficeResourceBundle : public OpenOfficeResourceBundle_Base - { - private: - typedef std::shared_ptr< StringResourceAccess > ResourceTypePtr; - typedef std::map< OUString, ResourceTypePtr > ResourceTypes; - - ::osl::Mutex m_aMutex; - Reference< XResourceBundle > m_xParent; - Locale m_aLocale; - std::unique_ptr m_pResourceManager; - ResourceTypes m_aResourceTypes; - - public: - OpenOfficeResourceBundle( - const Reference< XComponentContext >& _rxContext, - const OUString& _rBaseName, - const Locale& _rLocale - ); - - protected: - virtual ~OpenOfficeResourceBundle() override; - - public: - // XResourceBundle - virtual css::uno::Reference< css::resource::XResourceBundle > SAL_CALL getParent() override; - virtual void SAL_CALL setParent( const css::uno::Reference< css::resource::XResourceBundle >& _parent ) override; - virtual css::lang::Locale SAL_CALL getLocale( ) override; - virtual css::uno::Any SAL_CALL getDirectElement( const OUString& key ) override; - - // XNameAccess (base of XResourceBundle) - virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; - - // XElementAccess (base of XNameAccess) - virtual css::uno::Type SAL_CALL getElementType( ) override; - virtual sal_Bool SAL_CALL hasElements( ) override; - - private: - /** retrievs the element with the given key, without asking our parent bundle - @param _key - the key of the element to retrieve - @param _out_Element - will contained the retrieved element upon successful return. If the method is unsuccessful, the - value will not be touched. - @return - if and only if the element could be retrieved - @precond - our mutex is locked - */ - bool impl_getDirectElement_nothrow( const OUString& _key, Any& _out_Element ) const; - - /** retrieves the resource type and id from a given resource key, which assembles those two - @param _key - the resource key as got via a public API call - @param _out_resourceType - the resource type, if successful - @param _out_resourceId - the resource id, if successful - @return - if and only if the given key specifies a known resource type, and contains a valid - resource id - */ - bool impl_getResourceTypeAndId_nothrow( const OUString& _key, ResourceTypePtr& _out_resourceType, sal_Int32& _out_resourceId ) const; - }; - - OpenOfficeResourceLoader::OpenOfficeResourceLoader( Reference< XComponentContext > const& _rxContext ) - :m_xContext( _rxContext ) - { - } - - - Reference< XResourceBundle > SAL_CALL OpenOfficeResourceLoader::loadBundle_Default( const OUString& _baseName ) - { - return loadBundle( _baseName, Application::GetSettings().GetUILanguageTag().getLocale() ); - } - - - Reference< XResourceBundle > SAL_CALL OpenOfficeResourceLoader::loadBundle( const OUString& _baseName, const Locale& _locale ) - { - ::osl::MutexGuard aGuard( m_aMutex ); - - Reference< XResourceBundle > xBundle; - - ResourceBundleDescriptor resourceDescriptor( _baseName, _locale ); - ResourceBundleCache::iterator cachePos = m_aBundleCache.find( resourceDescriptor ); - if ( cachePos != m_aBundleCache.end() ) - xBundle = cachePos->second; - - if ( !xBundle.is() ) - { // not in the cache, or already died - xBundle = new OpenOfficeResourceBundle( m_xContext, _baseName, _locale ); - m_aBundleCache.insert( ResourceBundleCache::value_type( resourceDescriptor, xBundle ) ); - } - - return xBundle; - } - - OpenOfficeResourceBundle::OpenOfficeResourceBundle( const Reference< XComponentContext >& /*_rxContext*/, const OUString& _rBaseName, const Locale& _rLocale ) - :m_aLocale( _rLocale ) - ,m_pResourceManager( nullptr ) - { - m_pResourceManager.reset( new SimpleResMgr( OUStringToOString( _rBaseName, RTL_TEXTENCODING_UTF8 ).getStr(), - LanguageTag( m_aLocale) ) ); - - if ( !m_pResourceManager->IsValid() ) - { - throw MissingResourceException(); - } - - // supported resource types so far: strings - m_aResourceTypes[ OUString( "string" ) ] = - std::make_shared( ); - } - - OpenOfficeResourceBundle::~OpenOfficeResourceBundle() - { - } - - Reference< XResourceBundle > SAL_CALL OpenOfficeResourceBundle::getParent() - { - ::osl::MutexGuard aGuard( m_aMutex ); - return m_xParent; - } - - void SAL_CALL OpenOfficeResourceBundle::setParent( const Reference< XResourceBundle >& _parent ) - { - ::osl::MutexGuard aGuard( m_aMutex ); - m_xParent = _parent; - } - - Locale SAL_CALL OpenOfficeResourceBundle::getLocale( ) - { - ::osl::MutexGuard aGuard( m_aMutex ); - return m_aLocale; - } - - bool OpenOfficeResourceBundle::impl_getResourceTypeAndId_nothrow( const OUString& _key, ResourceTypePtr& _out_resourceType, sal_Int32& _out_resourceId ) const - { - sal_Int32 typeSeparatorPos = _key.indexOf( ':' ); - if ( typeSeparatorPos == -1 ) - // invalid key - return false; - - OUString resourceType = _key.copy( 0, typeSeparatorPos ); - - ResourceTypes::const_iterator typePos = m_aResourceTypes.find( resourceType ); - if ( typePos == m_aResourceTypes.end() ) - // don't know this resource type - return false; - - _out_resourceType = typePos->second; - _out_resourceId = _key.copy( typeSeparatorPos + 1 ).toInt32(); - return true; - } - - bool OpenOfficeResourceBundle::impl_getDirectElement_nothrow( const OUString& _key, Any& _out_Element ) const - { - ResourceTypePtr resourceType; - sal_Int32 resourceId( 0 ); - if ( !impl_getResourceTypeAndId_nothrow( _key, resourceType, resourceId ) ) - return false; - - if ( !m_pResourceManager->IsAvailable( StringResourceAccess::getResourceType(), resourceId ) ) - // no such resource with the given type/id - return false; - - _out_Element = StringResourceAccess::getResource( *m_pResourceManager, resourceId ); - return _out_Element.hasValue(); - } - - Any SAL_CALL OpenOfficeResourceBundle::getDirectElement( const OUString& _key ) - { - ::osl::MutexGuard aGuard( m_aMutex ); - - Any aElement; - impl_getDirectElement_nothrow( _key, aElement ); - return aElement; - } - - Any SAL_CALL OpenOfficeResourceBundle::getByName( const OUString& _key ) - { - ::osl::MutexGuard aGuard( m_aMutex ); - - Any aElement; - if ( !impl_getDirectElement_nothrow( _key, aElement ) ) - { - if ( m_xParent.is() ) - aElement = m_xParent->getByName( _key ); - } - - if ( !aElement.hasValue() ) - throw NoSuchElementException( OUString(), *this ); - - return aElement; - } - - Sequence< OUString > SAL_CALL OpenOfficeResourceBundle::getElementNames( ) - { - OSL_FAIL( "OpenOfficeResourceBundle::getElementNames: not implemented!" ); - // the (Simple)ResManager does not provide an API to enumerate the resources - return Sequence< OUString >( ); - } - - sal_Bool SAL_CALL OpenOfficeResourceBundle::hasByName( const OUString& _key ) - { - ::osl::MutexGuard aGuard( m_aMutex ); - - ResourceTypePtr resourceType; - sal_Int32 resourceId( 0 ); - if ( !impl_getResourceTypeAndId_nothrow( _key, resourceType, resourceId ) ) - return false; - - if ( !m_pResourceManager->IsAvailable( StringResourceAccess::getResourceType(), resourceId ) ) - return false; - - return true; - } - - Type SAL_CALL OpenOfficeResourceBundle::getElementType( ) - { - return ::cppu::UnoType< Any >::get(); - } - - sal_Bool SAL_CALL OpenOfficeResourceBundle::hasElements( ) - { - ::osl::MutexGuard aGuard( m_aMutex ); - OSL_FAIL( "OpenOfficeResourceBundle::hasElements: not implemented!" ); - // the (Simple)ResManager does not provide an API to enumerate the resources - return sal_Bool( ); - } - -}} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/resource/oooresourceloader.hxx b/extensions/source/resource/oooresourceloader.hxx deleted file mode 100644 index 82e6d1ffea71..000000000000 --- a/extensions/source/resource/oooresourceloader.hxx +++ /dev/null @@ -1,75 +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_EXTENSIONS_SOURCE_RESOURCE_OOORESOURCELOADER_HXX -#define INCLUDED_EXTENSIONS_SOURCE_RESOURCE_OOORESOURCELOADER_HXX - -#include -#include -#include -#include - -#include -#include - -namespace extensions { namespace resource -{ - typedef std::pair< OUString, css::lang::Locale> ResourceBundleDescriptor; - - struct ResourceBundleDescriptorLess - { - bool operator()( const ResourceBundleDescriptor& _lhs, const ResourceBundleDescriptor& _rhs ) const - { - if ( _lhs.first < _rhs.first ) - return true; - if ( _lhs.second.Language < _rhs.second.Language ) - return true; - if ( _lhs.second.Country < _rhs.second.Country ) - return true; - if ( _lhs.second.Variant < _rhs.second.Variant ) - return true; - return false; - } - }; - - class OpenOfficeResourceLoader : public ::cppu::WeakImplHelper< css::resource::XResourceBundleLoader> - { - public: - typedef std::map< - ResourceBundleDescriptor, - css::uno::WeakReference< css::resource::XResourceBundle>, - ResourceBundleDescriptorLess> ResourceBundleCache; - - OpenOfficeResourceLoader(css::uno::Reference< css::uno::XComponentContext> const&); - // XResourceBundleLoader - virtual css::uno::Reference< css::resource::XResourceBundle> SAL_CALL loadBundle_Default( const OUString& aBaseName ) override; - virtual css::uno::Reference< css::resource::XResourceBundle> SAL_CALL loadBundle( const OUString& abaseName, const css::lang::Locale& aLocale ) override; - - private: - OpenOfficeResourceLoader( const OpenOfficeResourceLoader& ) = delete; - OpenOfficeResourceLoader& operator=( const OpenOfficeResourceLoader& ) = delete; - css::uno::Reference< css::uno::XComponentContext> m_xContext; - ::osl::Mutex m_aMutex; - ResourceBundleCache m_aBundleCache; - }; -}} - -#endif // INCLUDED_EXTENSIONS_SOURCE_RESOURCE_OOORESOURCELOADER_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/resource/res.component b/extensions/source/resource/res.component deleted file mode 100644 index 4a573064fc09..000000000000 --- a/extensions/source/resource/res.component +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - diff --git a/extensions/source/resource/resourceservices.cxx b/extensions/source/resource/resourceservices.cxx deleted file mode 100644 index f8af057ea467..000000000000 --- a/extensions/source/resource/resourceservices.cxx +++ /dev/null @@ -1,39 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - - -#include -#include -#include -#include - -namespace sdecl = ::comphelper::service_decl; - -sdecl::class_< ::extensions::resource::ResourceIndexAccess, sdecl::with_args > const ResourceIndexAccessServiceImpl; -sdecl::class_< ::extensions::resource::OpenOfficeResourceLoader> const OpenOfficeResourceLoaderServiceImpl; - -const sdecl::ServiceDecl ResourceIndexAccessDecl( - ResourceIndexAccessServiceImpl, - "org.libreoffice.extensions.resource.ResourceIndexAccess", - "org.libreoffice.resource.ResourceIndexAccess"); - -//TODO: this is a singleton, not a service: -const sdecl::ServiceDecl OpenOfficeResourceLoaderDecl( - OpenOfficeResourceLoaderServiceImpl, - "com.sun.star.comp.resource.OpenOfficeResourceLoader", - "com.sun.star.resource.OfficeResourceLoader"); - -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL res_component_getFactory( - sal_Char const* pImplName, void*, void*) -{ - return sdecl::component_getFactoryHelper( pImplName, - {&ResourceIndexAccessDecl, &OpenOfficeResourceLoaderDecl} ); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index 48c9dc6e52f0..5294357a30c2 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -20,8 +20,11 @@ #include #include #include +#include #include #include +#include +#include #include #include #include @@ -316,10 +319,10 @@ void SaneDlg::dispose() namespace { -ResId SaneResId( sal_uInt32 nID ) +OUString SaneResId(const char *pID) { - static ResMgr* pResMgr = ResMgr::CreateResMgr( "scn" ); - return ResId( nID, *pResMgr ); + static std::locale loc = Translate::Create("pcr", Application::GetSettings().GetUILanguageTag()); + return Translate::get(pID, loc); } } diff --git a/extensions/source/scanner/strings.src b/extensions/source/scanner/strings.src deleted file mode 100644 index 4f8ea645ca3c..000000000000 --- a/extensions/source/scanner/strings.src +++ /dev/null @@ -1,34 +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 "strings.hrc" - -String STR_COULD_NOT_BE_INIT -{ - Text [ en-US ] = "The SANE interface could not be initialized. Scanning is not possible."; -}; - -String STR_SLOW_PREVIEW -{ - Text [ en-US ] = "The device does not offer a preview option. Therefore, a normal scan will be used as a preview instead. This may take a considerable amount of time."; -}; - -String STR_ERROR_SCAN -{ - Text [ en-US ] = "An error occurred while scanning."; -}; - -String STR_DEVICE_DESC -{ - Text [ en-US ] = "Device: %s\nVendor: %s\nModel: %s\nType: %s"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ - - diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx index b5dea59112d0..503552261f63 100644 --- a/extensions/source/update/check/updatehdl.cxx +++ b/extensions/source/update/check/updatehdl.cxx @@ -59,11 +59,12 @@ #include "com/sun/star/lang/XMultiServiceFactory.hpp" #include "com/sun/star/task/InteractionHandler.hpp" #include "com/sun/star/task/InteractionRequestStringResolver.hpp" -#include -#include -#include "updatehdl.hrc" +#include "strings.hrc" +#include #include +#include +#include #define COMMAND_CLOSE "close" @@ -591,24 +592,10 @@ void UpdateHandler::updateState( UpdateState eState ) meLastState = eState; } - -OUString UpdateHandler::loadString( const uno::Reference< resource::XResourceBundle >& rBundle, - sal_Int32 nResourceId ) +OUString UpdateHandler::loadString(const std::locale& rLocale, + const char* pResourceId) { - OUString sString; - OUString sKey = "string:" + OUString::number( nResourceId ); - - try - { - OSL_VERIFY( rBundle->getByName( sKey ) >>= sString ); - } - catch( const uno::Exception& ) - { - OSL_FAIL( "UpdateHandler::loadString: caught an exception!" ); - sString = "Missing " + sKey; - } - - return sString; + return Translate::get(pResourceId, rLocale); } OUString UpdateHandler::substVariables( const OUString &rSource ) const @@ -620,7 +607,6 @@ OUString UpdateHandler::substVariables( const OUString &rSource ) const .replaceAll( "%PERCENT", OUString::number( mnPercent ) ); } - void UpdateHandler::loadStrings() { if ( mbStringsLoaded ) @@ -628,76 +614,65 @@ void UpdateHandler::loadStrings() else mbStringsLoaded = true; - uno::Reference< resource::XResourceBundleLoader > xLoader; - try - { - uno::Any aValue( mxContext->getValueByName( - "/singletons/com.sun.star.resource.OfficeResourceLoader" ) ); - OSL_VERIFY( aValue >>= xLoader ); - } - catch( const uno::Exception& ) - { - OSL_FAIL( "UpdateHandler::loadStrings: could not create the resource loader!" ); - } + std::locale loc = Translate::Create("pcr", Application::GetSettings().GetUILanguageTag()); - if ( !xLoader.is() ) return; + msChecking = loadString( loc, RID_UPDATE_STR_CHECKING ); + msCheckingError = loadString( loc, RID_UPDATE_STR_CHECKING_ERR ); + msNoUpdFound = loadString( loc, RID_UPDATE_STR_NO_UPD_FOUND ); - uno::Reference< resource::XResourceBundle > xBundle; - - try - { - xBundle = xLoader->loadBundle_Default( "upd" ); - } - catch( const resource::MissingResourceException& ) - { - OSL_FAIL( "UpdateHandler::loadStrings: missing the resource bundle!" ); - } - - if ( !xBundle.is() ) return; - - msChecking = loadString( xBundle, RID_UPDATE_STR_CHECKING ); - msCheckingError = loadString( xBundle, RID_UPDATE_STR_CHECKING_ERR ); - msNoUpdFound = loadString( xBundle, RID_UPDATE_STR_NO_UPD_FOUND ); - - msUpdFound = loadString( xBundle, RID_UPDATE_STR_UPD_FOUND ); + msUpdFound = loadString( loc, RID_UPDATE_STR_UPD_FOUND ); setFullVersion( msUpdFound ); - msDlgTitle = loadString( xBundle, RID_UPDATE_STR_DLG_TITLE ); - msDownloadPause = loadString( xBundle, RID_UPDATE_STR_DOWNLOAD_PAUSE ); - msDownloadError = loadString( xBundle, RID_UPDATE_STR_DOWNLOAD_ERR ); - msDownloadWarning = loadString( xBundle, RID_UPDATE_STR_DOWNLOAD_WARN ); - msDownloadDescr = loadString( xBundle, RID_UPDATE_STR_DOWNLOAD_DESCR ); - msDownloadNotAvail = loadString( xBundle, RID_UPDATE_STR_DOWNLOAD_UNAVAIL ); - msDownloading = loadString( xBundle, RID_UPDATE_STR_DOWNLOADING ); - msReady2Install = loadString( xBundle, RID_UPDATE_STR_READY_INSTALL ); - msCancelTitle = loadString( xBundle, RID_UPDATE_STR_CANCEL_TITLE ); - msCancelMessage = loadString( xBundle, RID_UPDATE_STR_CANCEL_DOWNLOAD ); - msInstallMessage = loadString( xBundle, RID_UPDATE_STR_BEGIN_INSTALL ); - msInstallNow = loadString( xBundle, RID_UPDATE_STR_INSTALL_NOW ); - msInstallLater = loadString( xBundle, RID_UPDATE_STR_INSTALL_LATER ); - msInstallError = loadString( xBundle, RID_UPDATE_STR_INSTALL_ERROR ); - msOverwriteWarning = loadString( xBundle, RID_UPDATE_STR_OVERWRITE_WARNING ); - msPercent = loadString( xBundle, RID_UPDATE_STR_PERCENT ); - msReloadWarning = loadString( xBundle, RID_UPDATE_STR_RELOAD_WARNING ); - msReloadReload = loadString( xBundle, RID_UPDATE_STR_RELOAD_RELOAD ); - msReloadContinue = loadString( xBundle, RID_UPDATE_STR_RELOAD_CONTINUE ); + msDlgTitle = loadString( loc, RID_UPDATE_STR_DLG_TITLE ); + msDownloadPause = loadString( loc, RID_UPDATE_STR_DOWNLOAD_PAUSE ); + msDownloadError = loadString( loc, RID_UPDATE_STR_DOWNLOAD_ERR ); + msDownloadWarning = loadString( loc, RID_UPDATE_STR_DOWNLOAD_WARN ); + msDownloadDescr = loadString( loc, RID_UPDATE_STR_DOWNLOAD_DESCR ); + msDownloadNotAvail = loadString( loc, RID_UPDATE_STR_DOWNLOAD_UNAVAIL ); + msDownloading = loadString( loc, RID_UPDATE_STR_DOWNLOADING ); + msReady2Install = loadString( loc, RID_UPDATE_STR_READY_INSTALL ); + msCancelTitle = loadString( loc, RID_UPDATE_STR_CANCEL_TITLE ); + msCancelMessage = loadString( loc, RID_UPDATE_STR_CANCEL_DOWNLOAD ); + msInstallMessage = loadString( loc, RID_UPDATE_STR_BEGIN_INSTALL ); + msInstallNow = loadString( loc, RID_UPDATE_STR_INSTALL_NOW ); + msInstallLater = loadString( loc, RID_UPDATE_STR_INSTALL_LATER ); + msInstallError = loadString( loc, RID_UPDATE_STR_INSTALL_ERROR ); + msOverwriteWarning = loadString( loc, RID_UPDATE_STR_OVERWRITE_WARNING ); + msPercent = loadString( loc, RID_UPDATE_STR_PERCENT ); + msReloadWarning = loadString( loc, RID_UPDATE_STR_RELOAD_WARNING ); + msReloadReload = loadString( loc, RID_UPDATE_STR_RELOAD_RELOAD ); + msReloadContinue = loadString( loc, RID_UPDATE_STR_RELOAD_CONTINUE ); - msStatusFL = loadString( xBundle, RID_UPDATE_FT_STATUS ); - msDescription = loadString( xBundle, RID_UPDATE_FT_DESCRIPTION ); + msStatusFL = loadString( loc, RID_UPDATE_FT_STATUS ); + msDescription = loadString( loc, RID_UPDATE_FT_DESCRIPTION ); - msClose = loadString( xBundle, RID_UPDATE_BTN_CLOSE ); - msDownload = loadString( xBundle, RID_UPDATE_BTN_DOWNLOAD ); - msInstall = loadString( xBundle, RID_UPDATE_BTN_INSTALL ); - msPauseBtn = loadString( xBundle, RID_UPDATE_BTN_PAUSE ); - msResumeBtn = loadString( xBundle, RID_UPDATE_BTN_RESUME ); - msCancelBtn = loadString( xBundle, RID_UPDATE_BTN_CANCEL ); + msClose = loadString( loc, RID_UPDATE_BTN_CLOSE ); + msDownload = loadString( loc, RID_UPDATE_BTN_DOWNLOAD ); + msInstall = loadString( loc, RID_UPDATE_BTN_INSTALL ); + msPauseBtn = loadString( loc, RID_UPDATE_BTN_PAUSE ); + msResumeBtn = loadString( loc, RID_UPDATE_BTN_RESUME ); + msCancelBtn = loadString( loc, RID_UPDATE_BTN_CANCEL ); + + std::pair RID_UPDATE_BUBBLE[] = + { + { RID_UPDATE_BUBBLE_UPDATE_AVAIL, RID_UPDATE_BUBBLE_T_UPDATE_AVAIL }, + { RID_UPDATE_BUBBLE_UPDATE_NO_DOWN, RID_UPDATE_BUBBLE_T_UPDATE_NO_DOWN }, + { RID_UPDATE_BUBBLE_AUTO_START, RID_UPDATE_BUBBLE_T_AUTO_START }, + { RID_UPDATE_BUBBLE_DOWNLOADING, RID_UPDATE_BUBBLE_T_DOWNLOADING }, + { RID_UPDATE_BUBBLE_DOWNLOAD_PAUSED, RID_UPDATE_BUBBLE_T_DOWNLOAD_PAUSED }, + { RID_UPDATE_BUBBLE_ERROR_DOWNLOADING, RID_UPDATE_BUBBLE_T_ERROR_DOWNLOADING }, + { RID_UPDATE_BUBBLE_DOWNLOAD_AVAIL, RID_UPDATE_BUBBLE_T_DOWNLOAD_AVAIL }, + { RID_UPDATE_BUBBLE_EXT_UPD_AVAIL, RID_UPDATE_BUBBLE_T_EXT_UPD_AVAIL } + }; + + static_assert(SAL_N_ELEMENTS(RID_UPDATE_BUBBLE) == UPDATESTATES_COUNT - UPDATESTATE_UPDATE_AVAIL, "mismatch"); // all update states before UPDATESTATE_UPDATE_AVAIL don't have a bubble // so we can ignore them - for ( int i=0; i < (int)(UPDATESTATES_COUNT - UPDATESTATE_UPDATE_AVAIL); i++ ) + for (size_t i = 0; i < SAL_N_ELEMENTS(RID_UPDATE_BUBBLE); ++i) { - msBubbleTexts[ i ] = loadString( xBundle, RID_UPDATE_BUBBLE_TEXT_START + i ); - msBubbleTitles[ i ] = loadString( xBundle, RID_UPDATE_BUBBLE_T_TEXT_START + i ); + msBubbleTexts[i] = loadString(loc, RID_UPDATE_BUBBLE[i].first); + msBubbleTitles[i] = loadString(loc, RID_UPDATE_BUBBLE[i].second); } for ( int i=0; i < BUTTON_COUNT; i++ ) diff --git a/extensions/source/update/check/updatehdl.hrc b/extensions/source/update/check/updatehdl.hrc deleted file mode 100644 index e4860416f681..000000000000 --- a/extensions/source/update/check/updatehdl.hrc +++ /dev/null @@ -1,76 +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 . - */ - - #define RID_UPDATE_HDL_START 1200 - - #define RID_UPDATE_STR_CHECKING RID_UPDATE_HDL_START + 1 - #define RID_UPDATE_STR_NO_UPD_FOUND RID_UPDATE_HDL_START + 2 - #define RID_UPDATE_STR_UPD_FOUND RID_UPDATE_HDL_START + 3 - #define RID_UPDATE_STR_DLG_TITLE RID_UPDATE_HDL_START + 4 - #define RID_UPDATE_STR_DOWNLOAD_ERR RID_UPDATE_HDL_START + 5 - #define RID_UPDATE_STR_DOWNLOAD_WARN RID_UPDATE_HDL_START + 6 - #define RID_UPDATE_STR_DOWNLOADING RID_UPDATE_HDL_START + 7 - #define RID_UPDATE_STR_READY_INSTALL RID_UPDATE_HDL_START + 8 - #define RID_UPDATE_STR_CANCEL_TITLE RID_UPDATE_HDL_START + 9 - #define RID_UPDATE_STR_CANCEL_DOWNLOAD RID_UPDATE_HDL_START + 10 - #define RID_UPDATE_STR_BEGIN_INSTALL RID_UPDATE_HDL_START + 11 - #define RID_UPDATE_STR_INSTALL_NOW RID_UPDATE_HDL_START + 12 - #define RID_UPDATE_STR_INSTALL_LATER RID_UPDATE_HDL_START + 13 - #define RID_UPDATE_STR_CHECKING_ERR RID_UPDATE_HDL_START + 14 - #define RID_UPDATE_STR_OVERWRITE_WARNING RID_UPDATE_HDL_START + 15 - #define RID_UPDATE_STR_DOWNLOAD_PAUSE RID_UPDATE_HDL_START + 16 - #define RID_UPDATE_STR_DOWNLOAD_UNAVAIL RID_UPDATE_HDL_START + 17 - #define RID_UPDATE_STR_PERCENT RID_UPDATE_HDL_START + 18 - #define RID_UPDATE_STR_DOWNLOAD_DESCR RID_UPDATE_HDL_START + 19 - #define RID_UPDATE_STR_INSTALL_ERROR RID_UPDATE_HDL_START + 20 - #define RID_UPDATE_STR_RELOAD_WARNING RID_UPDATE_HDL_START + 21 - #define RID_UPDATE_STR_RELOAD_RELOAD RID_UPDATE_HDL_START + 22 - #define RID_UPDATE_STR_RELOAD_CONTINUE RID_UPDATE_HDL_START + 23 - - #define RID_UPDATE_FT_DESCRIPTION RID_UPDATE_HDL_START + 25 - #define RID_UPDATE_FT_STATUS RID_UPDATE_HDL_START + 26 - - #define RID_UPDATE_BTN_CLOSE RID_UPDATE_HDL_START + 30 - #define RID_UPDATE_BTN_DOWNLOAD RID_UPDATE_HDL_START + 31 - #define RID_UPDATE_BTN_INSTALL RID_UPDATE_HDL_START + 32 - #define RID_UPDATE_BTN_PAUSE RID_UPDATE_HDL_START + 33 - #define RID_UPDATE_BTN_RESUME RID_UPDATE_HDL_START + 34 - #define RID_UPDATE_BTN_CANCEL RID_UPDATE_HDL_START + 35 - - #define RID_UPDATE_BUBBLE_TEXT_START RID_UPDATE_HDL_START + 40 - #define RID_UPDATE_BUBBLE_UPDATE_AVAIL RID_UPDATE_BUBBLE_TEXT_START + 0 - #define RID_UPDATE_BUBBLE_UPDATE_NO_DOWN RID_UPDATE_BUBBLE_TEXT_START + 1 - #define RID_UPDATE_BUBBLE_AUTO_START RID_UPDATE_BUBBLE_TEXT_START + 2 - #define RID_UPDATE_BUBBLE_DOWNLOADING RID_UPDATE_BUBBLE_TEXT_START + 3 - #define RID_UPDATE_BUBBLE_DOWNLOAD_PAUSED RID_UPDATE_BUBBLE_TEXT_START + 4 - #define RID_UPDATE_BUBBLE_ERROR_DOWNLOADING RID_UPDATE_BUBBLE_TEXT_START + 5 - #define RID_UPDATE_BUBBLE_DOWNLOAD_AVAIL RID_UPDATE_BUBBLE_TEXT_START + 6 - #define RID_UPDATE_BUBBLE_EXT_UPD_AVAIL RID_UPDATE_BUBBLE_TEXT_START + 7 - - #define RID_UPDATE_BUBBLE_T_TEXT_START RID_UPDATE_HDL_START + 50 - #define RID_UPDATE_BUBBLE_T_UPDATE_AVAIL RID_UPDATE_BUBBLE_T_TEXT_START + 0 - #define RID_UPDATE_BUBBLE_T_UPDATE_NO_DOWN RID_UPDATE_BUBBLE_T_TEXT_START + 1 - #define RID_UPDATE_BUBBLE_T_AUTO_START RID_UPDATE_BUBBLE_T_TEXT_START + 2 - #define RID_UPDATE_BUBBLE_T_DOWNLOADING RID_UPDATE_BUBBLE_T_TEXT_START + 3 - #define RID_UPDATE_BUBBLE_T_DOWNLOAD_PAUSED RID_UPDATE_BUBBLE_T_TEXT_START + 4 - #define RID_UPDATE_BUBBLE_T_ERROR_DOWNLOADING RID_UPDATE_BUBBLE_T_TEXT_START + 5 - #define RID_UPDATE_BUBBLE_T_DOWNLOAD_AVAIL RID_UPDATE_BUBBLE_T_TEXT_START + 6 - #define RID_UPDATE_BUBBLE_T_EXT_UPD_AVAIL RID_UPDATE_BUBBLE_T_TEXT_START + 7 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/update/check/updatehdl.hxx b/extensions/source/update/check/updatehdl.hxx index 35258ffba73f..ee58d026e7d8 100644 --- a/extensions/source/update/check/updatehdl.hxx +++ b/extensions/source/update/check/updatehdl.hxx @@ -31,7 +31,6 @@ #include "com/sun/star/awt/XTopWindowListener.hpp" #include "com/sun/star/beans/NamedValue.hpp" #include "com/sun/star/frame/XTerminateListener.hpp" -#include #include #include @@ -141,8 +140,8 @@ private: void enableControls( short nCtrlState ); void setDownloadBtnLabel( bool bAppendDots ); void loadStrings(); - static OUString loadString( const css::uno::Reference< css::resource::XResourceBundle >& xBundle, - sal_Int32 nResourceId ); + static OUString loadString(const std::locale& rLocale, + const char* pResourceId); OUString substVariables( const OUString &rSource ) const; static void insertControlModel( css::uno::Reference< css::awt::XControlModel > const & rxDialogModel, OUString const & rServiceName, diff --git a/extensions/source/update/check/updatehdl.src b/extensions/source/update/check/updatehdl.src deleted file mode 100644 index 086f4bb7a3b2..000000000000 --- a/extensions/source/update/check/updatehdl.src +++ /dev/null @@ -1,257 +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 "updatehdl.hrc" - -String RID_UPDATE_STR_CHECKING -{ - Text [ en-US ] = "Checking..."; -}; - -String RID_UPDATE_STR_CHECKING_ERR -{ - Text [ en-US ] = "Checking for an update failed."; -}; - -String RID_UPDATE_STR_NO_UPD_FOUND -{ - Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION is up to date."; -}; - -String RID_UPDATE_STR_UPD_FOUND -{ - Text [ en-US ] = "%PRODUCTNAME %NEXTVERSION is available.\n\nThe installed version is %PRODUCTNAME %PRODUCTVERSION.\n\nNote: Before downloading an update, please ensure that you have sufficient access rights to install it.\nA password, usually the administrator's or root password, may be required."; -}; - -String RID_UPDATE_STR_DLG_TITLE -{ - Text [ en-US ] = "Check for Updates"; -}; - -String RID_UPDATE_STR_DOWNLOAD_PAUSE -{ - Text [ en-US ] = "Downloading %PRODUCTNAME %NEXTVERSION paused at..."; -}; - -String RID_UPDATE_STR_DOWNLOAD_ERR -{ - Text [ en-US ] = "Downloading %PRODUCTNAME %NEXTVERSION stalled at"; -}; - -String RID_UPDATE_STR_DOWNLOAD_WARN -{ - Text [ en-US ] = "The download location is: %DOWNLOAD_PATH.\n\nUnder Tools – Options... - %PRODUCTNAME – Online Update you can change the download location."; -}; - -String RID_UPDATE_STR_DOWNLOAD_DESCR -{ - Text [ en-US ] = "%FILE_NAME has been downloaded to %DOWNLOAD_PATH."; -}; - -String RID_UPDATE_STR_DOWNLOAD_UNAVAIL -{ - Text [ en-US ] = "The automatic download of the update is currently not available.\n\nClick 'Download...' to download %PRODUCTNAME %NEXTVERSION manually from the web site."; -}; - -String RID_UPDATE_STR_DOWNLOADING -{ - Text [ en-US ] = "Downloading %PRODUCTNAME %NEXTVERSION..."; -}; - -String RID_UPDATE_STR_READY_INSTALL -{ - Text [ en-US ] = "Download of %PRODUCTNAME %NEXTVERSION completed. Ready for installation."; -}; - -String RID_UPDATE_STR_CANCEL_TITLE -{ - Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION"; -}; - -String RID_UPDATE_STR_CANCEL_DOWNLOAD -{ - Text [ en-US ] = "Do you really want to cancel the download?"; -}; - -String RID_UPDATE_STR_BEGIN_INSTALL -{ - Text [ en-US ] = "To install the update, %PRODUCTNAME %PRODUCTVERSION needs to be closed. Do you want to install the update now?"; -}; - -String RID_UPDATE_STR_INSTALL_NOW -{ - Text [ en-US ] = "Install ~now"; -}; - -String RID_UPDATE_STR_INSTALL_LATER -{ - Text [ en-US ] = "Install ~later"; -}; - -String RID_UPDATE_STR_INSTALL_ERROR -{ - Text [ en-US ] = "Could not run the installer application, please run %FILE_NAME in %DOWNLOAD_PATH manually."; -}; - -String RID_UPDATE_STR_OVERWRITE_WARNING -{ - Text [ en-US ] = "A file with that name already exists! Do you want to overwrite the existing file?"; -}; - -String RID_UPDATE_STR_RELOAD_WARNING -{ - Text [ en-US ] = "A file with the name '%FILENAME' already exists in '%DOWNLOAD_PATH'! Do you want to continue with the download or delete and reload the file?"; -}; - -String RID_UPDATE_STR_RELOAD_RELOAD -{ - Text [ en-US ] = "Reload File"; -}; - -String RID_UPDATE_STR_RELOAD_CONTINUE -{ - Text [ en-US ] = "Continue"; -}; - -String RID_UPDATE_STR_PERCENT -{ - Text [ en-US ] = "%PERCENT%"; -}; - -String RID_UPDATE_FT_STATUS -{ - Text [ en-US ] = "Status"; -}; - -String RID_UPDATE_FT_DESCRIPTION -{ - Text [ en-US ] = "Description"; -}; - -String RID_UPDATE_BTN_CLOSE -{ - Text [ en-US ] = "Close"; -}; - -String RID_UPDATE_BTN_DOWNLOAD -{ - Text [ en-US ] = "~Download"; -}; - -String RID_UPDATE_BTN_INSTALL -{ - Text [ en-US ] = "~Install"; -}; - -String RID_UPDATE_BTN_PAUSE -{ - Text [ en-US ] = "~Pause"; -}; - -String RID_UPDATE_BTN_RESUME -{ - Text [ en-US ] = "~Resume"; -}; - -String RID_UPDATE_BTN_CANCEL -{ - Text [ en-US ] = "Cancel"; -}; - -String RID_UPDATE_BUBBLE_T_UPDATE_AVAIL -{ - Text [ en-US ] = "%PRODUCTNAME update available"; -}; - -String RID_UPDATE_BUBBLE_UPDATE_AVAIL -{ - Text [ en-US ] = "Click the icon to start the download."; -}; - -String RID_UPDATE_BUBBLE_T_UPDATE_NO_DOWN -{ - Text [ en-US ] = "%PRODUCTNAME update available"; -}; - -String RID_UPDATE_BUBBLE_UPDATE_NO_DOWN -{ - Text [ en-US ] = "Click the icon for more information."; -}; - -String RID_UPDATE_BUBBLE_T_AUTO_START -{ - Text [ en-US ] = "%PRODUCTNAME update available"; -}; - -String RID_UPDATE_BUBBLE_AUTO_START -{ - Text [ en-US ] = "Download of update begins."; -}; - -String RID_UPDATE_BUBBLE_T_DOWNLOADING -{ - Text [ en-US ] = "Download of update in progress"; -}; - -String RID_UPDATE_BUBBLE_DOWNLOADING -{ - Text [ en-US ] = ""; -}; - -String RID_UPDATE_BUBBLE_T_DOWNLOAD_PAUSED -{ - Text [ en-US ] = "Download of update paused"; -}; - -String RID_UPDATE_BUBBLE_DOWNLOAD_PAUSED -{ - Text [ en-US ] = "Click the icon to resume."; -}; - -String RID_UPDATE_BUBBLE_T_ERROR_DOWNLOADING -{ - Text [ en-US ] = "Download of update stalled"; -}; - -String RID_UPDATE_BUBBLE_ERROR_DOWNLOADING -{ - Text [ en-US ] = "Click the icon for more information."; -}; - -String RID_UPDATE_BUBBLE_T_DOWNLOAD_AVAIL -{ - Text [ en-US ] = "Download of update completed"; -}; - -String RID_UPDATE_BUBBLE_DOWNLOAD_AVAIL -{ - Text [ en-US ] = "Click the icon to start the installation."; -}; - -String RID_UPDATE_BUBBLE_T_EXT_UPD_AVAIL -{ - Text [ en-US ] = "Updates for extensions available"; -}; - -String RID_UPDATE_BUBBLE_EXT_UPD_AVAIL -{ - Text [ en-US ] = "Click the icon for more information."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index 6eacc4a9e82d..4afdda908a1a 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -32,9 +32,8 @@ #include #include #include - #include - +#include #include #include #include @@ -48,12 +47,11 @@ #include #include #include +#include #include "rtl/ustrbuf.hxx" #include "bitmaps.hlst" -#define STR_NO_WEBBROWSER_FOUND (RID_SFX_APP_START + 7) - #define PROPERTY_TITLE "BubbleHeading" #define PROPERTY_TEXT "BubbleText" #define PROPERTY_IMAGE "BubbleImageURL" @@ -140,7 +138,7 @@ class UpdateCheckUI : public ::cppu::WeakImplHelper VclPtr mpBubbleWin; VclPtr mpIconSysWin; VclPtr mpIconMBar; - ResMgr* mpSfxResMgr; + std::locale maSfxLocale; Idle maWaitIdle; Timer maTimeoutTimer; Link maWindowEventHdl; @@ -199,7 +197,7 @@ UpdateCheckUI::UpdateCheckUI(const uno::Reference& xCont , mbBubbleChanged( false ) , mnIconID( 0 ) { - mpSfxResMgr = ResMgr::CreateResMgr( "sfx" ); + maSfxLocale = Translate::Create("sfx", Application::GetSettings().GetUILanguageTag()); maBubbleImage = GetBubbleImage( maBubbleImageURL ); @@ -221,7 +219,6 @@ UpdateCheckUI::~UpdateCheckUI() { Application::RemoveEventListener( maApplicationEventHdl ); RemoveBubbleWindow( true ); - delete mpSfxResMgr; } OUString SAL_CALL @@ -549,7 +546,7 @@ IMPL_LINK_NOARG(UpdateCheckUI, ClickHdl, MenuBar::MenuBarButtonCallbackArg&, boo mrJob->execute( aEmpty ); } catch(const uno::Exception&) { - ScopedVclPtrInstance(nullptr, ResId( STR_NO_WEBBROWSER_FOUND, *mpSfxResMgr))->Execute(); + ScopedVclPtrInstance(nullptr, Translate::get(STR_NO_WEBBROWSER_FOUND, maSfxLocale))->Execute(); } } diff --git a/extensions/uiconfig/sabpilot/ui/contentfieldpage.ui b/extensions/uiconfig/sabpilot/ui/contentfieldpage.ui index c0c90086c268..5ab342ffd5e4 100644 --- a/extensions/uiconfig/sabpilot/ui/contentfieldpage.ui +++ b/extensions/uiconfig/sabpilot/ui/contentfieldpage.ui @@ -1,6 +1,6 @@ - + True @@ -31,7 +31,7 @@ True False start - Existing fields + Existing fields True selectfield:border @@ -78,7 +78,7 @@ False start start - Display field + Display field True True displayfield diff --git a/extensions/uiconfig/sabpilot/ui/contenttablepage.ui b/extensions/uiconfig/sabpilot/ui/contenttablepage.ui index 5fc5673255e9..c0b079874849 100644 --- a/extensions/uiconfig/sabpilot/ui/contenttablepage.ui +++ b/extensions/uiconfig/sabpilot/ui/contenttablepage.ui @@ -1,6 +1,6 @@ - + True @@ -40,7 +40,7 @@ True False start - Data source + Data source 0 @@ -54,7 +54,7 @@ True False start - Content type + Content type 0 @@ -68,7 +68,7 @@ True False start - Content + Content 0 @@ -145,7 +145,7 @@ True False - Form + Form @@ -191,7 +191,7 @@ True 0 0 - On the right side, you see all the tables from the data source of the form. + On the right side, you see all the tables from the data source of the form. Choose the table from which the data should be used as basis for the list content: @@ -230,7 +230,7 @@ Choose the table from which the data should be used as basis for the list conten True False - Control + Control diff --git a/extensions/uiconfig/sabpilot/ui/datasourcepage.ui b/extensions/uiconfig/sabpilot/ui/datasourcepage.ui index 0339bd75e5df..542c2cd3ef6b 100644 --- a/extensions/uiconfig/sabpilot/ui/datasourcepage.ui +++ b/extensions/uiconfig/sabpilot/ui/datasourcepage.ui @@ -1,6 +1,6 @@ - + @@ -14,7 +14,7 @@ False 0 0 - That was all the information necessary to integrate your address data into %PRODUCTNAME. + That was all the information necessary to integrate your address data into %PRODUCTNAME. Now, just enter the name under which you want to register the data source in %PRODUCTNAME. True @@ -35,7 +35,7 @@ Now, just enter the name under which you want to register the data source in %PR 6 - Embed this address book definition into the current document. + Embed this address book definition into the current document. True True False @@ -58,7 +58,7 @@ Now, just enter the name under which you want to register the data source in %PR True False 0 - Location + Location True location @@ -71,7 +71,7 @@ Now, just enter the name under which you want to register the data source in %PR - Browse... + Browse... True True True @@ -113,7 +113,7 @@ Now, just enter the name under which you want to register the data source in %PR - Make this address book available to all modules in %PRODUCTNAME. + Make this address book available to all modules in %PRODUCTNAME. True True False @@ -150,7 +150,7 @@ Now, just enter the name under which you want to register the data source in %PR True False 0 - Address book name + Address book name True location @@ -188,7 +188,7 @@ Now, just enter the name under which you want to register the data source in %PR True 0 0 - Another data source already has this name. As data sources have to have globally unique names, you need to choose another one. + Another data source already has this name. As data sources have to have globally unique names, you need to choose another one. True 90 diff --git a/extensions/uiconfig/sabpilot/ui/defaultfieldselectionpage.ui b/extensions/uiconfig/sabpilot/ui/defaultfieldselectionpage.ui index d06f0da30593..20bea91c867c 100644 --- a/extensions/uiconfig/sabpilot/ui/defaultfieldselectionpage.ui +++ b/extensions/uiconfig/sabpilot/ui/defaultfieldselectionpage.ui @@ -1,6 +1,6 @@ - + True @@ -15,7 +15,7 @@ True False start - Should one option field be selected as a default? + Should one option field be selected as a default? True @@ -31,7 +31,7 @@ 12 - _Yes, the following: + _Yes, the following: False True True @@ -73,7 +73,7 @@ - No, one particular field is not going to be selected. + No, one particular field is not going to be selected. False True True diff --git a/extensions/uiconfig/sabpilot/ui/fieldassignpage.ui b/extensions/uiconfig/sabpilot/ui/fieldassignpage.ui index f5cc1d33afdb..16ece700b78c 100644 --- a/extensions/uiconfig/sabpilot/ui/fieldassignpage.ui +++ b/extensions/uiconfig/sabpilot/ui/fieldassignpage.ui @@ -1,6 +1,6 @@ - + True @@ -13,7 +13,7 @@ False 0 0 - To incorporate the address data in your templates, %PRODUCTNAME has to know which fields contain which data. + To incorporate the address data in your templates, %PRODUCTNAME has to know which fields contain which data. For instance, you could have stored the e-mail addresses in a field named "email", or "E-mail" or "EM" - or something completely different. @@ -30,7 +30,7 @@ Click the button below to open another dialog where you can enter the settings f - Field Assignment + Field Assignment True True True diff --git a/extensions/uiconfig/sabpilot/ui/fieldlinkpage.ui b/extensions/uiconfig/sabpilot/ui/fieldlinkpage.ui index c1d7eb7c63f0..6a4dbeaf9ec1 100644 --- a/extensions/uiconfig/sabpilot/ui/fieldlinkpage.ui +++ b/extensions/uiconfig/sabpilot/ui/fieldlinkpage.ui @@ -1,6 +1,6 @@ - + True @@ -16,7 +16,7 @@ False 0 0 - This is where you select fields with matching contents so that the value from the display field will be shown. + This is where you select fields with matching contents so that the value from the display field will be shown. True 90 @@ -46,7 +46,7 @@ True False start - Field from the _Value Table + Field from the _Value Table True valuefield @@ -94,7 +94,7 @@ True False start - Field from the _List Table + Field from the _List Table True listtable diff --git a/extensions/uiconfig/sabpilot/ui/gridfieldsselectionpage.ui b/extensions/uiconfig/sabpilot/ui/gridfieldsselectionpage.ui index 0d308a2cd720..c814201518af 100644 --- a/extensions/uiconfig/sabpilot/ui/gridfieldsselectionpage.ui +++ b/extensions/uiconfig/sabpilot/ui/gridfieldsselectionpage.ui @@ -1,6 +1,6 @@ - - + + 200 @@ -41,7 +41,7 @@ True False start - Data source + Data source 0 @@ -55,7 +55,7 @@ True False start - Content type + Content type 0 @@ -69,7 +69,7 @@ True False start - Content + Content 0 @@ -145,7 +145,7 @@ True False - Form + Form @@ -202,7 +202,7 @@ True False start - Selected fields + Selected fields True selectedfields:border @@ -228,7 +228,7 @@ start - -> + -> False True True @@ -242,7 +242,7 @@ - =>> + =>> False True True @@ -270,7 +270,7 @@ start - <- + <- False True True @@ -284,7 +284,7 @@ - <<= + <<= False True True @@ -333,7 +333,7 @@ True False start - Existing fields + Existing fields True existingfields:border @@ -355,7 +355,7 @@ True False - Table element + Table element diff --git a/extensions/uiconfig/sabpilot/ui/groupradioselectionpage.ui b/extensions/uiconfig/sabpilot/ui/groupradioselectionpage.ui index 8372b91994f4..46f5cb82cc9d 100644 --- a/extensions/uiconfig/sabpilot/ui/groupradioselectionpage.ui +++ b/extensions/uiconfig/sabpilot/ui/groupradioselectionpage.ui @@ -1,6 +1,6 @@ - + 200 @@ -41,7 +41,7 @@ True False start - Data source + Data source 0 @@ -55,7 +55,7 @@ True False start - Content type + Content type 0 @@ -69,7 +69,7 @@ True False start - Content + Content 0 @@ -146,7 +146,7 @@ True False - Form + Form @@ -207,7 +207,7 @@ start 0 0 - _Option fields + _Option fields True radiobuttons:border @@ -227,7 +227,7 @@ start - _>> + _>> False True True @@ -242,7 +242,7 @@ - _<< + _<< False True True @@ -284,7 +284,7 @@ False 0 0 - Which _names do you want to give the option fields? + Which _names do you want to give the option fields? True True 42 @@ -307,7 +307,7 @@ True False - Table element + Table element diff --git a/extensions/uiconfig/sabpilot/ui/invokeadminpage.ui b/extensions/uiconfig/sabpilot/ui/invokeadminpage.ui index 868f2505ea24..abbd4d101f9b 100644 --- a/extensions/uiconfig/sabpilot/ui/invokeadminpage.ui +++ b/extensions/uiconfig/sabpilot/ui/invokeadminpage.ui @@ -1,6 +1,6 @@ - + True @@ -13,7 +13,7 @@ False 0 0 - To set up the new data source, additional information is required. + To set up the new data source, additional information is required. Click the following button to open another dialog in which you then enter the necessary information. True @@ -28,7 +28,7 @@ Click the following button to open another dialog in which you then enter the ne - Settings + Settings True True True @@ -47,7 +47,7 @@ Click the following button to open another dialog in which you then enter the ne True 0 0 - The connection to the data source could not be established. + The connection to the data source could not be established. Before you proceed, please check the settings made, or (on the previous page) choose another address data source type. True 90 diff --git a/extensions/uiconfig/sabpilot/ui/optiondbfieldpage.ui b/extensions/uiconfig/sabpilot/ui/optiondbfieldpage.ui index 3560f223ebff..b0b3227c6faa 100644 --- a/extensions/uiconfig/sabpilot/ui/optiondbfieldpage.ui +++ b/extensions/uiconfig/sabpilot/ui/optiondbfieldpage.ui @@ -1,6 +1,6 @@ - + True @@ -32,7 +32,7 @@ True False start - Do you want to save the value in a database field? + Do you want to save the value in a database field? False @@ -50,7 +50,7 @@ 12 - _Yes, I want to save it in the following database field: + _Yes, I want to save it in the following database field: False True True @@ -70,7 +70,7 @@ - _No, I only want to save the value in the form. + _No, I only want to save the value in the form. False True True diff --git a/extensions/uiconfig/sabpilot/ui/optionsfinalpage.ui b/extensions/uiconfig/sabpilot/ui/optionsfinalpage.ui index 4d09d35e0dbb..c555d3a3b61d 100644 --- a/extensions/uiconfig/sabpilot/ui/optionsfinalpage.ui +++ b/extensions/uiconfig/sabpilot/ui/optionsfinalpage.ui @@ -1,6 +1,6 @@ - + True @@ -15,7 +15,7 @@ True False start - Which _caption is to be given to your option group? + Which _caption is to be given to your option group? True nameit @@ -45,7 +45,7 @@ end True True - These were all details needed to create the option group. + These were all details needed to create the option group. True diff --git a/extensions/uiconfig/sabpilot/ui/optionvaluespage.ui b/extensions/uiconfig/sabpilot/ui/optionvaluespage.ui index 77949dcc38b4..1c66c8731676 100644 --- a/extensions/uiconfig/sabpilot/ui/optionvaluespage.ui +++ b/extensions/uiconfig/sabpilot/ui/optionvaluespage.ui @@ -1,6 +1,6 @@ - + True @@ -25,7 +25,7 @@ start start 0 - When you select an option, the option group is given a specific value. + When you select an option, the option group is given a specific value. True 40 @@ -42,7 +42,7 @@ start start 0 - Which _value do you want to assign to each option? + Which _value do you want to assign to each option? True True 40 @@ -87,7 +87,7 @@ True False start - _Option fields + _Option fields True radiobuttons:border diff --git a/extensions/uiconfig/sabpilot/ui/selecttablepage.ui b/extensions/uiconfig/sabpilot/ui/selecttablepage.ui index d765218de8cd..28d091741a7d 100644 --- a/extensions/uiconfig/sabpilot/ui/selecttablepage.ui +++ b/extensions/uiconfig/sabpilot/ui/selecttablepage.ui @@ -1,6 +1,6 @@ - + True @@ -13,7 +13,7 @@ False 0 0 - The external data source you have chosen contains more than one address book. + The external data source you have chosen contains more than one address book. Please select the one you mainly want to work with: True 90 diff --git a/extensions/uiconfig/sabpilot/ui/selecttypepage.ui b/extensions/uiconfig/sabpilot/ui/selecttypepage.ui index 9e53121491c8..41565b7c849b 100644 --- a/extensions/uiconfig/sabpilot/ui/selecttypepage.ui +++ b/extensions/uiconfig/sabpilot/ui/selecttypepage.ui @@ -1,6 +1,6 @@ - + True @@ -28,7 +28,7 @@ 6 - Evolution + Evolution True True False @@ -46,7 +46,7 @@ - Groupwise + Groupwise True True False @@ -63,7 +63,7 @@ - Evolution LDAP + Evolution LDAP True True False @@ -80,7 +80,7 @@ - Firefox/Iceweasel + Firefox/Iceweasel True True False @@ -97,7 +97,7 @@ - Thunderbird/Icedove + Thunderbird/Icedove True True False @@ -114,7 +114,7 @@ - KDE address book + KDE address book True True False @@ -131,7 +131,7 @@ - Mac OS X address book + Mac OS X address book True True False @@ -148,7 +148,7 @@ - Other external data source + Other external data source True True False @@ -171,7 +171,7 @@ True False - Please Select the Type of Your External Address Book + Please Select the Type of Your External Address Book @@ -191,7 +191,7 @@ False 0 0 - %PRODUCTNAME lets you access address data already present in your system. To do this, a %PRODUCTNAME data source will be created in which your address data is available in tabular form. + %PRODUCTNAME lets you access address data already present in your system. To do this, a %PRODUCTNAME data source will be created in which your address data is available in tabular form. This wizard helps you create the data source. True diff --git a/extensions/uiconfig/sabpilot/ui/tableselectionpage.ui b/extensions/uiconfig/sabpilot/ui/tableselectionpage.ui index 73914ba160cf..9723a7f39703 100644 --- a/extensions/uiconfig/sabpilot/ui/tableselectionpage.ui +++ b/extensions/uiconfig/sabpilot/ui/tableselectionpage.ui @@ -1,6 +1,6 @@ - + True @@ -39,7 +39,7 @@ start True True - Currently, the form the control belongs to is not (or not completely) bound to a data source. + Currently, the form the control belongs to is not (or not completely) bound to a data source. Please choose a data source and a table. @@ -69,7 +69,7 @@ Please note that the settings made on this page will take effect immediately upo True False start - _Data source: + _Data source: True datasource:border @@ -97,7 +97,7 @@ Please note that the settings made on this page will take effect immediately upo - _... + _... False True True @@ -130,7 +130,7 @@ Please note that the settings made on this page will take effect immediately upo True False start - _Table / Query: + _Table / Query: True table:border @@ -171,7 +171,7 @@ Please note that the settings made on this page will take effect immediately upo True False - Data + Data diff --git a/extensions/uiconfig/sbibliography/ui/choosedatasourcedialog.ui b/extensions/uiconfig/sbibliography/ui/choosedatasourcedialog.ui index e8b988dc106b..36db389fe5f0 100644 --- a/extensions/uiconfig/sbibliography/ui/choosedatasourcedialog.ui +++ b/extensions/uiconfig/sbibliography/ui/choosedatasourcedialog.ui @@ -1,11 +1,11 @@ - + False 6 - Choose Data Source + Choose Data Source dialog @@ -87,7 +87,7 @@ True False - Entry + Entry diff --git a/extensions/uiconfig/sbibliography/ui/generalpage.ui b/extensions/uiconfig/sbibliography/ui/generalpage.ui index 2b458f2a9776..a60a740aa73c 100644 --- a/extensions/uiconfig/sbibliography/ui/generalpage.ui +++ b/extensions/uiconfig/sbibliography/ui/generalpage.ui @@ -1,6 +1,6 @@ - + True @@ -33,7 +33,7 @@ True False 0 - _Short name + _Short name True @@ -49,7 +49,7 @@ False 12 0 - _Type + _Type True @@ -64,7 +64,7 @@ True False 0 - Author(s) + Author(s) True @@ -79,7 +79,7 @@ True False 0 - _Publisher + _Publisher True @@ -94,7 +94,7 @@ True False 0 - _Chapter + _Chapter True @@ -110,7 +110,7 @@ False 12 0 - Tit_le + Tit_le True @@ -126,7 +126,7 @@ False 12 0 - A_ddress + A_ddress True @@ -142,7 +142,7 @@ False 12 0 - Pa_ge(s) + Pa_ge(s) True @@ -158,7 +158,7 @@ False 12 0 - _Year + _Year True @@ -174,7 +174,7 @@ False 12 0 - _ISBN + _ISBN True @@ -207,7 +207,7 @@ True False 0 - Editor + Editor True @@ -222,7 +222,7 @@ True False 0 - _Book title + _Book title True @@ -238,7 +238,7 @@ False 12 0 - Ed_ition + Ed_ition True @@ -254,7 +254,7 @@ False 12 0 - Volume + Volume True @@ -270,7 +270,7 @@ False 12 0 - Instit_ution + Instit_ution True @@ -286,7 +286,7 @@ False 12 0 - _Month + _Month True @@ -302,7 +302,7 @@ False 12 0 - Publication t_ype + Publication t_ype True @@ -318,7 +318,7 @@ False 12 0 - University + University True @@ -333,7 +333,7 @@ True False 0 - Type of re_port + Type of re_port True @@ -348,7 +348,7 @@ True False 0 - Organi_zation + Organi_zation True @@ -381,7 +381,7 @@ True False 0 - _Journal + _Journal True @@ -396,7 +396,7 @@ True False 0 - Ann_otation + Ann_otation True @@ -412,7 +412,7 @@ False 12 0 - Numb_er + Numb_er True @@ -428,7 +428,7 @@ False 12 0 - _Note + _Note True @@ -444,7 +444,7 @@ False 12 0 - Se_ries + Se_ries True @@ -460,7 +460,7 @@ False 12 0 - URL + URL True @@ -493,7 +493,7 @@ True False 0 - User-defined field _1 + User-defined field _1 True @@ -508,7 +508,7 @@ True False 0 - User-defined field _4 + User-defined field _4 True @@ -524,7 +524,7 @@ False 12 0 - User-defined field _2 + User-defined field _2 True @@ -540,7 +540,7 @@ False 12 0 - User-defined field _5 + User-defined field _5 True @@ -556,7 +556,7 @@ False 12 0 - User-defined field _3 + User-defined field _3 True diff --git a/extensions/uiconfig/sbibliography/ui/mappingdialog.ui b/extensions/uiconfig/sbibliography/ui/mappingdialog.ui index 5207e4f60c04..144c919effd3 100644 --- a/extensions/uiconfig/sbibliography/ui/mappingdialog.ui +++ b/extensions/uiconfig/sbibliography/ui/mappingdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Column Layout for Table “%1” + Column Layout for Table “%1” dialog @@ -104,7 +104,7 @@ False start True - _Short name + _Short name True identifierCombobox @@ -119,7 +119,7 @@ False start True - _Author(s) + _Author(s) True authorCombobox @@ -134,7 +134,7 @@ False start True - _Publisher + _Publisher True publisherCombobox @@ -149,7 +149,7 @@ False start True - _Chapter + _Chapter True chapterCombobox @@ -164,7 +164,7 @@ False start True - Editor + Editor 0 @@ -225,7 +225,7 @@ False start True - _Type + _Type True authorityTypeCombobox @@ -240,7 +240,7 @@ False start True - _Year + _Year True yearCombobox @@ -255,7 +255,7 @@ False start True - Tit_le + Tit_le True titleCombobox @@ -306,7 +306,7 @@ False start True - A_ddress + A_ddress True addressCombobox @@ -321,7 +321,7 @@ False start True - _ISBN + _ISBN True ISBNCombobox @@ -336,7 +336,7 @@ False start True - Pa_ge(s) + Pa_ge(s) True pagesCombobox @@ -387,7 +387,7 @@ False start True - Ed_ition + Ed_ition True editionCombobox @@ -414,7 +414,7 @@ False start True - _Book title + _Book title True bookTitleCombobox @@ -429,7 +429,7 @@ False start True - Volume + Volume 2 @@ -442,7 +442,7 @@ False start True - Publication t_ype + Publication t_ype True howPublishedCombobox @@ -493,7 +493,7 @@ False start True - Organi_zation + Organi_zation True organizationCombobox @@ -508,7 +508,7 @@ False start True - Instit_ution + Instit_ution True institutionCombobox @@ -523,7 +523,7 @@ False start True - Uni_versity + Uni_versity True schoolCombobox @@ -574,7 +574,7 @@ False start True - Type of re_port + Type of re_port True reportTypeCombobox @@ -589,7 +589,7 @@ False start True - _Month + _Month True monthCombobox @@ -628,7 +628,7 @@ False start True - _Journal + _Journal True journalCombobox @@ -643,7 +643,7 @@ False start True - Numb_er + Numb_er True numberCombobox @@ -658,7 +658,7 @@ False start True - Se_ries + Se_ries True seriesCombobox @@ -709,7 +709,7 @@ False start True - Ann_otation + Ann_otation True annoteCombobox @@ -724,7 +724,7 @@ False start True - _Note + _Note True noteCombobox @@ -739,7 +739,7 @@ False start True - URL + URL 4 @@ -788,7 +788,7 @@ False start True - User-defined field _1 + User-defined field _1 True custom1Combobox @@ -803,7 +803,7 @@ False start True - User-defined field _2 + User-defined field _2 True custom2Combobox @@ -818,7 +818,7 @@ False start True - User-defined field _3 + User-defined field _3 True custom3Combobox @@ -833,7 +833,7 @@ False start True - User-defined field _4 + User-defined field _4 True custom4Combobox @@ -848,7 +848,7 @@ False start True - User-defined field _5 + User-defined field _5 True custom5Combobox @@ -967,7 +967,7 @@ True False - Column Names + Column Names diff --git a/extensions/uiconfig/sbibliography/ui/toolbar.ui b/extensions/uiconfig/sbibliography/ui/toolbar.ui index bdcc2bf7bcd4..06f8c81ac1c2 100644 --- a/extensions/uiconfig/sbibliography/ui/toolbar.ui +++ b/extensions/uiconfig/sbibliography/ui/toolbar.ui @@ -1,6 +1,6 @@ - + True @@ -11,7 +11,7 @@ True False TBC_FT_SOURCE - Table + Table True @@ -46,7 +46,7 @@ True False TBC_FT_QUERY - Search Key + Search Key True @@ -81,7 +81,7 @@ True False .uno:Bib/autoFilter - AutoFilter + AutoFilter True @@ -94,7 +94,7 @@ True False .uno:Bib/standardFilter - Standard Filter + Standard Filter True @@ -107,7 +107,7 @@ True False .uno:Bib/removeFilter - Reset Filter + Reset Filter True @@ -120,7 +120,7 @@ True False TBC_BT_COL_ASSIGN - Column Arrangement + Column Arrangement True @@ -133,7 +133,7 @@ True False .uno:Bib/sdbsource - Data Source + Data Source True diff --git a/extensions/uiconfig/scanner/ui/griddialog.ui b/extensions/uiconfig/scanner/ui/griddialog.ui index baebe9f10e3a..f55f982547c8 100644 --- a/extensions/uiconfig/scanner/ui/griddialog.ui +++ b/extensions/uiconfig/scanner/ui/griddialog.ui @@ -1,6 +1,6 @@ - + @@ -53,10 +53,10 @@ True False - Linear ascending - Linear descending - Original values - Exponential increasing + Linear ascending + Linear descending + Original values + Exponential increasing @@ -67,7 +67,7 @@ - _Set + _Set False True True diff --git a/extensions/uiconfig/scanner/ui/sanedialog.ui b/extensions/uiconfig/scanner/ui/sanedialog.ui index 33075f66e12c..2957346783c7 100644 --- a/extensions/uiconfig/scanner/ui/sanedialog.ui +++ b/extensions/uiconfig/scanner/ui/sanedialog.ui @@ -1,12 +1,12 @@ - + False 6 - Scanner + Scanner dialog @@ -43,7 +43,7 @@ True False 0 - _Left: + _Left: True leftSpinbutton:0 @@ -59,7 +59,7 @@ True False 0 - To_p: + To_p: True topSpinbutton:0 @@ -75,7 +75,7 @@ True False 0 - _Right: + _Right: True rightSpinbutton:0 @@ -91,7 +91,7 @@ True False 0 - _Bottom: + _Bottom: True bottomSpinbutton:0 @@ -163,7 +163,7 @@ True False 0 - Scan area + Scan area @@ -205,7 +205,7 @@ True False - Preview + Preview @@ -239,7 +239,7 @@ True False 0 - Device _used + Device _used True deviceCombobox @@ -255,7 +255,7 @@ True False 0 - Resolution [_DPI] + Resolution [_DPI] True reslCombobox @@ -309,7 +309,7 @@ 6 - Show advanced options + Show advanced options False True True @@ -341,7 +341,7 @@ True False 0 - Options: + Options: True optionSvTreeListBox:border @@ -413,7 +413,7 @@ - Se_t + Se_t False True True @@ -497,7 +497,7 @@ False start 0 - Vector element + Vector element True vectorSpinbutton-nospin @@ -626,7 +626,7 @@ - About Dev_ice + About Dev_ice False True True @@ -641,7 +641,7 @@ - Create Previe_w + Create Previe_w False True True @@ -656,7 +656,7 @@ - _Scan + _Scan False True True diff --git a/extensions/uiconfig/spropctrlr/ui/controlfontdialog.ui b/extensions/uiconfig/spropctrlr/ui/controlfontdialog.ui index 870ce46680bd..796f6983b189 100644 --- a/extensions/uiconfig/spropctrlr/ui/controlfontdialog.ui +++ b/extensions/uiconfig/spropctrlr/ui/controlfontdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Character + Character dialog @@ -96,7 +96,7 @@ True False - Font + Font False @@ -109,7 +109,7 @@ True False - Font Effects + Font Effects 1 diff --git a/extensions/uiconfig/spropctrlr/ui/datatypedialog.ui b/extensions/uiconfig/spropctrlr/ui/datatypedialog.ui index a55ea1ead182..052e3b7c5cf1 100644 --- a/extensions/uiconfig/spropctrlr/ui/datatypedialog.ui +++ b/extensions/uiconfig/spropctrlr/ui/datatypedialog.ui @@ -1,11 +1,11 @@ - + False 6 - New Data Type + New Data Type normal @@ -82,7 +82,7 @@ True False - Type a name for the new data type: + Type a name for the new data type: True entry 0 diff --git a/extensions/uiconfig/spropctrlr/ui/fieldlinkrow.ui b/extensions/uiconfig/spropctrlr/ui/fieldlinkrow.ui index 3164832345a4..fd55055afdc2 100644 --- a/extensions/uiconfig/spropctrlr/ui/fieldlinkrow.ui +++ b/extensions/uiconfig/spropctrlr/ui/fieldlinkrow.ui @@ -1,5 +1,5 @@ - + True diff --git a/extensions/uiconfig/spropctrlr/ui/formlinksdialog.ui b/extensions/uiconfig/spropctrlr/ui/formlinksdialog.ui index 9c598a3aef7f..de85978409ae 100644 --- a/extensions/uiconfig/spropctrlr/ui/formlinksdialog.ui +++ b/extensions/uiconfig/spropctrlr/ui/formlinksdialog.ui @@ -1,12 +1,12 @@ - + False True True 6 - Link fields + Link fields dialog @@ -69,7 +69,7 @@ - Suggest + Suggest False True True @@ -102,7 +102,7 @@ True False 0 - Sub forms can be used to display detailed data about the current record of the master form. To do this, you can specify which columns in the sub form match which columns in the master form. + Sub forms can be used to display detailed data about the current record of the master form. To do this, you can specify which columns in the sub form match which columns in the master form. True 60 @@ -122,7 +122,7 @@ True False - label + label False @@ -134,7 +134,7 @@ True False - label + label False diff --git a/extensions/uiconfig/spropctrlr/ui/labelselectiondialog.ui b/extensions/uiconfig/spropctrlr/ui/labelselectiondialog.ui index d9ff397cce35..efce46798e7c 100644 --- a/extensions/uiconfig/spropctrlr/ui/labelselectiondialog.ui +++ b/extensions/uiconfig/spropctrlr/ui/labelselectiondialog.ui @@ -1,12 +1,12 @@ - + False 6 - Label Field Selection + Label Field Selection dialog @@ -85,7 +85,7 @@ True False start - These are control fields that can be used as label fields for the $controlclass$ $controlname$. + These are control fields that can be used as label fields for the $controlclass$ $controlname$. True True control:border @@ -119,7 +119,7 @@ - _No assignment + _No assignment False True True diff --git a/extensions/uiconfig/spropctrlr/ui/listselectdialog.ui b/extensions/uiconfig/spropctrlr/ui/listselectdialog.ui index 247868baac0f..b619eb60bc56 100644 --- a/extensions/uiconfig/spropctrlr/ui/listselectdialog.ui +++ b/extensions/uiconfig/spropctrlr/ui/listselectdialog.ui @@ -1,6 +1,6 @@ - + False diff --git a/extensions/uiconfig/spropctrlr/ui/taborder.ui b/extensions/uiconfig/spropctrlr/ui/taborder.ui index d87b7e99d798..87d977feb41b 100644 --- a/extensions/uiconfig/spropctrlr/ui/taborder.ui +++ b/extensions/uiconfig/spropctrlr/ui/taborder.ui @@ -1,11 +1,11 @@ - + False 6 - Tab Order + Tab Order dialog @@ -18,7 +18,7 @@ end - _Move Up + _Move Up True True True @@ -32,7 +32,7 @@ - Move _Down + Move _Down True True True @@ -46,7 +46,7 @@ - _Automatic Sort + _Automatic Sort True True True @@ -143,7 +143,7 @@ True False - Controls + Controls diff --git a/filter/AllLangMoTarget_flt.mk b/filter/AllLangMoTarget_flt.mk new file mode 100644 index 000000000000..3c491bc95728 --- /dev/null +++ b/filter/AllLangMoTarget_flt.mk @@ -0,0 +1,13 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# 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/. + +$(eval $(call gb_AllLangMoTarget_AllLangMoTarget,flt)) + +$(eval $(call gb_AllLangMoTarget_set_polocation,flt,filter)) + +# vim: set noet sw=4 ts=4: diff --git a/filter/AllLangResTarget_eps.mk b/filter/AllLangResTarget_eps.mk deleted file mode 100644 index ea1d21a0a6e4..000000000000 --- a/filter/AllLangResTarget_eps.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -# 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 . -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,eps)) - -$(eval $(call gb_AllLangResTarget_add_srs,eps,\ - filter/eps \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,filter/eps)) - -$(eval $(call gb_SrsTarget_add_files,filter/eps,\ - filter/source/graphicfilter/eps/epsstr.src \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/filter/AllLangResTarget_pdffilter.mk b/filter/AllLangResTarget_pdffilter.mk deleted file mode 100644 index fddc6ff8323d..000000000000 --- a/filter/AllLangResTarget_pdffilter.mk +++ /dev/null @@ -1,40 +0,0 @@ -# -# 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 . -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,pdffilter)) - -# this is ugly; why is it necessary to set this manually? -$(eval $(call gb_AllLangResTarget_set_reslocation,pdffilter,res)) - -$(eval $(call gb_AllLangResTarget_add_srs,pdffilter,\ - filter/pdffilter \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,filter/pdffilter)) - -$(eval $(call gb_SrsTarget_set_include,filter/pdffilter,\ - $$(INCLUDE) \ - -I$(SRCDIR)/filter/inc \ -)) - -$(eval $(call gb_SrsTarget_add_files,filter/pdffilter,\ - filter/source/pdf/impdialog.src \ - filter/source/pdf/pdf.src \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/filter/AllLangResTarget_t602filter.mk b/filter/AllLangResTarget_t602filter.mk deleted file mode 100644 index 43cf03db6ffd..000000000000 --- a/filter/AllLangResTarget_t602filter.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -# 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 . -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,t602filter)) - -$(eval $(call gb_AllLangResTarget_add_srs,t602filter,\ - filter/t602filter \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,filter/t602filter)) - -$(eval $(call gb_SrsTarget_add_files,filter/t602filter,\ - filter/source/t602/t602filter.src \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/filter/AllLangResTarget_xsltdlg.mk b/filter/AllLangResTarget_xsltdlg.mk deleted file mode 100644 index 34262e21926e..000000000000 --- a/filter/AllLangResTarget_xsltdlg.mk +++ /dev/null @@ -1,36 +0,0 @@ -# -# 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 . -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,xsltdlg)) - -$(eval $(call gb_AllLangResTarget_add_srs,xsltdlg,\ - filter/xsltdlg \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,filter/xsltdlg)) - -$(eval $(call gb_SrsTarget_set_include,filter/xsltdlg,\ - $$(INCLUDE) \ - -I$(SRCDIR)/filter/inc \ -)) - -$(eval $(call gb_SrsTarget_add_files,filter/xsltdlg,\ - filter/source/xsltdialog/xmlfilterdialogstrings.src \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/filter/Library_gie.mk b/filter/Library_gie.mk index 167f6c758b34..d1513b25aed6 100644 --- a/filter/Library_gie.mk +++ b/filter/Library_gie.mk @@ -19,6 +19,11 @@ $(eval $(call gb_Library_Library,gie)) +$(eval $(call gb_Library_set_include,gie,\ + $$(INCLUDE) \ + -I$(SRCDIR)/filter/inc \ +)) + $(eval $(call gb_Library_use_external,gie,boost_headers)) $(eval $(call gb_Library_use_sdk_api,gie)) diff --git a/filter/Library_graphicfilter.mk b/filter/Library_graphicfilter.mk index 60b20eb2491d..e0e60357cb13 100644 --- a/filter/Library_graphicfilter.mk +++ b/filter/Library_graphicfilter.mk @@ -26,8 +26,8 @@ $(eval $(call gb_Library_use_external,graphicfilter,boost_headers)) $(eval $(call gb_Library_use_sdk_api,graphicfilter)) $(eval $(call gb_Library_set_include,graphicfilter,\ - -I$(SRCDIR)/filter/inc \ $$(INCLUDE) \ + -I$(SRCDIR)/filter/inc \ )) $(eval $(call gb_Library_use_libraries,graphicfilter,\ diff --git a/filter/Library_t602filter.mk b/filter/Library_t602filter.mk index 1b2d3ed6fa89..82b616434e47 100644 --- a/filter/Library_t602filter.mk +++ b/filter/Library_t602filter.mk @@ -19,6 +19,11 @@ $(eval $(call gb_Library_Library,t602filter)) +$(eval $(call gb_Library_set_include,t602filter,\ + $$(INCLUDE) \ + -I$(SRCDIR)/filter/inc \ +)) + $(eval $(call gb_Library_set_componentfile,t602filter,filter/source/t602/t602filter)) $(eval $(call gb_Library_use_external,t602filter,boost_headers)) diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk index 45cd54501c03..a7834b6dc631 100644 --- a/filter/Module_filter.mk +++ b/filter/Module_filter.mk @@ -40,14 +40,11 @@ $(eval $(call gb_Module_add_targets,filter,\ Package_docbook \ Package_xhtml \ Package_xslt \ + UIConfig_filter \ )) $(eval $(call gb_Module_add_l10n_targets,filter,\ - AllLangResTarget_eps \ - AllLangResTarget_pdffilter \ - AllLangResTarget_t602filter \ - AllLangResTarget_xsltdlg \ - UIConfig_filter \ + AllLangMoTarget_flt \ )) ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) diff --git a/filter/inc/strings.hrc b/filter/inc/strings.hrc new file mode 100644 index 000000000000..279fee3eedbf --- /dev/null +++ b/filter/inc/strings.hrc @@ -0,0 +1,83 @@ +/* -*- 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_FILTER_INC_STRINGS_HRC +#define INCLUDED_FILTER_INC_STRINGS_HRC + +#define NC_(Context, String) (Context "\004" u8##String) + +#define STR_COLUMN_HEADER_NAME NC_("STR_COLUMN_HEADER_NAME", "Name") +#define STR_COLUMN_HEADER_TYPE NC_("STR_COLUMN_HEADER_TYPE", "Type") +#define STR_UNKNOWN_APPLICATION NC_("STR_UNKNOWN_APPLICATION", "Unknown") +#define STR_IMPORT_ONLY NC_("STR_IMPORT_ONLY", "import filter") +#define STR_IMPORT_EXPORT NC_("STR_IMPORT_EXPORT", "import/export filter") +#define STR_EXPORT_ONLY NC_("STR_EXPORT_ONLY", "export filter") +#define STR_WARN_DELETE NC_("STR_WARN_DELETE", "Do you really want to delete the XML Filter '%s'? This action cannot be undone.") +#define STR_ERROR_FILTER_NAME_EXISTS NC_("STR_ERROR_FILTER_NAME_EXISTS", "An XML filter with the name '%s' already exists. Please enter a different name.") +#define STR_ERROR_TYPE_NAME_EXISTS NC_("STR_ERROR_TYPE_NAME_EXISTS", "The name for the user interface '%s1' is already used by the XML filter '%s2'. Please enter a different name.") +#define STR_ERROR_EXPORT_XSLT_NOT_FOUND NC_("STR_ERROR_EXPORT_XSLT_NOT_FOUND", "The XSLT for export cannot be found. Please enter a valid path.") +#define STR_ERROR_IMPORT_XSLT_NOT_FOUND NC_("STR_ERROR_IMPORT_XSLT_NOT_FOUND", "The XSLT for import cannot be found. Please enter a valid path.") +#define STR_ERROR_IMPORT_TEMPLATE_NOT_FOUND NC_("STR_ERROR_IMPORT_TEMPLATE_NOT_FOUND", "The given import template cannot be found. Please enter a valid path.") +#define STR_DEFAULT_FILTER_NAME NC_("STR_DEFAULT_FILTER_NAME", "New Filter") +#define STR_DEFAULT_UI_NAME NC_("STR_DEFAULT_UI_NAME", "Untitled") +#define STR_UNDEFINED_FILTER NC_("STR_UNDEFINED_FILTER", "undefined filter") +#define STR_FILTER_HAS_BEEN_SAVED NC_("STR_FILTER_HAS_BEEN_SAVED", "The XML filter '%s' has been saved as package '%s'. ") +#define STR_FILTERS_HAVE_BEEN_SAVED NC_("STR_FILTERS_HAVE_BEEN_SAVED", "%s XML filters have been saved in the package '%s'.") +#define STR_FILTER_PACKAGE NC_("STR_FILTER_PACKAGE", "XSLT filter package") +#define STR_FILTER_INSTALLED NC_("STR_FILTER_INSTALLED", "The XML filter '%s' has been installed successfully.") +#define STR_FILTERS_INSTALLED NC_("STR_FILTERS_INSTALLED", "%s XML filters have been installed successfully.") +#define STR_NO_FILTERS_FOUND NC_("STR_NO_FILTERS_FOUND", "No XML filter could be installed because the package '%s' does not contain any XML filters.") +#define STR_XML_FILTER_LISTBOX NC_("STR_XML_FILTER_LISTBOX", "XML Filter List") + +#define T602FILTER_STR_IMPORT_DIALOG_TITLE NC_("T602FILTER_STR_IMPORT_DIALOG_TITLE", "Settings for T602 import") +#define T602FILTER_STR_ENCODING_LABEL NC_("T602FILTER_STR_ENCODING_LABEL", "Encoding") +#define T602FILTER_STR_ENCODING_AUTO NC_("T602FILTER_STR_ENCODING_AUTO", "Automatic") +#define T602FILTER_STR_ENCODING_CP852 NC_("T602FILTER_STR_ENCODING_CP852", "CP852 (Latin2)") +#define T602FILTER_STR_ENCODING_CP895 NC_("T602FILTER_STR_ENCODING_CP895", "CP895 (KEYB2CS, Kamenicky)") +#define T602FILTER_STR_ENCODING_KOI8CS2 NC_("T602FILTER_STR_ENCODING_KOI8CS2", "KOI8 CS2") +#define T602FILTER_STR_CYRILLIC_MODE NC_("T602FILTER_STR_CYRILLIC_MODE", "Mode for Russian language (Cyrillic)") +#define T602FILTER_STR_REFORMAT_TEXT NC_("T602FILTER_STR_REFORMAT_TEXT", "Reformat the text") +#define T602FILTER_STR_DOT_COMMANDS NC_("T602FILTER_STR_DOT_COMMANDS", "Display dot commands") +#define T602FILTER_STR_CANCEL_BUTTON NC_("T602FILTER_STR_CANCEL_BUTTON", "Cancel") +#define T602FILTER_STR_OK_BUTTON NC_("T602FILTER_STR_OK_BUTTON", "OK") + +#define KEY_VERSION_CHECK NC_("KEY_VERSION_CHECK", "Warning: Not all of the imported EPS graphics could be saved at level1\nas some are at a higher level!") + +#define PDF_PROGRESS_BAR NC_("PDF_PROGRESS_BAR", "Export as PDF") + +//strings used in encryption UI +//password dialog title +#define STR_PDF_EXPORT_UDPWD NC_("STR_PDF_EXPORT_UDPWD", "Set open password") +//password dialog title +#define STR_PDF_EXPORT_ODPWD NC_("STR_PDF_EXPORT_ODPWD", "Set permission password") +#define STR_WARN_PASSWORD_PDFA NC_("STR_WARN_PASSWORD_PDFA", "PDF/A does not allow encryption. The exported PDF file will not be password protected.") +#define STR_WARN_TRANSP_PDFA_SHORT NC_("STR_WARN_TRANSP_PDFA_SHORT", "PDF/A transparency") +#define STR_WARN_TRANSP_PDFA NC_("STR_WARN_TRANSP_PDFA", "PDF/A forbids transparency. A transparent object was painted opaque instead.") +#define STR_WARN_TRANSP_VERSION_SHORT NC_("STR_WARN_TRANSP_VERSION_SHORT", "PDF version conflict") +#define STR_WARN_TRANSP_VERSION NC_("STR_WARN_TRANSP_VERSION", "Transparency is not supported in PDF versions earlier than PDF 1.4. A transparent object was painted opaque instead") +#define STR_WARN_FORMACTION_PDFA_SHORT NC_("STR_WARN_FORMACTION_PDFA_SHORT", "PDF/A form action") +#define STR_WARN_FORMACTION_PDFA NC_("STR_WARN_FORMACTION_PDFA", "A form control contained an action not supported by the PDF/A standard. The action was skipped") +#define STR_WARN_TRANSP_CONVERTED NC_("STR_WARN_TRANSP_CONVERTED", "Some objects were converted to an image in order to remove transparencies, because the target PDF format does not support transparencies. Possibly better results can be achieved if you remove the transparent objects before exporting.") +#define STR_WARN_TRANSP_CONVERTED_SHORT NC_("STR_WARN_TRANSP_CONVERTED_SHORT", "Transparencies removed") +#define STR_ERR_SIGNATURE_FAILED NC_("STR_ERR_SIGNATURE_FAILED", "Signature generation failed") +#define STR_ERR_PDF_EXPORT_ABORTED NC_("STR_ERR_PDF_EXPORT_ABORTED", "PDF export aborted") + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/inc/strings.hxx b/filter/inc/strings.hxx index 3a25ef921b31..c405e61121ab 100644 --- a/filter/inc/strings.hxx +++ b/filter/inc/strings.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_FILTER_INC_STRINGS_HRC -#define INCLUDED_FILTER_INC_STRINGS_HRC +#ifndef INCLUDED_FILTER_INC_STRINGS_HXX +#define INCLUDED_FILTER_INC_STRINGS_HXX #define STR_APPL_NAME_WRITER "%PRODUCTNAME Writer (.sxw)" #define STR_APPL_NAME_CALC "%PRODUCTNAME Calc (.sxc)" diff --git a/filter/source/flash/impswfdialog.hxx b/filter/source/flash/impswfdialog.hxx index adf3a349f715..5dfe84de0d13 100644 --- a/filter/source/flash/impswfdialog.hxx +++ b/filter/source/flash/impswfdialog.hxx @@ -31,7 +31,6 @@ #include -class ResMgr; namespace vcl { class Window; } diff --git a/filter/source/flash/swfdialog.hxx b/filter/source/flash/swfdialog.hxx index c659b51750cd..e75d8ba08a87 100644 --- a/filter/source/flash/swfdialog.hxx +++ b/filter/source/flash/swfdialog.hxx @@ -27,7 +27,6 @@ namespace vcl { class Window; } -class ResMgr; class SWFDialog final: diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index a8bfd98c4410..f84093afa558 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -436,14 +437,9 @@ bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Filter if ( mbStatus && mnLevelWarning && pFilterConfigItem ) { - ResMgr* pResMgr; - pResMgr = ResMgr::CreateResMgr( "eps", Application::GetSettings().GetUILanguageTag() ); - if( pResMgr ) - { - ScopedVclPtrInstance< InfoBox > aInfoBox( nullptr, ResId(KEY_VERSION_CHECK, *pResMgr) ); - aInfoBox->Execute(); - delete pResMgr; - } + std::locale loc = Translate::Create("flt", Application::GetSettings().GetUILanguageTag()); + ScopedVclPtrInstance< InfoBox > aInfoBox(nullptr, Translate::get(KEY_VERSION_CHECK, loc)); + aInfoBox->Execute(); } if ( xStatusIndicator.is() ) diff --git a/filter/source/graphicfilter/eps/epsstr.src b/filter/source/graphicfilter/eps/epsstr.src deleted file mode 100644 index 2a1139514450..000000000000 --- a/filter/source/graphicfilter/eps/epsstr.src +++ /dev/null @@ -1,27 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * 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 "strings.hrc" - -String KEY_VERSION_CHECK -{ - Text [ en-US ] = "Warning: Not all of the imported EPS graphics could be saved at level1\nas some are at a higher level!"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/graphicfilter/eps/strings.hrc b/filter/source/graphicfilter/eps/strings.hrc deleted file mode 100644 index 531cc7d7c4cb..000000000000 --- a/filter/source/graphicfilter/eps/strings.hrc +++ /dev/null @@ -1,22 +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 . - */ - -#define KEY_VERSION_CHECK 260 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index e509e43e867a..56e3370158e0 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -20,7 +20,7 @@ #include #include "impdialog.hxx" -#include "impdialog.hrc" +#include "strings.hrc" #include "bitmaps.hlst" #include #include @@ -28,6 +28,7 @@ #include #include "sfx2/passwd.hxx" #include "svtools/miscopt.hxx" +#include "tools/resmgr.hxx" #include "comphelper/propertyvalue.hxx" #include "comphelper/sequence.hxx" @@ -41,17 +42,17 @@ #include "com/sun/star/security/DocumentDigitalSignatures.hpp" #include "com/sun/star/security/XCertificate.hpp" -static ResMgr& getPDFFilterResMgr() +static std::locale& getPDFFilterResLocale() { - static ResMgr *pRes = ResMgr::CreateResMgr( "pdffilter", Application::GetSettings().GetUILanguageTag()); - return *pRes; + static std::locale loc = Translate::Create("flt", Application::GetSettings().GetUILanguageTag()); + return loc; } -PDFFilterResId::PDFFilterResId( sal_uInt32 nId ) : ResId( nId, getPDFFilterResMgr() ) +OUString PDFFilterResId(const char* pId) { + return Translate::get(pId, getPDFFilterResLocale()); } - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -1613,35 +1614,35 @@ ImplErrorDialog::ImplErrorDialog(const std::set< vcl::PDFWriter::ErrorCode >& rE { case vcl::PDFWriter::Warning_Transparency_Omitted_PDFA: { - sal_uInt16 nPos = m_pErrors->InsertEntry( OUString( PDFFilterResId( STR_WARN_TRANSP_PDFA_SHORT ) ), + sal_uInt16 nPos = m_pErrors->InsertEntry( PDFFilterResId( STR_WARN_TRANSP_PDFA_SHORT ), aWarnImg ); m_pErrors->SetEntryData( nPos, new OUString( PDFFilterResId( STR_WARN_TRANSP_PDFA ) ) ); } break; case vcl::PDFWriter::Warning_Transparency_Omitted_PDF13: { - sal_uInt16 nPos = m_pErrors->InsertEntry( OUString( PDFFilterResId( STR_WARN_TRANSP_VERSION_SHORT ) ), + sal_uInt16 nPos = m_pErrors->InsertEntry( PDFFilterResId( STR_WARN_TRANSP_VERSION_SHORT ), aWarnImg ); m_pErrors->SetEntryData( nPos, new OUString( PDFFilterResId( STR_WARN_TRANSP_VERSION ) ) ); } break; case vcl::PDFWriter::Warning_FormAction_Omitted_PDFA: { - sal_uInt16 nPos = m_pErrors->InsertEntry( OUString( PDFFilterResId( STR_WARN_FORMACTION_PDFA_SHORT ) ), + sal_uInt16 nPos = m_pErrors->InsertEntry( PDFFilterResId( STR_WARN_FORMACTION_PDFA_SHORT ), aWarnImg ); m_pErrors->SetEntryData( nPos, new OUString( PDFFilterResId( STR_WARN_FORMACTION_PDFA ) ) ); } break; case vcl::PDFWriter::Warning_Transparency_Converted: { - sal_uInt16 nPos = m_pErrors->InsertEntry( OUString( PDFFilterResId( STR_WARN_TRANSP_CONVERTED_SHORT ) ), + sal_uInt16 nPos = m_pErrors->InsertEntry( PDFFilterResId( STR_WARN_TRANSP_CONVERTED_SHORT ), aWarnImg ); m_pErrors->SetEntryData( nPos, new OUString( PDFFilterResId( STR_WARN_TRANSP_CONVERTED ) ) ); } break; case vcl::PDFWriter::Error_Signature_Failed: { - sal_uInt16 nPos = m_pErrors->InsertEntry( OUString( PDFFilterResId( STR_ERR_SIGNATURE_FAILED ) ), + sal_uInt16 nPos = m_pErrors->InsertEntry( PDFFilterResId( STR_ERR_SIGNATURE_FAILED ), aErrImg ); m_pErrors->SetEntryData( nPos, new OUString( PDFFilterResId( STR_ERR_PDF_EXPORT_ABORTED ) ) ); } diff --git a/filter/source/pdf/impdialog.hrc b/filter/source/pdf/impdialog.hrc deleted file mode 100644 index cd9f7772cb8b..000000000000 --- a/filter/source/pdf/impdialog.hrc +++ /dev/null @@ -1,45 +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 - -#define STR_ERR_SIGNATURE_FAILED (RID_PDF_DIALOG_START + 0) -#define STR_ERR_PDF_EXPORT_ABORTED (RID_PDF_DIALOG_START + 1) - -#define STR_WARN_PASSWORD_PDFA (RID_PDF_DIALOG_START + 6) - -//strings for PDF security, user password management -#define STR_PDF_EXPORT_UDPWD (RID_PDF_DIALOG_START + 7) - -//strings for PDF security, owner password management -#define STR_PDF_EXPORT_ODPWD (RID_PDF_DIALOG_START + 8) - -#define STR_WARN_TRANSP_PDFA (RID_PDF_DIALOG_START + 9) -#define STR_WARN_TRANSP_PDFA_SHORT (RID_PDF_DIALOG_START + 10) -#define STR_WARN_TRANSP_VERSION (RID_PDF_DIALOG_START + 11) -#define STR_WARN_TRANSP_VERSION_SHORT (RID_PDF_DIALOG_START + 12) -#define STR_WARN_FORMACTION_PDFA (RID_PDF_DIALOG_START + 13) -#define STR_WARN_FORMACTION_PDFA_SHORT (RID_PDF_DIALOG_START + 14) -#define STR_WARN_TRANSP_CONVERTED (RID_PDF_DIALOG_START + 15) -#define STR_WARN_TRANSP_CONVERTED_SHORT (RID_PDF_DIALOG_START + 16) - -//ATTENTION: maximum allowed value is (RID_PDF_DIALOG_START + 19) -//(see filter/inc/filter.hrc) - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx index 2def0c7ffd83..526fa0cdf96f 100644 --- a/filter/source/pdf/impdialog.hxx +++ b/filter/source/pdf/impdialog.hxx @@ -38,20 +38,11 @@ #include - class ImpPDFTabGeneralPage; class ImpPDFTabViewerPage; class ImpPDFTabOpnFtrPage; class ImpPDFTabLinksPage; - -class PDFFilterResId : public ResId -{ -public: - explicit PDFFilterResId( sal_uInt32 nId ); -}; - - class ImplErrorDialog : public MessageDialog { private: diff --git a/filter/source/pdf/impdialog.src b/filter/source/pdf/impdialog.src deleted file mode 100644 index cb5b68a61ae8..000000000000 --- a/filter/source/pdf/impdialog.src +++ /dev/null @@ -1,91 +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 "impdialog.hrc" - -//strings used in encryption UI - -//password dialog title -String STR_PDF_EXPORT_UDPWD -{ - Text[ en-US ] = "Set open password"; -}; - -//password dialog title -String STR_PDF_EXPORT_ODPWD -{ - Text[ en-US ] = "Set permission password"; -}; - -String STR_WARN_PASSWORD_PDFA -{ - Text [ en-US ] = "PDF/A does not allow encryption. The exported PDF file will not be password protected."; -}; - -String STR_WARN_TRANSP_PDFA_SHORT -{ - Text [en-US] = "PDF/A transparency"; -}; - -String STR_WARN_TRANSP_PDFA -{ - Text [en-US] = "PDF/A forbids transparency. A transparent object was painted opaque instead."; -}; - -String STR_WARN_TRANSP_VERSION_SHORT -{ - Text [en-US] = "PDF version conflict"; -}; - -String STR_WARN_TRANSP_VERSION -{ - Text [en-US] = "Transparency is not supported in PDF versions earlier than PDF 1.4. A transparent object was painted opaque instead"; -}; - -String STR_WARN_FORMACTION_PDFA_SHORT -{ - Text [en-US] = "PDF/A form action"; -}; - -String STR_WARN_FORMACTION_PDFA -{ - Text [en-US] = "A form control contained an action not supported by the PDF/A standard. The action was skipped"; -}; - -String STR_WARN_TRANSP_CONVERTED -{ - Text [en-US] = "Some objects were converted to an image in order to remove transparencies, because the target PDF format does not support transparencies. Possibly better results can be achieved if you remove the transparent objects before exporting."; -}; - -String STR_WARN_TRANSP_CONVERTED_SHORT -{ - Text [en-US] = "Transparencies removed"; -}; - -String STR_ERR_SIGNATURE_FAILED -{ - Text [en-US] = "Signature generation failed"; -}; - -String STR_ERR_PDF_EXPORT_ABORTED -{ - Text [en-US] = "PDF export aborted"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/pdf/pdf.hrc b/filter/source/pdf/pdf.hrc deleted file mode 100644 index 64b4dab38afc..000000000000 --- a/filter/source/pdf/pdf.hrc +++ /dev/null @@ -1,22 +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 . - */ - -#define PDF_PROGRESS_BAR 260 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/pdf/pdf.src b/filter/source/pdf/pdf.src deleted file mode 100644 index bf491d31856c..000000000000 --- a/filter/source/pdf/pdf.src +++ /dev/null @@ -1,27 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * 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 "pdf.hrc" - -String PDF_PROGRESS_BAR -{ - Text [ en-US ] = "Export as PDF"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index 1d24b3e0bf5e..d260e0308d59 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -50,7 +51,7 @@ #include "pdfexport.hxx" #include "impdialog.hxx" -#include "pdf.hrc" +#include "strings.hrc" #include #include @@ -883,14 +884,11 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& if ( mxStatusIndicator.is() ) { - std::unique_ptr pResMgr(ResMgr::CreateResMgr( "pdffilter", Application::GetSettings().GetUILanguageTag() )); - if ( pResMgr ) - { - sal_Int32 nTotalPageCount = aRangeEnum.size(); - if ( bExportPages && bExportNotesPages ) - nTotalPageCount *= 2; - mxStatusIndicator->start( ResId( PDF_PROGRESS_BAR, *pResMgr ), nTotalPageCount ); - } + std::locale loc(Translate::Create("flt", Application::GetSettings().GetUILanguageTag())); + sal_Int32 nTotalPageCount = aRangeEnum.size(); + if ( bExportPages && bExportNotesPages ) + nTotalPageCount *= 2; + mxStatusIndicator->start(Translate::get(PDF_PROGRESS_BAR, loc), nTotalPageCount); } bRet = nPageCount > 0; diff --git a/filter/source/svg/impsvgdialog.hxx b/filter/source/svg/impsvgdialog.hxx index 205a3417e118..0e31fc33bef1 100644 --- a/filter/source/svg/impsvgdialog.hxx +++ b/filter/source/svg/impsvgdialog.hxx @@ -37,7 +37,6 @@ #define SVG_PROP_POSITIONED_CHARACTERS "UsePositionedCharacters" -class ResMgr; namespace vcl { class Window; } @@ -61,7 +60,7 @@ private: public: - ImpSVGDialog( vcl::Window* pParent, /*ResMgr& rResMgr,*/ + ImpSVGDialog( vcl::Window* pParent, css::uno::Sequence< css::beans::PropertyValue >& rFilterData ); virtual ~ImpSVGDialog() override; virtual void dispose() override; diff --git a/filter/source/svg/svgdialog.hxx b/filter/source/svg/svgdialog.hxx index 812e6efa9a5f..92d3d0432938 100644 --- a/filter/source/svg/svgdialog.hxx +++ b/filter/source/svg/svgdialog.hxx @@ -28,8 +28,6 @@ #include -class ResMgr; - class SVGDialog final: public ::svt::OGenericUnoDialog, public ::comphelper::OPropertyArrayUsageHelper< SVGDialog >, diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx index b5cebf5ec5fd..ea20785d4995 100644 --- a/filter/source/t602/t602filter.cxx +++ b/filter/source/t602/t602filter.cxx @@ -18,7 +18,7 @@ */ #include "t602filter.hxx" -#include "t602filter.hrc" +#include "strings.hrc" #include @@ -35,8 +35,10 @@ #include #include #include +#include #include #include +#include #include using namespace ::cppu; @@ -883,8 +885,10 @@ Reference< XInterface > SAL_CALL T602ImportFilter_createInstance( const Referenc return static_cast(new T602ImportFilter( rSMgr )); } -T602ImportFilterDialog::T602ImportFilterDialog() : - mpResMgr( nullptr ) {} +T602ImportFilterDialog::T602ImportFilterDialog() + : mpResLocale(nullptr) +{ +} T602ImportFilterDialog::~T602ImportFilterDialog() { @@ -1086,14 +1090,14 @@ bool T602ImportFilterDialog::OptionsDlg() void T602ImportFilterDialog::initLocale() { - mpResMgr.reset( ResMgr::CreateResMgr( "t602filter", LanguageTag( meLocale) ) ); + mpResLocale.reset(new std::locale(Translate::Create("flt", LanguageTag(meLocale)))); } -ResMgr* T602ImportFilterDialog::getResMgr() +const std::locale* T602ImportFilterDialog::getResLocale() { - if( !mpResMgr ) + if (!mpResLocale) initLocale(); - return mpResMgr.get(); + return mpResLocale.get(); } void SAL_CALL T602ImportFilterDialog::setTitle( const OUString& ) @@ -1108,10 +1112,9 @@ sal_Int16 SAL_CALL T602ImportFilterDialog::execute() return css::ui::dialogs::ExecutableDialogResults::CANCEL; } -OUString T602ImportFilterDialog::getResStr( sal_Int16 resid ) +OUString T602ImportFilterDialog::getResStr(const char* resid) { - OUString sStr( ResId( resid, *getResMgr() ) ); - return sStr; + return Translate::get(resid, *getResLocale()); } uno::Sequence SAL_CALL T602ImportFilterDialog::getPropertyValues() diff --git a/filter/source/t602/t602filter.hrc b/filter/source/t602/t602filter.hrc deleted file mode 100644 index 7cb9a9d1f712..000000000000 --- a/filter/source/t602/t602filter.hrc +++ /dev/null @@ -1,39 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef T602FILTER_HRC -#define T602FILTER_HRC - -#define T602FILTER_RES_START 1000 - -#define T602FILTER_STR_IMPORT_DIALOG_TITLE (T602FILTER_RES_START) -#define T602FILTER_STR_ENCODING_LABEL (T602FILTER_RES_START+1) -#define T602FILTER_STR_ENCODING_AUTO (T602FILTER_RES_START+2) -#define T602FILTER_STR_ENCODING_CP852 (T602FILTER_RES_START+3) -#define T602FILTER_STR_ENCODING_CP895 (T602FILTER_RES_START+4) -#define T602FILTER_STR_ENCODING_KOI8CS2 (T602FILTER_RES_START+5) -#define T602FILTER_STR_CYRILLIC_MODE (T602FILTER_RES_START+6) -#define T602FILTER_STR_REFORMAT_TEXT (T602FILTER_RES_START+7) -#define T602FILTER_STR_DOT_COMMANDS (T602FILTER_RES_START+8) -#define T602FILTER_STR_CANCEL_BUTTON (T602FILTER_RES_START+9) -#define T602FILTER_STR_OK_BUTTON (T602FILTER_RES_START+10) - -#endif // T602FILTER_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/t602/t602filter.hxx b/filter/source/t602/t602filter.hxx index e7b0c452b64c..8d81fb1b476a 100644 --- a/filter/source/t602/t602filter.hxx +++ b/filter/source/t602/t602filter.hxx @@ -33,7 +33,6 @@ #include #include #include -#include namespace T602ImportFilter { @@ -84,10 +83,10 @@ class T602ImportFilterDialog : public cppu::WeakImplHelper < > { css::lang::Locale meLocale; - std::unique_ptr mpResMgr; + std::unique_ptr mpResLocale; bool OptionsDlg(); - ResMgr* getResMgr(); - OUString getResStr( sal_Int16 resid ); + const std::locale* getResLocale(); + OUString getResStr(const char* resid); void initLocale(); virtual ~T602ImportFilterDialog() override; diff --git a/filter/source/t602/t602filter.src b/filter/source/t602/t602filter.src deleted file mode 100644 index 6771ee28ff20..000000000000 --- a/filter/source/t602/t602filter.src +++ /dev/null @@ -1,77 +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 "t602filter.hrc" - -String T602FILTER_STR_IMPORT_DIALOG_TITLE -{ - Text [ en-US ] = "Settings for T602 import"; -}; - -String T602FILTER_STR_ENCODING_LABEL -{ - Text [ en-US ] = "Encoding"; -}; - -String T602FILTER_STR_ENCODING_AUTO -{ - Text [ en-US ] = "Automatic"; -}; - -String T602FILTER_STR_ENCODING_CP852 -{ - Text [ en-US ] = "CP852 (Latin2)"; -}; - -String T602FILTER_STR_ENCODING_CP895 -{ - Text [ en-US ] = "CP895 (KEYB2CS, Kamenicky)"; -}; - -String T602FILTER_STR_ENCODING_KOI8CS2 -{ - Text [ en-US ] = "KOI8 CS2"; -}; - -String T602FILTER_STR_CYRILLIC_MODE -{ - Text [ en-US ] = "Mode for Russian language (Cyrillic)"; -}; - -String T602FILTER_STR_REFORMAT_TEXT -{ - Text [ en-US ] = "Reformat the text"; -}; - -String T602FILTER_STR_DOT_COMMANDS -{ - Text [ en-US ] = "Display dot commands"; -}; - -String T602FILTER_STR_CANCEL_BUTTON -{ - Text [ en-US ] = "Cancel"; -}; - -String T602FILTER_STR_OK_BUTTON -{ - Text [ en-US ] = "OK"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/xsltdialog/xmlfilterdialogstrings.hrc b/filter/source/xsltdialog/xmlfilterdialogstrings.hrc deleted file mode 100644 index 8db23c2ad6bc..000000000000 --- a/filter/source/xsltdialog/xmlfilterdialogstrings.hrc +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_FILTER_SOURCE_XSLTDIALOG_XMLFILTERDIALOGSTRINGS_HRC -#define INCLUDED_FILTER_SOURCE_XSLTDIALOG_XMLFILTERDIALOGSTRINGS_HRC - -#include "filter.hrc" - -#define STR_COLUMN_HEADER_NAME (RID_XSLT_DIALOG_START + 0) -#define STR_COLUMN_HEADER_TYPE (RID_XSLT_DIALOG_START + 1) -#define STR_UNKNOWN_APPLICATION (RID_XSLT_DIALOG_START + 2) -#define STR_IMPORT_ONLY (RID_XSLT_DIALOG_START + 3) -#define STR_IMPORT_EXPORT (RID_XSLT_DIALOG_START + 4) -#define STR_EXPORT_ONLY (RID_XSLT_DIALOG_START + 5) - -#define STR_WARN_DELETE (RID_XSLT_DIALOG_START + 10) - -#define STR_DEFAULT_FILTER_NAME (RID_XSLT_DIALOG_START + 13) - -#define STR_ERROR_FILTER_NAME_EXISTS (RID_XSLT_DIALOG_START + 15) -#define STR_ERROR_TYPE_NAME_EXISTS (RID_XSLT_DIALOG_START + 16) -#define STR_ERROR_EXPORT_XSLT_NOT_FOUND (RID_XSLT_DIALOG_START + 18) -#define STR_ERROR_IMPORT_XSLT_NOT_FOUND (RID_XSLT_DIALOG_START + 19) -#define STR_ERROR_IMPORT_TEMPLATE_NOT_FOUND (RID_XSLT_DIALOG_START + 20) -#define STR_DEFAULT_UI_NAME (RID_XSLT_DIALOG_START + 21) -#define STR_UNDEFINED_FILTER (RID_XSLT_DIALOG_START + 22) - -#define STR_FILTER_HAS_BEEN_SAVED (RID_XSLT_DIALOG_START + 23) -#define STR_FILTERS_HAVE_BEEN_SAVED (RID_XSLT_DIALOG_START + 24) -#define STR_FILTER_PACKAGE (RID_XSLT_DIALOG_START + 25) -#define STR_FILTER_INSTALLED (RID_XSLT_DIALOG_START + 26) -#define STR_FILTERS_INSTALLED (RID_XSLT_DIALOG_START + 27) -#define STR_NO_FILTERS_FOUND (RID_XSLT_DIALOG_START + 28) - -#define STR_XML_FILTER_LISTBOX (RID_XSLT_DIALOG_START + 38) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/xsltdialog/xmlfilterdialogstrings.src b/filter/source/xsltdialog/xmlfilterdialogstrings.src deleted file mode 100644 index ea7a693a2257..000000000000 --- a/filter/source/xsltdialog/xmlfilterdialogstrings.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 "xmlfilterdialogstrings.hrc" - -String STR_COLUMN_HEADER_NAME -{ - Text [ en-US ] = "Name"; -}; - -String STR_COLUMN_HEADER_TYPE -{ - Text [ en-US ] = "Type"; -}; - -String STR_UNKNOWN_APPLICATION -{ - Text [ en-US ] = "Unknown"; -}; - -String STR_IMPORT_ONLY -{ - Text [ en-US ] = "import filter"; -}; - -String STR_IMPORT_EXPORT -{ - Text [ en-US ] = "import/export filter"; -}; - -String STR_EXPORT_ONLY -{ - Text [ en-US ] = "export filter"; -}; - -String STR_WARN_DELETE -{ - Text [ en-US ] = "Do you really want to delete the XML Filter '%s'? This action cannot be undone."; -}; - -String STR_ERROR_FILTER_NAME_EXISTS -{ - Text [ en-US ] = "An XML filter with the name '%s' already exists. Please enter a different name."; -}; - -String STR_ERROR_TYPE_NAME_EXISTS -{ - Text [ en-US ] = "The name for the user interface '%s1' is already used by the XML filter '%s2'. Please enter a different name."; -}; - -String STR_ERROR_EXPORT_XSLT_NOT_FOUND -{ - Text [ en-US ] = "The XSLT for export cannot be found. Please enter a valid path."; -}; - -String STR_ERROR_IMPORT_XSLT_NOT_FOUND -{ - Text [ en-US ] = "The XSLT for import cannot be found. Please enter a valid path."; -}; - -String STR_ERROR_IMPORT_TEMPLATE_NOT_FOUND -{ - Text [ en-US ] = "The given import template cannot be found. Please enter a valid path."; -}; - -String STR_DEFAULT_FILTER_NAME -{ - Text [ en-US ] = "New Filter"; -}; - -String STR_DEFAULT_UI_NAME -{ - Text [ en-US ] = "Untitled"; -}; - -String STR_UNDEFINED_FILTER -{ - Text [ en-US ] = "undefined filter"; -}; - -String STR_FILTER_HAS_BEEN_SAVED -{ - Text [ en-US ] = "The XML filter '%s' has been saved as package '%s'. "; -}; - -String STR_FILTERS_HAVE_BEEN_SAVED -{ - Text [ en-US ] = "%s XML filters have been saved in the package '%s'."; -}; - -String STR_FILTER_PACKAGE -{ - Text [ en-US ] = "XSLT filter package"; -}; - -String STR_FILTER_INSTALLED -{ - Text [ en-US ] = "The XML filter '%s' has been installed successfully."; -}; - -String STR_FILTERS_INSTALLED -{ - Text [ en-US ] = "%s XML filters have been installed successfully."; -}; - -String STR_NO_FILTERS_FOUND -{ - Text [ en-US ] = "No XML filter could be installed because the package '%s' does not contain any XML filters."; -}; - -String STR_XML_FILTER_LISTBOX -{ - Text [ en-US ] = "XML Filter List"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx index f80e8f8a5820..388235716aef 100644 --- a/filter/source/xsltdialog/xmlfilterjar.cxx +++ b/filter/source/xsltdialog/xmlfilterjar.cxx @@ -42,7 +42,7 @@ #include #include "xmlfilterjar.hxx" -#include "xmlfilterdialogstrings.hrc" +#include "strings.hrc" #include "xmlfiltersettingsdialog.hxx" #include "typedetectionexport.hxx" #include "typedetectionimport.hxx" diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 1abaf3c1b3ac..5d26460f1a00 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -41,7 +41,7 @@ #include #include -#include "xmlfilterdialogstrings.hrc" +#include "strings.hrc" #include "xmlfiltersettingsdialog.hxx" #include "xmlfiltertabdialog.hxx" #include "xmlfiltertestdialog.hxx" @@ -59,34 +59,34 @@ using namespace com::sun::star::util; using ::rtl::Uri; namespace { - static ResMgr* pXSLTResMgr = nullptr; + static std::locale* pXSLTResLocale = nullptr; - ResMgr* getXSLTDialogResMgr() + const std::locale* getXSLTDialogResLocale() { - return pXSLTResMgr; + return pXSLTResLocale; } } -EnsureResMgr::EnsureResMgr() +EnsureResLocale::EnsureResLocale() { - if (!pXSLTResMgr) + if (!pXSLTResLocale) { - m_xResMgr.reset(ResMgr::CreateResMgr("xsltdlg", Application::GetSettings().GetUILanguageTag())); - pXSLTResMgr = m_xResMgr.get(); + m_xResLocale.reset(new std::locale(Translate::Create("flt", Application::GetSettings().GetUILanguageTag()))); + pXSLTResLocale = m_xResLocale.get(); } } -EnsureResMgr::~EnsureResMgr() +EnsureResLocale::~EnsureResLocale() { - if (m_xResMgr) - pXSLTResMgr = nullptr; + if (m_xResLocale) + pXSLTResLocale = nullptr; } namespace { - OUString XsltResId(sal_uInt16 nId) + OUString XsltResId(const char* pId) { - return ResId(nId, *getXSLTDialogResMgr()); + return Translate::get(pId, *getXSLTDialogResLocale()); } } @@ -263,7 +263,7 @@ void XMLFilterSettingsDialog::onNew() aTempInfo.maDocumentService = "com.sun.star.text.TextDocument"; // execute XML Filter Dialog - ScopedVclPtrInstance< XMLFilterTabDialog > aDlg( this, *getXSLTDialogResMgr(), mxContext, &aTempInfo ); + ScopedVclPtrInstance< XMLFilterTabDialog > aDlg( this, *getXSLTDialogResLocale(), mxContext, &aTempInfo ); if ( aDlg->Execute() == RET_OK ) { // insert the new filter @@ -282,7 +282,7 @@ void XMLFilterSettingsDialog::onEdit() filter_info_impl* pOldInfo = static_cast(pEntry->GetUserData()); // execute XML Filter Dialog - ScopedVclPtrInstance< XMLFilterTabDialog > aDlg( this, *getXSLTDialogResMgr(), mxContext, pOldInfo ); + ScopedVclPtrInstance< XMLFilterTabDialog > aDlg( this, *getXSLTDialogResLocale(), mxContext, pOldInfo ); if ( aDlg->Execute() == RET_OK ) { filter_info_impl* pNewInfo = aDlg->getNewFilterInfo(); @@ -1209,7 +1209,7 @@ void XMLFilterSettingsDialog::initFilterList() application_info_impl::application_info_impl( const sal_Char * pDocumentService, const OUString& rUINameRes, const sal_Char * mpXMLImporter, const sal_Char * mpXMLExporter ) : maDocumentService( pDocumentService, strlen( pDocumentService ), RTL_TEXTENCODING_ASCII_US ), - maDocumentUIName(ResMgr::ExpandVariables(rUINameRes)), + maDocumentUIName(Translate::ExpandVariables(rUINameRes)), maXMLImporter( mpXMLImporter, strlen( mpXMLImporter ), RTL_TEXTENCODING_ASCII_US ), maXMLExporter( mpXMLExporter, strlen( mpXMLExporter ), RTL_TEXTENCODING_ASCII_US ) { diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx index 5105c67936c2..7dfc307ce057 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx @@ -55,12 +55,12 @@ public: virtual bool EventNotify( NotifyEvent& rNEvt ) override; }; -class EnsureResMgr +class EnsureResLocale { - std::unique_ptr m_xResMgr; + std::unique_ptr m_xResLocale; public: - EnsureResMgr(); - ~EnsureResMgr(); + EnsureResLocale(); + ~EnsureResLocale(); }; class HeaderBar; @@ -68,7 +68,7 @@ class HeaderBar; class XMLFilterListBox : public SvTabListBox { private: - EnsureResMgr m_aEnsureResMgr; + EnsureResLocale m_aEnsureResLocale; VclPtr m_pHeaderBar; DECL_LINK( TabBoxScrollHdl_Impl, SvTreeListBox*, void ); @@ -127,7 +127,7 @@ private: OUString createUniqueInterfaceName( const OUString& rInterfaceName ); private: - EnsureResMgr maEnsureResMgr; + EnsureResLocale maEnsureResLocale; css::uno::Reference< css::uno::XComponentContext > mxContext; css::uno::Reference< css::container::XNameContainer > mxFilterContainer; css::uno::Reference< css::container::XNameContainer > mxTypeDetection; diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx index 7da2fdee4bbd..2db0f6a08707 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx @@ -21,11 +21,11 @@ #include #include #include -#include +#include #include #include -#include "xmlfilterdialogstrings.hrc" +#include "strings.hrc" #include "xmlfiltertabdialog.hxx" #include "xmlfiltertabpagebasic.hxx" #include "xmlfiltertabpagexslt.hxx" @@ -36,11 +36,11 @@ using namespace com::sun::star::container; using namespace com::sun::star::beans; using namespace com::sun::star::lang; -XMLFilterTabDialog::XMLFilterTabDialog(vcl::Window *pParent, ResMgr& rResMgr, +XMLFilterTabDialog::XMLFilterTabDialog(vcl::Window *pParent, const std::locale& rResLocale, const Reference< XComponentContext >& rxContext, const filter_info_impl* pInfo) : TabDialog(pParent, "XSLTFilterDialog","filter/ui/xsltfilterdialog.ui") , mxContext(rxContext) - , mrResMgr(rResMgr) + , mrResLocale(rResLocale) { get(m_pOKBtn, "ok"); get(m_pTabCtrl, "tabcontrol"); @@ -94,7 +94,7 @@ bool XMLFilterTabDialog::onOk() mpBasicPage->FillInfo( mpNewInfo ); sal_uInt16 nErrorPage = 0; - sal_uInt16 nErrorId = 0; + const char* pErrorId = nullptr; vcl::Window* pFocusWindow = nullptr; OUString aReplace1; OUString aReplace2; @@ -117,7 +117,7 @@ bool XMLFilterTabDialog::onOk() if( xFilterContainer->hasByName( mpNewInfo->maFilterName ) ) { nErrorPage = m_nBasicPageId; - nErrorId = STR_ERROR_FILTER_NAME_EXISTS; + pErrorId = STR_ERROR_FILTER_NAME_EXISTS; pFocusWindow = (mpBasicPage->m_pEDFilterName); aReplace1 = mpNewInfo->maFilterName; } @@ -153,7 +153,7 @@ bool XMLFilterTabDialog::onOk() sal_Int32 nFilter; Sequence< PropertyValue > aValues; - for( nFilter = 0; (nFilter < nCount) && (nErrorId == 0); nFilter++, pFilterName++ ) + for( nFilter = 0; (nFilter < nCount) && (pErrorId == nullptr); nFilter++, pFilterName++ ) { Any aAny( xFilterContainer->getByName( *pFilterName ) ); if( !(aAny >>= aValues) ) @@ -163,7 +163,7 @@ bool XMLFilterTabDialog::onOk() PropertyValue* pValues = aValues.getArray(); sal_Int32 nValue; - for( nValue = 0; (nValue < nValueCount) && (nErrorId == 0); nValue++, pValues++ ) + for( nValue = 0; (nValue < nValueCount) && (pErrorId == nullptr); nValue++, pValues++ ) { if ( pValues->Name == "UIName" ) { @@ -172,7 +172,7 @@ bool XMLFilterTabDialog::onOk() if( aInterfaceName == mpNewInfo->maInterfaceName ) { nErrorPage = m_nBasicPageId; - nErrorId = STR_ERROR_TYPE_NAME_EXISTS; + pErrorId = STR_ERROR_TYPE_NAME_EXISTS; pFocusWindow = (mpBasicPage->m_pEDInterfaceName); aReplace1 = mpNewInfo->maInterfaceName; aReplace2 = *pFilterName; @@ -189,7 +189,7 @@ bool XMLFilterTabDialog::onOk() } } - if( 0 == nErrorId ) + if (!pErrorId) { // 4. see if the export xslt is valid if( (mpNewInfo->maExportXSLT != mpOldInfo->maExportXSLT) && comphelper::isFileUrl( mpNewInfo->maExportXSLT ) ) @@ -198,14 +198,14 @@ bool XMLFilterTabDialog::onOk() osl::File::RC aRC = aFile.open( osl_File_OpenFlag_Read ); if( aRC != osl::File::E_None ) { - nErrorId = STR_ERROR_EXPORT_XSLT_NOT_FOUND; + pErrorId = STR_ERROR_EXPORT_XSLT_NOT_FOUND; nErrorPage = m_nXSLTPageId; pFocusWindow = (mpXSLTPage->m_pEDExportXSLT); } } } - if( 0 == nErrorId ) + if (!pErrorId) { // 5. see if the import xslt is valid if( (mpNewInfo->maImportXSLT != mpOldInfo->maImportXSLT) && comphelper::isFileUrl( mpNewInfo->maImportXSLT ) ) @@ -214,7 +214,7 @@ bool XMLFilterTabDialog::onOk() osl::File::RC aRC = aFile.open( osl_File_OpenFlag_Read ); if( aRC != osl::File::E_None ) { - nErrorId = STR_ERROR_IMPORT_XSLT_NOT_FOUND; + pErrorId = STR_ERROR_IMPORT_XSLT_NOT_FOUND; nErrorPage = m_nXSLTPageId; pFocusWindow = (mpXSLTPage->m_pEDImportTemplate); } @@ -224,12 +224,12 @@ bool XMLFilterTabDialog::onOk() // see if we have at least an import or an export xslt if((mpNewInfo->maImportXSLT.isEmpty()) && (mpNewInfo->maExportXSLT.isEmpty()) ) { - nErrorId = STR_ERROR_EXPORT_XSLT_NOT_FOUND; + pErrorId = STR_ERROR_EXPORT_XSLT_NOT_FOUND; nErrorPage = m_nXSLTPageId; pFocusWindow = (mpXSLTPage->m_pEDExportXSLT); } - if( 0 == nErrorId ) + if (!pErrorId) { // 6. see if the import template is valid if( (mpNewInfo->maImportTemplate != mpOldInfo->maImportTemplate) && comphelper::isFileUrl( mpNewInfo->maImportTemplate ) ) @@ -238,20 +238,19 @@ bool XMLFilterTabDialog::onOk() osl::File::RC aRC = aFile.open( osl_File_OpenFlag_Read ); if( aRC != osl::File::E_None ) { - nErrorId = STR_ERROR_IMPORT_TEMPLATE_NOT_FOUND; + pErrorId = STR_ERROR_IMPORT_TEMPLATE_NOT_FOUND; nErrorPage = m_nXSLTPageId; pFocusWindow = (mpXSLTPage->m_pEDImportTemplate); } } } - if( 0 != nErrorId ) + if (pErrorId) { m_pTabCtrl->SetCurPageId(nErrorPage); ActivatePageHdl(nullptr, m_pTabCtrl); - ResId aResId( nErrorId, mrResMgr ); - OUString aMessage( aResId ); + OUString aMessage(Translate::get(pErrorId, mrResLocale)); if( aReplace2.getLength() ) { diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.hxx b/filter/source/xsltdialog/xmlfiltertabdialog.hxx index 4602af7907b9..c51656b84742 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.hxx @@ -25,7 +25,6 @@ #include namespace vcl { class Window; } -class ResMgr; class filter_info_impl; class XMLFilterTabPageBasic; @@ -34,7 +33,7 @@ class XMLFilterTabPageXSLT; class XMLFilterTabDialog: public TabDialog { public: - XMLFilterTabDialog(vcl::Window *pParent, ResMgr& rResMgr, const css::uno::Reference< css::uno::XComponentContext >& rxContext, const filter_info_impl* pInfo); + XMLFilterTabDialog(vcl::Window *pParent, const std::locale& rResLocale, const css::uno::Reference< css::uno::XComponentContext >& rxContext, const filter_info_impl* pInfo); virtual ~XMLFilterTabDialog() override; virtual void dispose() override; @@ -48,7 +47,7 @@ private: DECL_STATIC_LINK( XMLFilterTabDialog, ActivatePageHdl, TabControl*, void ); DECL_LINK(OkHdl, Button*, void); - ResMgr& mrResMgr; + const std::locale& mrResLocale; const filter_info_impl* mpOldInfo; filter_info_impl* mpNewInfo; diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx b/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx index fe6a2b7f449c..a868fb244b06 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx +++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx @@ -19,7 +19,7 @@ #include -#include "xmlfilterdialogstrings.hrc" +#include "strings.hrc" #include "xmlfiltertabpagebasic.hxx" #include "xmlfiltersettingsdialog.hxx" diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx index ce6e9fc20d48..e366703e8a0c 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx +++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx @@ -26,7 +26,6 @@ #include namespace vcl { class Window; } -class ResMgr; class filter_info_impl; class XMLFilterTabPageBasic : public TabPage diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx index 9d88183cdf96..c5e84aa0072e 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx +++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx @@ -27,7 +27,6 @@ #include namespace vcl { class Window; } -class ResMgr; class filter_info_impl; class XMLFilterTabPageXSLT : public TabPage diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx index 3cf1f5abd618..65c150db33b2 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx @@ -44,7 +44,7 @@ #include #include -#include "xmlfilterdialogstrings.hrc" +#include "strings.hrc" #include "xmlfiltersettingsdialog.hxx" #include "xmlfiltertestdialog.hxx" diff --git a/filter/uiconfig/ui/impswfdialog.ui b/filter/uiconfig/ui/impswfdialog.ui index 756fbe65eb41..c32d4c936c27 100644 --- a/filter/uiconfig/ui/impswfdialog.ui +++ b/filter/uiconfig/ui/impswfdialog.ui @@ -1,6 +1,6 @@ - + 1 @@ -11,7 +11,7 @@ False 6 - Flash (SWF) Options + Flash (SWF) Options False dialog @@ -92,7 +92,7 @@ True False 0 - 1: min. quality + 1: min. quality 100: max. quality True fill @@ -133,7 +133,7 @@ - Export _all slides (uncheck to export current slide) + Export _all slides (uncheck to export current slide) True True False @@ -155,7 +155,7 @@ 6 - Export as _multiple files + Export as _multiple files True True False @@ -178,7 +178,7 @@ 6 - Export _backgrounds + Export _backgrounds True True False @@ -195,7 +195,7 @@ - Export back_ground objects + Export back_ground objects True True False @@ -212,7 +212,7 @@ - Export _slide contents + Export _slide contents True True False @@ -245,7 +245,7 @@ - Export _Verilogix Slide Annotations + Export _Verilogix Slide Annotations True True False @@ -262,7 +262,7 @@ - Export OLE objects as _JPEG images + Export OLE objects as _JPEG images True True False diff --git a/filter/uiconfig/ui/pdfgeneralpage.ui b/filter/uiconfig/ui/pdfgeneralpage.ui index 67612f59c197..554d736523af 100644 --- a/filter/uiconfig/ui/pdfgeneralpage.ui +++ b/filter/uiconfig/ui/pdfgeneralpage.ui @@ -1,6 +1,6 @@ - + 1 @@ -40,7 +40,7 @@ 12 - _All + _All True True False @@ -58,7 +58,7 @@ - _Pages: + _Pages: True True False @@ -77,7 +77,7 @@ - _Selection + _Selection True True False @@ -111,7 +111,7 @@ False True - Slides: + Slides: 0 @@ -123,7 +123,7 @@ False True - _Selection/Selected sheet(s) + _Selection/Selected sheet(s) 0 @@ -139,7 +139,7 @@ True False - Range + Range @@ -200,7 +200,7 @@ True False - _Quality: + _Quality: True 0 @@ -225,7 +225,7 @@ 12 - _Reduce image resolution + _Reduce image resolution True True False @@ -247,17 +247,17 @@ False True - 75 DPI - 150 DPI - 300 DPI - 600 DPI - 1200 DPI + 75 DPI + 150 DPI + 300 DPI + 600 DPI + 1200 DPI False ● - 75 DPI + 75 DPI @@ -281,7 +281,7 @@ - _Lossless compression + _Lossless compression True True False @@ -298,7 +298,7 @@ - _JPEG compression + _JPEG compression True True False @@ -320,7 +320,7 @@ True False - Images + Images @@ -352,7 +352,7 @@ 12 - Sign with _watermark + Sign with _watermark True True False @@ -387,7 +387,7 @@ True False - Text: + Text: True watermarkentry 0 @@ -407,7 +407,7 @@ True False - Watermark + Watermark @@ -444,11 +444,11 @@ 6 - Hybrid PDF (em_bed ODF file) + Hybrid PDF (em_bed ODF file) True True False - Creates a PDF that is easily editable in %PRODUCTNAME + Creates a PDF that is easily editable in %PRODUCTNAME True 0 True @@ -460,11 +460,11 @@ - Archive P_DF/A-1a (ISO 19005-1) + Archive P_DF/A-1a (ISO 19005-1) True True False - Creates an ISO 19005-1 compliant PDF file, ideal for long-term document preservation + Creates an ISO 19005-1 compliant PDF file, ideal for long-term document preservation True 0 True @@ -476,11 +476,11 @@ - _Tagged PDF (add document structure) + _Tagged PDF (add document structure) True True False - Includes a document's content structure information in a PDF + Includes a document's content structure information in a PDF True 0 True @@ -492,11 +492,11 @@ - _Create PDF form + _Create PDF form True True False - Creates a PDF with fields that can be filled out + Creates a PDF with fields that can be filled out True 0 True @@ -521,7 +521,7 @@ True False - Submit _format: + Submit _format: True format 0 @@ -536,10 +536,10 @@ True False - FDF - PDF - HTML - XML + FDF + PDF + HTML + XML @@ -549,7 +549,7 @@ - Allow duplicate field _names + Allow duplicate field _names True True False @@ -573,7 +573,7 @@ - Export _bookmarks + Export _bookmarks True True False @@ -588,7 +588,7 @@ - Expo_rt placeholders + Expo_rt placeholders True True False @@ -603,7 +603,7 @@ - _Export comments + _Export comments True True False @@ -618,7 +618,7 @@ - Exp_ort automatically inserted blank pages + Exp_ort automatically inserted blank pages True True False @@ -633,7 +633,7 @@ - _View PDF after export + _View PDF after export True True False @@ -648,7 +648,7 @@ - Use reference XObjects + Use reference XObjects True True False @@ -663,7 +663,7 @@ - Export _hidden pages + Export _hidden pages True True False @@ -678,7 +678,7 @@ - Export _notes pages + Export _notes pages True True False @@ -698,7 +698,7 @@ 12 - Export onl_y notes pages + Export onl_y notes pages True True False @@ -721,7 +721,7 @@ True False - General + General diff --git a/filter/uiconfig/ui/pdflinkspage.ui b/filter/uiconfig/ui/pdflinkspage.ui index f7a5d2e755d1..ba3562afc3df 100644 --- a/filter/uiconfig/ui/pdflinkspage.ui +++ b/filter/uiconfig/ui/pdflinkspage.ui @@ -1,5 +1,5 @@ - + True @@ -26,7 +26,7 @@ 6 - Export bookmarks as named destinations + Export bookmarks as named destinations True True False @@ -44,7 +44,7 @@ - _Convert document references to PDF targets + _Convert document references to PDF targets True True False @@ -62,7 +62,7 @@ - Export _URLs relative to file system + Export _URLs relative to file system True True False @@ -86,7 +86,7 @@ True False - General + General @@ -118,7 +118,7 @@ 6 - Default mode + Default mode True True False @@ -137,7 +137,7 @@ - Open with PDF reader application + Open with PDF reader application True True False @@ -155,7 +155,7 @@ - Open _with Internet browser + Open _with Internet browser True True False @@ -179,7 +179,7 @@ True False - Cross-document Links + Cross-document Links diff --git a/filter/uiconfig/ui/pdfoptionsdialog.ui b/filter/uiconfig/ui/pdfoptionsdialog.ui index f8a7a409e63b..632ccec0df25 100644 --- a/filter/uiconfig/ui/pdfoptionsdialog.ui +++ b/filter/uiconfig/ui/pdfoptionsdialog.ui @@ -1,11 +1,11 @@ - + False 6 - PDF Options + PDF Options False dialog @@ -19,7 +19,7 @@ end - E_xport + E_xport True True True @@ -83,7 +83,7 @@ True False - General + General False @@ -96,7 +96,7 @@ True False - Initial View + Initial View 1 @@ -110,7 +110,7 @@ True False - User Interface + User Interface 2 @@ -124,7 +124,7 @@ True False - Links + Links 3 @@ -138,7 +138,7 @@ True False - Security + Security 4 @@ -152,7 +152,7 @@ True False - Digital Signatures + Digital Signatures 5 diff --git a/filter/uiconfig/ui/pdfsecuritypage.ui b/filter/uiconfig/ui/pdfsecuritypage.ui index 6d2658dbbe9a..4d9f73f5a5bc 100644 --- a/filter/uiconfig/ui/pdfsecuritypage.ui +++ b/filter/uiconfig/ui/pdfsecuritypage.ui @@ -1,6 +1,6 @@ - + True @@ -28,7 +28,7 @@ 12 - Set _Passwords… + Set _Passwords… True False True @@ -51,7 +51,7 @@ True False 0 - Open password set + Open password set 0 @@ -63,7 +63,7 @@ True False 0 - PDF document will be encrypted + PDF document will be encrypted 0 @@ -86,7 +86,7 @@ True False 0 - No open password set + No open password set 0 @@ -98,7 +98,7 @@ True False 0 - PDF document will not be encrypted + PDF document will not be encrypted 0 @@ -121,7 +121,7 @@ True False 0 - PDF document will not be encrypted due to PDF/A export. + PDF document will not be encrypted due to PDF/A export. True @@ -145,7 +145,7 @@ True False 0 - Permission password set + Permission password set 0 @@ -157,7 +157,7 @@ True False 0 - PDF document will be restricted + PDF document will be restricted 0 @@ -180,7 +180,7 @@ True False 0 - No permission password set + No permission password set 0 @@ -192,7 +192,7 @@ True False 0 - PDF document will be unrestricted + PDF document will be unrestricted 0 @@ -215,7 +215,7 @@ True False 0 - PDF document will not be restricted due to PDF/A export. + PDF document will not be restricted due to PDF/A export. True @@ -235,7 +235,7 @@ False True 0 - Set Passwords + Set Passwords False @@ -251,7 +251,7 @@ True False - File Encryption and Permission + File Encryption and Permission @@ -289,7 +289,7 @@ 6 - _Not permitted + _Not permitted True True False @@ -305,7 +305,7 @@ - _Low resolution (150 dpi) + _Low resolution (150 dpi) True True False @@ -321,7 +321,7 @@ - _High resolution + _High resolution True True False @@ -344,7 +344,7 @@ True False - Printing + Printing @@ -376,7 +376,7 @@ 6 - No_t permitted + No_t permitted True True False @@ -392,7 +392,7 @@ - _Inserting, deleting, and rotating pages + _Inserting, deleting, and rotating pages True True False @@ -408,7 +408,7 @@ - _Filling in form fields + _Filling in form fields True True False @@ -424,7 +424,7 @@ - _Commenting, filling in form fields + _Commenting, filling in form fields True True False @@ -440,7 +440,7 @@ - _Any except extracting pages + _Any except extracting pages True True False @@ -463,7 +463,7 @@ True False - Changes + Changes @@ -495,7 +495,7 @@ 6 - Ena_ble copying of content + Ena_ble copying of content True True False @@ -511,7 +511,7 @@ - Enable text access for acce_ssibility tools + Enable text access for acce_ssibility tools True True False @@ -533,7 +533,7 @@ True False - Content + Content diff --git a/filter/uiconfig/ui/pdfsignpage.ui b/filter/uiconfig/ui/pdfsignpage.ui index fe10e299496a..542bc5eb7dc7 100644 --- a/filter/uiconfig/ui/pdfsignpage.ui +++ b/filter/uiconfig/ui/pdfsignpage.ui @@ -1,6 +1,6 @@ - + True @@ -34,7 +34,7 @@ False True 0 - Use this certificate to digitally sign PDF documents: + Use this certificate to digitally sign PDF documents: True cert @@ -57,7 +57,7 @@ - Select... + Select... True True True @@ -156,7 +156,7 @@ True False - None + None @@ -169,7 +169,7 @@ True False 1 - Certificate password: + Certificate password: True password @@ -183,7 +183,7 @@ True False 1 - Location: + Location: True location @@ -197,7 +197,7 @@ True False 1 - Contact information: + Contact information: True contact @@ -211,7 +211,7 @@ True False 1 - Reason: + Reason: True reason @@ -225,7 +225,7 @@ True False 1 - Time Stamp Authority: + Time Stamp Authority: True reason @@ -248,7 +248,7 @@ True False - Certificate + Certificate diff --git a/filter/uiconfig/ui/pdfuserinterfacepage.ui b/filter/uiconfig/ui/pdfuserinterfacepage.ui index ab359c815277..199cf8e55d20 100644 --- a/filter/uiconfig/ui/pdfuserinterfacepage.ui +++ b/filter/uiconfig/ui/pdfuserinterfacepage.ui @@ -1,6 +1,6 @@ - + 1 @@ -41,7 +41,7 @@ 6 - _Center window on screen + _Center window on screen True True False @@ -57,7 +57,7 @@ - _Resize window to initial page + _Resize window to initial page True True False @@ -73,7 +73,7 @@ - _Open in full screen mode + _Open in full screen mode True True False @@ -89,7 +89,7 @@ - _Display document title + _Display document title True True False @@ -111,7 +111,7 @@ True False - Window Options + Window Options @@ -142,7 +142,7 @@ 6 - Hide _toolbar + Hide _toolbar True True False @@ -158,7 +158,7 @@ - Hide _menubar + Hide _menubar True True False @@ -174,7 +174,7 @@ - Hide _window controls + Hide _window controls True True False @@ -196,7 +196,7 @@ True False - User Interface Options + User Interface Options @@ -226,7 +226,7 @@ False - _Use transition effects + _Use transition effects True True False @@ -248,7 +248,7 @@ True False - Transitions + Transitions @@ -280,7 +280,7 @@ 12 - _All bookmark levels + _All bookmark levels True True False @@ -297,7 +297,7 @@ - _Visible bookmark levels: + _Visible bookmark levels: True True False @@ -341,7 +341,7 @@ True False - Bookmarks + Bookmarks diff --git a/filter/uiconfig/ui/pdfviewpage.ui b/filter/uiconfig/ui/pdfviewpage.ui index 4640de4438aa..d6f6f24834b1 100644 --- a/filter/uiconfig/ui/pdfviewpage.ui +++ b/filter/uiconfig/ui/pdfviewpage.ui @@ -1,6 +1,6 @@ - + 1 @@ -47,7 +47,7 @@ 6 - _Page only + _Page only True True False @@ -64,7 +64,7 @@ - _Bookmarks and page + _Bookmarks and page True True False @@ -80,7 +80,7 @@ - _Thumbnails and page + _Thumbnails and page True True False @@ -104,7 +104,7 @@ True False 0 - Open on pa_ge: + Open on pa_ge: True page @@ -139,7 +139,7 @@ True False - Panes + Panes @@ -171,7 +171,7 @@ 6 - _Default + _Default True True False @@ -188,7 +188,7 @@ - _Fit in window + _Fit in window True True False @@ -204,7 +204,7 @@ - Fit _width + Fit _width True True False @@ -220,7 +220,7 @@ - Fit _visible + Fit _visible True True False @@ -241,7 +241,7 @@ 12 - _Zoom factor: + _Zoom factor: True True False @@ -287,7 +287,7 @@ True False - Magnification + Magnification @@ -326,7 +326,7 @@ 6 - D_efault + D_efault True True False @@ -343,7 +343,7 @@ - _Single page + _Single page True True False @@ -359,7 +359,7 @@ - _Continuous + _Continuous True True False @@ -375,7 +375,7 @@ - C_ontinuous facing + C_ontinuous facing True True False @@ -391,7 +391,7 @@ - First page is _left + First page is _left True True False @@ -413,7 +413,7 @@ True False - Page Layout + Page Layout diff --git a/filter/uiconfig/ui/testxmlfilter.ui b/filter/uiconfig/ui/testxmlfilter.ui index fcc3b951192a..c23502c7f29f 100644 --- a/filter/uiconfig/ui/testxmlfilter.ui +++ b/filter/uiconfig/ui/testxmlfilter.ui @@ -1,11 +1,11 @@ - + False 6 - Test XML Filter: %s + Test XML Filter: %s False dialog @@ -86,7 +86,7 @@ False True 0 - XSLT for export + XSLT for export 0 @@ -99,7 +99,7 @@ False True 0 - Transform document + Transform document 0 @@ -108,7 +108,7 @@ - Browse... + Browse... True True True @@ -120,7 +120,7 @@ - Current Document + Current Document True True True @@ -165,7 +165,7 @@ True False - Export + Export @@ -202,7 +202,7 @@ False True 0 - XSLT for import + XSLT for import 0 @@ -211,7 +211,7 @@ - Browse... + Browse... True True True @@ -223,7 +223,7 @@ - Recent File + Recent File True True True @@ -239,7 +239,7 @@ False True 0 - Template for import + Template for import 0 @@ -259,7 +259,7 @@ - Display source + Display source True True False @@ -278,7 +278,7 @@ False True 0 - Transform file + Transform file 0 @@ -323,7 +323,7 @@ True False - Import + Import diff --git a/filter/uiconfig/ui/warnpdfdialog.ui b/filter/uiconfig/ui/warnpdfdialog.ui index 1860e84e99d9..0eda449ff96d 100644 --- a/filter/uiconfig/ui/warnpdfdialog.ui +++ b/filter/uiconfig/ui/warnpdfdialog.ui @@ -1,18 +1,18 @@ - + False 6 popup - Problems During PDF Export + Problems During PDF Export False dialog True warning ok - During PDF export the following problems occurred: + During PDF export the following problems occurred: False diff --git a/filter/uiconfig/ui/xmlfiltersettings.ui b/filter/uiconfig/ui/xmlfiltersettings.ui index 79de962e1205..bacfeebdaebb 100644 --- a/filter/uiconfig/ui/xmlfiltersettings.ui +++ b/filter/uiconfig/ui/xmlfiltersettings.ui @@ -1,12 +1,12 @@ - + False 6 - XML Filter Settings + XML Filter Settings False dialog @@ -21,7 +21,7 @@ start - _New... + _New... True True True @@ -35,7 +35,7 @@ - _Edit... + _Edit... True True True @@ -49,7 +49,7 @@ - _Test XSLTs... + _Test XSLTs... True True True @@ -63,7 +63,7 @@ - _Delete... + _Delete... True True True @@ -77,7 +77,7 @@ - _Save as Package... + _Save as Package... True True True @@ -91,7 +91,7 @@ - _Open Package... + _Open Package... True True True @@ -148,7 +148,7 @@ False - XML Filter List + XML Filter List diff --git a/filter/uiconfig/ui/xmlfiltertabpagegeneral.ui b/filter/uiconfig/ui/xmlfiltertabpagegeneral.ui index 9b0f4773bf25..7d0a00304eb8 100644 --- a/filter/uiconfig/ui/xmlfiltertabpagegeneral.ui +++ b/filter/uiconfig/ui/xmlfiltertabpagegeneral.ui @@ -1,6 +1,6 @@ - + True @@ -20,7 +20,7 @@ True False 1 - _Filter name: + _Filter name: True filtername @@ -34,7 +34,7 @@ True False 1 - _Application: + _Application: True application @@ -48,7 +48,7 @@ True False 1 - _Name of file type: + _Name of file type: True interfacename @@ -62,7 +62,7 @@ True False 1 - File _extension: + File _extension: True extension @@ -77,7 +77,7 @@ False 1 0 - Comment_s: + Comment_s: True description:border diff --git a/filter/uiconfig/ui/xmlfiltertabpagetransformation.ui b/filter/uiconfig/ui/xmlfiltertabpagetransformation.ui index 44d0e77e9983..9dc0724d7b49 100644 --- a/filter/uiconfig/ui/xmlfiltertabpagetransformation.ui +++ b/filter/uiconfig/ui/xmlfiltertabpagetransformation.ui @@ -1,6 +1,6 @@ - + @@ -22,7 +22,7 @@ True False 1 - _DocType: + _DocType: True doc @@ -49,7 +49,7 @@ True False 1 - _XSLT for export: + _XSLT for export: True xsltexport @@ -60,7 +60,7 @@ - Brows_e... + Brows_e... True True True @@ -76,7 +76,7 @@ True False 1 - XSLT _for import: + XSLT _for import: True xsltimport @@ -87,7 +87,7 @@ - B_rowse... + B_rowse... True True True @@ -103,7 +103,7 @@ True False 1 - Template for _import: + Template for _import: True tempimport @@ -114,7 +114,7 @@ - Browse... + Browse... True True True @@ -172,7 +172,7 @@ - The filter needs XSLT 2.0 processor + The filter needs XSLT 2.0 processor True True False diff --git a/filter/uiconfig/ui/xsltfilterdialog.ui b/filter/uiconfig/ui/xsltfilterdialog.ui index 8c68701e9697..baa2b3918292 100644 --- a/filter/uiconfig/ui/xsltfilterdialog.ui +++ b/filter/uiconfig/ui/xsltfilterdialog.ui @@ -1,11 +1,11 @@ - + False 6 - XML Filter: %s + XML Filter: %s False dialog @@ -83,7 +83,7 @@ True False - General + General False @@ -96,7 +96,7 @@ True False - Transformation + Transformation 1 diff --git a/forms/AllLangMoTarget_frm.mk b/forms/AllLangMoTarget_frm.mk new file mode 100644 index 000000000000..daca0e06d15e --- /dev/null +++ b/forms/AllLangMoTarget_frm.mk @@ -0,0 +1,13 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# 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/. + +$(eval $(call gb_AllLangMoTarget_AllLangMoTarget,frm)) + +$(eval $(call gb_AllLangMoTarget_set_polocation,frm,forms)) + +# vim: set noet sw=4 ts=4: diff --git a/forms/AllLangResTarget_frm.mk b/forms/AllLangResTarget_frm.mk deleted file mode 100644 index cf9f501ee970..000000000000 --- a/forms/AllLangResTarget_frm.mk +++ /dev/null @@ -1,30 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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/. -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,frm)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,frm,forms)) - -$(eval $(call gb_AllLangResTarget_add_srs,frm,\ - frm/res \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,frm/res)) - -$(eval $(call gb_SrsTarget_set_include,frm/res,\ - $$(INCLUDE) \ - -I$(SRCDIR)/forms/source/inc \ -)) - -$(eval $(call gb_SrsTarget_add_files,frm/res,\ - forms/source/resource/strings.src \ - forms/source/resource/xforms.src \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk index cae705c85c8c..b27b99fa48dd 100644 --- a/forms/Library_frm.mk +++ b/forms/Library_frm.mk @@ -11,6 +11,7 @@ $(eval $(call gb_Library_Library,frm)) $(eval $(call gb_Library_set_include,frm,\ $$(INCLUDE) \ + -I$(SRCDIR)/forms/inc \ -I$(SRCDIR)/forms/source/inc \ -I$(SRCDIR)/forms/source/solar/inc \ -I$(WORKDIR)/YaccTarget/connectivity/source/parse \ diff --git a/forms/Module_forms.mk b/forms/Module_forms.mk index 266f6a3c2aec..7ba484b81d3a 100644 --- a/forms/Module_forms.mk +++ b/forms/Module_forms.mk @@ -14,7 +14,7 @@ $(eval $(call gb_Module_add_targets,forms,\ )) $(eval $(call gb_Module_add_l10n_targets,forms,\ - AllLangResTarget_frm \ + AllLangMoTarget_frm \ )) $(eval $(call gb_Module_add_subsequentcheck_targets,forms,\ diff --git a/forms/inc/pch/precompiled_frm.hxx b/forms/inc/pch/precompiled_frm.hxx index 332168179df9..a8f5e5efcb2d 100644 --- a/forms/inc/pch/precompiled_frm.hxx +++ b/forms/inc/pch/precompiled_frm.hxx @@ -229,7 +229,6 @@ #include #include #include -#include #include #include #include @@ -257,7 +256,6 @@ #include #include #include -#include #include #include #include diff --git a/forms/inc/strings.hrc b/forms/inc/strings.hrc new file mode 100644 index 000000000000..50a5a19504f1 --- /dev/null +++ b/forms/inc/strings.hrc @@ -0,0 +1,87 @@ +/* -*- 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_VCL_INC_STRINGS_HRC +#define INCLUDED_VCL_INC_STRINGS_HRC + +#define NC_(Context, String) (Context "\004" u8##String) + +#define RID_BASELISTBOX_ERROR_FILLLIST NC_("RID_BASELISTBOX_ERROR_FILLLIST", "The contents of a combo box or list field could not be determined.") +#define RID_STR_IMPORT_GRAPHIC NC_("RID_STR_IMPORT_GRAPHIC", "Insert Image" ) +#define RID_STR_CONTROL_SUBSTITUTED_NAME NC_("RID_STR_CONTROL_SUBSTITUTED_NAME", "substituted") +#define RID_STR_CONTROL_SUBSTITUTED_EPXPLAIN NC_("RID_STR_CONTROL_SUBSTITUTED_EPXPLAIN", "An error occurred while this control was being loaded. It was therefore replaced with a placeholder.") +#define RID_STR_READERROR NC_("RID_STR_READERROR", "Error reading data from database" ) +#define RID_STR_CONNECTERROR NC_("RID_STR_CONNECTERROR", "Connection failed" ) +#define RID_ERR_LOADING_FORM NC_("RID_ERR_LOADING_FORM", "The data content could not be loaded.") +#define RID_ERR_REFRESHING_FORM NC_("RID_ERR_REFRESHING_FORM", "The data content could not be updated") +#define RID_STR_ERR_INSERTRECORD NC_("RID_STR_ERR_INSERTRECORD", "Error inserting the new record") +#define RID_STR_ERR_UPDATERECORD NC_("RID_STR_ERR_UPDATERECORD", "Error updating the current record") +#define RID_STR_ERR_DELETERECORD NC_("RID_STR_ERR_DELETERECORD", "Error deleting the current record") +#define RID_STR_ERR_DELETERECORDS NC_("RID_STR_ERR_DELETERECORDS", "Error deleting the specified records") +#define RID_STR_NEED_NON_NULL_OBJECT NC_("RID_STR_NEED_NON_NULL_OBJECT", "The object cannot be NULL.") +#define RID_STR_OPEN_GRAPHICS NC_("RID_STR_OPEN_GRAPHICS", "Insert Image from...") +#define RID_STR_CLEAR_GRAPHICS NC_("RID_STR_CLEAR_GRAPHICS", "Remove Image") +#define RID_STR_INVALIDSTREAM NC_("RID_STR_INVALIDSTREAM", "The given stream is invalid.") +#define RID_STR_SYNTAXERROR NC_("RID_STR_SYNTAXERROR", "Syntax error in query expression" ) +#define RID_STR_INCOMPATIBLE_TYPES NC_("RID_STR_INCOMPATIBLE_TYPES", "The value types supported by the binding cannot be used for exchanging data with this control.") +#define RID_STR_LABEL_RECORD NC_("RID_STR_LABEL_RECORD", "Record") +#define RID_STR_INVALID_VALIDATOR NC_("RID_STR_INVALID_VALIDATOR", "The control is connected to an external value binding, which at the same time acts as validator. You need to revoke the value binding, before you can set a new validator.") +#define RID_STR_LABEL_OF NC_("RID_STR_LABEL_OF", "of") +#define RID_STR_QUERY_SAVE_MODIFIED_ROW NC_("RID_STR_QUERY_SAVE_MODIFIED_ROW", "The content of the current form has been modified.\nDo you want to save your changes?") +#define RID_STR_COULD_NOT_SET_ORDER NC_("RID_STR_COULD_NOT_SET_ORDER", "Error setting the sort criteria") +#define RID_STR_COULD_NOT_SET_FILTER NC_("RID_STR_COULD_NOT_SET_FILTER", "Error setting the filter criteria") +#define RID_STR_FEATURE_REQUIRES_PARAMETERS NC_("RID_STR_FEATURE_REQUIRES_PARAMETERS", "To execute this function, parameters are needed.") +#define RID_STR_FEATURE_NOT_EXECUTABLE NC_("RID_STR_FEATURE_NOT_EXECUTABLE", "This function cannot be executed, but is only for status queries.") +#define RID_STR_FEATURE_UNKNOWN NC_("RID_STR_FEATURE_UNKNOWN", "Unknown function.") + +#define RID_STR_XFORMS_NO_BINDING_EXPRESSION NC_("RID_STR_XFORMS_NO_BINDING_EXPRESSION", "Please enter a binding expression.") +#define RID_STR_XFORMS_INVALID_BINDING_EXPRESSION NC_("RID_STR_XFORMS_INVALID_BINDING_EXPRESSION", "This is an invalid binding expression.") +#define RID_STR_XFORMS_INVALID_VALUE NC_("RID_STR_XFORMS_INVALID_VALUE", "Value is invalid.") +#define RID_STR_XFORMS_REQUIRED NC_("RID_STR_XFORMS_REQUIRED", "A value is required.") +#define RID_STR_XFORMS_INVALID_CONSTRAINT NC_("RID_STR_XFORMS_INVALID_CONSTRAINT", "The constraint '$1' not validated.") +#define RID_STR_XFORMS_VALUE_IS_NOT_A NC_("RID_STR_XFORMS_VALUE_IS_NOT_A", "The value is not of the type '$2'.") +#define RID_STR_XFORMS_VALUE_MAX_INCL NC_("RID_STR_XFORMS_VALUE_MAX_INCL", "The value must be smaller than or equal to $2.") +#define RID_STR_XFORMS_VALUE_MAX_EXCL NC_("RID_STR_XFORMS_VALUE_MAX_EXCL", "The value must be smaller than $2.") +#define RID_STR_XFORMS_VALUE_MIN_INCL NC_("RID_STR_XFORMS_VALUE_MIN_INCL", "The value must be greater than or equal to $2.") +#define RID_STR_XFORMS_VALUE_MIN_EXCL NC_("RID_STR_XFORMS_VALUE_MIN_EXCL", "The value must be greater than $2.") +#define RID_STR_XFORMS_VALUE_TOTAL_DIGITS NC_("RID_STR_XFORMS_VALUE_TOTAL_DIGITS", "$2 digits allowed at most.") +#define RID_STR_XFORMS_VALUE_FRACTION_DIGITS NC_("RID_STR_XFORMS_VALUE_FRACTION_DIGITS", "$2 fraction digits allowed at most.") +#define RID_STR_XFORMS_VALUE_LENGTH NC_("RID_STR_XFORMS_VALUE_LENGTH", "The string must be $2 characters long.") +#define RID_STR_XFORMS_VALUE_MIN_LENGTH NC_("RID_STR_XFORMS_VALUE_MIN_LENGTH", "The string must be at least $2 characters long.") +#define RID_STR_XFORMS_VALUE_MAX_LENGTH NC_("RID_STR_XFORMS_VALUE_MAX_LENGTH", "The string can only be $2 characters long at most.") +#define RID_STR_DATATYPE_STRING NC_("RID_STR_DATATYPE_STRING", "String") +#define RID_STR_DATATYPE_URL NC_("RID_STR_DATATYPE_URL", "Hyperlink") +#define RID_STR_DATATYPE_BOOLEAN NC_("RID_STR_DATATYPE_BOOLEAN", "True/False (Boolean)") +#define RID_STR_DATATYPE_DECIMAL NC_("RID_STR_DATATYPE_DECIMAL", "Decimal") +#define RID_STR_DATATYPE_FLOAT NC_("RID_STR_DATATYPE_FLOAT", "Floating point") +#define RID_STR_DATATYPE_DOUBLE NC_("RID_STR_DATATYPE_DOUBLE", "Double") +#define RID_STR_DATATYPE_DATE NC_("RID_STR_DATATYPE_DATE", "Date") +#define RID_STR_DATATYPE_TIME NC_("RID_STR_DATATYPE_TIME", "Time") +#define RID_STR_DATATYPE_DATETIME NC_("RID_STR_DATATYPE_DATETIME", "Date and Time") +#define RID_STR_DATATYPE_YEAR NC_("RID_STR_DATATYPE_YEAR", "Year") +#define RID_STR_DATATYPE_MONTH NC_("RID_STR_DATATYPE_MONTH", "Month") +#define RID_STR_DATATYPE_DAY NC_("RID_STR_DATATYPE_DAY", "Day") +#define RID_STR_XFORMS_CANT_EVALUATE NC_("RID_STR_XFORMS_CANT_EVALUATE", "Error during evaluation") +#define RID_STR_XFORMS_PATTERN_DOESNT_MATCH NC_("RID_STR_XFORMS_PATTERN_DOESNT_MATCH", "The string '$1' does not match the required regular expression '$2'.") +#define RID_STR_XFORMS_BINDING_UI_NAME NC_("RID_STR_XFORMS_BINDING_UI_NAME", "Binding" ) +#define RID_STR_XFORMS_CANT_REMOVE_TYPE NC_("RID_STR_XFORMS_CANT_REMOVE_TYPE", "This is a built-in type and cannot be removed." ) + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx index 3c8690321704..e8bdea30e299 100644 --- a/forms/source/component/Columns.cxx +++ b/forms/source/component/Columns.cxx @@ -38,7 +38,7 @@ #include #include #include "services.hxx" -#include "frm_resource.hrc" +#include "strings.hrc" #include diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx index c99cf8a1808e..cac09c9d5099 100644 --- a/forms/source/component/ComboBox.cxx +++ b/forms/source/component/ComboBox.cxx @@ -24,7 +24,7 @@ #include "services.hxx" #include "frm_resource.hxx" -#include "frm_resource.hrc" +#include "strings.hrc" #include "BaseListBox.hxx" #include diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index d56659fcec70..e4ba7f24fa4b 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -21,7 +21,7 @@ #include "componenttools.hxx" #include "DatabaseForm.hxx" #include "EventThread.hxx" -#include "frm_resource.hrc" +#include "strings.hrc" #include "frm_resource.hxx" #include "GroupManager.hxx" #include "property.hrc" diff --git a/forms/source/component/EditBase.cxx b/forms/source/component/EditBase.cxx index 99ecfdb316d1..eef46ef2bbb9 100644 --- a/forms/source/component/EditBase.cxx +++ b/forms/source/component/EditBase.cxx @@ -25,7 +25,7 @@ #include #include #include "frm_resource.hxx" -#include "frm_resource.hrc" +#include "strings.hrc" #include #include #include diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx index 96225e6cba06..eee60278e94f 100644 --- a/forms/source/component/Filter.cxx +++ b/forms/source/component/Filter.cxx @@ -19,7 +19,7 @@ #include "Filter.hxx" #include "FormComponent.hxx" -#include "frm_resource.hrc" +#include "strings.hrc" #include "frm_resource.hxx" #include "property.hrc" #include "property.hxx" diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index 296b06ca3d68..fae24966a626 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.cxx @@ -18,7 +18,7 @@ */ #include "componenttools.hxx" #include "FormComponent.hxx" -#include "frm_resource.hrc" +#include "strings.hrc" #include "frm_resource.hxx" #include "property.hrc" #include "services.hxx" diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index 096b2bcf9351..cbae77c3211c 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -21,7 +21,7 @@ #include "property.hrc" #include "property.hxx" #include "frm_resource.hxx" -#include "frm_resource.hrc" +#include "strings.hrc" #include "propertybaghelper.hxx" #include #include diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index 33e66450f2f7..c72c211ce2b0 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -20,7 +20,7 @@ #include "ImageControl.hxx" #include "property.hrc" -#include "frm_resource.hrc" +#include "strings.hrc" #include "frm_resource.hxx" #include "services.hxx" #include "componenttools.hxx" diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index dd53979ebbc1..7d1f39ca8e14 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -24,7 +24,7 @@ #include "property.hrc" #include "services.hxx" #include "frm_resource.hxx" -#include "frm_resource.hrc" +#include "strings.hrc" #include "BaseListBox.hxx" #include "listenercontainers.hxx" #include "componenttools.hxx" diff --git a/forms/source/inc/frm_resource.hrc b/forms/source/inc/frm_resource.hrc deleted file mode 100644 index e3a4eb04af90..000000000000 --- a/forms/source/inc/frm_resource.hrc +++ /dev/null @@ -1,94 +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_FORMS_SOURCE_INC_FRM_RESOURCE_HRC -#define INCLUDED_FORMS_SOURCE_INC_FRM_RESOURCE_HRC - -#include - -#define RID_FRM_STRINGS_START RID_FORMLAYER_START - -//- String-IDs -#define RID_BASELISTBOX_ERROR_FILLLIST ( RID_FRM_STRINGS_START + 0 ) -#define RID_STR_IMPORT_GRAPHIC ( RID_FRM_STRINGS_START + 1 ) -#define RID_STR_CONTROL_SUBSTITUTED_NAME ( RID_FRM_STRINGS_START + 2 ) -#define RID_STR_CONTROL_SUBSTITUTED_EPXPLAIN ( RID_FRM_STRINGS_START + 3 ) -#define RID_STR_READERROR ( RID_FRM_STRINGS_START + 4 ) -#define RID_STR_CONNECTERROR ( RID_FRM_STRINGS_START + 5 ) -#define RID_ERR_LOADING_FORM ( RID_FRM_STRINGS_START + 6 ) -#define RID_ERR_REFRESHING_FORM ( RID_FRM_STRINGS_START + 7 ) -#define RID_STR_ERR_INSERTRECORD ( RID_FRM_STRINGS_START + 8 ) -#define RID_STR_ERR_UPDATERECORD ( RID_FRM_STRINGS_START + 9 ) -#define RID_STR_ERR_DELETERECORD ( RID_FRM_STRINGS_START + 10 ) -#define RID_STR_ERR_DELETERECORDS ( RID_FRM_STRINGS_START + 11 ) -#define RID_STR_NEED_NON_NULL_OBJECT ( RID_FRM_STRINGS_START + 12 ) -#define RID_STR_OPEN_GRAPHICS ( RID_FRM_STRINGS_START + 13 ) -#define RID_STR_CLEAR_GRAPHICS ( RID_FRM_STRINGS_START + 14 ) -#define RID_STR_INVALIDSTREAM ( RID_FRM_STRINGS_START + 15 ) -#define RID_STR_SYNTAXERROR ( RID_FRM_STRINGS_START + 16 ) -#define RID_STR_INCOMPATIBLE_TYPES ( RID_FRM_STRINGS_START + 17 ) -#define RID_STR_INVALID_VALIDATOR ( RID_FRM_STRINGS_START + 18 ) -#define RID_STR_LABEL_RECORD ( RID_FRM_STRINGS_START + 19 ) -#define RID_STR_LABEL_OF ( RID_FRM_STRINGS_START + 20 ) - -#define RID_STR_XFORMS_NO_BINDING_EXPRESSION ( RID_FRM_STRINGS_START + 21 ) -#define RID_STR_XFORMS_INVALID_BINDING_EXPRESSION (RID_FRM_STRINGS_START + 22) -#define RID_STR_XFORMS_INVALID_VALUE ( RID_FRM_STRINGS_START + 23 ) -#define RID_STR_XFORMS_REQUIRED ( RID_FRM_STRINGS_START + 24 ) -#define RID_STR_XFORMS_INVALID_CONSTRAINT ( RID_FRM_STRINGS_START + 25 ) -#define RID_STR_XFORMS_VALUE_IS_NOT_A ( RID_FRM_STRINGS_START + 26 ) -#define RID_STR_XFORMS_VALUE_MAX_INCL ( RID_FRM_STRINGS_START + 27 ) -#define RID_STR_XFORMS_VALUE_MAX_EXCL ( RID_FRM_STRINGS_START + 28 ) -#define RID_STR_XFORMS_VALUE_MIN_INCL ( RID_FRM_STRINGS_START + 29 ) -#define RID_STR_XFORMS_VALUE_MIN_EXCL ( RID_FRM_STRINGS_START + 30 ) -#define RID_STR_XFORMS_VALUE_TOTAL_DIGITS ( RID_FRM_STRINGS_START + 32 ) -#define RID_STR_XFORMS_VALUE_FRACTION_DIGITS ( RID_FRM_STRINGS_START + 33 ) -#define RID_STR_XFORMS_VALUE_LENGTH ( RID_FRM_STRINGS_START + 34 ) -#define RID_STR_XFORMS_VALUE_MIN_LENGTH ( RID_FRM_STRINGS_START + 35 ) -#define RID_STR_XFORMS_VALUE_MAX_LENGTH ( RID_FRM_STRINGS_START + 36 ) - -#define RID_STR_DATATYPE_STRING ( RID_FRM_STRINGS_START + 37 ) -#define RID_STR_DATATYPE_URL ( RID_FRM_STRINGS_START + 38 ) -#define RID_STR_DATATYPE_BOOLEAN ( RID_FRM_STRINGS_START + 39 ) -#define RID_STR_DATATYPE_DECIMAL ( RID_FRM_STRINGS_START + 40 ) -#define RID_STR_DATATYPE_FLOAT ( RID_FRM_STRINGS_START + 41 ) -#define RID_STR_DATATYPE_DOUBLE ( RID_FRM_STRINGS_START + 42 ) -#define RID_STR_DATATYPE_DATE ( RID_FRM_STRINGS_START + 43 ) -#define RID_STR_DATATYPE_TIME ( RID_FRM_STRINGS_START + 44 ) -#define RID_STR_DATATYPE_DATETIME ( RID_FRM_STRINGS_START + 45 ) -#define RID_STR_DATATYPE_YEAR ( RID_FRM_STRINGS_START + 47 ) -#define RID_STR_DATATYPE_MONTH ( RID_FRM_STRINGS_START + 49 ) -#define RID_STR_DATATYPE_DAY ( RID_FRM_STRINGS_START + 50 ) - -#define RID_STR_XFORMS_CANT_EVALUATE ( RID_FRM_STRINGS_START + 51 ) -#define RID_STR_XFORMS_PATTERN_DOESNT_MATCH ( RID_FRM_STRINGS_START + 52 ) -#define RID_STR_XFORMS_BINDING_UI_NAME ( RID_FRM_STRINGS_START + 53 ) - -#define RID_STR_QUERY_SAVE_MODIFIED_ROW ( RID_FRM_STRINGS_START + 54 ) -#define RID_STR_COULD_NOT_SET_ORDER ( RID_FRM_STRINGS_START + 55 ) -#define RID_STR_COULD_NOT_SET_FILTER ( RID_FRM_STRINGS_START + 56 ) -#define RID_STR_FEATURE_REQUIRES_PARAMETERS ( RID_FRM_STRINGS_START + 57 ) -#define RID_STR_FEATURE_NOT_EXECUTABLE ( RID_FRM_STRINGS_START + 58 ) -#define RID_STR_FEATURE_UNKNOWN ( RID_FRM_STRINGS_START + 59 ) - -#define RID_STR_XFORMS_CANT_REMOVE_TYPE ( RID_FRM_STRINGS_START + 60 ) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/inc/frm_resource.hxx b/forms/source/inc/frm_resource.hxx index 6597893ab384..529d0f43b391 100644 --- a/forms/source/inc/frm_resource.hxx +++ b/forms/source/inc/frm_resource.hxx @@ -22,42 +22,18 @@ #include -class SimpleResMgr; - namespace frm { #define FRM_RES_STRING(id) ResourceManager::loadString(id) // handling resources within the FormLayer library - class ResourceManager + namespace ResourceManager { - static SimpleResMgr* m_pImpl; - private: - // no instantiation allowed - ResourceManager() = delete; - ~ResourceManager() { } - - // we'll instantiate one static member of the following class, which, in its dtor, - // ensures that m_pImpl will be deleted - class EnsureDelete - { - public: - EnsureDelete() { } - ~EnsureDelete(); - }; - friend class EnsureDelete; - - protected: - static void ensureImplExists(); - - public: - /** loads the string with the specified resource id from the FormLayer resource file + /** loads the string with the specified resource id from the FormLayer mo file */ - static OUString loadString(sal_uInt16 _nResId); + OUString loadString(const char* pResId); }; - - } diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx index 2d7430ed6cfb..5c2facc6505f 100644 --- a/forms/source/misc/InterfaceContainer.cxx +++ b/forms/source/misc/InterfaceContainer.cxx @@ -18,7 +18,7 @@ */ -#include "frm_resource.hrc" +#include "strings.hrc" #include "frm_resource.hxx" #include "InterfaceContainer.hxx" #include "componenttools.hxx" diff --git a/forms/source/resource/frm_resource.cxx b/forms/source/resource/frm_resource.cxx index 3ae6805694c3..4a3ff363abf6 100644 --- a/forms/source/resource/frm_resource.cxx +++ b/forms/source/resource/frm_resource.cxx @@ -18,58 +18,21 @@ */ #include "frm_resource.hxx" -#include +#include -// needed as long as we have no contexts for components #include #include -#include - - namespace frm { - - - //= ResourceManager - - SimpleResMgr* ResourceManager::m_pImpl = nullptr; - - - ResourceManager::EnsureDelete::~EnsureDelete() + namespace ResourceManager { - delete ResourceManager::m_pImpl; - } - - - void ResourceManager::ensureImplExists() - { - if (m_pImpl) - return; - - m_pImpl = SimpleResMgr::Create("frm", Application::GetSettings().GetUILanguageTag()); - - if (m_pImpl) + OUString loadString(const char* pResId) { - // no that we have a impl class make sure it's deleted on unloading the library - static ResourceManager::EnsureDelete s_aDeleteTheImplClas; + static std::locale loc = Translate::Create("frm", Application::GetSettings().GetUILanguageTag()); + return Translate::get(pResId, loc); } } - - - OUString ResourceManager::loadString(sal_uInt16 _nResId) - { - OUString sReturn; - - ensureImplExists(); - if (m_pImpl) - sReturn = m_pImpl->ReadString(_nResId); - - return sReturn; - } - - } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/resource/strings.src b/forms/source/resource/strings.src deleted file mode 100644 index 3a252c7d78ab..000000000000 --- a/forms/source/resource/strings.src +++ /dev/null @@ -1,152 +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 "frm_resource.hrc" - -String RID_BASELISTBOX_ERROR_FILLLIST -{ - Text [ en-US ] = "The contents of a combo box or list field could not be determined."; -}; - -String RID_STR_IMPORT_GRAPHIC -{ - Text [ en-US ] = "Insert Image" ; -}; - -String RID_STR_CONTROL_SUBSTITUTED_NAME -{ - Text [ en-US ] = "substituted"; -}; - -String RID_STR_CONTROL_SUBSTITUTED_EPXPLAIN -{ - Text [ en-US ] = "An error occurred while this control was being loaded. It was therefore replaced with a placeholder."; -}; - -String RID_STR_READERROR -{ - Text [ en-US ] = "Error reading data from database" ; -}; - -String RID_STR_CONNECTERROR -{ - Text [ en-US ] = "Connection failed" ; -}; - -String RID_ERR_LOADING_FORM -{ - Text [ en-US ] = "The data content could not be loaded."; -}; - -String RID_ERR_REFRESHING_FORM -{ - Text [ en-US ] = "The data content could not be updated"; -}; - -String RID_STR_ERR_INSERTRECORD -{ - Text [ en-US ] = "Error inserting the new record"; -}; - -String RID_STR_ERR_UPDATERECORD -{ - Text [ en-US ] = "Error updating the current record"; -}; - -String RID_STR_ERR_DELETERECORD -{ - Text [ en-US ] = "Error deleting the current record"; -}; - -String RID_STR_ERR_DELETERECORDS -{ - Text [ en-US ] = "Error deleting the specified records"; -}; - -String RID_STR_NEED_NON_NULL_OBJECT -{ - Text [ en-US ] = "The object cannot be NULL."; -}; - -String RID_STR_OPEN_GRAPHICS -{ - Text [ en-US ] = "Insert Image from..."; -}; - -String RID_STR_CLEAR_GRAPHICS -{ - Text [ en-US ] = "Remove Image"; -}; - -String RID_STR_INVALIDSTREAM -{ - Text [ en-US ] = "The given stream is invalid."; -}; - -String RID_STR_SYNTAXERROR -{ - Text [ en-US ] = "Syntax error in query expression" ; -}; - -String RID_STR_INCOMPATIBLE_TYPES -{ - Text [ en-US ] = "The value types supported by the binding cannot be used for exchanging data with this control."; -}; - -String RID_STR_LABEL_RECORD -{ - Text [ en-US ] = "Record"; -}; - -String RID_STR_INVALID_VALIDATOR -{ - Text [ en-US ] = "The control is connected to an external value binding, which at the same time acts as validator. You need to revoke the value binding, before you can set a new validator."; -}; - -String RID_STR_LABEL_OF -{ - Text [ en-US ] = "of"; -}; - -String RID_STR_QUERY_SAVE_MODIFIED_ROW -{ - Text [ en-US ] = "The content of the current form has been modified.\nDo you want to save your changes?"; -}; -String RID_STR_COULD_NOT_SET_ORDER -{ - Text [ en-US ] = "Error setting the sort criteria"; -}; -String RID_STR_COULD_NOT_SET_FILTER -{ - Text [ en-US ] = "Error setting the filter criteria"; -}; -String RID_STR_FEATURE_REQUIRES_PARAMETERS -{ - Text [ en-US ] = "To execute this function, parameters are needed."; -}; -String RID_STR_FEATURE_NOT_EXECUTABLE -{ - Text [ en-US ] = "This function cannot be executed, but is only for status queries."; -}; -String RID_STR_FEATURE_UNKNOWN -{ - Text [ en-US ] = "Unknown function."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/resource/xforms.src b/forms/source/resource/xforms.src deleted file mode 100644 index 8c47e872c49c..000000000000 --- a/forms/source/resource/xforms.src +++ /dev/null @@ -1,177 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "frm_resource.hrc" - -String RID_STR_XFORMS_NO_BINDING_EXPRESSION -{ - Text [ en-US ] = "Please enter a binding expression."; -}; - -String RID_STR_XFORMS_INVALID_BINDING_EXPRESSION -{ - Text [ en-US ] = "This is an invalid binding expression."; -}; - -String RID_STR_XFORMS_INVALID_VALUE -{ - Text [ en-US ] = "Value is invalid."; -}; - -String RID_STR_XFORMS_REQUIRED -{ - Text [ en-US ] = "A value is required."; -}; - -String RID_STR_XFORMS_INVALID_CONSTRAINT -{ - Text [ en-US ] = "The constraint '$1' not validated."; -}; - -String RID_STR_XFORMS_VALUE_IS_NOT_A -{ - Text [ en-US ] = "The value is not of the type '$2'."; -}; - -String RID_STR_XFORMS_VALUE_MAX_INCL -{ - Text [ en-US ] = "The value must be smaller than or equal to $2."; -}; - -String RID_STR_XFORMS_VALUE_MAX_EXCL -{ - Text [ en-US ] = "The value must be smaller than $2."; -}; - -String RID_STR_XFORMS_VALUE_MIN_INCL -{ - Text [ en-US ] = "The value must be greater than or equal to $2."; -}; - -String RID_STR_XFORMS_VALUE_MIN_EXCL -{ - Text [ en-US ] = "The value must be greater than $2."; -}; - -String RID_STR_XFORMS_VALUE_TOTAL_DIGITS -{ - Text [ en-US ] = "$2 digits allowed at most."; -}; - -String RID_STR_XFORMS_VALUE_FRACTION_DIGITS -{ - Text [ en-US ] = "$2 fraction digits allowed at most."; -}; - -String RID_STR_XFORMS_VALUE_LENGTH -{ - Text [ en-US ] = "The string must be $2 characters long."; -}; - -String RID_STR_XFORMS_VALUE_MIN_LENGTH -{ - Text [ en-US ] = "The string must be at least $2 characters long."; -}; - -String RID_STR_XFORMS_VALUE_MAX_LENGTH -{ - Text [ en-US ] = "The string can only be $2 characters long at most."; -}; - -String RID_STR_DATATYPE_STRING -{ - Text [ en-US ] = "String"; -}; - -String RID_STR_DATATYPE_URL -{ - Text [ en-US ] = "Hyperlink"; -}; - -String RID_STR_DATATYPE_BOOLEAN -{ - Text [ en-US ] = "True/False (Boolean)"; -}; - -String RID_STR_DATATYPE_DECIMAL -{ - Text [ en-US ] = "Decimal"; -}; - -String RID_STR_DATATYPE_FLOAT -{ - Text [ en-US ] = "Floating point"; -}; - -String RID_STR_DATATYPE_DOUBLE -{ - Text [ en-US ] = "Double"; -}; - -String RID_STR_DATATYPE_DATE -{ - Text [ en-US ] = "Date"; -}; - -String RID_STR_DATATYPE_TIME -{ - Text [ en-US ] = "Time"; -}; - -String RID_STR_DATATYPE_DATETIME -{ - Text [ en-US ] = "Date and Time"; -}; - -String RID_STR_DATATYPE_YEAR -{ - Text [ en-US ] = "Year"; -}; - -String RID_STR_DATATYPE_MONTH -{ - Text [ en-US ] = "Month"; -}; - -String RID_STR_DATATYPE_DAY -{ - Text [ en-US ] = "Day"; -}; - -String RID_STR_XFORMS_CANT_EVALUATE -{ - Text [ en-US ] = "Error during evaluation"; -}; - -String RID_STR_XFORMS_PATTERN_DOESNT_MATCH -{ - Text [ en-US ] = "The string '$1' does not match the required regular expression '$2'."; -}; - -String RID_STR_XFORMS_BINDING_UI_NAME -{ - Text [ en-US ] = "Binding" ; -}; - -String RID_STR_XFORMS_CANT_REMOVE_TYPE -{ - Text [ en-US ] = "This is a built-in type and cannot be removed." ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx index d291bfb4649d..340b4518f7d9 100644 --- a/forms/source/runtime/formoperations.cxx +++ b/forms/source/runtime/formoperations.cxx @@ -22,7 +22,7 @@ #include "formoperations.hxx" #include "frm_strings.hxx" #include "frm_resource.hxx" -#include "frm_resource.hrc" +#include "strings.hrc" #include "services.hxx" #include @@ -771,12 +771,12 @@ namespace frm default: { - sal_uInt16 nErrorResourceId = RID_STR_FEATURE_UNKNOWN; + const char* pErrorResourceId = RID_STR_FEATURE_UNKNOWN; if ( lcl_requiresArguments( _nFeature ) ) - nErrorResourceId = RID_STR_FEATURE_REQUIRES_PARAMETERS; + pErrorResourceId = RID_STR_FEATURE_REQUIRES_PARAMETERS; else if ( !lcl_isExecutableFeature( _nFeature ) ) - nErrorResourceId = RID_STR_FEATURE_NOT_EXECUTABLE; - throw IllegalArgumentException( FRM_RES_STRING( nErrorResourceId ), *this, 1 ); + pErrorResourceId = RID_STR_FEATURE_NOT_EXECUTABLE; + throw IllegalArgumentException( FRM_RES_STRING( pErrorResourceId ), *this, 1 ); } } // switch } @@ -1695,7 +1695,7 @@ namespace frm template < typename FunctObj > - void FormOperations::impl_doActionInSQLContext_throw( FunctObj f, sal_uInt16 _nErrorResourceId ) const + void FormOperations::impl_doActionInSQLContext_throw( FunctObj f, const char* pErrorResourceId ) const { try { @@ -1704,12 +1704,11 @@ namespace frm #if HAVE_FEATURE_DBCONNECTIVITY catch( const SQLException& ) { - if ( !_nErrorResourceId ) - // no information to prepend + if (!pErrorResourceId) // no information to prepend throw; SQLExceptionInfo aInfo( ::cppu::getCaughtException() ); - OUString sAdditionalError( FRM_RES_STRING( _nErrorResourceId ) ); + OUString sAdditionalError( FRM_RES_STRING( pErrorResourceId ) ); aInfo.prepend( sAdditionalError ); aInfo.doThrow(); } @@ -1717,7 +1716,7 @@ namespace frm catch( const RuntimeException& ) { throw; } catch( const Exception& ) { - OUString sAdditionalError( FRM_RES_STRING( _nErrorResourceId ) ); + OUString sAdditionalError( FRM_RES_STRING( pErrorResourceId ) ); throw WrappedTargetException( sAdditionalError, *const_cast< FormOperations* >( this ), ::cppu::getCaughtException() ); } } diff --git a/forms/source/runtime/formoperations.hxx b/forms/source/runtime/formoperations.hxx index db76e57f7df8..425e789f8419 100644 --- a/forms/source/runtime/formoperations.hxx +++ b/forms/source/runtime/formoperations.hxx @@ -290,11 +290,11 @@ namespace frm @param f a functionoid with no arguments to do the work - @param _nErrorResourceId + @param pErrorResourceId the id of the resources string to use as error message */ template < typename FunctObj > - void impl_doActionInSQLContext_throw( FunctObj f, sal_uInt16 _nErrorResourceId ) const; + void impl_doActionInSQLContext_throw( FunctObj f, const char* pErrorResourceId ) const; // functionoid to call appendOrderByColumn class impl_appendOrderByColumn_throw diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx index dd183941eb61..981a711d085e 100644 --- a/forms/source/solar/control/navtoolbar.cxx +++ b/forms/source/solar/control/navtoolbar.cxx @@ -21,7 +21,7 @@ #include "navtoolbar.hxx" #include "frm_resource.hxx" #include "featuredispatcher.hxx" -#include "frm_resource.hrc" +#include "strings.hrc" #include "commandimageprovider.hxx" #include @@ -52,10 +52,10 @@ namespace frm || ( _nFeatureId == LID_RECORD_FILLER ); } - OUString getLabelString( sal_uInt16 _nResId ) + OUString getLabelString(const char* pResId) { OUString sLabel( " " ); - sLabel += FRM_RES_STRING( _nResId ); + sLabel += FRM_RES_STRING(pResId); sLabel += " "; return sLabel; } diff --git a/forms/source/xforms/datatyperepository.cxx b/forms/source/xforms/datatyperepository.cxx index 6d622a1ea8c7..cafdd5ce07b3 100644 --- a/forms/source/xforms/datatyperepository.cxx +++ b/forms/source/xforms/datatyperepository.cxx @@ -20,7 +20,7 @@ #include "datatyperepository.hxx" #include "datatypes.hxx" -#include "frm_resource.hrc" +#include "strings.hrc" #include "frm_resource.hxx" #include "frm_strings.hxx" #include "property.hrc" diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx index 3bd0fb0537a6..5b8373223389 100644 --- a/forms/source/xforms/datatypes.cxx +++ b/forms/source/xforms/datatypes.cxx @@ -159,26 +159,25 @@ namespace xforms sal_Bool OXSDDataType::validate( const OUString& sValue ) { - return ( _validate( sValue ) == 0 ); + return ( _validate( sValue ) == nullptr ); } OUString OXSDDataType::explainInvalid( const OUString& sValue ) { // get reason - sal_uInt16 nReason = _validate( sValue ); + const char* pReason = _validate( sValue ); // get resource and return localized string - return ( nReason == 0 ) + return (!pReason) ? OUString() - : getResource( nReason, sValue, - _explainInvalid( nReason ) ); + : getResource( pReason, sValue, + _explainInvalid( pReason ) ); } - - OUString OXSDDataType::_explainInvalid( sal_uInt16 nReason ) + OUString OXSDDataType::_explainInvalid(const OString& rReason) { - if ( RID_STR_XFORMS_PATTERN_DOESNT_MATCH == nReason ) + if ( RID_STR_XFORMS_PATTERN_DOESNT_MATCH == rReason ) { OSL_ENSURE( !m_sPattern.isEmpty(), "OXSDDataType::_explainInvalid: how can this error occur without a regular expression?" ); return m_sPattern; @@ -186,7 +185,6 @@ namespace xforms return OUString(); } - namespace { void lcl_initializePatternMatcher( ::std::unique_ptr< RegexMatcher >& _rpMatcher, const OUString& _rPattern ) @@ -215,8 +213,7 @@ namespace xforms } } - - sal_uInt16 OXSDDataType::_validate( const OUString& _rValue ) + const char* OXSDDataType::_validate( const OUString& _rValue ) { // care for the regular expression if ( !m_sPattern.isEmpty() ) @@ -233,7 +230,7 @@ namespace xforms return RID_STR_XFORMS_PATTERN_DOESNT_MATCH; } - return 0; + return nullptr; } @@ -422,66 +419,43 @@ namespace xforms return bReturn; } - - sal_uInt16 OValueLimitedType_Base::_validate( const OUString& rValue ) + const char* OValueLimitedType_Base::_validate( const OUString& rValue ) { - sal_uInt16 nReason = OXSDDataType::_validate( rValue ); - if( nReason == 0 ) + const char* pReason = OXSDDataType::_validate( rValue ); + if (!pReason) { // convert value and check format double f; if( ! _getValue( rValue, f ) ) - nReason = RID_STR_XFORMS_VALUE_IS_NOT_A; + pReason = RID_STR_XFORMS_VALUE_IS_NOT_A; // check range else if( ( m_aMaxInclusive.hasValue() ) && f > m_fCachedMaxInclusive ) - nReason = RID_STR_XFORMS_VALUE_MAX_INCL; + pReason = RID_STR_XFORMS_VALUE_MAX_INCL; else if( ( m_aMaxExclusive.hasValue() ) && f >= m_fCachedMaxExclusive ) - nReason = RID_STR_XFORMS_VALUE_MAX_EXCL; + pReason = RID_STR_XFORMS_VALUE_MAX_EXCL; else if( ( m_aMinInclusive.hasValue() ) && f < m_fCachedMinInclusive ) - nReason = RID_STR_XFORMS_VALUE_MIN_INCL; + pReason = RID_STR_XFORMS_VALUE_MIN_INCL; else if( ( m_aMinExclusive.hasValue() ) && f <= m_fCachedMinExclusive ) - nReason = RID_STR_XFORMS_VALUE_MIN_EXCL; + pReason = RID_STR_XFORMS_VALUE_MIN_EXCL; } - return nReason; + return pReason; } - - OUString OValueLimitedType_Base::_explainInvalid( sal_uInt16 nReason ) + OUString OValueLimitedType_Base::_explainInvalid(const OString& rReason) { OUStringBuffer sInfo; - switch( nReason ) - { - case 0: - // nothing to do! - break; - - case RID_STR_XFORMS_VALUE_IS_NOT_A: + if (rReason == RID_STR_XFORMS_VALUE_IS_NOT_A) sInfo.append( getName() ); - break; - - case RID_STR_XFORMS_VALUE_MAX_INCL: + else if (rReason == RID_STR_XFORMS_VALUE_MAX_INCL) sInfo.append( typedValueAsHumanReadableString( m_aMaxInclusive ) ); - break; - - case RID_STR_XFORMS_VALUE_MAX_EXCL: + else if (rReason == RID_STR_XFORMS_VALUE_MAX_EXCL) sInfo.append( typedValueAsHumanReadableString( m_aMaxExclusive ) ); - break; - - case RID_STR_XFORMS_VALUE_MIN_INCL: + else if (rReason == RID_STR_XFORMS_VALUE_MIN_INCL) sInfo.append( typedValueAsHumanReadableString( m_aMinInclusive ) ); - break; - - case RID_STR_XFORMS_VALUE_MIN_EXCL: + else if (rReason == RID_STR_XFORMS_VALUE_MIN_EXCL) sInfo.append( typedValueAsHumanReadableString( m_aMinExclusive ) ); - break; - - default: - OSL_FAIL( "OValueLimitedType::_explainInvalid: unknown reason!" ); - break; - } - return sInfo.makeStringAndClear(); } @@ -538,12 +512,12 @@ namespace xforms } - sal_uInt16 OStringType::_validate( const OUString& rValue ) + const char* OStringType::_validate( const OUString& rValue ) { // check regexp, whitespace etc. in parent class - sal_uInt16 nReason = OStringType_Base::_validate( rValue ); + const char* pReason = OStringType_Base::_validate( rValue ); - if( nReason == 0 ) + if (!pReason) { // check string constraints sal_Int32 nLength = rValue.getLength(); @@ -551,48 +525,41 @@ namespace xforms if ( m_aLength >>= nLimit ) { if ( nLimit != nLength ) - nReason = RID_STR_XFORMS_VALUE_LENGTH; + pReason = RID_STR_XFORMS_VALUE_LENGTH; } else { if ( ( m_aMaxLength >>= nLimit ) && ( nLength > nLimit ) ) - nReason = RID_STR_XFORMS_VALUE_MAX_LENGTH; + pReason = RID_STR_XFORMS_VALUE_MAX_LENGTH; else if ( ( m_aMinLength >>= nLimit ) && ( nLength < nLimit ) ) - nReason = RID_STR_XFORMS_VALUE_MIN_LENGTH; + pReason = RID_STR_XFORMS_VALUE_MIN_LENGTH; } } - return nReason; + return pReason; } - - OUString OStringType::_explainInvalid( sal_uInt16 nReason ) + OUString OStringType::_explainInvalid(const OString& rReason) { sal_Int32 nValue = 0; OUStringBuffer sInfo; - switch( nReason ) + if (rReason == RID_STR_XFORMS_VALUE_LENGTH) { - case 0: - // nothing to do! - break; - - case RID_STR_XFORMS_VALUE_LENGTH: if( m_aLength >>= nValue ) sInfo.append( nValue ); - break; - - case RID_STR_XFORMS_VALUE_MAX_LENGTH: + } + else if (rReason == RID_STR_XFORMS_VALUE_MAX_LENGTH) + { if( m_aMaxLength >>= nValue ) sInfo.append( nValue ); - break; - - case RID_STR_XFORMS_VALUE_MIN_LENGTH: + } + else if (rReason == RID_STR_XFORMS_VALUE_MIN_LENGTH) + { if( m_aMinLength >>= nValue ) sInfo.append( nValue ); - break; - - default: - sInfo.append( OStringType_Base::_explainInvalid( nReason ) ); - break; + } + else if (!rReason.isEmpty()) + { + sInfo.append(OStringType_Base::_explainInvalid(rReason)); } return sInfo.makeStringAndClear(); } @@ -612,20 +579,19 @@ namespace xforms OBooleanType_Base::initializeClone( _rCloneSource ); } - sal_uInt16 OBooleanType::_validate( const OUString& sValue ) + const char* OBooleanType::_validate( const OUString& sValue ) { - sal_uInt16 nInvalidityReason = OBooleanType_Base::_validate( sValue ); - if ( nInvalidityReason ) - return nInvalidityReason; + const char* pInvalidityReason = OBooleanType_Base::_validate( sValue ); + if ( pInvalidityReason ) + return pInvalidityReason; bool bValid = sValue == "0" || sValue == "1" || sValue == "true" || sValue == "false"; - return bValid ? 0 : RID_STR_XFORMS_INVALID_VALUE; + return bValid ? nullptr : RID_STR_XFORMS_INVALID_VALUE; } - - OUString OBooleanType::_explainInvalid( sal_uInt16 nReason ) + OUString OBooleanType::_explainInvalid(const OString& rReason) { - return ( nReason == 0 ) ? OUString() : getName(); + return rReason.isEmpty() ? OUString() : getName(); } ODecimalType::ODecimalType( const OUString& _rName, sal_Int16 _nTypeClass ) @@ -655,12 +621,12 @@ namespace xforms // validate decimals and return code for which facets failed // to be used by: ODecimalType::validate and ODecimalType::explainInvalid - sal_uInt16 ODecimalType::_validate( const OUString& rValue ) + const char* ODecimalType::_validate( const OUString& rValue ) { - sal_Int16 nReason = ODecimalType_Base::_validate( rValue ); + const char* pReason = ODecimalType_Base::_validate( rValue ); // check digits (if no other cause is available so far) - if( nReason == 0 ) + if (!pReason) { sal_Int32 nLength = rValue.getLength(); sal_Int32 n = 0; @@ -679,40 +645,36 @@ namespace xforms sal_Int32 nValue = 0; if( ( m_aTotalDigits >>= nValue ) && nTotalDigits > nValue ) - nReason = RID_STR_XFORMS_VALUE_TOTAL_DIGITS; + pReason = RID_STR_XFORMS_VALUE_TOTAL_DIGITS; else if( ( m_aFractionDigits >>= nValue ) && ( nFractionDigits > nValue ) ) - nReason = RID_STR_XFORMS_VALUE_FRACTION_DIGITS; + pReason = RID_STR_XFORMS_VALUE_FRACTION_DIGITS; } - return nReason; + return pReason; } - - OUString ODecimalType::_explainInvalid( sal_uInt16 nReason ) + OUString ODecimalType::_explainInvalid(const OString& rReason) { sal_Int32 nValue = 0; OUStringBuffer sInfo; - switch( nReason ) + if (rReason == RID_STR_XFORMS_VALUE_TOTAL_DIGITS) { - case RID_STR_XFORMS_VALUE_TOTAL_DIGITS: if( m_aTotalDigits >>= nValue ) sInfo.append( nValue ); - break; - - case RID_STR_XFORMS_VALUE_FRACTION_DIGITS: + } + else if (rReason == RID_STR_XFORMS_VALUE_FRACTION_DIGITS) + { if( m_aFractionDigits >>= nValue ) sInfo.append( nValue ); - break; - - default: - sInfo.append( ODecimalType_Base::_explainInvalid( nReason ) ); - break; + } + else + { + sInfo.append(ODecimalType_Base::_explainInvalid(rReason)); } return sInfo.makeStringAndClear(); } - OUString ODecimalType::typedValueAsHumanReadableString( const Any& _rValue ) const { double fValue( 0 ); @@ -751,7 +713,7 @@ namespace xforms DEFAULT_IMPLEMNENT_SUBTYPE( ODateType, DATE ) - sal_uInt16 ODateType::_validate( const OUString& _rValue ) + const char* ODateType::_validate( const OUString& _rValue ) { return ODateType_Base::_validate( _rValue ); } @@ -793,7 +755,7 @@ namespace xforms DEFAULT_IMPLEMNENT_SUBTYPE( OTimeType, TIME ) - sal_uInt16 OTimeType::_validate( const OUString& _rValue ) + const char* OTimeType::_validate( const OUString& _rValue ) { return OTimeType_Base::_validate( _rValue ); } @@ -841,13 +803,11 @@ namespace xforms DEFAULT_IMPLEMNENT_SUBTYPE( ODateTimeType, DATETIME ) - - sal_uInt16 ODateTimeType::_validate( const OUString& _rValue ) + const char* ODateTimeType::_validate( const OUString& _rValue ) { return ODateTimeType_Base::_validate( _rValue ); } - namespace { double lcl_normalizeDateTime( const DateTime& _rValue ) diff --git a/forms/source/xforms/datatypes.hxx b/forms/source/xforms/datatypes.hxx index 7c84694eabcc..ee00452e5b94 100644 --- a/forms/source/xforms/datatypes.hxx +++ b/forms/source/xforms/datatypes.hxx @@ -118,8 +118,8 @@ namespace xforms virtual void initializeClone( const OXSDDataType& _rCloneSource ); // helper method for validate and explainInvalid - virtual sal_uInt16 _validate( const OUString& value ); - virtual OUString _explainInvalid( sal_uInt16 nReason ); + virtual const char* _validate( const OUString& value ); + virtual OUString _explainInvalid( const OString& rReason ); // helper method for checking properties values which are to be set virtual bool checkPropertySanity( sal_Int32 _nHandle, const css::uno::Any& _rNewValue, OUString& _rErrorMessage ); @@ -177,8 +177,8 @@ namespace xforms // OXSDDataType overridables virtual bool _getValue( const OUString& value, double& fValue ); - virtual sal_uInt16 _validate( const OUString& value ) override; - virtual OUString _explainInvalid( sal_uInt16 nReason ) override; + virtual const char* _validate( const OUString& value ) override; + virtual OUString _explainInvalid( const OString& rReason ) override; // own overridables /** translate a given value into a human-readable string @@ -249,8 +249,8 @@ namespace xforms DECLARE_DEFAULT_CLONING( OBooleanType ) // OXSDDataType overridables - virtual sal_uInt16 _validate( const OUString& value ) override; - virtual OUString _explainInvalid( sal_uInt16 nReason ) override; + virtual const char* _validate( const OUString& value ) override; + virtual OUString _explainInvalid( const OString& rReason ) override; }; class OStringType; @@ -272,8 +272,8 @@ namespace xforms void initializeTypedClone( const OStringType& _rCloneSource ); // OXSDDataType overridables - virtual sal_uInt16 _validate( const OUString& value ) override; - virtual OUString _explainInvalid( sal_uInt16 nReason ) override; + virtual const char* _validate( const OUString& value ) override; + virtual OUString _explainInvalid( const OString& rReason ) override; virtual bool checkPropertySanity( sal_Int32 _nHandle, const css::uno::Any& _rNewValue, OUString& _rErrorMessage ) override; virtual void registerProperties() override; }; @@ -294,8 +294,8 @@ namespace xforms void initializeTypedClone( const ODecimalType& _rCloneSource ); // OXSDDataType overridables - virtual sal_uInt16 _validate( const OUString& value ) override; - virtual OUString _explainInvalid( sal_uInt16 nReason ) override; + virtual const char* _validate( const OUString& value ) override; + virtual OUString _explainInvalid( const OString& rReason ) override; virtual void registerProperties() override; // OValueLimitedType overridables @@ -321,7 +321,7 @@ namespace xforms DECLARE_DEFAULT_CLONING( classname ) \ \ /* OXSDDataType overridables */ \ - virtual sal_uInt16 _validate( const OUString& value ) override; \ + virtual const char* _validate( const OUString& value ) override; \ virtual bool _getValue( const OUString& value, double& fValue ) override; \ \ /* OValueLimitedType overridables */ \ diff --git a/forms/source/xforms/resourcehelper.cxx b/forms/source/xforms/resourcehelper.cxx index a0614572db5f..49ecdb5b6140 100644 --- a/forms/source/xforms/resourcehelper.cxx +++ b/forms/source/xforms/resourcehelper.cxx @@ -28,30 +28,30 @@ namespace xforms { -OUString getResource( sal_uInt16 nResourceId ) +OUString getResource(const char* pResourceId) { - return getResource( nResourceId, OUString(), OUString(), OUString() ); + return getResource(pResourceId, OUString(), OUString(), OUString()); } -OUString getResource( sal_uInt16 nResourceId, - const OUString& rInfo1 ) +OUString getResource(const char* pResourceId, + const OUString& rInfo1) { - return getResource( nResourceId, rInfo1, OUString(), OUString() ); + return getResource(pResourceId, rInfo1, OUString(), OUString()); } -OUString getResource( sal_uInt16 nResourceId, - const OUString& rInfo1, - const OUString& rInfo2 ) +OUString getResource(const char* pResourceId, + const OUString& rInfo1, + const OUString& rInfo2) { - return getResource( nResourceId, rInfo1, rInfo2, OUString() ); + return getResource(pResourceId, rInfo1, rInfo2, OUString()); } -OUString getResource( sal_uInt16 nResourceId, - const OUString& rInfo1, - const OUString& rInfo2, - const OUString& rInfo3 ) +OUString getResource(const char* pResourceId, + const OUString& rInfo1, + const OUString& rInfo2, + const OUString& rInfo3) { - OUString sResource = frm::ResourceManager::loadString( nResourceId ); + OUString sResource = frm::ResourceManager::loadString(pResourceId); OSL_ENSURE( !sResource.isEmpty(), "resource not found?" ); OUString sString( sResource ); diff --git a/forms/source/xforms/resourcehelper.hxx b/forms/source/xforms/resourcehelper.hxx index ef166dae3ad7..85a01cc74737 100644 --- a/forms/source/xforms/resourcehelper.hxx +++ b/forms/source/xforms/resourcehelper.hxx @@ -20,7 +20,7 @@ #define INCLUDED_FORMS_SOURCE_XFORMS_RESOURCEHELPER_HXX // include resource IDs -#include +#include #include #include @@ -28,15 +28,15 @@ namespace xforms { /// get a resource string for the current language - OUString getResource( sal_uInt16 ); + OUString getResource(const char*); // overloaded: get a resource string, and substitute parameters - OUString getResource( sal_uInt16, const OUString& ); - OUString getResource( sal_uInt16, const OUString&, - const OUString& ); - OUString getResource( sal_uInt16, const OUString&, + OUString getResource(const char*, const OUString&); + OUString getResource(const char*, const OUString&, + const OUString&); + OUString getResource(const char*, const OUString&, const OUString&, - const OUString& ); + const OUString&); } // namespace diff --git a/formula/AllLangMoTarget_for.mk b/formula/AllLangMoTarget_for.mk new file mode 100644 index 000000000000..6d674ac11314 --- /dev/null +++ b/formula/AllLangMoTarget_for.mk @@ -0,0 +1,13 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# 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/. + +$(eval $(call gb_AllLangMoTarget_AllLangMoTarget,for)) + +$(eval $(call gb_AllLangMoTarget_set_polocation,for,formula)) + +# vim: set noet sw=4 ts=4: diff --git a/formula/AllLangResTarget_for.mk b/formula/AllLangResTarget_for.mk deleted file mode 100644 index 8f7821b46815..000000000000 --- a/formula/AllLangResTarget_for.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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/. -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,for)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,for,formula)) - -$(eval $(call gb_AllLangResTarget_add_srs,for,\ - formula/res \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,formula/res)) - -$(eval $(call gb_SrsTarget_set_include,formula/res,\ - $$(INCLUDE) \ - -I$(SRCDIR)/formula/source/core/inc \ -)) - -$(eval $(call gb_SrsTarget_add_files,formula/res,\ - formula/source/core/resource/core_resource.src \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/formula/AllLangResTarget_forui.mk b/formula/AllLangResTarget_forui.mk deleted file mode 100644 index ba4b106b0142..000000000000 --- a/formula/AllLangResTarget_forui.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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/. -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,forui)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,forui,formula)) - -$(eval $(call gb_AllLangResTarget_add_srs,forui,\ - formula/ui \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,formula/ui)) - -$(eval $(call gb_SrsTarget_set_include,formula/ui,\ - $$(INCLUDE) \ - -I$(SRCDIR)/formula/inc \ - -I$(SRCDIR)/formula/source/ui/inc \ -)) - -$(eval $(call gb_SrsTarget_add_files,formula/ui,\ - formula/source/ui/dlg/formdlgs.src \ - formula/source/ui/dlg/parawin.src \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/formula/Library_for.mk b/formula/Library_for.mk index dcac26d4a12b..297a6dc2ca3a 100644 --- a/formula/Library_for.mk +++ b/formula/Library_for.mk @@ -11,6 +11,7 @@ $(eval $(call gb_Library_Library,for)) $(eval $(call gb_Library_set_include,for,\ $$(INCLUDE) \ + -I$(SRCDIR)/formula/inc \ -I$(SRCDIR)/formula/source/core/inc \ )) @@ -47,7 +48,4 @@ $(eval $(call gb_Library_add_exception_objects,for,\ formula/source/core/resource/core_resource \ )) -# Runtime dependency for unit-tests -$(eval $(call gb_Library_use_restarget,for,for)) - # vim: set noet sw=4 ts=4: diff --git a/formula/Module_formula.mk b/formula/Module_formula.mk index 8b39e98aad9f..eac8702bf5ff 100644 --- a/formula/Module_formula.mk +++ b/formula/Module_formula.mk @@ -12,12 +12,11 @@ $(eval $(call gb_Module_Module,formula)) $(eval $(call gb_Module_add_targets,formula,\ Library_for \ Library_forui \ + UIConfig_formula \ )) $(eval $(call gb_Module_add_l10n_targets,formula,\ - AllLangResTarget_for \ - AllLangResTarget_forui \ - UIConfig_formula \ + AllLangMoTarget_for \ )) # screenshots diff --git a/formula/inc/core_resource.hrc b/formula/inc/core_resource.hrc new file mode 100644 index 000000000000..57aa4644e30b --- /dev/null +++ b/formula/inc/core_resource.hrc @@ -0,0 +1,2702 @@ +/* -*- 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_FORMULA_INC_CORE_RESOURCE_HRC +#define INCLUDED_FORMULA_INC_CORE_RESOURCE_HRC + +#include "formula/compiler.hrc" +#include + +#define NC_(Context, String) (Context "\004" u8##String) + +/** These English names are used to store/load ODFF as of ODF v1.2. */ +// NAMES CAN ONLY BE CHANGED WHEN PROVIDING BACKWARD AND FORWARD COMPATIBILITY +// such that at least two releases can already read the new name to be +// introduced by a later release. +// If there is a reason for another name for some function then add an +// *additional* name to be recognized to sc/source/core/tool/compiler.cxx +// ScCompiler::IsOpCode() in the if (mxSymbols->isODFF()) block. +const std::pair RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF[] = +{ + { "IF" , SC_OPCODE_IF }, + { "IFERROR" , SC_OPCODE_IF_ERROR }, + { "IFNA" , SC_OPCODE_IF_NA }, + { "CHOOSE" , SC_OPCODE_CHOOSE }, + { "(" , SC_OPCODE_OPEN }, + { ")" , SC_OPCODE_CLOSE }, + // SC_OPCODE_TABLE_REF_... not supported in ODFF + { "{" , SC_OPCODE_ARRAY_OPEN }, + { "}" , SC_OPCODE_ARRAY_CLOSE }, + { "|" , SC_OPCODE_ARRAY_ROW_SEP }, + { ";" , SC_OPCODE_ARRAY_COL_SEP }, + { ";" , SC_OPCODE_SEP }, + { "%" , SC_OPCODE_PERCENT_SIGN }, + { "+" , SC_OPCODE_ADD }, + { "-" , SC_OPCODE_SUB }, + { "*" , SC_OPCODE_MUL }, + { "/" , SC_OPCODE_DIV }, + { "&" , SC_OPCODE_AMPERSAND }, + { "^" , SC_OPCODE_POW }, + { "=" , SC_OPCODE_EQUAL }, + { "<>" , SC_OPCODE_NOT_EQUAL }, + { "<" , SC_OPCODE_LESS }, + { ">" , SC_OPCODE_GREATER }, + { "<=" , SC_OPCODE_LESS_EQUAL }, + { ">=" , SC_OPCODE_GREATER_EQUAL }, + { "AND" , SC_OPCODE_AND }, + { "OR" , SC_OPCODE_OR }, + { "XOR" , SC_OPCODE_XOR }, + { "!" , SC_OPCODE_INTERSECT }, + { "~" , SC_OPCODE_UNION }, + { ":" , SC_OPCODE_RANGE }, + { "NOT" , SC_OPCODE_NOT }, + { "NEG" , SC_OPCODE_NEG }, + { "-" , SC_OPCODE_NEG_SUB }, + { "PI" , SC_OPCODE_PI }, + { "RAND" , SC_OPCODE_RANDOM }, + { "TRUE" , SC_OPCODE_TRUE }, + { "FALSE" , SC_OPCODE_FALSE }, + { "TODAY" , SC_OPCODE_GET_ACT_DATE }, + { "NOW" , SC_OPCODE_GET_ACT_TIME }, + { "NA" , SC_OPCODE_NO_VALUE }, + { "ORG.OPENOFFICE.CURRENT" , SC_OPCODE_CURRENT }, + { "DEGREES" , SC_OPCODE_DEG }, + { "RADIANS" , SC_OPCODE_RAD }, + { "SIN" , SC_OPCODE_SIN }, + { "COS" , SC_OPCODE_COS }, + { "TAN" , SC_OPCODE_TAN }, + { "COT" , SC_OPCODE_COT }, + { "ASIN" , SC_OPCODE_ARC_SIN }, + { "ACOS" , SC_OPCODE_ARC_COS }, + { "ATAN" , SC_OPCODE_ARC_TAN }, + { "ACOT" , SC_OPCODE_ARC_COT }, + { "SINH" , SC_OPCODE_SIN_HYP }, + { "COSH" , SC_OPCODE_COS_HYP }, + { "TANH" , SC_OPCODE_TAN_HYP }, + { "COTH" , SC_OPCODE_COT_HYP }, + { "ASINH" , SC_OPCODE_ARC_SIN_HYP }, + { "ACOSH" , SC_OPCODE_ARC_COS_HYP }, + { "ATANH" , SC_OPCODE_ARC_TAN_HYP }, + { "ACOTH" , SC_OPCODE_ARC_COT_HYP }, + { "CSC" , SC_OPCODE_COSECANT }, + { "SEC" , SC_OPCODE_SECANT }, + { "CSCH" , SC_OPCODE_COSECANT_HYP }, + { "SECH" , SC_OPCODE_SECANT_HYP }, + { "EXP" , SC_OPCODE_EXP }, + { "LN" , SC_OPCODE_LN }, + { "SQRT" , SC_OPCODE_SQRT }, + { "FACT" , SC_OPCODE_FACT }, + { "YEAR" , SC_OPCODE_GET_YEAR }, + { "MONTH" , SC_OPCODE_GET_MONTH }, + { "DAY" , SC_OPCODE_GET_DAY }, + { "HOUR" , SC_OPCODE_GET_HOUR }, + { "MINUTE" , SC_OPCODE_GET_MIN }, + { "SECOND" , SC_OPCODE_GET_SEC }, + { "SIGN" , SC_OPCODE_PLUS_MINUS }, + { "ABS" , SC_OPCODE_ABS }, + { "INT" , SC_OPCODE_INT }, + { "PHI" , SC_OPCODE_PHI }, + { "GAUSS" , SC_OPCODE_GAUSS }, + { "ISBLANK" , SC_OPCODE_IS_EMPTY }, + { "ISTEXT" , SC_OPCODE_IS_STRING }, + { "ISNONTEXT" , SC_OPCODE_IS_NON_STRING }, + { "ISLOGICAL" , SC_OPCODE_IS_LOGICAL }, + { "TYPE" , SC_OPCODE_TYPE }, + { "CELL" , SC_OPCODE_CELL }, + { "ISREF" , SC_OPCODE_IS_REF }, + { "ISNUMBER" , SC_OPCODE_IS_VALUE }, + { "ISFORMULA" , SC_OPCODE_IS_FORMULA }, + { "ISNA" , SC_OPCODE_IS_NV }, + { "ISERR" , SC_OPCODE_IS_ERR }, + { "ISERROR" , SC_OPCODE_IS_ERROR }, + { "ISEVEN" , SC_OPCODE_IS_EVEN }, + { "ISODD" , SC_OPCODE_IS_ODD }, + { "N" , SC_OPCODE_N }, + { "DATEVALUE" , SC_OPCODE_GET_DATE_VALUE }, + { "TIMEVALUE" , SC_OPCODE_GET_TIME_VALUE }, + { "CODE" , SC_OPCODE_CODE }, + { "TRIM" , SC_OPCODE_TRIM }, + { "UPPER" , SC_OPCODE_UPPER }, + { "PROPER" , SC_OPCODE_PROPER }, + { "LOWER" , SC_OPCODE_LOWER }, + { "LEN" , SC_OPCODE_LEN }, + { "T" , SC_OPCODE_T }, + { "VALUE" , SC_OPCODE_VALUE }, + { "CLEAN" , SC_OPCODE_CLEAN }, + { "CHAR" , SC_OPCODE_CHAR }, + { "JIS" , SC_OPCODE_JIS }, + { "ASC" , SC_OPCODE_ASC }, + { "UNICODE" , SC_OPCODE_UNICODE }, + { "UNICHAR" , SC_OPCODE_UNICHAR }, + { "LOG10" , SC_OPCODE_LOG10 }, + { "EVEN" , SC_OPCODE_EVEN }, + { "ODD" , SC_OPCODE_ODD }, + { "LEGACY.NORMSDIST" , SC_OPCODE_STD_NORM_DIST }, + { "COM.MICROSOFT.NORM.S.DIST" , SC_OPCODE_STD_NORM_DIST_MS }, + { "FISHER" , SC_OPCODE_FISHER }, + { "FISHERINV" , SC_OPCODE_FISHER_INV }, + { "LEGACY.NORMSINV" , SC_OPCODE_S_NORM_INV }, + { "COM.MICROSOFT.NORM.S.INV" , SC_OPCODE_S_NORM_INV_MS }, + { "GAMMALN" , SC_OPCODE_GAMMA_LN }, + { "COM.MICROSOFT.GAMMALN.PRECISE" , SC_OPCODE_GAMMA_LN_MS }, + { "ORG.OPENOFFICE.ERRORTYPE" , SC_OPCODE_ERROR_TYPE }, + { "ERROR.TYPE" , SC_OPCODE_ERROR_TYPE_ODF }, + { "FORMULA" , SC_OPCODE_FORMULA }, + { "ATAN2" , SC_OPCODE_ARC_TAN_2 }, + { "COM.MICROSOFT.CEILING.MATH" , SC_OPCODE_CEIL_MATH }, + { "CEILING" , SC_OPCODE_CEIL }, + { "COM.MICROSOFT.CEILING" , SC_OPCODE_CEIL_MS }, + { "COM.MICROSOFT.CEILING.PRECISE" , SC_OPCODE_CEIL_PRECISE }, + { "COM.MICROSOFT.ISO.CEILING" , SC_OPCODE_CEIL_ISO }, + { "FLOOR" , SC_OPCODE_FLOOR }, + { "COM.MICROSOFT.FLOOR" , SC_OPCODE_FLOOR_MS }, + { "COM.MICROSOFT.FLOOR.MATH" , SC_OPCODE_FLOOR_MATH }, + { "COM.MICROSOFT.FLOOR.PRECISE" , SC_OPCODE_FLOOR_PRECISE }, + { "ROUND" , SC_OPCODE_ROUND }, + { "ROUNDUP" , SC_OPCODE_ROUND_UP }, + { "ROUNDDOWN" , SC_OPCODE_ROUND_DOWN }, + { "TRUNC" , SC_OPCODE_TRUNC }, + { "LOG" , SC_OPCODE_LOG }, + { "POWER" , SC_OPCODE_POWER }, + { "GCD" , SC_OPCODE_GCD }, + { "LCM" , SC_OPCODE_LCM }, + { "MOD" , SC_OPCODE_MOD }, + { "SUMPRODUCT" , SC_OPCODE_SUM_PRODUCT }, + { "SUMSQ" , SC_OPCODE_SUM_SQ }, + { "SUMX2MY2" , SC_OPCODE_SUM_X2MY2 }, + { "SUMX2PY2" , SC_OPCODE_SUM_X2DY2 }, + { "SUMXMY2" , SC_OPCODE_SUM_XMY2 }, + { "DATE" , SC_OPCODE_GET_DATE }, + { "TIME" , SC_OPCODE_GET_TIME }, + { "DAYS" , SC_OPCODE_GET_DIFF_DATE }, + { "DAYS360" , SC_OPCODE_GET_DIFF_DATE_360 }, + { "DATEDIF" , SC_OPCODE_GET_DATEDIF }, + { "MIN" , SC_OPCODE_MIN }, + { "MINA" , SC_OPCODE_MIN_A }, + { "MAX" , SC_OPCODE_MAX }, + { "MAXA" , SC_OPCODE_MAX_A }, + { "SUM" , SC_OPCODE_SUM }, + { "PRODUCT" , SC_OPCODE_PRODUCT }, + { "AVERAGE" , SC_OPCODE_AVERAGE }, + { "AVERAGEA" , SC_OPCODE_AVERAGE_A }, + { "COUNT" , SC_OPCODE_COUNT }, + { "COUNTA" , SC_OPCODE_COUNT_2 }, + { "NPV" , SC_OPCODE_NPV }, + { "IRR" , SC_OPCODE_IRR }, + { "MIRR" , SC_OPCODE_MIRR }, + { "ISPMT" , SC_OPCODE_ISPMT }, + { "VAR" , SC_OPCODE_VAR }, + { "VARA" , SC_OPCODE_VAR_A }, + { "VARP" , SC_OPCODE_VAR_P }, + { "VARPA" , SC_OPCODE_VAR_P_A }, + { "COM.MICROSOFT.VAR.P" , SC_OPCODE_VAR_P_MS }, + { "COM.MICROSOFT.VAR.S" , SC_OPCODE_VAR_S }, + { "STDEV" , SC_OPCODE_ST_DEV }, + { "STDEVA" , SC_OPCODE_ST_DEV_A }, + { "STDEVP" , SC_OPCODE_ST_DEV_P }, + { "STDEVPA" , SC_OPCODE_ST_DEV_P_A }, + { "COM.MICROSOFT.STDEV.P" , SC_OPCODE_ST_DEV_P_MS }, + { "COM.MICROSOFT.STDEV.S" , SC_OPCODE_ST_DEV_S }, + { "BINOM.DIST.RANGE" , SC_OPCODE_B }, + { "NORMDIST" , SC_OPCODE_NORM_DIST }, + { "COM.MICROSOFT.NORM.DIST" , SC_OPCODE_NORM_DIST_MS }, + { "EXPONDIST" , SC_OPCODE_EXP_DIST }, + { "COM.MICROSOFT.EXPON.DIST" , SC_OPCODE_EXP_DIST_MS }, + { "BINOMDIST" , SC_OPCODE_BINOM_DIST }, + { "COM.MICROSOFT.BINOM.DIST" , SC_OPCODE_BINOM_DIST_MS }, + { "POISSON" , SC_OPCODE_POISSON_DIST }, + { "COM.MICROSOFT.POISSON.DIST" , SC_OPCODE_POISSON_DIST_MS }, + { "COMBIN" , SC_OPCODE_COMBIN }, + { "COMBINA" , SC_OPCODE_COMBIN_A }, + { "PERMUT" , SC_OPCODE_PERMUT }, + { "PERMUTATIONA" , SC_OPCODE_PERMUTATION_A }, + { "PV" , SC_OPCODE_PV }, + { "SYD" , SC_OPCODE_SYD }, + { "DDB" , SC_OPCODE_DDB }, + { "DB" , SC_OPCODE_DB }, + { "VDB" , SC_OPCODE_VBD }, + { "PDURATION" , SC_OPCODE_PDURATION }, + { "SLN" , SC_OPCODE_SLN }, + { "PMT" , SC_OPCODE_PMT }, + { "COLUMNS" , SC_OPCODE_COLUMNS }, + { "ROWS" , SC_OPCODE_ROWS }, + { "SHEETS" , SC_OPCODE_SHEETS }, + { "COLUMN" , SC_OPCODE_COLUMN }, + { "ROW" , SC_OPCODE_ROW }, + { "SHEET" , SC_OPCODE_SHEET }, + { "RRI" , SC_OPCODE_RRI }, + { "FV" , SC_OPCODE_FV }, + { "NPER" , SC_OPCODE_NPER }, + { "RATE" , SC_OPCODE_RATE }, + { "IPMT" , SC_OPCODE_IPMT }, + { "PPMT" , SC_OPCODE_PPMT }, + { "CUMIPMT" , SC_OPCODE_CUM_IPMT }, + { "CUMPRINC" , SC_OPCODE_CUM_PRINC }, + { "EFFECT" , SC_OPCODE_EFFECT }, + { "NOMINAL" , SC_OPCODE_NOMINAL }, + { "SUBTOTAL" , SC_OPCODE_SUB_TOTAL }, + { "DSUM" , SC_OPCODE_DB_SUM }, + { "DCOUNT" , SC_OPCODE_DB_COUNT }, + { "DCOUNTA" , SC_OPCODE_DB_COUNT_2 }, + { "DAVERAGE" , SC_OPCODE_DB_AVERAGE }, + { "DGET" , SC_OPCODE_DB_GET }, + { "DMAX" , SC_OPCODE_DB_MAX }, + { "DMIN" , SC_OPCODE_DB_MIN }, + { "DPRODUCT" , SC_OPCODE_DB_PRODUCT }, + { "DSTDEV" , SC_OPCODE_DB_STD_DEV }, + { "DSTDEVP" , SC_OPCODE_DB_STD_DEV_P }, + { "DVAR" , SC_OPCODE_DB_VAR }, + { "DVARP" , SC_OPCODE_DB_VAR_P }, + { "INDIRECT" , SC_OPCODE_INDIRECT }, + { "ADDRESS" , SC_OPCODE_ADDRESS }, + { "MATCH" , SC_OPCODE_MATCH }, + { "COUNTBLANK" , SC_OPCODE_COUNT_EMPTY_CELLS }, + { "COUNTIF" , SC_OPCODE_COUNT_IF }, + { "SUMIF" , SC_OPCODE_SUM_IF }, + { "AVERAGEIF" , SC_OPCODE_AVERAGE_IF }, + { "SUMIFS" , SC_OPCODE_SUM_IFS }, + { "AVERAGEIFS" , SC_OPCODE_AVERAGE_IFS }, + { "COUNTIFS" , SC_OPCODE_COUNT_IFS }, + { "LOOKUP" , SC_OPCODE_LOOKUP }, + { "VLOOKUP" , SC_OPCODE_V_LOOKUP }, + { "HLOOKUP" , SC_OPCODE_H_LOOKUP }, + { "ORG.OPENOFFICE.MULTIRANGE" , SC_OPCODE_MULTI_AREA }, // legacy for range list (union) + { "OFFSET" , SC_OPCODE_OFFSET }, + { "INDEX" , SC_OPCODE_INDEX }, + { "AREAS" , SC_OPCODE_AREAS }, + { "DOLLAR" , SC_OPCODE_CURRENCY }, + { "REPLACE" , SC_OPCODE_REPLACE }, + { "FIXED" , SC_OPCODE_FIXED }, + { "FIND" , SC_OPCODE_FIND }, + { "EXACT" , SC_OPCODE_EXACT }, + { "LEFT" , SC_OPCODE_LEFT }, + { "RIGHT" , SC_OPCODE_RIGHT }, + { "SEARCH" , SC_OPCODE_SEARCH }, + { "MID" , SC_OPCODE_MID }, + { "LENB" , SC_OPCODE_LENB }, + { "RIGHTB" , SC_OPCODE_RIGHTB }, + { "LEFTB" , SC_OPCODE_LEFTB }, + { "REPLACEB" , SC_OPCODE_REPLACEB }, + { "MIDB" , SC_OPCODE_MIDB }, + { "TEXT" , SC_OPCODE_TEXT }, + { "SUBSTITUTE" , SC_OPCODE_SUBSTITUTE }, + { "REPT" , SC_OPCODE_REPT }, + { "CONCATENATE" , SC_OPCODE_CONCAT }, + { "COM.MICROSOFT.CONCAT" , SC_OPCODE_CONCAT_MS }, + { "COM.MICROSOFT.TEXTJOIN" , SC_OPCODE_TEXTJOIN_MS }, + { "COM.MICROSOFT.IFS" , SC_OPCODE_IFS_MS }, + { "COM.MICROSOFT.SWITCH" , SC_OPCODE_SWITCH_MS }, + { "COM.MICROSOFT.MINIFS" , SC_OPCODE_MINIFS_MS }, + { "COM.MICROSOFT.MAXIFS" , SC_OPCODE_MAXIFS_MS }, + { "MVALUE" , SC_OPCODE_MAT_VALUE }, + { "MDETERM" , SC_OPCODE_MAT_DET }, + { "MINVERSE" , SC_OPCODE_MAT_INV }, + { "MMULT" , SC_OPCODE_MAT_MULT }, + { "TRANSPOSE" , SC_OPCODE_MAT_TRANS }, + { "MUNIT" , SC_OPCODE_MATRIX_UNIT }, + { "ORG.OPENOFFICE.GOALSEEK" , SC_OPCODE_BACK_SOLVER }, + { "HYPGEOMDIST" , SC_OPCODE_HYP_GEOM_DIST }, + { "COM.MICROSOFT.HYPGEOM.DIST" , SC_OPCODE_HYP_GEOM_DIST_MS }, + { "LOGNORMDIST" , SC_OPCODE_LOG_NORM_DIST }, + { "COM.MICROSOFT.LOGNORM.DIST" , SC_OPCODE_LOG_NORM_DIST_MS }, + { "LEGACY.TDIST" , SC_OPCODE_T_DIST }, + { "COM.MICROSOFT.T.DIST.2T" , SC_OPCODE_T_DIST_2T }, + { "COM.MICROSOFT.T.DIST" , SC_OPCODE_T_DIST_MS }, + { "COM.MICROSOFT.T.DIST.RT" , SC_OPCODE_T_DIST_RT }, + { "LEGACY.FDIST" , SC_OPCODE_F_DIST }, + { "FDIST" , SC_OPCODE_F_DIST_LT }, + { "COM.MICROSOFT.F.DIST.RT" , SC_OPCODE_F_DIST_RT }, + { "LEGACY.CHIDIST" , SC_OPCODE_CHI_DIST }, + { "COM.MICROSOFT.CHISQ.DIST.RT" , SC_OPCODE_CHI_DIST_MS }, + { "WEIBULL" , SC_OPCODE_WEIBULL }, + { "COM.MICROSOFT.WEIBULL.DIST" , SC_OPCODE_WEIBULL_MS }, + { "NEGBINOMDIST" , SC_OPCODE_NEG_BINOM_VERT }, + { "COM.MICROSOFT.NEGBINOM.DIST" , SC_OPCODE_NEG_BINOM_DIST_MS }, + { "CRITBINOM" , SC_OPCODE_CRIT_BINOM }, + { "COM.MICROSOFT.BINOM.INV" , SC_OPCODE_BINOM_INV }, + { "KURT" , SC_OPCODE_KURT }, + { "HARMEAN" , SC_OPCODE_HAR_MEAN }, + { "GEOMEAN" , SC_OPCODE_GEO_MEAN }, + { "STANDARDIZE" , SC_OPCODE_STANDARD }, + { "AVEDEV" , SC_OPCODE_AVE_DEV }, + { "SKEW" , SC_OPCODE_SKEW }, + { "SKEWP" , SC_OPCODE_SKEWP }, + { "DEVSQ" , SC_OPCODE_DEV_SQ }, + { "MEDIAN" , SC_OPCODE_MEDIAN }, + { "MODE" , SC_OPCODE_MODAL_VALUE }, + { "COM.MICROSOFT.MODE.SNGL" , SC_OPCODE_MODAL_VALUE_MS }, + { "COM.MICROSOFT.MODE.MULT" , SC_OPCODE_MODAL_VALUE_MULTI }, + { "ZTEST" , SC_OPCODE_Z_TEST }, + { "COM.MICROSOFT.Z.TEST" , SC_OPCODE_Z_TEST_MS }, + { "COM.MICROSOFT.AGGREGATE" , SC_OPCODE_AGGREGATE }, + { "TTEST" , SC_OPCODE_T_TEST }, + { "COM.MICROSOFT.T.TEST" , SC_OPCODE_T_TEST_MS }, + { "RANK" , SC_OPCODE_RANK }, + { "PERCENTILE" , SC_OPCODE_PERCENTILE }, + { "PERCENTRANK" , SC_OPCODE_PERCENT_RANK }, + { "COM.MICROSOFT.PERCENTILE.INC" , SC_OPCODE_PERCENTILE_INC }, + { "COM.MICROSOFT.PERCENTRANK.INC" , SC_OPCODE_PERCENT_RANK_INC }, + { "COM.MICROSOFT.QUARTILE.INC" , SC_OPCODE_QUARTILE_INC }, + { "COM.MICROSOFT.RANK.EQ" , SC_OPCODE_RANK_EQ }, + { "COM.MICROSOFT.PERCENTILE.EXC" , SC_OPCODE_PERCENTILE_EXC }, + { "COM.MICROSOFT.PERCENTRANK.EXC" , SC_OPCODE_PERCENT_RANK_EXC }, + { "COM.MICROSOFT.QUARTILE.EXC" , SC_OPCODE_QUARTILE_EXC }, + { "COM.MICROSOFT.RANK.AVG" , SC_OPCODE_RANK_AVG }, + { "LARGE" , SC_OPCODE_LARGE }, + { "SMALL" , SC_OPCODE_SMALL }, + { "FREQUENCY" , SC_OPCODE_FREQUENCY }, + { "QUARTILE" , SC_OPCODE_QUARTILE }, + { "NORMINV" , SC_OPCODE_NORM_INV }, + { "COM.MICROSOFT.NORM.INV" , SC_OPCODE_NORM_INV_MS }, + { "CONFIDENCE" , SC_OPCODE_CONFIDENCE }, + { "COM.MICROSOFT.CONFIDENCE.NORM" , SC_OPCODE_CONFIDENCE_N }, + { "COM.MICROSOFT.CONFIDENCE.T" , SC_OPCODE_CONFIDENCE_T }, + { "FTEST" , SC_OPCODE_F_TEST }, + { "COM.MICROSOFT.F.TEST" , SC_OPCODE_F_TEST_MS }, + { "TRIMMEAN" , SC_OPCODE_TRIM_MEAN }, + { "PROB" , SC_OPCODE_PROB }, + { "CORREL" , SC_OPCODE_CORREL }, + { "COVAR" , SC_OPCODE_COVAR }, + { "COM.MICROSOFT.COVARIANCE.P" , SC_OPCODE_COVARIANCE_P }, + { "COM.MICROSOFT.COVARIANCE.S" , SC_OPCODE_COVARIANCE_S }, + { "PEARSON" , SC_OPCODE_PEARSON }, + { "RSQ" , SC_OPCODE_RSQ }, + { "STEYX" , SC_OPCODE_STEYX }, + { "SLOPE" , SC_OPCODE_SLOPE }, + { "INTERCEPT" , SC_OPCODE_INTERCEPT }, + { "TREND" , SC_OPCODE_TREND }, + { "GROWTH" , SC_OPCODE_GROWTH }, + { "LINEST" , SC_OPCODE_LINEST }, + { "LOGEST" , SC_OPCODE_LOGEST }, + { "FORECAST" , SC_OPCODE_FORECAST }, + { "COM.MICROSOFT.FORECAST.ETS" , SC_OPCODE_FORECAST_ETS_ADD }, + { "COM.MICROSOFT.FORECAST.ETS.SEASONALITY" , SC_OPCODE_FORECAST_ETS_SEA }, + { "ORG.LIBREOFFICE.FORECAST.ETS.MULT" , SC_OPCODE_FORECAST_ETS_MUL }, + { "COM.MICROSOFT.FORECAST.ETS.CONFINT" , SC_OPCODE_FORECAST_ETS_PIA }, + { "ORG.LIBREOFFICE.FORECAST.ETS.PI.MULT" , SC_OPCODE_FORECAST_ETS_PIM }, + { "COM.MICROSOFT.FORECAST.ETS.STAT" , SC_OPCODE_FORECAST_ETS_STA }, + { "ORG.LIBREOFFICE.FORECAST.ETS.STAT.MULT" , SC_OPCODE_FORECAST_ETS_STM }, + { "COM.MICROSOFT.FORECAST.LINEAR" , SC_OPCODE_FORECAST_LIN }, + { "LEGACY.CHIINV" , SC_OPCODE_CHI_INV }, + { "COM.MICROSOFT.CHISQ.INV.RT" , SC_OPCODE_CHI_INV_MS }, + { "GAMMADIST" , SC_OPCODE_GAMMA_DIST }, + { "COM.MICROSOFT.GAMMA.DIST" , SC_OPCODE_GAMMA_DIST_MS }, + { "GAMMAINV" , SC_OPCODE_GAMMA_INV }, + { "COM.MICROSOFT.GAMMA.INV" , SC_OPCODE_GAMMA_INV_MS }, + { "TINV" , SC_OPCODE_T_INV }, + { "COM.MICROSOFT.T.INV.2T" , SC_OPCODE_T_INV_2T }, + { "COM.MICROSOFT.T.INV" , SC_OPCODE_T_INV_MS }, + { "LEGACY.FINV" , SC_OPCODE_F_INV }, + { "FINV" , SC_OPCODE_F_INV_LT }, + { "COM.MICROSOFT.F.INV.RT" , SC_OPCODE_F_INV_RT }, + { "LEGACY.CHITEST" , SC_OPCODE_CHI_TEST }, + { "COM.MICROSOFT.CHISQ.TEST" , SC_OPCODE_CHI_TEST_MS }, + { "LOGINV" , SC_OPCODE_LOG_INV }, + { "COM.MICROSOFT.LOGNORM.INV" , SC_OPCODE_LOG_INV_MS }, + { "MULTIPLE.OPERATIONS" , SC_OPCODE_TABLE_OP }, + { "BETADIST" , SC_OPCODE_BETA_DIST }, + { "BETAINV" , SC_OPCODE_BETA_INV }, + { "COM.MICROSOFT.BETA.DIST" , SC_OPCODE_BETA_DIST_MS }, + { "COM.MICROSOFT.BETA.INV" , SC_OPCODE_BETA_INV_MS }, + { "WEEKNUM" , SC_OPCODE_WEEK }, + { "ISOWEEKNUM" , SC_OPCODE_ISOWEEKNUM }, + { "ORG.LIBREOFFICE.WEEKNUM_OOO" , SC_OPCODE_WEEKNUM_OOO }, + { "ORG.OPENOFFICE.EASTERSUNDAY" , SC_OPCODE_EASTERSUNDAY }, + { "WEEKDAY" , SC_OPCODE_GET_DAY_OF_WEEK }, + { "NETWORKDAYS" , SC_OPCODE_NETWORKDAYS }, + { "COM.MICROSOFT.NETWORKDAYS.INTL" , SC_OPCODE_NETWORKDAYS_MS }, + { "COM.MICROSOFT.WORKDAY.INTL" , SC_OPCODE_WORKDAY_MS }, + { "#NAME!" , SC_OPCODE_NO_NAME }, + { "ORG.OPENOFFICE.STYLE" , SC_OPCODE_STYLE }, + { "DDE" , SC_OPCODE_DDE }, + { "BASE" , SC_OPCODE_BASE }, + { "DECIMAL" , SC_OPCODE_DECIMAL }, + { "ORG.OPENOFFICE.CONVERT" , SC_OPCODE_CONVERT_OOO }, + { "ROMAN" , SC_OPCODE_ROMAN }, + { "ARABIC" , SC_OPCODE_ARABIC }, + { "HYPERLINK" , SC_OPCODE_HYPERLINK }, + { "INFO" , SC_OPCODE_INFO }, + { "COM.MICROSOFT.BAHTTEXT" , SC_OPCODE_BAHTTEXT }, + { "GETPIVOTDATA" , SC_OPCODE_GET_PIVOT_DATA }, + { "EUROCONVERT" , SC_OPCODE_EUROCONVERT }, + { "NUMBERVALUE" , SC_OPCODE_NUMBERVALUE }, + { "GAMMA" , SC_OPCODE_GAMMA }, + { "CHISQDIST" , SC_OPCODE_CHISQ_DIST }, + { "COM.MICROSOFT.CHISQ.DIST" , SC_OPCODE_CHISQ_DIST_MS }, + { "CHISQINV" , SC_OPCODE_CHISQ_INV }, + { "COM.MICROSOFT.CHISQ.INV" , SC_OPCODE_CHISQ_INV_MS }, + { "BITAND" , SC_OPCODE_BITAND }, + { "BITOR" , SC_OPCODE_BITOR }, + { "BITXOR" , SC_OPCODE_BITXOR }, + { "BITRSHIFT" , SC_OPCODE_BITRSHIFT }, + { "BITLSHIFT" , SC_OPCODE_BITLSHIFT }, + /* BEGIN defined ERROR.TYPE() values. */ + { "#NULL!" , SC_OPCODE_ERROR_NULL }, + { "#DIV/0!" , SC_OPCODE_ERROR_DIVZERO }, + { "#VALUE!" , SC_OPCODE_ERROR_VALUE }, + { "#REF!" , SC_OPCODE_ERROR_REF }, + { "#NAME?" , SC_OPCODE_ERROR_NAME }, + { "#NUM!" , SC_OPCODE_ERROR_NUM }, + { "#N/A" , SC_OPCODE_ERROR_NA }, + /* END defined ERROR.TYPE() values. */ + { "COM.MICROSOFT.FILTERXML" , SC_OPCODE_FILTERXML }, + { "COM.MICROSOFT.WEBSERVICE" , SC_OPCODE_WEBSERVICE }, + { "ORG.LIBREOFFICE.COLOR" , SC_OPCODE_COLOR }, + { "COM.MICROSOFT.ERF.PRECISE" , SC_OPCODE_ERF_MS }, + { "COM.MICROSOFT.ERFC.PRECISE" , SC_OPCODE_ERFC_MS }, + { "COM.MICROSOFT.ENCODEURL" , SC_OPCODE_ENCODEURL }, + { "ORG.LIBREOFFICE.RAWSUBTRACT" , SC_OPCODE_RAWSUBTRACT }, + { "ORG.LIBREOFFICE.ROUNDSIG" , SC_OPCODE_ROUNDSIG }, + { nullptr, -1 } +}; + +/** These function names are used in the OOXML XLSX import/export. */ +const std::pair RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML[] = +{ + { "IF" , SC_OPCODE_IF }, + { "IFERROR" , SC_OPCODE_IF_ERROR }, + { "_xlfn.IFNA" , SC_OPCODE_IF_NA }, + { "CHOOSE" , SC_OPCODE_CHOOSE }, + { "(" , SC_OPCODE_OPEN }, + { ")" , SC_OPCODE_CLOSE }, + { "[" , SC_OPCODE_TABLE_REF_OPEN }, + { "]" , SC_OPCODE_TABLE_REF_CLOSE }, + { "#All" , SC_OPCODE_TABLE_REF_ITEM_ALL }, + { "#Headers" , SC_OPCODE_TABLE_REF_ITEM_HEADERS }, + { "#Data" , SC_OPCODE_TABLE_REF_ITEM_DATA }, + { "#Totals" , SC_OPCODE_TABLE_REF_ITEM_TOTALS }, + { "#This Row" , SC_OPCODE_TABLE_REF_ITEM_THIS_ROW }, + { "{" , SC_OPCODE_ARRAY_OPEN }, + { "}" , SC_OPCODE_ARRAY_CLOSE }, + { ";" , SC_OPCODE_ARRAY_ROW_SEP }, + { "," , SC_OPCODE_ARRAY_COL_SEP }, + { "," , SC_OPCODE_SEP }, + { "%" , SC_OPCODE_PERCENT_SIGN }, + { "+" , SC_OPCODE_ADD }, + { "-" , SC_OPCODE_SUB }, + { "*" , SC_OPCODE_MUL }, + { "/" , SC_OPCODE_DIV }, + { "&" , SC_OPCODE_AMPERSAND }, + { "^" , SC_OPCODE_POW }, + { "=" , SC_OPCODE_EQUAL }, + { "<>" , SC_OPCODE_NOT_EQUAL }, + { "<" , SC_OPCODE_LESS }, + { ">" , SC_OPCODE_GREATER }, + { "<=" , SC_OPCODE_LESS_EQUAL }, + { ">=" , SC_OPCODE_GREATER_EQUAL }, + { "AND" , SC_OPCODE_AND }, + { "OR" , SC_OPCODE_OR }, + { "_xlfn.XOR" , SC_OPCODE_XOR }, + { " " , SC_OPCODE_INTERSECT }, + { "~" , SC_OPCODE_UNION }, + { ":" , SC_OPCODE_RANGE }, + { "NOT" , SC_OPCODE_NOT }, + { "NEG" , SC_OPCODE_NEG }, + { "-" , SC_OPCODE_NEG_SUB }, + { "PI" , SC_OPCODE_PI }, + { "RAND" , SC_OPCODE_RANDOM }, + { "TRUE" , SC_OPCODE_TRUE }, + { "FALSE" , SC_OPCODE_FALSE }, + { "TODAY" , SC_OPCODE_GET_ACT_DATE }, + { "NOW" , SC_OPCODE_GET_ACT_TIME }, + { "NA" , SC_OPCODE_NO_VALUE }, + { "_xlfn.ORG.OPENOFFICE.CURRENT" , SC_OPCODE_CURRENT }, + { "DEGREES" , SC_OPCODE_DEG }, + { "RADIANS" , SC_OPCODE_RAD }, + { "SIN" , SC_OPCODE_SIN }, + { "COS" , SC_OPCODE_COS }, + { "TAN" , SC_OPCODE_TAN }, + { "_xlfn.COT" , SC_OPCODE_COT }, + { "ASIN" , SC_OPCODE_ARC_SIN }, + { "ACOS" , SC_OPCODE_ARC_COS }, + { "ATAN" , SC_OPCODE_ARC_TAN }, + { "_xlfn.ACOT" , SC_OPCODE_ARC_COT }, + { "SINH" , SC_OPCODE_SIN_HYP }, + { "COSH" , SC_OPCODE_COS_HYP }, + { "TANH" , SC_OPCODE_TAN_HYP }, + { "_xlfn.COTH" , SC_OPCODE_COT_HYP }, + { "ASINH" , SC_OPCODE_ARC_SIN_HYP }, + { "ACOSH" , SC_OPCODE_ARC_COS_HYP }, + { "ATANH" , SC_OPCODE_ARC_TAN_HYP }, + { "_xlfn.ACOTH" , SC_OPCODE_ARC_COT_HYP }, + { "_xlfn.CSC" , SC_OPCODE_COSECANT }, + { "_xlfn.SEC" , SC_OPCODE_SECANT }, + { "_xlfn.CSCH" , SC_OPCODE_COSECANT_HYP }, + { "_xlfn.SECH" , SC_OPCODE_SECANT_HYP }, + { "EXP" , SC_OPCODE_EXP }, + { "LN" , SC_OPCODE_LN }, + { "SQRT" , SC_OPCODE_SQRT }, + { "FACT" , SC_OPCODE_FACT }, + { "YEAR" , SC_OPCODE_GET_YEAR }, + { "MONTH" , SC_OPCODE_GET_MONTH }, + { "DAY" , SC_OPCODE_GET_DAY }, + { "HOUR" , SC_OPCODE_GET_HOUR }, + { "MINUTE" , SC_OPCODE_GET_MIN }, + { "SECOND" , SC_OPCODE_GET_SEC }, + { "SIGN" , SC_OPCODE_PLUS_MINUS }, + { "ABS" , SC_OPCODE_ABS }, + { "INT" , SC_OPCODE_INT }, + { "_xlfn.PHI" , SC_OPCODE_PHI }, + { "_xlfn.GAUSS" , SC_OPCODE_GAUSS }, + { "ISBLANK" , SC_OPCODE_IS_EMPTY }, + { "ISTEXT" , SC_OPCODE_IS_STRING }, + { "ISNONTEXT" , SC_OPCODE_IS_NON_STRING }, + { "ISLOGICAL" , SC_OPCODE_IS_LOGICAL }, + { "TYPE" , SC_OPCODE_TYPE }, + { "CELL" , SC_OPCODE_CELL }, + { "ISREF" , SC_OPCODE_IS_REF }, + { "ISNUMBER" , SC_OPCODE_IS_VALUE }, + { "_xlfn.ISFORMULA" , SC_OPCODE_IS_FORMULA }, + { "ISNA" , SC_OPCODE_IS_NV }, + { "ISERR" , SC_OPCODE_IS_ERR }, + { "ISERROR" , SC_OPCODE_IS_ERROR }, + { "ISEVEN" , SC_OPCODE_IS_EVEN }, + { "ISODD" , SC_OPCODE_IS_ODD }, + { "N" , SC_OPCODE_N }, + { "DATEVALUE" , SC_OPCODE_GET_DATE_VALUE }, + { "TIMEVALUE" , SC_OPCODE_GET_TIME_VALUE }, + { "CODE" , SC_OPCODE_CODE }, + { "TRIM" , SC_OPCODE_TRIM }, + { "UPPER" , SC_OPCODE_UPPER }, + { "PROPER" , SC_OPCODE_PROPER }, + { "LOWER" , SC_OPCODE_LOWER }, + { "LEN" , SC_OPCODE_LEN }, + { "T" , SC_OPCODE_T }, + { "VALUE" , SC_OPCODE_VALUE }, + { "CLEAN" , SC_OPCODE_CLEAN }, + { "CHAR" , SC_OPCODE_CHAR }, + { "JIS" , SC_OPCODE_JIS }, + { "ASC" , SC_OPCODE_ASC }, + { "_xlfn.UNICODE" , SC_OPCODE_UNICODE }, + { "_xlfn.UNICHAR" , SC_OPCODE_UNICHAR }, + { "LOG10" , SC_OPCODE_LOG10 }, + { "EVEN" , SC_OPCODE_EVEN }, + { "ODD" , SC_OPCODE_ODD }, + { "NORMSDIST" , SC_OPCODE_STD_NORM_DIST }, + { "_xlfn.NORM.S.DIST" , SC_OPCODE_STD_NORM_DIST_MS }, + { "FISHER" , SC_OPCODE_FISHER }, + { "FISHERINV" , SC_OPCODE_FISHER_INV }, + { "NORMSINV" , SC_OPCODE_S_NORM_INV }, + { "_xlfn.NORM.S.INV" , SC_OPCODE_S_NORM_INV_MS }, + { "GAMMALN" , SC_OPCODE_GAMMA_LN }, + { "_xlfn.GAMMALN.PRECISE" , SC_OPCODE_GAMMA_LN_MS }, + { "_xlfn.ORG.OPENOFFICE.ERRORTYPE" , SC_OPCODE_ERROR_TYPE }, + { "ERROR.TYPE" , SC_OPCODE_ERROR_TYPE_ODF }, + { "_xlfn.FORMULATEXT" , SC_OPCODE_FORMULA }, + { "ATAN2" , SC_OPCODE_ARC_TAN_2 }, + { "_xlfn.CEILING.MATH" , SC_OPCODE_CEIL_MATH }, + { "_xlfn.CEILING.MATH" , SC_OPCODE_CEIL }, + { "CEILING" , SC_OPCODE_CEIL_MS }, + { "_xlfn.CEILING.PRECISE" , SC_OPCODE_CEIL_PRECISE }, + { "ISO.CEILING" , SC_OPCODE_CEIL_ISO }, + { "FLOOR" , SC_OPCODE_FLOOR_MS }, + { "_xlfn.FLOOR.MATH" , SC_OPCODE_FLOOR_MATH }, + { "_xlfn.FLOOR.MATH" , SC_OPCODE_FLOOR }, + { "_xlfn.FLOOR.PRECISE" , SC_OPCODE_FLOOR_PRECISE }, + { "ROUND" , SC_OPCODE_ROUND }, + { "ROUNDUP" , SC_OPCODE_ROUND_UP }, + { "ROUNDDOWN" , SC_OPCODE_ROUND_DOWN }, + { "TRUNC" , SC_OPCODE_TRUNC }, + { "LOG" , SC_OPCODE_LOG }, + { "POWER" , SC_OPCODE_POWER }, + { "GCD" , SC_OPCODE_GCD }, + { "LCM" , SC_OPCODE_LCM }, + { "MOD" , SC_OPCODE_MOD }, + { "SUMPRODUCT" , SC_OPCODE_SUM_PRODUCT }, + { "SUMSQ" , SC_OPCODE_SUM_SQ }, + { "SUMX2MY2" , SC_OPCODE_SUM_X2MY2 }, + { "SUMX2PY2" , SC_OPCODE_SUM_X2DY2 }, + { "SUMXMY2" , SC_OPCODE_SUM_XMY2 }, + { "DATE" , SC_OPCODE_GET_DATE }, + { "TIME" , SC_OPCODE_GET_TIME }, + { "_xlfn.DAYS" , SC_OPCODE_GET_DIFF_DATE }, + { "DAYS360" , SC_OPCODE_GET_DIFF_DATE_360 }, + { "DATEDIF" , SC_OPCODE_GET_DATEDIF }, + { "MIN" , SC_OPCODE_MIN }, + { "MINA" , SC_OPCODE_MIN_A }, + { "MAX" , SC_OPCODE_MAX }, + { "MAXA" , SC_OPCODE_MAX_A }, + { "SUM" , SC_OPCODE_SUM }, + { "PRODUCT" , SC_OPCODE_PRODUCT }, + { "AVERAGE" , SC_OPCODE_AVERAGE }, + { "AVERAGEA" , SC_OPCODE_AVERAGE_A }, + { "COUNT" , SC_OPCODE_COUNT }, + { "COUNTA" , SC_OPCODE_COUNT_2 }, + { "NPV" , SC_OPCODE_NPV }, + { "IRR" , SC_OPCODE_IRR }, + { "MIRR" , SC_OPCODE_MIRR }, + { "ISPMT" , SC_OPCODE_ISPMT }, + { "VAR" , SC_OPCODE_VAR }, + { "VARA" , SC_OPCODE_VAR_A }, + { "VARP" , SC_OPCODE_VAR_P }, + { "VARPA" , SC_OPCODE_VAR_P_A }, + { "_xlfn.VAR.P" , SC_OPCODE_VAR_P_MS }, + { "_xlfn.VAR.S" , SC_OPCODE_VAR_S }, + { "STDEV" , SC_OPCODE_ST_DEV }, + { "STDEVA" , SC_OPCODE_ST_DEV_A }, + { "STDEVP" , SC_OPCODE_ST_DEV_P }, + { "STDEVPA" , SC_OPCODE_ST_DEV_P_A }, + { "_xlfn.STDEV.P" , SC_OPCODE_ST_DEV_P_MS }, + { "_xlfn.STDEV.S" , SC_OPCODE_ST_DEV_S }, + { "B" , SC_OPCODE_B }, + { "NORMDIST" , SC_OPCODE_NORM_DIST }, + { "_xlfn.NORM.DIST" , SC_OPCODE_NORM_DIST_MS }, + { "EXPONDIST" , SC_OPCODE_EXP_DIST }, + { "_xlfn.EXPON.DIST" , SC_OPCODE_EXP_DIST_MS }, + { "BINOMDIST" , SC_OPCODE_BINOM_DIST }, + { "_xlfn.BINOM.DIST" , SC_OPCODE_BINOM_DIST_MS }, + { "POISSON" , SC_OPCODE_POISSON_DIST }, + { "_xlfn.POISSON.DIST" , SC_OPCODE_POISSON_DIST_MS }, + { "COMBIN" , SC_OPCODE_COMBIN }, + { "_xlfn.COMBINA" , SC_OPCODE_COMBIN_A }, + { "PERMUT" , SC_OPCODE_PERMUT }, + { "_xlfn.PERMUTATIONA" , SC_OPCODE_PERMUTATION_A }, + { "PV" , SC_OPCODE_PV }, + { "SYD" , SC_OPCODE_SYD }, + { "DDB" , SC_OPCODE_DDB }, + { "DB" , SC_OPCODE_DB }, + { "VDB" , SC_OPCODE_VBD }, + { "_xlfn.PDURATION" , SC_OPCODE_PDURATION }, + { "SLN" , SC_OPCODE_SLN }, + { "PMT" , SC_OPCODE_PMT }, + { "COLUMNS" , SC_OPCODE_COLUMNS }, + { "ROWS" , SC_OPCODE_ROWS }, + { "_xlfn.SHEETS" , SC_OPCODE_SHEETS }, + { "COLUMN" , SC_OPCODE_COLUMN }, + { "ROW" , SC_OPCODE_ROW }, + { "_xlfn.SHEET" , SC_OPCODE_SHEET }, + { "_xlfn.RRI" , SC_OPCODE_RRI }, + { "FV" , SC_OPCODE_FV }, + { "NPER" , SC_OPCODE_NPER }, + { "RATE" , SC_OPCODE_RATE }, + { "IPMT" , SC_OPCODE_IPMT }, + { "PPMT" , SC_OPCODE_PPMT }, + { "CUMIPMT" , SC_OPCODE_CUM_IPMT }, + { "CUMPRINC" , SC_OPCODE_CUM_PRINC }, + { "EFFECT" , SC_OPCODE_EFFECT }, + { "NOMINAL" , SC_OPCODE_NOMINAL }, + { "SUBTOTAL" , SC_OPCODE_SUB_TOTAL }, + { "DSUM" , SC_OPCODE_DB_SUM }, + { "DCOUNT" , SC_OPCODE_DB_COUNT }, + { "DCOUNTA" , SC_OPCODE_DB_COUNT_2 }, + { "DAVERAGE" , SC_OPCODE_DB_AVERAGE }, + { "DGET" , SC_OPCODE_DB_GET }, + { "DMAX" , SC_OPCODE_DB_MAX }, + { "DMIN" , SC_OPCODE_DB_MIN }, + { "DPRODUCT" , SC_OPCODE_DB_PRODUCT }, + { "DSTDEV" , SC_OPCODE_DB_STD_DEV }, + { "DSTDEVP" , SC_OPCODE_DB_STD_DEV_P }, + { "DVAR" , SC_OPCODE_DB_VAR }, + { "DVARP" , SC_OPCODE_DB_VAR_P }, + { "INDIRECT" , SC_OPCODE_INDIRECT }, + { "ADDRESS" , SC_OPCODE_ADDRESS }, + { "MATCH" , SC_OPCODE_MATCH }, + { "COUNTBLANK" , SC_OPCODE_COUNT_EMPTY_CELLS }, + { "COUNTIF" , SC_OPCODE_COUNT_IF }, + { "SUMIF" , SC_OPCODE_SUM_IF }, + { "AVERAGEIF" , SC_OPCODE_AVERAGE_IF }, + { "SUMIFS" , SC_OPCODE_SUM_IFS }, + { "AVERAGEIFS" , SC_OPCODE_AVERAGE_IFS }, + { "COUNTIFS" , SC_OPCODE_COUNT_IFS }, + { "LOOKUP" , SC_OPCODE_LOOKUP }, + { "VLOOKUP" , SC_OPCODE_V_LOOKUP }, + { "HLOOKUP" , SC_OPCODE_H_LOOKUP }, + { "_xlfn.ORG.OPENOFFICE.MULTIRANGE" , SC_OPCODE_MULTI_AREA }, // legacy for range list (union) + { "OFFSET" , SC_OPCODE_OFFSET }, + { "INDEX" , SC_OPCODE_INDEX }, + { "AREAS" , SC_OPCODE_AREAS }, + { "DOLLAR" , SC_OPCODE_CURRENCY }, + { "REPLACE" , SC_OPCODE_REPLACE }, + { "FIXED" , SC_OPCODE_FIXED }, + { "FIND" , SC_OPCODE_FIND }, + { "EXACT" , SC_OPCODE_EXACT }, + { "LEFT" , SC_OPCODE_LEFT }, + { "RIGHT" , SC_OPCODE_RIGHT }, + { "SEARCH" , SC_OPCODE_SEARCH }, + { "MID" , SC_OPCODE_MID }, + { "LENB" , SC_OPCODE_LENB }, + { "RIGHTB" , SC_OPCODE_RIGHTB }, + { "LEFTB" , SC_OPCODE_LEFTB }, + { "REPLACEB" , SC_OPCODE_REPLACEB }, + { "MIDB" , SC_OPCODE_MIDB }, + { "TEXT" , SC_OPCODE_TEXT }, + { "SUBSTITUTE" , SC_OPCODE_SUBSTITUTE }, + { "REPT" , SC_OPCODE_REPT }, + { "CONCATENATE" , SC_OPCODE_CONCAT }, + { "_xlfn.CONCAT" , SC_OPCODE_CONCAT_MS }, + { "_xlfn.TEXTJOIN" , SC_OPCODE_TEXTJOIN_MS }, + { "_xlfn.IFS" , SC_OPCODE_IFS_MS }, + { "_xlfn.SWITCH" , SC_OPCODE_SWITCH_MS }, + { "_xlfn.MINIFS" , SC_OPCODE_MINIFS_MS }, + { "_xlfn.MAXIFS" , SC_OPCODE_MAXIFS_MS }, + { "MVALUE" , SC_OPCODE_MAT_VALUE }, + { "MDETERM" , SC_OPCODE_MAT_DET }, + { "MINVERSE" , SC_OPCODE_MAT_INV }, + { "MMULT" , SC_OPCODE_MAT_MULT }, + { "TRANSPOSE" , SC_OPCODE_MAT_TRANS }, + { "_xlfn.MUNIT" , SC_OPCODE_MATRIX_UNIT }, + { "_xlfn.ORG.OPENOFFICE.GOALSEEK" , SC_OPCODE_BACK_SOLVER }, + { "HYPGEOMDIST" , SC_OPCODE_HYP_GEOM_DIST }, + { "_xlfn.HYPGEOM.DIST" , SC_OPCODE_HYP_GEOM_DIST_MS }, + { "LOGNORMDIST" , SC_OPCODE_LOG_NORM_DIST }, + { "_xlfn.LOGNORM.DIST" , SC_OPCODE_LOG_NORM_DIST_MS }, + { "TDIST" , SC_OPCODE_T_DIST }, + { "_xlfn.T.DIST.2T" , SC_OPCODE_T_DIST_2T }, + { "_xlfn.T.DIST" , SC_OPCODE_T_DIST_MS }, + { "_xlfn.T.DIST.RT" , SC_OPCODE_T_DIST_RT }, + { "FDIST" , SC_OPCODE_F_DIST }, + { "_xlfn.F.DIST" , SC_OPCODE_F_DIST_LT }, + { "_xlfn.F.DIST.RT" , SC_OPCODE_F_DIST_RT }, + { "CHIDIST" , SC_OPCODE_CHI_DIST }, + { "_xlfn.CHISQ.DIST.RT" , SC_OPCODE_CHI_DIST_MS }, + { "WEIBULL" , SC_OPCODE_WEIBULL }, + { "_xlfn.WEIBULL.DIST" , SC_OPCODE_WEIBULL_MS }, + { "NEGBINOMDIST" , SC_OPCODE_NEG_BINOM_VERT }, + { "_xlfn.NEGBINOM.DIST" , SC_OPCODE_NEG_BINOM_DIST_MS }, + { "CRITBINOM" , SC_OPCODE_CRIT_BINOM }, + { "_xlfn.BINOM.INV" , SC_OPCODE_BINOM_INV }, + { "KURT" , SC_OPCODE_KURT }, + { "HARMEAN" , SC_OPCODE_HAR_MEAN }, + { "GEOMEAN" , SC_OPCODE_GEO_MEAN }, + { "STANDARDIZE" , SC_OPCODE_STANDARD }, + { "AVEDEV" , SC_OPCODE_AVE_DEV }, + { "SKEW" , SC_OPCODE_SKEW }, + { "_xlfn.SKEW.P" , SC_OPCODE_SKEWP }, + { "DEVSQ" , SC_OPCODE_DEV_SQ }, + { "MEDIAN" , SC_OPCODE_MEDIAN }, + { "MODE" , SC_OPCODE_MODAL_VALUE }, + { "_xlfn.MODE.SNGL" , SC_OPCODE_MODAL_VALUE_MS }, + { "_xlfn.MODE.MULT" , SC_OPCODE_MODAL_VALUE_MULTI }, + { "ZTEST" , SC_OPCODE_Z_TEST }, + { "_xlfn.Z.TEST" , SC_OPCODE_Z_TEST_MS }, + { "_xlfn.AGGREGATE" , SC_OPCODE_AGGREGATE }, + { "TTEST" , SC_OPCODE_T_TEST }, + { "_xlfn.T.TEST" , SC_OPCODE_T_TEST_MS }, + { "RANK" , SC_OPCODE_RANK }, + { "PERCENTILE" , SC_OPCODE_PERCENTILE }, + { "PERCENTRANK" , SC_OPCODE_PERCENT_RANK }, + { "_xlfn.PERCENTILE.INC" , SC_OPCODE_PERCENTILE_INC }, + { "_xlfn.PERCENTRANK.INC" , SC_OPCODE_PERCENT_RANK_INC }, + { "_xlfn.QUARTILE.INC" , SC_OPCODE_QUARTILE_INC }, + { "_xlfn.RANK.EQ" , SC_OPCODE_RANK_EQ }, + { "_xlfn.PERCENTILE.EXC" , SC_OPCODE_PERCENTILE_EXC }, + { "_xlfn.PERCENTRANK.EXC" , SC_OPCODE_PERCENT_RANK_EXC }, + { "_xlfn.QUARTILE.EXC" , SC_OPCODE_QUARTILE_EXC }, + { "_xlfn.RANK.AVG" , SC_OPCODE_RANK_AVG }, + { "LARGE" , SC_OPCODE_LARGE }, + { "SMALL" , SC_OPCODE_SMALL }, + { "FREQUENCY" , SC_OPCODE_FREQUENCY }, + { "QUARTILE" , SC_OPCODE_QUARTILE }, + { "NORMINV" , SC_OPCODE_NORM_INV }, + { "_xlfn.NORM.INV" , SC_OPCODE_NORM_INV_MS }, + { "CONFIDENCE" , SC_OPCODE_CONFIDENCE }, + { "_xlfn.CONFIDENCE.NORM" , SC_OPCODE_CONFIDENCE_N }, + { "_xlfn.CONFIDENCE.T" , SC_OPCODE_CONFIDENCE_T }, + { "FTEST" , SC_OPCODE_F_TEST }, + { "_xlfn.F.TEST" , SC_OPCODE_F_TEST_MS }, + { "TRIMMEAN" , SC_OPCODE_TRIM_MEAN }, + { "PROB" , SC_OPCODE_PROB }, + { "CORREL" , SC_OPCODE_CORREL }, + { "COVAR" , SC_OPCODE_COVAR }, + { "_xlfn.COVARIANCE.P" , SC_OPCODE_COVARIANCE_P }, + { "_xlfn.COVARIANCE.S" , SC_OPCODE_COVARIANCE_S }, + { "PEARSON" , SC_OPCODE_PEARSON }, + { "RSQ" , SC_OPCODE_RSQ }, + { "STEYX" , SC_OPCODE_STEYX }, + { "SLOPE" , SC_OPCODE_SLOPE }, + { "INTERCEPT" , SC_OPCODE_INTERCEPT }, + { "TREND" , SC_OPCODE_TREND }, + { "GROWTH" , SC_OPCODE_GROWTH }, + { "LINEST" , SC_OPCODE_LINEST }, + { "LOGEST" , SC_OPCODE_LOGEST }, + { "FORECAST" , SC_OPCODE_FORECAST }, + { "_xlfn.FORECAST.ETS" , SC_OPCODE_FORECAST_ETS_ADD }, + { "_xlfn.FORECAST.ETS.SEASONALITY" , SC_OPCODE_FORECAST_ETS_SEA }, + { "_xlfn.ORG.LIBREOFFICE.FORECAST.ETS.MULT" , SC_OPCODE_FORECAST_ETS_MUL }, + { "_xlfn.FORECAST.ETS.CONFINT" , SC_OPCODE_FORECAST_ETS_PIA }, + { "_xlfn.ORG.LIBREOFFICE.FORECAST.ETS.PI.MULT" , SC_OPCODE_FORECAST_ETS_PIM }, + { "_xlfn.FORECAST.ETS.STAT" , SC_OPCODE_FORECAST_ETS_STA }, + { "_xlfn.ORG.LIBREOFFICE.FORECAST.ETS.STAT.MULT" , SC_OPCODE_FORECAST_ETS_STM }, + { "_xlfn.FORECAST.LINEAR" , SC_OPCODE_FORECAST_LIN }, + { "CHIINV" , SC_OPCODE_CHI_INV }, + { "_xlfn.CHISQ.INV.RT" , SC_OPCODE_CHI_INV_MS }, + { "GAMMADIST" , SC_OPCODE_GAMMA_DIST }, + { "_xlfn.GAMMA.DIST" , SC_OPCODE_GAMMA_DIST_MS }, + { "GAMMAINV" , SC_OPCODE_GAMMA_INV }, + { "_xlfn.GAMMA.INV" , SC_OPCODE_GAMMA_INV_MS }, + { "TINV" , SC_OPCODE_T_INV }, + { "_xlfn.T.INV.2T" , SC_OPCODE_T_INV_2T }, + { "_xlfn.T.INV" , SC_OPCODE_T_INV_MS }, + { "FINV" , SC_OPCODE_F_INV }, + { "_xlfn.F.INV" , SC_OPCODE_F_INV_LT }, + { "_xlfn.F.INV.RT" , SC_OPCODE_F_INV_RT }, + { "CHITEST" , SC_OPCODE_CHI_TEST }, + { "_xlfn.CHISQ.TEST" , SC_OPCODE_CHI_TEST_MS }, + { "LOGINV" , SC_OPCODE_LOG_INV }, + { "_xlfn.LOGNORM.INV" , SC_OPCODE_LOG_INV_MS }, + { "TABLE" , SC_OPCODE_TABLE_OP }, + { "BETADIST" , SC_OPCODE_BETA_DIST }, + { "BETAINV" , SC_OPCODE_BETA_INV }, + { "_xlfn.BETA.DIST" , SC_OPCODE_BETA_DIST_MS }, + { "_xlfn.BETA.INV" , SC_OPCODE_BETA_INV_MS }, + { "WEEKNUM" , SC_OPCODE_WEEK }, + { "_xlfn.ISOWEEKNUM" , SC_OPCODE_ISOWEEKNUM }, + { "_xlfn.ORG.LIBREOFFICE.WEEKNUM_OOO" , SC_OPCODE_WEEKNUM_OOO }, + { "_xlfn.ORG.OPENOFFICE.EASTERSUNDAY" , SC_OPCODE_EASTERSUNDAY }, + { "WEEKDAY" , SC_OPCODE_GET_DAY_OF_WEEK }, + { "NETWORKDAYS" , SC_OPCODE_NETWORKDAYS }, + { "NETWORKDAYS.INTL" , SC_OPCODE_NETWORKDAYS_MS }, + { "WORKDAY.INTL" , SC_OPCODE_WORKDAY_MS }, + { "#NAME!" , SC_OPCODE_NO_NAME }, + { "_xlfn.ORG.OPENOFFICE.STYLE" , SC_OPCODE_STYLE }, + { "DDE" , SC_OPCODE_DDE }, + { "_xlfn.BASE" , SC_OPCODE_BASE }, + { "_xlfn.DECIMAL" , SC_OPCODE_DECIMAL }, + { "_xlfn.ORG.OPENOFFICE.CONVERT" , SC_OPCODE_CONVERT_OOO }, + { "ROMAN" , SC_OPCODE_ROMAN }, + { "_xlfn.ARABIC" , SC_OPCODE_ARABIC }, + { "HYPERLINK" , SC_OPCODE_HYPERLINK }, + { "INFO" , SC_OPCODE_INFO }, + { "_xlfn.BAHTTEXT" , SC_OPCODE_BAHTTEXT }, + { "GETPIVOTDATA" , SC_OPCODE_GET_PIVOT_DATA }, + { "EUROCONVERT" , SC_OPCODE_EUROCONVERT }, + { "_xlfn.NUMBERVALUE" , SC_OPCODE_NUMBERVALUE }, + { "_xlfn.GAMMA" , SC_OPCODE_GAMMA }, + { "CHISQDIST" , SC_OPCODE_CHISQ_DIST }, + { "_xlfn.CHISQ.DIST" , SC_OPCODE_CHISQ_DIST_MS }, + { "CHISQINV" , SC_OPCODE_CHISQ_INV }, + { "_xlfn.CHISQ.INV" , SC_OPCODE_CHISQ_INV_MS }, + { "_xlfn.BITAND" , SC_OPCODE_BITAND }, + { "_xlfn.BITOR" , SC_OPCODE_BITOR }, + { "_xlfn.BITXOR" , SC_OPCODE_BITXOR }, + { "_xlfn.BITRSHIFT" , SC_OPCODE_BITRSHIFT }, + { "_xlfn.BITLSHIFT" , SC_OPCODE_BITLSHIFT }, + { "#NULL!" , SC_OPCODE_ERROR_NULL }, + { "#DIV/0!" , SC_OPCODE_ERROR_DIVZERO }, + { "#VALUE!" , SC_OPCODE_ERROR_VALUE }, + { "#REF!" , SC_OPCODE_ERROR_REF }, + { "#NAME?" , SC_OPCODE_ERROR_NAME }, + { "#NUM!" , SC_OPCODE_ERROR_NUM }, + { "#N/A" , SC_OPCODE_ERROR_NA }, + /* END defined ERROR.TYPE() values. */ + { "_xlfn.FILTERXML" , SC_OPCODE_FILTERXML }, + { "_xlfn.WEBSERVICE" , SC_OPCODE_WEBSERVICE }, + { "_xlfn.ORG.LIBREOFFICE.COLOR" , SC_OPCODE_COLOR }, + { "_xlfn.ERF.PRECISE" , SC_OPCODE_ERF_MS }, + { "_xlfn.ERFC.PRECISE" , SC_OPCODE_ERFC_MS }, + { "_xlfn.ENCODEURL" , SC_OPCODE_ENCODEURL }, + { "_xlfn.ORG.LIBREOFFICE.RAWSUBTRACT" , SC_OPCODE_RAWSUBTRACT }, + { "_xlfn.ORG.LIBREOFFICE.ROUNDSIG" , SC_OPCODE_ROUNDSIG }, + { nullptr, -1 } +}; + +/** These English names are used to store/load ODF v1.0/v1.1. */ +// DO NOT CHANGE NAMES! Only add functions. +// If there is a reason for another name for some function then add an +// *additional* name to be recognized to sc/source/core/tool/compiler.cxx +// ScCompiler::IsOpCode() in the else if (mxSymbols->isPODF()) block. +const std::pair RID_STRLIST_FUNCTION_NAMES_ENGLISH_PODF[] = +{ + { "IF" , SC_OPCODE_IF }, + { "IFERROR" , SC_OPCODE_IF_ERROR }, + { "IFNA" , SC_OPCODE_IF_NA }, + { "CHOOSE" , SC_OPCODE_CHOOSE }, + { "(" , SC_OPCODE_OPEN }, + { ")" , SC_OPCODE_CLOSE }, + { "[" , SC_OPCODE_TABLE_REF_OPEN }, + { "]" , SC_OPCODE_TABLE_REF_CLOSE }, + { "#All" , SC_OPCODE_TABLE_REF_ITEM_ALL }, + { "#Headers" , SC_OPCODE_TABLE_REF_ITEM_HEADERS }, + { "#Data" , SC_OPCODE_TABLE_REF_ITEM_DATA }, + { "#Totals" , SC_OPCODE_TABLE_REF_ITEM_TOTALS }, + { "#This Row" , SC_OPCODE_TABLE_REF_ITEM_THIS_ROW }, + { "{" , SC_OPCODE_ARRAY_OPEN }, + { "}" , SC_OPCODE_ARRAY_CLOSE }, + { "|" , SC_OPCODE_ARRAY_ROW_SEP }, + { ";" , SC_OPCODE_ARRAY_COL_SEP }, + { ";" , SC_OPCODE_SEP }, + { "%" , SC_OPCODE_PERCENT_SIGN }, + { "+" , SC_OPCODE_ADD }, + { "-" , SC_OPCODE_SUB }, + { "*" , SC_OPCODE_MUL }, + { "/" , SC_OPCODE_DIV }, + { "&" , SC_OPCODE_AMPERSAND }, + { "^" , SC_OPCODE_POW }, + { "=" , SC_OPCODE_EQUAL }, + { "<>" , SC_OPCODE_NOT_EQUAL }, + { "<" , SC_OPCODE_LESS }, + { ">" , SC_OPCODE_GREATER }, + { "<=" , SC_OPCODE_LESS_EQUAL }, + { ">=" , SC_OPCODE_GREATER_EQUAL }, + { "AND" , SC_OPCODE_AND }, + { "OR" , SC_OPCODE_OR }, + { "XOR" , SC_OPCODE_XOR }, + { "!" , SC_OPCODE_INTERSECT }, + { "~" , SC_OPCODE_UNION }, + { ":" , SC_OPCODE_RANGE }, + { "NOT" , SC_OPCODE_NOT }, + { "NEG" , SC_OPCODE_NEG }, + { "-" , SC_OPCODE_NEG_SUB }, + { "PI" , SC_OPCODE_PI }, + { "RAND" , SC_OPCODE_RANDOM }, + { "TRUE" , SC_OPCODE_TRUE }, + { "FALSE" , SC_OPCODE_FALSE }, + { "TODAY" , SC_OPCODE_GET_ACT_DATE }, + { "NOW" , SC_OPCODE_GET_ACT_TIME }, + { "NA" , SC_OPCODE_NO_VALUE }, + { "CURRENT" , SC_OPCODE_CURRENT }, + { "DEGREES" , SC_OPCODE_DEG }, + { "RADIANS" , SC_OPCODE_RAD }, + { "SIN" , SC_OPCODE_SIN }, + { "COS" , SC_OPCODE_COS }, + { "TAN" , SC_OPCODE_TAN }, + { "COT" , SC_OPCODE_COT }, + { "ASIN" , SC_OPCODE_ARC_SIN }, + { "ACOS" , SC_OPCODE_ARC_COS }, + { "ATAN" , SC_OPCODE_ARC_TAN }, + { "ACOT" , SC_OPCODE_ARC_COT }, + { "SINH" , SC_OPCODE_SIN_HYP }, + { "COSH" , SC_OPCODE_COS_HYP }, + { "TANH" , SC_OPCODE_TAN_HYP }, + { "COTH" , SC_OPCODE_COT_HYP }, + { "ASINH" , SC_OPCODE_ARC_SIN_HYP }, + { "ACOSH" , SC_OPCODE_ARC_COS_HYP }, + { "ATANH" , SC_OPCODE_ARC_TAN_HYP }, + { "ACOTH" , SC_OPCODE_ARC_COT_HYP }, + { "CSC" , SC_OPCODE_COSECANT }, + { "SEC" , SC_OPCODE_SECANT }, + { "CSCH" , SC_OPCODE_COSECANT_HYP }, + { "SECH" , SC_OPCODE_SECANT_HYP }, + { "EXP" , SC_OPCODE_EXP }, + { "LN" , SC_OPCODE_LN }, + { "SQRT" , SC_OPCODE_SQRT }, + { "FACT" , SC_OPCODE_FACT }, + { "YEAR" , SC_OPCODE_GET_YEAR }, + { "MONTH" , SC_OPCODE_GET_MONTH }, + { "DAY" , SC_OPCODE_GET_DAY }, + { "HOUR" , SC_OPCODE_GET_HOUR }, + { "MINUTE" , SC_OPCODE_GET_MIN }, + { "SECOND" , SC_OPCODE_GET_SEC }, + { "SIGN" , SC_OPCODE_PLUS_MINUS }, + { "ABS" , SC_OPCODE_ABS }, + { "INT" , SC_OPCODE_INT }, + { "PHI" , SC_OPCODE_PHI }, + { "GAUSS" , SC_OPCODE_GAUSS }, + { "ISBLANK" , SC_OPCODE_IS_EMPTY }, + { "ISTEXT" , SC_OPCODE_IS_STRING }, + { "ISNONTEXT" , SC_OPCODE_IS_NON_STRING }, + { "ISLOGICAL" , SC_OPCODE_IS_LOGICAL }, + { "TYPE" , SC_OPCODE_TYPE }, + { "CELL" , SC_OPCODE_CELL }, + { "ISREF" , SC_OPCODE_IS_REF }, + { "ISNUMBER" , SC_OPCODE_IS_VALUE }, + { "ISFORMULA" , SC_OPCODE_IS_FORMULA }, + { "ISNA" , SC_OPCODE_IS_NV }, + { "ISERR" , SC_OPCODE_IS_ERR }, + { "ISERROR" , SC_OPCODE_IS_ERROR }, + { "ISEVEN" , SC_OPCODE_IS_EVEN }, + { "ISODD" , SC_OPCODE_IS_ODD }, + { "N" , SC_OPCODE_N }, + { "DATEVALUE" , SC_OPCODE_GET_DATE_VALUE }, + { "TIMEVALUE" , SC_OPCODE_GET_TIME_VALUE }, + { "CODE" , SC_OPCODE_CODE }, + { "TRIM" , SC_OPCODE_TRIM }, + { "UPPER" , SC_OPCODE_UPPER }, + { "PROPER" , SC_OPCODE_PROPER }, + { "LOWER" , SC_OPCODE_LOWER }, + { "LEN" , SC_OPCODE_LEN }, + { "T" , SC_OPCODE_T }, + { "VALUE" , SC_OPCODE_VALUE }, + { "CLEAN" , SC_OPCODE_CLEAN }, + { "CHAR" , SC_OPCODE_CHAR }, + { "JIS" , SC_OPCODE_JIS }, + { "ASC" , SC_OPCODE_ASC }, + { "UNICODE" , SC_OPCODE_UNICODE }, + { "UNICHAR" , SC_OPCODE_UNICHAR }, + { "LOG10" , SC_OPCODE_LOG10 }, + { "EVEN" , SC_OPCODE_EVEN }, + { "ODD" , SC_OPCODE_ODD }, + { "NORMSDIST" , SC_OPCODE_STD_NORM_DIST }, + { "NORM.S.DIST" , SC_OPCODE_STD_NORM_DIST_MS }, + { "FISHER" , SC_OPCODE_FISHER }, + { "FISHERINV" , SC_OPCODE_FISHER_INV }, + { "NORMSINV" , SC_OPCODE_S_NORM_INV }, + { "NORM.S.INV" , SC_OPCODE_S_NORM_INV_MS }, + { "GAMMALN" , SC_OPCODE_GAMMA_LN }, + { "GAMMALN.PRECISE" , SC_OPCODE_GAMMA_LN_MS }, + { "ERRORTYPE" , SC_OPCODE_ERROR_TYPE }, + { "ERROR.TYPE" , SC_OPCODE_ERROR_TYPE_ODF }, + { "FORMULA" , SC_OPCODE_FORMULA }, + { "ATAN2" , SC_OPCODE_ARC_TAN_2 }, + { "CEILING.MATH" , SC_OPCODE_CEIL_MATH }, + { "CEILING" , SC_OPCODE_CEIL }, + { "CEILING.XCL" , SC_OPCODE_CEIL_MS }, + { "CEILING.PRECISE" , SC_OPCODE_CEIL_PRECISE }, + { "ISO.CEILING" , SC_OPCODE_CEIL_ISO }, + { "FLOOR" , SC_OPCODE_FLOOR }, + { "FLOOR.XCL" , SC_OPCODE_FLOOR_MS }, + { "FLOOR.MATH" , SC_OPCODE_FLOOR_MATH }, + { "FLOOR.PRECISE" , SC_OPCODE_FLOOR_PRECISE }, + { "ROUND" , SC_OPCODE_ROUND }, + { "ROUNDUP" , SC_OPCODE_ROUND_UP }, + { "ROUNDDOWN" , SC_OPCODE_ROUND_DOWN }, + { "TRUNC" , SC_OPCODE_TRUNC }, + { "LOG" , SC_OPCODE_LOG }, + { "POWER" , SC_OPCODE_POWER }, + { "GCD" , SC_OPCODE_GCD }, + { "LCM" , SC_OPCODE_LCM }, + { "MOD" , SC_OPCODE_MOD }, + { "SUMPRODUCT" , SC_OPCODE_SUM_PRODUCT }, + { "SUMSQ" , SC_OPCODE_SUM_SQ }, + { "SUMX2MY2" , SC_OPCODE_SUM_X2MY2 }, + { "SUMX2PY2" , SC_OPCODE_SUM_X2DY2 }, + { "SUMXMY2" , SC_OPCODE_SUM_XMY2 }, + { "DATE" , SC_OPCODE_GET_DATE }, + { "TIME" , SC_OPCODE_GET_TIME }, + { "DAYS" , SC_OPCODE_GET_DIFF_DATE }, + { "DAYS360" , SC_OPCODE_GET_DIFF_DATE_360 }, + { "DATEDIF" , SC_OPCODE_GET_DATEDIF }, + { "MIN" , SC_OPCODE_MIN }, + { "MINA" , SC_OPCODE_MIN_A }, + { "MAX" , SC_OPCODE_MAX }, + { "MAXA" , SC_OPCODE_MAX_A }, + { "SUM" , SC_OPCODE_SUM }, + { "PRODUCT" , SC_OPCODE_PRODUCT }, + { "AVERAGE" , SC_OPCODE_AVERAGE }, + { "AVERAGEA" , SC_OPCODE_AVERAGE_A }, + { "COUNT" , SC_OPCODE_COUNT }, + { "COUNTA" , SC_OPCODE_COUNT_2 }, + { "NPV" , SC_OPCODE_NPV }, + { "IRR" , SC_OPCODE_IRR }, + { "MIRR" , SC_OPCODE_MIRR }, + { "ISPMT" , SC_OPCODE_ISPMT }, + { "VAR" , SC_OPCODE_VAR }, + { "VARA" , SC_OPCODE_VAR_A }, + { "VARP" , SC_OPCODE_VAR_P }, + { "VARPA" , SC_OPCODE_VAR_P_A }, + { "VAR.P" , SC_OPCODE_VAR_P_MS }, + { "VAR.S" , SC_OPCODE_VAR_S }, + { "STDEV" , SC_OPCODE_ST_DEV }, + { "STDEVA" , SC_OPCODE_ST_DEV_A }, + { "STDEVP" , SC_OPCODE_ST_DEV_P }, + { "STDEVPA" , SC_OPCODE_ST_DEV_P_A }, + { "STDEV.P" , SC_OPCODE_ST_DEV_P_MS }, + { "STDEV.S" , SC_OPCODE_ST_DEV_S }, + { "B" , SC_OPCODE_B }, + { "NORMDIST" , SC_OPCODE_NORM_DIST }, + { "NORM.DIST" , SC_OPCODE_NORM_DIST_MS }, + { "EXPONDIST" , SC_OPCODE_EXP_DIST }, + { "EXPON.DIST" , SC_OPCODE_EXP_DIST_MS }, + { "BINOMDIST" , SC_OPCODE_BINOM_DIST }, + { "BINOM.DIST" , SC_OPCODE_BINOM_DIST_MS }, + { "POISSON" , SC_OPCODE_POISSON_DIST }, + { "POISSON.DIST" , SC_OPCODE_POISSON_DIST_MS }, + { "COMBIN" , SC_OPCODE_COMBIN }, + { "COMBINA" , SC_OPCODE_COMBIN_A }, + { "PERMUT" , SC_OPCODE_PERMUT }, + { "PERMUTATIONA" , SC_OPCODE_PERMUTATION_A }, + { "PV" , SC_OPCODE_PV }, + { "SYD" , SC_OPCODE_SYD }, + { "DDB" , SC_OPCODE_DDB }, + { "DB" , SC_OPCODE_DB }, + { "VDB" , SC_OPCODE_VBD }, + { "DURATION" , SC_OPCODE_PDURATION }, // wrong but ODF1.1, keep it. + { "SLN" , SC_OPCODE_SLN }, + { "PMT" , SC_OPCODE_PMT }, + { "COLUMNS" , SC_OPCODE_COLUMNS }, + { "ROWS" , SC_OPCODE_ROWS }, + { "SHEETS" , SC_OPCODE_SHEETS }, + { "COLUMN" , SC_OPCODE_COLUMN }, + { "ROW" , SC_OPCODE_ROW }, + { "SHEET" , SC_OPCODE_SHEET }, + { "ZGZ" , SC_OPCODE_RRI }, + { "FV" , SC_OPCODE_FV }, + { "NPER" , SC_OPCODE_NPER }, + { "RATE" , SC_OPCODE_RATE }, + { "IPMT" , SC_OPCODE_IPMT }, + { "PPMT" , SC_OPCODE_PPMT }, + { "CUMIPMT" , SC_OPCODE_CUM_IPMT }, + { "CUMPRINC" , SC_OPCODE_CUM_PRINC }, + { "EFFECTIVE" , SC_OPCODE_EFFECT }, + { "NOMINAL" , SC_OPCODE_NOMINAL }, + { "SUBTOTAL" , SC_OPCODE_SUB_TOTAL }, + { "DSUM" , SC_OPCODE_DB_SUM }, + { "DCOUNT" , SC_OPCODE_DB_COUNT }, + { "DCOUNTA" , SC_OPCODE_DB_COUNT_2 }, + { "DAVERAGE" , SC_OPCODE_DB_AVERAGE }, + { "DGET" , SC_OPCODE_DB_GET }, + { "DMAX" , SC_OPCODE_DB_MAX }, + { "DMIN" , SC_OPCODE_DB_MIN }, + { "DPRODUCT" , SC_OPCODE_DB_PRODUCT }, + { "DSTDEV" , SC_OPCODE_DB_STD_DEV }, + { "DSTDEVP" , SC_OPCODE_DB_STD_DEV_P }, + { "DVAR" , SC_OPCODE_DB_VAR }, + { "DVARP" , SC_OPCODE_DB_VAR_P }, + { "INDIRECT" , SC_OPCODE_INDIRECT }, + { "ADDRESS" , SC_OPCODE_ADDRESS }, + { "MATCH" , SC_OPCODE_MATCH }, + { "COUNTBLANK" , SC_OPCODE_COUNT_EMPTY_CELLS }, + { "COUNTIF" , SC_OPCODE_COUNT_IF }, + { "SUMIF" , SC_OPCODE_SUM_IF }, + { "AVERAGEIF" , SC_OPCODE_AVERAGE_IF }, + { "SUMIFS" , SC_OPCODE_SUM_IFS }, + { "AVERAGEIFS" , SC_OPCODE_AVERAGE_IFS }, + { "COUNTIFS" , SC_OPCODE_COUNT_IFS }, + { "LOOKUP" , SC_OPCODE_LOOKUP }, + { "VLOOKUP" , SC_OPCODE_V_LOOKUP }, + { "HLOOKUP" , SC_OPCODE_H_LOOKUP }, + { "MULTIRANGE" , SC_OPCODE_MULTI_AREA }, // legacy for range list (union) + { "OFFSET" , SC_OPCODE_OFFSET }, + { "INDEX" , SC_OPCODE_INDEX }, + { "AREAS" , SC_OPCODE_AREAS }, + { "DOLLAR" , SC_OPCODE_CURRENCY }, + { "REPLACE" , SC_OPCODE_REPLACE }, + { "FIXED" , SC_OPCODE_FIXED }, + { "FIND" , SC_OPCODE_FIND }, + { "EXACT" , SC_OPCODE_EXACT }, + { "LEFT" , SC_OPCODE_LEFT }, + { "RIGHT" , SC_OPCODE_RIGHT }, + { "SEARCH" , SC_OPCODE_SEARCH }, + { "MID" , SC_OPCODE_MID }, + { "LENB" , SC_OPCODE_LENB }, + { "RIGHTB" , SC_OPCODE_RIGHTB }, + { "LEFTB" , SC_OPCODE_LEFTB }, + { "REPLACEB" , SC_OPCODE_REPLACEB }, + { "MIDB" , SC_OPCODE_MIDB }, + { "TEXT" , SC_OPCODE_TEXT }, + { "SUBSTITUTE" , SC_OPCODE_SUBSTITUTE }, + { "REPT" , SC_OPCODE_REPT }, + { "CONCATENATE" , SC_OPCODE_CONCAT }, + { "CONCAT" , SC_OPCODE_CONCAT_MS }, + { "TEXTJOIN" , SC_OPCODE_TEXTJOIN_MS }, + { "IFS" , SC_OPCODE_IFS_MS }, + { "SWITCH" , SC_OPCODE_SWITCH_MS }, + { "MINIFS" , SC_OPCODE_MINIFS_MS }, + { "MAXIFS" , SC_OPCODE_MAXIFS_MS }, + { "MVALUE" , SC_OPCODE_MAT_VALUE }, + { "MDETERM" , SC_OPCODE_MAT_DET }, + { "MINVERSE" , SC_OPCODE_MAT_INV }, + { "MMULT" , SC_OPCODE_MAT_MULT }, + { "TRANSPOSE" , SC_OPCODE_MAT_TRANS }, + { "MUNIT" , SC_OPCODE_MATRIX_UNIT }, + { "GOALSEEK" , SC_OPCODE_BACK_SOLVER }, + { "HYPGEOMDIST" , SC_OPCODE_HYP_GEOM_DIST }, + { "HYPGEOM.DIST" , SC_OPCODE_HYP_GEOM_DIST_MS }, + { "LOGNORMDIST" , SC_OPCODE_LOG_NORM_DIST }, + { "LOGNORM.DIST" , SC_OPCODE_LOG_NORM_DIST_MS }, + { "TDIST" , SC_OPCODE_T_DIST }, + { "T.DIST.2T" , SC_OPCODE_T_DIST_2T }, + { "T.DIST" , SC_OPCODE_T_DIST_MS }, + { "T.DIST.RT" , SC_OPCODE_T_DIST_RT }, + { "FDIST" , SC_OPCODE_F_DIST }, + { "F.DIST" , SC_OPCODE_F_DIST_LT }, + { "F.DIST.RT" , SC_OPCODE_F_DIST_RT }, + { "CHIDIST" , SC_OPCODE_CHI_DIST }, + { "CHISQ.DIST.RT" , SC_OPCODE_CHI_DIST_MS }, + { "WEIBULL" , SC_OPCODE_WEIBULL }, + { "WEIBULL.DIST" , SC_OPCODE_WEIBULL_MS }, + { "NEGBINOMDIST" , SC_OPCODE_NEG_BINOM_VERT }, + { "NEGBINOM.DIST" , SC_OPCODE_NEG_BINOM_DIST_MS }, + { "CRITBINOM" , SC_OPCODE_CRIT_BINOM }, + { "BINOM.INV" , SC_OPCODE_BINOM_INV }, + { "KURT" , SC_OPCODE_KURT }, + { "HARMEAN" , SC_OPCODE_HAR_MEAN }, + { "GEOMEAN" , SC_OPCODE_GEO_MEAN }, + { "STANDARDIZE" , SC_OPCODE_STANDARD }, + { "AVEDEV" , SC_OPCODE_AVE_DEV }, + { "SKEW" , SC_OPCODE_SKEW }, + { "SKEWP" , SC_OPCODE_SKEWP }, + { "DEVSQ" , SC_OPCODE_DEV_SQ }, + { "MEDIAN" , SC_OPCODE_MEDIAN }, + { "MODE" , SC_OPCODE_MODAL_VALUE }, + { "MODE.SNGL" , SC_OPCODE_MODAL_VALUE_MS }, + { "MODE.MULT" , SC_OPCODE_MODAL_VALUE_MULTI }, + { "ZTEST" , SC_OPCODE_Z_TEST }, + { "Z.TEST" , SC_OPCODE_Z_TEST_MS }, + { "AGGREGATE" , SC_OPCODE_AGGREGATE }, + { "TTEST" , SC_OPCODE_T_TEST }, + { "T.TEST" , SC_OPCODE_T_TEST_MS }, + { "RANK" , SC_OPCODE_RANK }, + { "PERCENTILE" , SC_OPCODE_PERCENTILE }, + { "PERCENTRANK" , SC_OPCODE_PERCENT_RANK }, + { "PERCENTILE.INC" , SC_OPCODE_PERCENTILE_INC }, + { "PERCENTRANK.INC" , SC_OPCODE_PERCENT_RANK_INC }, + { "QUARTILE.INC" , SC_OPCODE_QUARTILE_INC }, + { "RANK.EQ" , SC_OPCODE_RANK_EQ }, + { "PERCENTILE.EXC" , SC_OPCODE_PERCENTILE_EXC }, + { "PERCENTRANK.EXC" , SC_OPCODE_PERCENT_RANK_EXC }, + { "QUARTILE.EXC" , SC_OPCODE_QUARTILE_EXC }, + { "RANK.AVG" , SC_OPCODE_RANK_AVG }, + { "LARGE" , SC_OPCODE_LARGE }, + { "SMALL" , SC_OPCODE_SMALL }, + { "FREQUENCY" , SC_OPCODE_FREQUENCY }, + { "QUARTILE" , SC_OPCODE_QUARTILE }, + { "NORMINV" , SC_OPCODE_NORM_INV }, + { "NORM.INV" , SC_OPCODE_NORM_INV_MS }, + { "CONFIDENCE" , SC_OPCODE_CONFIDENCE }, + { "CONFIDENCE.NORM" , SC_OPCODE_CONFIDENCE_N }, + { "CONFIDENCE.T" , SC_OPCODE_CONFIDENCE_T }, + { "FTEST" , SC_OPCODE_F_TEST }, + { "F.TEST" , SC_OPCODE_F_TEST_MS }, + { "TRIMMEAN" , SC_OPCODE_TRIM_MEAN }, + { "PROB" , SC_OPCODE_PROB }, + { "CORREL" , SC_OPCODE_CORREL }, + { "COVAR" , SC_OPCODE_COVAR }, + { "COVARIANCE.P" , SC_OPCODE_COVARIANCE_P }, + { "COVARIANCE.S" , SC_OPCODE_COVARIANCE_S }, + { "PEARSON" , SC_OPCODE_PEARSON }, + { "RSQ" , SC_OPCODE_RSQ }, + { "STEYX" , SC_OPCODE_STEYX }, + { "SLOPE" , SC_OPCODE_SLOPE }, + { "INTERCEPT" , SC_OPCODE_INTERCEPT }, + { "TREND" , SC_OPCODE_TREND }, + { "GROWTH" , SC_OPCODE_GROWTH }, + { "LINEST" , SC_OPCODE_LINEST }, + { "LOGEST" , SC_OPCODE_LOGEST }, + { "FORECAST" , SC_OPCODE_FORECAST }, + { "FORECAST.ETS.ADD" , SC_OPCODE_FORECAST_ETS_ADD }, + { "FORECAST.ETS.SEASONALITY" , SC_OPCODE_FORECAST_ETS_SEA }, + { "FORECAST.ETS.MULT" , SC_OPCODE_FORECAST_ETS_MUL }, + { "FORECAST.ETS.PI.ADD" , SC_OPCODE_FORECAST_ETS_PIA }, + { "FORECAST.ETS.PI.MULT" , SC_OPCODE_FORECAST_ETS_PIM }, + { "FORECAST.ETS.STAT.ADD" , SC_OPCODE_FORECAST_ETS_STA }, + { "FORECAST.ETS.STAT.MULT" , SC_OPCODE_FORECAST_ETS_STM }, + { "FORECAST.LINEAR" , SC_OPCODE_FORECAST_LIN }, + { "CHIINV" , SC_OPCODE_CHI_INV }, + { "CHISQ.INV.RT" , SC_OPCODE_CHI_INV_MS }, + { "GAMMADIST" , SC_OPCODE_GAMMA_DIST }, + { "GAMMA.DIST" , SC_OPCODE_GAMMA_DIST_MS }, + { "GAMMAINV" , SC_OPCODE_GAMMA_INV }, + { "GAMMA.INV" , SC_OPCODE_GAMMA_INV_MS }, + { "TINV" , SC_OPCODE_T_INV }, + { "T.INV.2T" , SC_OPCODE_T_INV_2T }, + { "T.INV" , SC_OPCODE_T_INV_MS }, + { "FINV" , SC_OPCODE_F_INV }, + { "F.INV" , SC_OPCODE_F_INV_LT }, + { "F.INV.RT" , SC_OPCODE_F_INV_RT }, + { "CHITEST" , SC_OPCODE_CHI_TEST }, + { "CHISQ.TEST" , SC_OPCODE_CHI_TEST_MS }, + { "LOGINV" , SC_OPCODE_LOG_INV }, + { "LOGNORM.INV" , SC_OPCODE_LOG_INV_MS }, + { "TABLE" , SC_OPCODE_TABLE_OP }, + { "BETADIST" , SC_OPCODE_BETA_DIST }, + { "BETAINV" , SC_OPCODE_BETA_INV }, + { "BETA.DIST" , SC_OPCODE_BETA_DIST_MS }, + { "BETA.INV" , SC_OPCODE_BETA_INV_MS }, + { "WEEKNUM" , SC_OPCODE_WEEK }, + { "ISOWEEKNUM" , SC_OPCODE_ISOWEEKNUM }, + { "WEEKNUM_OOO" , SC_OPCODE_WEEKNUM_OOO }, + { "EASTERSUNDAY" , SC_OPCODE_EASTERSUNDAY }, + { "WEEKDAY" , SC_OPCODE_GET_DAY_OF_WEEK }, + { "NETWORKDAYS" , SC_OPCODE_NETWORKDAYS }, + { "NETWORKDAYS.INTL" , SC_OPCODE_NETWORKDAYS_MS }, + { "WORKDAY.INTL" , SC_OPCODE_WORKDAY_MS }, + { "#NAME!" , SC_OPCODE_NO_NAME }, + { "STYLE" , SC_OPCODE_STYLE }, + { "DDE" , SC_OPCODE_DDE }, + { "BASE" , SC_OPCODE_BASE }, + { "DECIMAL" , SC_OPCODE_DECIMAL }, + { "CONVERT" , SC_OPCODE_CONVERT_OOO }, // wrong but ODF1.1, keep it + { "ROMAN" , SC_OPCODE_ROMAN }, + { "ARABIC" , SC_OPCODE_ARABIC }, + { "HYPERLINK" , SC_OPCODE_HYPERLINK }, + { "INFO" , SC_OPCODE_INFO }, + { "BAHTTEXT" , SC_OPCODE_BAHTTEXT }, + { "GETPIVOTDATA" , SC_OPCODE_GET_PIVOT_DATA }, + { "EUROCONVERT" , SC_OPCODE_EUROCONVERT }, + { "NUMBERVALUE" , SC_OPCODE_NUMBERVALUE }, + { "GAMMA" , SC_OPCODE_GAMMA }, + { "CHISQDIST" , SC_OPCODE_CHISQ_DIST }, + { "CHISQ.DIST" , SC_OPCODE_CHISQ_DIST_MS }, + { "CHISQ.INV" , SC_OPCODE_CHISQ_INV_MS }, + { "CHISQINV" , SC_OPCODE_CHISQ_INV }, + { "BITAND" , SC_OPCODE_BITAND }, + { "BITOR" , SC_OPCODE_BITOR }, + { "BITXOR" , SC_OPCODE_BITXOR }, + { "BITRSHIFT" , SC_OPCODE_BITRSHIFT }, + { "BITLSHIFT" , SC_OPCODE_BITLSHIFT }, + /* BEGIN defined ERROR.TYPE() values. */ + { "#NULL!" , SC_OPCODE_ERROR_NULL }, + { "#DIV/0!" , SC_OPCODE_ERROR_DIVZERO }, + { "#VALUE!" , SC_OPCODE_ERROR_VALUE }, + { "#REF!" , SC_OPCODE_ERROR_REF }, + { "#NAME?" , SC_OPCODE_ERROR_NAME }, + { "#NUM!" , SC_OPCODE_ERROR_NUM }, + { "#N/A" , SC_OPCODE_ERROR_NA }, + /* END defined ERROR.TYPE() values. */ + { "FILTERXML" , SC_OPCODE_FILTERXML }, + { "WEBSERVICE" , SC_OPCODE_WEBSERVICE }, + { "COLOR" , SC_OPCODE_COLOR }, + { "ERF.PRECISE" , SC_OPCODE_ERF_MS }, + { "ERFC.PRECISE" , SC_OPCODE_ERFC_MS }, + { "ENCODEURL" , SC_OPCODE_ENCODEURL }, + { "RAWSUBTRACT" , SC_OPCODE_RAWSUBTRACT }, + { "ROUNDSIG" , SC_OPCODE_ROUNDSIG }, + { nullptr, -1 } +}; + +/** These English names are used for XFunctionAccess API. */ +// DO NOT CHANGE NAMES! Only add functions. +// If there is a reason for another name for some function then add an +// *additional* name to be recognized to sc/source/core/tool/compiler.cxx +// ScCompiler::IsOpCode(). +const std::pair RID_STRLIST_FUNCTION_NAMES_ENGLISH_API[] = +{ + { "IF" , SC_OPCODE_IF }, + { "IFERROR" , SC_OPCODE_IF_ERROR }, + { "IFNA" , SC_OPCODE_IF_NA }, + { "CHOOSE" , SC_OPCODE_CHOOSE }, + { "(" , SC_OPCODE_OPEN }, + { ")" , SC_OPCODE_CLOSE }, + { "[" , SC_OPCODE_TABLE_REF_OPEN }, + { "]" , SC_OPCODE_TABLE_REF_CLOSE }, + { "#All" , SC_OPCODE_TABLE_REF_ITEM_ALL }, + { "#Headers" , SC_OPCODE_TABLE_REF_ITEM_HEADERS }, + { "#Data" , SC_OPCODE_TABLE_REF_ITEM_DATA }, + { "#Totals" , SC_OPCODE_TABLE_REF_ITEM_TOTALS }, + { "#This Row" , SC_OPCODE_TABLE_REF_ITEM_THIS_ROW }, + { "{" , SC_OPCODE_ARRAY_OPEN }, + { "}" , SC_OPCODE_ARRAY_CLOSE }, + { "|" , SC_OPCODE_ARRAY_ROW_SEP }, + { ";" , SC_OPCODE_ARRAY_COL_SEP }, + { ";" , SC_OPCODE_SEP }, + { "%" , SC_OPCODE_PERCENT_SIGN }, + { "+" , SC_OPCODE_ADD }, + { "-" , SC_OPCODE_SUB }, + { "*" , SC_OPCODE_MUL }, + { "/" , SC_OPCODE_DIV }, + { "&" , SC_OPCODE_AMPERSAND }, + { "^" , SC_OPCODE_POW }, + { "=" , SC_OPCODE_EQUAL }, + { "<>" , SC_OPCODE_NOT_EQUAL }, + { "<" , SC_OPCODE_LESS }, + { ">" , SC_OPCODE_GREATER }, + { "<=" , SC_OPCODE_LESS_EQUAL }, + { ">=" , SC_OPCODE_GREATER_EQUAL }, + { "AND" , SC_OPCODE_AND }, + { "OR" , SC_OPCODE_OR }, + { "XOR" , SC_OPCODE_XOR }, + { "!" , SC_OPCODE_INTERSECT }, + { "~" , SC_OPCODE_UNION }, + { ":" , SC_OPCODE_RANGE }, + { "NOT" , SC_OPCODE_NOT }, + { "NEG" , SC_OPCODE_NEG }, + { "-" , SC_OPCODE_NEG_SUB }, + { "PI" , SC_OPCODE_PI }, + { "RAND" , SC_OPCODE_RANDOM }, + { "TRUE" , SC_OPCODE_TRUE }, + { "FALSE" , SC_OPCODE_FALSE }, + { "TODAY" , SC_OPCODE_GET_ACT_DATE }, + { "NOW" , SC_OPCODE_GET_ACT_TIME }, + { "NA" , SC_OPCODE_NO_VALUE }, + { "CURRENT" , SC_OPCODE_CURRENT }, + { "DEGREES" , SC_OPCODE_DEG }, + { "RADIANS" , SC_OPCODE_RAD }, + { "SIN" , SC_OPCODE_SIN }, + { "COS" , SC_OPCODE_COS }, + { "TAN" , SC_OPCODE_TAN }, + { "COT" , SC_OPCODE_COT }, + { "ASIN" , SC_OPCODE_ARC_SIN }, + { "ACOS" , SC_OPCODE_ARC_COS }, + { "ATAN" , SC_OPCODE_ARC_TAN }, + { "ACOT" , SC_OPCODE_ARC_COT }, + { "SINH" , SC_OPCODE_SIN_HYP }, + { "COSH" , SC_OPCODE_COS_HYP }, + { "TANH" , SC_OPCODE_TAN_HYP }, + { "COTH" , SC_OPCODE_COT_HYP }, + { "ASINH" , SC_OPCODE_ARC_SIN_HYP }, + { "ACOSH" , SC_OPCODE_ARC_COS_HYP }, + { "ATANH" , SC_OPCODE_ARC_TAN_HYP }, + { "ACOTH" , SC_OPCODE_ARC_COT_HYP }, + { "CSC" , SC_OPCODE_COSECANT }, + { "SEC" , SC_OPCODE_SECANT }, + { "CSCH" , SC_OPCODE_COSECANT_HYP }, + { "SECH" , SC_OPCODE_SECANT_HYP }, + { "EXP" , SC_OPCODE_EXP }, + { "LN" , SC_OPCODE_LN }, + { "SQRT" , SC_OPCODE_SQRT }, + { "FACT" , SC_OPCODE_FACT }, + { "YEAR" , SC_OPCODE_GET_YEAR }, + { "MONTH" , SC_OPCODE_GET_MONTH }, + { "DAY" , SC_OPCODE_GET_DAY }, + { "HOUR" , SC_OPCODE_GET_HOUR }, + { "MINUTE" , SC_OPCODE_GET_MIN }, + { "SECOND" , SC_OPCODE_GET_SEC }, + { "SIGN" , SC_OPCODE_PLUS_MINUS }, + { "ABS" , SC_OPCODE_ABS }, + { "INT" , SC_OPCODE_INT }, + { "PHI" , SC_OPCODE_PHI }, + { "GAUSS" , SC_OPCODE_GAUSS }, + { "ISBLANK" , SC_OPCODE_IS_EMPTY }, + { "ISTEXT" , SC_OPCODE_IS_STRING }, + { "ISNONTEXT" , SC_OPCODE_IS_NON_STRING }, + { "ISLOGICAL" , SC_OPCODE_IS_LOGICAL }, + { "TYPE" , SC_OPCODE_TYPE }, + { "CELL" , SC_OPCODE_CELL }, + { "ISREF" , SC_OPCODE_IS_REF }, + { "ISNUMBER" , SC_OPCODE_IS_VALUE }, + { "ISFORMULA" , SC_OPCODE_IS_FORMULA }, + { "ISNA" , SC_OPCODE_IS_NV }, + { "ISERR" , SC_OPCODE_IS_ERR }, + { "ISERROR" , SC_OPCODE_IS_ERROR }, + { "ISEVEN" , SC_OPCODE_IS_EVEN }, + { "ISODD" , SC_OPCODE_IS_ODD }, + { "N" , SC_OPCODE_N }, + { "DATEVALUE" , SC_OPCODE_GET_DATE_VALUE }, + { "TIMEVALUE" , SC_OPCODE_GET_TIME_VALUE }, + { "CODE" , SC_OPCODE_CODE }, + { "TRIM" , SC_OPCODE_TRIM }, + { "UPPER" , SC_OPCODE_UPPER }, + { "PROPER" , SC_OPCODE_PROPER }, + { "LOWER" , SC_OPCODE_LOWER }, + { "LEN" , SC_OPCODE_LEN }, + { "T" , SC_OPCODE_T }, + { "VALUE" , SC_OPCODE_VALUE }, + { "CLEAN" , SC_OPCODE_CLEAN }, + { "CHAR" , SC_OPCODE_CHAR }, + { "JIS" , SC_OPCODE_JIS }, + { "ASC" , SC_OPCODE_ASC }, + { "UNICODE" , SC_OPCODE_UNICODE }, + { "UNICHAR" , SC_OPCODE_UNICHAR }, + { "LOG10" , SC_OPCODE_LOG10 }, + { "EVEN" , SC_OPCODE_EVEN }, + { "ODD" , SC_OPCODE_ODD }, + { "NORMSDIST" , SC_OPCODE_STD_NORM_DIST }, + { "NORM.S.DIST" , SC_OPCODE_STD_NORM_DIST_MS }, + { "FISHER" , SC_OPCODE_FISHER }, + { "FISHERINV" , SC_OPCODE_FISHER_INV }, + { "NORMSINV" , SC_OPCODE_S_NORM_INV }, + { "NORM.S.INV" , SC_OPCODE_S_NORM_INV_MS }, + { "GAMMALN" , SC_OPCODE_GAMMA_LN }, + { "GAMMALN.PRECISE" , SC_OPCODE_GAMMA_LN_MS }, + { "ERRORTYPE" , SC_OPCODE_ERROR_TYPE }, + { "ERROR.TYPE" , SC_OPCODE_ERROR_TYPE_ODF }, + { "FORMULA" , SC_OPCODE_FORMULA }, + { "ATAN2" , SC_OPCODE_ARC_TAN_2 }, + { "CEILING.MATH" , SC_OPCODE_CEIL_MATH }, + { "CEILING" , SC_OPCODE_CEIL }, + { "CEILING.XCL" , SC_OPCODE_CEIL_MS }, + { "CEILING.PRECISE" , SC_OPCODE_CEIL_PRECISE }, + { "ISO.CEILING" , SC_OPCODE_CEIL_ISO }, + { "FLOOR" , SC_OPCODE_FLOOR }, + { "FLOOR.XCL" , SC_OPCODE_FLOOR_MS }, + { "FLOOR.MATH" , SC_OPCODE_FLOOR_MATH }, + { "FLOOR.PRECISE" , SC_OPCODE_FLOOR_PRECISE }, + { "ROUND" , SC_OPCODE_ROUND }, + { "ROUNDUP" , SC_OPCODE_ROUND_UP }, + { "ROUNDDOWN" , SC_OPCODE_ROUND_DOWN }, + { "TRUNC" , SC_OPCODE_TRUNC }, + { "LOG" , SC_OPCODE_LOG }, + { "POWER" , SC_OPCODE_POWER }, + { "GCD" , SC_OPCODE_GCD }, + { "LCM" , SC_OPCODE_LCM }, + { "MOD" , SC_OPCODE_MOD }, + { "SUMPRODUCT" , SC_OPCODE_SUM_PRODUCT }, + { "SUMSQ" , SC_OPCODE_SUM_SQ }, + { "SUMX2MY2" , SC_OPCODE_SUM_X2MY2 }, + { "SUMX2PY2" , SC_OPCODE_SUM_X2DY2 }, + { "SUMXMY2" , SC_OPCODE_SUM_XMY2 }, + { "DATE" , SC_OPCODE_GET_DATE }, + { "TIME" , SC_OPCODE_GET_TIME }, + { "DAYS" , SC_OPCODE_GET_DIFF_DATE }, + { "DAYS360" , SC_OPCODE_GET_DIFF_DATE_360 }, + { "DATEDIF" , SC_OPCODE_GET_DATEDIF }, + { "MIN" , SC_OPCODE_MIN }, + { "MINA" , SC_OPCODE_MIN_A }, + { "MAX" , SC_OPCODE_MAX }, + { "MAXA" , SC_OPCODE_MAX_A }, + { "SUM" , SC_OPCODE_SUM }, + { "PRODUCT" , SC_OPCODE_PRODUCT }, + { "AVERAGE" , SC_OPCODE_AVERAGE }, + { "AVERAGEA" , SC_OPCODE_AVERAGE_A }, + { "COUNT" , SC_OPCODE_COUNT }, + { "COUNTA" , SC_OPCODE_COUNT_2 }, + { "NPV" , SC_OPCODE_NPV }, + { "IRR" , SC_OPCODE_IRR }, + { "MIRR" , SC_OPCODE_MIRR }, + { "ISPMT" , SC_OPCODE_ISPMT }, + { "VAR" , SC_OPCODE_VAR }, + { "VARA" , SC_OPCODE_VAR_A }, + { "VARP" , SC_OPCODE_VAR_P }, + { "VARPA" , SC_OPCODE_VAR_P_A }, + { "VAR.P" , SC_OPCODE_VAR_P_MS }, + { "VAR.S" , SC_OPCODE_VAR_S }, + { "STDEV" , SC_OPCODE_ST_DEV }, + { "STDEVA" , SC_OPCODE_ST_DEV_A }, + { "STDEVP" , SC_OPCODE_ST_DEV_P }, + { "STDEVPA" , SC_OPCODE_ST_DEV_P_A }, + { "STDEV.P" , SC_OPCODE_ST_DEV_P_MS }, + { "STDEV.S" , SC_OPCODE_ST_DEV_S }, + { "B" , SC_OPCODE_B }, + { "NORMDIST" , SC_OPCODE_NORM_DIST }, + { "NORM.DIST" , SC_OPCODE_NORM_DIST_MS }, + { "EXPONDIST" , SC_OPCODE_EXP_DIST }, + { "EXPON.DIST" , SC_OPCODE_EXP_DIST_MS }, + { "BINOMDIST" , SC_OPCODE_BINOM_DIST }, + { "BINOM.DIST" , SC_OPCODE_BINOM_DIST_MS }, + { "POISSON" , SC_OPCODE_POISSON_DIST }, + { "POISSON.DIST" , SC_OPCODE_POISSON_DIST_MS }, + { "COMBIN" , SC_OPCODE_COMBIN }, + { "COMBINA" , SC_OPCODE_COMBIN_A }, + { "PERMUT" , SC_OPCODE_PERMUT }, + { "PERMUTATIONA" , SC_OPCODE_PERMUTATION_A }, + { "PV" , SC_OPCODE_PV }, + { "SYD" , SC_OPCODE_SYD }, + { "DDB" , SC_OPCODE_DDB }, + { "DB" , SC_OPCODE_DB }, + { "VDB" , SC_OPCODE_VBD }, + { "DURATION" , SC_OPCODE_PDURATION }, + { "SLN" , SC_OPCODE_SLN }, + { "PMT" , SC_OPCODE_PMT }, + { "COLUMNS" , SC_OPCODE_COLUMNS }, + { "ROWS" , SC_OPCODE_ROWS }, + { "SHEETS" , SC_OPCODE_SHEETS }, + { "COLUMN" , SC_OPCODE_COLUMN }, + { "ROW" , SC_OPCODE_ROW }, + { "SHEET" , SC_OPCODE_SHEET }, + { "ZGZ" , SC_OPCODE_RRI }, + { "FV" , SC_OPCODE_FV }, + { "NPER" , SC_OPCODE_NPER }, + { "RATE" , SC_OPCODE_RATE }, + { "IPMT" , SC_OPCODE_IPMT }, + { "PPMT" , SC_OPCODE_PPMT }, + { "CUMIPMT" , SC_OPCODE_CUM_IPMT }, + { "CUMPRINC" , SC_OPCODE_CUM_PRINC }, + { "EFFECTIVE" , SC_OPCODE_EFFECT }, + { "NOMINAL" , SC_OPCODE_NOMINAL }, + { "SUBTOTAL" , SC_OPCODE_SUB_TOTAL }, + { "DSUM" , SC_OPCODE_DB_SUM }, + { "DCOUNT" , SC_OPCODE_DB_COUNT }, + { "DCOUNTA" , SC_OPCODE_DB_COUNT_2 }, + { "DAVERAGE" , SC_OPCODE_DB_AVERAGE }, + { "DGET" , SC_OPCODE_DB_GET }, + { "DMAX" , SC_OPCODE_DB_MAX }, + { "DMIN" , SC_OPCODE_DB_MIN }, + { "DPRODUCT" , SC_OPCODE_DB_PRODUCT }, + { "DSTDEV" , SC_OPCODE_DB_STD_DEV }, + { "DSTDEVP" , SC_OPCODE_DB_STD_DEV_P }, + { "DVAR" , SC_OPCODE_DB_VAR }, + { "DVARP" , SC_OPCODE_DB_VAR_P }, + { "INDIRECT" , SC_OPCODE_INDIRECT }, + { "ADDRESS" , SC_OPCODE_ADDRESS }, + { "MATCH" , SC_OPCODE_MATCH }, + { "COUNTBLANK" , SC_OPCODE_COUNT_EMPTY_CELLS }, + { "COUNTIF" , SC_OPCODE_COUNT_IF }, + { "SUMIF" , SC_OPCODE_SUM_IF }, + { "AVERAGEIF" , SC_OPCODE_AVERAGE_IF }, + { "SUMIFS" , SC_OPCODE_SUM_IFS }, + { "AVERAGEIFS" , SC_OPCODE_AVERAGE_IFS }, + { "COUNTIFS" , SC_OPCODE_COUNT_IFS }, + { "LOOKUP" , SC_OPCODE_LOOKUP }, + { "VLOOKUP" , SC_OPCODE_V_LOOKUP }, + { "HLOOKUP" , SC_OPCODE_H_LOOKUP }, + { "MULTIRANGE" , SC_OPCODE_MULTI_AREA }, // legacy for range list (union) + { "OFFSET" , SC_OPCODE_OFFSET }, + { "INDEX" , SC_OPCODE_INDEX }, // ?? first character = I ?? + { "AREAS" , SC_OPCODE_AREAS }, + { "DOLLAR" , SC_OPCODE_CURRENCY }, + { "REPLACE" , SC_OPCODE_REPLACE }, + { "FIXED" , SC_OPCODE_FIXED }, + { "FIND" , SC_OPCODE_FIND }, + { "EXACT" , SC_OPCODE_EXACT }, + { "LEFT" , SC_OPCODE_LEFT }, + { "RIGHT" , SC_OPCODE_RIGHT }, + { "SEARCH" , SC_OPCODE_SEARCH }, + { "MID" , SC_OPCODE_MID }, + { "LENB" , SC_OPCODE_LENB }, + { "RIGHTB" , SC_OPCODE_RIGHTB }, + { "LEFTB" , SC_OPCODE_LEFTB }, + { "REPLACEB" , SC_OPCODE_REPLACEB }, + { "MIDB" , SC_OPCODE_MIDB }, + { "TEXT" , SC_OPCODE_TEXT }, + { "SUBSTITUTE" , SC_OPCODE_SUBSTITUTE }, + { "REPT" , SC_OPCODE_REPT }, + { "CONCATENATE" , SC_OPCODE_CONCAT }, + { "CONCAT" , SC_OPCODE_CONCAT_MS }, + { "TEXTJOIN" , SC_OPCODE_TEXTJOIN_MS }, + { "IFS" , SC_OPCODE_IFS_MS }, + { "SWITCH" , SC_OPCODE_SWITCH_MS }, + { "MINIFS" , SC_OPCODE_MINIFS_MS }, + { "MAXIFS" , SC_OPCODE_MAXIFS_MS }, + { "MVALUE" , SC_OPCODE_MAT_VALUE }, + { "MDETERM" , SC_OPCODE_MAT_DET }, + { "MINVERSE" , SC_OPCODE_MAT_INV }, + { "MMULT" , SC_OPCODE_MAT_MULT }, + { "TRANSPOSE" , SC_OPCODE_MAT_TRANS }, + { "MUNIT" , SC_OPCODE_MATRIX_UNIT }, + { "GOALSEEK" , SC_OPCODE_BACK_SOLVER }, + { "HYPGEOMDIST" , SC_OPCODE_HYP_GEOM_DIST }, + { "HYPGEOM.DIST" , SC_OPCODE_HYP_GEOM_DIST_MS }, + { "LOGNORMDIST" , SC_OPCODE_LOG_NORM_DIST }, + { "LOGNORM.DIST" , SC_OPCODE_LOG_NORM_DIST_MS }, + { "TDIST" , SC_OPCODE_T_DIST }, + { "T.DIST.2T" , SC_OPCODE_T_DIST_2T }, + { "T.DIST" , SC_OPCODE_T_DIST_MS }, + { "T.DIST.RT" , SC_OPCODE_T_DIST_RT }, + { "FDIST" , SC_OPCODE_F_DIST }, + { "F.DIST" , SC_OPCODE_F_DIST_LT }, + { "F.DIST.RT" , SC_OPCODE_F_DIST_RT }, + { "CHIDIST" , SC_OPCODE_CHI_DIST }, + { "CHISQ.DIST.RT" , SC_OPCODE_CHI_DIST_MS }, + { "WEIBULL" , SC_OPCODE_WEIBULL }, + { "WEIBULL.DIST" , SC_OPCODE_WEIBULL_MS }, + { "NEGBINOMDIST" , SC_OPCODE_NEG_BINOM_VERT }, + { "NEGBINOM.DIST" , SC_OPCODE_NEG_BINOM_DIST_MS }, + { "CRITBINOM" , SC_OPCODE_CRIT_BINOM }, + { "BINOM.INV" , SC_OPCODE_BINOM_INV }, + { "KURT" , SC_OPCODE_KURT }, + { "HARMEAN" , SC_OPCODE_HAR_MEAN }, + { "GEOMEAN" , SC_OPCODE_GEO_MEAN }, + { "STANDARDIZE" , SC_OPCODE_STANDARD }, + { "AVEDEV" , SC_OPCODE_AVE_DEV }, + { "SKEW" , SC_OPCODE_SKEW }, + { "SKEWP" , SC_OPCODE_SKEWP }, + { "DEVSQ" , SC_OPCODE_DEV_SQ }, + { "MEDIAN" , SC_OPCODE_MEDIAN }, + { "MODE" , SC_OPCODE_MODAL_VALUE }, + { "MODE.SNGL" , SC_OPCODE_MODAL_VALUE_MS }, + { "MODE.MULT" , SC_OPCODE_MODAL_VALUE_MULTI }, + { "ZTEST" , SC_OPCODE_Z_TEST }, + { "Z.TEST" , SC_OPCODE_Z_TEST_MS }, + { "AGGREGATE" , SC_OPCODE_AGGREGATE }, + { "TTEST" , SC_OPCODE_T_TEST }, + { "T.TEST" , SC_OPCODE_T_TEST_MS }, + { "RANK" , SC_OPCODE_RANK }, + { "PERCENTILE" , SC_OPCODE_PERCENTILE }, + { "PERCENTRANK" , SC_OPCODE_PERCENT_RANK }, + { "PERCENTILE.INC" , SC_OPCODE_PERCENTILE_INC }, + { "PERCENTRANK.INC" , SC_OPCODE_PERCENT_RANK_INC }, + { "QUARTILE.INC" , SC_OPCODE_QUARTILE_INC }, + { "RANK.EQ" , SC_OPCODE_RANK_EQ }, + { "PERCENTILE.EXC" , SC_OPCODE_PERCENTILE_EXC }, + { "PERCENTRANK.EXC" , SC_OPCODE_PERCENT_RANK_EXC }, + { "QUARTILE.EXC" , SC_OPCODE_QUARTILE_EXC }, + { "RANK.AVG" , SC_OPCODE_RANK_AVG }, + { "LARGE" , SC_OPCODE_LARGE }, + { "SMALL" , SC_OPCODE_SMALL }, + { "FREQUENCY" , SC_OPCODE_FREQUENCY }, + { "QUARTILE" , SC_OPCODE_QUARTILE }, + { "NORMINV" , SC_OPCODE_NORM_INV }, + { "NORM.INV" , SC_OPCODE_NORM_INV_MS }, + { "CONFIDENCE" , SC_OPCODE_CONFIDENCE }, + { "CONFIDENCE.NORM" , SC_OPCODE_CONFIDENCE_N }, + { "CONFIDENCE.T" , SC_OPCODE_CONFIDENCE_T }, + { "FTEST" , SC_OPCODE_F_TEST }, + { "F.TEST" , SC_OPCODE_F_TEST_MS }, + { "TRIMMEAN" , SC_OPCODE_TRIM_MEAN }, + { "PROB" , SC_OPCODE_PROB }, + { "CORREL" , SC_OPCODE_CORREL }, + { "COVAR" , SC_OPCODE_COVAR }, + { "COVARIANCE.P" , SC_OPCODE_COVARIANCE_P }, + { "COVARIANCE.S" , SC_OPCODE_COVARIANCE_S }, + { "PEARSON" , SC_OPCODE_PEARSON }, + { "RSQ" , SC_OPCODE_RSQ }, + { "STEYX" , SC_OPCODE_STEYX }, + { "SLOPE" , SC_OPCODE_SLOPE }, + { "INTERCEPT" , SC_OPCODE_INTERCEPT }, + { "TREND" , SC_OPCODE_TREND }, + { "GROWTH" , SC_OPCODE_GROWTH }, + { "LINEST" , SC_OPCODE_LINEST }, + { "LOGEST" , SC_OPCODE_LOGEST }, + { "FORECAST" , SC_OPCODE_FORECAST }, + { "FORECAST.ETS.ADD" , SC_OPCODE_FORECAST_ETS_ADD }, + { "FORECAST.ETS.SEASONALITY" , SC_OPCODE_FORECAST_ETS_SEA }, + { "FORECAST.ETS.MULT" , SC_OPCODE_FORECAST_ETS_MUL }, + { "FORECAST.ETS.PI.ADD" , SC_OPCODE_FORECAST_ETS_PIA }, + { "FORECAST.ETS.PI.MULT" , SC_OPCODE_FORECAST_ETS_PIM }, + { "FORECAST.ETS.STAT.ADD" , SC_OPCODE_FORECAST_ETS_STA }, + { "FORECAST.ETS.STAT.MULT" , SC_OPCODE_FORECAST_ETS_STM }, + { "FORECAST.LINEAR" , SC_OPCODE_FORECAST_LIN }, + { "CHIINV" , SC_OPCODE_CHI_INV }, + { "CHISQ.INV.RT" , SC_OPCODE_CHI_INV_MS }, + { "GAMMADIST" , SC_OPCODE_GAMMA_DIST }, + { "GAMMA.DIST" , SC_OPCODE_GAMMA_DIST_MS }, + { "GAMMAINV" , SC_OPCODE_GAMMA_INV }, + { "GAMMA.INV" , SC_OPCODE_GAMMA_INV_MS }, + { "TINV" , SC_OPCODE_T_INV }, + { "T.INV.2T" , SC_OPCODE_T_INV_2T }, + { "T.INV" , SC_OPCODE_T_INV_MS }, + { "FINV" , SC_OPCODE_F_INV }, + { "F.INV" , SC_OPCODE_F_INV_LT }, + { "F.INV.RT" , SC_OPCODE_F_INV_RT }, + { "CHITEST" , SC_OPCODE_CHI_TEST }, + { "CHISQ.TEST" , SC_OPCODE_CHI_TEST_MS }, + { "LOGINV" , SC_OPCODE_LOG_INV }, + { "LOGNORM.INV" , SC_OPCODE_LOG_INV_MS }, + { "TABLE" , SC_OPCODE_TABLE_OP }, + { "BETADIST" , SC_OPCODE_BETA_DIST }, + { "BETAINV" , SC_OPCODE_BETA_INV }, + { "BETA.DIST" , SC_OPCODE_BETA_DIST_MS }, + { "BETA.INV" , SC_OPCODE_BETA_INV_MS }, + { "WEEKNUM" , SC_OPCODE_WEEK }, + { "ISOWEEKNUM" , SC_OPCODE_ISOWEEKNUM }, + { "WEEKNUM_OOO" , SC_OPCODE_WEEKNUM_OOO }, + { "EASTERSUNDAY" , SC_OPCODE_EASTERSUNDAY }, + { "WEEKDAY" , SC_OPCODE_GET_DAY_OF_WEEK }, + { "NETWORKDAYS" , SC_OPCODE_NETWORKDAYS }, + { "NETWORKDAYS.INTL" , SC_OPCODE_NETWORKDAYS_MS }, + { "WORKDAY.INTL" , SC_OPCODE_WORKDAY_MS }, + { "#NAME!" , SC_OPCODE_NO_NAME }, + { "STYLE" , SC_OPCODE_STYLE }, + { "DDE" , SC_OPCODE_DDE }, + { "BASE" , SC_OPCODE_BASE }, + { "DECIMAL" , SC_OPCODE_DECIMAL }, + { "CONVERT" , SC_OPCODE_CONVERT_OOO }, + { "ROMAN" , SC_OPCODE_ROMAN }, + { "ARABIC" , SC_OPCODE_ARABIC }, + { "HYPERLINK" , SC_OPCODE_HYPERLINK }, + { "INFO" , SC_OPCODE_INFO }, + { "BAHTTEXT" , SC_OPCODE_BAHTTEXT }, + { "GETPIVOTDATA" , SC_OPCODE_GET_PIVOT_DATA }, + { "EUROCONVERT" , SC_OPCODE_EUROCONVERT }, + { "NUMBERVALUE" , SC_OPCODE_NUMBERVALUE }, + { "GAMMA" , SC_OPCODE_GAMMA }, + { "CHISQDIST" , SC_OPCODE_CHISQ_DIST }, + { "CHISQ.DIST" , SC_OPCODE_CHISQ_DIST_MS }, + { "CHISQ.INV" , SC_OPCODE_CHISQ_INV_MS }, + { "CHISQINV" , SC_OPCODE_CHISQ_INV }, + { "BITAND" , SC_OPCODE_BITAND }, + { "BITOR" , SC_OPCODE_BITOR }, + { "BITXOR" , SC_OPCODE_BITXOR }, + { "BITRSHIFT" , SC_OPCODE_BITRSHIFT }, + { "BITLSHIFT" , SC_OPCODE_BITLSHIFT }, + { "#NULL!" , SC_OPCODE_ERROR_NULL }, + { "#DIV/0!" , SC_OPCODE_ERROR_DIVZERO }, + { "#VALUE!" , SC_OPCODE_ERROR_VALUE }, + { "#REF!" , SC_OPCODE_ERROR_REF }, + { "#NAME?" , SC_OPCODE_ERROR_NAME }, + { "#NUM!" , SC_OPCODE_ERROR_NUM }, + { "#N/A" , SC_OPCODE_ERROR_NA }, + /* END defined ERROR.TYPE() values. */ + { "FILTERXML" , SC_OPCODE_FILTERXML }, + { "WEBSERVICE" , SC_OPCODE_WEBSERVICE }, + { "COLOR" , SC_OPCODE_COLOR }, + { "ERF.PRECISE" , SC_OPCODE_ERF_MS }, + { "ERFC.PRECISE" , SC_OPCODE_ERFC_MS }, + { "ENCODEURL" , SC_OPCODE_ENCODEURL }, + { "RAWSUBTRACT" , SC_OPCODE_RAWSUBTRACT }, + { "ROUNDSIG" , SC_OPCODE_ROUNDSIG }, + { nullptr, -1 } +}; + +/** These English names can be chosen in the UI and can be changed. They + should match the [en-US] names of RID_STRLIST_FUNCTION_NAMES below. */ +// As such they are a duplicate, but we can not have two string localizations +// at the same time. +const std::pair RID_STRLIST_FUNCTION_NAMES_ENGLISH[] = +{ + { "IF" , SC_OPCODE_IF }, + { "IFERROR" , SC_OPCODE_IF_ERROR }, + { "IFNA" , SC_OPCODE_IF_NA }, + { "CHOOSE" , SC_OPCODE_CHOOSE }, + { "(" , SC_OPCODE_OPEN }, + { ")" , SC_OPCODE_CLOSE }, + { "[" , SC_OPCODE_TABLE_REF_OPEN }, + { "]" , SC_OPCODE_TABLE_REF_CLOSE }, + { "#All" , SC_OPCODE_TABLE_REF_ITEM_ALL }, + { "#Headers" , SC_OPCODE_TABLE_REF_ITEM_HEADERS }, + { "#Data" , SC_OPCODE_TABLE_REF_ITEM_DATA }, + { "#Totals" , SC_OPCODE_TABLE_REF_ITEM_TOTALS }, + { "#This Row" , SC_OPCODE_TABLE_REF_ITEM_THIS_ROW }, + { "{" , SC_OPCODE_ARRAY_OPEN }, + { "}" , SC_OPCODE_ARRAY_CLOSE }, + { "|" , SC_OPCODE_ARRAY_ROW_SEP }, + { ";" , SC_OPCODE_ARRAY_COL_SEP }, + { ";" , SC_OPCODE_SEP }, + { "%" , SC_OPCODE_PERCENT_SIGN }, + { "+" , SC_OPCODE_ADD }, + { "-" , SC_OPCODE_SUB }, + { "*" , SC_OPCODE_MUL }, + { "/" , SC_OPCODE_DIV }, + { "&" , SC_OPCODE_AMPERSAND }, + { "^" , SC_OPCODE_POW }, + { "=" , SC_OPCODE_EQUAL }, + { "<>" , SC_OPCODE_NOT_EQUAL }, + { "<" , SC_OPCODE_LESS }, + { ">" , SC_OPCODE_GREATER }, + { "<=" , SC_OPCODE_LESS_EQUAL }, + { ">=" , SC_OPCODE_GREATER_EQUAL }, + { "AND" , SC_OPCODE_AND }, + { "OR" , SC_OPCODE_OR }, + { "XOR" , SC_OPCODE_XOR }, + { "!" , SC_OPCODE_INTERSECT }, + { "~" , SC_OPCODE_UNION }, + { ":" , SC_OPCODE_RANGE }, + { "NOT" , SC_OPCODE_NOT }, + { "NEG" , SC_OPCODE_NEG }, + { "-" , SC_OPCODE_NEG_SUB }, + { "PI" , SC_OPCODE_PI }, + { "RAND" , SC_OPCODE_RANDOM }, + { "TRUE" , SC_OPCODE_TRUE }, + { "FALSE" , SC_OPCODE_FALSE }, + { "TODAY" , SC_OPCODE_GET_ACT_DATE }, + { "NOW" , SC_OPCODE_GET_ACT_TIME }, + { "NA" , SC_OPCODE_NO_VALUE }, + { "CURRENT" , SC_OPCODE_CURRENT }, + { "DEGREES" , SC_OPCODE_DEG }, + { "RADIANS" , SC_OPCODE_RAD }, + { "SIN" , SC_OPCODE_SIN }, + { "COS" , SC_OPCODE_COS }, + { "TAN" , SC_OPCODE_TAN }, + { "COT" , SC_OPCODE_COT }, + { "ASIN" , SC_OPCODE_ARC_SIN }, + { "ACOS" , SC_OPCODE_ARC_COS }, + { "ATAN" , SC_OPCODE_ARC_TAN }, + { "ACOT" , SC_OPCODE_ARC_COT }, + { "SINH" , SC_OPCODE_SIN_HYP }, + { "COSH" , SC_OPCODE_COS_HYP }, + { "TANH" , SC_OPCODE_TAN_HYP }, + { "COTH" , SC_OPCODE_COT_HYP }, + { "ASINH" , SC_OPCODE_ARC_SIN_HYP }, + { "ACOSH" , SC_OPCODE_ARC_COS_HYP }, + { "ATANH" , SC_OPCODE_ARC_TAN_HYP }, + { "ACOTH" , SC_OPCODE_ARC_COT_HYP }, + { "CSC" , SC_OPCODE_COSECANT }, + { "SEC" , SC_OPCODE_SECANT }, + { "CSCH" , SC_OPCODE_COSECANT_HYP }, + { "SECH" , SC_OPCODE_SECANT_HYP }, + { "EXP" , SC_OPCODE_EXP }, + { "LN" , SC_OPCODE_LN }, + { "SQRT" , SC_OPCODE_SQRT }, + { "FACT" , SC_OPCODE_FACT }, + { "YEAR" , SC_OPCODE_GET_YEAR }, + { "MONTH" , SC_OPCODE_GET_MONTH }, + { "DAY" , SC_OPCODE_GET_DAY }, + { "HOUR" , SC_OPCODE_GET_HOUR }, + { "MINUTE" , SC_OPCODE_GET_MIN }, + { "SECOND" , SC_OPCODE_GET_SEC }, + { "SIGN" , SC_OPCODE_PLUS_MINUS }, + { "ABS" , SC_OPCODE_ABS }, + { "INT" , SC_OPCODE_INT }, + { "PHI" , SC_OPCODE_PHI }, + { "GAUSS" , SC_OPCODE_GAUSS }, + { "ISBLANK" , SC_OPCODE_IS_EMPTY }, + { "ISTEXT" , SC_OPCODE_IS_STRING }, + { "ISNONTEXT" , SC_OPCODE_IS_NON_STRING }, + { "ISLOGICAL" , SC_OPCODE_IS_LOGICAL }, + { "TYPE" , SC_OPCODE_TYPE }, + { "CELL" , SC_OPCODE_CELL }, + { "ISREF" , SC_OPCODE_IS_REF }, + { "ISNUMBER" , SC_OPCODE_IS_VALUE }, + { "ISFORMULA" , SC_OPCODE_IS_FORMULA }, + { "ISNA" , SC_OPCODE_IS_NV }, + { "ISERR" , SC_OPCODE_IS_ERR }, + { "ISERROR" , SC_OPCODE_IS_ERROR }, + { "ISEVEN" , SC_OPCODE_IS_EVEN }, + { "ISODD" , SC_OPCODE_IS_ODD }, + { "N" , SC_OPCODE_N }, + { "DATEVALUE" , SC_OPCODE_GET_DATE_VALUE }, + { "TIMEVALUE" , SC_OPCODE_GET_TIME_VALUE }, + { "CODE" , SC_OPCODE_CODE }, + { "TRIM" , SC_OPCODE_TRIM }, + { "UPPER" , SC_OPCODE_UPPER }, + { "PROPER" , SC_OPCODE_PROPER }, + { "LOWER" , SC_OPCODE_LOWER }, + { "LEN" , SC_OPCODE_LEN }, + { "T" , SC_OPCODE_T }, + { "VALUE" , SC_OPCODE_VALUE }, + { "CLEAN" , SC_OPCODE_CLEAN }, + { "CHAR" , SC_OPCODE_CHAR }, + { "JIS" , SC_OPCODE_JIS }, + { "ASC" , SC_OPCODE_ASC }, + { "UNICODE" , SC_OPCODE_UNICODE }, + { "UNICHAR" , SC_OPCODE_UNICHAR }, + { "LOG10" , SC_OPCODE_LOG10 }, + { "EVEN" , SC_OPCODE_EVEN }, + { "ODD" , SC_OPCODE_ODD }, + { "NORMSDIST" , SC_OPCODE_STD_NORM_DIST }, + { "NORM.S.DIST" , SC_OPCODE_STD_NORM_DIST_MS }, + { "FISHER" , SC_OPCODE_FISHER }, + { "FISHERINV" , SC_OPCODE_FISHER_INV }, + { "NORMSINV" , SC_OPCODE_S_NORM_INV }, + { "NORM.S.INV" , SC_OPCODE_S_NORM_INV_MS }, + { "GAMMALN" , SC_OPCODE_GAMMA_LN }, + { "GAMMALN.PRECISE" , SC_OPCODE_GAMMA_LN_MS }, + { "ERRORTYPE" , SC_OPCODE_ERROR_TYPE }, + { "ERROR.TYPE" , SC_OPCODE_ERROR_TYPE_ODF }, + { "FORMULA" , SC_OPCODE_FORMULA }, + { "ATAN2" , SC_OPCODE_ARC_TAN_2 }, + { "CEILING.MATH" , SC_OPCODE_CEIL_MATH }, + { "CEILING" , SC_OPCODE_CEIL }, + { "CEILING.XCL" , SC_OPCODE_CEIL_MS }, + { "CEILING.PRECISE" , SC_OPCODE_CEIL_PRECISE }, + { "ISO.CEILING" , SC_OPCODE_CEIL_ISO }, + { "FLOOR" , SC_OPCODE_FLOOR }, + { "FLOOR.XCL" , SC_OPCODE_FLOOR_MS }, + { "FLOOR.MATH" , SC_OPCODE_FLOOR_MATH }, + { "FLOOR.PRECISE" , SC_OPCODE_FLOOR_PRECISE }, + { "ROUND" , SC_OPCODE_ROUND }, + { "ROUNDUP" , SC_OPCODE_ROUND_UP }, + { "ROUNDDOWN" , SC_OPCODE_ROUND_DOWN }, + { "TRUNC" , SC_OPCODE_TRUNC }, + { "LOG" , SC_OPCODE_LOG }, + { "POWER" , SC_OPCODE_POWER }, + { "GCD" , SC_OPCODE_GCD }, + { "LCM" , SC_OPCODE_LCM }, + { "MOD" , SC_OPCODE_MOD }, + { "SUMPRODUCT" , SC_OPCODE_SUM_PRODUCT }, + { "SUMSQ" , SC_OPCODE_SUM_SQ }, + { "SUMX2MY2" , SC_OPCODE_SUM_X2MY2 }, + { "SUMX2PY2" , SC_OPCODE_SUM_X2DY2 }, + { "SUMXMY2" , SC_OPCODE_SUM_XMY2 }, + { "DATE" , SC_OPCODE_GET_DATE }, + { "TIME" , SC_OPCODE_GET_TIME }, + { "DAYS" , SC_OPCODE_GET_DIFF_DATE }, + { "DAYS360" , SC_OPCODE_GET_DIFF_DATE_360 }, + { "DATEDIF" , SC_OPCODE_GET_DATEDIF }, + { "MIN" , SC_OPCODE_MIN }, + { "MINA" , SC_OPCODE_MIN_A }, + { "MAX" , SC_OPCODE_MAX }, + { "MAXA" , SC_OPCODE_MAX_A }, + { "SUM" , SC_OPCODE_SUM }, + { "PRODUCT" , SC_OPCODE_PRODUCT }, + { "AVERAGE" , SC_OPCODE_AVERAGE }, + { "AVERAGEA" , SC_OPCODE_AVERAGE_A }, + { "COUNT" , SC_OPCODE_COUNT }, + { "COUNTA" , SC_OPCODE_COUNT_2 }, + { "NPV" , SC_OPCODE_NPV }, + { "IRR" , SC_OPCODE_IRR }, + { "MIRR" , SC_OPCODE_MIRR }, + { "ISPMT" , SC_OPCODE_ISPMT }, + { "VAR" , SC_OPCODE_VAR }, + { "VARA" , SC_OPCODE_VAR_A }, + { "VARP" , SC_OPCODE_VAR_P }, + { "VARPA" , SC_OPCODE_VAR_P_A }, + { "VAR.P" , SC_OPCODE_VAR_P_MS }, + { "VAR.S" , SC_OPCODE_VAR_S }, + { "STDEV" , SC_OPCODE_ST_DEV }, + { "STDEVA" , SC_OPCODE_ST_DEV_A }, + { "STDEVP" , SC_OPCODE_ST_DEV_P }, + { "STDEVPA" , SC_OPCODE_ST_DEV_P_A }, + { "STDEV.P" , SC_OPCODE_ST_DEV_P_MS }, + { "STDEV.S" , SC_OPCODE_ST_DEV_S }, + { "B" , SC_OPCODE_B }, + { "NORMDIST" , SC_OPCODE_NORM_DIST }, + { "NORM.DIST" , SC_OPCODE_NORM_DIST_MS }, + { "EXPONDIST" , SC_OPCODE_EXP_DIST }, + { "EXPON.DIST" , SC_OPCODE_EXP_DIST_MS }, + { "BINOMDIST" , SC_OPCODE_BINOM_DIST }, + { "BINOM.DIST" , SC_OPCODE_BINOM_DIST_MS }, + { "POISSON" , SC_OPCODE_POISSON_DIST }, + { "POISSON.DIST" , SC_OPCODE_POISSON_DIST_MS }, + { "COMBIN" , SC_OPCODE_COMBIN }, + { "COMBINA" , SC_OPCODE_COMBIN_A }, + { "PERMUT" , SC_OPCODE_PERMUT }, + { "PERMUTATIONA" , SC_OPCODE_PERMUTATION_A }, + { "PV" , SC_OPCODE_PV }, + { "SYD" , SC_OPCODE_SYD }, + { "DDB" , SC_OPCODE_DDB }, + { "DB" , SC_OPCODE_DB }, + { "VDB" , SC_OPCODE_VBD }, + { "PDURATION" , SC_OPCODE_PDURATION }, + { "SLN" , SC_OPCODE_SLN }, + { "PMT" , SC_OPCODE_PMT }, + { "COLUMNS" , SC_OPCODE_COLUMNS }, + { "ROWS" , SC_OPCODE_ROWS }, + { "SHEETS" , SC_OPCODE_SHEETS }, + { "COLUMN" , SC_OPCODE_COLUMN }, + { "ROW" , SC_OPCODE_ROW }, + { "SHEET" , SC_OPCODE_SHEET }, + { "ZGZ" , SC_OPCODE_RRI }, + { "FV" , SC_OPCODE_FV }, + { "NPER" , SC_OPCODE_NPER }, + { "RATE" , SC_OPCODE_RATE }, + { "IPMT" , SC_OPCODE_IPMT }, + { "PPMT" , SC_OPCODE_PPMT }, + { "CUMIPMT" , SC_OPCODE_CUM_IPMT }, + { "CUMPRINC" , SC_OPCODE_CUM_PRINC }, + { "EFFECTIVE" , SC_OPCODE_EFFECT }, + { "NOMINAL" , SC_OPCODE_NOMINAL }, + { "SUBTOTAL" , SC_OPCODE_SUB_TOTAL }, + { "DSUM" , SC_OPCODE_DB_SUM }, + { "DCOUNT" , SC_OPCODE_DB_COUNT }, + { "DCOUNTA" , SC_OPCODE_DB_COUNT_2 }, + { "DAVERAGE" , SC_OPCODE_DB_AVERAGE }, + { "DGET" , SC_OPCODE_DB_GET }, + { "DMAX" , SC_OPCODE_DB_MAX }, + { "DMIN" , SC_OPCODE_DB_MIN }, + { "DPRODUCT" , SC_OPCODE_DB_PRODUCT }, + { "DSTDEV" , SC_OPCODE_DB_STD_DEV }, + { "DSTDEVP" , SC_OPCODE_DB_STD_DEV_P }, + { "DVAR" , SC_OPCODE_DB_VAR }, + { "DVARP" , SC_OPCODE_DB_VAR_P }, + { "INDIRECT" , SC_OPCODE_INDIRECT }, + { "ADDRESS" , SC_OPCODE_ADDRESS }, + { "MATCH" , SC_OPCODE_MATCH }, + { "COUNTBLANK" , SC_OPCODE_COUNT_EMPTY_CELLS }, + { "COUNTIF" , SC_OPCODE_COUNT_IF }, + { "SUMIF" , SC_OPCODE_SUM_IF }, + { "AVERAGEIF" , SC_OPCODE_AVERAGE_IF }, + { "SUMIFS" , SC_OPCODE_SUM_IFS }, + { "AVERAGEIFS" , SC_OPCODE_AVERAGE_IFS }, + { "COUNTIFS" , SC_OPCODE_COUNT_IFS }, + { "LOOKUP" , SC_OPCODE_LOOKUP }, + { "VLOOKUP" , SC_OPCODE_V_LOOKUP }, + { "HLOOKUP" , SC_OPCODE_H_LOOKUP }, + { "MULTIRANGE" , SC_OPCODE_MULTI_AREA }, + { "OFFSET" , SC_OPCODE_OFFSET }, + { "INDEX" , SC_OPCODE_INDEX }, + { "AREAS" , SC_OPCODE_AREAS }, + { "DOLLAR" , SC_OPCODE_CURRENCY }, + { "REPLACE" , SC_OPCODE_REPLACE }, + { "FIXED" , SC_OPCODE_FIXED }, + { "FIND" , SC_OPCODE_FIND }, + { "EXACT" , SC_OPCODE_EXACT }, + { "LEFT" , SC_OPCODE_LEFT }, + { "RIGHT" , SC_OPCODE_RIGHT }, + { "SEARCH" , SC_OPCODE_SEARCH }, + { "MID" , SC_OPCODE_MID }, + { "LENB" , SC_OPCODE_LENB }, + { "RIGHTB" , SC_OPCODE_RIGHTB }, + { "LEFTB" , SC_OPCODE_LEFTB }, + { "REPLACEB" , SC_OPCODE_REPLACEB }, + { "MIDB" , SC_OPCODE_MIDB }, + { "TEXT" , SC_OPCODE_TEXT }, + { "SUBSTITUTE" , SC_OPCODE_SUBSTITUTE }, + { "REPT" , SC_OPCODE_REPT }, + { "CONCATENATE" , SC_OPCODE_CONCAT }, + { "CONCAT" , SC_OPCODE_CONCAT_MS }, + { "TEXTJOIN" , SC_OPCODE_TEXTJOIN_MS }, + { "IFS" , SC_OPCODE_IFS_MS }, + { "SWITCH" , SC_OPCODE_SWITCH_MS }, + { "MINIFS" , SC_OPCODE_MINIFS_MS }, + { "MAXIFS" , SC_OPCODE_MAXIFS_MS }, + { "MVALUE" , SC_OPCODE_MAT_VALUE }, + { "MDETERM" , SC_OPCODE_MAT_DET }, + { "MINVERSE" , SC_OPCODE_MAT_INV }, + { "MMULT" , SC_OPCODE_MAT_MULT }, + { "TRANSPOSE" , SC_OPCODE_MAT_TRANS }, + { "MUNIT" , SC_OPCODE_MATRIX_UNIT }, + { "GOALSEEK" , SC_OPCODE_BACK_SOLVER }, + { "HYPGEOMDIST" , SC_OPCODE_HYP_GEOM_DIST }, + { "HYPGEOM.DIST" , SC_OPCODE_HYP_GEOM_DIST_MS }, + { "LOGNORMDIST" , SC_OPCODE_LOG_NORM_DIST }, + { "LOGNORM.DIST" , SC_OPCODE_LOG_NORM_DIST_MS }, + { "TDIST" , SC_OPCODE_T_DIST }, + { "T.DIST.2T" , SC_OPCODE_T_DIST_2T }, + { "T.DIST" , SC_OPCODE_T_DIST_MS }, + { "T.DIST.RT" , SC_OPCODE_T_DIST_RT }, + { "FDIST" , SC_OPCODE_F_DIST }, + { "F.DIST" , SC_OPCODE_F_DIST_LT }, + { "F.DIST.RT" , SC_OPCODE_F_DIST_RT }, + { "CHIDIST" , SC_OPCODE_CHI_DIST }, + { "CHISQ.DIST.RT" , SC_OPCODE_CHI_DIST_MS }, + { "WEIBULL" , SC_OPCODE_WEIBULL }, + { "WEIBULL.DIST" , SC_OPCODE_WEIBULL_MS }, + { "NEGBINOMDIST" , SC_OPCODE_NEG_BINOM_VERT }, + { "NEGBINOM.DIST" , SC_OPCODE_NEG_BINOM_DIST_MS }, + { "CRITBINOM" , SC_OPCODE_CRIT_BINOM }, + { "BINOM.INV" , SC_OPCODE_BINOM_INV }, + { "KURT" , SC_OPCODE_KURT }, + { "HARMEAN" , SC_OPCODE_HAR_MEAN }, + { "GEOMEAN" , SC_OPCODE_GEO_MEAN }, + { "STANDARDIZE" , SC_OPCODE_STANDARD }, + { "AVEDEV" , SC_OPCODE_AVE_DEV }, + { "SKEW" , SC_OPCODE_SKEW }, + { "SKEWP" , SC_OPCODE_SKEWP }, + { "DEVSQ" , SC_OPCODE_DEV_SQ }, + { "MEDIAN" , SC_OPCODE_MEDIAN }, + { "MODE" , SC_OPCODE_MODAL_VALUE }, + { "MODE.SNGL" , SC_OPCODE_MODAL_VALUE_MS }, + { "MODE.MULT" , SC_OPCODE_MODAL_VALUE_MULTI }, + { "ZTEST" , SC_OPCODE_Z_TEST }, + { "Z.TEST" , SC_OPCODE_Z_TEST_MS }, + { "AGGREGATE" , SC_OPCODE_AGGREGATE }, + { "TTEST" , SC_OPCODE_T_TEST }, + { "T.TEST" , SC_OPCODE_T_TEST_MS }, + { "RANK" , SC_OPCODE_RANK }, + { "PERCENTILE" , SC_OPCODE_PERCENTILE }, + { "PERCENTRANK" , SC_OPCODE_PERCENT_RANK }, + { "PERCENTILE.INC" , SC_OPCODE_PERCENTILE_INC }, + { "PERCENTRANK.INC" , SC_OPCODE_PERCENT_RANK_INC }, + { "QUARTILE.INC" , SC_OPCODE_QUARTILE_INC }, + { "RANK.EQ" , SC_OPCODE_RANK_EQ }, + { "PERCENTILE.EXC" , SC_OPCODE_PERCENTILE_EXC }, + { "PERCENTRANK.EXC" , SC_OPCODE_PERCENT_RANK_EXC }, + { "QUARTILE.EXC" , SC_OPCODE_QUARTILE_EXC }, + { "RANK.AVG" , SC_OPCODE_RANK_AVG }, + { "LARGE" , SC_OPCODE_LARGE }, + { "SMALL" , SC_OPCODE_SMALL }, + { "FREQUENCY" , SC_OPCODE_FREQUENCY }, + { "QUARTILE" , SC_OPCODE_QUARTILE }, + { "NORMINV" , SC_OPCODE_NORM_INV }, + { "NORM.INV" , SC_OPCODE_NORM_INV_MS }, + { "CONFIDENCE" , SC_OPCODE_CONFIDENCE }, + { "CONFIDENCE.NORM" , SC_OPCODE_CONFIDENCE_N }, + { "CONFIDENCE.T" , SC_OPCODE_CONFIDENCE_T }, + { "FTEST" , SC_OPCODE_F_TEST }, + { "F.TEST" , SC_OPCODE_F_TEST_MS }, + { "TRIMMEAN" , SC_OPCODE_TRIM_MEAN }, + { "PROB" , SC_OPCODE_PROB }, + { "CORREL" , SC_OPCODE_CORREL }, + { "COVAR" , SC_OPCODE_COVAR }, + { "COVARIANCE.P" , SC_OPCODE_COVARIANCE_P }, + { "COVARIANCE.S" , SC_OPCODE_COVARIANCE_S }, + { "PEARSON" , SC_OPCODE_PEARSON }, + { "RSQ" , SC_OPCODE_RSQ }, + { "STEYX" , SC_OPCODE_STEYX }, + { "SLOPE" , SC_OPCODE_SLOPE }, + { "INTERCEPT" , SC_OPCODE_INTERCEPT }, + { "TREND" , SC_OPCODE_TREND }, + { "GROWTH" , SC_OPCODE_GROWTH }, + { "LINEST" , SC_OPCODE_LINEST }, + { "LOGEST" , SC_OPCODE_LOGEST }, + { "FORECAST" , SC_OPCODE_FORECAST }, + { "FORECAST.ETS.ADD" , SC_OPCODE_FORECAST_ETS_ADD }, + { "FORECAST.ETS.SEASONALITY" , SC_OPCODE_FORECAST_ETS_SEA }, + { "FORECAST.ETS.MULT" , SC_OPCODE_FORECAST_ETS_MUL }, + { "FORECAST.ETS.PI.ADD" , SC_OPCODE_FORECAST_ETS_PIA }, + { "FORECAST.ETS.PI.MULT" , SC_OPCODE_FORECAST_ETS_PIM }, + { "FORECAST.ETS.STAT.ADD" , SC_OPCODE_FORECAST_ETS_STA }, + { "FORECAST.ETS.STAT.MULT" , SC_OPCODE_FORECAST_ETS_STM }, + { "FORECAST.LINEAR" , SC_OPCODE_FORECAST_LIN }, + { "CHIINV" , SC_OPCODE_CHI_INV }, + { "CHISQ.INV.RT" , SC_OPCODE_CHI_INV_MS }, + { "GAMMADIST" , SC_OPCODE_GAMMA_DIST }, + { "GAMMA.DIST" , SC_OPCODE_GAMMA_DIST_MS }, + { "GAMMAINV" , SC_OPCODE_GAMMA_INV }, + { "GAMMA.INV" , SC_OPCODE_GAMMA_INV_MS }, + { "TINV" , SC_OPCODE_T_INV }, + { "T.INV.2T" , SC_OPCODE_T_INV_2T }, + { "T.INV" , SC_OPCODE_T_INV_MS }, + { "FINV" , SC_OPCODE_F_INV }, + { "F.INV" , SC_OPCODE_F_INV_LT }, + { "F.INV.RT" , SC_OPCODE_F_INV_RT }, + { "CHITEST" , SC_OPCODE_CHI_TEST }, + { "CHISQ.TEST" , SC_OPCODE_CHI_TEST_MS }, + { "LOGINV" , SC_OPCODE_LOG_INV }, + { "LOGNORM.INV" , SC_OPCODE_LOG_INV_MS }, + { "TABLE" , SC_OPCODE_TABLE_OP }, + { "BETADIST" , SC_OPCODE_BETA_DIST }, + { "BETAINV" , SC_OPCODE_BETA_INV }, + { "BETA.DIST" , SC_OPCODE_BETA_DIST_MS }, + { "BETA.INV" , SC_OPCODE_BETA_INV_MS }, + { "WEEKNUM" , SC_OPCODE_WEEK }, + { "ISOWEEKNUM" , SC_OPCODE_ISOWEEKNUM }, + { "WEEKNUM_OOO" , SC_OPCODE_WEEKNUM_OOO }, + { "EASTERSUNDAY" , SC_OPCODE_EASTERSUNDAY }, + { "WEEKDAY" , SC_OPCODE_GET_DAY_OF_WEEK }, + { "NETWORKDAYS" , SC_OPCODE_NETWORKDAYS }, + { "NETWORKDAYS.INTL" , SC_OPCODE_NETWORKDAYS_MS }, + { "WORKDAY.INTL" , SC_OPCODE_WORKDAY_MS }, + { "#NAME!" , SC_OPCODE_NO_NAME }, + { "STYLE" , SC_OPCODE_STYLE }, + { "DDE" , SC_OPCODE_DDE }, + { "BASE" , SC_OPCODE_BASE }, + { "DECIMAL" , SC_OPCODE_DECIMAL }, + { "CONVERT_OOO" , SC_OPCODE_CONVERT_OOO }, + { "ROMAN" , SC_OPCODE_ROMAN }, + { "ARABIC" , SC_OPCODE_ARABIC }, + { "HYPERLINK" , SC_OPCODE_HYPERLINK }, + { "INFO" , SC_OPCODE_INFO }, + { "BAHTTEXT" , SC_OPCODE_BAHTTEXT }, + { "GETPIVOTDATA" , SC_OPCODE_GET_PIVOT_DATA }, + { "EUROCONVERT" , SC_OPCODE_EUROCONVERT }, + { "NUMBERVALUE" , SC_OPCODE_NUMBERVALUE }, + { "GAMMA" , SC_OPCODE_GAMMA }, + { "CHISQDIST" , SC_OPCODE_CHISQ_DIST }, + { "CHISQ.DIST" , SC_OPCODE_CHISQ_DIST_MS }, + { "CHISQ.INV" , SC_OPCODE_CHISQ_INV_MS }, + { "CHISQINV" , SC_OPCODE_CHISQ_INV }, + { "BITAND" , SC_OPCODE_BITAND }, + { "BITOR" , SC_OPCODE_BITOR }, + { "BITXOR" , SC_OPCODE_BITXOR }, + { "BITRSHIFT" , SC_OPCODE_BITRSHIFT }, + { "BITLSHIFT" , SC_OPCODE_BITLSHIFT }, + { "#NULL!" , SC_OPCODE_ERROR_NULL }, + { "#DIV/0!" , SC_OPCODE_ERROR_DIVZERO }, + { "#VALUE!" , SC_OPCODE_ERROR_VALUE }, + { "#REF!" , SC_OPCODE_ERROR_REF }, + { "#NAME?" , SC_OPCODE_ERROR_NAME }, + { "#NUM!" , SC_OPCODE_ERROR_NUM }, + { "#N/A" , SC_OPCODE_ERROR_NA }, + /* END defined ERROR.TYPE() values. */ + { "FILTERXML" , SC_OPCODE_FILTERXML }, + { "WEBSERVICE" , SC_OPCODE_WEBSERVICE }, + { "COLOR" , SC_OPCODE_COLOR }, + { "ERF.PRECISE" , SC_OPCODE_ERF_MS }, + { "ERFC.PRECISE" , SC_OPCODE_ERFC_MS }, + { "ENCODEURL" , SC_OPCODE_ENCODEURL }, + { "RAWSUBTRACT" , SC_OPCODE_RAWSUBTRACT }, + { "ROUNDSIG" , SC_OPCODE_ROUNDSIG }, + { nullptr, -1 } +}; + +/** Function names that can be localized if [en-US]. Same names should be used + in RID_STRLIST_FUNCTION_NAMES_ENGLISH above. Names can be changed, the + change has to be mentioned in the release notes, i.e. + https://wiki.documentfoundation.org/ReleaseNotes/... + */ +const std::pair RID_STRLIST_FUNCTION_NAMES[] = +{ + { NC_("RID_STRLIST_FUNCTION_NAMES", "IF") , SC_OPCODE_IF }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "IFERROR") , SC_OPCODE_IF_ERROR }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "IFNA") , SC_OPCODE_IF_NA }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "CHOOSE") , SC_OPCODE_CHOOSE }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "#All") , SC_OPCODE_TABLE_REF_ITEM_ALL }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "#Headers") , SC_OPCODE_TABLE_REF_ITEM_HEADERS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "#Data") , SC_OPCODE_TABLE_REF_ITEM_DATA }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "#Totals") , SC_OPCODE_TABLE_REF_ITEM_TOTALS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "#This Row") , SC_OPCODE_TABLE_REF_ITEM_THIS_ROW }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "AND") , SC_OPCODE_AND }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "OR") , SC_OPCODE_OR }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "XOR") , SC_OPCODE_XOR }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "NOT") , SC_OPCODE_NOT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "NEG") , SC_OPCODE_NEG }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "PI") , SC_OPCODE_PI }, // ??? + { NC_("RID_STRLIST_FUNCTION_NAMES", "RAND") , SC_OPCODE_RANDOM }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "TRUE") , SC_OPCODE_TRUE }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "FALSE") , SC_OPCODE_FALSE }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "TODAY") , SC_OPCODE_GET_ACT_DATE }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "NOW") , SC_OPCODE_GET_ACT_TIME }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "NA") , SC_OPCODE_NO_VALUE }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "CURRENT") , SC_OPCODE_CURRENT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "DEGREES") , SC_OPCODE_DEG }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "RADIANS") , SC_OPCODE_RAD }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "SIN") , SC_OPCODE_SIN }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "COS") , SC_OPCODE_COS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "TAN") , SC_OPCODE_TAN }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "COT") , SC_OPCODE_COT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ASIN") , SC_OPCODE_ARC_SIN }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ACOS") , SC_OPCODE_ARC_COS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ATAN") , SC_OPCODE_ARC_TAN }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ACOT") , SC_OPCODE_ARC_COT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "SINH") , SC_OPCODE_SIN_HYP }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "COSH") , SC_OPCODE_COS_HYP }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "TANH") , SC_OPCODE_TAN_HYP }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "COTH") , SC_OPCODE_COT_HYP }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ASINH") , SC_OPCODE_ARC_SIN_HYP }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ACOSH") , SC_OPCODE_ARC_COS_HYP }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ATANH") , SC_OPCODE_ARC_TAN_HYP }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ACOTH") , SC_OPCODE_ARC_COT_HYP }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "CSC") , SC_OPCODE_COSECANT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "SEC") , SC_OPCODE_SECANT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "CSCH") , SC_OPCODE_COSECANT_HYP }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "SECH") , SC_OPCODE_SECANT_HYP }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "EXP") , SC_OPCODE_EXP }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "LN") , SC_OPCODE_LN }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "SQRT") , SC_OPCODE_SQRT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "FACT") , SC_OPCODE_FACT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "YEAR") , SC_OPCODE_GET_YEAR }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "MONTH") , SC_OPCODE_GET_MONTH }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "DAY") , SC_OPCODE_GET_DAY }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "HOUR") , SC_OPCODE_GET_HOUR }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "MINUTE") , SC_OPCODE_GET_MIN }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "SECOND") , SC_OPCODE_GET_SEC }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "SIGN") , SC_OPCODE_PLUS_MINUS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ABS") , SC_OPCODE_ABS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "INT") , SC_OPCODE_INT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "PHI") , SC_OPCODE_PHI }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "GAUSS") , SC_OPCODE_GAUSS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ISBLANK") , SC_OPCODE_IS_EMPTY }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ISTEXT") , SC_OPCODE_IS_STRING }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ISNONTEXT") , SC_OPCODE_IS_NON_STRING }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ISLOGICAL") , SC_OPCODE_IS_LOGICAL }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "TYPE") , SC_OPCODE_TYPE }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "CELL") , SC_OPCODE_CELL }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ISREF") , SC_OPCODE_IS_REF }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ISNUMBER") , SC_OPCODE_IS_VALUE }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ISFORMULA") , SC_OPCODE_IS_FORMULA }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ISNA") , SC_OPCODE_IS_NV }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ISERR") , SC_OPCODE_IS_ERR }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ISERROR") , SC_OPCODE_IS_ERROR }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ISEVEN") , SC_OPCODE_IS_EVEN }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ISODD") , SC_OPCODE_IS_ODD }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "N") , SC_OPCODE_N }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "DATEVALUE") , SC_OPCODE_GET_DATE_VALUE }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "TIMEVALUE") , SC_OPCODE_GET_TIME_VALUE }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "CODE") , SC_OPCODE_CODE }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "TRIM") , SC_OPCODE_TRIM }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "UPPER") , SC_OPCODE_UPPER }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "PROPER") , SC_OPCODE_PROPER }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "LOWER") , SC_OPCODE_LOWER }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "LEN") , SC_OPCODE_LEN }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "T") , SC_OPCODE_T }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "VALUE") , SC_OPCODE_VALUE }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "CLEAN") , SC_OPCODE_CLEAN }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "CHAR") , SC_OPCODE_CHAR }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "JIS") , SC_OPCODE_JIS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ASC") , SC_OPCODE_ASC }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "UNICODE") , SC_OPCODE_UNICODE }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "UNICHAR") , SC_OPCODE_UNICHAR }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "LOG10") , SC_OPCODE_LOG10 }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "EVEN") , SC_OPCODE_EVEN }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ODD") , SC_OPCODE_ODD }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "NORMSDIST") , SC_OPCODE_STD_NORM_DIST }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "NORM.S.DIST") , SC_OPCODE_STD_NORM_DIST_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "FISHER") , SC_OPCODE_FISHER }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "FISHERINV") , SC_OPCODE_FISHER_INV }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "NORMSINV") , SC_OPCODE_S_NORM_INV }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "NORM.S.INV") , SC_OPCODE_S_NORM_INV_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "GAMMALN") , SC_OPCODE_GAMMA_LN }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "GAMMALN.PRECISE") , SC_OPCODE_GAMMA_LN_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ERRORTYPE") , SC_OPCODE_ERROR_TYPE }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ERROR.TYPE") , SC_OPCODE_ERROR_TYPE_ODF }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "FORMULA") , SC_OPCODE_FORMULA }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ARABIC") , SC_OPCODE_ARABIC }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ATAN2") , SC_OPCODE_ARC_TAN_2 }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "CEILING.MATH") , SC_OPCODE_CEIL_MATH }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "CEILING") , SC_OPCODE_CEIL }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "CEILING.XCL") , SC_OPCODE_CEIL_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "CEILING.PRECISE") , SC_OPCODE_CEIL_PRECISE }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ISO.CEILING") , SC_OPCODE_CEIL_ISO }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "FLOOR") , SC_OPCODE_FLOOR }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "FLOOR.XCL") , SC_OPCODE_FLOOR_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "FLOOR.MATH") , SC_OPCODE_FLOOR_MATH }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "FLOOR.PRECISE") , SC_OPCODE_FLOOR_PRECISE }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ROUND") , SC_OPCODE_ROUND }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ROUNDUP") , SC_OPCODE_ROUND_UP }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ROUNDDOWN") , SC_OPCODE_ROUND_DOWN }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "TRUNC") , SC_OPCODE_TRUNC }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "LOG") , SC_OPCODE_LOG }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "POWER") , SC_OPCODE_POWER }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "GCD") , SC_OPCODE_GCD }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "LCM") , SC_OPCODE_LCM }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "MOD") , SC_OPCODE_MOD }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "SUMPRODUCT") , SC_OPCODE_SUM_PRODUCT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "SUMSQ") , SC_OPCODE_SUM_SQ }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "SUMX2MY2") , SC_OPCODE_SUM_X2MY2 }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "SUMX2PY2") , SC_OPCODE_SUM_X2DY2 }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "SUMXMY2") , SC_OPCODE_SUM_XMY2 }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "DATE") , SC_OPCODE_GET_DATE }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "TIME") , SC_OPCODE_GET_TIME }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "DAYS") , SC_OPCODE_GET_DIFF_DATE }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "DAYS360") , SC_OPCODE_GET_DIFF_DATE_360 }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "DATEDIF") , SC_OPCODE_GET_DATEDIF }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "MIN") , SC_OPCODE_MIN }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "MINA") , SC_OPCODE_MIN_A }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "MAX") , SC_OPCODE_MAX }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "MAXA") , SC_OPCODE_MAX_A }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "SUM") , SC_OPCODE_SUM }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "PRODUCT") , SC_OPCODE_PRODUCT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "AVERAGE") , SC_OPCODE_AVERAGE }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "AVERAGEA") , SC_OPCODE_AVERAGE_A }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "COUNT") , SC_OPCODE_COUNT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "COUNTA") , SC_OPCODE_COUNT_2 }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "NPV") , SC_OPCODE_NPV }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "IRR") , SC_OPCODE_IRR }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "MIRR") , SC_OPCODE_MIRR }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ISPMT") , SC_OPCODE_ISPMT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "VAR") , SC_OPCODE_VAR }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "VARA") , SC_OPCODE_VAR_A }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "VARP") , SC_OPCODE_VAR_P }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "VARPA") , SC_OPCODE_VAR_P_A }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "VAR.P") , SC_OPCODE_VAR_P_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "VAR.S") , SC_OPCODE_VAR_S }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "STDEV") , SC_OPCODE_ST_DEV }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "STDEVA") , SC_OPCODE_ST_DEV_A }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "STDEVP") , SC_OPCODE_ST_DEV_P }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "STDEVPA") , SC_OPCODE_ST_DEV_P_A }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "STDEV.P") , SC_OPCODE_ST_DEV_P_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "STDEV.S") , SC_OPCODE_ST_DEV_S }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "B") , SC_OPCODE_B }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "NORMDIST") , SC_OPCODE_NORM_DIST }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "NORM.DIST") , SC_OPCODE_NORM_DIST_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "EXPONDIST") , SC_OPCODE_EXP_DIST }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "EXPON.DIST") , SC_OPCODE_EXP_DIST_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "BINOMDIST") , SC_OPCODE_BINOM_DIST }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "BINOM.DIST") , SC_OPCODE_BINOM_DIST_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "POISSON") , SC_OPCODE_POISSON_DIST }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "POISSON.DIST") , SC_OPCODE_POISSON_DIST_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "COMBIN") , SC_OPCODE_COMBIN }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "COMBINA") , SC_OPCODE_COMBIN_A }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "PERMUT") , SC_OPCODE_PERMUT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "PERMUTATIONA") , SC_OPCODE_PERMUTATION_A }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "PV") , SC_OPCODE_PV }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "SYD") , SC_OPCODE_SYD }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "DDB") , SC_OPCODE_DDB }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "DB") , SC_OPCODE_DB }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "VDB") , SC_OPCODE_VBD }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "PDURATION") , SC_OPCODE_PDURATION }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "SLN") , SC_OPCODE_SLN }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "PMT") , SC_OPCODE_PMT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "COLUMNS") , SC_OPCODE_COLUMNS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ROWS") , SC_OPCODE_ROWS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "SHEETS") , SC_OPCODE_SHEETS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "COLUMN") , SC_OPCODE_COLUMN }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ROW") , SC_OPCODE_ROW }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "SHEET") , SC_OPCODE_SHEET }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "RRI") , SC_OPCODE_RRI }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "FV") , SC_OPCODE_FV }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "NPER") , SC_OPCODE_NPER }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "RATE") , SC_OPCODE_RATE }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "IPMT") , SC_OPCODE_IPMT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "PPMT") , SC_OPCODE_PPMT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "CUMIPMT") , SC_OPCODE_CUM_IPMT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "CUMPRINC") , SC_OPCODE_CUM_PRINC }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "EFFECT") , SC_OPCODE_EFFECT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "NOMINAL") , SC_OPCODE_NOMINAL }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "SUBTOTAL") , SC_OPCODE_SUB_TOTAL }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "DSUM") , SC_OPCODE_DB_SUM }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "DCOUNT") , SC_OPCODE_DB_COUNT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "DCOUNTA") , SC_OPCODE_DB_COUNT_2 }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "DAVERAGE") , SC_OPCODE_DB_AVERAGE }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "DGET") , SC_OPCODE_DB_GET }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "DMAX") , SC_OPCODE_DB_MAX }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "DMIN") , SC_OPCODE_DB_MIN }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "DPRODUCT") , SC_OPCODE_DB_PRODUCT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "DSTDEV") , SC_OPCODE_DB_STD_DEV }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "DSTDEVP") , SC_OPCODE_DB_STD_DEV_P }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "DVAR") , SC_OPCODE_DB_VAR }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "DVARP") , SC_OPCODE_DB_VAR_P }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "INDIRECT") , SC_OPCODE_INDIRECT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ADDRESS") , SC_OPCODE_ADDRESS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "MATCH") , SC_OPCODE_MATCH }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "COUNTBLANK") , SC_OPCODE_COUNT_EMPTY_CELLS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "COUNTIF") , SC_OPCODE_COUNT_IF }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "SUMIF") , SC_OPCODE_SUM_IF }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "AVERAGEIF") , SC_OPCODE_AVERAGE_IF }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "SUMIFS") , SC_OPCODE_SUM_IFS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "AVERAGEIFS") , SC_OPCODE_AVERAGE_IFS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "COUNTIFS") , SC_OPCODE_COUNT_IFS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "LOOKUP") , SC_OPCODE_LOOKUP }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "VLOOKUP") , SC_OPCODE_V_LOOKUP }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "HLOOKUP") , SC_OPCODE_H_LOOKUP }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "MULTIRANGE") , SC_OPCODE_MULTI_AREA }, // legacy for range list (union) + { NC_("RID_STRLIST_FUNCTION_NAMES", "OFFSET") , SC_OPCODE_OFFSET }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "INDEX") , SC_OPCODE_INDEX }, // ?? first character = I ?? + { NC_("RID_STRLIST_FUNCTION_NAMES", "AREAS") , SC_OPCODE_AREAS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "DOLLAR") , SC_OPCODE_CURRENCY }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "REPLACE") , SC_OPCODE_REPLACE }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "FIXED") , SC_OPCODE_FIXED }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "FIND") , SC_OPCODE_FIND }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "EXACT") , SC_OPCODE_EXACT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "LEFT") , SC_OPCODE_LEFT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "RIGHT") , SC_OPCODE_RIGHT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "SEARCH") , SC_OPCODE_SEARCH }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "MID") , SC_OPCODE_MID }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "LENB") , SC_OPCODE_LENB }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "RIGHTB") , SC_OPCODE_RIGHTB }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "LEFTB") , SC_OPCODE_LEFTB }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "REPLACEB") , SC_OPCODE_REPLACEB }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "MIDB") , SC_OPCODE_MIDB }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "TEXT") , SC_OPCODE_TEXT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "SUBSTITUTE") , SC_OPCODE_SUBSTITUTE }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "REPT") , SC_OPCODE_REPT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "CONCATENATE") , SC_OPCODE_CONCAT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "CONCAT") , SC_OPCODE_CONCAT_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "TEXTJOIN") , SC_OPCODE_TEXTJOIN_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "IFS") , SC_OPCODE_IFS_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "SWITCH") , SC_OPCODE_SWITCH_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "MINIFS") , SC_OPCODE_MINIFS_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "MAXIFS") , SC_OPCODE_MAXIFS_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "MVALUE") , SC_OPCODE_MAT_VALUE }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "MDETERM") , SC_OPCODE_MAT_DET }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "MINVERSE") , SC_OPCODE_MAT_INV }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "MMULT") , SC_OPCODE_MAT_MULT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "TRANSPOSE") , SC_OPCODE_MAT_TRANS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "MUNIT") , SC_OPCODE_MATRIX_UNIT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "GOALSEEK") , SC_OPCODE_BACK_SOLVER }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "HYPGEOMDIST") , SC_OPCODE_HYP_GEOM_DIST }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "HYPGEOM.DIST") , SC_OPCODE_HYP_GEOM_DIST_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "LOGNORMDIST") , SC_OPCODE_LOG_NORM_DIST }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "LOGNORM.DIST") , SC_OPCODE_LOG_NORM_DIST_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "TDIST") , SC_OPCODE_T_DIST }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "T.DIST.2T") , SC_OPCODE_T_DIST_2T }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "T.DIST") , SC_OPCODE_T_DIST_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "T.DIST.RT") , SC_OPCODE_T_DIST_RT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "FDIST") , SC_OPCODE_F_DIST }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "F.DIST") , SC_OPCODE_F_DIST_LT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "F.DIST.RT") , SC_OPCODE_F_DIST_RT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "CHIDIST") , SC_OPCODE_CHI_DIST }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "CHISQ.DIST.RT") , SC_OPCODE_CHI_DIST_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "WEIBULL") , SC_OPCODE_WEIBULL }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "WEIBULL.DIST") , SC_OPCODE_WEIBULL_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "NEGBINOMDIST") , SC_OPCODE_NEG_BINOM_VERT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "NEGBINOM.DIST") , SC_OPCODE_NEG_BINOM_DIST_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "CRITBINOM") , SC_OPCODE_CRIT_BINOM }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "BINOM.INV") , SC_OPCODE_BINOM_INV }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "KURT") , SC_OPCODE_KURT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "HARMEAN") , SC_OPCODE_HAR_MEAN }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "GEOMEAN") , SC_OPCODE_GEO_MEAN }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "STANDARDIZE") , SC_OPCODE_STANDARD }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "AVEDEV") , SC_OPCODE_AVE_DEV }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "SKEW") , SC_OPCODE_SKEW }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "SKEWP") , SC_OPCODE_SKEWP }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "DEVSQ") , SC_OPCODE_DEV_SQ }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "MEDIAN") , SC_OPCODE_MEDIAN }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "MODE") , SC_OPCODE_MODAL_VALUE }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "MODE.SNGL") , SC_OPCODE_MODAL_VALUE_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "MODE.MULT") , SC_OPCODE_MODAL_VALUE_MULTI }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ZTEST") , SC_OPCODE_Z_TEST }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "Z.TEST") , SC_OPCODE_Z_TEST_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "AGGREGATE") , SC_OPCODE_AGGREGATE }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "TTEST") , SC_OPCODE_T_TEST }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "T.TEST") , SC_OPCODE_T_TEST_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "RANK") , SC_OPCODE_RANK }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "PERCENTILE") , SC_OPCODE_PERCENTILE }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "PERCENTRANK") , SC_OPCODE_PERCENT_RANK }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "PERCENTILE.INC") , SC_OPCODE_PERCENTILE_INC }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "PERCENTRANK.INC") , SC_OPCODE_PERCENT_RANK_INC }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "QUARTILE.INC") , SC_OPCODE_QUARTILE_INC }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "RANK.EQ") , SC_OPCODE_RANK_EQ }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "PERCENTILE.EXC") , SC_OPCODE_PERCENTILE_EXC }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "PERCENTRANK.EXC") , SC_OPCODE_PERCENT_RANK_EXC }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "QUARTILE.EXC") , SC_OPCODE_QUARTILE_EXC }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "RANK.AVG") , SC_OPCODE_RANK_AVG }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "LARGE") , SC_OPCODE_LARGE }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "SMALL") , SC_OPCODE_SMALL }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "FREQUENCY") , SC_OPCODE_FREQUENCY }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "QUARTILE") , SC_OPCODE_QUARTILE }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "NORMINV") , SC_OPCODE_NORM_INV }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "NORM.INV") , SC_OPCODE_NORM_INV_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "CONFIDENCE") , SC_OPCODE_CONFIDENCE }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "CONFIDENCE.NORM") , SC_OPCODE_CONFIDENCE_N }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "CONFIDENCE.T") , SC_OPCODE_CONFIDENCE_T }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "FTEST") , SC_OPCODE_F_TEST }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "F.TEST") , SC_OPCODE_F_TEST_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "TRIMMEAN") , SC_OPCODE_TRIM_MEAN }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "PROB") , SC_OPCODE_PROB }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "CORREL") , SC_OPCODE_CORREL }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "COVAR") , SC_OPCODE_COVAR }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "COVARIANCE.P") , SC_OPCODE_COVARIANCE_P }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "COVARIANCE.S") , SC_OPCODE_COVARIANCE_S }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "PEARSON") , SC_OPCODE_PEARSON }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "RSQ") , SC_OPCODE_RSQ }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "STEYX") , SC_OPCODE_STEYX }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "SLOPE") , SC_OPCODE_SLOPE }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "INTERCEPT") , SC_OPCODE_INTERCEPT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "TREND") , SC_OPCODE_TREND }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "GROWTH") , SC_OPCODE_GROWTH }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "LINEST") , SC_OPCODE_LINEST }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "LOGEST") , SC_OPCODE_LOGEST }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "FORECAST") , SC_OPCODE_FORECAST }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "FORECAST.ETS.ADD") , SC_OPCODE_FORECAST_ETS_ADD }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "FORECAST.ETS.SEASONALITY") , SC_OPCODE_FORECAST_ETS_SEA }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "FORECAST.ETS.MULT") , SC_OPCODE_FORECAST_ETS_MUL }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "FORECAST.ETS.PI.ADD") , SC_OPCODE_FORECAST_ETS_PIA }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "FORECAST.ETS.PI.MULT") , SC_OPCODE_FORECAST_ETS_PIM }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "FORECAST.ETS.STAT.ADD") , SC_OPCODE_FORECAST_ETS_STA }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "FORECAST.ETS.STAT.MULT") , SC_OPCODE_FORECAST_ETS_STM }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "FORECAST.LINEAR") , SC_OPCODE_FORECAST_LIN }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "CHIINV") , SC_OPCODE_CHI_INV }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "CHISQ.INV.RT") , SC_OPCODE_CHI_INV_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "GAMMADIST") , SC_OPCODE_GAMMA_DIST }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "GAMMA.DIST") , SC_OPCODE_GAMMA_DIST_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "GAMMAINV") , SC_OPCODE_GAMMA_INV }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "GAMMA.INV") , SC_OPCODE_GAMMA_INV_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "TINV") , SC_OPCODE_T_INV }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "T.INV.2T") , SC_OPCODE_T_INV_2T }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "T.INV") , SC_OPCODE_T_INV_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "FINV") , SC_OPCODE_F_INV }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "F.INV") , SC_OPCODE_F_INV_LT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "F.INV.RT") , SC_OPCODE_F_INV_RT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "CHITEST") , SC_OPCODE_CHI_TEST }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "CHISQ.TEST") , SC_OPCODE_CHI_TEST_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "LOGINV") , SC_OPCODE_LOG_INV }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "LOGNORM.INV") , SC_OPCODE_LOG_INV_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "MULTIPLE.OPERATIONS") , SC_OPCODE_TABLE_OP }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "BETADIST") , SC_OPCODE_BETA_DIST }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "BETAINV") , SC_OPCODE_BETA_INV }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "BETA.DIST") , SC_OPCODE_BETA_DIST_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "BETA.INV") , SC_OPCODE_BETA_INV_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "WEEKNUM") , SC_OPCODE_WEEK }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ISOWEEKNUM") , SC_OPCODE_ISOWEEKNUM }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "WEEKNUM_OOO") , SC_OPCODE_WEEKNUM_OOO }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "EASTERSUNDAY") , SC_OPCODE_EASTERSUNDAY }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "WEEKDAY") , SC_OPCODE_GET_DAY_OF_WEEK }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "NETWORKDAYS") , SC_OPCODE_NETWORKDAYS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "NETWORKDAYS.INTL") , SC_OPCODE_NETWORKDAYS_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "WORKDAY.INTL") , SC_OPCODE_WORKDAY_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "#NAME!") , SC_OPCODE_NO_NAME }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "STYLE") , SC_OPCODE_STYLE }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "DDE") , SC_OPCODE_DDE }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "BASE") , SC_OPCODE_BASE }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "DECIMAL") , SC_OPCODE_DECIMAL }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "CONVERT_OOO") , SC_OPCODE_CONVERT_OOO }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ROMAN") , SC_OPCODE_ROMAN }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "HYPERLINK") , SC_OPCODE_HYPERLINK }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "INFO") , SC_OPCODE_INFO }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "BAHTTEXT") , SC_OPCODE_BAHTTEXT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "GETPIVOTDATA") , SC_OPCODE_GET_PIVOT_DATA }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "EUROCONVERT") , SC_OPCODE_EUROCONVERT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "NUMBERVALUE") , SC_OPCODE_NUMBERVALUE }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "GAMMA") , SC_OPCODE_GAMMA }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "CHISQDIST") , SC_OPCODE_CHISQ_DIST }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "CHISQ.DIST") , SC_OPCODE_CHISQ_DIST_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "CHISQINV") , SC_OPCODE_CHISQ_INV }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "CHISQ.INV") , SC_OPCODE_CHISQ_INV_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "BITAND") , SC_OPCODE_BITAND }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "BITOR") , SC_OPCODE_BITOR }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "BITXOR") , SC_OPCODE_BITXOR }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "BITRSHIFT") , SC_OPCODE_BITRSHIFT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "BITLSHIFT") , SC_OPCODE_BITLSHIFT }, + /* BEGIN defined ERROR.TYPE() values. */ + /* ERROR.TYPE( #NULL! ) == 1 */ + { NC_("RID_STRLIST_FUNCTION_NAMES", "#NULL!") , SC_OPCODE_ERROR_NULL }, + /* ERROR.TYPE( #DIV/0! ) == 2 */ + { NC_("RID_STRLIST_FUNCTION_NAMES", "#DIV/0!") , SC_OPCODE_ERROR_DIVZERO }, + /* ERROR.TYPE( #VALUE! ) == 3 */ + { NC_("RID_STRLIST_FUNCTION_NAMES", "#VALUE!") , SC_OPCODE_ERROR_VALUE }, + /* ERROR.TYPE( #REF! ) == 4 */ + { NC_("RID_STRLIST_FUNCTION_NAMES", "#REF!") , SC_OPCODE_ERROR_REF }, + /* ERROR.TYPE( #NAME! ) == 5 */ + { NC_("RID_STRLIST_FUNCTION_NAMES", "#NAME?") , SC_OPCODE_ERROR_NAME }, + /* ERROR.TYPE( #NUM! ) == 6 */ + { NC_("RID_STRLIST_FUNCTION_NAMES", "#NUM!") , SC_OPCODE_ERROR_NUM }, + /* ERROR.TYPE( #N/A ) == 7 */ + { NC_("RID_STRLIST_FUNCTION_NAMES", "#N/A") , SC_OPCODE_ERROR_NA }, + /* END defined ERROR.TYPE() values. */ + + { NC_("RID_STRLIST_FUNCTION_NAMES", "FILTERXML") , SC_OPCODE_FILTERXML }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "COLOR") , SC_OPCODE_COLOR }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "WEBSERVICE") , SC_OPCODE_WEBSERVICE }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ERF.PRECISE") , SC_OPCODE_ERF_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ERFC.PRECISE") , SC_OPCODE_ERFC_MS }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ENCODEURL") , SC_OPCODE_ENCODEURL }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "RAWSUBTRACT") , SC_OPCODE_RAWSUBTRACT }, + { NC_("RID_STRLIST_FUNCTION_NAMES", "ROUNDSIG") , SC_OPCODE_ROUNDSIG }, + + { nullptr, -1 } +}; + +const std::pair RID_STRLIST_FUNCTION_NAMES_SYMBOLS[] = +{ + { "(" , SC_OPCODE_OPEN }, + { ")" , SC_OPCODE_CLOSE }, + { "[" , SC_OPCODE_TABLE_REF_OPEN }, + { "]" , SC_OPCODE_TABLE_REF_CLOSE }, + { "{" , SC_OPCODE_ARRAY_OPEN }, + { "}" , SC_OPCODE_ARRAY_CLOSE }, + { "|" , SC_OPCODE_ARRAY_ROW_SEP }, + { ";" , SC_OPCODE_ARRAY_COL_SEP }, + { ";" , SC_OPCODE_SEP }, + { "%" , SC_OPCODE_PERCENT_SIGN }, + { "+" , SC_OPCODE_ADD }, + { "-" , SC_OPCODE_SUB }, + { "*" , SC_OPCODE_MUL }, + { "/" , SC_OPCODE_DIV }, + { "&" , SC_OPCODE_AMPERSAND }, + { "^" , SC_OPCODE_POW }, + { "=" , SC_OPCODE_EQUAL }, + { "<>" , SC_OPCODE_NOT_EQUAL }, + { "<" , SC_OPCODE_LESS }, + { ">" , SC_OPCODE_GREATER }, + { "<=" , SC_OPCODE_LESS_EQUAL }, + { ">=" , SC_OPCODE_GREATER_EQUAL }, + { "!" , SC_OPCODE_INTERSECT }, + { "~" , SC_OPCODE_UNION }, + { ":" , SC_OPCODE_RANGE }, + { "-" , SC_OPCODE_NEG_SUB }, + { nullptr, -1 } +}; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/envelp/label.hrc b/formula/inc/strings.hrc similarity index 63% rename from sw/source/uibase/envelp/label.hrc rename to formula/inc/strings.hrc index d91422e73a6e..1d654c08e7da 100644 --- a/sw/source/uibase/envelp/label.hrc +++ b/formula/inc/strings.hrc @@ -17,21 +17,19 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SW_SOURCE_UIBASE_ENVELP_LABEL_HRC -#define INCLUDED_SW_SOURCE_UIBASE_ENVELP_LABEL_HRC +#ifndef INCLUDED_VCL_INC_STRINGS_HRC +#define INCLUDED_VCL_INC_STRINGS_HRC -#include "envelp.hrc" +#define NC_(Context, String) (Context "\004" u8##String) -// global resources ******************************************************** -#define STR_CUSTOM (RC_LABEL_BEGIN + 1) +#define STR_OPTIONAL NC_("STR_OPTIONAL", "(optional)") +#define STR_REQUIRED NC_("STR_REQUIRED", "(required)") -// overflow check ******************************************************** - -#define LABEL_ACT_END STR_CUSTOM - -#if LABEL_ACT_END > RC_LABEL_END -#error Resource-Ueberlauf in #file, #line -#endif +#define STR_TITLE1 NC_("STR_TITLE1", "Function Wizard") +#define STR_TITLE2 NC_("STR_TITLE2", "Function Wizard -") +#define STR_END NC_("STR_END", "~End") +#define RID_STR_SHRINK NC_("RID_STR_SHRINK", "Shrink") +#define RID_STR_EXPAND NC_("RID_STR_EXPAND", "Expand") #endif diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index 8fe5738b7417..1429951649e1 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -27,8 +27,7 @@ #include "osl/mutex.hxx" #include -#include -#include +#include #include #include #include @@ -145,7 +144,7 @@ class OpCodeList { public: - OpCodeList( sal_uInt16, const FormulaCompiler::NonConstOpCodeMapPtr&, + OpCodeList(bool bLocalized, const std::pair* pSymbols, const FormulaCompiler::NonConstOpCodeMapPtr&, FormulaCompiler::SeparatorType = FormulaCompiler::SeparatorType::SEMICOLON_BASE ); private: @@ -154,13 +153,15 @@ private: private: FormulaCompiler::SeparatorType meSepType; - ResStringArray maStringList; + const std::pair* mpSymbols; + bool mbLocalized; }; -OpCodeList::OpCodeList( sal_uInt16 nRID, const FormulaCompiler::NonConstOpCodeMapPtr& xMap, - FormulaCompiler::SeparatorType eSepType ) +OpCodeList::OpCodeList(bool bLocalized, const std::pair* pSymbols, const FormulaCompiler::NonConstOpCodeMapPtr& xMap, + FormulaCompiler::SeparatorType eSepType) : meSepType(eSepType) - , maStringList(ResId(nRID, *ResourceManager::getResManager())) + , mpSymbols(pSymbols) + , mbLocalized(bLocalized) { SvtSysLocale aSysLocale; const CharClass* pCharClass = (xMap->isEnglish() ? nullptr : aSysLocale.GetCharClassPtr()); @@ -223,9 +224,19 @@ bool OpCodeList::getOpCodeString( OUString& rStr, sal_uInt16 nOp ) void OpCodeList::putDefaultOpCode( const FormulaCompiler::NonConstOpCodeMapPtr& xMap, sal_uInt16 nOp, const CharClass* pCharClass ) { - sal_uInt32 nIndex = maStringList.FindIndex(nOp); - if (nIndex != RESARRAY_INDEX_NOTFOUND) - xMap->putOpCode(maStringList.GetString(nIndex), OpCode(nOp), pCharClass); + const char* pKey = nullptr; + for (const std::pair* pSymbol = mpSymbols; pSymbol->first; ++pSymbol) + { + if (nOp == pSymbol->second) + { + pKey = pSymbol->first; + break; + } + } + if (!pKey) + return; + OUString sKey = !mbLocalized ? OUString::createFromAscii(pKey) : Translate::get(pKey, ResourceManager::getResLocale()); + xMap->putOpCode(sKey, OpCode(nOp), pCharClass); } // static @@ -843,8 +854,8 @@ void lcl_fillNativeSymbols( FormulaCompiler::NonConstOpCodeMapPtr& xMap, bool bD new FormulaCompiler::OpCodeMap( SC_OPCODE_LAST_OPCODE_ID + 1, true, FormulaGrammar::GRAM_NATIVE_UI)); OModuleClient aModuleClient; - OpCodeList aOpCodeListSymbols(RID_STRLIST_FUNCTION_NAMES_SYMBOLS, aSymbolMap.mxSymbolMap); - OpCodeList aOpCodeListNative(RID_STRLIST_FUNCTION_NAMES, aSymbolMap.mxSymbolMap); + OpCodeList aOpCodeListSymbols(false, RID_STRLIST_FUNCTION_NAMES_SYMBOLS, aSymbolMap.mxSymbolMap); + OpCodeList aOpCodeListNative(true, RID_STRLIST_FUNCTION_NAMES, aSymbolMap.mxSymbolMap); // No AddInMap for native core mapping. } @@ -931,7 +942,7 @@ void FormulaCompiler::InitSymbolsOOXML() const } -void FormulaCompiler::loadSymbols( sal_uInt16 nSymbols, FormulaGrammar::Grammar eGrammar, +void FormulaCompiler::loadSymbols(const std::pair* pSymbols, FormulaGrammar::Grammar eGrammar, NonConstOpCodeMapPtr& rxMap, SeparatorType eSepType) const { if ( !rxMap.get() ) @@ -939,7 +950,7 @@ void FormulaCompiler::loadSymbols( sal_uInt16 nSymbols, FormulaGrammar::Grammar // not Core rxMap.reset( new OpCodeMap( SC_OPCODE_LAST_OPCODE_ID + 1, eGrammar != FormulaGrammar::GRAM_ODFF, eGrammar )); OModuleClient aModuleClient; - OpCodeList aOpCodeList( nSymbols, rxMap, eSepType); + OpCodeList aOpCodeList(false, pSymbols, rxMap, eSepType); fillFromAddInMap( rxMap, eGrammar); // Fill from collection for AddIns not already present. diff --git a/formula/source/core/inc/core_resource.hrc b/formula/source/core/inc/core_resource.hrc deleted file mode 100644 index 750be5afbef3..000000000000 --- a/formula/source/core/inc/core_resource.hrc +++ /dev/null @@ -1,39 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_FORMULA_SOURCE_CORE_INC_CORE_RESOURCE_HRC -#define INCLUDED_FORMULA_SOURCE_CORE_INC_CORE_RESOURCE_HRC - -#include - -#define RID_CORE_STRINGS_START RID_FORMULA_START -#define RID_CORE_OTHER_START RID_FORMULA_START - -//- String-IDs -#define RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF (RID_CORE_OTHER_START + 0) -#define RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML (RID_CORE_OTHER_START + 1) -#define RID_STRLIST_FUNCTION_NAMES_ENGLISH_PODF (RID_CORE_OTHER_START + 2) -#define RID_STRLIST_FUNCTION_NAMES_ENGLISH_API (RID_CORE_OTHER_START + 3) -#define RID_STRLIST_FUNCTION_NAMES_ENGLISH (RID_CORE_OTHER_START + 4) -#define RID_STRLIST_FUNCTION_NAMES_SYMBOLS (RID_CORE_OTHER_START + 5) -#define RID_STRLIST_FUNCTION_NAMES (RID_CORE_OTHER_START + 6) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/formula/source/core/inc/core_resource.hxx b/formula/source/core/inc/core_resource.hxx index aaf3b5a9bb53..3dc321b57834 100644 --- a/formula/source/core/inc/core_resource.hxx +++ b/formula/source/core/inc/core_resource.hxx @@ -22,8 +22,6 @@ #include -class ResMgr; - namespace formula { @@ -34,7 +32,7 @@ namespace formula { friend class OModuleClient; static sal_Int32 s_nClients; /// number of registered clients - static ResMgr* m_pImpl; + static std::locale* m_pImpl; private: // no instantiation allowed @@ -50,7 +48,7 @@ namespace formula public: - static ResMgr* getResManager(); + static const std::locale& getResLocale(); }; diff --git a/formula/source/core/resource/core_resource.cxx b/formula/source/core/resource/core_resource.cxx index 6c9df0139704..b03668d3c783 100644 --- a/formula/source/core/resource/core_resource.cxx +++ b/formula/source/core/resource/core_resource.cxx @@ -39,26 +39,24 @@ namespace formula // access safety struct theResourceManagerMutex : public rtl::Static< osl::Mutex, theResourceManagerMutex > {}; } - sal_Int32 ResourceManager::s_nClients = 0; - ResMgr* ResourceManager::m_pImpl = nullptr; + sal_Int32 ResourceManager::s_nClients = 0; + std::locale* ResourceManager::m_pImpl = nullptr; void ResourceManager::ensureImplExists() { if (m_pImpl) return; - m_pImpl = ResMgr::CreateResMgr("for", Application::GetSettings().GetUILanguageTag()); + m_pImpl = new std::locale(Translate::Create("for", Application::GetSettings().GetUILanguageTag())); } - void ResourceManager::registerClient() { ::osl::MutexGuard aGuard(theResourceManagerMutex::get()); ++s_nClients; } - void ResourceManager::revokeClient() { ::osl::MutexGuard aGuard(theResourceManagerMutex::get()); @@ -68,10 +66,11 @@ namespace formula m_pImpl = nullptr; } } - ResMgr* ResourceManager::getResManager() + + const std::locale& ResourceManager::getResLocale() { ensureImplExists(); - return m_pImpl; + return *m_pImpl; } diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src deleted file mode 100644 index 1c98ff43263e..000000000000 --- a/formula/source/core/resource/core_resource.src +++ /dev/null @@ -1,2708 +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 "core_resource.hrc" -#include "formula/compiler.hrc" - -/** These English names are used to store/load ODFF as of ODF v1.2. */ -// NAMES CAN ONLY BE CHANGED WHEN PROVIDING BACKWARD AND FORWARD COMPATIBILITY -// such that at least two releases can already read the new name to be -// introduced by a later release. -// If there is a reason for another name for some function then add an -// *additional* name to be recognized to sc/source/core/tool/compiler.cxx -// ScCompiler::IsOpCode() in the if (mxSymbols->isODFF()) block. -StringArray RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF -{ - ItemList = - { - < "IF" ; SC_OPCODE_IF; >; - < "IFERROR" ; SC_OPCODE_IF_ERROR; >; - < "IFNA" ; SC_OPCODE_IF_NA; >; - < "CHOOSE" ; SC_OPCODE_CHOOSE; >; - < "(" ; SC_OPCODE_OPEN; >; - < ")" ; SC_OPCODE_CLOSE; >; - // SC_OPCODE_TABLE_REF_... not supported in ODFF - < "{" ; SC_OPCODE_ARRAY_OPEN; >; - < "}" ; SC_OPCODE_ARRAY_CLOSE; >; - < "|" ; SC_OPCODE_ARRAY_ROW_SEP; >; - < ";" ; SC_OPCODE_ARRAY_COL_SEP; >; - < ";" ; SC_OPCODE_SEP; >; - < "%" ; SC_OPCODE_PERCENT_SIGN; >; - < "+" ; SC_OPCODE_ADD; >; - < "-" ; SC_OPCODE_SUB; >; - < "*" ; SC_OPCODE_MUL; >; - < "/" ; SC_OPCODE_DIV; >; - < "&" ; SC_OPCODE_AMPERSAND; >; - < "^" ; SC_OPCODE_POW; >; - < "=" ; SC_OPCODE_EQUAL; >; - < "<>" ; SC_OPCODE_NOT_EQUAL; >; - < "<" ; SC_OPCODE_LESS; >; - < ">" ; SC_OPCODE_GREATER; >; - < "<=" ; SC_OPCODE_LESS_EQUAL; >; - < ">=" ; SC_OPCODE_GREATER_EQUAL; >; - < "AND" ; SC_OPCODE_AND; >; - < "OR" ; SC_OPCODE_OR; >; - < "XOR" ; SC_OPCODE_XOR; >; - < "!" ; SC_OPCODE_INTERSECT; >; - < "~" ; SC_OPCODE_UNION; >; - < ":" ; SC_OPCODE_RANGE; >; - < "NOT" ; SC_OPCODE_NOT; >; - < "NEG" ; SC_OPCODE_NEG; >; - < "-" ; SC_OPCODE_NEG_SUB; >; - < "PI" ; SC_OPCODE_PI; >; - < "RAND" ; SC_OPCODE_RANDOM; >; - < "TRUE" ; SC_OPCODE_TRUE; >; - < "FALSE" ; SC_OPCODE_FALSE; >; - < "TODAY" ; SC_OPCODE_GET_ACT_DATE; >; - < "NOW" ; SC_OPCODE_GET_ACT_TIME; >; - < "NA" ; SC_OPCODE_NO_VALUE; >; - < "ORG.OPENOFFICE.CURRENT" ; SC_OPCODE_CURRENT; >; - < "DEGREES" ; SC_OPCODE_DEG; >; - < "RADIANS" ; SC_OPCODE_RAD; >; - < "SIN" ; SC_OPCODE_SIN; >; - < "COS" ; SC_OPCODE_COS; >; - < "TAN" ; SC_OPCODE_TAN; >; - < "COT" ; SC_OPCODE_COT; >; - < "ASIN" ; SC_OPCODE_ARC_SIN; >; - < "ACOS" ; SC_OPCODE_ARC_COS; >; - < "ATAN" ; SC_OPCODE_ARC_TAN; >; - < "ACOT" ; SC_OPCODE_ARC_COT; >; - < "SINH" ; SC_OPCODE_SIN_HYP; >; - < "COSH" ; SC_OPCODE_COS_HYP; >; - < "TANH" ; SC_OPCODE_TAN_HYP; >; - < "COTH" ; SC_OPCODE_COT_HYP; >; - < "ASINH" ; SC_OPCODE_ARC_SIN_HYP; >; - < "ACOSH" ; SC_OPCODE_ARC_COS_HYP; >; - < "ATANH" ; SC_OPCODE_ARC_TAN_HYP; >; - < "ACOTH" ; SC_OPCODE_ARC_COT_HYP; >; - < "CSC" ; SC_OPCODE_COSECANT; >; - < "SEC" ; SC_OPCODE_SECANT; >; - < "CSCH" ; SC_OPCODE_COSECANT_HYP; >; - < "SECH" ; SC_OPCODE_SECANT_HYP; >; - < "EXP" ; SC_OPCODE_EXP; >; - < "LN" ; SC_OPCODE_LN; >; - < "SQRT" ; SC_OPCODE_SQRT; >; - < "FACT" ; SC_OPCODE_FACT; >; - < "YEAR" ; SC_OPCODE_GET_YEAR; >; - < "MONTH" ; SC_OPCODE_GET_MONTH; >; - < "DAY" ; SC_OPCODE_GET_DAY; >; - < "HOUR" ; SC_OPCODE_GET_HOUR; >; - < "MINUTE" ; SC_OPCODE_GET_MIN; >; - < "SECOND" ; SC_OPCODE_GET_SEC; >; - < "SIGN" ; SC_OPCODE_PLUS_MINUS; >; - < "ABS" ; SC_OPCODE_ABS; >; - < "INT" ; SC_OPCODE_INT; >; - < "PHI" ; SC_OPCODE_PHI; >; - < "GAUSS" ; SC_OPCODE_GAUSS; >; - < "ISBLANK" ; SC_OPCODE_IS_EMPTY; >; - < "ISTEXT" ; SC_OPCODE_IS_STRING; >; - < "ISNONTEXT" ; SC_OPCODE_IS_NON_STRING; >; - < "ISLOGICAL" ; SC_OPCODE_IS_LOGICAL; >; - < "TYPE" ; SC_OPCODE_TYPE; >; - < "CELL" ; SC_OPCODE_CELL; >; - < "ISREF" ; SC_OPCODE_IS_REF; >; - < "ISNUMBER" ; SC_OPCODE_IS_VALUE; >; - < "ISFORMULA" ; SC_OPCODE_IS_FORMULA; >; - < "ISNA" ; SC_OPCODE_IS_NV; >; - < "ISERR" ; SC_OPCODE_IS_ERR; >; - < "ISERROR" ; SC_OPCODE_IS_ERROR; >; - < "ISEVEN" ; SC_OPCODE_IS_EVEN; >; - < "ISODD" ; SC_OPCODE_IS_ODD; >; - < "N" ; SC_OPCODE_N; >; - < "DATEVALUE" ; SC_OPCODE_GET_DATE_VALUE; >; - < "TIMEVALUE" ; SC_OPCODE_GET_TIME_VALUE; >; - < "CODE" ; SC_OPCODE_CODE; >; - < "TRIM" ; SC_OPCODE_TRIM; >; - < "UPPER" ; SC_OPCODE_UPPER; >; - < "PROPER" ; SC_OPCODE_PROPER; >; - < "LOWER" ; SC_OPCODE_LOWER; >; - < "LEN" ; SC_OPCODE_LEN; >; - < "T" ; SC_OPCODE_T; >; - < "VALUE" ; SC_OPCODE_VALUE; >; - < "CLEAN" ; SC_OPCODE_CLEAN; >; - < "CHAR" ; SC_OPCODE_CHAR; >; - < "JIS" ; SC_OPCODE_JIS; >; - < "ASC" ; SC_OPCODE_ASC; >; - < "UNICODE" ; SC_OPCODE_UNICODE; >; - < "UNICHAR" ; SC_OPCODE_UNICHAR; >; - < "LOG10" ; SC_OPCODE_LOG10; >; - < "EVEN" ; SC_OPCODE_EVEN; >; - < "ODD" ; SC_OPCODE_ODD; >; - < "LEGACY.NORMSDIST" ; SC_OPCODE_STD_NORM_DIST; >; - < "COM.MICROSOFT.NORM.S.DIST" ; SC_OPCODE_STD_NORM_DIST_MS; >; - < "FISHER" ; SC_OPCODE_FISHER; >; - < "FISHERINV" ; SC_OPCODE_FISHER_INV; >; - < "LEGACY.NORMSINV" ; SC_OPCODE_S_NORM_INV; >; - < "COM.MICROSOFT.NORM.S.INV" ; SC_OPCODE_S_NORM_INV_MS; >; - < "GAMMALN" ; SC_OPCODE_GAMMA_LN; >; - < "COM.MICROSOFT.GAMMALN.PRECISE" ; SC_OPCODE_GAMMA_LN_MS; >; - < "ORG.OPENOFFICE.ERRORTYPE" ; SC_OPCODE_ERROR_TYPE; >; - < "ERROR.TYPE" ; SC_OPCODE_ERROR_TYPE_ODF; >; - < "FORMULA" ; SC_OPCODE_FORMULA; >; - < "ATAN2" ; SC_OPCODE_ARC_TAN_2; >; - < "COM.MICROSOFT.CEILING.MATH" ; SC_OPCODE_CEIL_MATH; >; - < "CEILING" ; SC_OPCODE_CEIL; >; - < "COM.MICROSOFT.CEILING" ; SC_OPCODE_CEIL_MS; >; - < "COM.MICROSOFT.CEILING.PRECISE" ; SC_OPCODE_CEIL_PRECISE; >; - < "COM.MICROSOFT.ISO.CEILING" ; SC_OPCODE_CEIL_ISO; >; - < "FLOOR" ; SC_OPCODE_FLOOR; >; - < "COM.MICROSOFT.FLOOR" ; SC_OPCODE_FLOOR_MS; >; - < "COM.MICROSOFT.FLOOR.MATH" ; SC_OPCODE_FLOOR_MATH; >; - < "COM.MICROSOFT.FLOOR.PRECISE" ; SC_OPCODE_FLOOR_PRECISE; >; - < "ROUND" ; SC_OPCODE_ROUND; >; - < "ROUNDUP" ; SC_OPCODE_ROUND_UP; >; - < "ROUNDDOWN" ; SC_OPCODE_ROUND_DOWN; >; - < "TRUNC" ; SC_OPCODE_TRUNC; >; - < "LOG" ; SC_OPCODE_LOG; >; - < "POWER" ; SC_OPCODE_POWER; >; - < "GCD" ; SC_OPCODE_GCD; >; - < "LCM" ; SC_OPCODE_LCM; >; - < "MOD" ; SC_OPCODE_MOD; >; - < "SUMPRODUCT" ; SC_OPCODE_SUM_PRODUCT; >; - < "SUMSQ" ; SC_OPCODE_SUM_SQ; >; - < "SUMX2MY2" ; SC_OPCODE_SUM_X2MY2; >; - < "SUMX2PY2" ; SC_OPCODE_SUM_X2DY2; >; - < "SUMXMY2" ; SC_OPCODE_SUM_XMY2; >; - < "DATE" ; SC_OPCODE_GET_DATE; >; - < "TIME" ; SC_OPCODE_GET_TIME; >; - < "DAYS" ; SC_OPCODE_GET_DIFF_DATE; >; - < "DAYS360" ; SC_OPCODE_GET_DIFF_DATE_360; >; - < "DATEDIF" ; SC_OPCODE_GET_DATEDIF; >; - < "MIN" ; SC_OPCODE_MIN; >; - < "MINA" ; SC_OPCODE_MIN_A; >; - < "MAX" ; SC_OPCODE_MAX; >; - < "MAXA" ; SC_OPCODE_MAX_A; >; - < "SUM" ; SC_OPCODE_SUM; >; - < "PRODUCT" ; SC_OPCODE_PRODUCT; >; - < "AVERAGE" ; SC_OPCODE_AVERAGE; >; - < "AVERAGEA" ; SC_OPCODE_AVERAGE_A; >; - < "COUNT" ; SC_OPCODE_COUNT; >; - < "COUNTA" ; SC_OPCODE_COUNT_2; >; - < "NPV" ; SC_OPCODE_NPV; >; - < "IRR" ; SC_OPCODE_IRR; >; - < "MIRR" ; SC_OPCODE_MIRR; >; - < "ISPMT" ; SC_OPCODE_ISPMT; >; - < "VAR" ; SC_OPCODE_VAR; >; - < "VARA" ; SC_OPCODE_VAR_A; >; - < "VARP" ; SC_OPCODE_VAR_P; >; - < "VARPA" ; SC_OPCODE_VAR_P_A; >; - < "COM.MICROSOFT.VAR.P" ; SC_OPCODE_VAR_P_MS; >; - < "COM.MICROSOFT.VAR.S" ; SC_OPCODE_VAR_S; >; - < "STDEV" ; SC_OPCODE_ST_DEV; >; - < "STDEVA" ; SC_OPCODE_ST_DEV_A; >; - < "STDEVP" ; SC_OPCODE_ST_DEV_P; >; - < "STDEVPA" ; SC_OPCODE_ST_DEV_P_A; >; - < "COM.MICROSOFT.STDEV.P" ; SC_OPCODE_ST_DEV_P_MS; >; - < "COM.MICROSOFT.STDEV.S" ; SC_OPCODE_ST_DEV_S; >; - < "BINOM.DIST.RANGE" ; SC_OPCODE_B; >; - < "NORMDIST" ; SC_OPCODE_NORM_DIST; >; - < "COM.MICROSOFT.NORM.DIST" ; SC_OPCODE_NORM_DIST_MS; >; - < "EXPONDIST" ; SC_OPCODE_EXP_DIST; >; - < "COM.MICROSOFT.EXPON.DIST" ; SC_OPCODE_EXP_DIST_MS; >; - < "BINOMDIST" ; SC_OPCODE_BINOM_DIST; >; - < "COM.MICROSOFT.BINOM.DIST" ; SC_OPCODE_BINOM_DIST_MS; >; - < "POISSON" ; SC_OPCODE_POISSON_DIST; >; - < "COM.MICROSOFT.POISSON.DIST" ; SC_OPCODE_POISSON_DIST_MS; >; - < "COMBIN" ; SC_OPCODE_COMBIN; >; - < "COMBINA" ; SC_OPCODE_COMBIN_A; >; - < "PERMUT" ; SC_OPCODE_PERMUT; >; - < "PERMUTATIONA" ; SC_OPCODE_PERMUTATION_A; >; - < "PV" ; SC_OPCODE_PV; >; - < "SYD" ; SC_OPCODE_SYD; >; - < "DDB" ; SC_OPCODE_DDB; >; - < "DB" ; SC_OPCODE_DB; >; - < "VDB" ; SC_OPCODE_VBD; >; - < "PDURATION" ; SC_OPCODE_PDURATION; >; - < "SLN" ; SC_OPCODE_SLN; >; - < "PMT" ; SC_OPCODE_PMT; >; - < "COLUMNS" ; SC_OPCODE_COLUMNS; >; - < "ROWS" ; SC_OPCODE_ROWS; >; - < "SHEETS" ; SC_OPCODE_SHEETS; >; - < "COLUMN" ; SC_OPCODE_COLUMN; >; - < "ROW" ; SC_OPCODE_ROW; >; - < "SHEET" ; SC_OPCODE_SHEET; >; - < "RRI" ; SC_OPCODE_RRI; >; - < "FV" ; SC_OPCODE_FV; >; - < "NPER" ; SC_OPCODE_NPER; >; - < "RATE" ; SC_OPCODE_RATE; >; - < "IPMT" ; SC_OPCODE_IPMT; >; - < "PPMT" ; SC_OPCODE_PPMT; >; - < "CUMIPMT" ; SC_OPCODE_CUM_IPMT; >; - < "CUMPRINC" ; SC_OPCODE_CUM_PRINC; >; - < "EFFECT" ; SC_OPCODE_EFFECT; >; - < "NOMINAL" ; SC_OPCODE_NOMINAL; >; - < "SUBTOTAL" ; SC_OPCODE_SUB_TOTAL; >; - < "DSUM" ; SC_OPCODE_DB_SUM; >; - < "DCOUNT" ; SC_OPCODE_DB_COUNT; >; - < "DCOUNTA" ; SC_OPCODE_DB_COUNT_2; >; - < "DAVERAGE" ; SC_OPCODE_DB_AVERAGE; >; - < "DGET" ; SC_OPCODE_DB_GET; >; - < "DMAX" ; SC_OPCODE_DB_MAX; >; - < "DMIN" ; SC_OPCODE_DB_MIN; >; - < "DPRODUCT" ; SC_OPCODE_DB_PRODUCT; >; - < "DSTDEV" ; SC_OPCODE_DB_STD_DEV; >; - < "DSTDEVP" ; SC_OPCODE_DB_STD_DEV_P; >; - < "DVAR" ; SC_OPCODE_DB_VAR; >; - < "DVARP" ; SC_OPCODE_DB_VAR_P; >; - < "INDIRECT" ; SC_OPCODE_INDIRECT; >; - < "ADDRESS" ; SC_OPCODE_ADDRESS; >; - < "MATCH" ; SC_OPCODE_MATCH; >; - < "COUNTBLANK" ; SC_OPCODE_COUNT_EMPTY_CELLS; >; - < "COUNTIF" ; SC_OPCODE_COUNT_IF; >; - < "SUMIF" ; SC_OPCODE_SUM_IF; >; - < "AVERAGEIF" ; SC_OPCODE_AVERAGE_IF; >; - < "SUMIFS" ; SC_OPCODE_SUM_IFS; >; - < "AVERAGEIFS" ; SC_OPCODE_AVERAGE_IFS; >; - < "COUNTIFS" ; SC_OPCODE_COUNT_IFS; >; - < "LOOKUP" ; SC_OPCODE_LOOKUP; >; - < "VLOOKUP" ; SC_OPCODE_V_LOOKUP; >; - < "HLOOKUP" ; SC_OPCODE_H_LOOKUP; >; - < "ORG.OPENOFFICE.MULTIRANGE" ; SC_OPCODE_MULTI_AREA; >; // legacy for range list (union) - < "OFFSET" ; SC_OPCODE_OFFSET; >; - < "INDEX" ; SC_OPCODE_INDEX; >; - < "AREAS" ; SC_OPCODE_AREAS; >; - < "DOLLAR" ; SC_OPCODE_CURRENCY; >; - < "REPLACE" ; SC_OPCODE_REPLACE; >; - < "FIXED" ; SC_OPCODE_FIXED; >; - < "FIND" ; SC_OPCODE_FIND; >; - < "EXACT" ; SC_OPCODE_EXACT; >; - < "LEFT" ; SC_OPCODE_LEFT; >; - < "RIGHT" ; SC_OPCODE_RIGHT; >; - < "SEARCH" ; SC_OPCODE_SEARCH; >; - < "MID" ; SC_OPCODE_MID; >; - < "LENB" ; SC_OPCODE_LENB; >; - < "RIGHTB" ; SC_OPCODE_RIGHTB; >; - < "LEFTB" ; SC_OPCODE_LEFTB; >; - < "REPLACEB" ; SC_OPCODE_REPLACEB; >; - < "MIDB" ; SC_OPCODE_MIDB; >; - < "TEXT" ; SC_OPCODE_TEXT; >; - < "SUBSTITUTE" ; SC_OPCODE_SUBSTITUTE; >; - < "REPT" ; SC_OPCODE_REPT; >; - < "CONCATENATE" ; SC_OPCODE_CONCAT; >; - < "COM.MICROSOFT.CONCAT" ; SC_OPCODE_CONCAT_MS; >; - < "COM.MICROSOFT.TEXTJOIN" ; SC_OPCODE_TEXTJOIN_MS; >; - < "COM.MICROSOFT.IFS" ; SC_OPCODE_IFS_MS; >; - < "COM.MICROSOFT.SWITCH" ; SC_OPCODE_SWITCH_MS; >; - < "COM.MICROSOFT.MINIFS" ; SC_OPCODE_MINIFS_MS; >; - < "COM.MICROSOFT.MAXIFS" ; SC_OPCODE_MAXIFS_MS; >; - < "MVALUE" ; SC_OPCODE_MAT_VALUE; >; - < "MDETERM" ; SC_OPCODE_MAT_DET; >; - < "MINVERSE" ; SC_OPCODE_MAT_INV; >; - < "MMULT" ; SC_OPCODE_MAT_MULT; >; - < "TRANSPOSE" ; SC_OPCODE_MAT_TRANS; >; - < "MUNIT" ; SC_OPCODE_MATRIX_UNIT; >; - < "ORG.OPENOFFICE.GOALSEEK" ; SC_OPCODE_BACK_SOLVER; >; - < "HYPGEOMDIST" ; SC_OPCODE_HYP_GEOM_DIST; >; - < "COM.MICROSOFT.HYPGEOM.DIST" ; SC_OPCODE_HYP_GEOM_DIST_MS; >; - < "LOGNORMDIST" ; SC_OPCODE_LOG_NORM_DIST; >; - < "COM.MICROSOFT.LOGNORM.DIST" ; SC_OPCODE_LOG_NORM_DIST_MS; >; - < "LEGACY.TDIST" ; SC_OPCODE_T_DIST; >; - < "COM.MICROSOFT.T.DIST.2T" ; SC_OPCODE_T_DIST_2T; >; - < "COM.MICROSOFT.T.DIST" ; SC_OPCODE_T_DIST_MS; >; - < "COM.MICROSOFT.T.DIST.RT" ; SC_OPCODE_T_DIST_RT; >; - < "LEGACY.FDIST" ; SC_OPCODE_F_DIST; >; - < "FDIST" ; SC_OPCODE_F_DIST_LT; >; - < "COM.MICROSOFT.F.DIST.RT" ; SC_OPCODE_F_DIST_RT; >; - < "LEGACY.CHIDIST" ; SC_OPCODE_CHI_DIST; >; - < "COM.MICROSOFT.CHISQ.DIST.RT" ; SC_OPCODE_CHI_DIST_MS; >; - < "WEIBULL" ; SC_OPCODE_WEIBULL; >; - < "COM.MICROSOFT.WEIBULL.DIST" ; SC_OPCODE_WEIBULL_MS; >; - < "NEGBINOMDIST" ; SC_OPCODE_NEG_BINOM_VERT; >; - < "COM.MICROSOFT.NEGBINOM.DIST" ; SC_OPCODE_NEG_BINOM_DIST_MS; >; - < "CRITBINOM" ; SC_OPCODE_CRIT_BINOM; >; - < "COM.MICROSOFT.BINOM.INV" ; SC_OPCODE_BINOM_INV; >; - < "KURT" ; SC_OPCODE_KURT; >; - < "HARMEAN" ; SC_OPCODE_HAR_MEAN; >; - < "GEOMEAN" ; SC_OPCODE_GEO_MEAN; >; - < "STANDARDIZE" ; SC_OPCODE_STANDARD; >; - < "AVEDEV" ; SC_OPCODE_AVE_DEV; >; - < "SKEW" ; SC_OPCODE_SKEW; >; - < "SKEWP" ; SC_OPCODE_SKEWP; >; - < "DEVSQ" ; SC_OPCODE_DEV_SQ; >; - < "MEDIAN" ; SC_OPCODE_MEDIAN; >; - < "MODE" ; SC_OPCODE_MODAL_VALUE; >; - < "COM.MICROSOFT.MODE.SNGL" ; SC_OPCODE_MODAL_VALUE_MS; >; - < "COM.MICROSOFT.MODE.MULT" ; SC_OPCODE_MODAL_VALUE_MULTI; >; - < "ZTEST" ; SC_OPCODE_Z_TEST; >; - < "COM.MICROSOFT.Z.TEST" ; SC_OPCODE_Z_TEST_MS; >; - < "COM.MICROSOFT.AGGREGATE" ; SC_OPCODE_AGGREGATE; >; - < "TTEST" ; SC_OPCODE_T_TEST; >; - < "COM.MICROSOFT.T.TEST" ; SC_OPCODE_T_TEST_MS; >; - < "RANK" ; SC_OPCODE_RANK; >; - < "PERCENTILE" ; SC_OPCODE_PERCENTILE; >; - < "PERCENTRANK" ; SC_OPCODE_PERCENT_RANK; >; - < "COM.MICROSOFT.PERCENTILE.INC" ; SC_OPCODE_PERCENTILE_INC; >; - < "COM.MICROSOFT.PERCENTRANK.INC" ; SC_OPCODE_PERCENT_RANK_INC; >; - < "COM.MICROSOFT.QUARTILE.INC" ; SC_OPCODE_QUARTILE_INC; >; - < "COM.MICROSOFT.RANK.EQ" ; SC_OPCODE_RANK_EQ; >; - < "COM.MICROSOFT.PERCENTILE.EXC" ; SC_OPCODE_PERCENTILE_EXC; >; - < "COM.MICROSOFT.PERCENTRANK.EXC" ; SC_OPCODE_PERCENT_RANK_EXC; >; - < "COM.MICROSOFT.QUARTILE.EXC" ; SC_OPCODE_QUARTILE_EXC; >; - < "COM.MICROSOFT.RANK.AVG" ; SC_OPCODE_RANK_AVG; >; - < "LARGE" ; SC_OPCODE_LARGE; >; - < "SMALL" ; SC_OPCODE_SMALL; >; - < "FREQUENCY" ; SC_OPCODE_FREQUENCY; >; - < "QUARTILE" ; SC_OPCODE_QUARTILE; >; - < "NORMINV" ; SC_OPCODE_NORM_INV; >; - < "COM.MICROSOFT.NORM.INV" ; SC_OPCODE_NORM_INV_MS; >; - < "CONFIDENCE" ; SC_OPCODE_CONFIDENCE; >; - < "COM.MICROSOFT.CONFIDENCE.NORM" ; SC_OPCODE_CONFIDENCE_N; >; - < "COM.MICROSOFT.CONFIDENCE.T" ; SC_OPCODE_CONFIDENCE_T; >; - < "FTEST" ; SC_OPCODE_F_TEST; >; - < "COM.MICROSOFT.F.TEST" ; SC_OPCODE_F_TEST_MS; >; - < "TRIMMEAN" ; SC_OPCODE_TRIM_MEAN; >; - < "PROB" ; SC_OPCODE_PROB; >; - < "CORREL" ; SC_OPCODE_CORREL; >; - < "COVAR" ; SC_OPCODE_COVAR; >; - < "COM.MICROSOFT.COVARIANCE.P" ; SC_OPCODE_COVARIANCE_P; >; - < "COM.MICROSOFT.COVARIANCE.S" ; SC_OPCODE_COVARIANCE_S; >; - < "PEARSON" ; SC_OPCODE_PEARSON; >; - < "RSQ" ; SC_OPCODE_RSQ; >; - < "STEYX" ; SC_OPCODE_STEYX; >; - < "SLOPE" ; SC_OPCODE_SLOPE; >; - < "INTERCEPT" ; SC_OPCODE_INTERCEPT; >; - < "TREND" ; SC_OPCODE_TREND; >; - < "GROWTH" ; SC_OPCODE_GROWTH; >; - < "LINEST" ; SC_OPCODE_LINEST; >; - < "LOGEST" ; SC_OPCODE_LOGEST; >; - < "FORECAST" ; SC_OPCODE_FORECAST; >; - < "COM.MICROSOFT.FORECAST.ETS" ; SC_OPCODE_FORECAST_ETS_ADD; >; - < "COM.MICROSOFT.FORECAST.ETS.SEASONALITY" ; SC_OPCODE_FORECAST_ETS_SEA; >; - < "ORG.LIBREOFFICE.FORECAST.ETS.MULT" ; SC_OPCODE_FORECAST_ETS_MUL; >; - < "COM.MICROSOFT.FORECAST.ETS.CONFINT" ; SC_OPCODE_FORECAST_ETS_PIA; >; - < "ORG.LIBREOFFICE.FORECAST.ETS.PI.MULT" ; SC_OPCODE_FORECAST_ETS_PIM; >; - < "COM.MICROSOFT.FORECAST.ETS.STAT" ; SC_OPCODE_FORECAST_ETS_STA; >; - < "ORG.LIBREOFFICE.FORECAST.ETS.STAT.MULT" ; SC_OPCODE_FORECAST_ETS_STM; >; - < "COM.MICROSOFT.FORECAST.LINEAR" ; SC_OPCODE_FORECAST_LIN; >; - < "LEGACY.CHIINV" ; SC_OPCODE_CHI_INV; >; - < "COM.MICROSOFT.CHISQ.INV.RT" ; SC_OPCODE_CHI_INV_MS; >; - < "GAMMADIST" ; SC_OPCODE_GAMMA_DIST; >; - < "COM.MICROSOFT.GAMMA.DIST" ; SC_OPCODE_GAMMA_DIST_MS; >; - < "GAMMAINV" ; SC_OPCODE_GAMMA_INV; >; - < "COM.MICROSOFT.GAMMA.INV" ; SC_OPCODE_GAMMA_INV_MS; >; - < "TINV" ; SC_OPCODE_T_INV; >; - < "COM.MICROSOFT.T.INV.2T" ; SC_OPCODE_T_INV_2T; >; - < "COM.MICROSOFT.T.INV" ; SC_OPCODE_T_INV_MS; >; - < "LEGACY.FINV" ; SC_OPCODE_F_INV; >; - < "FINV" ; SC_OPCODE_F_INV_LT; >; - < "COM.MICROSOFT.F.INV.RT" ; SC_OPCODE_F_INV_RT; >; - < "LEGACY.CHITEST" ; SC_OPCODE_CHI_TEST; >; - < "COM.MICROSOFT.CHISQ.TEST" ; SC_OPCODE_CHI_TEST_MS; >; - < "LOGINV" ; SC_OPCODE_LOG_INV; >; - < "COM.MICROSOFT.LOGNORM.INV" ; SC_OPCODE_LOG_INV_MS; >; - < "MULTIPLE.OPERATIONS" ; SC_OPCODE_TABLE_OP; >; - < "BETADIST" ; SC_OPCODE_BETA_DIST; >; - < "BETAINV" ; SC_OPCODE_BETA_INV; >; - < "COM.MICROSOFT.BETA.DIST" ; SC_OPCODE_BETA_DIST_MS; >; - < "COM.MICROSOFT.BETA.INV" ; SC_OPCODE_BETA_INV_MS; >; - < "WEEKNUM" ; SC_OPCODE_WEEK; >; - < "ISOWEEKNUM" ; SC_OPCODE_ISOWEEKNUM; >; - < "ORG.LIBREOFFICE.WEEKNUM_OOO" ; SC_OPCODE_WEEKNUM_OOO; >; - < "ORG.OPENOFFICE.EASTERSUNDAY" ; SC_OPCODE_EASTERSUNDAY; >; - < "WEEKDAY" ; SC_OPCODE_GET_DAY_OF_WEEK; >; - < "NETWORKDAYS" ; SC_OPCODE_NETWORKDAYS; >; - < "COM.MICROSOFT.NETWORKDAYS.INTL" ; SC_OPCODE_NETWORKDAYS_MS; >; - < "COM.MICROSOFT.WORKDAY.INTL" ; SC_OPCODE_WORKDAY_MS; >; - < "#NAME!" ; SC_OPCODE_NO_NAME; >; - < "ORG.OPENOFFICE.STYLE" ; SC_OPCODE_STYLE; >; - < "DDE" ; SC_OPCODE_DDE; >; - < "BASE" ; SC_OPCODE_BASE; >; - < "DECIMAL" ; SC_OPCODE_DECIMAL; >; - < "ORG.OPENOFFICE.CONVERT" ; SC_OPCODE_CONVERT_OOO; >; - < "ROMAN" ; SC_OPCODE_ROMAN; >; - < "ARABIC" ; SC_OPCODE_ARABIC; >; - < "HYPERLINK" ; SC_OPCODE_HYPERLINK; >; - < "INFO" ; SC_OPCODE_INFO; >; - < "COM.MICROSOFT.BAHTTEXT" ; SC_OPCODE_BAHTTEXT; >; - < "GETPIVOTDATA" ; SC_OPCODE_GET_PIVOT_DATA; >; - < "EUROCONVERT" ; SC_OPCODE_EUROCONVERT; >; - < "NUMBERVALUE" ; SC_OPCODE_NUMBERVALUE; >; - < "GAMMA" ; SC_OPCODE_GAMMA; >; - < "CHISQDIST" ; SC_OPCODE_CHISQ_DIST; >; - < "COM.MICROSOFT.CHISQ.DIST" ; SC_OPCODE_CHISQ_DIST_MS; >; - < "CHISQINV" ; SC_OPCODE_CHISQ_INV; >; - < "COM.MICROSOFT.CHISQ.INV" ; SC_OPCODE_CHISQ_INV_MS; >; - < "BITAND" ; SC_OPCODE_BITAND; >; - < "BITOR" ; SC_OPCODE_BITOR; >; - < "BITXOR" ; SC_OPCODE_BITXOR; >; - < "BITRSHIFT" ; SC_OPCODE_BITRSHIFT; >; - < "BITLSHIFT" ; SC_OPCODE_BITLSHIFT; >; - /* BEGIN defined ERROR.TYPE() values. */ - < "#NULL!" ; SC_OPCODE_ERROR_NULL; >; - < "#DIV/0!" ; SC_OPCODE_ERROR_DIVZERO; >; - < "#VALUE!" ; SC_OPCODE_ERROR_VALUE; >; - < "#REF!" ; SC_OPCODE_ERROR_REF; >; - < "#NAME?" ; SC_OPCODE_ERROR_NAME; >; - < "#NUM!" ; SC_OPCODE_ERROR_NUM; >; - < "#N/A" ; SC_OPCODE_ERROR_NA; >; - /* END defined ERROR.TYPE() values. */ - < "COM.MICROSOFT.FILTERXML" ; SC_OPCODE_FILTERXML; >; - < "COM.MICROSOFT.WEBSERVICE" ; SC_OPCODE_WEBSERVICE; >; - < "ORG.LIBREOFFICE.COLOR" ; SC_OPCODE_COLOR; >; - < "COM.MICROSOFT.ERF.PRECISE" ; SC_OPCODE_ERF_MS; >; - < "COM.MICROSOFT.ERFC.PRECISE" ; SC_OPCODE_ERFC_MS; >; - < "COM.MICROSOFT.ENCODEURL" ; SC_OPCODE_ENCODEURL; >; - < "ORG.LIBREOFFICE.RAWSUBTRACT" ; SC_OPCODE_RAWSUBTRACT; >; - < "ORG.LIBREOFFICE.ROUNDSIG" ; SC_OPCODE_ROUNDSIG; >; - }; -}; - -/** These function names are used in the OOXML XLSX import/export. */ -StringArray RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML -{ - ItemList = - { - < "IF" ; SC_OPCODE_IF; >; - < "IFERROR" ; SC_OPCODE_IF_ERROR; >; - < "_xlfn.IFNA" ; SC_OPCODE_IF_NA; >; - < "CHOOSE" ; SC_OPCODE_CHOOSE; >; - < "(" ; SC_OPCODE_OPEN; >; - < ")" ; SC_OPCODE_CLOSE; >; - < "[" ; SC_OPCODE_TABLE_REF_OPEN; >; - < "]" ; SC_OPCODE_TABLE_REF_CLOSE; >; - < "#All" ; SC_OPCODE_TABLE_REF_ITEM_ALL; >; - < "#Headers" ; SC_OPCODE_TABLE_REF_ITEM_HEADERS; >; - < "#Data" ; SC_OPCODE_TABLE_REF_ITEM_DATA; >; - < "#Totals" ; SC_OPCODE_TABLE_REF_ITEM_TOTALS; >; - < "#This Row" ; SC_OPCODE_TABLE_REF_ITEM_THIS_ROW; >; - < "{" ; SC_OPCODE_ARRAY_OPEN; >; - < "}" ; SC_OPCODE_ARRAY_CLOSE; >; - < ";" ; SC_OPCODE_ARRAY_ROW_SEP; >; - < "," ; SC_OPCODE_ARRAY_COL_SEP; >; - < "," ; SC_OPCODE_SEP; >; - < "%" ; SC_OPCODE_PERCENT_SIGN; >; - < "+" ; SC_OPCODE_ADD; >; - < "-" ; SC_OPCODE_SUB; >; - < "*" ; SC_OPCODE_MUL; >; - < "/" ; SC_OPCODE_DIV; >; - < "&" ; SC_OPCODE_AMPERSAND; >; - < "^" ; SC_OPCODE_POW; >; - < "=" ; SC_OPCODE_EQUAL; >; - < "<>" ; SC_OPCODE_NOT_EQUAL; >; - < "<" ; SC_OPCODE_LESS; >; - < ">" ; SC_OPCODE_GREATER; >; - < "<=" ; SC_OPCODE_LESS_EQUAL; >; - < ">=" ; SC_OPCODE_GREATER_EQUAL; >; - < "AND" ; SC_OPCODE_AND; >; - < "OR" ; SC_OPCODE_OR; >; - < "_xlfn.XOR" ; SC_OPCODE_XOR; >; - < " " ; SC_OPCODE_INTERSECT; >; - < "~" ; SC_OPCODE_UNION; >; - < ":" ; SC_OPCODE_RANGE; >; - < "NOT" ; SC_OPCODE_NOT; >; - < "NEG" ; SC_OPCODE_NEG; >; - < "-" ; SC_OPCODE_NEG_SUB; >; - < "PI" ; SC_OPCODE_PI; >; - < "RAND" ; SC_OPCODE_RANDOM; >; - < "TRUE" ; SC_OPCODE_TRUE; >; - < "FALSE" ; SC_OPCODE_FALSE; >; - < "TODAY" ; SC_OPCODE_GET_ACT_DATE; >; - < "NOW" ; SC_OPCODE_GET_ACT_TIME; >; - < "NA" ; SC_OPCODE_NO_VALUE; >; - < "_xlfn.ORG.OPENOFFICE.CURRENT" ; SC_OPCODE_CURRENT; >; - < "DEGREES" ; SC_OPCODE_DEG; >; - < "RADIANS" ; SC_OPCODE_RAD; >; - < "SIN" ; SC_OPCODE_SIN; >; - < "COS" ; SC_OPCODE_COS; >; - < "TAN" ; SC_OPCODE_TAN; >; - < "_xlfn.COT" ; SC_OPCODE_COT; >; - < "ASIN" ; SC_OPCODE_ARC_SIN; >; - < "ACOS" ; SC_OPCODE_ARC_COS; >; - < "ATAN" ; SC_OPCODE_ARC_TAN; >; - < "_xlfn.ACOT" ; SC_OPCODE_ARC_COT; >; - < "SINH" ; SC_OPCODE_SIN_HYP; >; - < "COSH" ; SC_OPCODE_COS_HYP; >; - < "TANH" ; SC_OPCODE_TAN_HYP; >; - < "_xlfn.COTH" ; SC_OPCODE_COT_HYP; >; - < "ASINH" ; SC_OPCODE_ARC_SIN_HYP; >; - < "ACOSH" ; SC_OPCODE_ARC_COS_HYP; >; - < "ATANH" ; SC_OPCODE_ARC_TAN_HYP; >; - < "_xlfn.ACOTH" ; SC_OPCODE_ARC_COT_HYP; >; - < "_xlfn.CSC" ; SC_OPCODE_COSECANT; >; - < "_xlfn.SEC" ; SC_OPCODE_SECANT; >; - < "_xlfn.CSCH" ; SC_OPCODE_COSECANT_HYP; >; - < "_xlfn.SECH" ; SC_OPCODE_SECANT_HYP; >; - < "EXP" ; SC_OPCODE_EXP; >; - < "LN" ; SC_OPCODE_LN; >; - < "SQRT" ; SC_OPCODE_SQRT; >; - < "FACT" ; SC_OPCODE_FACT; >; - < "YEAR" ; SC_OPCODE_GET_YEAR; >; - < "MONTH" ; SC_OPCODE_GET_MONTH; >; - < "DAY" ; SC_OPCODE_GET_DAY; >; - < "HOUR" ; SC_OPCODE_GET_HOUR; >; - < "MINUTE" ; SC_OPCODE_GET_MIN; >; - < "SECOND" ; SC_OPCODE_GET_SEC; >; - < "SIGN" ; SC_OPCODE_PLUS_MINUS; >; - < "ABS" ; SC_OPCODE_ABS; >; - < "INT" ; SC_OPCODE_INT; >; - < "_xlfn.PHI" ; SC_OPCODE_PHI; >; - < "_xlfn.GAUSS" ; SC_OPCODE_GAUSS; >; - < "ISBLANK" ; SC_OPCODE_IS_EMPTY; >; - < "ISTEXT" ; SC_OPCODE_IS_STRING; >; - < "ISNONTEXT" ; SC_OPCODE_IS_NON_STRING; >; - < "ISLOGICAL" ; SC_OPCODE_IS_LOGICAL; >; - < "TYPE" ; SC_OPCODE_TYPE; >; - < "CELL" ; SC_OPCODE_CELL; >; - < "ISREF" ; SC_OPCODE_IS_REF; >; - < "ISNUMBER" ; SC_OPCODE_IS_VALUE; >; - < "_xlfn.ISFORMULA" ; SC_OPCODE_IS_FORMULA; >; - < "ISNA" ; SC_OPCODE_IS_NV; >; - < "ISERR" ; SC_OPCODE_IS_ERR; >; - < "ISERROR" ; SC_OPCODE_IS_ERROR; >; - < "ISEVEN" ; SC_OPCODE_IS_EVEN; >; - < "ISODD" ; SC_OPCODE_IS_ODD; >; - < "N" ; SC_OPCODE_N; >; - < "DATEVALUE" ; SC_OPCODE_GET_DATE_VALUE; >; - < "TIMEVALUE" ; SC_OPCODE_GET_TIME_VALUE; >; - < "CODE" ; SC_OPCODE_CODE; >; - < "TRIM" ; SC_OPCODE_TRIM; >; - < "UPPER" ; SC_OPCODE_UPPER; >; - < "PROPER" ; SC_OPCODE_PROPER; >; - < "LOWER" ; SC_OPCODE_LOWER; >; - < "LEN" ; SC_OPCODE_LEN; >; - < "T" ; SC_OPCODE_T; >; - < "VALUE" ; SC_OPCODE_VALUE; >; - < "CLEAN" ; SC_OPCODE_CLEAN; >; - < "CHAR" ; SC_OPCODE_CHAR; >; - < "JIS" ; SC_OPCODE_JIS; >; - < "ASC" ; SC_OPCODE_ASC; >; - < "_xlfn.UNICODE" ; SC_OPCODE_UNICODE; >; - < "_xlfn.UNICHAR" ; SC_OPCODE_UNICHAR; >; - < "LOG10" ; SC_OPCODE_LOG10; >; - < "EVEN" ; SC_OPCODE_EVEN; >; - < "ODD" ; SC_OPCODE_ODD; >; - < "NORMSDIST" ; SC_OPCODE_STD_NORM_DIST; >; - < "_xlfn.NORM.S.DIST" ; SC_OPCODE_STD_NORM_DIST_MS; >; - < "FISHER" ; SC_OPCODE_FISHER; >; - < "FISHERINV" ; SC_OPCODE_FISHER_INV; >; - < "NORMSINV" ; SC_OPCODE_S_NORM_INV; >; - < "_xlfn.NORM.S.INV" ; SC_OPCODE_S_NORM_INV_MS; >; - < "GAMMALN" ; SC_OPCODE_GAMMA_LN; >; - < "_xlfn.GAMMALN.PRECISE" ; SC_OPCODE_GAMMA_LN_MS; >; - < "_xlfn.ORG.OPENOFFICE.ERRORTYPE" ; SC_OPCODE_ERROR_TYPE; >; - < "ERROR.TYPE" ; SC_OPCODE_ERROR_TYPE_ODF; >; - < "_xlfn.FORMULATEXT" ; SC_OPCODE_FORMULA; >; - < "ATAN2" ; SC_OPCODE_ARC_TAN_2; >; - < "_xlfn.CEILING.MATH" ; SC_OPCODE_CEIL_MATH; >; - < "_xlfn.CEILING.MATH" ; SC_OPCODE_CEIL; >; - < "CEILING" ; SC_OPCODE_CEIL_MS; >; - < "_xlfn.CEILING.PRECISE" ; SC_OPCODE_CEIL_PRECISE; >; - < "ISO.CEILING" ; SC_OPCODE_CEIL_ISO; >; - < "FLOOR" ; SC_OPCODE_FLOOR_MS; >; - < "_xlfn.FLOOR.MATH" ; SC_OPCODE_FLOOR_MATH; >; - < "_xlfn.FLOOR.MATH" ; SC_OPCODE_FLOOR; >; - < "_xlfn.FLOOR.PRECISE" ; SC_OPCODE_FLOOR_PRECISE; >; - < "ROUND" ; SC_OPCODE_ROUND; >; - < "ROUNDUP" ; SC_OPCODE_ROUND_UP; >; - < "ROUNDDOWN" ; SC_OPCODE_ROUND_DOWN; >; - < "TRUNC" ; SC_OPCODE_TRUNC; >; - < "LOG" ; SC_OPCODE_LOG; >; - < "POWER" ; SC_OPCODE_POWER; >; - < "GCD" ; SC_OPCODE_GCD; >; - < "LCM" ; SC_OPCODE_LCM; >; - < "MOD" ; SC_OPCODE_MOD; >; - < "SUMPRODUCT" ; SC_OPCODE_SUM_PRODUCT; >; - < "SUMSQ" ; SC_OPCODE_SUM_SQ; >; - < "SUMX2MY2" ; SC_OPCODE_SUM_X2MY2; >; - < "SUMX2PY2" ; SC_OPCODE_SUM_X2DY2; >; - < "SUMXMY2" ; SC_OPCODE_SUM_XMY2; >; - < "DATE" ; SC_OPCODE_GET_DATE; >; - < "TIME" ; SC_OPCODE_GET_TIME; >; - < "_xlfn.DAYS" ; SC_OPCODE_GET_DIFF_DATE; >; - < "DAYS360" ; SC_OPCODE_GET_DIFF_DATE_360; >; - < "DATEDIF" ; SC_OPCODE_GET_DATEDIF; >; - < "MIN" ; SC_OPCODE_MIN; >; - < "MINA" ; SC_OPCODE_MIN_A; >; - < "MAX" ; SC_OPCODE_MAX; >; - < "MAXA" ; SC_OPCODE_MAX_A; >; - < "SUM" ; SC_OPCODE_SUM; >; - < "PRODUCT" ; SC_OPCODE_PRODUCT; >; - < "AVERAGE" ; SC_OPCODE_AVERAGE; >; - < "AVERAGEA" ; SC_OPCODE_AVERAGE_A; >; - < "COUNT" ; SC_OPCODE_COUNT; >; - < "COUNTA" ; SC_OPCODE_COUNT_2; >; - < "NPV" ; SC_OPCODE_NPV; >; - < "IRR" ; SC_OPCODE_IRR; >; - < "MIRR" ; SC_OPCODE_MIRR; >; - < "ISPMT" ; SC_OPCODE_ISPMT; >; - < "VAR" ; SC_OPCODE_VAR; >; - < "VARA" ; SC_OPCODE_VAR_A; >; - < "VARP" ; SC_OPCODE_VAR_P; >; - < "VARPA" ; SC_OPCODE_VAR_P_A; >; - < "_xlfn.VAR.P" ; SC_OPCODE_VAR_P_MS; >; - < "_xlfn.VAR.S" ; SC_OPCODE_VAR_S; >; - < "STDEV" ; SC_OPCODE_ST_DEV; >; - < "STDEVA" ; SC_OPCODE_ST_DEV_A; >; - < "STDEVP" ; SC_OPCODE_ST_DEV_P; >; - < "STDEVPA" ; SC_OPCODE_ST_DEV_P_A; >; - < "_xlfn.STDEV.P" ; SC_OPCODE_ST_DEV_P_MS; >; - < "_xlfn.STDEV.S" ; SC_OPCODE_ST_DEV_S; >; - < "B" ; SC_OPCODE_B; >; - < "NORMDIST" ; SC_OPCODE_NORM_DIST; >; - < "_xlfn.NORM.DIST" ; SC_OPCODE_NORM_DIST_MS; >; - < "EXPONDIST" ; SC_OPCODE_EXP_DIST; >; - < "_xlfn.EXPON.DIST" ; SC_OPCODE_EXP_DIST_MS; >; - < "BINOMDIST" ; SC_OPCODE_BINOM_DIST; >; - < "_xlfn.BINOM.DIST" ; SC_OPCODE_BINOM_DIST_MS; >; - < "POISSON" ; SC_OPCODE_POISSON_DIST; >; - < "_xlfn.POISSON.DIST" ; SC_OPCODE_POISSON_DIST_MS; >; - < "COMBIN" ; SC_OPCODE_COMBIN; >; - < "_xlfn.COMBINA" ; SC_OPCODE_COMBIN_A; >; - < "PERMUT" ; SC_OPCODE_PERMUT; >; - < "_xlfn.PERMUTATIONA" ; SC_OPCODE_PERMUTATION_A; >; - < "PV" ; SC_OPCODE_PV; >; - < "SYD" ; SC_OPCODE_SYD; >; - < "DDB" ; SC_OPCODE_DDB; >; - < "DB" ; SC_OPCODE_DB; >; - < "VDB" ; SC_OPCODE_VBD; >; - < "_xlfn.PDURATION" ; SC_OPCODE_PDURATION; >; - < "SLN" ; SC_OPCODE_SLN; >; - < "PMT" ; SC_OPCODE_PMT; >; - < "COLUMNS" ; SC_OPCODE_COLUMNS; >; - < "ROWS" ; SC_OPCODE_ROWS; >; - < "_xlfn.SHEETS" ; SC_OPCODE_SHEETS; >; - < "COLUMN" ; SC_OPCODE_COLUMN; >; - < "ROW" ; SC_OPCODE_ROW; >; - < "_xlfn.SHEET" ; SC_OPCODE_SHEET; >; - < "_xlfn.RRI" ; SC_OPCODE_RRI; >; - < "FV" ; SC_OPCODE_FV; >; - < "NPER" ; SC_OPCODE_NPER; >; - < "RATE" ; SC_OPCODE_RATE; >; - < "IPMT" ; SC_OPCODE_IPMT; >; - < "PPMT" ; SC_OPCODE_PPMT; >; - < "CUMIPMT" ; SC_OPCODE_CUM_IPMT; >; - < "CUMPRINC" ; SC_OPCODE_CUM_PRINC; >; - < "EFFECT" ; SC_OPCODE_EFFECT; >; - < "NOMINAL" ; SC_OPCODE_NOMINAL; >; - < "SUBTOTAL" ; SC_OPCODE_SUB_TOTAL; >; - < "DSUM" ; SC_OPCODE_DB_SUM; >; - < "DCOUNT" ; SC_OPCODE_DB_COUNT; >; - < "DCOUNTA" ; SC_OPCODE_DB_COUNT_2; >; - < "DAVERAGE" ; SC_OPCODE_DB_AVERAGE; >; - < "DGET" ; SC_OPCODE_DB_GET; >; - < "DMAX" ; SC_OPCODE_DB_MAX; >; - < "DMIN" ; SC_OPCODE_DB_MIN; >; - < "DPRODUCT" ; SC_OPCODE_DB_PRODUCT; >; - < "DSTDEV" ; SC_OPCODE_DB_STD_DEV; >; - < "DSTDEVP" ; SC_OPCODE_DB_STD_DEV_P; >; - < "DVAR" ; SC_OPCODE_DB_VAR; >; - < "DVARP" ; SC_OPCODE_DB_VAR_P; >; - < "INDIRECT" ; SC_OPCODE_INDIRECT; >; - < "ADDRESS" ; SC_OPCODE_ADDRESS; >; - < "MATCH" ; SC_OPCODE_MATCH; >; - < "COUNTBLANK" ; SC_OPCODE_COUNT_EMPTY_CELLS; >; - < "COUNTIF" ; SC_OPCODE_COUNT_IF; >; - < "SUMIF" ; SC_OPCODE_SUM_IF; >; - < "AVERAGEIF" ; SC_OPCODE_AVERAGE_IF; >; - < "SUMIFS" ; SC_OPCODE_SUM_IFS; >; - < "AVERAGEIFS" ; SC_OPCODE_AVERAGE_IFS; >; - < "COUNTIFS" ; SC_OPCODE_COUNT_IFS; >; - < "LOOKUP" ; SC_OPCODE_LOOKUP; >; - < "VLOOKUP" ; SC_OPCODE_V_LOOKUP; >; - < "HLOOKUP" ; SC_OPCODE_H_LOOKUP; >; - < "_xlfn.ORG.OPENOFFICE.MULTIRANGE" ; SC_OPCODE_MULTI_AREA; >; // legacy for range list (union) - < "OFFSET" ; SC_OPCODE_OFFSET; >; - < "INDEX" ; SC_OPCODE_INDEX; >; - < "AREAS" ; SC_OPCODE_AREAS; >; - < "DOLLAR" ; SC_OPCODE_CURRENCY; >; - < "REPLACE" ; SC_OPCODE_REPLACE; >; - < "FIXED" ; SC_OPCODE_FIXED; >; - < "FIND" ; SC_OPCODE_FIND; >; - < "EXACT" ; SC_OPCODE_EXACT; >; - < "LEFT" ; SC_OPCODE_LEFT; >; - < "RIGHT" ; SC_OPCODE_RIGHT; >; - < "SEARCH" ; SC_OPCODE_SEARCH; >; - < "MID" ; SC_OPCODE_MID; >; - < "LENB" ; SC_OPCODE_LENB; >; - < "RIGHTB" ; SC_OPCODE_RIGHTB; >; - < "LEFTB" ; SC_OPCODE_LEFTB; >; - < "REPLACEB" ; SC_OPCODE_REPLACEB; >; - < "MIDB" ; SC_OPCODE_MIDB; >; - < "TEXT" ; SC_OPCODE_TEXT; >; - < "SUBSTITUTE" ; SC_OPCODE_SUBSTITUTE; >; - < "REPT" ; SC_OPCODE_REPT; >; - < "CONCATENATE" ; SC_OPCODE_CONCAT; >; - < "_xlfn.CONCAT" ; SC_OPCODE_CONCAT_MS; >; - < "_xlfn.TEXTJOIN" ; SC_OPCODE_TEXTJOIN_MS; >; - < "_xlfn.IFS" ; SC_OPCODE_IFS_MS; >; - < "_xlfn.SWITCH" ; SC_OPCODE_SWITCH_MS; >; - < "_xlfn.MINIFS" ; SC_OPCODE_MINIFS_MS; >; - < "_xlfn.MAXIFS" ; SC_OPCODE_MAXIFS_MS; >; - < "MVALUE" ; SC_OPCODE_MAT_VALUE; >; - < "MDETERM" ; SC_OPCODE_MAT_DET; >; - < "MINVERSE" ; SC_OPCODE_MAT_INV; >; - < "MMULT" ; SC_OPCODE_MAT_MULT; >; - < "TRANSPOSE" ; SC_OPCODE_MAT_TRANS; >; - < "_xlfn.MUNIT" ; SC_OPCODE_MATRIX_UNIT; >; - < "_xlfn.ORG.OPENOFFICE.GOALSEEK" ; SC_OPCODE_BACK_SOLVER; >; - < "HYPGEOMDIST" ; SC_OPCODE_HYP_GEOM_DIST; >; - < "_xlfn.HYPGEOM.DIST" ; SC_OPCODE_HYP_GEOM_DIST_MS; >; - < "LOGNORMDIST" ; SC_OPCODE_LOG_NORM_DIST; >; - < "_xlfn.LOGNORM.DIST" ; SC_OPCODE_LOG_NORM_DIST_MS; >; - < "TDIST" ; SC_OPCODE_T_DIST; >; - < "_xlfn.T.DIST.2T" ; SC_OPCODE_T_DIST_2T; >; - < "_xlfn.T.DIST" ; SC_OPCODE_T_DIST_MS; >; - < "_xlfn.T.DIST.RT" ; SC_OPCODE_T_DIST_RT; >; - < "FDIST" ; SC_OPCODE_F_DIST; >; - < "_xlfn.F.DIST" ; SC_OPCODE_F_DIST_LT; >; - < "_xlfn.F.DIST.RT" ; SC_OPCODE_F_DIST_RT; >; - < "CHIDIST" ; SC_OPCODE_CHI_DIST; >; - < "_xlfn.CHISQ.DIST.RT" ; SC_OPCODE_CHI_DIST_MS; >; - < "WEIBULL" ; SC_OPCODE_WEIBULL; >; - < "_xlfn.WEIBULL.DIST" ; SC_OPCODE_WEIBULL_MS; >; - < "NEGBINOMDIST" ; SC_OPCODE_NEG_BINOM_VERT; >; - < "_xlfn.NEGBINOM.DIST" ; SC_OPCODE_NEG_BINOM_DIST_MS; >; - < "CRITBINOM" ; SC_OPCODE_CRIT_BINOM; >; - < "_xlfn.BINOM.INV" ; SC_OPCODE_BINOM_INV; >; - < "KURT" ; SC_OPCODE_KURT; >; - < "HARMEAN" ; SC_OPCODE_HAR_MEAN; >; - < "GEOMEAN" ; SC_OPCODE_GEO_MEAN; >; - < "STANDARDIZE" ; SC_OPCODE_STANDARD; >; - < "AVEDEV" ; SC_OPCODE_AVE_DEV; >; - < "SKEW" ; SC_OPCODE_SKEW; >; - < "_xlfn.SKEW.P" ; SC_OPCODE_SKEWP; >; - < "DEVSQ" ; SC_OPCODE_DEV_SQ; >; - < "MEDIAN" ; SC_OPCODE_MEDIAN; >; - < "MODE" ; SC_OPCODE_MODAL_VALUE; >; - < "_xlfn.MODE.SNGL" ; SC_OPCODE_MODAL_VALUE_MS; >; - < "_xlfn.MODE.MULT" ; SC_OPCODE_MODAL_VALUE_MULTI; >; - < "ZTEST" ; SC_OPCODE_Z_TEST; >; - < "_xlfn.Z.TEST" ; SC_OPCODE_Z_TEST_MS; >; - < "_xlfn.AGGREGATE" ; SC_OPCODE_AGGREGATE; >; - < "TTEST" ; SC_OPCODE_T_TEST; >; - < "_xlfn.T.TEST" ; SC_OPCODE_T_TEST_MS; >; - < "RANK" ; SC_OPCODE_RANK; >; - < "PERCENTILE" ; SC_OPCODE_PERCENTILE; >; - < "PERCENTRANK" ; SC_OPCODE_PERCENT_RANK; >; - < "_xlfn.PERCENTILE.INC" ; SC_OPCODE_PERCENTILE_INC; >; - < "_xlfn.PERCENTRANK.INC" ; SC_OPCODE_PERCENT_RANK_INC; >; - < "_xlfn.QUARTILE.INC" ; SC_OPCODE_QUARTILE_INC; >; - < "_xlfn.RANK.EQ" ; SC_OPCODE_RANK_EQ; >; - < "_xlfn.PERCENTILE.EXC" ; SC_OPCODE_PERCENTILE_EXC; >; - < "_xlfn.PERCENTRANK.EXC" ; SC_OPCODE_PERCENT_RANK_EXC; >; - < "_xlfn.QUARTILE.EXC" ; SC_OPCODE_QUARTILE_EXC; >; - < "_xlfn.RANK.AVG" ; SC_OPCODE_RANK_AVG; >; - < "LARGE" ; SC_OPCODE_LARGE; >; - < "SMALL" ; SC_OPCODE_SMALL; >; - < "FREQUENCY" ; SC_OPCODE_FREQUENCY; >; - < "QUARTILE" ; SC_OPCODE_QUARTILE; >; - < "NORMINV" ; SC_OPCODE_NORM_INV; >; - < "_xlfn.NORM.INV" ; SC_OPCODE_NORM_INV_MS; >; - < "CONFIDENCE" ; SC_OPCODE_CONFIDENCE; >; - < "_xlfn.CONFIDENCE.NORM" ; SC_OPCODE_CONFIDENCE_N; >; - < "_xlfn.CONFIDENCE.T" ; SC_OPCODE_CONFIDENCE_T; >; - < "FTEST" ; SC_OPCODE_F_TEST; >; - < "_xlfn.F.TEST" ; SC_OPCODE_F_TEST_MS; >; - < "TRIMMEAN" ; SC_OPCODE_TRIM_MEAN; >; - < "PROB" ; SC_OPCODE_PROB; >; - < "CORREL" ; SC_OPCODE_CORREL; >; - < "COVAR" ; SC_OPCODE_COVAR; >; - < "_xlfn.COVARIANCE.P" ; SC_OPCODE_COVARIANCE_P; >; - < "_xlfn.COVARIANCE.S" ; SC_OPCODE_COVARIANCE_S; >; - < "PEARSON" ; SC_OPCODE_PEARSON; >; - < "RSQ" ; SC_OPCODE_RSQ; >; - < "STEYX" ; SC_OPCODE_STEYX; >; - < "SLOPE" ; SC_OPCODE_SLOPE; >; - < "INTERCEPT" ; SC_OPCODE_INTERCEPT; >; - < "TREND" ; SC_OPCODE_TREND; >; - < "GROWTH" ; SC_OPCODE_GROWTH; >; - < "LINEST" ; SC_OPCODE_LINEST; >; - < "LOGEST" ; SC_OPCODE_LOGEST; >; - < "FORECAST" ; SC_OPCODE_FORECAST; >; - < "_xlfn.FORECAST.ETS" ; SC_OPCODE_FORECAST_ETS_ADD; >; - < "_xlfn.FORECAST.ETS.SEASONALITY" ; SC_OPCODE_FORECAST_ETS_SEA; >; - < "_xlfn.ORG.LIBREOFFICE.FORECAST.ETS.MULT" ; SC_OPCODE_FORECAST_ETS_MUL; >; - < "_xlfn.FORECAST.ETS.CONFINT" ; SC_OPCODE_FORECAST_ETS_PIA; >; - < "_xlfn.ORG.LIBREOFFICE.FORECAST.ETS.PI.MULT" ; SC_OPCODE_FORECAST_ETS_PIM; >; - < "_xlfn.FORECAST.ETS.STAT" ; SC_OPCODE_FORECAST_ETS_STA; >; - < "_xlfn.ORG.LIBREOFFICE.FORECAST.ETS.STAT.MULT" ; SC_OPCODE_FORECAST_ETS_STM; >; - < "_xlfn.FORECAST.LINEAR" ; SC_OPCODE_FORECAST_LIN; >; - < "CHIINV" ; SC_OPCODE_CHI_INV; >; - < "_xlfn.CHISQ.INV.RT" ; SC_OPCODE_CHI_INV_MS; >; - < "GAMMADIST" ; SC_OPCODE_GAMMA_DIST; >; - < "_xlfn.GAMMA.DIST" ; SC_OPCODE_GAMMA_DIST_MS; >; - < "GAMMAINV" ; SC_OPCODE_GAMMA_INV; >; - < "_xlfn.GAMMA.INV" ; SC_OPCODE_GAMMA_INV_MS; >; - < "TINV" ; SC_OPCODE_T_INV; >; - < "_xlfn.T.INV.2T" ; SC_OPCODE_T_INV_2T; >; - < "_xlfn.T.INV" ; SC_OPCODE_T_INV_MS; >; - < "FINV" ; SC_OPCODE_F_INV; >; - < "_xlfn.F.INV" ; SC_OPCODE_F_INV_LT; >; - < "_xlfn.F.INV.RT" ; SC_OPCODE_F_INV_RT; >; - < "CHITEST" ; SC_OPCODE_CHI_TEST; >; - < "_xlfn.CHISQ.TEST" ; SC_OPCODE_CHI_TEST_MS; >; - < "LOGINV" ; SC_OPCODE_LOG_INV; >; - < "_xlfn.LOGNORM.INV" ; SC_OPCODE_LOG_INV_MS; >; - < "TABLE" ; SC_OPCODE_TABLE_OP; >; - < "BETADIST" ; SC_OPCODE_BETA_DIST; >; - < "BETAINV" ; SC_OPCODE_BETA_INV; >; - < "_xlfn.BETA.DIST" ; SC_OPCODE_BETA_DIST_MS; >; - < "_xlfn.BETA.INV" ; SC_OPCODE_BETA_INV_MS; >; - < "WEEKNUM" ; SC_OPCODE_WEEK; >; - < "_xlfn.ISOWEEKNUM" ; SC_OPCODE_ISOWEEKNUM; >; - < "_xlfn.ORG.LIBREOFFICE.WEEKNUM_OOO" ; SC_OPCODE_WEEKNUM_OOO; >; - < "_xlfn.ORG.OPENOFFICE.EASTERSUNDAY" ; SC_OPCODE_EASTERSUNDAY; >; - < "WEEKDAY" ; SC_OPCODE_GET_DAY_OF_WEEK; >; - < "NETWORKDAYS" ; SC_OPCODE_NETWORKDAYS; >; - < "NETWORKDAYS.INTL" ; SC_OPCODE_NETWORKDAYS_MS; >; - < "WORKDAY.INTL" ; SC_OPCODE_WORKDAY_MS; >; - < "#NAME!" ; SC_OPCODE_NO_NAME; >; - < "_xlfn.ORG.OPENOFFICE.STYLE" ; SC_OPCODE_STYLE; >; - < "DDE" ; SC_OPCODE_DDE; >; - < "_xlfn.BASE" ; SC_OPCODE_BASE; >; - < "_xlfn.DECIMAL" ; SC_OPCODE_DECIMAL; >; - < "_xlfn.ORG.OPENOFFICE.CONVERT" ; SC_OPCODE_CONVERT_OOO; >; - < "ROMAN" ; SC_OPCODE_ROMAN; >; - < "_xlfn.ARABIC" ; SC_OPCODE_ARABIC; >; - < "HYPERLINK" ; SC_OPCODE_HYPERLINK; >; - < "INFO" ; SC_OPCODE_INFO; >; - < "_xlfn.BAHTTEXT" ; SC_OPCODE_BAHTTEXT; >; - < "GETPIVOTDATA" ; SC_OPCODE_GET_PIVOT_DATA; >; - < "EUROCONVERT" ; SC_OPCODE_EUROCONVERT; >; - < "_xlfn.NUMBERVALUE" ; SC_OPCODE_NUMBERVALUE; >; - < "_xlfn.GAMMA" ; SC_OPCODE_GAMMA; >; - < "CHISQDIST" ; SC_OPCODE_CHISQ_DIST; >; - < "_xlfn.CHISQ.DIST" ; SC_OPCODE_CHISQ_DIST_MS; >; - < "CHISQINV" ; SC_OPCODE_CHISQ_INV; >; - < "_xlfn.CHISQ.INV" ; SC_OPCODE_CHISQ_INV_MS; >; - < "_xlfn.BITAND" ; SC_OPCODE_BITAND; >; - < "_xlfn.BITOR" ; SC_OPCODE_BITOR; >; - < "_xlfn.BITXOR" ; SC_OPCODE_BITXOR; >; - < "_xlfn.BITRSHIFT" ; SC_OPCODE_BITRSHIFT; >; - < "_xlfn.BITLSHIFT" ; SC_OPCODE_BITLSHIFT; >; - < "#NULL!" ; SC_OPCODE_ERROR_NULL; >; - < "#DIV/0!" ; SC_OPCODE_ERROR_DIVZERO; >; - < "#VALUE!" ; SC_OPCODE_ERROR_VALUE; >; - < "#REF!" ; SC_OPCODE_ERROR_REF; >; - < "#NAME?" ; SC_OPCODE_ERROR_NAME; >; - < "#NUM!" ; SC_OPCODE_ERROR_NUM; >; - < "#N/A" ; SC_OPCODE_ERROR_NA; >; - /* END defined ERROR.TYPE() values. */ - < "_xlfn.FILTERXML" ; SC_OPCODE_FILTERXML; >; - < "_xlfn.WEBSERVICE" ; SC_OPCODE_WEBSERVICE; >; - < "_xlfn.ORG.LIBREOFFICE.COLOR" ; SC_OPCODE_COLOR; >; - < "_xlfn.ERF.PRECISE" ; SC_OPCODE_ERF_MS; >; - < "_xlfn.ERFC.PRECISE" ; SC_OPCODE_ERFC_MS; >; - < "_xlfn.ENCODEURL" ; SC_OPCODE_ENCODEURL; >; - < "_xlfn.ORG.LIBREOFFICE.RAWSUBTRACT" ; SC_OPCODE_RAWSUBTRACT; >; - < "_xlfn.ORG.LIBREOFFICE.ROUNDSIG" ; SC_OPCODE_ROUNDSIG; >; - }; -}; - -/** These English names are used to store/load ODF v1.0/v1.1. */ -// DO NOT CHANGE NAMES! Only add functions. -// If there is a reason for another name for some function then add an -// *additional* name to be recognized to sc/source/core/tool/compiler.cxx -// ScCompiler::IsOpCode() in the else if (mxSymbols->isPODF()) block. -StringArray RID_STRLIST_FUNCTION_NAMES_ENGLISH_PODF -{ - ItemList = - { - < "IF" ; SC_OPCODE_IF; >; - < "IFERROR" ; SC_OPCODE_IF_ERROR; >; - < "IFNA" ; SC_OPCODE_IF_NA; >; - < "CHOOSE" ; SC_OPCODE_CHOOSE; >; - < "(" ; SC_OPCODE_OPEN; >; - < ")" ; SC_OPCODE_CLOSE; >; - < "[" ; SC_OPCODE_TABLE_REF_OPEN; >; - < "]" ; SC_OPCODE_TABLE_REF_CLOSE; >; - < "#All" ; SC_OPCODE_TABLE_REF_ITEM_ALL; >; - < "#Headers" ; SC_OPCODE_TABLE_REF_ITEM_HEADERS; >; - < "#Data" ; SC_OPCODE_TABLE_REF_ITEM_DATA; >; - < "#Totals" ; SC_OPCODE_TABLE_REF_ITEM_TOTALS; >; - < "#This Row" ; SC_OPCODE_TABLE_REF_ITEM_THIS_ROW; >; - < "{" ; SC_OPCODE_ARRAY_OPEN; >; - < "}" ; SC_OPCODE_ARRAY_CLOSE; >; - < "|" ; SC_OPCODE_ARRAY_ROW_SEP; >; - < ";" ; SC_OPCODE_ARRAY_COL_SEP; >; - < ";" ; SC_OPCODE_SEP; >; - < "%" ; SC_OPCODE_PERCENT_SIGN; >; - < "+" ; SC_OPCODE_ADD; >; - < "-" ; SC_OPCODE_SUB; >; - < "*" ; SC_OPCODE_MUL; >; - < "/" ; SC_OPCODE_DIV; >; - < "&" ; SC_OPCODE_AMPERSAND; >; - < "^" ; SC_OPCODE_POW; >; - < "=" ; SC_OPCODE_EQUAL; >; - < "<>" ; SC_OPCODE_NOT_EQUAL; >; - < "<" ; SC_OPCODE_LESS; >; - < ">" ; SC_OPCODE_GREATER; >; - < "<=" ; SC_OPCODE_LESS_EQUAL; >; - < ">=" ; SC_OPCODE_GREATER_EQUAL; >; - < "AND" ; SC_OPCODE_AND; >; - < "OR" ; SC_OPCODE_OR; >; - < "XOR" ; SC_OPCODE_XOR; >; - < "!" ; SC_OPCODE_INTERSECT; >; - < "~" ; SC_OPCODE_UNION; >; - < ":" ; SC_OPCODE_RANGE; >; - < "NOT" ; SC_OPCODE_NOT; >; - < "NEG" ; SC_OPCODE_NEG; >; - < "-" ; SC_OPCODE_NEG_SUB; >; - < "PI" ; SC_OPCODE_PI; >; - < "RAND" ; SC_OPCODE_RANDOM; >; - < "TRUE" ; SC_OPCODE_TRUE; >; - < "FALSE" ; SC_OPCODE_FALSE; >; - < "TODAY" ; SC_OPCODE_GET_ACT_DATE; >; - < "NOW" ; SC_OPCODE_GET_ACT_TIME; >; - < "NA" ; SC_OPCODE_NO_VALUE; >; - < "CURRENT" ; SC_OPCODE_CURRENT; >; - < "DEGREES" ; SC_OPCODE_DEG; >; - < "RADIANS" ; SC_OPCODE_RAD; >; - < "SIN" ; SC_OPCODE_SIN; >; - < "COS" ; SC_OPCODE_COS; >; - < "TAN" ; SC_OPCODE_TAN; >; - < "COT" ; SC_OPCODE_COT; >; - < "ASIN" ; SC_OPCODE_ARC_SIN; >; - < "ACOS" ; SC_OPCODE_ARC_COS; >; - < "ATAN" ; SC_OPCODE_ARC_TAN; >; - < "ACOT" ; SC_OPCODE_ARC_COT; >; - < "SINH" ; SC_OPCODE_SIN_HYP; >; - < "COSH" ; SC_OPCODE_COS_HYP; >; - < "TANH" ; SC_OPCODE_TAN_HYP; >; - < "COTH" ; SC_OPCODE_COT_HYP; >; - < "ASINH" ; SC_OPCODE_ARC_SIN_HYP; >; - < "ACOSH" ; SC_OPCODE_ARC_COS_HYP; >; - < "ATANH" ; SC_OPCODE_ARC_TAN_HYP; >; - < "ACOTH" ; SC_OPCODE_ARC_COT_HYP; >; - < "CSC" ; SC_OPCODE_COSECANT; >; - < "SEC" ; SC_OPCODE_SECANT; >; - < "CSCH" ; SC_OPCODE_COSECANT_HYP; >; - < "SECH" ; SC_OPCODE_SECANT_HYP; >; - < "EXP" ; SC_OPCODE_EXP; >; - < "LN" ; SC_OPCODE_LN; >; - < "SQRT" ; SC_OPCODE_SQRT; >; - < "FACT" ; SC_OPCODE_FACT; >; - < "YEAR" ; SC_OPCODE_GET_YEAR; >; - < "MONTH" ; SC_OPCODE_GET_MONTH; >; - < "DAY" ; SC_OPCODE_GET_DAY; >; - < "HOUR" ; SC_OPCODE_GET_HOUR; >; - < "MINUTE" ; SC_OPCODE_GET_MIN; >; - < "SECOND" ; SC_OPCODE_GET_SEC; >; - < "SIGN" ; SC_OPCODE_PLUS_MINUS; >; - < "ABS" ; SC_OPCODE_ABS; >; - < "INT" ; SC_OPCODE_INT; >; - < "PHI" ; SC_OPCODE_PHI; >; - < "GAUSS" ; SC_OPCODE_GAUSS; >; - < "ISBLANK" ; SC_OPCODE_IS_EMPTY; >; - < "ISTEXT" ; SC_OPCODE_IS_STRING; >; - < "ISNONTEXT" ; SC_OPCODE_IS_NON_STRING; >; - < "ISLOGICAL" ; SC_OPCODE_IS_LOGICAL; >; - < "TYPE" ; SC_OPCODE_TYPE; >; - < "CELL" ; SC_OPCODE_CELL; >; - < "ISREF" ; SC_OPCODE_IS_REF; >; - < "ISNUMBER" ; SC_OPCODE_IS_VALUE; >; - < "ISFORMULA" ; SC_OPCODE_IS_FORMULA; >; - < "ISNA" ; SC_OPCODE_IS_NV; >; - < "ISERR" ; SC_OPCODE_IS_ERR; >; - < "ISERROR" ; SC_OPCODE_IS_ERROR; >; - < "ISEVEN" ; SC_OPCODE_IS_EVEN; >; - < "ISODD" ; SC_OPCODE_IS_ODD; >; - < "N" ; SC_OPCODE_N; >; - < "DATEVALUE" ; SC_OPCODE_GET_DATE_VALUE; >; - < "TIMEVALUE" ; SC_OPCODE_GET_TIME_VALUE; >; - < "CODE" ; SC_OPCODE_CODE; >; - < "TRIM" ; SC_OPCODE_TRIM; >; - < "UPPER" ; SC_OPCODE_UPPER; >; - < "PROPER" ; SC_OPCODE_PROPER; >; - < "LOWER" ; SC_OPCODE_LOWER; >; - < "LEN" ; SC_OPCODE_LEN; >; - < "T" ; SC_OPCODE_T; >; - < "VALUE" ; SC_OPCODE_VALUE; >; - < "CLEAN" ; SC_OPCODE_CLEAN; >; - < "CHAR" ; SC_OPCODE_CHAR; >; - < "JIS" ; SC_OPCODE_JIS; >; - < "ASC" ; SC_OPCODE_ASC; >; - < "UNICODE" ; SC_OPCODE_UNICODE; >; - < "UNICHAR" ; SC_OPCODE_UNICHAR; >; - < "LOG10" ; SC_OPCODE_LOG10; >; - < "EVEN" ; SC_OPCODE_EVEN; >; - < "ODD" ; SC_OPCODE_ODD; >; - < "NORMSDIST" ; SC_OPCODE_STD_NORM_DIST; >; - < "NORM.S.DIST" ; SC_OPCODE_STD_NORM_DIST_MS; >; - < "FISHER" ; SC_OPCODE_FISHER; >; - < "FISHERINV" ; SC_OPCODE_FISHER_INV; >; - < "NORMSINV" ; SC_OPCODE_S_NORM_INV; >; - < "NORM.S.INV" ; SC_OPCODE_S_NORM_INV_MS; >; - < "GAMMALN" ; SC_OPCODE_GAMMA_LN; >; - < "GAMMALN.PRECISE" ; SC_OPCODE_GAMMA_LN_MS; >; - < "ERRORTYPE" ; SC_OPCODE_ERROR_TYPE; >; - < "ERROR.TYPE" ; SC_OPCODE_ERROR_TYPE_ODF; >; - < "FORMULA" ; SC_OPCODE_FORMULA; >; - < "ATAN2" ; SC_OPCODE_ARC_TAN_2; >; - < "CEILING.MATH" ; SC_OPCODE_CEIL_MATH; >; - < "CEILING" ; SC_OPCODE_CEIL; >; - < "CEILING.XCL" ; SC_OPCODE_CEIL_MS; >; - < "CEILING.PRECISE" ; SC_OPCODE_CEIL_PRECISE; >; - < "ISO.CEILING" ; SC_OPCODE_CEIL_ISO; >; - < "FLOOR" ; SC_OPCODE_FLOOR; >; - < "FLOOR.XCL" ; SC_OPCODE_FLOOR_MS; >; - < "FLOOR.MATH" ; SC_OPCODE_FLOOR_MATH; >; - < "FLOOR.PRECISE" ; SC_OPCODE_FLOOR_PRECISE; >; - < "ROUND" ; SC_OPCODE_ROUND; >; - < "ROUNDUP" ; SC_OPCODE_ROUND_UP; >; - < "ROUNDDOWN" ; SC_OPCODE_ROUND_DOWN; >; - < "TRUNC" ; SC_OPCODE_TRUNC; >; - < "LOG" ; SC_OPCODE_LOG; >; - < "POWER" ; SC_OPCODE_POWER; >; - < "GCD" ; SC_OPCODE_GCD; >; - < "LCM" ; SC_OPCODE_LCM; >; - < "MOD" ; SC_OPCODE_MOD; >; - < "SUMPRODUCT" ; SC_OPCODE_SUM_PRODUCT; >; - < "SUMSQ" ; SC_OPCODE_SUM_SQ; >; - < "SUMX2MY2" ; SC_OPCODE_SUM_X2MY2; >; - < "SUMX2PY2" ; SC_OPCODE_SUM_X2DY2; >; - < "SUMXMY2" ; SC_OPCODE_SUM_XMY2; >; - < "DATE" ; SC_OPCODE_GET_DATE; >; - < "TIME" ; SC_OPCODE_GET_TIME; >; - < "DAYS" ; SC_OPCODE_GET_DIFF_DATE; >; - < "DAYS360" ; SC_OPCODE_GET_DIFF_DATE_360; >; - < "DATEDIF" ; SC_OPCODE_GET_DATEDIF; >; - < "MIN" ; SC_OPCODE_MIN; >; - < "MINA" ; SC_OPCODE_MIN_A; >; - < "MAX" ; SC_OPCODE_MAX; >; - < "MAXA" ; SC_OPCODE_MAX_A; >; - < "SUM" ; SC_OPCODE_SUM; >; - < "PRODUCT" ; SC_OPCODE_PRODUCT; >; - < "AVERAGE" ; SC_OPCODE_AVERAGE; >; - < "AVERAGEA" ; SC_OPCODE_AVERAGE_A; >; - < "COUNT" ; SC_OPCODE_COUNT; >; - < "COUNTA" ; SC_OPCODE_COUNT_2; >; - < "NPV" ; SC_OPCODE_NPV; >; - < "IRR" ; SC_OPCODE_IRR; >; - < "MIRR" ; SC_OPCODE_MIRR; >; - < "ISPMT" ; SC_OPCODE_ISPMT; >; - < "VAR" ; SC_OPCODE_VAR; >; - < "VARA" ; SC_OPCODE_VAR_A; >; - < "VARP" ; SC_OPCODE_VAR_P; >; - < "VARPA" ; SC_OPCODE_VAR_P_A; >; - < "VAR.P" ; SC_OPCODE_VAR_P_MS; >; - < "VAR.S" ; SC_OPCODE_VAR_S; >; - < "STDEV" ; SC_OPCODE_ST_DEV; >; - < "STDEVA" ; SC_OPCODE_ST_DEV_A; >; - < "STDEVP" ; SC_OPCODE_ST_DEV_P; >; - < "STDEVPA" ; SC_OPCODE_ST_DEV_P_A; >; - < "STDEV.P" ; SC_OPCODE_ST_DEV_P_MS; >; - < "STDEV.S" ; SC_OPCODE_ST_DEV_S; >; - < "B" ; SC_OPCODE_B; >; - < "NORMDIST" ; SC_OPCODE_NORM_DIST; >; - < "NORM.DIST" ; SC_OPCODE_NORM_DIST_MS; >; - < "EXPONDIST" ; SC_OPCODE_EXP_DIST; >; - < "EXPON.DIST" ; SC_OPCODE_EXP_DIST_MS; >; - < "BINOMDIST" ; SC_OPCODE_BINOM_DIST; >; - < "BINOM.DIST" ; SC_OPCODE_BINOM_DIST_MS; >; - < "POISSON" ; SC_OPCODE_POISSON_DIST; >; - < "POISSON.DIST" ; SC_OPCODE_POISSON_DIST_MS; >; - < "COMBIN" ; SC_OPCODE_COMBIN; >; - < "COMBINA" ; SC_OPCODE_COMBIN_A; >; - < "PERMUT" ; SC_OPCODE_PERMUT; >; - < "PERMUTATIONA" ; SC_OPCODE_PERMUTATION_A; >; - < "PV" ; SC_OPCODE_PV; >; - < "SYD" ; SC_OPCODE_SYD; >; - < "DDB" ; SC_OPCODE_DDB; >; - < "DB" ; SC_OPCODE_DB; >; - < "VDB" ; SC_OPCODE_VBD; >; - < "DURATION" ; SC_OPCODE_PDURATION; >; // wrong but ODF1.1, keep it. - < "SLN" ; SC_OPCODE_SLN; >; - < "PMT" ; SC_OPCODE_PMT; >; - < "COLUMNS" ; SC_OPCODE_COLUMNS; >; - < "ROWS" ; SC_OPCODE_ROWS; >; - < "SHEETS" ; SC_OPCODE_SHEETS; >; - < "COLUMN" ; SC_OPCODE_COLUMN; >; - < "ROW" ; SC_OPCODE_ROW; >; - < "SHEET" ; SC_OPCODE_SHEET; >; - < "ZGZ" ; SC_OPCODE_RRI; >; - < "FV" ; SC_OPCODE_FV; >; - < "NPER" ; SC_OPCODE_NPER; >; - < "RATE" ; SC_OPCODE_RATE; >; - < "IPMT" ; SC_OPCODE_IPMT; >; - < "PPMT" ; SC_OPCODE_PPMT; >; - < "CUMIPMT" ; SC_OPCODE_CUM_IPMT; >; - < "CUMPRINC" ; SC_OPCODE_CUM_PRINC; >; - < "EFFECTIVE" ; SC_OPCODE_EFFECT; >; - < "NOMINAL" ; SC_OPCODE_NOMINAL; >; - < "SUBTOTAL" ; SC_OPCODE_SUB_TOTAL; >; - < "DSUM" ; SC_OPCODE_DB_SUM; >; - < "DCOUNT" ; SC_OPCODE_DB_COUNT; >; - < "DCOUNTA" ; SC_OPCODE_DB_COUNT_2; >; - < "DAVERAGE" ; SC_OPCODE_DB_AVERAGE; >; - < "DGET" ; SC_OPCODE_DB_GET; >; - < "DMAX" ; SC_OPCODE_DB_MAX; >; - < "DMIN" ; SC_OPCODE_DB_MIN; >; - < "DPRODUCT" ; SC_OPCODE_DB_PRODUCT; >; - < "DSTDEV" ; SC_OPCODE_DB_STD_DEV; >; - < "DSTDEVP" ; SC_OPCODE_DB_STD_DEV_P; >; - < "DVAR" ; SC_OPCODE_DB_VAR; >; - < "DVARP" ; SC_OPCODE_DB_VAR_P; >; - < "INDIRECT" ; SC_OPCODE_INDIRECT; >; - < "ADDRESS" ; SC_OPCODE_ADDRESS; >; - < "MATCH" ; SC_OPCODE_MATCH; >; - < "COUNTBLANK" ; SC_OPCODE_COUNT_EMPTY_CELLS; >; - < "COUNTIF" ; SC_OPCODE_COUNT_IF; >; - < "SUMIF" ; SC_OPCODE_SUM_IF; >; - < "AVERAGEIF" ; SC_OPCODE_AVERAGE_IF; >; - < "SUMIFS" ; SC_OPCODE_SUM_IFS; >; - < "AVERAGEIFS" ; SC_OPCODE_AVERAGE_IFS; >; - < "COUNTIFS" ; SC_OPCODE_COUNT_IFS; >; - < "LOOKUP" ; SC_OPCODE_LOOKUP; >; - < "VLOOKUP" ; SC_OPCODE_V_LOOKUP; >; - < "HLOOKUP" ; SC_OPCODE_H_LOOKUP; >; - < "MULTIRANGE" ; SC_OPCODE_MULTI_AREA; >; // legacy for range list (union) - < "OFFSET" ; SC_OPCODE_OFFSET; >; - < "INDEX" ; SC_OPCODE_INDEX; >; - < "AREAS" ; SC_OPCODE_AREAS; >; - < "DOLLAR" ; SC_OPCODE_CURRENCY; >; - < "REPLACE" ; SC_OPCODE_REPLACE; >; - < "FIXED" ; SC_OPCODE_FIXED; >; - < "FIND" ; SC_OPCODE_FIND; >; - < "EXACT" ; SC_OPCODE_EXACT; >; - < "LEFT" ; SC_OPCODE_LEFT; >; - < "RIGHT" ; SC_OPCODE_RIGHT; >; - < "SEARCH" ; SC_OPCODE_SEARCH; >; - < "MID" ; SC_OPCODE_MID; >; - < "LENB" ; SC_OPCODE_LENB; >; - < "RIGHTB" ; SC_OPCODE_RIGHTB; >; - < "LEFTB" ; SC_OPCODE_LEFTB; >; - < "REPLACEB" ; SC_OPCODE_REPLACEB; >; - < "MIDB" ; SC_OPCODE_MIDB; >; - < "TEXT" ; SC_OPCODE_TEXT; >; - < "SUBSTITUTE" ; SC_OPCODE_SUBSTITUTE; >; - < "REPT" ; SC_OPCODE_REPT; >; - < "CONCATENATE" ; SC_OPCODE_CONCAT; >; - < "CONCAT" ; SC_OPCODE_CONCAT_MS; >; - < "TEXTJOIN" ; SC_OPCODE_TEXTJOIN_MS; >; - < "IFS" ; SC_OPCODE_IFS_MS; >; - < "SWITCH" ; SC_OPCODE_SWITCH_MS; >; - < "MINIFS" ; SC_OPCODE_MINIFS_MS; >; - < "MAXIFS" ; SC_OPCODE_MAXIFS_MS; >; - < "MVALUE" ; SC_OPCODE_MAT_VALUE; >; - < "MDETERM" ; SC_OPCODE_MAT_DET; >; - < "MINVERSE" ; SC_OPCODE_MAT_INV; >; - < "MMULT" ; SC_OPCODE_MAT_MULT; >; - < "TRANSPOSE" ; SC_OPCODE_MAT_TRANS; >; - < "MUNIT" ; SC_OPCODE_MATRIX_UNIT; >; - < "GOALSEEK" ; SC_OPCODE_BACK_SOLVER; >; - < "HYPGEOMDIST" ; SC_OPCODE_HYP_GEOM_DIST; >; - < "HYPGEOM.DIST" ; SC_OPCODE_HYP_GEOM_DIST_MS; >; - < "LOGNORMDIST" ; SC_OPCODE_LOG_NORM_DIST; >; - < "LOGNORM.DIST" ; SC_OPCODE_LOG_NORM_DIST_MS; >; - < "TDIST" ; SC_OPCODE_T_DIST; >; - < "T.DIST.2T" ; SC_OPCODE_T_DIST_2T; >; - < "T.DIST" ; SC_OPCODE_T_DIST_MS; >; - < "T.DIST.RT" ; SC_OPCODE_T_DIST_RT; >; - < "FDIST" ; SC_OPCODE_F_DIST; >; - < "F.DIST" ; SC_OPCODE_F_DIST_LT; >; - < "F.DIST.RT" ; SC_OPCODE_F_DIST_RT; >; - < "CHIDIST" ; SC_OPCODE_CHI_DIST; >; - < "CHISQ.DIST.RT" ; SC_OPCODE_CHI_DIST_MS; >; - < "WEIBULL" ; SC_OPCODE_WEIBULL; >; - < "WEIBULL.DIST" ; SC_OPCODE_WEIBULL_MS; >; - < "NEGBINOMDIST" ; SC_OPCODE_NEG_BINOM_VERT; >; - < "NEGBINOM.DIST" ; SC_OPCODE_NEG_BINOM_DIST_MS; >; - < "CRITBINOM" ; SC_OPCODE_CRIT_BINOM; >; - < "BINOM.INV" ; SC_OPCODE_BINOM_INV; >; - < "KURT" ; SC_OPCODE_KURT; >; - < "HARMEAN" ; SC_OPCODE_HAR_MEAN; >; - < "GEOMEAN" ; SC_OPCODE_GEO_MEAN; >; - < "STANDARDIZE" ; SC_OPCODE_STANDARD; >; - < "AVEDEV" ; SC_OPCODE_AVE_DEV; >; - < "SKEW" ; SC_OPCODE_SKEW; >; - < "SKEWP" ; SC_OPCODE_SKEWP; >; - < "DEVSQ" ; SC_OPCODE_DEV_SQ; >; - < "MEDIAN" ; SC_OPCODE_MEDIAN; >; - < "MODE" ; SC_OPCODE_MODAL_VALUE; >; - < "MODE.SNGL" ; SC_OPCODE_MODAL_VALUE_MS; >; - < "MODE.MULT" ; SC_OPCODE_MODAL_VALUE_MULTI; >; - < "ZTEST" ; SC_OPCODE_Z_TEST; >; - < "Z.TEST" ; SC_OPCODE_Z_TEST_MS; >; - < "AGGREGATE" ; SC_OPCODE_AGGREGATE; >; - < "TTEST" ; SC_OPCODE_T_TEST; >; - < "T.TEST" ; SC_OPCODE_T_TEST_MS; >; - < "RANK" ; SC_OPCODE_RANK; >; - < "PERCENTILE" ; SC_OPCODE_PERCENTILE; >; - < "PERCENTRANK" ; SC_OPCODE_PERCENT_RANK; >; - < "PERCENTILE.INC" ; SC_OPCODE_PERCENTILE_INC; >; - < "PERCENTRANK.INC" ; SC_OPCODE_PERCENT_RANK_INC; >; - < "QUARTILE.INC" ; SC_OPCODE_QUARTILE_INC; >; - < "RANK.EQ" ; SC_OPCODE_RANK_EQ; >; - < "PERCENTILE.EXC" ; SC_OPCODE_PERCENTILE_EXC; >; - < "PERCENTRANK.EXC" ; SC_OPCODE_PERCENT_RANK_EXC; >; - < "QUARTILE.EXC" ; SC_OPCODE_QUARTILE_EXC; >; - < "RANK.AVG" ; SC_OPCODE_RANK_AVG; >; - < "LARGE" ; SC_OPCODE_LARGE; >; - < "SMALL" ; SC_OPCODE_SMALL; >; - < "FREQUENCY" ; SC_OPCODE_FREQUENCY; >; - < "QUARTILE" ; SC_OPCODE_QUARTILE; >; - < "NORMINV" ; SC_OPCODE_NORM_INV; >; - < "NORM.INV" ; SC_OPCODE_NORM_INV_MS; >; - < "CONFIDENCE" ; SC_OPCODE_CONFIDENCE; >; - < "CONFIDENCE.NORM" ; SC_OPCODE_CONFIDENCE_N; >; - < "CONFIDENCE.T" ; SC_OPCODE_CONFIDENCE_T; >; - < "FTEST" ; SC_OPCODE_F_TEST; >; - < "F.TEST" ; SC_OPCODE_F_TEST_MS; >; - < "TRIMMEAN" ; SC_OPCODE_TRIM_MEAN; >; - < "PROB" ; SC_OPCODE_PROB; >; - < "CORREL" ; SC_OPCODE_CORREL; >; - < "COVAR" ; SC_OPCODE_COVAR; >; - < "COVARIANCE.P" ; SC_OPCODE_COVARIANCE_P; >; - < "COVARIANCE.S" ; SC_OPCODE_COVARIANCE_S; >; - < "PEARSON" ; SC_OPCODE_PEARSON; >; - < "RSQ" ; SC_OPCODE_RSQ; >; - < "STEYX" ; SC_OPCODE_STEYX; >; - < "SLOPE" ; SC_OPCODE_SLOPE; >; - < "INTERCEPT" ; SC_OPCODE_INTERCEPT; >; - < "TREND" ; SC_OPCODE_TREND; >; - < "GROWTH" ; SC_OPCODE_GROWTH; >; - < "LINEST" ; SC_OPCODE_LINEST; >; - < "LOGEST" ; SC_OPCODE_LOGEST; >; - < "FORECAST" ; SC_OPCODE_FORECAST; >; - < "FORECAST.ETS.ADD" ; SC_OPCODE_FORECAST_ETS_ADD; >; - < "FORECAST.ETS.SEASONALITY" ; SC_OPCODE_FORECAST_ETS_SEA; >; - < "FORECAST.ETS.MULT" ; SC_OPCODE_FORECAST_ETS_MUL; >; - < "FORECAST.ETS.PI.ADD" ; SC_OPCODE_FORECAST_ETS_PIA; >; - < "FORECAST.ETS.PI.MULT" ; SC_OPCODE_FORECAST_ETS_PIM; >; - < "FORECAST.ETS.STAT.ADD" ; SC_OPCODE_FORECAST_ETS_STA; >; - < "FORECAST.ETS.STAT.MULT" ; SC_OPCODE_FORECAST_ETS_STM; >; - < "FORECAST.LINEAR" ; SC_OPCODE_FORECAST_LIN; >; - < "CHIINV" ; SC_OPCODE_CHI_INV; >; - < "CHISQ.INV.RT" ; SC_OPCODE_CHI_INV_MS; >; - < "GAMMADIST" ; SC_OPCODE_GAMMA_DIST; >; - < "GAMMA.DIST" ; SC_OPCODE_GAMMA_DIST_MS; >; - < "GAMMAINV" ; SC_OPCODE_GAMMA_INV; >; - < "GAMMA.INV" ; SC_OPCODE_GAMMA_INV_MS; >; - < "TINV" ; SC_OPCODE_T_INV; >; - < "T.INV.2T" ; SC_OPCODE_T_INV_2T; >; - < "T.INV" ; SC_OPCODE_T_INV_MS; >; - < "FINV" ; SC_OPCODE_F_INV; >; - < "F.INV" ; SC_OPCODE_F_INV_LT; >; - < "F.INV.RT" ; SC_OPCODE_F_INV_RT; >; - < "CHITEST" ; SC_OPCODE_CHI_TEST; >; - < "CHISQ.TEST" ; SC_OPCODE_CHI_TEST_MS; >; - < "LOGINV" ; SC_OPCODE_LOG_INV; >; - < "LOGNORM.INV" ; SC_OPCODE_LOG_INV_MS; >; - < "TABLE" ; SC_OPCODE_TABLE_OP; >; - < "BETADIST" ; SC_OPCODE_BETA_DIST; >; - < "BETAINV" ; SC_OPCODE_BETA_INV; >; - < "BETA.DIST" ; SC_OPCODE_BETA_DIST_MS; >; - < "BETA.INV" ; SC_OPCODE_BETA_INV_MS; >; - < "WEEKNUM" ; SC_OPCODE_WEEK; >; - < "ISOWEEKNUM" ; SC_OPCODE_ISOWEEKNUM; >; - < "WEEKNUM_OOO" ; SC_OPCODE_WEEKNUM_OOO; >; - < "EASTERSUNDAY" ; SC_OPCODE_EASTERSUNDAY; >; - < "WEEKDAY" ; SC_OPCODE_GET_DAY_OF_WEEK; >; - < "NETWORKDAYS" ; SC_OPCODE_NETWORKDAYS; >; - < "NETWORKDAYS.INTL" ; SC_OPCODE_NETWORKDAYS_MS; >; - < "WORKDAY.INTL" ; SC_OPCODE_WORKDAY_MS; >; - < "#NAME!" ; SC_OPCODE_NO_NAME; >; - < "STYLE" ; SC_OPCODE_STYLE; >; - < "DDE" ; SC_OPCODE_DDE; >; - < "BASE" ; SC_OPCODE_BASE; >; - < "DECIMAL" ; SC_OPCODE_DECIMAL; >; - < "CONVERT" ; SC_OPCODE_CONVERT_OOO; >; // wrong but ODF1.1, keep it - < "ROMAN" ; SC_OPCODE_ROMAN; >; - < "ARABIC" ; SC_OPCODE_ARABIC; >; - < "HYPERLINK" ; SC_OPCODE_HYPERLINK; >; - < "INFO" ; SC_OPCODE_INFO; >; - < "BAHTTEXT" ; SC_OPCODE_BAHTTEXT; >; - < "GETPIVOTDATA" ; SC_OPCODE_GET_PIVOT_DATA; >; - < "EUROCONVERT" ; SC_OPCODE_EUROCONVERT; >; - < "NUMBERVALUE" ; SC_OPCODE_NUMBERVALUE; >; - < "GAMMA" ; SC_OPCODE_GAMMA; >; - < "CHISQDIST" ; SC_OPCODE_CHISQ_DIST; >; - < "CHISQ.DIST" ; SC_OPCODE_CHISQ_DIST_MS; >; - < "CHISQ.INV" ; SC_OPCODE_CHISQ_INV_MS; >; - < "CHISQINV" ; SC_OPCODE_CHISQ_INV; >; - < "BITAND" ; SC_OPCODE_BITAND; >; - < "BITOR" ; SC_OPCODE_BITOR; >; - < "BITXOR" ; SC_OPCODE_BITXOR; >; - < "BITRSHIFT" ; SC_OPCODE_BITRSHIFT; >; - < "BITLSHIFT" ; SC_OPCODE_BITLSHIFT; >; - /* BEGIN defined ERROR.TYPE() values. */ - < "#NULL!" ; SC_OPCODE_ERROR_NULL; >; - < "#DIV/0!" ; SC_OPCODE_ERROR_DIVZERO; >; - < "#VALUE!" ; SC_OPCODE_ERROR_VALUE; >; - < "#REF!" ; SC_OPCODE_ERROR_REF; >; - < "#NAME?" ; SC_OPCODE_ERROR_NAME; >; - < "#NUM!" ; SC_OPCODE_ERROR_NUM; >; - < "#N/A" ; SC_OPCODE_ERROR_NA; >; - /* END defined ERROR.TYPE() values. */ - < "FILTERXML" ; SC_OPCODE_FILTERXML; >; - < "WEBSERVICE" ; SC_OPCODE_WEBSERVICE; >; - < "COLOR" ; SC_OPCODE_COLOR; >; - < "ERF.PRECISE" ; SC_OPCODE_ERF_MS; >; - < "ERFC.PRECISE" ; SC_OPCODE_ERFC_MS; >; - < "ENCODEURL" ; SC_OPCODE_ENCODEURL; >; - < "RAWSUBTRACT" ; SC_OPCODE_RAWSUBTRACT; >; - < "ROUNDSIG" ; SC_OPCODE_ROUNDSIG; >; - }; -}; - -/** These English names are used for XFunctionAccess API. */ -// DO NOT CHANGE NAMES! Only add functions. -// If there is a reason for another name for some function then add an -// *additional* name to be recognized to sc/source/core/tool/compiler.cxx -// ScCompiler::IsOpCode(). -StringArray RID_STRLIST_FUNCTION_NAMES_ENGLISH_API -{ - ItemList = - { - < "IF" ; SC_OPCODE_IF; >; - < "IFERROR" ; SC_OPCODE_IF_ERROR; >; - < "IFNA" ; SC_OPCODE_IF_NA; >; - < "CHOOSE" ; SC_OPCODE_CHOOSE; >; - < "(" ; SC_OPCODE_OPEN; >; - < ")" ; SC_OPCODE_CLOSE; >; - < "[" ; SC_OPCODE_TABLE_REF_OPEN; >; - < "]" ; SC_OPCODE_TABLE_REF_CLOSE; >; - < "#All" ; SC_OPCODE_TABLE_REF_ITEM_ALL; >; - < "#Headers" ; SC_OPCODE_TABLE_REF_ITEM_HEADERS; >; - < "#Data" ; SC_OPCODE_TABLE_REF_ITEM_DATA; >; - < "#Totals" ; SC_OPCODE_TABLE_REF_ITEM_TOTALS; >; - < "#This Row" ; SC_OPCODE_TABLE_REF_ITEM_THIS_ROW; >; - < "{" ; SC_OPCODE_ARRAY_OPEN; >; - < "}" ; SC_OPCODE_ARRAY_CLOSE; >; - < "|" ; SC_OPCODE_ARRAY_ROW_SEP; >; - < ";" ; SC_OPCODE_ARRAY_COL_SEP; >; - < ";" ; SC_OPCODE_SEP; >; - < "%" ; SC_OPCODE_PERCENT_SIGN; >; - < "+" ; SC_OPCODE_ADD; >; - < "-" ; SC_OPCODE_SUB; >; - < "*" ; SC_OPCODE_MUL; >; - < "/" ; SC_OPCODE_DIV; >; - < "&" ; SC_OPCODE_AMPERSAND; >; - < "^" ; SC_OPCODE_POW; >; - < "=" ; SC_OPCODE_EQUAL; >; - < "<>" ; SC_OPCODE_NOT_EQUAL; >; - < "<" ; SC_OPCODE_LESS; >; - < ">" ; SC_OPCODE_GREATER; >; - < "<=" ; SC_OPCODE_LESS_EQUAL; >; - < ">=" ; SC_OPCODE_GREATER_EQUAL; >; - < "AND" ; SC_OPCODE_AND; >; - < "OR" ; SC_OPCODE_OR; >; - < "XOR" ; SC_OPCODE_XOR; >; - < "!" ; SC_OPCODE_INTERSECT; >; - < "~" ; SC_OPCODE_UNION; >; - < ":" ; SC_OPCODE_RANGE; >; - < "NOT" ; SC_OPCODE_NOT; >; - < "NEG" ; SC_OPCODE_NEG; >; - < "-" ; SC_OPCODE_NEG_SUB; >; - < "PI" ; SC_OPCODE_PI; >; - < "RAND" ; SC_OPCODE_RANDOM; >; - < "TRUE" ; SC_OPCODE_TRUE; >; - < "FALSE" ; SC_OPCODE_FALSE; >; - < "TODAY" ; SC_OPCODE_GET_ACT_DATE; >; - < "NOW" ; SC_OPCODE_GET_ACT_TIME; >; - < "NA" ; SC_OPCODE_NO_VALUE; >; - < "CURRENT" ; SC_OPCODE_CURRENT; >; - < "DEGREES" ; SC_OPCODE_DEG; >; - < "RADIANS" ; SC_OPCODE_RAD; >; - < "SIN" ; SC_OPCODE_SIN; >; - < "COS" ; SC_OPCODE_COS; >; - < "TAN" ; SC_OPCODE_TAN; >; - < "COT" ; SC_OPCODE_COT; >; - < "ASIN" ; SC_OPCODE_ARC_SIN; >; - < "ACOS" ; SC_OPCODE_ARC_COS; >; - < "ATAN" ; SC_OPCODE_ARC_TAN; >; - < "ACOT" ; SC_OPCODE_ARC_COT; >; - < "SINH" ; SC_OPCODE_SIN_HYP; >; - < "COSH" ; SC_OPCODE_COS_HYP; >; - < "TANH" ; SC_OPCODE_TAN_HYP; >; - < "COTH" ; SC_OPCODE_COT_HYP; >; - < "ASINH" ; SC_OPCODE_ARC_SIN_HYP; >; - < "ACOSH" ; SC_OPCODE_ARC_COS_HYP; >; - < "ATANH" ; SC_OPCODE_ARC_TAN_HYP; >; - < "ACOTH" ; SC_OPCODE_ARC_COT_HYP; >; - < "CSC" ; SC_OPCODE_COSECANT; >; - < "SEC" ; SC_OPCODE_SECANT; >; - < "CSCH" ; SC_OPCODE_COSECANT_HYP; >; - < "SECH" ; SC_OPCODE_SECANT_HYP; >; - < "EXP" ; SC_OPCODE_EXP; >; - < "LN" ; SC_OPCODE_LN; >; - < "SQRT" ; SC_OPCODE_SQRT; >; - < "FACT" ; SC_OPCODE_FACT; >; - < "YEAR" ; SC_OPCODE_GET_YEAR; >; - < "MONTH" ; SC_OPCODE_GET_MONTH; >; - < "DAY" ; SC_OPCODE_GET_DAY; >; - < "HOUR" ; SC_OPCODE_GET_HOUR; >; - < "MINUTE" ; SC_OPCODE_GET_MIN; >; - < "SECOND" ; SC_OPCODE_GET_SEC; >; - < "SIGN" ; SC_OPCODE_PLUS_MINUS; >; - < "ABS" ; SC_OPCODE_ABS; >; - < "INT" ; SC_OPCODE_INT; >; - < "PHI" ; SC_OPCODE_PHI; >; - < "GAUSS" ; SC_OPCODE_GAUSS; >; - < "ISBLANK" ; SC_OPCODE_IS_EMPTY; >; - < "ISTEXT" ; SC_OPCODE_IS_STRING; >; - < "ISNONTEXT" ; SC_OPCODE_IS_NON_STRING; >; - < "ISLOGICAL" ; SC_OPCODE_IS_LOGICAL; >; - < "TYPE" ; SC_OPCODE_TYPE; >; - < "CELL" ; SC_OPCODE_CELL; >; - < "ISREF" ; SC_OPCODE_IS_REF; >; - < "ISNUMBER" ; SC_OPCODE_IS_VALUE; >; - < "ISFORMULA" ; SC_OPCODE_IS_FORMULA; >; - < "ISNA" ; SC_OPCODE_IS_NV; >; - < "ISERR" ; SC_OPCODE_IS_ERR; >; - < "ISERROR" ; SC_OPCODE_IS_ERROR; >; - < "ISEVEN" ; SC_OPCODE_IS_EVEN; >; - < "ISODD" ; SC_OPCODE_IS_ODD; >; - < "N" ; SC_OPCODE_N; >; - < "DATEVALUE" ; SC_OPCODE_GET_DATE_VALUE; >; - < "TIMEVALUE" ; SC_OPCODE_GET_TIME_VALUE; >; - < "CODE" ; SC_OPCODE_CODE; >; - < "TRIM" ; SC_OPCODE_TRIM; >; - < "UPPER" ; SC_OPCODE_UPPER; >; - < "PROPER" ; SC_OPCODE_PROPER; >; - < "LOWER" ; SC_OPCODE_LOWER; >; - < "LEN" ; SC_OPCODE_LEN; >; - < "T" ; SC_OPCODE_T; >; - < "VALUE" ; SC_OPCODE_VALUE; >; - < "CLEAN" ; SC_OPCODE_CLEAN; >; - < "CHAR" ; SC_OPCODE_CHAR; >; - < "JIS" ; SC_OPCODE_JIS; >; - < "ASC" ; SC_OPCODE_ASC; >; - < "UNICODE" ; SC_OPCODE_UNICODE; >; - < "UNICHAR" ; SC_OPCODE_UNICHAR; >; - < "LOG10" ; SC_OPCODE_LOG10; >; - < "EVEN" ; SC_OPCODE_EVEN; >; - < "ODD" ; SC_OPCODE_ODD; >; - < "NORMSDIST" ; SC_OPCODE_STD_NORM_DIST; >; - < "NORM.S.DIST" ; SC_OPCODE_STD_NORM_DIST_MS; >; - < "FISHER" ; SC_OPCODE_FISHER; >; - < "FISHERINV" ; SC_OPCODE_FISHER_INV; >; - < "NORMSINV" ; SC_OPCODE_S_NORM_INV; >; - < "NORM.S.INV" ; SC_OPCODE_S_NORM_INV_MS; >; - < "GAMMALN" ; SC_OPCODE_GAMMA_LN; >; - < "GAMMALN.PRECISE" ; SC_OPCODE_GAMMA_LN_MS; >; - < "ERRORTYPE" ; SC_OPCODE_ERROR_TYPE; >; - < "ERROR.TYPE" ; SC_OPCODE_ERROR_TYPE_ODF; >; - < "FORMULA" ; SC_OPCODE_FORMULA; >; - < "ATAN2" ; SC_OPCODE_ARC_TAN_2; >; - < "CEILING.MATH" ; SC_OPCODE_CEIL_MATH; >; - < "CEILING" ; SC_OPCODE_CEIL; >; - < "CEILING.XCL" ; SC_OPCODE_CEIL_MS; >; - < "CEILING.PRECISE" ; SC_OPCODE_CEIL_PRECISE; >; - < "ISO.CEILING" ; SC_OPCODE_CEIL_ISO; >; - < "FLOOR" ; SC_OPCODE_FLOOR; >; - < "FLOOR.XCL" ; SC_OPCODE_FLOOR_MS; >; - < "FLOOR.MATH" ; SC_OPCODE_FLOOR_MATH; >; - < "FLOOR.PRECISE" ; SC_OPCODE_FLOOR_PRECISE; >; - < "ROUND" ; SC_OPCODE_ROUND; >; - < "ROUNDUP" ; SC_OPCODE_ROUND_UP; >; - < "ROUNDDOWN" ; SC_OPCODE_ROUND_DOWN; >; - < "TRUNC" ; SC_OPCODE_TRUNC; >; - < "LOG" ; SC_OPCODE_LOG; >; - < "POWER" ; SC_OPCODE_POWER; >; - < "GCD" ; SC_OPCODE_GCD; >; - < "LCM" ; SC_OPCODE_LCM; >; - < "MOD" ; SC_OPCODE_MOD; >; - < "SUMPRODUCT" ; SC_OPCODE_SUM_PRODUCT; >; - < "SUMSQ" ; SC_OPCODE_SUM_SQ; >; - < "SUMX2MY2" ; SC_OPCODE_SUM_X2MY2; >; - < "SUMX2PY2" ; SC_OPCODE_SUM_X2DY2; >; - < "SUMXMY2" ; SC_OPCODE_SUM_XMY2; >; - < "DATE" ; SC_OPCODE_GET_DATE; >; - < "TIME" ; SC_OPCODE_GET_TIME; >; - < "DAYS" ; SC_OPCODE_GET_DIFF_DATE; >; - < "DAYS360" ; SC_OPCODE_GET_DIFF_DATE_360; >; - < "DATEDIF" ; SC_OPCODE_GET_DATEDIF; >; - < "MIN" ; SC_OPCODE_MIN; >; - < "MINA" ; SC_OPCODE_MIN_A; >; - < "MAX" ; SC_OPCODE_MAX; >; - < "MAXA" ; SC_OPCODE_MAX_A; >; - < "SUM" ; SC_OPCODE_SUM; >; - < "PRODUCT" ; SC_OPCODE_PRODUCT; >; - < "AVERAGE" ; SC_OPCODE_AVERAGE; >; - < "AVERAGEA" ; SC_OPCODE_AVERAGE_A; >; - < "COUNT" ; SC_OPCODE_COUNT; >; - < "COUNTA" ; SC_OPCODE_COUNT_2; >; - < "NPV" ; SC_OPCODE_NPV; >; - < "IRR" ; SC_OPCODE_IRR; >; - < "MIRR" ; SC_OPCODE_MIRR; >; - < "ISPMT" ; SC_OPCODE_ISPMT; >; - < "VAR" ; SC_OPCODE_VAR; >; - < "VARA" ; SC_OPCODE_VAR_A; >; - < "VARP" ; SC_OPCODE_VAR_P; >; - < "VARPA" ; SC_OPCODE_VAR_P_A; >; - < "VAR.P" ; SC_OPCODE_VAR_P_MS; >; - < "VAR.S" ; SC_OPCODE_VAR_S; >; - < "STDEV" ; SC_OPCODE_ST_DEV; >; - < "STDEVA" ; SC_OPCODE_ST_DEV_A; >; - < "STDEVP" ; SC_OPCODE_ST_DEV_P; >; - < "STDEVPA" ; SC_OPCODE_ST_DEV_P_A; >; - < "STDEV.P" ; SC_OPCODE_ST_DEV_P_MS; >; - < "STDEV.S" ; SC_OPCODE_ST_DEV_S; >; - < "B" ; SC_OPCODE_B; >; - < "NORMDIST" ; SC_OPCODE_NORM_DIST; >; - < "NORM.DIST" ; SC_OPCODE_NORM_DIST_MS; >; - < "EXPONDIST" ; SC_OPCODE_EXP_DIST; >; - < "EXPON.DIST" ; SC_OPCODE_EXP_DIST_MS; >; - < "BINOMDIST" ; SC_OPCODE_BINOM_DIST; >; - < "BINOM.DIST" ; SC_OPCODE_BINOM_DIST_MS; >; - < "POISSON" ; SC_OPCODE_POISSON_DIST; >; - < "POISSON.DIST" ; SC_OPCODE_POISSON_DIST_MS; >; - < "COMBIN" ; SC_OPCODE_COMBIN; >; - < "COMBINA" ; SC_OPCODE_COMBIN_A; >; - < "PERMUT" ; SC_OPCODE_PERMUT; >; - < "PERMUTATIONA" ; SC_OPCODE_PERMUTATION_A; >; - < "PV" ; SC_OPCODE_PV; >; - < "SYD" ; SC_OPCODE_SYD; >; - < "DDB" ; SC_OPCODE_DDB; >; - < "DB" ; SC_OPCODE_DB; >; - < "VDB" ; SC_OPCODE_VBD; >; - < "DURATION" ; SC_OPCODE_PDURATION; >; - < "SLN" ; SC_OPCODE_SLN; >; - < "PMT" ; SC_OPCODE_PMT; >; - < "COLUMNS" ; SC_OPCODE_COLUMNS; >; - < "ROWS" ; SC_OPCODE_ROWS; >; - < "SHEETS" ; SC_OPCODE_SHEETS; >; - < "COLUMN" ; SC_OPCODE_COLUMN; >; - < "ROW" ; SC_OPCODE_ROW; >; - < "SHEET" ; SC_OPCODE_SHEET; >; - < "ZGZ" ; SC_OPCODE_RRI; >; - < "FV" ; SC_OPCODE_FV; >; - < "NPER" ; SC_OPCODE_NPER; >; - < "RATE" ; SC_OPCODE_RATE; >; - < "IPMT" ; SC_OPCODE_IPMT; >; - < "PPMT" ; SC_OPCODE_PPMT; >; - < "CUMIPMT" ; SC_OPCODE_CUM_IPMT; >; - < "CUMPRINC" ; SC_OPCODE_CUM_PRINC; >; - < "EFFECTIVE" ; SC_OPCODE_EFFECT; >; - < "NOMINAL" ; SC_OPCODE_NOMINAL; >; - < "SUBTOTAL" ; SC_OPCODE_SUB_TOTAL; >; - < "DSUM" ; SC_OPCODE_DB_SUM; >; - < "DCOUNT" ; SC_OPCODE_DB_COUNT; >; - < "DCOUNTA" ; SC_OPCODE_DB_COUNT_2; >; - < "DAVERAGE" ; SC_OPCODE_DB_AVERAGE; >; - < "DGET" ; SC_OPCODE_DB_GET; >; - < "DMAX" ; SC_OPCODE_DB_MAX; >; - < "DMIN" ; SC_OPCODE_DB_MIN; >; - < "DPRODUCT" ; SC_OPCODE_DB_PRODUCT; >; - < "DSTDEV" ; SC_OPCODE_DB_STD_DEV; >; - < "DSTDEVP" ; SC_OPCODE_DB_STD_DEV_P; >; - < "DVAR" ; SC_OPCODE_DB_VAR; >; - < "DVARP" ; SC_OPCODE_DB_VAR_P; >; - < "INDIRECT" ; SC_OPCODE_INDIRECT; >; - < "ADDRESS" ; SC_OPCODE_ADDRESS; >; - < "MATCH" ; SC_OPCODE_MATCH; >; - < "COUNTBLANK" ; SC_OPCODE_COUNT_EMPTY_CELLS; >; - < "COUNTIF" ; SC_OPCODE_COUNT_IF; >; - < "SUMIF" ; SC_OPCODE_SUM_IF; >; - < "AVERAGEIF" ; SC_OPCODE_AVERAGE_IF; >; - < "SUMIFS" ; SC_OPCODE_SUM_IFS; >; - < "AVERAGEIFS" ; SC_OPCODE_AVERAGE_IFS; >; - < "COUNTIFS" ; SC_OPCODE_COUNT_IFS; >; - < "LOOKUP" ; SC_OPCODE_LOOKUP; >; - < "VLOOKUP" ; SC_OPCODE_V_LOOKUP; >; - < "HLOOKUP" ; SC_OPCODE_H_LOOKUP; >; - < "MULTIRANGE" ; SC_OPCODE_MULTI_AREA; >; // legacy for range list (union) - < "OFFSET" ; SC_OPCODE_OFFSET; >; - < "INDEX" ; SC_OPCODE_INDEX; >; // ?? first character = I ?? - < "AREAS" ; SC_OPCODE_AREAS; >; - < "DOLLAR" ; SC_OPCODE_CURRENCY; >; - < "REPLACE" ; SC_OPCODE_REPLACE; >; - < "FIXED" ; SC_OPCODE_FIXED; >; - < "FIND" ; SC_OPCODE_FIND; >; - < "EXACT" ; SC_OPCODE_EXACT; >; - < "LEFT" ; SC_OPCODE_LEFT; >; - < "RIGHT" ; SC_OPCODE_RIGHT; >; - < "SEARCH" ; SC_OPCODE_SEARCH; >; - < "MID" ; SC_OPCODE_MID; >; - < "LENB" ; SC_OPCODE_LENB; >; - < "RIGHTB" ; SC_OPCODE_RIGHTB; >; - < "LEFTB" ; SC_OPCODE_LEFTB; >; - < "REPLACEB" ; SC_OPCODE_REPLACEB; >; - < "MIDB" ; SC_OPCODE_MIDB; >; - < "TEXT" ; SC_OPCODE_TEXT; >; - < "SUBSTITUTE" ; SC_OPCODE_SUBSTITUTE; >; - < "REPT" ; SC_OPCODE_REPT; >; - < "CONCATENATE" ; SC_OPCODE_CONCAT; >; - < "CONCAT" ; SC_OPCODE_CONCAT_MS; >; - < "TEXTJOIN" ; SC_OPCODE_TEXTJOIN_MS; >; - < "IFS" ; SC_OPCODE_IFS_MS; >; - < "SWITCH" ; SC_OPCODE_SWITCH_MS; >; - < "MINIFS" ; SC_OPCODE_MINIFS_MS; >; - < "MAXIFS" ; SC_OPCODE_MAXIFS_MS; >; - < "MVALUE" ; SC_OPCODE_MAT_VALUE; >; - < "MDETERM" ; SC_OPCODE_MAT_DET; >; - < "MINVERSE" ; SC_OPCODE_MAT_INV; >; - < "MMULT" ; SC_OPCODE_MAT_MULT; >; - < "TRANSPOSE" ; SC_OPCODE_MAT_TRANS; >; - < "MUNIT" ; SC_OPCODE_MATRIX_UNIT; >; - < "GOALSEEK" ; SC_OPCODE_BACK_SOLVER; >; - < "HYPGEOMDIST" ; SC_OPCODE_HYP_GEOM_DIST; >; - < "HYPGEOM.DIST" ; SC_OPCODE_HYP_GEOM_DIST_MS; >; - < "LOGNORMDIST" ; SC_OPCODE_LOG_NORM_DIST; >; - < "LOGNORM.DIST" ; SC_OPCODE_LOG_NORM_DIST_MS; >; - < "TDIST" ; SC_OPCODE_T_DIST; >; - < "T.DIST.2T" ; SC_OPCODE_T_DIST_2T; >; - < "T.DIST" ; SC_OPCODE_T_DIST_MS; >; - < "T.DIST.RT" ; SC_OPCODE_T_DIST_RT; >; - < "FDIST" ; SC_OPCODE_F_DIST; >; - < "F.DIST" ; SC_OPCODE_F_DIST_LT; >; - < "F.DIST.RT" ; SC_OPCODE_F_DIST_RT; >; - < "CHIDIST" ; SC_OPCODE_CHI_DIST; >; - < "CHISQ.DIST.RT" ; SC_OPCODE_CHI_DIST_MS; >; - < "WEIBULL" ; SC_OPCODE_WEIBULL; >; - < "WEIBULL.DIST" ; SC_OPCODE_WEIBULL_MS; >; - < "NEGBINOMDIST" ; SC_OPCODE_NEG_BINOM_VERT; >; - < "NEGBINOM.DIST" ; SC_OPCODE_NEG_BINOM_DIST_MS; >; - < "CRITBINOM" ; SC_OPCODE_CRIT_BINOM; >; - < "BINOM.INV" ; SC_OPCODE_BINOM_INV; >; - < "KURT" ; SC_OPCODE_KURT; >; - < "HARMEAN" ; SC_OPCODE_HAR_MEAN; >; - < "GEOMEAN" ; SC_OPCODE_GEO_MEAN; >; - < "STANDARDIZE" ; SC_OPCODE_STANDARD; >; - < "AVEDEV" ; SC_OPCODE_AVE_DEV; >; - < "SKEW" ; SC_OPCODE_SKEW; >; - < "SKEWP" ; SC_OPCODE_SKEWP; >; - < "DEVSQ" ; SC_OPCODE_DEV_SQ; >; - < "MEDIAN" ; SC_OPCODE_MEDIAN; >; - < "MODE" ; SC_OPCODE_MODAL_VALUE; >; - < "MODE.SNGL" ; SC_OPCODE_MODAL_VALUE_MS; >; - < "MODE.MULT" ; SC_OPCODE_MODAL_VALUE_MULTI; >; - < "ZTEST" ; SC_OPCODE_Z_TEST; >; - < "Z.TEST" ; SC_OPCODE_Z_TEST_MS; >; - < "AGGREGATE" ; SC_OPCODE_AGGREGATE; >; - < "TTEST" ; SC_OPCODE_T_TEST; >; - < "T.TEST" ; SC_OPCODE_T_TEST_MS; >; - < "RANK" ; SC_OPCODE_RANK; >; - < "PERCENTILE" ; SC_OPCODE_PERCENTILE; >; - < "PERCENTRANK" ; SC_OPCODE_PERCENT_RANK; >; - < "PERCENTILE.INC" ; SC_OPCODE_PERCENTILE_INC; >; - < "PERCENTRANK.INC" ; SC_OPCODE_PERCENT_RANK_INC; >; - < "QUARTILE.INC" ; SC_OPCODE_QUARTILE_INC; >; - < "RANK.EQ" ; SC_OPCODE_RANK_EQ; >; - < "PERCENTILE.EXC" ; SC_OPCODE_PERCENTILE_EXC; >; - < "PERCENTRANK.EXC" ; SC_OPCODE_PERCENT_RANK_EXC; >; - < "QUARTILE.EXC" ; SC_OPCODE_QUARTILE_EXC; >; - < "RANK.AVG" ; SC_OPCODE_RANK_AVG; >; - < "LARGE" ; SC_OPCODE_LARGE; >; - < "SMALL" ; SC_OPCODE_SMALL; >; - < "FREQUENCY" ; SC_OPCODE_FREQUENCY; >; - < "QUARTILE" ; SC_OPCODE_QUARTILE; >; - < "NORMINV" ; SC_OPCODE_NORM_INV; >; - < "NORM.INV" ; SC_OPCODE_NORM_INV_MS; >; - < "CONFIDENCE" ; SC_OPCODE_CONFIDENCE; >; - < "CONFIDENCE.NORM" ; SC_OPCODE_CONFIDENCE_N; >; - < "CONFIDENCE.T" ; SC_OPCODE_CONFIDENCE_T; >; - < "FTEST" ; SC_OPCODE_F_TEST; >; - < "F.TEST" ; SC_OPCODE_F_TEST_MS; >; - < "TRIMMEAN" ; SC_OPCODE_TRIM_MEAN; >; - < "PROB" ; SC_OPCODE_PROB; >; - < "CORREL" ; SC_OPCODE_CORREL; >; - < "COVAR" ; SC_OPCODE_COVAR; >; - < "COVARIANCE.P" ; SC_OPCODE_COVARIANCE_P; >; - < "COVARIANCE.S" ; SC_OPCODE_COVARIANCE_S; >; - < "PEARSON" ; SC_OPCODE_PEARSON; >; - < "RSQ" ; SC_OPCODE_RSQ; >; - < "STEYX" ; SC_OPCODE_STEYX; >; - < "SLOPE" ; SC_OPCODE_SLOPE; >; - < "INTERCEPT" ; SC_OPCODE_INTERCEPT; >; - < "TREND" ; SC_OPCODE_TREND; >; - < "GROWTH" ; SC_OPCODE_GROWTH; >; - < "LINEST" ; SC_OPCODE_LINEST; >; - < "LOGEST" ; SC_OPCODE_LOGEST; >; - < "FORECAST" ; SC_OPCODE_FORECAST; >; - < "FORECAST.ETS.ADD" ; SC_OPCODE_FORECAST_ETS_ADD; >; - < "FORECAST.ETS.SEASONALITY" ; SC_OPCODE_FORECAST_ETS_SEA; >; - < "FORECAST.ETS.MULT" ; SC_OPCODE_FORECAST_ETS_MUL; >; - < "FORECAST.ETS.PI.ADD" ; SC_OPCODE_FORECAST_ETS_PIA; >; - < "FORECAST.ETS.PI.MULT" ; SC_OPCODE_FORECAST_ETS_PIM; >; - < "FORECAST.ETS.STAT.ADD" ; SC_OPCODE_FORECAST_ETS_STA; >; - < "FORECAST.ETS.STAT.MULT" ; SC_OPCODE_FORECAST_ETS_STM; >; - < "FORECAST.LINEAR" ; SC_OPCODE_FORECAST_LIN; >; - < "CHIINV" ; SC_OPCODE_CHI_INV; >; - < "CHISQ.INV.RT" ; SC_OPCODE_CHI_INV_MS; >; - < "GAMMADIST" ; SC_OPCODE_GAMMA_DIST; >; - < "GAMMA.DIST" ; SC_OPCODE_GAMMA_DIST_MS; >; - < "GAMMAINV" ; SC_OPCODE_GAMMA_INV; >; - < "GAMMA.INV" ; SC_OPCODE_GAMMA_INV_MS; >; - < "TINV" ; SC_OPCODE_T_INV; >; - < "T.INV.2T" ; SC_OPCODE_T_INV_2T; >; - < "T.INV" ; SC_OPCODE_T_INV_MS; >; - < "FINV" ; SC_OPCODE_F_INV; >; - < "F.INV" ; SC_OPCODE_F_INV_LT; >; - < "F.INV.RT" ; SC_OPCODE_F_INV_RT; >; - < "CHITEST" ; SC_OPCODE_CHI_TEST; >; - < "CHISQ.TEST" ; SC_OPCODE_CHI_TEST_MS; >; - < "LOGINV" ; SC_OPCODE_LOG_INV; >; - < "LOGNORM.INV" ; SC_OPCODE_LOG_INV_MS; >; - < "TABLE" ; SC_OPCODE_TABLE_OP; >; - < "BETADIST" ; SC_OPCODE_BETA_DIST; >; - < "BETAINV" ; SC_OPCODE_BETA_INV; >; - < "BETA.DIST" ; SC_OPCODE_BETA_DIST_MS; >; - < "BETA.INV" ; SC_OPCODE_BETA_INV_MS; >; - < "WEEKNUM" ; SC_OPCODE_WEEK; >; - < "ISOWEEKNUM" ; SC_OPCODE_ISOWEEKNUM; >; - < "WEEKNUM_OOO" ; SC_OPCODE_WEEKNUM_OOO; >; - < "EASTERSUNDAY" ; SC_OPCODE_EASTERSUNDAY; >; - < "WEEKDAY" ; SC_OPCODE_GET_DAY_OF_WEEK; >; - < "NETWORKDAYS" ; SC_OPCODE_NETWORKDAYS; >; - < "NETWORKDAYS.INTL" ; SC_OPCODE_NETWORKDAYS_MS; >; - < "WORKDAY.INTL" ; SC_OPCODE_WORKDAY_MS; >; - < "#NAME!" ; SC_OPCODE_NO_NAME; >; - < "STYLE" ; SC_OPCODE_STYLE; >; - < "DDE" ; SC_OPCODE_DDE; >; - < "BASE" ; SC_OPCODE_BASE; >; - < "DECIMAL" ; SC_OPCODE_DECIMAL; >; - < "CONVERT" ; SC_OPCODE_CONVERT_OOO; >; - < "ROMAN" ; SC_OPCODE_ROMAN; >; - < "ARABIC" ; SC_OPCODE_ARABIC; >; - < "HYPERLINK" ; SC_OPCODE_HYPERLINK; >; - < "INFO" ; SC_OPCODE_INFO; >; - < "BAHTTEXT" ; SC_OPCODE_BAHTTEXT; >; - < "GETPIVOTDATA" ; SC_OPCODE_GET_PIVOT_DATA; >; - < "EUROCONVERT" ; SC_OPCODE_EUROCONVERT; >; - < "NUMBERVALUE" ; SC_OPCODE_NUMBERVALUE; >; - < "GAMMA" ; SC_OPCODE_GAMMA; >; - < "CHISQDIST" ; SC_OPCODE_CHISQ_DIST; >; - < "CHISQ.DIST" ; SC_OPCODE_CHISQ_DIST_MS; >; - < "CHISQ.INV" ; SC_OPCODE_CHISQ_INV_MS; >; - < "CHISQINV" ; SC_OPCODE_CHISQ_INV; >; - < "BITAND" ; SC_OPCODE_BITAND; >; - < "BITOR" ; SC_OPCODE_BITOR; >; - < "BITXOR" ; SC_OPCODE_BITXOR; >; - < "BITRSHIFT" ; SC_OPCODE_BITRSHIFT; >; - < "BITLSHIFT" ; SC_OPCODE_BITLSHIFT; >; - < "#NULL!" ; SC_OPCODE_ERROR_NULL; >; - < "#DIV/0!" ; SC_OPCODE_ERROR_DIVZERO; >; - < "#VALUE!" ; SC_OPCODE_ERROR_VALUE; >; - < "#REF!" ; SC_OPCODE_ERROR_REF; >; - < "#NAME?" ; SC_OPCODE_ERROR_NAME; >; - < "#NUM!" ; SC_OPCODE_ERROR_NUM; >; - < "#N/A" ; SC_OPCODE_ERROR_NA; >; - /* END defined ERROR.TYPE() values. */ - < "FILTERXML" ; SC_OPCODE_FILTERXML; >; - < "WEBSERVICE" ; SC_OPCODE_WEBSERVICE; >; - < "COLOR" ; SC_OPCODE_COLOR; >; - < "ERF.PRECISE" ; SC_OPCODE_ERF_MS; >; - < "ERFC.PRECISE" ; SC_OPCODE_ERFC_MS; >; - < "ENCODEURL" ; SC_OPCODE_ENCODEURL; >; - < "RAWSUBTRACT" ; SC_OPCODE_RAWSUBTRACT; >; - < "ROUNDSIG" ; SC_OPCODE_ROUNDSIG; >; - }; -}; - -/** These English names can be chosen in the UI and can be changed. They - should match the [en-US] names of RID_STRLIST_FUNCTION_NAMES below. */ -// As such they are a duplicate, but we can not have two string localizations -// at the same time. -StringArray RID_STRLIST_FUNCTION_NAMES_ENGLISH -{ - ItemList = - { - < "IF" ; SC_OPCODE_IF; >; - < "IFERROR" ; SC_OPCODE_IF_ERROR; >; - < "IFNA" ; SC_OPCODE_IF_NA; >; - < "CHOOSE" ; SC_OPCODE_CHOOSE; >; - < "(" ; SC_OPCODE_OPEN; >; - < ")" ; SC_OPCODE_CLOSE; >; - < "[" ; SC_OPCODE_TABLE_REF_OPEN; >; - < "]" ; SC_OPCODE_TABLE_REF_CLOSE; >; - < "#All" ; SC_OPCODE_TABLE_REF_ITEM_ALL; >; - < "#Headers" ; SC_OPCODE_TABLE_REF_ITEM_HEADERS; >; - < "#Data" ; SC_OPCODE_TABLE_REF_ITEM_DATA; >; - < "#Totals" ; SC_OPCODE_TABLE_REF_ITEM_TOTALS; >; - < "#This Row" ; SC_OPCODE_TABLE_REF_ITEM_THIS_ROW; >; - < "{" ; SC_OPCODE_ARRAY_OPEN; >; - < "}" ; SC_OPCODE_ARRAY_CLOSE; >; - < "|" ; SC_OPCODE_ARRAY_ROW_SEP; >; - < ";" ; SC_OPCODE_ARRAY_COL_SEP; >; - < ";" ; SC_OPCODE_SEP; >; - < "%" ; SC_OPCODE_PERCENT_SIGN; >; - < "+" ; SC_OPCODE_ADD; >; - < "-" ; SC_OPCODE_SUB; >; - < "*" ; SC_OPCODE_MUL; >; - < "/" ; SC_OPCODE_DIV; >; - < "&" ; SC_OPCODE_AMPERSAND; >; - < "^" ; SC_OPCODE_POW; >; - < "=" ; SC_OPCODE_EQUAL; >; - < "<>" ; SC_OPCODE_NOT_EQUAL; >; - < "<" ; SC_OPCODE_LESS; >; - < ">" ; SC_OPCODE_GREATER; >; - < "<=" ; SC_OPCODE_LESS_EQUAL; >; - < ">=" ; SC_OPCODE_GREATER_EQUAL; >; - < "AND" ; SC_OPCODE_AND; >; - < "OR" ; SC_OPCODE_OR; >; - < "XOR" ; SC_OPCODE_XOR; >; - < "!" ; SC_OPCODE_INTERSECT; >; - < "~" ; SC_OPCODE_UNION; >; - < ":" ; SC_OPCODE_RANGE; >; - < "NOT" ; SC_OPCODE_NOT; >; - < "NEG" ; SC_OPCODE_NEG; >; - < "-" ; SC_OPCODE_NEG_SUB; >; - < "PI" ; SC_OPCODE_PI; >; - < "RAND" ; SC_OPCODE_RANDOM; >; - < "TRUE" ; SC_OPCODE_TRUE; >; - < "FALSE" ; SC_OPCODE_FALSE; >; - < "TODAY" ; SC_OPCODE_GET_ACT_DATE; >; - < "NOW" ; SC_OPCODE_GET_ACT_TIME; >; - < "NA" ; SC_OPCODE_NO_VALUE; >; - < "CURRENT" ; SC_OPCODE_CURRENT; >; - < "DEGREES" ; SC_OPCODE_DEG; >; - < "RADIANS" ; SC_OPCODE_RAD; >; - < "SIN" ; SC_OPCODE_SIN; >; - < "COS" ; SC_OPCODE_COS; >; - < "TAN" ; SC_OPCODE_TAN; >; - < "COT" ; SC_OPCODE_COT; >; - < "ASIN" ; SC_OPCODE_ARC_SIN; >; - < "ACOS" ; SC_OPCODE_ARC_COS; >; - < "ATAN" ; SC_OPCODE_ARC_TAN; >; - < "ACOT" ; SC_OPCODE_ARC_COT; >; - < "SINH" ; SC_OPCODE_SIN_HYP; >; - < "COSH" ; SC_OPCODE_COS_HYP; >; - < "TANH" ; SC_OPCODE_TAN_HYP; >; - < "COTH" ; SC_OPCODE_COT_HYP; >; - < "ASINH" ; SC_OPCODE_ARC_SIN_HYP; >; - < "ACOSH" ; SC_OPCODE_ARC_COS_HYP; >; - < "ATANH" ; SC_OPCODE_ARC_TAN_HYP; >; - < "ACOTH" ; SC_OPCODE_ARC_COT_HYP; >; - < "CSC" ; SC_OPCODE_COSECANT; >; - < "SEC" ; SC_OPCODE_SECANT; >; - < "CSCH" ; SC_OPCODE_COSECANT_HYP; >; - < "SECH" ; SC_OPCODE_SECANT_HYP; >; - < "EXP" ; SC_OPCODE_EXP; >; - < "LN" ; SC_OPCODE_LN; >; - < "SQRT" ; SC_OPCODE_SQRT; >; - < "FACT" ; SC_OPCODE_FACT; >; - < "YEAR" ; SC_OPCODE_GET_YEAR; >; - < "MONTH" ; SC_OPCODE_GET_MONTH; >; - < "DAY" ; SC_OPCODE_GET_DAY; >; - < "HOUR" ; SC_OPCODE_GET_HOUR; >; - < "MINUTE" ; SC_OPCODE_GET_MIN; >; - < "SECOND" ; SC_OPCODE_GET_SEC; >; - < "SIGN" ; SC_OPCODE_PLUS_MINUS; >; - < "ABS" ; SC_OPCODE_ABS; >; - < "INT" ; SC_OPCODE_INT; >; - < "PHI" ; SC_OPCODE_PHI; >; - < "GAUSS" ; SC_OPCODE_GAUSS; >; - < "ISBLANK" ; SC_OPCODE_IS_EMPTY; >; - < "ISTEXT" ; SC_OPCODE_IS_STRING; >; - < "ISNONTEXT" ; SC_OPCODE_IS_NON_STRING; >; - < "ISLOGICAL" ; SC_OPCODE_IS_LOGICAL; >; - < "TYPE" ; SC_OPCODE_TYPE; >; - < "CELL" ; SC_OPCODE_CELL; >; - < "ISREF" ; SC_OPCODE_IS_REF; >; - < "ISNUMBER" ; SC_OPCODE_IS_VALUE; >; - < "ISFORMULA" ; SC_OPCODE_IS_FORMULA; >; - < "ISNA" ; SC_OPCODE_IS_NV; >; - < "ISERR" ; SC_OPCODE_IS_ERR; >; - < "ISERROR" ; SC_OPCODE_IS_ERROR; >; - < "ISEVEN" ; SC_OPCODE_IS_EVEN; >; - < "ISODD" ; SC_OPCODE_IS_ODD; >; - < "N" ; SC_OPCODE_N; >; - < "DATEVALUE" ; SC_OPCODE_GET_DATE_VALUE; >; - < "TIMEVALUE" ; SC_OPCODE_GET_TIME_VALUE; >; - < "CODE" ; SC_OPCODE_CODE; >; - < "TRIM" ; SC_OPCODE_TRIM; >; - < "UPPER" ; SC_OPCODE_UPPER; >; - < "PROPER" ; SC_OPCODE_PROPER; >; - < "LOWER" ; SC_OPCODE_LOWER; >; - < "LEN" ; SC_OPCODE_LEN; >; - < "T" ; SC_OPCODE_T; >; - < "VALUE" ; SC_OPCODE_VALUE; >; - < "CLEAN" ; SC_OPCODE_CLEAN; >; - < "CHAR" ; SC_OPCODE_CHAR; >; - < "JIS" ; SC_OPCODE_JIS; >; - < "ASC" ; SC_OPCODE_ASC; >; - < "UNICODE" ; SC_OPCODE_UNICODE; >; - < "UNICHAR" ; SC_OPCODE_UNICHAR; >; - < "LOG10" ; SC_OPCODE_LOG10; >; - < "EVEN" ; SC_OPCODE_EVEN; >; - < "ODD" ; SC_OPCODE_ODD; >; - < "NORMSDIST" ; SC_OPCODE_STD_NORM_DIST; >; - < "NORM.S.DIST" ; SC_OPCODE_STD_NORM_DIST_MS; >; - < "FISHER" ; SC_OPCODE_FISHER; >; - < "FISHERINV" ; SC_OPCODE_FISHER_INV; >; - < "NORMSINV" ; SC_OPCODE_S_NORM_INV; >; - < "NORM.S.INV" ; SC_OPCODE_S_NORM_INV_MS; >; - < "GAMMALN" ; SC_OPCODE_GAMMA_LN; >; - < "GAMMALN.PRECISE" ; SC_OPCODE_GAMMA_LN_MS; >; - < "ERRORTYPE" ; SC_OPCODE_ERROR_TYPE; >; - < "ERROR.TYPE" ; SC_OPCODE_ERROR_TYPE_ODF; >; - < "FORMULA" ; SC_OPCODE_FORMULA; >; - < "ATAN2" ; SC_OPCODE_ARC_TAN_2; >; - < "CEILING.MATH" ; SC_OPCODE_CEIL_MATH; >; - < "CEILING" ; SC_OPCODE_CEIL; >; - < "CEILING.XCL" ; SC_OPCODE_CEIL_MS; >; - < "CEILING.PRECISE" ; SC_OPCODE_CEIL_PRECISE; >; - < "ISO.CEILING" ; SC_OPCODE_CEIL_ISO; >; - < "FLOOR" ; SC_OPCODE_FLOOR; >; - < "FLOOR.XCL" ; SC_OPCODE_FLOOR_MS; >; - < "FLOOR.MATH" ; SC_OPCODE_FLOOR_MATH; >; - < "FLOOR.PRECISE" ; SC_OPCODE_FLOOR_PRECISE; >; - < "ROUND" ; SC_OPCODE_ROUND; >; - < "ROUNDUP" ; SC_OPCODE_ROUND_UP; >; - < "ROUNDDOWN" ; SC_OPCODE_ROUND_DOWN; >; - < "TRUNC" ; SC_OPCODE_TRUNC; >; - < "LOG" ; SC_OPCODE_LOG; >; - < "POWER" ; SC_OPCODE_POWER; >; - < "GCD" ; SC_OPCODE_GCD; >; - < "LCM" ; SC_OPCODE_LCM; >; - < "MOD" ; SC_OPCODE_MOD; >; - < "SUMPRODUCT" ; SC_OPCODE_SUM_PRODUCT; >; - < "SUMSQ" ; SC_OPCODE_SUM_SQ; >; - < "SUMX2MY2" ; SC_OPCODE_SUM_X2MY2; >; - < "SUMX2PY2" ; SC_OPCODE_SUM_X2DY2; >; - < "SUMXMY2" ; SC_OPCODE_SUM_XMY2; >; - < "DATE" ; SC_OPCODE_GET_DATE; >; - < "TIME" ; SC_OPCODE_GET_TIME; >; - < "DAYS" ; SC_OPCODE_GET_DIFF_DATE; >; - < "DAYS360" ; SC_OPCODE_GET_DIFF_DATE_360; >; - < "DATEDIF" ; SC_OPCODE_GET_DATEDIF; >; - < "MIN" ; SC_OPCODE_MIN; >; - < "MINA" ; SC_OPCODE_MIN_A; >; - < "MAX" ; SC_OPCODE_MAX; >; - < "MAXA" ; SC_OPCODE_MAX_A; >; - < "SUM" ; SC_OPCODE_SUM; >; - < "PRODUCT" ; SC_OPCODE_PRODUCT; >; - < "AVERAGE" ; SC_OPCODE_AVERAGE; >; - < "AVERAGEA" ; SC_OPCODE_AVERAGE_A; >; - < "COUNT" ; SC_OPCODE_COUNT; >; - < "COUNTA" ; SC_OPCODE_COUNT_2; >; - < "NPV" ; SC_OPCODE_NPV; >; - < "IRR" ; SC_OPCODE_IRR; >; - < "MIRR" ; SC_OPCODE_MIRR; >; - < "ISPMT" ; SC_OPCODE_ISPMT; >; - < "VAR" ; SC_OPCODE_VAR; >; - < "VARA" ; SC_OPCODE_VAR_A; >; - < "VARP" ; SC_OPCODE_VAR_P; >; - < "VARPA" ; SC_OPCODE_VAR_P_A; >; - < "VAR.P" ; SC_OPCODE_VAR_P_MS; >; - < "VAR.S" ; SC_OPCODE_VAR_S; >; - < "STDEV" ; SC_OPCODE_ST_DEV; >; - < "STDEVA" ; SC_OPCODE_ST_DEV_A; >; - < "STDEVP" ; SC_OPCODE_ST_DEV_P; >; - < "STDEVPA" ; SC_OPCODE_ST_DEV_P_A; >; - < "STDEV.P" ; SC_OPCODE_ST_DEV_P_MS; >; - < "STDEV.S" ; SC_OPCODE_ST_DEV_S; >; - < "B" ; SC_OPCODE_B; >; - < "NORMDIST" ; SC_OPCODE_NORM_DIST; >; - < "NORM.DIST" ; SC_OPCODE_NORM_DIST_MS; >; - < "EXPONDIST" ; SC_OPCODE_EXP_DIST; >; - < "EXPON.DIST" ; SC_OPCODE_EXP_DIST_MS; >; - < "BINOMDIST" ; SC_OPCODE_BINOM_DIST; >; - < "BINOM.DIST" ; SC_OPCODE_BINOM_DIST_MS; >; - < "POISSON" ; SC_OPCODE_POISSON_DIST; >; - < "POISSON.DIST" ; SC_OPCODE_POISSON_DIST_MS; >; - < "COMBIN" ; SC_OPCODE_COMBIN; >; - < "COMBINA" ; SC_OPCODE_COMBIN_A; >; - < "PERMUT" ; SC_OPCODE_PERMUT; >; - < "PERMUTATIONA" ; SC_OPCODE_PERMUTATION_A; >; - < "PV" ; SC_OPCODE_PV; >; - < "SYD" ; SC_OPCODE_SYD; >; - < "DDB" ; SC_OPCODE_DDB; >; - < "DB" ; SC_OPCODE_DB; >; - < "VDB" ; SC_OPCODE_VBD; >; - < "PDURATION" ; SC_OPCODE_PDURATION; >; - < "SLN" ; SC_OPCODE_SLN; >; - < "PMT" ; SC_OPCODE_PMT; >; - < "COLUMNS" ; SC_OPCODE_COLUMNS; >; - < "ROWS" ; SC_OPCODE_ROWS; >; - < "SHEETS" ; SC_OPCODE_SHEETS; >; - < "COLUMN" ; SC_OPCODE_COLUMN; >; - < "ROW" ; SC_OPCODE_ROW; >; - < "SHEET" ; SC_OPCODE_SHEET; >; - < "ZGZ" ; SC_OPCODE_RRI; >; - < "FV" ; SC_OPCODE_FV; >; - < "NPER" ; SC_OPCODE_NPER; >; - < "RATE" ; SC_OPCODE_RATE; >; - < "IPMT" ; SC_OPCODE_IPMT; >; - < "PPMT" ; SC_OPCODE_PPMT; >; - < "CUMIPMT" ; SC_OPCODE_CUM_IPMT; >; - < "CUMPRINC" ; SC_OPCODE_CUM_PRINC; >; - < "EFFECTIVE" ; SC_OPCODE_EFFECT; >; - < "NOMINAL" ; SC_OPCODE_NOMINAL; >; - < "SUBTOTAL" ; SC_OPCODE_SUB_TOTAL; >; - < "DSUM" ; SC_OPCODE_DB_SUM; >; - < "DCOUNT" ; SC_OPCODE_DB_COUNT; >; - < "DCOUNTA" ; SC_OPCODE_DB_COUNT_2; >; - < "DAVERAGE" ; SC_OPCODE_DB_AVERAGE; >; - < "DGET" ; SC_OPCODE_DB_GET; >; - < "DMAX" ; SC_OPCODE_DB_MAX; >; - < "DMIN" ; SC_OPCODE_DB_MIN; >; - < "DPRODUCT" ; SC_OPCODE_DB_PRODUCT; >; - < "DSTDEV" ; SC_OPCODE_DB_STD_DEV; >; - < "DSTDEVP" ; SC_OPCODE_DB_STD_DEV_P; >; - < "DVAR" ; SC_OPCODE_DB_VAR; >; - < "DVARP" ; SC_OPCODE_DB_VAR_P; >; - < "INDIRECT" ; SC_OPCODE_INDIRECT; >; - < "ADDRESS" ; SC_OPCODE_ADDRESS; >; - < "MATCH" ; SC_OPCODE_MATCH; >; - < "COUNTBLANK" ; SC_OPCODE_COUNT_EMPTY_CELLS; >; - < "COUNTIF" ; SC_OPCODE_COUNT_IF; >; - < "SUMIF" ; SC_OPCODE_SUM_IF; >; - < "AVERAGEIF" ; SC_OPCODE_AVERAGE_IF; >; - < "SUMIFS" ; SC_OPCODE_SUM_IFS; >; - < "AVERAGEIFS" ; SC_OPCODE_AVERAGE_IFS; >; - < "COUNTIFS" ; SC_OPCODE_COUNT_IFS; >; - < "LOOKUP" ; SC_OPCODE_LOOKUP; >; - < "VLOOKUP" ; SC_OPCODE_V_LOOKUP; >; - < "HLOOKUP" ; SC_OPCODE_H_LOOKUP; >; - < "MULTIRANGE" ; SC_OPCODE_MULTI_AREA; >; - < "OFFSET" ; SC_OPCODE_OFFSET; >; - < "INDEX" ; SC_OPCODE_INDEX; >; - < "AREAS" ; SC_OPCODE_AREAS; >; - < "DOLLAR" ; SC_OPCODE_CURRENCY; >; - < "REPLACE" ; SC_OPCODE_REPLACE; >; - < "FIXED" ; SC_OPCODE_FIXED; >; - < "FIND" ; SC_OPCODE_FIND; >; - < "EXACT" ; SC_OPCODE_EXACT; >; - < "LEFT" ; SC_OPCODE_LEFT; >; - < "RIGHT" ; SC_OPCODE_RIGHT; >; - < "SEARCH" ; SC_OPCODE_SEARCH; >; - < "MID" ; SC_OPCODE_MID; >; - < "LENB" ; SC_OPCODE_LENB; >; - < "RIGHTB" ; SC_OPCODE_RIGHTB; >; - < "LEFTB" ; SC_OPCODE_LEFTB; >; - < "REPLACEB" ; SC_OPCODE_REPLACEB; >; - < "MIDB" ; SC_OPCODE_MIDB; >; - < "TEXT" ; SC_OPCODE_TEXT; >; - < "SUBSTITUTE" ; SC_OPCODE_SUBSTITUTE; >; - < "REPT" ; SC_OPCODE_REPT; >; - < "CONCATENATE" ; SC_OPCODE_CONCAT; >; - < "CONCAT" ; SC_OPCODE_CONCAT_MS; >; - < "TEXTJOIN" ; SC_OPCODE_TEXTJOIN_MS; >; - < "IFS" ; SC_OPCODE_IFS_MS; >; - < "SWITCH" ; SC_OPCODE_SWITCH_MS; >; - < "MINIFS" ; SC_OPCODE_MINIFS_MS; >; - < "MAXIFS" ; SC_OPCODE_MAXIFS_MS; >; - < "MVALUE" ; SC_OPCODE_MAT_VALUE; >; - < "MDETERM" ; SC_OPCODE_MAT_DET; >; - < "MINVERSE" ; SC_OPCODE_MAT_INV; >; - < "MMULT" ; SC_OPCODE_MAT_MULT; >; - < "TRANSPOSE" ; SC_OPCODE_MAT_TRANS; >; - < "MUNIT" ; SC_OPCODE_MATRIX_UNIT; >; - < "GOALSEEK" ; SC_OPCODE_BACK_SOLVER; >; - < "HYPGEOMDIST" ; SC_OPCODE_HYP_GEOM_DIST; >; - < "HYPGEOM.DIST" ; SC_OPCODE_HYP_GEOM_DIST_MS; >; - < "LOGNORMDIST" ; SC_OPCODE_LOG_NORM_DIST; >; - < "LOGNORM.DIST" ; SC_OPCODE_LOG_NORM_DIST_MS; >; - < "TDIST" ; SC_OPCODE_T_DIST; >; - < "T.DIST.2T" ; SC_OPCODE_T_DIST_2T; >; - < "T.DIST" ; SC_OPCODE_T_DIST_MS; >; - < "T.DIST.RT" ; SC_OPCODE_T_DIST_RT; >; - < "FDIST" ; SC_OPCODE_F_DIST; >; - < "F.DIST" ; SC_OPCODE_F_DIST_LT; >; - < "F.DIST.RT" ; SC_OPCODE_F_DIST_RT; >; - < "CHIDIST" ; SC_OPCODE_CHI_DIST; >; - < "CHISQ.DIST.RT" ; SC_OPCODE_CHI_DIST_MS; >; - < "WEIBULL" ; SC_OPCODE_WEIBULL; >; - < "WEIBULL.DIST" ; SC_OPCODE_WEIBULL_MS; >; - < "NEGBINOMDIST" ; SC_OPCODE_NEG_BINOM_VERT; >; - < "NEGBINOM.DIST" ; SC_OPCODE_NEG_BINOM_DIST_MS; >; - < "CRITBINOM" ; SC_OPCODE_CRIT_BINOM; >; - < "BINOM.INV" ; SC_OPCODE_BINOM_INV; >; - < "KURT" ; SC_OPCODE_KURT; >; - < "HARMEAN" ; SC_OPCODE_HAR_MEAN; >; - < "GEOMEAN" ; SC_OPCODE_GEO_MEAN; >; - < "STANDARDIZE" ; SC_OPCODE_STANDARD; >; - < "AVEDEV" ; SC_OPCODE_AVE_DEV; >; - < "SKEW" ; SC_OPCODE_SKEW; >; - < "SKEWP" ; SC_OPCODE_SKEWP; >; - < "DEVSQ" ; SC_OPCODE_DEV_SQ; >; - < "MEDIAN" ; SC_OPCODE_MEDIAN; >; - < "MODE" ; SC_OPCODE_MODAL_VALUE; >; - < "MODE.SNGL" ; SC_OPCODE_MODAL_VALUE_MS; >; - < "MODE.MULT" ; SC_OPCODE_MODAL_VALUE_MULTI; >; - < "ZTEST" ; SC_OPCODE_Z_TEST; >; - < "Z.TEST" ; SC_OPCODE_Z_TEST_MS; >; - < "AGGREGATE" ; SC_OPCODE_AGGREGATE; >; - < "TTEST" ; SC_OPCODE_T_TEST; >; - < "T.TEST" ; SC_OPCODE_T_TEST_MS; >; - < "RANK" ; SC_OPCODE_RANK; >; - < "PERCENTILE" ; SC_OPCODE_PERCENTILE; >; - < "PERCENTRANK" ; SC_OPCODE_PERCENT_RANK; >; - < "PERCENTILE.INC" ; SC_OPCODE_PERCENTILE_INC; >; - < "PERCENTRANK.INC" ; SC_OPCODE_PERCENT_RANK_INC; >; - < "QUARTILE.INC" ; SC_OPCODE_QUARTILE_INC; >; - < "RANK.EQ" ; SC_OPCODE_RANK_EQ; >; - < "PERCENTILE.EXC" ; SC_OPCODE_PERCENTILE_EXC; >; - < "PERCENTRANK.EXC" ; SC_OPCODE_PERCENT_RANK_EXC; >; - < "QUARTILE.EXC" ; SC_OPCODE_QUARTILE_EXC; >; - < "RANK.AVG" ; SC_OPCODE_RANK_AVG; >; - < "LARGE" ; SC_OPCODE_LARGE; >; - < "SMALL" ; SC_OPCODE_SMALL; >; - < "FREQUENCY" ; SC_OPCODE_FREQUENCY; >; - < "QUARTILE" ; SC_OPCODE_QUARTILE; >; - < "NORMINV" ; SC_OPCODE_NORM_INV; >; - < "NORM.INV" ; SC_OPCODE_NORM_INV_MS; >; - < "CONFIDENCE" ; SC_OPCODE_CONFIDENCE; >; - < "CONFIDENCE.NORM" ; SC_OPCODE_CONFIDENCE_N; >; - < "CONFIDENCE.T" ; SC_OPCODE_CONFIDENCE_T; >; - < "FTEST" ; SC_OPCODE_F_TEST; >; - < "F.TEST" ; SC_OPCODE_F_TEST_MS; >; - < "TRIMMEAN" ; SC_OPCODE_TRIM_MEAN; >; - < "PROB" ; SC_OPCODE_PROB; >; - < "CORREL" ; SC_OPCODE_CORREL; >; - < "COVAR" ; SC_OPCODE_COVAR; >; - < "COVARIANCE.P" ; SC_OPCODE_COVARIANCE_P; >; - < "COVARIANCE.S" ; SC_OPCODE_COVARIANCE_S; >; - < "PEARSON" ; SC_OPCODE_PEARSON; >; - < "RSQ" ; SC_OPCODE_RSQ; >; - < "STEYX" ; SC_OPCODE_STEYX; >; - < "SLOPE" ; SC_OPCODE_SLOPE; >; - < "INTERCEPT" ; SC_OPCODE_INTERCEPT; >; - < "TREND" ; SC_OPCODE_TREND; >; - < "GROWTH" ; SC_OPCODE_GROWTH; >; - < "LINEST" ; SC_OPCODE_LINEST; >; - < "LOGEST" ; SC_OPCODE_LOGEST; >; - < "FORECAST" ; SC_OPCODE_FORECAST; >; - < "FORECAST.ETS.ADD" ; SC_OPCODE_FORECAST_ETS_ADD; >; - < "FORECAST.ETS.SEASONALITY" ; SC_OPCODE_FORECAST_ETS_SEA; >; - < "FORECAST.ETS.MULT" ; SC_OPCODE_FORECAST_ETS_MUL; >; - < "FORECAST.ETS.PI.ADD" ; SC_OPCODE_FORECAST_ETS_PIA; >; - < "FORECAST.ETS.PI.MULT" ; SC_OPCODE_FORECAST_ETS_PIM; >; - < "FORECAST.ETS.STAT.ADD" ; SC_OPCODE_FORECAST_ETS_STA; >; - < "FORECAST.ETS.STAT.MULT" ; SC_OPCODE_FORECAST_ETS_STM; >; - < "FORECAST.LINEAR" ; SC_OPCODE_FORECAST_LIN; >; - < "CHIINV" ; SC_OPCODE_CHI_INV; >; - < "CHISQ.INV.RT" ; SC_OPCODE_CHI_INV_MS; >; - < "GAMMADIST" ; SC_OPCODE_GAMMA_DIST; >; - < "GAMMA.DIST" ; SC_OPCODE_GAMMA_DIST_MS; >; - < "GAMMAINV" ; SC_OPCODE_GAMMA_INV; >; - < "GAMMA.INV" ; SC_OPCODE_GAMMA_INV_MS; >; - < "TINV" ; SC_OPCODE_T_INV; >; - < "T.INV.2T" ; SC_OPCODE_T_INV_2T; >; - < "T.INV" ; SC_OPCODE_T_INV_MS; >; - < "FINV" ; SC_OPCODE_F_INV; >; - < "F.INV" ; SC_OPCODE_F_INV_LT; >; - < "F.INV.RT" ; SC_OPCODE_F_INV_RT; >; - < "CHITEST" ; SC_OPCODE_CHI_TEST; >; - < "CHISQ.TEST" ; SC_OPCODE_CHI_TEST_MS; >; - < "LOGINV" ; SC_OPCODE_LOG_INV; >; - < "LOGNORM.INV" ; SC_OPCODE_LOG_INV_MS; >; - < "TABLE" ; SC_OPCODE_TABLE_OP; >; - < "BETADIST" ; SC_OPCODE_BETA_DIST; >; - < "BETAINV" ; SC_OPCODE_BETA_INV; >; - < "BETA.DIST" ; SC_OPCODE_BETA_DIST_MS; >; - < "BETA.INV" ; SC_OPCODE_BETA_INV_MS; >; - < "WEEKNUM" ; SC_OPCODE_WEEK; >; - < "ISOWEEKNUM" ; SC_OPCODE_ISOWEEKNUM; >; - < "WEEKNUM_OOO" ; SC_OPCODE_WEEKNUM_OOO; >; - < "EASTERSUNDAY" ; SC_OPCODE_EASTERSUNDAY; >; - < "WEEKDAY" ; SC_OPCODE_GET_DAY_OF_WEEK; >; - < "NETWORKDAYS" ; SC_OPCODE_NETWORKDAYS; >; - < "NETWORKDAYS.INTL" ; SC_OPCODE_NETWORKDAYS_MS; >; - < "WORKDAY.INTL" ; SC_OPCODE_WORKDAY_MS; >; - < "#NAME!" ; SC_OPCODE_NO_NAME; >; - < "STYLE" ; SC_OPCODE_STYLE; >; - < "DDE" ; SC_OPCODE_DDE; >; - < "BASE" ; SC_OPCODE_BASE; >; - < "DECIMAL" ; SC_OPCODE_DECIMAL; >; - < "CONVERT_OOO" ; SC_OPCODE_CONVERT_OOO; >; - < "ROMAN" ; SC_OPCODE_ROMAN; >; - < "ARABIC" ; SC_OPCODE_ARABIC; >; - < "HYPERLINK" ; SC_OPCODE_HYPERLINK; >; - < "INFO" ; SC_OPCODE_INFO; >; - < "BAHTTEXT" ; SC_OPCODE_BAHTTEXT; >; - < "GETPIVOTDATA" ; SC_OPCODE_GET_PIVOT_DATA; >; - < "EUROCONVERT" ; SC_OPCODE_EUROCONVERT; >; - < "NUMBERVALUE" ; SC_OPCODE_NUMBERVALUE; >; - < "GAMMA" ; SC_OPCODE_GAMMA; >; - < "CHISQDIST" ; SC_OPCODE_CHISQ_DIST; >; - < "CHISQ.DIST" ; SC_OPCODE_CHISQ_DIST_MS; >; - < "CHISQ.INV" ; SC_OPCODE_CHISQ_INV_MS; >; - < "CHISQINV" ; SC_OPCODE_CHISQ_INV; >; - < "BITAND" ; SC_OPCODE_BITAND; >; - < "BITOR" ; SC_OPCODE_BITOR; >; - < "BITXOR" ; SC_OPCODE_BITXOR; >; - < "BITRSHIFT" ; SC_OPCODE_BITRSHIFT; >; - < "BITLSHIFT" ; SC_OPCODE_BITLSHIFT; >; - < "#NULL!" ; SC_OPCODE_ERROR_NULL; >; - < "#DIV/0!" ; SC_OPCODE_ERROR_DIVZERO; >; - < "#VALUE!" ; SC_OPCODE_ERROR_VALUE; >; - < "#REF!" ; SC_OPCODE_ERROR_REF; >; - < "#NAME?" ; SC_OPCODE_ERROR_NAME; >; - < "#NUM!" ; SC_OPCODE_ERROR_NUM; >; - < "#N/A" ; SC_OPCODE_ERROR_NA; >; - /* END defined ERROR.TYPE() values. */ - < "FILTERXML" ; SC_OPCODE_FILTERXML; >; - < "WEBSERVICE" ; SC_OPCODE_WEBSERVICE; >; - < "COLOR" ; SC_OPCODE_COLOR; >; - < "ERF.PRECISE" ; SC_OPCODE_ERF_MS; >; - < "ERFC.PRECISE" ; SC_OPCODE_ERFC_MS; >; - < "ENCODEURL" ; SC_OPCODE_ENCODEURL; >; - < "RAWSUBTRACT" ; SC_OPCODE_RAWSUBTRACT; >; - < "ROUNDSIG" ; SC_OPCODE_ROUNDSIG; >; - }; -}; - -/** Function names that can be localized if [en-US]. Same names should be used - in RID_STRLIST_FUNCTION_NAMES_ENGLISH above. Names can be changed, the - change has to be mentioned in the release notes, i.e. - https://wiki.documentfoundation.org/ReleaseNotes/... - */ -StringArray RID_STRLIST_FUNCTION_NAMES -{ - ItemList [ en-US ] = - { - < "IF" ; SC_OPCODE_IF ; >; - < "IFERROR" ; SC_OPCODE_IF_ERROR ; >; - < "IFNA" ; SC_OPCODE_IF_NA ; >; - < "CHOOSE" ; SC_OPCODE_CHOOSE ; >; - < "#All" ; SC_OPCODE_TABLE_REF_ITEM_ALL ; >; - < "#Headers" ; SC_OPCODE_TABLE_REF_ITEM_HEADERS ; >; - < "#Data" ; SC_OPCODE_TABLE_REF_ITEM_DATA ; >; - < "#Totals" ; SC_OPCODE_TABLE_REF_ITEM_TOTALS ; >; - < "#This Row" ; SC_OPCODE_TABLE_REF_ITEM_THIS_ROW ; >; - < "AND" ; SC_OPCODE_AND ; >; - < "OR" ; SC_OPCODE_OR ; >; - < "XOR" ; SC_OPCODE_XOR ; >; - < "NOT" ; SC_OPCODE_NOT ; >; - < "NEG" ; SC_OPCODE_NEG ; >; - < "PI" ; SC_OPCODE_PI ; >; // ??? - < "RAND" ; SC_OPCODE_RANDOM ; >; - < "TRUE" ; SC_OPCODE_TRUE ; >; - < "FALSE" ; SC_OPCODE_FALSE ; >; - < "TODAY" ; SC_OPCODE_GET_ACT_DATE ; >; - < "NOW" ; SC_OPCODE_GET_ACT_TIME ; >; - < "NA" ; SC_OPCODE_NO_VALUE ; >; - < "CURRENT" ; SC_OPCODE_CURRENT ; >; - < "DEGREES" ; SC_OPCODE_DEG ; >; - < "RADIANS" ; SC_OPCODE_RAD ; >; - < "SIN" ; SC_OPCODE_SIN ; >; - < "COS" ; SC_OPCODE_COS ; >; - < "TAN" ; SC_OPCODE_TAN ; >; - < "COT" ; SC_OPCODE_COT ; >; - < "ASIN" ; SC_OPCODE_ARC_SIN ; >; - < "ACOS" ; SC_OPCODE_ARC_COS ; >; - < "ATAN" ; SC_OPCODE_ARC_TAN ; >; - < "ACOT" ; SC_OPCODE_ARC_COT ; >; - < "SINH" ; SC_OPCODE_SIN_HYP ; >; - < "COSH" ; SC_OPCODE_COS_HYP ; >; - < "TANH" ; SC_OPCODE_TAN_HYP ; >; - < "COTH" ; SC_OPCODE_COT_HYP ; >; - < "ASINH" ; SC_OPCODE_ARC_SIN_HYP ; >; - < "ACOSH" ; SC_OPCODE_ARC_COS_HYP ; >; - < "ATANH" ; SC_OPCODE_ARC_TAN_HYP ; >; - < "ACOTH" ; SC_OPCODE_ARC_COT_HYP ; >; - < "CSC" ; SC_OPCODE_COSECANT ; >; - < "SEC" ; SC_OPCODE_SECANT ; >; - < "CSCH" ; SC_OPCODE_COSECANT_HYP ; >; - < "SECH" ; SC_OPCODE_SECANT_HYP ; >; - < "EXP" ; SC_OPCODE_EXP ; >; - < "LN" ; SC_OPCODE_LN ; >; - < "SQRT" ; SC_OPCODE_SQRT ; >; - < "FACT" ; SC_OPCODE_FACT ; >; - < "YEAR" ; SC_OPCODE_GET_YEAR ; >; - < "MONTH" ; SC_OPCODE_GET_MONTH ; >; - < "DAY" ; SC_OPCODE_GET_DAY ; >; - < "HOUR" ; SC_OPCODE_GET_HOUR ; >; - < "MINUTE" ; SC_OPCODE_GET_MIN ; >; - < "SECOND" ; SC_OPCODE_GET_SEC ; >; - < "SIGN" ; SC_OPCODE_PLUS_MINUS ; >; - < "ABS" ; SC_OPCODE_ABS ; >; - < "INT" ; SC_OPCODE_INT ; >; - < "PHI" ; SC_OPCODE_PHI ; >; - < "GAUSS" ; SC_OPCODE_GAUSS ; >; - < "ISBLANK" ; SC_OPCODE_IS_EMPTY ; >; - < "ISTEXT" ; SC_OPCODE_IS_STRING ; >; - < "ISNONTEXT" ; SC_OPCODE_IS_NON_STRING ; >; - < "ISLOGICAL" ; SC_OPCODE_IS_LOGICAL ; >; - < "TYPE" ; SC_OPCODE_TYPE ; >; - < "CELL" ; SC_OPCODE_CELL ; >; - < "ISREF" ; SC_OPCODE_IS_REF ; >; - < "ISNUMBER" ; SC_OPCODE_IS_VALUE ; >; - < "ISFORMULA" ; SC_OPCODE_IS_FORMULA ; >; - < "ISNA" ; SC_OPCODE_IS_NV ; >; - < "ISERR" ; SC_OPCODE_IS_ERR ; >; - < "ISERROR" ; SC_OPCODE_IS_ERROR ; >; - < "ISEVEN" ; SC_OPCODE_IS_EVEN ; >; - < "ISODD" ; SC_OPCODE_IS_ODD ; >; - < "N" ; SC_OPCODE_N ; >; - < "DATEVALUE" ; SC_OPCODE_GET_DATE_VALUE ; >; - < "TIMEVALUE" ; SC_OPCODE_GET_TIME_VALUE ; >; - < "CODE" ; SC_OPCODE_CODE ; >; - < "TRIM" ; SC_OPCODE_TRIM ; >; - < "UPPER" ; SC_OPCODE_UPPER ; >; - < "PROPER" ; SC_OPCODE_PROPER ; >; - < "LOWER" ; SC_OPCODE_LOWER ; >; - < "LEN" ; SC_OPCODE_LEN ; >; - < "T" ; SC_OPCODE_T ; >; - < "VALUE" ; SC_OPCODE_VALUE ; >; - < "CLEAN" ; SC_OPCODE_CLEAN ; >; - < "CHAR" ; SC_OPCODE_CHAR ; >; - < "JIS" ; SC_OPCODE_JIS ; >; - < "ASC" ; SC_OPCODE_ASC ; >; - < "UNICODE" ; SC_OPCODE_UNICODE ; >; - < "UNICHAR" ; SC_OPCODE_UNICHAR ; >; - < "LOG10" ; SC_OPCODE_LOG10 ; >; - < "EVEN" ; SC_OPCODE_EVEN ; >; - < "ODD" ; SC_OPCODE_ODD ; >; - < "NORMSDIST" ; SC_OPCODE_STD_NORM_DIST ; >; - < "NORM.S.DIST" ; SC_OPCODE_STD_NORM_DIST_MS ; >; - < "FISHER" ; SC_OPCODE_FISHER ; >; - < "FISHERINV" ; SC_OPCODE_FISHER_INV ; >; - < "NORMSINV" ; SC_OPCODE_S_NORM_INV ; >; - < "NORM.S.INV" ; SC_OPCODE_S_NORM_INV_MS ; >; - < "GAMMALN" ; SC_OPCODE_GAMMA_LN ; >; - < "GAMMALN.PRECISE" ; SC_OPCODE_GAMMA_LN_MS ; >; - < "ERRORTYPE" ; SC_OPCODE_ERROR_TYPE ; >; - < "ERROR.TYPE" ; SC_OPCODE_ERROR_TYPE_ODF ; >; - < "FORMULA" ; SC_OPCODE_FORMULA ; >; - < "ARABIC" ; SC_OPCODE_ARABIC ; >; - < "ATAN2" ; SC_OPCODE_ARC_TAN_2 ; >; - < "CEILING.MATH" ; SC_OPCODE_CEIL_MATH ; >; - < "CEILING" ; SC_OPCODE_CEIL ; >; - < "CEILING.XCL" ; SC_OPCODE_CEIL_MS ; >; - < "CEILING.PRECISE" ; SC_OPCODE_CEIL_PRECISE ; >; - < "ISO.CEILING" ; SC_OPCODE_CEIL_ISO ; >; - < "FLOOR" ; SC_OPCODE_FLOOR ; >; - < "FLOOR.XCL" ; SC_OPCODE_FLOOR_MS ; >; - < "FLOOR.MATH" ; SC_OPCODE_FLOOR_MATH ; >; - < "FLOOR.PRECISE" ; SC_OPCODE_FLOOR_PRECISE ; >; - < "ROUND" ; SC_OPCODE_ROUND ; >; - < "ROUNDUP" ; SC_OPCODE_ROUND_UP ; >; - < "ROUNDDOWN" ; SC_OPCODE_ROUND_DOWN ; >; - < "TRUNC" ; SC_OPCODE_TRUNC ; >; - < "LOG" ; SC_OPCODE_LOG ; >; - < "POWER" ; SC_OPCODE_POWER ; >; - < "GCD" ; SC_OPCODE_GCD ; >; - < "LCM" ; SC_OPCODE_LCM ; >; - < "MOD" ; SC_OPCODE_MOD ; >; - < "SUMPRODUCT" ; SC_OPCODE_SUM_PRODUCT ; >; - < "SUMSQ" ; SC_OPCODE_SUM_SQ ; >; - < "SUMX2MY2" ; SC_OPCODE_SUM_X2MY2 ; >; - < "SUMX2PY2" ; SC_OPCODE_SUM_X2DY2 ; >; - < "SUMXMY2" ; SC_OPCODE_SUM_XMY2 ; >; - < "DATE" ; SC_OPCODE_GET_DATE ; >; - < "TIME" ; SC_OPCODE_GET_TIME ; >; - < "DAYS" ; SC_OPCODE_GET_DIFF_DATE ; >; - < "DAYS360" ; SC_OPCODE_GET_DIFF_DATE_360 ; >; - < "DATEDIF" ; SC_OPCODE_GET_DATEDIF ; >; - < "MIN" ; SC_OPCODE_MIN ; >; - < "MINA" ; SC_OPCODE_MIN_A ; >; - < "MAX" ; SC_OPCODE_MAX ; >; - < "MAXA" ; SC_OPCODE_MAX_A ; >; - < "SUM" ; SC_OPCODE_SUM ; >; - < "PRODUCT" ; SC_OPCODE_PRODUCT ; >; - < "AVERAGE" ; SC_OPCODE_AVERAGE ; >; - < "AVERAGEA" ; SC_OPCODE_AVERAGE_A ; >; - < "COUNT" ; SC_OPCODE_COUNT ; >; - < "COUNTA" ; SC_OPCODE_COUNT_2 ; >; - < "NPV" ; SC_OPCODE_NPV ; >; - < "IRR" ; SC_OPCODE_IRR ; >; - < "MIRR" ; SC_OPCODE_MIRR ; >; - < "ISPMT" ; SC_OPCODE_ISPMT ; >; - < "VAR" ; SC_OPCODE_VAR ; >; - < "VARA" ; SC_OPCODE_VAR_A ; >; - < "VARP" ; SC_OPCODE_VAR_P ; >; - < "VARPA" ; SC_OPCODE_VAR_P_A ; >; - < "VAR.P" ; SC_OPCODE_VAR_P_MS ; >; - < "VAR.S" ; SC_OPCODE_VAR_S ; >; - < "STDEV" ; SC_OPCODE_ST_DEV ; >; - < "STDEVA" ; SC_OPCODE_ST_DEV_A ; >; - < "STDEVP" ; SC_OPCODE_ST_DEV_P ; >; - < "STDEVPA" ; SC_OPCODE_ST_DEV_P_A ; >; - < "STDEV.P" ; SC_OPCODE_ST_DEV_P_MS ; >; - < "STDEV.S" ; SC_OPCODE_ST_DEV_S ; >; - < "B" ; SC_OPCODE_B ; >; - < "NORMDIST" ; SC_OPCODE_NORM_DIST ; >; - < "NORM.DIST" ; SC_OPCODE_NORM_DIST_MS ; >; - < "EXPONDIST" ; SC_OPCODE_EXP_DIST ; >; - < "EXPON.DIST" ; SC_OPCODE_EXP_DIST_MS ; >; - < "BINOMDIST" ; SC_OPCODE_BINOM_DIST ; >; - < "BINOM.DIST" ; SC_OPCODE_BINOM_DIST_MS ; >; - < "POISSON" ; SC_OPCODE_POISSON_DIST ; >; - < "POISSON.DIST" ; SC_OPCODE_POISSON_DIST_MS ; >; - < "COMBIN" ; SC_OPCODE_COMBIN ; >; - < "COMBINA" ; SC_OPCODE_COMBIN_A ; >; - < "PERMUT" ; SC_OPCODE_PERMUT ; >; - < "PERMUTATIONA" ; SC_OPCODE_PERMUTATION_A ; >; - < "PV" ; SC_OPCODE_PV ; >; - < "SYD" ; SC_OPCODE_SYD ; >; - < "DDB" ; SC_OPCODE_DDB ; >; - < "DB" ; SC_OPCODE_DB ; >; - < "VDB" ; SC_OPCODE_VBD ; >; - < "PDURATION" ; SC_OPCODE_PDURATION ; >; - < "SLN" ; SC_OPCODE_SLN ; >; - < "PMT" ; SC_OPCODE_PMT ; >; - < "COLUMNS" ; SC_OPCODE_COLUMNS ; >; - < "ROWS" ; SC_OPCODE_ROWS ; >; - < "SHEETS" ; SC_OPCODE_SHEETS ; >; - < "COLUMN" ; SC_OPCODE_COLUMN ; >; - < "ROW" ; SC_OPCODE_ROW ; >; - < "SHEET" ; SC_OPCODE_SHEET ; >; - < "RRI" ; SC_OPCODE_RRI ; >; - < "FV" ; SC_OPCODE_FV ; >; - < "NPER" ; SC_OPCODE_NPER ; >; - < "RATE" ; SC_OPCODE_RATE ; >; - < "IPMT" ; SC_OPCODE_IPMT ; >; - < "PPMT" ; SC_OPCODE_PPMT ; >; - < "CUMIPMT" ; SC_OPCODE_CUM_IPMT ; >; - < "CUMPRINC" ; SC_OPCODE_CUM_PRINC ; >; - < "EFFECT" ; SC_OPCODE_EFFECT ; >; - < "NOMINAL" ; SC_OPCODE_NOMINAL ; >; - < "SUBTOTAL" ; SC_OPCODE_SUB_TOTAL ; >; - < "DSUM" ; SC_OPCODE_DB_SUM ; >; - < "DCOUNT" ; SC_OPCODE_DB_COUNT ; >; - < "DCOUNTA" ; SC_OPCODE_DB_COUNT_2 ; >; - < "DAVERAGE" ; SC_OPCODE_DB_AVERAGE ; >; - < "DGET" ; SC_OPCODE_DB_GET ; >; - < "DMAX" ; SC_OPCODE_DB_MAX ; >; - < "DMIN" ; SC_OPCODE_DB_MIN ; >; - < "DPRODUCT" ; SC_OPCODE_DB_PRODUCT ; >; - < "DSTDEV" ; SC_OPCODE_DB_STD_DEV ; >; - < "DSTDEVP" ; SC_OPCODE_DB_STD_DEV_P ; >; - < "DVAR" ; SC_OPCODE_DB_VAR ; >; - < "DVARP" ; SC_OPCODE_DB_VAR_P ; >; - < "INDIRECT" ; SC_OPCODE_INDIRECT ; >; - < "ADDRESS" ; SC_OPCODE_ADDRESS ; >; - < "MATCH" ; SC_OPCODE_MATCH ; >; - < "COUNTBLANK" ; SC_OPCODE_COUNT_EMPTY_CELLS ; >; - < "COUNTIF" ; SC_OPCODE_COUNT_IF ; >; - < "SUMIF" ; SC_OPCODE_SUM_IF ; >; - < "AVERAGEIF" ; SC_OPCODE_AVERAGE_IF ; >; - < "SUMIFS" ; SC_OPCODE_SUM_IFS ; >; - < "AVERAGEIFS" ; SC_OPCODE_AVERAGE_IFS ; >; - < "COUNTIFS" ; SC_OPCODE_COUNT_IFS ; >; - < "LOOKUP" ; SC_OPCODE_LOOKUP ; >; - < "VLOOKUP" ; SC_OPCODE_V_LOOKUP ; >; - < "HLOOKUP" ; SC_OPCODE_H_LOOKUP ; >; - < "MULTIRANGE" ; SC_OPCODE_MULTI_AREA ; >; // legacy for range list (union) - < "OFFSET" ; SC_OPCODE_OFFSET ; >; - < "INDEX" ; SC_OPCODE_INDEX ; >; // ?? first character = I ?? - < "AREAS" ; SC_OPCODE_AREAS ; >; - < "DOLLAR" ; SC_OPCODE_CURRENCY ; >; - < "REPLACE" ; SC_OPCODE_REPLACE ; >; - < "FIXED" ; SC_OPCODE_FIXED ; >; - < "FIND" ; SC_OPCODE_FIND ; >; - < "EXACT" ; SC_OPCODE_EXACT ; >; - < "LEFT" ; SC_OPCODE_LEFT ; >; - < "RIGHT" ; SC_OPCODE_RIGHT ; >; - < "SEARCH" ; SC_OPCODE_SEARCH ; >; - < "MID" ; SC_OPCODE_MID ; >; - < "LENB" ; SC_OPCODE_LENB ; >; - < "RIGHTB" ; SC_OPCODE_RIGHTB ; >; - < "LEFTB" ; SC_OPCODE_LEFTB ; >; - < "REPLACEB" ; SC_OPCODE_REPLACEB; >; - < "MIDB" ; SC_OPCODE_MIDB ; >; - < "TEXT" ; SC_OPCODE_TEXT ; >; - < "SUBSTITUTE" ; SC_OPCODE_SUBSTITUTE ; >; - < "REPT" ; SC_OPCODE_REPT ; >; - < "CONCATENATE" ; SC_OPCODE_CONCAT ; >; - < "CONCAT" ; SC_OPCODE_CONCAT_MS ; >; - < "TEXTJOIN" ; SC_OPCODE_TEXTJOIN_MS ; >; - < "IFS" ; SC_OPCODE_IFS_MS ; >; - < "SWITCH" ; SC_OPCODE_SWITCH_MS ; >; - < "MINIFS" ; SC_OPCODE_MINIFS_MS ; >; - < "MAXIFS" ; SC_OPCODE_MAXIFS_MS ; >; - < "MVALUE" ; SC_OPCODE_MAT_VALUE ; >; - < "MDETERM" ; SC_OPCODE_MAT_DET ; >; - < "MINVERSE" ; SC_OPCODE_MAT_INV ; >; - < "MMULT" ; SC_OPCODE_MAT_MULT ; >; - < "TRANSPOSE" ; SC_OPCODE_MAT_TRANS ; >; - < "MUNIT" ; SC_OPCODE_MATRIX_UNIT ; >; - < "GOALSEEK" ; SC_OPCODE_BACK_SOLVER ; >; - < "HYPGEOMDIST" ; SC_OPCODE_HYP_GEOM_DIST ; >; - < "HYPGEOM.DIST" ; SC_OPCODE_HYP_GEOM_DIST_MS ; >; - < "LOGNORMDIST" ; SC_OPCODE_LOG_NORM_DIST ; >; - < "LOGNORM.DIST" ; SC_OPCODE_LOG_NORM_DIST_MS ; >; - < "TDIST" ; SC_OPCODE_T_DIST ; >; - < "T.DIST.2T" ; SC_OPCODE_T_DIST_2T ; >; - < "T.DIST" ; SC_OPCODE_T_DIST_MS ; >; - < "T.DIST.RT" ; SC_OPCODE_T_DIST_RT ; >; - < "FDIST" ; SC_OPCODE_F_DIST ; >; - < "F.DIST" ; SC_OPCODE_F_DIST_LT ; >; - < "F.DIST.RT" ; SC_OPCODE_F_DIST_RT ; >; - < "CHIDIST" ; SC_OPCODE_CHI_DIST ; >; - < "CHISQ.DIST.RT" ; SC_OPCODE_CHI_DIST_MS ; >; - < "WEIBULL" ; SC_OPCODE_WEIBULL ; >; - < "WEIBULL.DIST" ; SC_OPCODE_WEIBULL_MS ; >; - < "NEGBINOMDIST" ; SC_OPCODE_NEG_BINOM_VERT ; >; - < "NEGBINOM.DIST" ; SC_OPCODE_NEG_BINOM_DIST_MS ; >; - < "CRITBINOM" ; SC_OPCODE_CRIT_BINOM ; >; - < "BINOM.INV" ; SC_OPCODE_BINOM_INV ; >; - < "KURT" ; SC_OPCODE_KURT ; >; - < "HARMEAN" ; SC_OPCODE_HAR_MEAN ; >; - < "GEOMEAN" ; SC_OPCODE_GEO_MEAN ; >; - < "STANDARDIZE" ; SC_OPCODE_STANDARD ; >; - < "AVEDEV" ; SC_OPCODE_AVE_DEV ; >; - < "SKEW" ; SC_OPCODE_SKEW ; >; - < "SKEWP" ; SC_OPCODE_SKEWP ; >; - < "DEVSQ" ; SC_OPCODE_DEV_SQ ; >; - < "MEDIAN" ; SC_OPCODE_MEDIAN ; >; - < "MODE" ; SC_OPCODE_MODAL_VALUE ; >; - < "MODE.SNGL" ; SC_OPCODE_MODAL_VALUE_MS ; >; - < "MODE.MULT" ; SC_OPCODE_MODAL_VALUE_MULTI ; >; - < "ZTEST" ; SC_OPCODE_Z_TEST ; >; - < "Z.TEST" ; SC_OPCODE_Z_TEST_MS ; >; - < "AGGREGATE" ; SC_OPCODE_AGGREGATE ; >; - < "TTEST" ; SC_OPCODE_T_TEST ; >; - < "T.TEST" ; SC_OPCODE_T_TEST_MS ; >; - < "RANK" ; SC_OPCODE_RANK ; >; - < "PERCENTILE" ; SC_OPCODE_PERCENTILE ; >; - < "PERCENTRANK" ; SC_OPCODE_PERCENT_RANK ; >; - < "PERCENTILE.INC" ; SC_OPCODE_PERCENTILE_INC ; >; - < "PERCENTRANK.INC" ; SC_OPCODE_PERCENT_RANK_INC ; >; - < "QUARTILE.INC" ; SC_OPCODE_QUARTILE_INC ; >; - < "RANK.EQ" ; SC_OPCODE_RANK_EQ ; >; - < "PERCENTILE.EXC" ; SC_OPCODE_PERCENTILE_EXC ; >; - < "PERCENTRANK.EXC" ; SC_OPCODE_PERCENT_RANK_EXC ; >; - < "QUARTILE.EXC" ; SC_OPCODE_QUARTILE_EXC ; >; - < "RANK.AVG" ; SC_OPCODE_RANK_AVG ; >; - < "LARGE" ; SC_OPCODE_LARGE ; >; - < "SMALL" ; SC_OPCODE_SMALL ; >; - < "FREQUENCY" ; SC_OPCODE_FREQUENCY ; >; - < "QUARTILE" ; SC_OPCODE_QUARTILE ; >; - < "NORMINV" ; SC_OPCODE_NORM_INV ; >; - < "NORM.INV" ; SC_OPCODE_NORM_INV_MS ; >; - < "CONFIDENCE" ; SC_OPCODE_CONFIDENCE ; >; - < "CONFIDENCE.NORM" ; SC_OPCODE_CONFIDENCE_N ; >; - < "CONFIDENCE.T" ; SC_OPCODE_CONFIDENCE_T ; >; - < "FTEST" ; SC_OPCODE_F_TEST ; >; - < "F.TEST" ; SC_OPCODE_F_TEST_MS ; >; - < "TRIMMEAN" ; SC_OPCODE_TRIM_MEAN ; >; - < "PROB" ; SC_OPCODE_PROB ; >; - < "CORREL" ; SC_OPCODE_CORREL ; >; - < "COVAR" ; SC_OPCODE_COVAR ; >; - < "COVARIANCE.P" ; SC_OPCODE_COVARIANCE_P ; >; - < "COVARIANCE.S" ; SC_OPCODE_COVARIANCE_S ; >; - < "PEARSON" ; SC_OPCODE_PEARSON ; >; - < "RSQ" ; SC_OPCODE_RSQ ; >; - < "STEYX" ; SC_OPCODE_STEYX ; >; - < "SLOPE" ; SC_OPCODE_SLOPE ; >; - < "INTERCEPT" ; SC_OPCODE_INTERCEPT ; >; - < "TREND" ; SC_OPCODE_TREND ; >; - < "GROWTH" ; SC_OPCODE_GROWTH ; >; - < "LINEST" ; SC_OPCODE_LINEST ; >; - < "LOGEST" ; SC_OPCODE_LOGEST ; >; - < "FORECAST" ; SC_OPCODE_FORECAST ; >; - < "FORECAST.ETS.ADD" ; SC_OPCODE_FORECAST_ETS_ADD ; >; - < "FORECAST.ETS.SEASONALITY" ; SC_OPCODE_FORECAST_ETS_SEA ; >; - < "FORECAST.ETS.MULT" ; SC_OPCODE_FORECAST_ETS_MUL ; >; - < "FORECAST.ETS.PI.ADD" ; SC_OPCODE_FORECAST_ETS_PIA ; >; - < "FORECAST.ETS.PI.MULT" ; SC_OPCODE_FORECAST_ETS_PIM ; >; - < "FORECAST.ETS.STAT.ADD" ; SC_OPCODE_FORECAST_ETS_STA ; >; - < "FORECAST.ETS.STAT.MULT" ; SC_OPCODE_FORECAST_ETS_STM ; >; - < "FORECAST.LINEAR" ; SC_OPCODE_FORECAST_LIN ; >; - < "CHIINV" ; SC_OPCODE_CHI_INV ; >; - < "CHISQ.INV.RT" ; SC_OPCODE_CHI_INV_MS ; >; - < "GAMMADIST" ; SC_OPCODE_GAMMA_DIST ; >; - < "GAMMA.DIST" ; SC_OPCODE_GAMMA_DIST_MS ; >; - < "GAMMAINV" ; SC_OPCODE_GAMMA_INV ; >; - < "GAMMA.INV" ; SC_OPCODE_GAMMA_INV_MS ; >; - < "TINV" ; SC_OPCODE_T_INV ; >; - < "T.INV.2T" ; SC_OPCODE_T_INV_2T ; >; - < "T.INV" ; SC_OPCODE_T_INV_MS ; >; - < "FINV" ; SC_OPCODE_F_INV ; >; - < "F.INV" ; SC_OPCODE_F_INV_LT ; >; - < "F.INV.RT" ; SC_OPCODE_F_INV_RT ; >; - < "CHITEST" ; SC_OPCODE_CHI_TEST ; >; - < "CHISQ.TEST" ; SC_OPCODE_CHI_TEST_MS ; >; - < "LOGINV" ; SC_OPCODE_LOG_INV ; >; - < "LOGNORM.INV" ; SC_OPCODE_LOG_INV_MS ; >; - < "MULTIPLE.OPERATIONS" ; SC_OPCODE_TABLE_OP ; >; - < "BETADIST" ; SC_OPCODE_BETA_DIST ; >; - < "BETAINV" ; SC_OPCODE_BETA_INV ; >; - < "BETA.DIST" ; SC_OPCODE_BETA_DIST_MS ; >; - < "BETA.INV" ; SC_OPCODE_BETA_INV_MS ; >; - < "WEEKNUM" ; SC_OPCODE_WEEK ; >; - < "ISOWEEKNUM" ; SC_OPCODE_ISOWEEKNUM ; >; - < "WEEKNUM_OOO" ; SC_OPCODE_WEEKNUM_OOO ; >; - < "EASTERSUNDAY" ; SC_OPCODE_EASTERSUNDAY ; >; - < "WEEKDAY" ; SC_OPCODE_GET_DAY_OF_WEEK ; >; - < "NETWORKDAYS" ; SC_OPCODE_NETWORKDAYS ; >; - < "NETWORKDAYS.INTL" ; SC_OPCODE_NETWORKDAYS_MS ; >; - < "WORKDAY.INTL" ; SC_OPCODE_WORKDAY_MS ; >; - < "#NAME!" ; SC_OPCODE_NO_NAME ; >; - < "STYLE" ; SC_OPCODE_STYLE ; >; - < "DDE" ; SC_OPCODE_DDE ; >; - < "BASE" ; SC_OPCODE_BASE ; >; - < "DECIMAL" ; SC_OPCODE_DECIMAL ; >; - < "CONVERT_OOO" ; SC_OPCODE_CONVERT_OOO ; >; - < "ROMAN" ; SC_OPCODE_ROMAN ; >; - < "HYPERLINK" ; SC_OPCODE_HYPERLINK ; >; - < "INFO" ; SC_OPCODE_INFO ; >; - < "BAHTTEXT" ; SC_OPCODE_BAHTTEXT ; >; - < "GETPIVOTDATA" ; SC_OPCODE_GET_PIVOT_DATA ; >; - < "EUROCONVERT" ; SC_OPCODE_EUROCONVERT ; >; - < "NUMBERVALUE" ; SC_OPCODE_NUMBERVALUE ; >; - < "GAMMA" ; SC_OPCODE_GAMMA ; >; - < "CHISQDIST" ; SC_OPCODE_CHISQ_DIST ; >; - < "CHISQ.DIST" ; SC_OPCODE_CHISQ_DIST_MS ; >; - < "CHISQINV" ; SC_OPCODE_CHISQ_INV ; >; - < "CHISQ.INV" ; SC_OPCODE_CHISQ_INV_MS ; >; - < "BITAND" ; SC_OPCODE_BITAND ; >; - < "BITOR" ; SC_OPCODE_BITOR ; >; - < "BITXOR" ; SC_OPCODE_BITXOR ; >; - < "BITRSHIFT" ; SC_OPCODE_BITRSHIFT ; >; - < "BITLSHIFT" ; SC_OPCODE_BITLSHIFT ; >; - /* BEGIN defined ERROR.TYPE() values. */ - /* ERROR.TYPE( #NULL! ) == 1 */ - < "#NULL!" ; SC_OPCODE_ERROR_NULL ; >; - /* ERROR.TYPE( #DIV/0! ) == 2 */ - < "#DIV/0!" ; SC_OPCODE_ERROR_DIVZERO ; >; - /* ERROR.TYPE( #VALUE! ) == 3 */ - < "#VALUE!" ; SC_OPCODE_ERROR_VALUE ; >; - /* ERROR.TYPE( #REF! ) == 4 */ - < "#REF!" ; SC_OPCODE_ERROR_REF ; >; - /* ERROR.TYPE( #NAME! ) == 5 */ - < "#NAME?" ; SC_OPCODE_ERROR_NAME ; >; - /* ERROR.TYPE( #NUM! ) == 6 */ - < "#NUM!" ; SC_OPCODE_ERROR_NUM ; >; - /* ERROR.TYPE( #N/A ) == 7 */ - < "#N/A" ; SC_OPCODE_ERROR_NA ; >; - /* END defined ERROR.TYPE() values. */ - - < "FILTERXML" ; SC_OPCODE_FILTERXML ; >; - < "COLOR" ; SC_OPCODE_COLOR ; >; - < "WEBSERVICE" ; SC_OPCODE_WEBSERVICE ; >; - < "ERF.PRECISE" ; SC_OPCODE_ERF_MS ; >; - < "ERFC.PRECISE" ; SC_OPCODE_ERFC_MS ; >; - < "ENCODEURL" ; SC_OPCODE_ENCODEURL ; >; - < "RAWSUBTRACT" ; SC_OPCODE_RAWSUBTRACT ; >; - < "ROUNDSIG" ; SC_OPCODE_ROUNDSIG; >; - }; -}; - -StringArray RID_STRLIST_FUNCTION_NAMES_SYMBOLS -{ - ItemList = - { - < "(" ; SC_OPCODE_OPEN ; >; - < ")" ; SC_OPCODE_CLOSE ; >; - < "[" ; SC_OPCODE_TABLE_REF_OPEN ; >; - < "]" ; SC_OPCODE_TABLE_REF_CLOSE ; >; - < "{" ; SC_OPCODE_ARRAY_OPEN ; >; - < "}" ; SC_OPCODE_ARRAY_CLOSE ; >; - < "|" ; SC_OPCODE_ARRAY_ROW_SEP ; >; - < ";" ; SC_OPCODE_ARRAY_COL_SEP ; >; - < ";" ; SC_OPCODE_SEP ; >; - < "%" ; SC_OPCODE_PERCENT_SIGN ; >; - < "+" ; SC_OPCODE_ADD ; >; - < "-" ; SC_OPCODE_SUB ; >; - < "*" ; SC_OPCODE_MUL ; >; - < "/" ; SC_OPCODE_DIV ; >; - < "&" ; SC_OPCODE_AMPERSAND ; >; - < "^" ; SC_OPCODE_POW ; >; - < "=" ; SC_OPCODE_EQUAL ; >; - < "<>" ; SC_OPCODE_NOT_EQUAL ; >; - < "<" ; SC_OPCODE_LESS ; >; - < ">" ; SC_OPCODE_GREATER ; >; - < "<=" ; SC_OPCODE_LESS_EQUAL ; >; - < ">=" ; SC_OPCODE_GREATER_EQUAL ; >; - < "!" ; SC_OPCODE_INTERSECT ; >; - < "~" ; SC_OPCODE_UNION ; >; - < ":" ; SC_OPCODE_RANGE ; >; - < "-" ; SC_OPCODE_NEG_SUB ; >; - }; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/formula/source/ui/dlg/formdlgs.hrc b/formula/source/ui/dlg/formdlgs.hrc index 7704ea146e03..1f213864b89e 100644 --- a/formula/source/ui/dlg/formdlgs.hrc +++ b/formula/source/ui/dlg/formdlgs.hrc @@ -17,12 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#define BTN_CANCEL 7 -#define BTN_END 10 -#define ED_FORMULA 17 -#define ED_REF 19 -#define RB_REF 20 - // For tab page #define TP_FUNCTION 1 #define TP_STRUCT 2 diff --git a/formula/source/ui/dlg/formdlgs.src b/formula/source/ui/dlg/formdlgs.src deleted file mode 100644 index d342c1d772c9..000000000000 --- a/formula/source/ui/dlg/formdlgs.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 "formdlgs.hrc" -#include "ForResId.hrc" - -String STR_TITLE1 -{ - Text [ en-US ] = "Function Wizard" ; -}; - -String STR_TITLE2 -{ - Text [ en-US ] = "Function Wizard -" ; -}; - -String STR_END -{ - Text [ en-US ] = "~End" ; -}; -String RID_STR_SHRINK -{ - Text [ en-US ] = "Shrink" ; -}; - -String RID_STR_EXPAND -{ - Text [ en-US ] = "Expand" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index d3a50fd6f0a5..8a1f3a774818 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -52,7 +52,7 @@ #include "structpg.hxx" #include "parawin.hxx" #include "ModuleHelper.hxx" -#include "ForResId.hrc" +#include "strings.hrc" #include #include #include diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx index 466857fabf64..e017a9a6c543 100644 --- a/formula/source/ui/dlg/funcpage.cxx +++ b/formula/source/ui/dlg/funcpage.cxx @@ -25,8 +25,6 @@ #include "formula/IFunctionDescription.hxx" #include "funcpage.hxx" -#include "formdlgs.hrc" -#include "ForResId.hrc" #include "ModuleHelper.hxx" #include #include diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx index 9b218aa09153..e52628d867e6 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -27,7 +27,7 @@ #include "formula/IControlReferenceHandler.hxx" #include "ControlHelper.hxx" #include "ModuleHelper.hxx" -#include "ForResId.hrc" +#include "strings.hrc" #include "bitmaps.hlst" #include "com/sun/star/accessibility/AccessibleRole.hpp" @@ -521,8 +521,8 @@ RefButton::RefButton( vcl::Window* _pParent, WinBits nStyle ) : ImageButton(_pParent, nStyle), aImgRefStart(BitmapEx(RID_BMP_REFBTN1)), aImgRefDone(BitmapEx(RID_BMP_REFBTN2)), - aShrinkQuickHelp( ModuleRes( RID_STR_SHRINK ).toString() ), - aExpandQuickHelp( ModuleRes( RID_STR_EXPAND ).toString() ), + aShrinkQuickHelp( ModuleRes( RID_STR_SHRINK ) ), + aExpandQuickHelp( ModuleRes( RID_STR_EXPAND ) ), pAnyRefDlg( nullptr ), pRefEdit( nullptr ) { diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index 069a104574a0..f066b40e82a5 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -27,7 +27,7 @@ #include "formula/IFunctionDescription.hxx" #include #include "ModuleHelper.hxx" -#include "ForResId.hrc" +#include "strings.hrc" #include "bitmaps.hlst" namespace formula diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx index c4345bb22208..afebc0cba5c8 100644 --- a/formula/source/ui/dlg/structpg.cxx +++ b/formula/source/ui/dlg/structpg.cxx @@ -23,12 +23,10 @@ #include "svtools/treelistentry.hxx" #include "structpg.hxx" -#include "formdlgs.hrc" #include "formula/formdata.hxx" #include "formula/formula.hxx" #include "ModuleHelper.hxx" #include "formula/IFunctionDescription.hxx" -#include "ForResId.hrc" #include "bitmaps.hlst" namespace formula diff --git a/formula/source/ui/inc/ForResId.hrc b/formula/source/ui/inc/ForResId.hrc deleted file mode 100644 index e41d3aecbba4..000000000000 --- a/formula/source/ui/inc/ForResId.hrc +++ /dev/null @@ -1,52 +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 FORMULA_FORRESID_HRC -#define FORMULA_FORRESID_HRC - -#include - -#define RID_PAGE_START RID_FORMULA_START -#define RID_ERRORBOX_START RID_FORMULA_START -#define RID_QUERYBOX_START RID_FORMULA_START -#define RID_TOOLBOX_START RID_FORMULA_START -#define RID_BITMAP_START RID_FORMULA_START -#define RID_IMAGE_START RID_FORMULA_START -#define RID_IMAGELIST_START RID_FORMULA_START -#define RID_MENU_START RID_FORMULA_START -#define RID_STRING_START RID_FORMULA_START -#define RID_UNTYPED_START RID_FORMULA_START -#define RID_WARN_START RID_FORMULA_START -#define RID_CONTROL_START RID_FORMULA_START -#define RID_MISC_START RID_FORMULA_START - -// Dialog Control Id's ----------------------------------------------------------- - -// strings -#define RID_STR_SHRINK (RID_STRING_START + 0) -#define RID_STR_EXPAND (RID_STRING_START + 1) -#define STR_OPTIONAL (RID_STRING_START + 4) -#define STR_REQUIRED (RID_STRING_START + 5) -#define STR_END (RID_STRING_START + 6) -#define STR_TITLE1 (RID_STRING_START + 7) -#define STR_TITLE2 (RID_STRING_START + 8) - -#endif // FORMULA_FORRESID_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/formula/source/ui/inc/ModuleHelper.hxx b/formula/source/ui/inc/ModuleHelper.hxx index 00dca8171167..c5e92847b701 100644 --- a/formula/source/ui/inc/ModuleHelper.hxx +++ b/formula/source/ui/inc/ModuleHelper.hxx @@ -25,8 +25,6 @@ namespace formula { - - //= OModule class OModuleClient; @@ -44,7 +42,7 @@ namespace formula public: /// get the vcl res manager of the module - static ResMgr* getResManager(); + static const std::locale& getResLocale(); protected: /// register a client for the module static void registerClient(); @@ -58,20 +56,10 @@ namespace formula static void ensureImpl(); }; - //= ModuleRes - - /** specialized ResId, using the resource manager provided by the global module - */ - class ModuleRes : public ::ResId - { - public: - ModuleRes(sal_uInt16 _nId) : ResId(_nId, *OModule::getResManager()) { } - }; - + OUString ModuleRes(const char *pId); } // namespace formula - #endif // INCLUDED_FORMULA_SOURCE_UI_INC_MODULEHELPER_HXX diff --git a/formula/source/ui/resource/ModuleHelper.cxx b/formula/source/ui/resource/ModuleHelper.cxx index febf61729092..80636792aa14 100644 --- a/formula/source/ui/resource/ModuleHelper.cxx +++ b/formula/source/ui/resource/ModuleHelper.cxx @@ -26,6 +26,8 @@ #include #include #include +#include +#include #define ENTER_MOD_METHOD() \ ::osl::MutexGuard aGuard(theOModuleMutex::get()); \ @@ -43,34 +45,32 @@ namespace formula */ class OModuleImpl { - std::unique_ptr m_pResources; + std::unique_ptr m_xResources; public: /// ctor OModuleImpl(); /// get the manager for the resources of the module - ResMgr* getResManager(); + const std::locale& getResLocale(); }; OModuleImpl::OModuleImpl() { } - -ResMgr* OModuleImpl::getResManager() +const std::locale& OModuleImpl::getResLocale() { // note that this method is not threadsafe, which counts for the whole class ! - if (!m_pResources) + if (!m_xResources) { // create a manager with a fixed prefix - m_pResources.reset( ResMgr::CreateResMgr("forui") ); + m_xResources.reset(new std::locale(Translate::Create("for", Application::GetSettings().GetUILanguageTag()))); } - return m_pResources.get(); + return *m_xResources; } - //= OModule namespace @@ -81,13 +81,12 @@ namespace sal_Int32 OModule::s_nClients = 0; OModuleImpl* OModule::s_pImpl = nullptr; -ResMgr* OModule::getResManager() +const std::locale& OModule::getResLocale() { ENTER_MOD_METHOD(); - return s_pImpl->getResManager(); + return s_pImpl->getResLocale(); } - void OModule::registerClient() { ::osl::MutexGuard aGuard(theOModuleMutex::get()); @@ -113,6 +112,10 @@ void OModule::ensureImpl() s_pImpl = new OModuleImpl(); } +OUString ModuleRes(const char *pId) +{ + return Translate::get(pId, OModule::getResLocale()); +}; } // namespace formula diff --git a/formula/uiconfig/ui/formuladialog.ui b/formula/uiconfig/ui/formuladialog.ui index 613272bc13ce..992da1afa011 100644 --- a/formula/uiconfig/ui/formuladialog.ui +++ b/formula/uiconfig/ui/formuladialog.ui @@ -19,7 +19,7 @@ end - Array + Array False True True @@ -54,7 +54,7 @@ - << _Back + << _Back False True True @@ -69,7 +69,7 @@ - _Next >> + _Next >> False True True @@ -149,7 +149,7 @@ True False - Functions + Functions False @@ -162,7 +162,7 @@ True False - Structure + Structure 1 @@ -200,7 +200,7 @@ True False end - Function result + Function result True result @@ -341,7 +341,7 @@ False start True - For_mula + For_mula True ed_formula 1 @@ -356,7 +356,7 @@ True False end - Result + Result True formula_result @@ -391,7 +391,7 @@ True - Formula + Formula @@ -440,7 +440,7 @@ True True False - Maximize + Maximize end diff --git a/formula/uiconfig/ui/functionpage.ui b/formula/uiconfig/ui/functionpage.ui index a382836741a4..68d13b0475cf 100644 --- a/formula/uiconfig/ui/functionpage.ui +++ b/formula/uiconfig/ui/functionpage.ui @@ -16,7 +16,7 @@ True False start - _Search + _Search True search @@ -44,7 +44,7 @@ True False start - _Category + _Category True category @@ -60,8 +60,8 @@ False True - Last Used - All + Last Used + All @@ -75,7 +75,7 @@ True False start - _Function + _Function True function diff --git a/formula/uiconfig/ui/parameter.ui b/formula/uiconfig/ui/parameter.ui index 2677c9266e6f..efc394152239 100644 --- a/formula/uiconfig/ui/parameter.ui +++ b/formula/uiconfig/ui/parameter.ui @@ -27,7 +27,7 @@ True 0 0 - Function not known + Function not known True @@ -276,7 +276,7 @@ True True False - Select + Select end @@ -292,7 +292,7 @@ True True False - Select + Select end @@ -308,7 +308,7 @@ True True False - Select + Select end @@ -324,7 +324,7 @@ True True False - Select + Select end diff --git a/formula/uiconfig/ui/structpage.ui b/formula/uiconfig/ui/structpage.ui index b1256231d398..7abdf57e9b6b 100644 --- a/formula/uiconfig/ui/structpage.ui +++ b/formula/uiconfig/ui/structpage.ui @@ -16,7 +16,7 @@ True False start - _Structure + _Structure True struct diff --git a/fpicker/AllLangMoTarget_fps.mk b/fpicker/AllLangMoTarget_fps.mk new file mode 100644 index 000000000000..cd4495b0bc66 --- /dev/null +++ b/fpicker/AllLangMoTarget_fps.mk @@ -0,0 +1,13 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# 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/. + +$(eval $(call gb_AllLangMoTarget_AllLangMoTarget,fps)) + +$(eval $(call gb_AllLangMoTarget_set_polocation,fps,fpicker)) + +# vim: set noet sw=4 ts=4: diff --git a/fpicker/AllLangResTarget_fps_office.mk b/fpicker/AllLangResTarget_fps_office.mk deleted file mode 100644 index 6c21e33d7ad5..000000000000 --- a/fpicker/AllLangResTarget_fps_office.mk +++ /dev/null @@ -1,26 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# -# 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/. -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,fps_office)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,fps_office,fpicker)) - -$(eval $(call gb_AllLangResTarget_add_srs,fps_office,\ - fps_office/res \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,fps_office/res)) - -$(eval $(call gb_SrsTarget_add_files,fps_office/res,\ - fpicker/source/office/OfficeFilePicker.src \ - fpicker/source/office/iodlg.src \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk index 2e7f0a17d42a..d6be222b1f19 100644 --- a/fpicker/Library_fps.mk +++ b/fpicker/Library_fps.mk @@ -18,6 +18,11 @@ $(eval $(call gb_Library_add_nativeres,fps,fps/Fps)) $(eval $(call gb_Library_set_componentfile,fps,fpicker/source/win32/fps)) +$(eval $(call gb_Library_set_include,fps,\ + $$(INCLUDE) \ + -I$(SRCDIR)/fpicker/inc \ +)) + $(eval $(call gb_Library_use_external,fps,boost_headers)) $(eval $(call gb_Library_use_sdk_api,fps)) diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk index e4b7ef53a097..91e875c44ed9 100644 --- a/fpicker/Library_fps_aqua.mk +++ b/fpicker/Library_fps_aqua.mk @@ -12,6 +12,11 @@ $(eval $(call gb_Library_Library,fps_aqua)) $(eval $(call gb_Library_set_componentfile,fps_aqua,fpicker/source/aqua/fps_aqua)) +$(eval $(call gb_Library_set_include,fps_aqua,\ + $$(INCLUDE) \ + -I$(SRCDIR)/fpicker/inc \ +)) + $(eval $(call gb_Library_use_external,fps_aqua,boost_headers)) $(eval $(call gb_Library_use_sdk_api,fps_aqua)) diff --git a/fpicker/Module_fpicker.mk b/fpicker/Module_fpicker.mk index 443d60a65c21..5f4ee86c9c6c 100644 --- a/fpicker/Module_fpicker.mk +++ b/fpicker/Module_fpicker.mk @@ -12,11 +12,11 @@ $(eval $(call gb_Module_Module,fpicker)) $(eval $(call gb_Module_add_targets,fpicker,\ Library_fps_office \ + UIConfig_fps \ )) $(eval $(call gb_Module_add_l10n_targets,fpicker,\ - AllLangResTarget_fps_office \ - UIConfig_fps \ + AllLangMoTarget_fps \ )) ifeq ($(OS),MACOSX) diff --git a/fpicker/source/office/fpsofficeResMgr.hxx b/fpicker/inc/fpsofficeResMgr.hxx similarity index 61% rename from fpicker/source/office/fpsofficeResMgr.hxx rename to fpicker/inc/fpsofficeResMgr.hxx index 0fcbe4cab629..1e7711d670b5 100644 --- a/fpicker/source/office/fpsofficeResMgr.hxx +++ b/fpicker/inc/fpsofficeResMgr.hxx @@ -12,35 +12,32 @@ #include #include #include +#include +#include namespace fpicker { - struct ResMgrHolder + struct ResLocaleHolder { - ResMgr * operator ()() + std::locale* operator ()() { - return ResMgr::CreateResMgr ("fps_office"); + return new std::locale(Translate::Create("fps", Application::GetSettings().GetUILanguageTag())); } - static ResMgr * getOrCreate() + static std::locale* getOrCreate() { return rtl_Instance< - ResMgr, ResMgrHolder, + std::locale, ResLocaleHolder, osl::MutexGuard, osl::GetGlobalMutex >::create ( - ResMgrHolder(), osl::GetGlobalMutex()); + ResLocaleHolder(), osl::GetGlobalMutex()); } }; - - struct SvtResId : public ResId - { - explicit SvtResId (sal_uInt16 nId) : ResId (nId, *ResMgrHolder::getOrCreate()) {} - }; } -inline OUString FpsResId(sal_uInt16 nId) +inline OUString FpsResId(const char* pId) { - return fpicker::SvtResId(nId); -} + return Translate::get(pId, *fpicker::ResLocaleHolder::getOrCreate()); +}; #endif diff --git a/fpicker/inc/strings.hrc b/fpicker/inc/strings.hrc new file mode 100644 index 000000000000..0dc082212e02 --- /dev/null +++ b/fpicker/inc/strings.hrc @@ -0,0 +1,40 @@ +/* -*- 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_VCL_INC_STRINGS_HRC +#define INCLUDED_VCL_INC_STRINGS_HRC + +#define NC_(Context, String) (Context "\004" u8##String) + +#define STR_EXPLORERFILE_OPEN NC_("STR_EXPLORERFILE_OPEN", "Open") +#define STR_EXPLORERFILE_SAVE NC_("STR_EXPLORERFILE_SAVE", "Save as") +#define STR_EXPLORERFILE_BUTTONSAVE NC_("STR_EXPLORERFILE_BUTTONSAVE", "~Save") +#define STR_PATHNAME NC_("STR_PATHNAME", "~Path:") +#define STR_PATHSELECT NC_("STR_PATHSELECT", "Select path") +#define STR_BUTTONSELECT NC_("STR_BUTTONSELECT", "~Select") +#define STR_PREVIEW NC_("STR_PREVIEW", "File Preview") +#define STR_DEFAULT_DIRECTORY NC_("STR_DEFAULT_DIRECTORY", "My Documents") +#define STR_PLACES_TITLE NC_("STR_PLACES_TITLE", "Places") +#define RID_FILEOPEN_NOTEXISTENTFILE NC_("RID_FILEOPEN_NOTEXISTENTFILE", "The file $name$ does not exist.\nMake sure you have entered the correct file name.") +#define STR_SVT_NEW_FOLDER NC_("STR_SVT_NEW_FOLDER", "Folder") +#define STR_SVT_NOREMOVABLEDEVICE NC_("STR_SVT_NOREMOVABLEDEVICE", "No removable storage device detected.\nMake sure it is plugged in properly and try again.") + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/aqua/resourceprovider.hxx b/fpicker/source/aqua/resourceprovider.hxx index 63fb47e8ad5f..44454c8e0954 100644 --- a/fpicker/source/aqua/resourceprovider.hxx +++ b/fpicker/source/aqua/resourceprovider.hxx @@ -38,18 +38,10 @@ #define FILE_PICKER_FILE_TYPE 504 #define FILE_PICKER_OVERWRITE 505 -class CResourceProvider_Impl; - class CResourceProvider { public: - CResourceProvider( ); - ~CResourceProvider( ); - NSString* getResString( sal_Int32 aId ); - -private: - std::unique_ptr m_pImpl; }; #endif diff --git a/fpicker/source/aqua/resourceprovider.mm b/fpicker/source/aqua/resourceprovider.mm index f1c9023a1cfd..6942d0fe9fda 100644 --- a/fpicker/source/aqua/resourceprovider.mm +++ b/fpicker/source/aqua/resourceprovider.mm @@ -23,27 +23,29 @@ #include #include #include -#include +#include #include #include #include #include -#include #include "NSString_OOoAdditions.hxx" - +#include "fpsofficeResMgr.hxx" #include "resourceprovider.hxx" using rtl::OUString; using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds; using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds; -static const char* const RES_NAME = "fps_office"; -static const char* const OTHER_RES_NAME = "svt"; - // we have to translate control ids to resource ids struct Entry +{ + sal_Int32 ctrlId; + const char* resId; +}; + +struct OldEntry { sal_Int32 ctrlId; sal_Int16 resId; @@ -64,110 +66,48 @@ Entry const CtrlIdToResIdTable[] = { { FOLDERPICKER_TITLE, STR_SVT_FOLDERPICKER_DEFAULT_TITLE }, { FOLDER_PICKER_DEF_DESCRIPTION, STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION }, { FILE_PICKER_OVERWRITE, STR_SVT_ALREADYEXISTOVERWRITE }, - { LISTBOX_FILTER_LABEL, STR_SVT_FILEPICKER_FILTER_TITLE} -}; - -Entry const OtherCtrlIdToResIdTable[] = { + { LISTBOX_FILTER_LABEL, STR_SVT_FILEPICKER_FILTER_TITLE}, { FILE_PICKER_TITLE_OPEN, STR_FILEDLG_OPEN }, { FILE_PICKER_TITLE_SAVE, STR_FILEDLG_SAVE }, { FILE_PICKER_FILE_TYPE, STR_FILEDLG_TYPE } }; const sal_Int32 SIZE_TABLE = SAL_N_ELEMENTS( CtrlIdToResIdTable ); -const sal_Int32 OTHER_SIZE_TABLE = SAL_N_ELEMENTS( OtherCtrlIdToResIdTable ); -sal_Int16 CtrlIdToResId( sal_Int32 aControlId ) +const char* CtrlIdToResId(sal_Int32 aControlId) { - sal_Int16 aResId = -1; + const char *pResId = nullptr; for ( sal_Int32 i = 0; i < SIZE_TABLE; i++ ) { if ( CtrlIdToResIdTable[i].ctrlId == aControlId ) { - aResId = CtrlIdToResIdTable[i].resId; + pResId = CtrlIdToResIdTable[i].resId; break; } } - return aResId; + return pResId; } -sal_Int16 OtherCtrlIdToResId( sal_Int32 aControlId ) +namespace CResourceProvider_Impl { - sal_Int16 aResId = -1; - - for ( sal_Int32 i = 0; i < OTHER_SIZE_TABLE; i++ ) - { - if ( OtherCtrlIdToResIdTable[i].ctrlId == aControlId ) - { - aResId = OtherCtrlIdToResIdTable[i].resId; - break; - } - } - - return aResId; -} - -class CResourceProvider_Impl -{ -public: - CResourceProvider_Impl( ) - { - m_ResMgr = ResMgr::CreateResMgr( RES_NAME ); - m_OtherResMgr = ResMgr::CreateResMgr( OTHER_RES_NAME ); - } - - ~CResourceProvider_Impl( ) - { - delete m_ResMgr; - delete m_OtherResMgr; - } - - NSString* getResString( sal_Int16 aId ) + NSString* getResString(sal_Int16 aId) { OUString aResString; - const SolarMutexGuard aGuard; - - try - { - OSL_ASSERT( m_ResMgr && m_OtherResMgr ); - - // translate the control id to a resource id - sal_Int16 aResId = CtrlIdToResId( aId ); - if ( aResId > -1 ) - aResString = ResId( aResId, *m_ResMgr ); - else - { - aResId = OtherCtrlIdToResId( aId ); - if ( aResId > -1 ) { - aResString = ResId( aResId, *m_OtherResMgr ); - } - } - } - catch(...) - { - } + // translate the control id to a resource id + const char* pResId = CtrlIdToResId(aId); + if (pResId) + aResString = FpsResId(pResId); return [NSString stringWithOUString:aResString]; } - -public: - ResMgr* m_ResMgr; - ResMgr* m_OtherResMgr; }; -CResourceProvider::CResourceProvider( ) : - m_pImpl( o3tl::make_unique() ) -{ -} - -CResourceProvider::~CResourceProvider( ) -{} - NSString* CResourceProvider::getResString( sal_Int32 aId ) { - NSString* sImmutable = m_pImpl->getResString( aId ); + NSString* sImmutable = CResourceProvider_Impl::getResString(aId); NSMutableString *sMutableString = [NSMutableString stringWithString:sImmutable]; [sMutableString replaceOccurrencesOfString:@"~" withString:@"" options:0 range:NSMakeRange(0, [sMutableString length])]; diff --git a/fpicker/source/office/OfficeFilePicker.hrc b/fpicker/source/office/OfficeFilePicker.hrc deleted file mode 100644 index c61593f4193f..000000000000 --- a/fpicker/source/office/OfficeFilePicker.hrc +++ /dev/null @@ -1,19 +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/. - */ -#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_OFFICEFILEPICKER_HRC -#define INCLUDED_FPICKER_SOURCE_OFFICE_OFFICEFILEPICKER_HRC - -#include - -#define STR_SVT_NEW_FOLDER (RID_FPICKER_START+19) -#define RID_FILEOPEN_NOTEXISTENTFILE (RID_FPICKER_START+24) -#define STR_SVT_NOREMOVABLEDEVICE (RID_FPICKER_START+25) - -#endif -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/OfficeFilePicker.src b/fpicker/source/office/OfficeFilePicker.src deleted file mode 100644 index 4f6fe4b764b9..000000000000 --- a/fpicker/source/office/OfficeFilePicker.src +++ /dev/null @@ -1,92 +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 "OfficeFilePicker.hrc" - -String STR_SVT_FILEPICKER_AUTO_EXTENSION -{ - Text [ en-US ] = "~Automatic file name extension" ; -}; - -String STR_SVT_FILEPICKER_PASSWORD -{ - Text [ en-US ] = "Save with pass~word" ; -}; - -String STR_SVT_FILEPICKER_FILTER_OPTIONS -{ - Text [ en-US ] = "~Edit filter settings"; -}; - -String STR_SVT_FILEPICKER_READONLY -{ - Text [ en-US ] = "~Read-only" ; -}; - -String STR_SVT_FILEPICKER_INSERT_AS_LINK -{ - Text [ en-US ] = "~Link" ; -}; - -String STR_SVT_FILEPICKER_SHOW_PREVIEW -{ - Text [ en-US ] = "Pr~eview" ; -}; - -String STR_SVT_FILEPICKER_PLAY -{ - Text [ en-US ] = "~Play" ; -}; - -String STR_SVT_FILEPICKER_VERSION -{ - Text [ en-US ] = "~Version:"; -}; - -String STR_SVT_FILEPICKER_TEMPLATES -{ - Text [ en-US ] = "S~tyles:" ; -}; - -String STR_SVT_FILEPICKER_IMAGE_TEMPLATE -{ - Text [ en-US ] = "Style:"; -}; - -String STR_SVT_FILEPICKER_SELECTION -{ - Text [ en-US ] = "~Selection" ; -}; - -String STR_SVT_FILEPICKER_FILTER_TITLE -{ - Text [ en-US ] = "File ~type:" ; -}; - -String STR_SVT_FOLDERPICKER_DEFAULT_TITLE -{ - Text [ en-US ] = "Select Path" ; -}; - -String STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION -{ - Text [ en-US ] = "Please select a folder."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx index f42a0440154a..c0bbc68235eb 100644 --- a/fpicker/source/office/PlacesListBox.cxx +++ b/fpicker/source/office/PlacesListBox.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include +#include #include #include diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx index 36dbe624ccb1..1b92732e3239 100644 --- a/fpicker/source/office/RemoteFilesDialog.hxx +++ b/fpicker/source/office/RemoteFilesDialog.hxx @@ -20,12 +20,11 @@ #include #include -#include #include #include -#include +#include #include #include #include @@ -42,9 +41,8 @@ #include "fpdialogbase.hxx" #include "fpsofficeResMgr.hxx" -#include "OfficeFilePicker.hrc" #include "QueryFolderName.hxx" -#include "iodlg.hrc" +#include "strings.hrc" using namespace ::com::sun::star::beans; using namespace ::com::sun::star::task; diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index df21d5f00d7f..3415f2e2d06c 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -42,10 +42,10 @@ #include "svtools/treelistentry.hxx" #include +#include "fpicker/fpicker.hrc" #include "svtools/helpid.hrc" -#include -#include "OfficeFilePicker.hrc" -#include "iodlg.hrc" +#include +#include "strings.hrc" #include "bitmaps.hlst" #include "asyncfilepicker.hxx" #include "iodlgimp.hxx" @@ -646,26 +646,26 @@ void SvtFileDialog::Init_Impl AddControls_Impl( ); // adjust the labels to the mode - sal_uInt16 nResId = STR_EXPLORERFILE_OPEN; - sal_uInt16 nButtonResId = 0; + const char* pResId = STR_EXPLORERFILE_OPEN; + const char* pButtonResId = nullptr; if ( nStyle & PickerFlags::SaveAs ) { - nResId = STR_EXPLORERFILE_SAVE; - nButtonResId = STR_EXPLORERFILE_BUTTONSAVE; + pResId = STR_EXPLORERFILE_SAVE; + pButtonResId = STR_EXPLORERFILE_BUTTONSAVE; } if ( nStyle & PickerFlags::PathDialog ) { pImpl->_pFtFileName->SetText( FpsResId( STR_PATHNAME ) ); - nResId = STR_PATHSELECT; - nButtonResId = STR_BUTTONSELECT; + pResId = STR_PATHSELECT; + pButtonResId = STR_BUTTONSELECT; } - SetText( FpsResId( nResId ) ); + SetText( FpsResId( pResId ) ); - if ( nButtonResId ) - pImpl->_pBtnFileOpen->SetText( FpsResId( nButtonResId ) ); + if ( pButtonResId ) + pImpl->_pBtnFileOpen->SetText( FpsResId( pButtonResId ) ); if ( FILEDLG_TYPE_FILEDLG != pImpl->_eDlgType ) { diff --git a/fpicker/source/office/iodlg.hrc b/fpicker/source/office/iodlg.hrc deleted file mode 100644 index 467114efb2f9..000000000000 --- a/fpicker/source/office/iodlg.hrc +++ /dev/null @@ -1,38 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_IODLG_HRC -#define INCLUDED_FPICKER_SOURCE_OFFICE_IODLG_HRC - -#include "svtools/helpid.hrc" -#include - -#define STR_EXPLORERFILE_OPEN (RID_FPICKER_START+31) -#define STR_EXPLORERFILE_SAVE (RID_FPICKER_START+32) -#define STR_EXPLORERFILE_BUTTONSAVE (RID_FPICKER_START+33) -#define STR_PATHNAME (RID_FPICKER_START+34) -#define STR_PATHSELECT (RID_FPICKER_START+35) -#define STR_BUTTONSELECT (RID_FPICKER_START+36) -#define STR_PREVIEW (RID_FPICKER_START+38) -#define STR_DEFAULT_DIRECTORY (RID_FPICKER_START+39) -#define STR_PLACES_TITLE (RID_FPICKER_START+40) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src deleted file mode 100644 index 74408ad7aaac..000000000000 --- a/fpicker/source/office/iodlg.src +++ /dev/null @@ -1,101 +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/helpid.hrc" -#include "svtools/svtools.hrc" -#include "iodlg.hrc" -#include "OfficeFilePicker.hrc" - -// strings ******************************************************************* - -String STR_EXPLORERFILE_OPEN -{ - Text [ en-US ] = "Open" ; -}; -String STR_EXPLORERFILE_SAVE -{ - Text [ en-US ] = "Save as" ; -}; -String STR_EXPLORERFILE_BUTTONSAVE -{ - Text [ en-US ] = "~Save" ; -}; -String STR_PATHNAME -{ - Text [ en-US ] = "~Path:" ; -}; -String STR_PATHSELECT -{ - Text [ en-US ] = "Select path" ; -}; -String STR_BUTTONSELECT -{ - Text [ en-US ] = "~Select"; -}; -String STR_PREVIEW -{ - Text [ en-US ] = "File Preview"; -}; -String STR_DEFAULT_DIRECTORY -{ - Text [ en-US ] = "My Documents" ; -}; -String STR_PLACES_TITLE -{ - Text [ en-US ] = "Places" ; -}; - -String RID_FILEOPEN_NOTEXISTENTFILE -{ - Text [ en-US ] = "The file $name$ does not exist.\nMake sure you have entered the correct file name."; -}; - -String STR_FILTERNAME_ALL -{ - Text [ en-US ] = "All files" ; -}; - -String STR_SVT_ALREADYEXISTOVERWRITE -{ - Text [ en-US ] = "A file named \"$filename$\" already exists.\n\nDo you want to replace it?" ; -}; - -String STR_SVT_DELETESERVICE -{ - Text [ en-US ] = "Are you sure you want to delete the service?\n\"$servicename$\"" ; -}; - -String STR_SVT_ROOTLABEL -{ - Text [ en-US ] = "Root" ; -}; - -String STR_SVT_NEW_FOLDER -{ - Text [ en-US ] = "Folder" ; -}; - -String STR_SVT_NOREMOVABLEDEVICE -{ - Text [ en-US ] = "No removable storage device detected.\nMake sure it is plugged in properly and try again." ; -}; - -//******************************************************************** EOF - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index e45764e7782e..9ee48838fc54 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -20,6 +20,7 @@ #include "iodlgimp.hxx" #include "svtools/headbar.hxx" #include +#include #include #include #include @@ -31,45 +32,17 @@ #include "svtools/fileview.hxx" #include "svtools/inettbc.hxx" #include "iodlg.hxx" -#include "iodlg.hrc" +#include "strings.hrc" #include "bitmaps.hlst" #include "svtools/imagemgr.hxx" #include #include "unotools/useroptions.hxx" -#include "rtl/instance.hxx" -#include #include using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::utl; - -// ResMgrHolder / SvtSimpleResId - -namespace -{ - struct ResMgrHolder - { - ResMgr * operator ()() - { - return ResMgr::CreateResMgr ("svl"); - } - static ResMgr * getOrCreate() - { - return rtl_Instance< - ResMgr, ResMgrHolder, - osl::MutexGuard, osl::GetGlobalMutex >::create ( - ResMgrHolder(), osl::GetGlobalMutex()); - } - }; - - struct SvtSimpleResId : public ResId - { - explicit SvtSimpleResId (sal_uInt16 nId) : ResId (nId, *ResMgrHolder::getOrCreate()) {} - }; -} - SvtFileDialogFilter_Impl::SvtFileDialogFilter_Impl( const OUString& rName, const OUString& rType ) :m_aName( rName ) ,m_aType( rType ) @@ -171,13 +144,13 @@ void SvtUpButton_Impl::FillURLMenu( PopupMenu* _pMenu ) if ( nCount == 1 ) { // adjust the title of the top level entry (the workspace) - _pMenu->SetItemText( --nItemId, SvtSimpleResId(STR_SVT_MIMETYPE_CNT_FSYSBOX).toString() ); + std::locale loc = Translate::Create("svl", Application::GetSettings().GetUILanguageTag()); + _pMenu->SetItemText(--nItemId, Translate::get(STR_SVT_MIMETYPE_CNT_FSYSBOX, loc)); } --nCount; } } - void SvtUpButton_Impl::Select() { sal_uInt16 nId = GetCurItemId(); diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx index e7a6697d4fb8..c3ce95a8054b 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx @@ -491,9 +491,9 @@ static const ::sal_Int32 GROUP_IMAGETEMPLATE = 3; static const ::sal_Int32 GROUP_CHECKBOXES = 4; -static void setLabelToControl(CResourceProvider& rResourceProvider, TFileDialogCustomize iCustom, sal_uInt16 nControlId) +static void setLabelToControl(TFileDialogCustomize iCustom, sal_uInt16 nControlId) { - OUString aLabel = rResourceProvider.getResString(nControlId); + OUString aLabel = CResourceProvider::getResString(nControlId); aLabel = SOfficeToWindowsLabel(aLabel); iCustom->SetControlLabel(nControlId, reinterpret_cast(aLabel.getStr()) ); } @@ -577,42 +577,42 @@ void VistaFilePickerImpl::impl_sta_enableFeatures(::sal_Int32 nFeatures, ::sal_I { nControlId = css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION; iCustom->AddCheckButton (nControlId, L"Auto Extension", true); - setLabelToControl(m_ResProvider, iCustom, nControlId); + setLabelToControl(iCustom, nControlId); } if ((nFeatures & FEATURE_PASSWORD) == FEATURE_PASSWORD) { nControlId = css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_PASSWORD; iCustom->AddCheckButton (nControlId, L"Password", false); - setLabelToControl(m_ResProvider, iCustom, nControlId); + setLabelToControl(iCustom, nControlId); } if ((nFeatures & FEATURE_READONLY) == FEATURE_READONLY) { nControlId = css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_READONLY; iCustom->AddCheckButton (nControlId, L"Readonly", false); - setLabelToControl(m_ResProvider, iCustom, nControlId); + setLabelToControl(iCustom, nControlId); } if ((nFeatures & FEATURE_FILTEROPTIONS) == FEATURE_FILTEROPTIONS) { nControlId = css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_FILTEROPTIONS; iCustom->AddCheckButton (nControlId, L"Filter Options", false); - setLabelToControl(m_ResProvider, iCustom, nControlId); + setLabelToControl(iCustom, nControlId); } if ((nFeatures & FEATURE_LINK) == FEATURE_LINK) { nControlId = css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_LINK; iCustom->AddCheckButton (nControlId, L"Link", false); - setLabelToControl(m_ResProvider, iCustom, nControlId); + setLabelToControl(iCustom, nControlId); } if ((nFeatures & FEATURE_SELECTION) == FEATURE_SELECTION) { nControlId = css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_SELECTION; iCustom->AddCheckButton (nControlId, L"Selection", false); - setLabelToControl(m_ResProvider, iCustom, nControlId); + setLabelToControl(iCustom, nControlId); } /* can be ignored ... new COM dialog supports preview native now ! diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx index b7ea4de5fc0e..70272ad8c1c0 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx @@ -316,9 +316,6 @@ class VistaFilePickerImpl : private ::cppu::BaseMutex OUString m_sFilename; - - // Resource provider - CResourceProvider m_ResProvider; }; } // namespace vista diff --git a/fpicker/source/win32/folderpicker/MtaFop.cxx b/fpicker/source/win32/folderpicker/MtaFop.cxx index 43908c947020..5e5de9f612c4 100644 --- a/fpicker/source/win32/folderpicker/MtaFop.cxx +++ b/fpicker/source/win32/folderpicker/MtaFop.cxx @@ -138,14 +138,8 @@ CMtaFolderPicker::CMtaFolderPicker( sal_uInt32 Flags ) : m_bi.lpfn = CMtaFolderPicker::FolderPickerCallback; m_bi.lParam = reinterpret_cast< LPARAM >( this ); - - // read the default strings for title and - // description from a resource file - - CResourceProvider ResProvider; - - m_dialogTitle = ResProvider.getResString(FOLDERPICKER_TITLE); - m_Description = ResProvider.getResString(FOLDER_PICKER_DEF_DESCRIPTION); + m_dialogTitle = CResourceProvider::getResString(FOLDERPICKER_TITLE); + m_Description = CResourceProvider::getResString(FOLDER_PICKER_DEF_DESCRIPTION); // signals that the thread was successfully set up m_hEvtThrdReady = CreateEventA( diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/misc/resourceprovider.cxx index 12a733ec01d1..118d7ab932f5 100644 --- a/fpicker/source/win32/misc/resourceprovider.cxx +++ b/fpicker/source/win32/misc/resourceprovider.cxx @@ -25,13 +25,14 @@ #include #include "resourceprovider.hxx" #include -#include +#include #include #include -#include +#include #include #include +#include "fpsofficeResMgr.hxx" using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds; using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds; @@ -44,7 +45,7 @@ using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds; struct Entry { sal_Int32 ctrlId; - sal_Int16 resId; + const char* resId; }; Entry const CtrlIdToResIdTable[] = { @@ -65,68 +66,33 @@ Entry const CtrlIdToResIdTable[] = { const sal_Int32 SIZE_TABLE = SAL_N_ELEMENTS( CtrlIdToResIdTable ); -sal_Int16 CtrlIdToResId( sal_Int32 aControlId ) +const char* CtrlIdToResId( sal_Int32 aControlId ) { - sal_Int16 aResId = -1; + const char* pResId = nullptr; for ( sal_Int32 i = 0; i < SIZE_TABLE; i++ ) { if ( CtrlIdToResIdTable[i].ctrlId == aControlId ) { - aResId = CtrlIdToResIdTable[i].resId; + pResId = CtrlIdToResIdTable[i].resId; break; } } - return aResId; + return pResId; } -class CResourceProvider_Impl +namespace CResourceProvider { -public: - - - CResourceProvider_Impl( ) - { - const SolarMutexGuard aGuard; - m_ResMgr = o3tl::make_unique( - "fps_office", Application::GetSettings().GetUILanguageTag()); - } - OUString getResString( sal_Int16 aId ) { OUString aResOUString; - - try - { - // translate the control id to a resource id - sal_Int16 aResId = CtrlIdToResId( aId ); - - if ( aResId > -1 ) - aResOUString = m_ResMgr->ReadString( aResId ); - } - catch(...) - { - } - + // translate the control id to a resource id + const char *pResId = CtrlIdToResId(aId); + if (pResId) + aResOUString = FpsResId(pResId); return aResOUString; } - -public: - std::unique_ptr m_ResMgr; -}; - -CResourceProvider::CResourceProvider( ) : - m_pImpl( o3tl::make_unique() ) -{ -} - -CResourceProvider::~CResourceProvider( ) -{} - -OUString CResourceProvider::getResString( sal_Int16 aId ) -{ - return m_pImpl->getResString( aId ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/win32/misc/resourceprovider.hxx b/fpicker/source/win32/misc/resourceprovider.hxx index 8d515cbeb20b..a611d1aaf195 100644 --- a/fpicker/source/win32/misc/resourceprovider.hxx +++ b/fpicker/source/win32/misc/resourceprovider.hxx @@ -29,18 +29,9 @@ #include -class CResourceProvider_Impl; - -class CResourceProvider +namespace CResourceProvider { -public: - CResourceProvider( ); - ~CResourceProvider( ); - - OUString getResString( sal_Int16 aId ); - -private: - std::unique_ptr m_pImpl; + OUString getResString(sal_Int16 aId); }; #endif diff --git a/fpicker/uiconfig/ui/explorerfiledialog.ui b/fpicker/uiconfig/ui/explorerfiledialog.ui index 04c4f824d692..58b268fcc423 100644 --- a/fpicker/uiconfig/ui/explorerfiledialog.ui +++ b/fpicker/uiconfig/ui/explorerfiledialog.ui @@ -1,6 +1,6 @@ - + @@ -69,16 +69,16 @@ - Servers... + Servers... False True True True True - Connect To Server + Connect To Server - Connect To Server + Connect To Server @@ -110,10 +110,10 @@ True True True - Create New Folder + Create New Folder - Create New Folder + Create New Folder @@ -249,7 +249,7 @@ True False end - File _name: + File _name: True file_name @@ -274,7 +274,7 @@ True False end - File _type: + File _type: True file_type @@ -370,7 +370,7 @@ - _Read-only + _Read-only False True False @@ -394,7 +394,7 @@ 12 - Save with password + Save with password False True False @@ -408,7 +408,7 @@ - _Automatic file name extension + _Automatic file name extension False True False @@ -423,7 +423,7 @@ - Edit _filter settings + Edit _filter settings False True False diff --git a/fpicker/uiconfig/ui/foldernamedialog.ui b/fpicker/uiconfig/ui/foldernamedialog.ui index d6e171203366..11fb27a728c5 100644 --- a/fpicker/uiconfig/ui/foldernamedialog.ui +++ b/fpicker/uiconfig/ui/foldernamedialog.ui @@ -1,10 +1,10 @@ - + False 6 - Folder Name ? + Folder Name ? dialog @@ -81,7 +81,7 @@ True False - Na_me + Na_me True entry @@ -112,7 +112,7 @@ True False - Create New Folder + Create New Folder diff --git a/fpicker/uiconfig/ui/remotefilesdialog.ui b/fpicker/uiconfig/ui/remotefilesdialog.ui index bcb3cd2a6013..5b1b736424a7 100644 --- a/fpicker/uiconfig/ui/remotefilesdialog.ui +++ b/fpicker/uiconfig/ui/remotefilesdialog.ui @@ -1,6 +1,6 @@ - + True @@ -15,7 +15,7 @@ False 6 - Remote Files + Remote Files dialog @@ -102,7 +102,7 @@ True False - Service: + Service: @@ -129,7 +129,7 @@ - Add service + Add service True True True @@ -174,7 +174,7 @@ True True True - List view + List view image2 @@ -189,7 +189,7 @@ True True True - Icon view + Icon view image1 @@ -207,7 +207,7 @@ True True True - Create New Folder + Create New Folder 6 @@ -252,7 +252,7 @@ True False - Filter + Filter 0 @@ -264,7 +264,7 @@ True False - File name + File name 0 @@ -315,7 +315,7 @@ True False - _Edit service + _Edit service True @@ -323,7 +323,7 @@ True False - _Delete service + _Delete service True @@ -331,7 +331,7 @@ True False - _Change password + _Change password True diff --git a/framework/AllLangMoTarget_fwk.mk b/framework/AllLangMoTarget_fwk.mk new file mode 100644 index 000000000000..cbeff181bd57 --- /dev/null +++ b/framework/AllLangMoTarget_fwk.mk @@ -0,0 +1,13 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# 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/. + +$(eval $(call gb_AllLangMoTarget_AllLangMoTarget,fwk)) + +$(eval $(call gb_AllLangMoTarget_set_polocation,fwk,framework)) + +# vim: set noet sw=4 ts=4: diff --git a/framework/AllLangResTarget_fwe.mk b/framework/AllLangResTarget_fwe.mk deleted file mode 100644 index 7a8726d3cf7a..000000000000 --- a/framework/AllLangResTarget_fwe.mk +++ /dev/null @@ -1,49 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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 . -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,fwe)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,fwe,framework)) - -$(eval $(call gb_AllLangResTarget_add_srs,fwe,\ - fwe/fwk_classes \ -)) - - -$(eval $(call gb_SrsTarget_SrsTarget,fwe/fwk_classes)) - -$(eval $(call gb_SrsTarget_set_include,fwe/fwk_classes,\ - $$(INCLUDE) \ - -I$(SRCDIR)/framework/inc \ - -I$(SRCDIR)/framework/inc/classes \ -)) - -$(eval $(call gb_SrsTarget_add_files,fwe/fwk_classes,\ - framework/source/classes/resource.src \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,fwe/fwk_services)) - -$(eval $(call gb_SrsTarget_set_include,fwe/fwk_services,\ - $$(INCLUDE) \ - -I$(SRCDIR)/framework/inc \ - -I$(SRCDIR)/framework/inc/services \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk index 2931e52e0ca7..52d53fcc79fd 100644 --- a/framework/Library_fwe.mk +++ b/framework/Library_fwe.mk @@ -81,7 +81,4 @@ $(eval $(call gb_Library_add_exception_objects,fwe,\ framework/source/services/dispatchhelper \ )) -# Runtime dependency for unit-tests -$(eval $(call gb_Library_use_restarget,fwe,fwe)) - # vim: set noet sw=4 ts=4: diff --git a/framework/Module_framework.mk b/framework/Module_framework.mk index f048989ad63c..93ac5e79618f 100644 --- a/framework/Module_framework.mk +++ b/framework/Module_framework.mk @@ -26,6 +26,7 @@ $(eval $(call gb_Module_add_targets,framework,\ Library_fwl \ Library_fwm \ Package_dtd \ + UIConfig_startmodule \ )) $(eval $(call gb_Module_add_slowcheck_targets,framework,\ @@ -33,8 +34,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,framework,\ )) $(eval $(call gb_Module_add_l10n_targets,framework,\ - AllLangResTarget_fwe \ - UIConfig_startmodule \ + AllLangMoTarget_fwk \ )) ifneq ($(OOO_JUNIT_JAR),) diff --git a/framework/inc/classes/fwkresid.hxx b/framework/inc/classes/fwkresid.hxx index ba54eca5f081..c6606c5271e8 100644 --- a/framework/inc/classes/fwkresid.hxx +++ b/framework/inc/classes/fwkresid.hxx @@ -20,21 +20,10 @@ #ifndef INCLUDED_FRAMEWORK_INC_CLASSES_FWKRESID_HXX #define INCLUDED_FRAMEWORK_INC_CLASSES_FWKRESID_HXX -#include #include +#include -namespace framework -{ - -class FWE_DLLPUBLIC FwkResId : public ResId -{ - public: - FwkResId( sal_uInt16 nId ); - - static ResMgr* GetResManager(); -}; - -} +FWE_DLLPUBLIC OUString FwkResId(const char* pId); #endif // __FRAMEWORK_CLASSES_FWKRESID diff --git a/framework/inc/classes/resource.hrc b/framework/inc/classes/resource.hrc deleted file mode 100644 index 72a45931b048..000000000000 --- a/framework/inc/classes/resource.hrc +++ /dev/null @@ -1,67 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_FRAMEWORK_INC_CLASSES_RESOURCE_HRC -#define INCLUDED_FRAMEWORK_INC_CLASSES_RESOURCE_HRC - -#define RID_STR_START 2000 -#define RID_MENU_START 10000 -#define RID_IMAGE_START 15000 - -#define STR_MENU_HEADFOOTALL (RID_STR_START+2) -#define STR_UPDATEDOC (RID_STR_START+3) -#define STR_CLOSEDOC_ANDRETURN (RID_STR_START+4) -#define STR_SAVECOPYDOC (RID_STR_START+5) -#define STR_NODOCUMENT (RID_STR_START+6) -#define STR_TOOLBAR_TITLE_ADDON (RID_STR_START+7) - -#define STR_FULL_DISC_RETRY_BUTTON (RID_STR_START+9) // used by AuotSave to show error state: full disc -#define STR_FULL_DISC_MSG (RID_STR_START+10) // used by AuotSave to show error state: full disc -#define STR_RESTORE_TOOLBARS (RID_STR_START+11) -#define STR_CORRUPT_UICFG_SHARE (RID_STR_START+12) -#define STR_CORRUPT_UICFG_USER (RID_STR_START+13) -#define STR_CORRUPT_UICFG_GENERAL (RID_STR_START+14) -#define STR_LANGSTATUS_MULTIPLE_LANGUAGES (RID_STR_START+15) -#define STR_LANGSTATUS_NONE (RID_STR_START+16) -#define STR_LANGSTATUS_MORE (RID_STR_START+17) -#define STR_SET_LANGUAGE_FOR_PARAGRAPH (RID_STR_START+19) -#define STR_UNTITLED_DOCUMENT (RID_STR_START+21) -#define STR_RESET_TO_DEFAULT_LANGUAGE (RID_STR_START+22) -#define STR_CLEAR_RECENT_FILES (RID_STR_START+23) -#define STR_CLEAR_RECENT_FILES_HELP (RID_STR_START+24) -#define STR_LANGSTATUS_HINT (RID_STR_START+25) -#define STR_REMOTE_TITLE (RID_STR_START+26) -#define STR_SAFEMODE_TITLE (RID_STR_START+27) -#define STR_TOOLBAR_VISIBLE_BUTTONS (RID_STR_START+28) -#define STR_TOOLBAR_CUSTOMIZE_TOOLBAR (RID_STR_START+29) -#define STR_TOOLBAR_DOCK_TOOLBAR (RID_STR_START+30) -#define STR_TOOLBAR_DOCK_ALL_TOOLBARS (RID_STR_START+31) -#define STR_TOOLBAR_LOCK_TOOLBAR (RID_STR_START+32) -#define STR_TOOLBAR_CLOSE_TOOLBAR (RID_STR_START+33) - -#define MENUITEM_TOOLBAR_VISIBLEBUTTON 1 -#define MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR 2 -#define MENUITEM_TOOLBAR_DOCKTOOLBAR 3 -#define MENUITEM_TOOLBAR_DOCKALLTOOLBAR 4 -#define MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION 5 -#define MENUITEM_TOOLBAR_CLOSE 6 - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basic/inc/sb.hrc b/framework/inc/classes/resource.hxx similarity index 70% rename from basic/inc/sb.hrc rename to framework/inc/classes/resource.hxx index 12469099cf88..a9f98e607baa 100644 --- a/basic/inc/sb.hrc +++ b/framework/inc/classes/resource.hxx @@ -17,16 +17,15 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_BASIC_INC_SB_HRC -#define INCLUDED_BASIC_INC_SB_HRC +#ifndef INCLUDED_FRAMEWORK_INC_CLASSES_RESOURCE_HXX +#define INCLUDED_FRAMEWORK_INC_CLASSES_RESOURCE_HXX -#include - -#ifndef IDS_SBERR_START - #define IDS_SBERR_START RID_BASIC_START -#endif - -#define IDS_SBERR_TERMINATED IDS_SBERR_START+2000 +#define MENUITEM_TOOLBAR_VISIBLEBUTTON 1 +#define MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR 2 +#define MENUITEM_TOOLBAR_DOCKTOOLBAR 3 +#define MENUITEM_TOOLBAR_DOCKALLTOOLBAR 4 +#define MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION 5 +#define MENUITEM_TOOLBAR_CLOSE 6 #endif diff --git a/framework/inc/pch/precompiled_fwe.hxx b/framework/inc/pch/precompiled_fwe.hxx index 984b6266f5ab..86fb2645b5ff 100644 --- a/framework/inc/pch/precompiled_fwe.hxx +++ b/framework/inc/pch/precompiled_fwe.hxx @@ -206,7 +206,6 @@ #include #include #include -#include #include #include #include @@ -218,7 +217,6 @@ #include #include #include -#include #include #include #include diff --git a/framework/inc/pch/precompiled_fwi.hxx b/framework/inc/pch/precompiled_fwi.hxx index 05a4cac9e5c8..724aa721cc42 100644 --- a/framework/inc/pch/precompiled_fwi.hxx +++ b/framework/inc/pch/precompiled_fwi.hxx @@ -147,7 +147,6 @@ #include #include #include -#include #include #include #include @@ -157,7 +156,6 @@ #include #include #include -#include #include #include #include diff --git a/framework/inc/pch/precompiled_fwk.hxx b/framework/inc/pch/precompiled_fwk.hxx index 5863dbf7d55e..900e1b3c75da 100644 --- a/framework/inc/pch/precompiled_fwk.hxx +++ b/framework/inc/pch/precompiled_fwk.hxx @@ -319,7 +319,6 @@ #include #include #include -#include #include #include #include @@ -343,7 +342,6 @@ #include #include #include -#include #include #include #include diff --git a/framework/inc/pch/precompiled_fwl.hxx b/framework/inc/pch/precompiled_fwl.hxx index 62f2594a632e..2f59e411a3f8 100644 --- a/framework/inc/pch/precompiled_fwl.hxx +++ b/framework/inc/pch/precompiled_fwl.hxx @@ -305,7 +305,6 @@ #include #include #include -#include #include #include #include @@ -326,7 +325,6 @@ #include #include #include -#include #include #include #include diff --git a/framework/inc/strings.hrc b/framework/inc/strings.hrc new file mode 100644 index 000000000000..5a1cdea24093 --- /dev/null +++ b/framework/inc/strings.hrc @@ -0,0 +1,58 @@ +/* -*- 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_FRAMEWORK_INC_STRINGS_HRC +#define INCLUDED_FRAMEWORK_INC_STRINGS_HRC + +#define NC_(Context, String) (Context "\004" u8##String) + +#define STR_MENU_HEADFOOTALL NC_("STR_MENU_HEADFOOTALL", "All" ) +#define STR_UPDATEDOC NC_("STR_UPDATEDOC", "~Update" ) +#define STR_CLOSEDOC_ANDRETURN NC_("STR_CLOSEDOC_ANDRETURN", "~Close & Return to " ) +#define STR_TOOLBAR_VISIBLE_BUTTONS NC_("STR_TOOLBAR_VISIBLE_BUTTONS", "Visible ~Buttons") +#define STR_TOOLBAR_CUSTOMIZE_TOOLBAR NC_("STR_TOOLBAR_CUSTOMIZE_TOOLBAR", "~Customize Toolbar...") +#define STR_TOOLBAR_DOCK_TOOLBAR NC_("STR_TOOLBAR_DOCK_TOOLBAR", "~Dock Toolbar" ) +#define STR_TOOLBAR_DOCK_ALL_TOOLBARS NC_("STR_TOOLBAR_DOCK_ALL_TOOLBARS", "Dock ~All Toolbars" ) +#define STR_TOOLBAR_LOCK_TOOLBAR NC_("STR_TOOLBAR_LOCK_TOOLBAR", "~Lock Toolbar Position" ) +#define STR_TOOLBAR_CLOSE_TOOLBAR NC_("STR_TOOLBAR_CLOSE_TOOLBAR", "Close ~Toolbar" ) +#define STR_SAVECOPYDOC NC_("STR_SAVECOPYDOC", "Save Copy ~as..." ) +#define STR_NODOCUMENT NC_("STR_NODOCUMENT", "No Documents") +#define STR_CLEAR_RECENT_FILES NC_("STR_CLEAR_RECENT_FILES", "Clear List") +#define STR_CLEAR_RECENT_FILES_HELP NC_("STR_CLEAR_RECENT_FILES_HELP", "Clears the list with the most recently opened files. This action can not be undone.") +#define STR_REMOTE_TITLE NC_("STR_REMOTE_TITLE", " (Remote)") +#define STR_SAFEMODE_TITLE NC_("STR_SAFEMODE_TITLE", " (Safe Mode)") +#define STR_TOOLBAR_TITLE_ADDON NC_("STR_TOOLBAR_TITLE_ADDON", "Add-On %num%") +#define STR_FULL_DISC_RETRY_BUTTON NC_("STR_FULL_DISC_RETRY_BUTTON", "Retry" ) +#define STR_FULL_DISC_MSG NC_("STR_FULL_DISC_MSG", "%PRODUCTNAME could not save important internal information due to insufficient free disk space at the following location:\n%PATH\n\nYou will not be able to continue working with %PRODUCTNAME without allocating more free disk space at that location.\n\nPress the 'Retry' button after you have allocated more free disk space to retry saving the data.\n\n" ) +#define STR_RESTORE_TOOLBARS NC_("STR_RESTORE_TOOLBARS", "~Reset" ) +#define STR_CORRUPT_UICFG_SHARE NC_("STR_CORRUPT_UICFG_SHARE", "An error occurred while loading the user interface configuration data. The application will be terminated now.\nPlease try to reinstall the application." ) +#define STR_CORRUPT_UICFG_USER NC_("STR_CORRUPT_UICFG_USER", "An error occurred while loading the user interface configuration data. The application will be terminated now.\nPlease try to remove your user profile for the application." ) +#define STR_CORRUPT_UICFG_GENERAL NC_("STR_CORRUPT_UICFG_GENERAL", "An error occurred while loading the user interface configuration data. The application will be terminated now.\nPlease try to remove your user profile for the application first or try to reinstall the application." ) +#define STR_UNTITLED_DOCUMENT NC_("STR_UNTITLED_DOCUMENT", "Untitled" ) +// To translators: for displaying 'Multiple Languages' in the language statusbar control +#define STR_LANGSTATUS_MULTIPLE_LANGUAGES NC_("STR_LANGSTATUS_MULTIPLE_LANGUAGES", "Multiple Languages" ) +#define STR_LANGSTATUS_NONE NC_("STR_LANGSTATUS_NONE", "None (Do not check spelling)" ) +#define STR_RESET_TO_DEFAULT_LANGUAGE NC_("STR_RESET_TO_DEFAULT_LANGUAGE", "Reset to Default Language" ) +#define STR_LANGSTATUS_MORE NC_("STR_LANGSTATUS_MORE", "More..." ) +#define STR_SET_LANGUAGE_FOR_PARAGRAPH NC_("STR_SET_LANGUAGE_FOR_PARAGRAPH", "Set Language for Paragraph" ) +#define STR_LANGSTATUS_HINT NC_("STR_LANGSTATUS_HINT", "Text Language. Right-click to set character or paragraph language" ) + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index f1126d7c2afd..22519dff34f8 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -21,7 +21,7 @@ #include -#include "classes/resource.hrc" +#include "strings.hrc" #include #include diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src deleted file mode 100644 index 62e7b616b6ff..000000000000 --- a/framework/source/classes/resource.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/. - * - * 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 - -String STR_MENU_HEADFOOTALL -{ - Text [ en-US ] = "All" ; -}; - -String STR_UPDATEDOC -{ - Text [ en-US ] = "~Update" ; -}; - -String STR_CLOSEDOC_ANDRETURN -{ - Text [ en-US ] = "~Close & Return to " ; -}; - -String STR_TOOLBAR_VISIBLE_BUTTONS -{ - Text[ en-US ] = "Visible ~Buttons"; -}; - -String STR_TOOLBAR_CUSTOMIZE_TOOLBAR -{ - Text[ en-US ] = "~Customize Toolbar..."; -}; - -String STR_TOOLBAR_DOCK_TOOLBAR -{ - Text[ en-US ] = "~Dock Toolbar" ; -}; - -String STR_TOOLBAR_DOCK_ALL_TOOLBARS -{ - Text[ en-US ] = "Dock ~All Toolbars" ; -}; - -String STR_TOOLBAR_LOCK_TOOLBAR -{ - Text[ en-US ] = "~Lock Toolbar Position" ; -}; - -String STR_TOOLBAR_CLOSE_TOOLBAR -{ - Text[ en-US ] = "Close ~Toolbar" ; -}; - -String STR_SAVECOPYDOC -{ - Text [ en-US ] = "Save Copy ~as..." ; -}; - -String STR_NODOCUMENT -{ - Text [ en-US ] = "No Documents"; -}; - -String STR_CLEAR_RECENT_FILES -{ - Text [ en-US ] = "Clear List"; -}; - -String STR_CLEAR_RECENT_FILES_HELP -{ - Text [ en-US ] = "Clears the list with the most recently opened files. This action can not be undone."; -}; - -String STR_REMOTE_TITLE -{ - Text [ en-US ] = " (Remote)"; -}; - -String STR_SAFEMODE_TITLE -{ - Text [ en-US ] = " (Safe Mode)"; -}; - -String STR_TOOLBAR_TITLE_ADDON -{ - Text [ en-US ] = "Add-On %num%"; -}; - -String STR_FULL_DISC_RETRY_BUTTON -{ - Text [ en-US ] = "Retry" ; -}; - -String STR_FULL_DISC_MSG -{ - Text [ en-US ] = "%PRODUCTNAME could not save important internal information due to insufficient free disk space at the following location:\n%PATH\n\nYou will not be able to continue working with %PRODUCTNAME without allocating more free disk space at that location.\n\nPress the 'Retry' button after you have allocated more free disk space to retry saving the data.\n\n" ; -}; - -String STR_RESTORE_TOOLBARS -{ - Text [ en-US ] = "~Reset" ; -}; - -String STR_CORRUPT_UICFG_SHARE -{ - Text [ en-US ] = "An error occurred while loading the user interface configuration data. The application will be terminated now.\nPlease try to reinstall the application." ; -}; - -String STR_CORRUPT_UICFG_USER -{ - Text [ en-US ] = "An error occurred while loading the user interface configuration data. The application will be terminated now.\nPlease try to remove your user profile for the application." ; -}; - -String STR_CORRUPT_UICFG_GENERAL -{ - Text [ en-US ] = "An error occurred while loading the user interface configuration data. The application will be terminated now.\nPlease try to remove your user profile for the application first or try to reinstall the application." ; -}; - -String STR_UNTITLED_DOCUMENT -{ - Text [ en-US ] = "Untitled" ; -}; - -// for displaying 'Multiple Languages' in the language statusbar control -String STR_LANGSTATUS_MULTIPLE_LANGUAGES -{ - Text [ en-US ] = "Multiple Languages" ; -}; - -String STR_LANGSTATUS_NONE -{ - Text [ en-US ] = "None (Do not check spelling)" ; -}; - -String STR_RESET_TO_DEFAULT_LANGUAGE -{ - Text [ en-US ] = "Reset to Default Language" ; -}; - -String STR_LANGSTATUS_MORE -{ - Text [ en-US ] = "More..." ; -}; - -String STR_SET_LANGUAGE_FOR_PARAGRAPH -{ - Text [ en-US ] = "Set Language for Paragraph" ; -}; - -String STR_LANGSTATUS_HINT -{ - Text [ en-US ] = "Text Language. Right-click to set character or paragraph language" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/classes/fwkresid.cxx b/framework/source/fwe/classes/fwkresid.cxx index e9a2998629fd..8ed6c1dbb5e5 100644 --- a/framework/source/fwe/classes/fwkresid.cxx +++ b/framework/source/fwe/classes/fwkresid.cxx @@ -24,27 +24,24 @@ #include -namespace framework +namespace { - -ResMgr* FwkResId::GetResManager() -{ - static ResMgr* pResMgr = nullptr; - - if ( !pResMgr ) + const std::locale& GetResLocale() { - SolarMutexGuard aSolarGuard; - pResMgr = ResMgr::CreateResMgr("fwe", Application::GetSettings().GetUILanguageTag()); + static std::locale* pResLocale = nullptr; + if (!pResLocale) + { + SolarMutexGuard aSolarGuard; + static std::locale loc(Translate::Create("fwe", Application::GetSettings().GetUILanguageTag())); + pResLocale = &loc; + } + return *pResLocale; } - - return pResMgr; } -FwkResId::FwkResId( sal_uInt16 nId ) : - ResId( nId, *FwkResId::GetResManager() ) +OUString FwkResId(const char* pId) { -} - + return Translate::get(pId, GetResLocale()); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx index 63fbd191299d..b6f521bfeea9 100644 --- a/framework/source/fwe/helper/titlehelper.cxx +++ b/framework/source/fwe/helper/titlehelper.cxx @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index bbf91371e89e..373b2c73e159 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index d39bb3e90bac..a20435405741 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -23,7 +23,7 @@ #include "helpers.hxx" #include #include -#include +#include #include #include diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index fc33349faebc..b265d616fe1e 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 090c109318d6..f727fbe3f576 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index f497ea01826e..211c9f9e27b3 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -24,7 +24,8 @@ #include "services.h" #include #include -#include +#include +#include #include #include #include diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index 5cd2984fad64..5831e5112ee6 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #include diff --git a/framework/source/uielement/footermenucontroller.cxx b/framework/source/uielement/footermenucontroller.cxx index d139475079bf..0d8ffad400b7 100644 --- a/framework/source/uielement/footermenucontroller.cxx +++ b/framework/source/uielement/footermenucontroller.cxx @@ -20,7 +20,7 @@ #include #include "services.h" -#include +#include #include #include diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index 886bee4fcf83..6a8dedac82fb 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx index 41bf068c7047..3f086d15c337 100644 --- a/framework/source/uielement/headermenucontroller.cxx +++ b/framework/source/uielement/headermenucontroller.cxx @@ -21,7 +21,7 @@ #include "services.h" -#include +#include #include #include diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index 701bdf1902da..e659d5edb5de 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -40,7 +40,7 @@ #include #include -#include +#include #include "helper/mischelper.hxx" #include diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index 6f3daabb5109..e59c32eca8ae 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index 7b54f2aaa911..0f3d972eb776 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -20,7 +20,7 @@ #include #include #include "services.h" -#include +#include #include #include #include diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 0b82b567c855..4c2c5c79ff54 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index adb39d870bf6..d774fecc0ecf 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -20,7 +20,7 @@ #include #include "services.h" -#include +#include #include #include diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index 806af7cfbc16..202f3fa85dc8 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include +#include #include "bitmaps.hlst" #include diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx index 6d3f2deafb5c..763862240844 100644 --- a/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/framework/source/uielement/recentfilesmenucontroller.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include +#include #include #include @@ -37,7 +37,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::frame; using namespace com::sun::star::beans; using namespace com::sun::star::util; -using namespace framework; #define MAX_MENU_ITEMS 99 diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index ae92672d40ec..856c3916f5d9 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -29,7 +29,8 @@ #include "properties.h" #include #include -#include +#include +#include #include #include diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 1b5c451af138..35f12c14d9ad 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -22,7 +22,7 @@ #include #include "services.h" -#include +#include #include #include #include diff --git a/i18nlangtag/Executable_localestr.mk b/i18nlangtag/Executable_localestr.mk new file mode 100644 index 000000000000..99195ffc7b80 --- /dev/null +++ b/i18nlangtag/Executable_localestr.mk @@ -0,0 +1,29 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# +# 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/. +# + +$(eval $(call gb_Executable_Executable,localestr)) + +$(eval $(call gb_Executable_use_api,localestr,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Executable_use_external,localestr,liblangtag)) + +$(eval $(call gb_Executable_use_libraries,localestr,\ + i18nlangtag \ + sal \ +)) + +$(eval $(call gb_Executable_add_exception_objects,localestr,\ + i18nlangtag/source/localestr/localestr \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/i18nlangtag/Module_i18nlangtag.mk b/i18nlangtag/Module_i18nlangtag.mk index edd2e1d2e2a9..0aecbc05ffdb 100644 --- a/i18nlangtag/Module_i18nlangtag.mk +++ b/i18nlangtag/Module_i18nlangtag.mk @@ -10,6 +10,7 @@ $(eval $(call gb_Module_Module,i18nlangtag)) $(eval $(call gb_Module_add_targets,i18nlangtag,\ Library_i18nlangtag \ + Executable_localestr \ )) $(eval $(call gb_Module_add_check_targets,i18nlangtag,\ diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx index 4bf244284289..2da3b95174ed 100644 --- a/i18nlangtag/source/languagetag/languagetag.cxx +++ b/i18nlangtag/source/languagetag/languagetag.cxx @@ -279,6 +279,7 @@ private: OUString getRegion() const; OUString const & getVariants() const; bool hasScript() const; + OUString getGlibcLocaleString() const; void setScriptType(LanguageTag::ScriptType st); LanguageTag::ScriptType getScriptType() const; @@ -1920,6 +1921,25 @@ OUString LanguageTag::getVariants() const return aRet; } +OUString LanguageTagImpl::getGlibcLocaleString() const +{ + OUString sLocale; + if (!mpImplLangtag) + { + meIsLiblangtagNeeded = DECISION_YES; + const_cast(this)->synCanonicalize(); + } + if (mpImplLangtag) + { + char* pLang = lt_tag_convert_to_locale(mpImplLangtag, nullptr); + if (pLang) + { + sLocale = OUString::createFromAscii( pLang); + free(pLang); + } + } + return sLocale; +} OUString LanguageTag::getGlibcLocaleString( const OUString & rEncoding ) const { @@ -1934,16 +1954,16 @@ OUString LanguageTag::getGlibcLocaleString( const OUString & rEncoding ) const } else { - /* FIXME: use the aImplIsoLangGLIBCModifiersEntries table from - * i18nlangtag/source/isolang/isolang.cxx or let liblangtag handle it. - * So far no code was prepared for anything else than a simple - * language_country locale so we don't lose anything here right now. - * */ + aRet = getImpl()->getGlibcLocaleString(); + sal_Int32 nAt = aRet.indexOf('@'); + if (nAt != -1) + aRet = aRet.copy(0, nAt) + rEncoding + aRet.copy(nAt); + else + aRet += rEncoding; } return aRet; } - bool LanguageTagImpl::hasScript() const { if (!mbCachedScript) diff --git a/i18nlangtag/source/localestr/localestr.cxx b/i18nlangtag/source/localestr/localestr.cxx new file mode 100644 index 000000000000..c18531330c51 --- /dev/null +++ b/i18nlangtag/source/localestr/localestr.cxx @@ -0,0 +1,20 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * 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 +#include + +int main(int /*argc*/, char **argv) +{ + LanguageTag aTag(OUString::createFromAscii(argv[1])); + OUString aLocaleStr = aTag.getGlibcLocaleString(""); + printf("%s", aLocaleStr.toUtf8().getStr()); + return 0; +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx b/include/LibreOfficeKit/LibreOfficeKit.hxx index 47da169f5ce5..46a32a406934 100644 --- a/include/LibreOfficeKit/LibreOfficeKit.hxx +++ b/include/LibreOfficeKit/LibreOfficeKit.hxx @@ -227,7 +227,7 @@ public: * @param nY vertical position in document coordinates * @param nCount number of clicks: 1 for single click, 2 for double click * @param nButtons: which mouse buttons: 1 for left, 2 for middle, 4 right - * @param nModifier: which keyboard modifier: (see include/rsc/rsc-vcl-shared-types.hxx for possible values) + * @param nModifier: which keyboard modifier: (see include/vcl/vclenum.hxx for possible values) */ void postMouseEvent(int nType, int nX, int nY, int nCount, int nButtons, int nModifier) { diff --git a/include/basic/basrdll.hxx b/include/basic/basrdll.hxx index 623ec6afcbaf..6c2fc4655122 100644 --- a/include/basic/basrdll.hxx +++ b/include/basic/basrdll.hxx @@ -23,8 +23,6 @@ #include #include -class ResMgr; - class BASIC_DLLPUBLIC BasicDLL { public: @@ -32,10 +30,10 @@ public: std::unique_ptr m_xImpl; public: - BasicDLL(); - ~BasicDLL(); + BasicDLL(); + ~BasicDLL(); - ResMgr* GetBasResMgr() const; + const std::locale& GetBasResLocale() const; static void BasicBreak(); diff --git a/include/basic/sbdef.hxx b/include/basic/sbdef.hxx index 40071031eff2..8df50e07678a 100644 --- a/include/basic/sbdef.hxx +++ b/include/basic/sbdef.hxx @@ -23,6 +23,7 @@ #include #include #include +#include #include // Returns type name for Basic type, array flag is ignored @@ -67,6 +68,8 @@ enum class PropertyMode Set }; +BASIC_DLLPUBLIC const ErrMsgCode* getRID_BASIC_START(); + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/comphelper/officeresourcebundle.hxx b/include/comphelper/officeresourcebundle.hxx deleted file mode 100644 index 8f127d534a28..000000000000 --- a/include/comphelper/officeresourcebundle.hxx +++ /dev/null @@ -1,93 +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_COMPHELPER_OFFICERESOURCEBUNDLE_HXX -#define INCLUDED_COMPHELPER_OFFICERESOURCEBUNDLE_HXX - -#include - -#include -#include - -#include - - -namespace comphelper -{ - - - //= OfficeResourceBundle - - class ResourceBundle_Impl; - /** wraps the css::resource::OfficeResourceAccess service - */ - class COMPHELPER_DLLPUBLIC OfficeResourceBundle - { - private: - ::std::unique_ptr< ResourceBundle_Impl > m_pImpl; - - public: - /** constructs a resource bundle with the resource bundle given as 8-bit ASCII name - - This is a convenience constructor only, it does nothing different than the constructor - taking an unicode string. - - @param _context - the component context to operate in - @param _bundleBaseName - the base name of the resource file which should be accessed (*without* the SUPD!) - @throws css::lang::NullPointerException - if the given component context is - */ - OfficeResourceBundle( - const css::uno::Reference< css::uno::XComponentContext >& _context, - const sal_Char* _bundleBaseAsciiName - ); - - /** destroys the instance - */ - ~OfficeResourceBundle(); - - /** loads the string with the given resource id from the resource bundle - @param _resourceId - the id of the string to load - @return - the requested resource string. If no string with the given id exists in the resource bundle, - an empty string is returned. In a non-product version, an OSL_ENSURE will notify you of this - then. - */ - OUString loadString( sal_Int32 _resourceId ) const; - - /** determines whether the resource bundle has a string with the given id - @param _resourceId - the id of the string whose existence is to be checked - @return - if and only if a string with the given ID exists in the resource - bundle. - */ - bool hasString( sal_Int32 _resourceId ) const; - }; - - -} // namespace comphelper - - -#endif // INCLUDED_COMPHELPER_OFFICERESOURCEBUNDLE_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index 71421453752e..2e364af0f75f 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/include/editeng/editobj.hxx b/include/editeng/editobj.hxx index b9eb96236d9e..68aa86c7c20e 100644 --- a/include/editeng/editobj.hxx +++ b/include/editeng/editobj.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_EDITENG_EDITOBJ_HXX #define INCLUDED_EDITENG_EDITOBJ_HXX -#include +#include #include #include #include diff --git a/include/editeng/editrids.hrc b/include/editeng/editrids.hrc index f88f0d0c00a3..096d119aa002 100644 --- a/include/editeng/editrids.hrc +++ b/include/editeng/editrids.hrc @@ -16,364 +16,308 @@ * 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_EDITENG_EDITRIDS_HRC -#define INCLUDED_EDITENG_EDITRIDS_HRC -#include +#ifndef INCLUDED_INCLUDE_EDITENG_EDITRIDS_HRC +#define INCLUDED_INCLUDE_EDITENG_EDITRIDS_HRC -// strings also used in cui -#define RID_SVXSTR_PAPERBIN_SETTINGS (RID_EDIT_START) -#define RID_SVXSTR_PAPERBIN (RID_EDIT_START + 1) - -#define RID_OUTLUNDO_EXPAND (RID_EDIT_START + 2) -#define RID_OUTLUNDO_COLLAPSE (RID_EDIT_START + 3) -#define RID_OUTLUNDO_ATTR (RID_EDIT_START + 4) -#define RID_OUTLUNDO_INSERT (RID_EDIT_START + 5) -#define RID_OUTLUNDO_DEPTH (RID_EDIT_START + 6) - -// strings for items - -#define RID_SVXITEMS_FRMDIR_BEGIN (RID_EDIT_START + 9) -#define RID_SVXITEMS_FRMDIR_HORI_LEFT_TOP (RID_EDIT_START + 9) -#define RID_SVXITEMS_FRMDIR_HORI_RIGHT_TOP (RID_EDIT_START + 10) -#define RID_SVXITEMS_FRMDIR_VERT_TOP_RIGHT (RID_EDIT_START + 11) -#define RID_SVXITEMS_FRMDIR_VERT_TOP_LEFT (RID_EDIT_START + 12) -#define RID_SVXITEMS_FRMDIR_ENVIRONMENT (RID_EDIT_START + 13) -// RID_SVXITEMS_FRMDIR_END (RID_EDIT_START + 14) - -#define RID_SVXITEMS_BORDER_COMPLETE (RID_EDIT_START + 17) -#define RID_SVXITEMS_BORDER_TOP (RID_EDIT_START + 18) -#define RID_SVXITEMS_BORDER_BOTTOM (RID_EDIT_START + 19) -#define RID_SVXITEMS_BORDER_LEFT (RID_EDIT_START + 20) -#define RID_SVXITEMS_BORDER_RIGHT (RID_EDIT_START + 21) -#define RID_SVXITEMS_BORDER_DISTANCE (RID_EDIT_START + 22) -#define RID_SVXITEMS_BORDER_NONE (RID_EDIT_START + 23) - -#define RID_SVXITEMS_TRANSPARENT_TRUE (RID_EDIT_START + 24) -#define RID_SVXITEMS_TRANSPARENT_FALSE (RID_EDIT_START + 25) -#define RID_SVXITEMS_OPAQUE_TRUE (RID_EDIT_START + 26) -#define RID_SVXITEMS_OPAQUE_FALSE (RID_EDIT_START + 27) - -#define RID_SVXITEMS_SHADOW_COMPLETE (RID_EDIT_START + 28) -#define RID_SVXITEMS_GRAPHIC (RID_EDIT_START + 29) -#define RID_SVXITEMS_LINES (RID_EDIT_START + 30) -#define RID_SVXITEMS_ORPHANS_COMPLETE (RID_EDIT_START + 31) -#define RID_SVXITEMS_WIDOWS_COMPLETE (RID_EDIT_START + 32) -#define RID_SVXITEMS_PAGEMODEL_COMPLETE (RID_EDIT_START + 33) - -#define RID_SVXITEMS_SHADOWED_TRUE (RID_EDIT_START + 34) -#define RID_SVXITEMS_SHADOWED_FALSE (RID_EDIT_START + 35) -#define RID_SVXITEMS_AUTOKERN_TRUE (RID_EDIT_START + 36) -#define RID_SVXITEMS_AUTOKERN_FALSE (RID_EDIT_START + 37) -#define RID_SVXITEMS_WORDLINE_TRUE (RID_EDIT_START + 38) -#define RID_SVXITEMS_WORDLINE_FALSE (RID_EDIT_START + 39) -#define RID_SVXITEMS_CONTOUR_TRUE (RID_EDIT_START + 40) -#define RID_SVXITEMS_CONTOUR_FALSE (RID_EDIT_START + 41) -#define RID_SVXITEMS_FMTKEEP_TRUE (RID_EDIT_START + 46) -#define RID_SVXITEMS_FMTKEEP_FALSE (RID_EDIT_START + 47) -#define RID_SVXITEMS_FMTSPLIT_TRUE (RID_EDIT_START + 48) -#define RID_SVXITEMS_FMTSPLIT_FALSE (RID_EDIT_START + 49) -#define RID_SVXITEMS_PRINT_TRUE (RID_EDIT_START + 50) -#define RID_SVXITEMS_PRINT_FALSE (RID_EDIT_START + 51) -#define RID_SVXITEMS_PROT_POS_TRUE (RID_EDIT_START + 52) -#define RID_SVXITEMS_PROT_POS_FALSE (RID_EDIT_START + 53) -#define RID_SVXITEMS_PROT_SIZE_TRUE (RID_EDIT_START + 54) -#define RID_SVXITEMS_PROT_SIZE_FALSE (RID_EDIT_START + 55) -#define RID_SVXITEMS_PROT_CONTENT_TRUE (RID_EDIT_START + 56) -#define RID_SVXITEMS_PROT_CONTENT_FALSE (RID_EDIT_START + 57) -#define RID_SVXITEMS_ULSPACE_UPPER (RID_EDIT_START + 58) -#define RID_SVXITEMS_ULSPACE_LOWER (RID_EDIT_START + 59) -#define RID_SVXITEMS_LRSPACE_LEFT (RID_EDIT_START + 60) -#define RID_SVXITEMS_LRSPACE_FLINE (RID_EDIT_START + 62) -#define RID_SVXITEMS_LRSPACE_RIGHT (RID_EDIT_START + 63) -#define RID_SVXITEMS_SIZE_WIDTH (RID_EDIT_START + 64) -#define RID_SVXITEMS_SIZE_HEIGHT (RID_EDIT_START + 65) -#define RID_SVXITEMS_PAGE_END_TRUE (RID_EDIT_START + 66) -#define RID_SVXITEMS_PAGE_END_FALSE (RID_EDIT_START + 67) -#define RID_SVXITEMS_HYPHEN_TRUE (RID_EDIT_START + 68) -#define RID_SVXITEMS_HYPHEN_FALSE (RID_EDIT_START + 69) -#define RID_SVXITEMS_HYPHEN_MINLEAD (RID_EDIT_START + 70) -#define RID_SVXITEMS_HYPHEN_MINTRAIL (RID_EDIT_START + 71) -#define RID_SVXITEMS_HYPHEN_MAX (RID_EDIT_START + 72) -#define RID_SVXITEMS_HNGPNCT_OFF (RID_EDIT_START + 73) -#define RID_SVXITEMS_HNGPNCT_ON (RID_EDIT_START + 74) -#define RID_SVXITEMS_FORBIDDEN_RULE_OFF (RID_EDIT_START + 75) -#define RID_SVXITEMS_FORBIDDEN_RULE_ON (RID_EDIT_START + 76) -#define RID_SVXITEMS_SCRPTSPC_OFF (RID_EDIT_START + 77) -#define RID_SVXITEMS_SCRPTSPC_ON (RID_EDIT_START + 78) -#define RID_SVXITEMS_CHARSCALE_OFF (RID_EDIT_START + 79) -#define RID_SVXITEMS_CHARSCALE (RID_EDIT_START + 80) -#define RID_SVXITEMS_CHARROTATE_OFF (RID_EDIT_START + 81) -#define RID_SVXITEMS_CHARROTATE (RID_EDIT_START + 82) -#define RID_SVXITEMS_CHARROTATE_FITLINE (RID_EDIT_START + 83) -#define RID_SVXITEMS_TEXTROTATE_OFF (RID_EDIT_START + 84) -#define RID_SVXITEMS_TEXTROTATE (RID_EDIT_START + 89) - -#define RID_SVXITEMS_RELIEF_BEGIN (RID_EDIT_START + 85) -#define RID_SVXITEMS_RELIEF_NONE (RID_EDIT_START + 85) -#define RID_SVXITEMS_RELIEF_EMBOSSED (RID_EDIT_START + 86) -#define RID_SVXITEMS_RELIEF_ENGRAVED (RID_EDIT_START + 87) -// RID_SVXITEMS_RELIEF_END (RID_EDIT_START + 88) - -// enum FontEmphasisMark --------------------------------------------------- -#define RID_SVXITEMS_EMPHASIS_BEGIN_STYLE (RID_EDIT_START + 90) -#define RID_SVXITEMS_EMPHASIS_NONE_STYLE (RID_EDIT_START + 90) -#define RID_SVXITEMS_EMPHASIS_DOT_STYLE (RID_EDIT_START + 91) -#define RID_SVXITEMS_EMPHASIS_CIRCLE_STYLE (RID_EDIT_START + 92) -#define RID_SVXITEMS_EMPHASIS_DISC_STYLE (RID_EDIT_START + 93) -#define RID_SVXITEMS_EMPHASIS_ACCENT_STYLE (RID_EDIT_START + 94) - -#define RID_SVXITEMS_EMPHASIS_ABOVE_POS (RID_EDIT_START + 95) -#define RID_SVXITEMS_EMPHASIS_BELOW_POS (RID_EDIT_START + 96) - -// enum ESCAPEMENT ------------------------------------------------------- -#define RID_SVXITEMS_ESCAPEMENT_BEGIN (RID_EDIT_START + 97) -#define RID_SVXITEMS_ESCAPEMENT_OFF (RID_EDIT_START + 97) -#define RID_SVXITEMS_ESCAPEMENT_SUPER (RID_EDIT_START + 98) -#define RID_SVXITEMS_ESCAPEMENT_SUB (RID_EDIT_START + 99) -#define RID_SVXITEMS_ESCAPEMENT_AUTO (RID_EDIT_START + 100) - -// enum CASEMAP ---------------------------------------------------------- -#define RID_SVXITEMS_CASEMAP_BEGIN (RID_EDIT_START + 101) -#define RID_SVXITEMS_CASEMAP_NONE (RID_EDIT_START + 101) -#define RID_SVXITEMS_CASEMAP_VERSALIEN (RID_EDIT_START + 102) -#define RID_SVXITEMS_CASEMAP_GEMEINE (RID_EDIT_START + 103) -#define RID_SVXITEMS_CASEMAP_TITEL (RID_EDIT_START + 104) -#define RID_SVXITEMS_CASEMAP_KAPITAELCHEN (RID_EDIT_START + 105) - -#define RID_SVXITEMS_KERNING_COMPLETE (RID_EDIT_START + 106) -#define RID_SVXITEMS_KERNING_EXPANDED (RID_EDIT_START + 107) -#define RID_SVXITEMS_KERNING_CONDENSED (RID_EDIT_START + 108) - -#define RID_SVXITEMS_BLINK_TRUE (RID_EDIT_START + 109) -#define RID_SVXITEMS_BLINK_FALSE (RID_EDIT_START + 110) - -#define RID_SVXITEMS_TWOLINES_OFF (RID_EDIT_START + 111) -#define RID_SVXITEMS_TWOLINES (RID_EDIT_START + 112) - -// enum FontStrikeout ---------------------------------------------------- -#define RID_SVXITEMS_STRIKEOUT_BEGIN (RID_EDIT_START + 113) -#define RID_SVXITEMS_STRIKEOUT_NONE (RID_EDIT_START + 113) -#define RID_SVXITEMS_STRIKEOUT_SINGLE (RID_EDIT_START + 114) -#define RID_SVXITEMS_STRIKEOUT_DOUBLE (RID_EDIT_START + 115) -#define RID_SVXITEMS_STRIKEOUT_BOLD (RID_EDIT_START + 117) -#define RID_SVXITEMS_STRIKEOUT_SLASH (RID_EDIT_START + 118) -#define RID_SVXITEMS_STRIKEOUT_X (RID_EDIT_START + 119) - -// enum FontUnderline - used for overline -------------------------------- -#define RID_SVXITEMS_OL_BEGIN (RID_EDIT_START + 120) -#define RID_SVXITEMS_OL_NONE (RID_EDIT_START + 120) -#define RID_SVXITEMS_OL_SINGLE (RID_EDIT_START + 121) -#define RID_SVXITEMS_OL_DOUBLE (RID_EDIT_START + 122) -#define RID_SVXITEMS_OL_DOTTED (RID_EDIT_START + 123) -#define RID_SVXITEMS_OL_DONTKNOW (RID_EDIT_START + 124) -#define RID_SVXITEMS_OL_DASH (RID_EDIT_START + 125) -#define RID_SVXITEMS_OL_LONGDASH (RID_EDIT_START + 126) -#define RID_SVXITEMS_OL_DASHDOT (RID_EDIT_START + 127) -#define RID_SVXITEMS_OL_DASHDOTDOT (RID_EDIT_START + 128) -#define RID_SVXITEMS_OL_SMALLWAVE (RID_EDIT_START + 129) -#define RID_SVXITEMS_OL_WAVE (RID_EDIT_START + 130) -#define RID_SVXITEMS_OL_DOUBLEWAVE (RID_EDIT_START + 131) -#define RID_SVXITEMS_OL_BOLD (RID_EDIT_START + 132) -#define RID_SVXITEMS_OL_BOLDDOTTED (RID_EDIT_START + 133) -#define RID_SVXITEMS_OL_BOLDDASH (RID_EDIT_START + 134) -#define RID_SVXITEMS_OL_BOLDLONGDASH (RID_EDIT_START + 135) -#define RID_SVXITEMS_OL_BOLDDASHDOT (RID_EDIT_START + 136) -#define RID_SVXITEMS_OL_BOLDDASHDOTDOT (RID_EDIT_START + 137) -#define RID_SVXITEMS_OL_BOLDWAVE (RID_EDIT_START + 138) - -// enum FontUnderline - used for underline ------------------------------- -#define RID_SVXITEMS_UL_BEGIN (RID_EDIT_START + 139) -#define RID_SVXITEMS_UL_NONE (RID_EDIT_START + 139) -#define RID_SVXITEMS_UL_SINGLE (RID_EDIT_START + 140) -#define RID_SVXITEMS_UL_DOUBLE (RID_EDIT_START + 141) -#define RID_SVXITEMS_UL_DOTTED (RID_EDIT_START + 142) -#define RID_SVXITEMS_UL_DONTKNOW (RID_EDIT_START + 143) -#define RID_SVXITEMS_UL_DASH (RID_EDIT_START + 144) -#define RID_SVXITEMS_UL_LONGDASH (RID_EDIT_START + 145) -#define RID_SVXITEMS_UL_DASHDOT (RID_EDIT_START + 146) -#define RID_SVXITEMS_UL_DASHDOTDOT (RID_EDIT_START + 147) -#define RID_SVXITEMS_UL_SMALLWAVE (RID_EDIT_START + 148) -#define RID_SVXITEMS_UL_WAVE (RID_EDIT_START + 149) -#define RID_SVXITEMS_UL_DOUBLEWAVE (RID_EDIT_START + 150) -#define RID_SVXITEMS_UL_BOLD (RID_EDIT_START + 151) -#define RID_SVXITEMS_UL_BOLDDOTTED (RID_EDIT_START + 152) -#define RID_SVXITEMS_UL_BOLDDASH (RID_EDIT_START + 153) -#define RID_SVXITEMS_UL_BOLDLONGDASH (RID_EDIT_START + 154) -#define RID_SVXITEMS_UL_BOLDDASHDOT (RID_EDIT_START + 155) -#define RID_SVXITEMS_UL_BOLDDASHDOTDOT (RID_EDIT_START + 156) -#define RID_SVXITEMS_UL_BOLDWAVE (RID_EDIT_START + 157) - -// enum FontWeight ------------------------------------------------------- -#define RID_SVXITEMS_WEIGHT_BEGIN (RID_EDIT_START + 158) -#define RID_SVXITEMS_WEIGHT_DONTKNOW (RID_EDIT_START + 158) -#define RID_SVXITEMS_WEIGHT_THIN (RID_EDIT_START + 159) -#define RID_SVXITEMS_WEIGHT_ULTRALIGHT (RID_EDIT_START + 160) -#define RID_SVXITEMS_WEIGHT_LIGHT (RID_EDIT_START + 161) -#define RID_SVXITEMS_WEIGHT_SEMILIGHT (RID_EDIT_START + 162) -#define RID_SVXITEMS_WEIGHT_NORMAL (RID_EDIT_START + 163) -#define RID_SVXITEMS_WEIGHT_MEDIUM (RID_EDIT_START + 164) -#define RID_SVXITEMS_WEIGHT_SEMIBOLD (RID_EDIT_START + 165) -#define RID_SVXITEMS_WEIGHT_BOLD (RID_EDIT_START + 166) -#define RID_SVXITEMS_WEIGHT_ULTRABOLD (RID_EDIT_START + 167) -#define RID_SVXITEMS_WEIGHT_BLACK (RID_EDIT_START + 168) - -// enum FontItalic ------------------------------------------------------- -#define RID_SVXITEMS_ITALIC_NONE (RID_EDIT_START + 206) -#define RID_SVXITEMS_ITALIC_OBLIQUE (RID_EDIT_START + 207) -#define RID_SVXITEMS_ITALIC_NORMAL (RID_EDIT_START + 208) - -// enum SvxAdjust ----------------------------------------------------------- -#define RID_SVXITEMS_ADJUST_BEGIN (RID_EDIT_START + 209) -#define RID_SVXITEMS_ADJUST_LEFT (RID_EDIT_START + 209) -#define RID_SVXITEMS_ADJUST_RIGHT (RID_EDIT_START + 210) -#define RID_SVXITEMS_ADJUST_BLOCK (RID_EDIT_START + 211) -#define RID_SVXITEMS_ADJUST_CENTER (RID_EDIT_START + 212) -#define RID_SVXITEMS_ADJUST_BLOCKLINE (RID_EDIT_START + 213) +#define NC_(Context, String) (Context "\004" u8##String) // enum SvxBreak ------------------------------------------------------------ -#define RID_SVXITEMS_BREAK_BEGIN (RID_EDIT_START + 222) -#define RID_SVXITEMS_BREAK_NONE (RID_EDIT_START + 222) -#define RID_SVXITEMS_BREAK_COLUMN_BEFORE (RID_EDIT_START + 223) -#define RID_SVXITEMS_BREAK_COLUMN_AFTER (RID_EDIT_START + 224) -#define RID_SVXITEMS_BREAK_COLUMN_BOTH (RID_EDIT_START + 225) -#define RID_SVXITEMS_BREAK_PAGE_BEFORE (RID_EDIT_START + 226) -#define RID_SVXITEMS_BREAK_PAGE_AFTER (RID_EDIT_START + 227) -#define RID_SVXITEMS_BREAK_PAGE_BOTH (RID_EDIT_START + 228) +#define RID_SVXITEMS_BREAK_NONE NC_("RID_SVXITEMS_BREAK_NONE", "No break") +#define RID_SVXITEMS_BREAK_COLUMN_BEFORE NC_("RID_SVXITEMS_BREAK_COLUMN_BEFORE", "Break before new column") +#define RID_SVXITEMS_BREAK_COLUMN_AFTER NC_("RID_SVXITEMS_BREAK_COLUMN_AFTER", "Break after new column") +#define RID_SVXITEMS_BREAK_COLUMN_BOTH NC_("RID_SVXITEMS_BREAK_COLUMN_BOTH", "Break before and after new column") +#define RID_SVXITEMS_BREAK_PAGE_BEFORE NC_("RID_SVXITEMS_BREAK_PAGE_BEFORE", "Break before new page") +#define RID_SVXITEMS_BREAK_PAGE_AFTER NC_("RID_SVXITEMS_BREAK_PAGE_AFTER", "Break after new page") +#define RID_SVXITEMS_BREAK_PAGE_BOTH NC_("RID_SVXITEMS_BREAK_PAGE_BOTH", "Break before and after new page") // enum SvxShadowLocation --------------------------------------------------- -#define RID_SVXITEMS_SHADOW_BEGIN (RID_EDIT_START + 229) -#define RID_SVXITEMS_SHADOW_NONE (RID_EDIT_START + 229) -#define RID_SVXITEMS_SHADOW_TOPLEFT (RID_EDIT_START + 230) -#define RID_SVXITEMS_SHADOW_TOPRIGHT (RID_EDIT_START + 231) -#define RID_SVXITEMS_SHADOW_BOTTOMLEFT (RID_EDIT_START + 232) -#define RID_SVXITEMS_SHADOW_BOTTOMRIGHT (RID_EDIT_START + 233) - -// Border lines -#define RID_SOLID (RID_EDIT_START + 234) -#define RID_DOTTED (RID_EDIT_START + 235) -#define RID_DASHED (RID_EDIT_START + 236) -#define RID_DOUBLE (RID_EDIT_START + 237) -#define RID_THINTHICK_SMALLGAP (RID_EDIT_START + 238) -#define RID_THINTHICK_MEDIUMGAP (RID_EDIT_START + 239) -#define RID_THINTHICK_LARGEGAP (RID_EDIT_START + 240) -#define RID_THICKTHIN_SMALLGAP (RID_EDIT_START + 241) -#define RID_THICKTHIN_MEDIUMGAP (RID_EDIT_START + 242) -#define RID_THICKTHIN_LARGEGAP (RID_EDIT_START + 243) -#define RID_EMBOSSED (RID_EDIT_START + 244) -#define RID_ENGRAVED (RID_EDIT_START + 245) -#define RID_OUTSET (RID_EDIT_START + 246) -#define RID_INSET (RID_EDIT_START + 247) -#define RID_FINE_DASHED (RID_EDIT_START + 248) -#define RID_DOUBLE_THIN (RID_EDIT_START + 249) -// border lines continue at RID_EDIT_START + 330 - -// Metric-Text -#define RID_SVXITEMS_METRIC_MM (RID_EDIT_START + 250) -#define RID_SVXITEMS_METRIC_CM (RID_EDIT_START + 251) -#define RID_SVXITEMS_METRIC_INCH (RID_EDIT_START + 252) -#define RID_SVXITEMS_METRIC_POINT (RID_EDIT_START + 253) -#define RID_SVXITEMS_METRIC_TWIP (RID_EDIT_START + 254) -#define RID_SVXITEMS_METRIC_PIXEL (RID_EDIT_START + 255) +#define RID_SVXITEMS_SHADOW_NONE NC_("RID_SVXITEMS_SHADOW_NONE", "No Shadow") +#define RID_SVXITEMS_SHADOW_TOPLEFT NC_("RID_SVXITEMS_SHADOW_TOPLEFT", "Shadow top left") +#define RID_SVXITEMS_SHADOW_TOPRIGHT NC_("RID_SVXITEMS_SHADOW_TOPRIGHT", "Shadow top right") +#define RID_SVXITEMS_SHADOW_BOTTOMLEFT NC_("RID_SVXITEMS_SHADOW_BOTTOMLEFT", "Shadow bottom left") +#define RID_SVXITEMS_SHADOW_BOTTOMRIGHT NC_("RID_SVXITEMS_SHADOW_BOTTOMRIGHT", "Shadow bottom right") // enum ColorName ----------------------------------------------------------- -#define RID_SVXITEMS_COLOR_BEGIN (RID_EDIT_START + 256) -#define RID_SVXITEMS_COLOR (RID_EDIT_START + 256) -#define RID_SVXITEMS_COLOR_BLACK (RID_EDIT_START + 257) -#define RID_SVXITEMS_COLOR_BLUE (RID_EDIT_START + 258) -#define RID_SVXITEMS_COLOR_GREEN (RID_EDIT_START + 259) -#define RID_SVXITEMS_COLOR_CYAN (RID_EDIT_START + 260) -#define RID_SVXITEMS_COLOR_RED (RID_EDIT_START + 261) -#define RID_SVXITEMS_COLOR_MAGENTA (RID_EDIT_START + 262) -#define RID_SVXITEMS_COLOR_BROWN (RID_EDIT_START + 263) -#define RID_SVXITEMS_COLOR_GRAY (RID_EDIT_START + 264) -#define RID_SVXITEMS_COLOR_LIGHTGRAY (RID_EDIT_START + 265) -#define RID_SVXITEMS_COLOR_LIGHTBLUE (RID_EDIT_START + 266) -#define RID_SVXITEMS_COLOR_LIGHTGREEN (RID_EDIT_START + 267) -#define RID_SVXITEMS_COLOR_LIGHTCYAN (RID_EDIT_START + 268) -#define RID_SVXITEMS_COLOR_LIGHTRED (RID_EDIT_START + 269) -#define RID_SVXITEMS_COLOR_LIGHTMAGENTA (RID_EDIT_START + 270) -#define RID_SVXITEMS_COLOR_YELLOW (RID_EDIT_START + 271) -#define RID_SVXITEMS_COLOR_WHITE (RID_EDIT_START + 272) -#define RID_SVXITEMS_COLOR_MENUBAR (RID_EDIT_START + 273) -#define RID_SVXITEMS_COLOR_MENUBARTEXT (RID_EDIT_START + 274) -#define RID_SVXITEMS_COLOR_POPUPMENU (RID_EDIT_START + 275) -#define RID_SVXITEMS_COLOR_POPUPMENUTEXT (RID_EDIT_START + 276) -#define RID_SVXITEMS_COLOR_WINDOWTEXT (RID_EDIT_START + 277) -#define RID_SVXITEMS_COLOR_WINDOWWORKSPACE (RID_EDIT_START + 278) -#define RID_SVXITEMS_COLOR_HIGHLIGHT (RID_EDIT_START + 279) -#define RID_SVXITEMS_COLOR_HIGHLIGHTTEXT (RID_EDIT_START + 280) -#define RID_SVXITEMS_COLOR_3DTEXT (RID_EDIT_START + 281) -#define RID_SVXITEMS_COLOR_3DFACE (RID_EDIT_START + 282) -#define RID_SVXITEMS_COLOR_3DLIGHT (RID_EDIT_START + 283) -#define RID_SVXITEMS_COLOR_3DSHADOW (RID_EDIT_START + 284) -#define RID_SVXITEMS_COLOR_SCROLLBAR (RID_EDIT_START + 285) -#define RID_SVXITEMS_COLOR_FIELD (RID_EDIT_START + 286) -#define RID_SVXITEMS_COLOR_FIELDTEXT (RID_EDIT_START + 287) +#define RID_SVXITEMS_COLOR NC_("RID_SVXITEMS_COLOR", "Color ") +#define RID_SVXITEMS_COLOR_BLACK NC_("RID_SVXITEMS_COLOR_BLACK", "Black") +#define RID_SVXITEMS_COLOR_BLUE NC_("RID_SVXITEMS_COLOR_BLUE", "Blue") +#define RID_SVXITEMS_COLOR_GREEN NC_("RID_SVXITEMS_COLOR_GREEN", "Green") +#define RID_SVXITEMS_COLOR_CYAN NC_("RID_SVXITEMS_COLOR_CYAN", "Cyan") +#define RID_SVXITEMS_COLOR_RED NC_("RID_SVXITEMS_COLOR_RED", "Red") +#define RID_SVXITEMS_COLOR_MAGENTA NC_("RID_SVXITEMS_COLOR_MAGENTA", "Magenta") +#define RID_SVXITEMS_COLOR_BROWN NC_("RID_SVXITEMS_COLOR_BROWN", "Brown") +#define RID_SVXITEMS_COLOR_GRAY NC_("RID_SVXITEMS_COLOR_GRAY", "Gray") +#define RID_SVXITEMS_COLOR_LIGHTGRAY NC_("RID_SVXITEMS_COLOR_LIGHTGRAY", "Light Gray") +#define RID_SVXITEMS_COLOR_LIGHTBLUE NC_("RID_SVXITEMS_COLOR_LIGHTBLUE", "Light Blue") +#define RID_SVXITEMS_COLOR_LIGHTGREEN NC_("RID_SVXITEMS_COLOR_LIGHTGREEN", "Light Green") +#define RID_SVXITEMS_COLOR_LIGHTCYAN NC_("RID_SVXITEMS_COLOR_LIGHTCYAN", "Light Cyan") +#define RID_SVXITEMS_COLOR_LIGHTRED NC_("RID_SVXITEMS_COLOR_LIGHTRED", "Light Red") +#define RID_SVXITEMS_COLOR_LIGHTMAGENTA NC_("RID_SVXITEMS_COLOR_LIGHTMAGENTA", "Light Magenta") +#define RID_SVXITEMS_COLOR_YELLOW NC_("RID_SVXITEMS_COLOR_YELLOW", "Yellow") +#define RID_SVXITEMS_COLOR_WHITE NC_("RID_SVXITEMS_COLOR_WHITE", "White") -#define RID_SVXITEMS_PARASNAPTOGRID_ON (RID_EDIT_START + 288) -#define RID_SVXITEMS_PARASNAPTOGRID_OFF (RID_EDIT_START + 289) +// enum FontItalic ------------------------------------------------------- +#define RID_SVXITEMS_ITALIC_NONE NC_("RID_SVXITEMS_ITALIC_NONE", "Not Italic") +#define RID_SVXITEMS_ITALIC_OBLIQUE NC_("RID_SVXITEMS_ITALIC_OBLIQUE", "Oblique italic") +#define RID_SVXITEMS_ITALIC_NORMAL NC_("RID_SVXITEMS_ITALIC_NORMAL", "Italic") -#define RID_SVXITEMS_PARAVERTALIGN_AUTO (RID_EDIT_START + 290) -#define RID_SVXITEMS_PARAVERTALIGN_BASELINE (RID_EDIT_START + 291) -#define RID_SVXITEMS_PARAVERTALIGN_TOP (RID_EDIT_START + 292) -#define RID_SVXITEMS_PARAVERTALIGN_CENTER (RID_EDIT_START + 293) -#define RID_SVXITEMS_PARAVERTALIGN_BOTTOM (RID_EDIT_START + 294) +// enum FontWeight ------------------------------------------------------- +#define RID_SVXITEMS_WEIGHT_DONTKNOW NC_("RID_SVXITEMS_WEIGHT_DONTKNOW", "?") +#define RID_SVXITEMS_WEIGHT_THIN NC_("RID_SVXITEMS_WEIGHT_THIN", "thin") +#define RID_SVXITEMS_WEIGHT_ULTRALIGHT NC_("RID_SVXITEMS_WEIGHT_ULTRALIGHT", "ultra thin") +#define RID_SVXITEMS_WEIGHT_LIGHT NC_("RID_SVXITEMS_WEIGHT_LIGHT", "light") +#define RID_SVXITEMS_WEIGHT_SEMILIGHT NC_("RID_SVXITEMS_WEIGHT_SEMILIGHT", "semi light") +#define RID_SVXITEMS_WEIGHT_NORMAL NC_("RID_SVXITEMS_WEIGHT_NORMAL", "normal") +#define RID_SVXITEMS_WEIGHT_MEDIUM NC_("RID_SVXITEMS_WEIGHT_MEDIUM", "medium") +#define RID_SVXITEMS_WEIGHT_SEMIBOLD NC_("RID_SVXITEMS_WEIGHT_SEMIBOLD", "semi bold") +#define RID_SVXITEMS_WEIGHT_BOLD NC_("RID_SVXITEMS_WEIGHT_BOLD", "bold") +#define RID_SVXITEMS_WEIGHT_ULTRABOLD NC_("RID_SVXITEMS_WEIGHT_ULTRABOLD", "ultra bold") +#define RID_SVXITEMS_WEIGHT_BLACK NC_("RID_SVXITEMS_WEIGHT_BLACK", "black") -#define RID_SVXITEMS_CHARHIDDEN_FALSE (RID_EDIT_START + 295) -#define RID_SVXITEMS_CHARHIDDEN_TRUE (RID_EDIT_START + 296) +// enum FontUnderline - used for underline ------------------------------ +#define RID_SVXITEMS_UL_NONE NC_("RID_SVXITEMS_UL_NONE", "No underline") +#define RID_SVXITEMS_UL_SINGLE NC_("RID_SVXITEMS_UL_SINGLE", "Single underline") +#define RID_SVXITEMS_UL_DOUBLE NC_("RID_SVXITEMS_UL_DOUBLE", "Double underline") +#define RID_SVXITEMS_UL_DOTTED NC_("RID_SVXITEMS_UL_DOTTED", "Dotted underline") +#define RID_SVXITEMS_UL_DONTKNOW NC_("RID_SVXITEMS_UL_DONTKNOW", "Underline") +#define RID_SVXITEMS_UL_DASH NC_("RID_SVXITEMS_UL_DASH", "Underline (dashes)") +#define RID_SVXITEMS_UL_LONGDASH NC_("RID_SVXITEMS_UL_LONGDASH", "Underline (long dashes)") +#define RID_SVXITEMS_UL_DASHDOT NC_("RID_SVXITEMS_UL_DASHDOT", "Underline (dot dash)") +#define RID_SVXITEMS_UL_DASHDOTDOT NC_("RID_SVXITEMS_UL_DASHDOTDOT", "Underline (dot dot dash)") +#define RID_SVXITEMS_UL_SMALLWAVE NC_("RID_SVXITEMS_UL_SMALLWAVE", "Underline (small wave)") +#define RID_SVXITEMS_UL_WAVE NC_("RID_SVXITEMS_UL_WAVE", "Underline (Wave)") +#define RID_SVXITEMS_UL_DOUBLEWAVE NC_("RID_SVXITEMS_UL_DOUBLEWAVE", "Underline (Double wave)") +#define RID_SVXITEMS_UL_BOLD NC_("RID_SVXITEMS_UL_BOLD", "Underlined (Bold)") +#define RID_SVXITEMS_UL_BOLDDOTTED NC_("RID_SVXITEMS_UL_BOLDDOTTED", "Dotted underline (Bold)") +#define RID_SVXITEMS_UL_BOLDDASH NC_("RID_SVXITEMS_UL_BOLDDASH", "Underline (Dash bold)") +#define RID_SVXITEMS_UL_BOLDLONGDASH NC_("RID_SVXITEMS_UL_BOLDLONGDASH", "Underline (long dash, bold)") +#define RID_SVXITEMS_UL_BOLDDASHDOT NC_("RID_SVXITEMS_UL_BOLDDASHDOT", "Underline (dot dash, bold)") +#define RID_SVXITEMS_UL_BOLDDASHDOTDOT NC_("RID_SVXITEMS_UL_BOLDDASHDOTDOT", "Underline (dot dot dash, bold)") +#define RID_SVXITEMS_UL_BOLDWAVE NC_("RID_SVXITEMS_UL_BOLDWAVE", "Underline (wave, bold)") -// strings for error messages in dictionary updates -#define RID_SVXSTR_DIC_ERR_UNKNOWN (RID_EDIT_START + 297) -#define RID_SVXSTR_DIC_ERR_FULL (RID_EDIT_START + 298) -#define RID_SVXSTR_DIC_ERR_READONLY (RID_EDIT_START + 299) -#define RID_SVXSTR_QUERY_BW_CONTINUE (RID_EDIT_START + 300) -#define RID_SVXSTR_QUERY_CONTINUE (RID_EDIT_START + 301) +// enum FontUnderline - used for overline ------------------------------- +#define RID_SVXITEMS_OL_NONE NC_("RID_SVXITEMS_OL_NONE", "No overline") +#define RID_SVXITEMS_OL_SINGLE NC_("RID_SVXITEMS_OL_SINGLE", "Single overline") +#define RID_SVXITEMS_OL_DOUBLE NC_("RID_SVXITEMS_OL_DOUBLE", "Double overline") +#define RID_SVXITEMS_OL_DOTTED NC_("RID_SVXITEMS_OL_DOTTED", "Dotted overline") +#define RID_SVXITEMS_OL_DONTKNOW NC_("RID_SVXITEMS_OL_DONTKNOW", "Overline") +#define RID_SVXITEMS_OL_DASH NC_("RID_SVXITEMS_OL_DASH", "Overline (dashes)") +#define RID_SVXITEMS_OL_LONGDASH NC_("RID_SVXITEMS_OL_LONGDASH", "Overline (long dashes)") +#define RID_SVXITEMS_OL_DASHDOT NC_("RID_SVXITEMS_OL_DASHDOT", "Overline (dot dash)") +#define RID_SVXITEMS_OL_DASHDOTDOT NC_("RID_SVXITEMS_OL_DASHDOTDOT", "Overline (dot dot dash)") +#define RID_SVXITEMS_OL_SMALLWAVE NC_("RID_SVXITEMS_OL_SMALLWAVE", "Overline (small wave)") +#define RID_SVXITEMS_OL_WAVE NC_("RID_SVXITEMS_OL_WAVE", "Overline (Wave)") +#define RID_SVXITEMS_OL_DOUBLEWAVE NC_("RID_SVXITEMS_OL_DOUBLEWAVE", "Overline (Double wave)") +#define RID_SVXITEMS_OL_BOLD NC_("RID_SVXITEMS_OL_BOLD", "Overlined (Bold)") +#define RID_SVXITEMS_OL_BOLDDOTTED NC_("RID_SVXITEMS_OL_BOLDDOTTED", "Dotted overline (Bold)") +#define RID_SVXITEMS_OL_BOLDDASH NC_("RID_SVXITEMS_OL_BOLDDASH", "Overline (Dash bold)") +#define RID_SVXITEMS_OL_BOLDLONGDASH NC_("RID_SVXITEMS_OL_BOLDLONGDASH", "Overline (long dash, bold)") +#define RID_SVXITEMS_OL_BOLDDASHDOT NC_("RID_SVXITEMS_OL_BOLDDASHDOT", "Overline (dot dash, bold)") +#define RID_SVXITEMS_OL_BOLDDASHDOTDOT NC_("RID_SVXITEMS_OL_BOLDDASHDOTDOT", "Overline (dot dot dash, bold)") +#define RID_SVXITEMS_OL_BOLDWAVE NC_("RID_SVXITEMS_OL_BOLDWAVE", "Overline (wave, bold)") -// EditEngine -#define RID_EDITUNDO_DEL (RID_EDIT_START + 302) -#define RID_EDITUNDO_MOVE (RID_EDIT_START + 303) -#define RID_EDITUNDO_INSERT (RID_EDIT_START + 304) -#define RID_EDITUNDO_REPLACE (RID_EDIT_START + 305) -#define RID_EDITUNDO_SETATTRIBS (RID_EDIT_START + 306) -#define RID_EDITUNDO_SETSTYLE (RID_EDIT_START + 307) -#define RID_EDITUNDO_RESETATTRIBS (RID_EDIT_START + 308) -#define RID_EDITUNDO_INDENT (RID_EDIT_START + 309) -#define RID_EDITUNDO_TRANSLITERATE (RID_EDIT_START + 310) -#define RID_SVXSTR_AUTOMATIC (RID_EDIT_START + 311) -#define RID_STR_PARAGRAPH (RID_EDIT_START + 312) -#define RID_STR_WORD (RID_EDIT_START + 313) -#define RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION (RID_EDIT_START + 314) -#define RID_SVXSTR_A11Y_IMAGEBULLET_NAME (RID_EDIT_START + 315) +// enum FontStrikeout ---------------------------------------------------- +#define RID_SVXITEMS_STRIKEOUT_NONE NC_("RID_SVXITEMS_STRIKEOUT_NONE", "No strikethrough") +#define RID_SVXITEMS_STRIKEOUT_SINGLE NC_("RID_SVXITEMS_STRIKEOUT_SINGLE", "Single strikethrough") +#define RID_SVXITEMS_STRIKEOUT_DOUBLE NC_("RID_SVXITEMS_STRIKEOUT_DOUBLE", "Double strikethrough") +#define RID_SVXITEMS_STRIKEOUT_DONTKNOW NC_("RID_SVXITEMS_STRIKEOUT_DONTKNOW", "Strikethrough") +#define RID_SVXITEMS_STRIKEOUT_BOLD NC_("RID_SVXITEMS_STRIKEOUT_BOLD", "Bold strikethrough") +#define RID_SVXITEMS_STRIKEOUT_SLASH NC_("RID_SVXITEMS_STRIKEOUT_SLASH", "Strike through with slash") +#define RID_SVXITEMS_STRIKEOUT_X NC_("RID_SVXITEMS_STRIKEOUT_X", "Strike through with Xes") -// enum SvxCellHorJustify -#define RID_SVXITEMS_HORJUST_STANDARD (RID_EDIT_START + 316) -#define RID_SVXITEMS_HORJUST_LEFT (RID_EDIT_START + 317) -#define RID_SVXITEMS_HORJUST_CENTER (RID_EDIT_START + 318) -#define RID_SVXITEMS_HORJUST_RIGHT (RID_EDIT_START + 319) -#define RID_SVXITEMS_HORJUST_BLOCK (RID_EDIT_START + 320) -#define RID_SVXITEMS_HORJUST_REPEAT (RID_EDIT_START + 321) +// enum CASEMAP ---------------------------------------------------------- +#define RID_SVXITEMS_CASEMAP_NONE NC_("RID_SVXITEMS_CASEMAP_NONE", "None") +#define RID_SVXITEMS_CASEMAP_VERSALIEN NC_("RID_SVXITEMS_CASEMAP_VERSALIEN", "Caps") +#define RID_SVXITEMS_CASEMAP_GEMEINE NC_("RID_SVXITEMS_CASEMAP_GEMEINE", "Lowercase") +#define RID_SVXITEMS_CASEMAP_TITEL NC_("RID_SVXITEMS_CASEMAP_TITEL", "Title") +#define RID_SVXITEMS_CASEMAP_KAPITAELCHEN NC_("RID_SVXITEMS_CASEMAP_KAPITAELCHEN", "Small caps") -// enum SvxCellVerJustify -#define RID_SVXITEMS_VERJUST_STANDARD (RID_EDIT_START + 322) -#define RID_SVXITEMS_VERJUST_TOP (RID_EDIT_START + 323) -#define RID_SVXITEMS_VERJUST_CENTER (RID_EDIT_START + 324) -#define RID_SVXITEMS_VERJUST_BOTTOM (RID_EDIT_START + 325) +// enum ESCAPEMENT ------------------------------------------------------- +#define RID_SVXITEMS_ESCAPEMENT_OFF NC_("RID_SVXITEMS_ESCAPEMENT_OFF", "Normal position") +#define RID_SVXITEMS_ESCAPEMENT_SUPER NC_("RID_SVXITEMS_ESCAPEMENT_SUPER", "Superscript ") +#define RID_SVXITEMS_ESCAPEMENT_SUB NC_("RID_SVXITEMS_ESCAPEMENT_SUB", "Subscript ") +#define RID_SVXITEMS_ESCAPEMENT_AUTO NC_("RID_SVXITEMS_ESCAPEMENT_AUTO", "automatic") -// enum SvxCellJustifyMethod -#define RID_SVXITEMS_JUSTMETHOD_AUTO (RID_EDIT_START + 326) -#define RID_SVXITEMS_JUSTMETHOD_DISTRIBUTE (RID_EDIT_START + 327) +// enum SvxAdjust ----------------------------------------------------------- +#define RID_SVXITEMS_ADJUST_LEFT NC_("RID_SVXITEMS_ADJUST_LEFT", "Align left") +#define RID_SVXITEMS_ADJUST_RIGHT NC_("RID_SVXITEMS_ADJUST_RIGHT", "Align right") +#define RID_SVXITEMS_ADJUST_BLOCK NC_("RID_SVXITEMS_ADJUST_BLOCK", "Justify") +#define RID_SVXITEMS_ADJUST_CENTER NC_("RID_SVXITEMS_ADJUST_CENTER", "Centered") +#define RID_SVXITEMS_ADJUST_BLOCKLINE NC_("RID_SVXITEMS_ADJUST_BLOCKLINE", "Justify") +#define RID_SOLID NC_("RID_SOLID", "Single, solid") +#define RID_DOTTED NC_("RID_DOTTED", "Single, dotted") +#define RID_DASHED NC_("RID_DASHED", "Single, dashed") +#define RID_DOUBLE NC_("RID_DOUBLE", "Double") +#define RID_THINTHICK_SMALLGAP NC_("RID_THINTHICK_SMALLGAP", "Double, inside: fine, outside: thick, spacing: small") +#define RID_THINTHICK_MEDIUMGAP NC_("RID_THINTHICK_MEDIUMGAP", "Double, inside: fine, outside: thick, spacing: medium") +#define RID_THINTHICK_LARGEGAP NC_("RID_THINTHICK_LARGEGAP", "Double, inside: fine, outside: thick, spacing: large") +#define RID_THICKTHIN_SMALLGAP NC_("RID_THICKTHIN_SMALLGAP", "Double, inside: thick, outside: fine, spacing: small") +#define RID_THICKTHIN_MEDIUMGAP NC_("RID_THICKTHIN_MEDIUMGAP", "Double, inside: thick, outside: fine, spacing: medium") +#define RID_THICKTHIN_LARGEGAP NC_("RID_THICKTHIN_LARGEGAP", "Double, inside: thick, outside: fine, spacing: large") +#define RID_EMBOSSED NC_("RID_EMBOSSED", "3D embossed") +#define RID_ENGRAVED NC_("RID_ENGRAVED", "3D engraved") +#define RID_INSET NC_("RID_INSET", "Inset") +#define RID_OUTSET NC_("RID_OUTSET", "Outset") +#define RID_FINE_DASHED NC_("RID_FINE_DASHED", "Single, fine dashed") +#define RID_DOUBLE_THIN NC_("RID_DOUBLE_THIN", "Double, fixed thin lines") +#define RID_DASH_DOT NC_("RID_DASH_DOT", "Single, dash-dot") +#define RID_DASH_DOT_DOT NC_("RID_DASH_DOT_DOT", "Single, dash-dot-dot") +#define RID_SVXITEMS_METRIC_MM NC_("RID_SVXITEMS_METRIC_MM", "mm") +#define RID_SVXITEMS_METRIC_CM NC_("RID_SVXITEMS_METRIC_CM", "cm") +#define RID_SVXITEMS_METRIC_INCH NC_("RID_SVXITEMS_METRIC_INCH", "inch") +#define RID_SVXITEMS_METRIC_POINT NC_("RID_SVXITEMS_METRIC_POINT", "pt") +#define RID_SVXITEMS_METRIC_TWIP NC_("RID_SVXITEMS_METRIC_TWIP", "twip") +#define RID_SVXITEMS_METRIC_PIXEL NC_("RID_SVXITEMS_METRIC_PIXEL", "pixel") -#define RID_SVXSTR_A11Y_PARAGRAPH_DESCRIPTION (RID_EDIT_START + 328) -// unused (RID_EDIT_START + 329) +// GetValueText of BoolItems +#define RID_SVXITEMS_SHADOWED_TRUE NC_("RID_SVXITEMS_SHADOWED_TRUE", "Shadowed") +#define RID_SVXITEMS_SHADOWED_FALSE NC_("RID_SVXITEMS_SHADOWED_FALSE", "Not Shadowed") +#define RID_SVXITEMS_BLINK_TRUE NC_("RID_SVXITEMS_BLINK_TRUE", "Blinking") +#define RID_SVXITEMS_BLINK_FALSE NC_("RID_SVXITEMS_BLINK_FALSE", "Not Blinking") +#define RID_SVXITEMS_AUTOKERN_TRUE NC_("RID_SVXITEMS_AUTOKERN_TRUE", "Pair Kerning") +#define RID_SVXITEMS_AUTOKERN_FALSE NC_("RID_SVXITEMS_AUTOKERN_FALSE", "No pair kerning") +#define RID_SVXITEMS_WORDLINE_TRUE NC_("RID_SVXITEMS_WORDLINE_TRUE", "Individual words") +#define RID_SVXITEMS_WORDLINE_FALSE NC_("RID_SVXITEMS_WORDLINE_FALSE", "Not Words Only") +#define RID_SVXITEMS_CONTOUR_TRUE NC_("RID_SVXITEMS_CONTOUR_TRUE", "Outline") +#define RID_SVXITEMS_CONTOUR_FALSE NC_("RID_SVXITEMS_CONTOUR_FALSE", "No Outline") +#define RID_SVXITEMS_PRINT_TRUE NC_("RID_SVXITEMS_PRINT_TRUE", "Print") +#define RID_SVXITEMS_PRINT_FALSE NC_("RID_SVXITEMS_PRINT_FALSE", "Don't print") +#define RID_SVXITEMS_OPAQUE_TRUE NC_("RID_SVXITEMS_OPAQUE_TRUE", "Opaque") +#define RID_SVXITEMS_OPAQUE_FALSE NC_("RID_SVXITEMS_OPAQUE_FALSE", "Not Opaque") +#define RID_SVXITEMS_FMTKEEP_TRUE NC_("RID_SVXITEMS_FMTKEEP_TRUE", "Keep with next paragraph") +#define RID_SVXITEMS_FMTKEEP_FALSE NC_("RID_SVXITEMS_FMTKEEP_FALSE", "Don't Keep Paragraphs Together") +#define RID_SVXITEMS_FMTSPLIT_TRUE NC_("RID_SVXITEMS_FMTSPLIT_TRUE", "Split paragraph") +#define RID_SVXITEMS_FMTSPLIT_FALSE NC_("RID_SVXITEMS_FMTSPLIT_FALSE", "Don't split paragraph") +#define RID_SVXITEMS_PROT_CONTENT_TRUE NC_("RID_SVXITEMS_PROT_CONTENT_TRUE", "Contents protected") +#define RID_SVXITEMS_PROT_CONTENT_FALSE NC_("RID_SVXITEMS_PROT_CONTENT_FALSE", "Contents not protected") +#define RID_SVXITEMS_PROT_SIZE_TRUE NC_("RID_SVXITEMS_PROT_SIZE_TRUE", "Size protected") +#define RID_SVXITEMS_PROT_SIZE_FALSE NC_("RID_SVXITEMS_PROT_SIZE_FALSE", "Size not protected") +#define RID_SVXITEMS_PROT_POS_TRUE NC_("RID_SVXITEMS_PROT_POS_TRUE", "Position protected") +#define RID_SVXITEMS_PROT_POS_FALSE NC_("RID_SVXITEMS_PROT_POS_FALSE", "Position not protected") +#define RID_SVXITEMS_TRANSPARENT_TRUE NC_("RID_SVXITEMS_TRANSPARENT_TRUE", "Transparent") +#define RID_SVXITEMS_TRANSPARENT_FALSE NC_("RID_SVXITEMS_TRANSPARENT_FALSE", "Not Transparent") +#define RID_SVXITEMS_HYPHEN_TRUE NC_("RID_SVXITEMS_HYPHEN_TRUE", "Hyphenation") +#define RID_SVXITEMS_HYPHEN_FALSE NC_("RID_SVXITEMS_HYPHEN_FALSE", "No hyphenation") +#define RID_SVXITEMS_PAGE_END_TRUE NC_("RID_SVXITEMS_PAGE_END_TRUE", "Page End") +#define RID_SVXITEMS_PAGE_END_FALSE NC_("RID_SVXITEMS_PAGE_END_FALSE", "No Page End") +#define RID_SVXITEMS_SIZE_WIDTH NC_("RID_SVXITEMS_SIZE_WIDTH", "Width: ") +#define RID_SVXITEMS_SIZE_HEIGHT NC_("RID_SVXITEMS_SIZE_HEIGHT", "Height: ") +#define RID_SVXITEMS_LRSPACE_LEFT NC_("RID_SVXITEMS_LRSPACE_LEFT", "Indent left ") +#define RID_SVXITEMS_LRSPACE_FLINE NC_("RID_SVXITEMS_LRSPACE_FLINE", "First Line ") +#define RID_SVXITEMS_LRSPACE_RIGHT NC_("RID_SVXITEMS_LRSPACE_RIGHT", "Indent right ") +#define RID_SVXITEMS_SHADOW_COMPLETE NC_("RID_SVXITEMS_SHADOW_COMPLETE", "Shadow: ") +#define RID_SVXITEMS_BORDER_COMPLETE NC_("RID_SVXITEMS_BORDER_COMPLETE", "Borders ") +#define RID_SVXITEMS_BORDER_NONE NC_("RID_SVXITEMS_BORDER_NONE", "No border") +#define RID_SVXITEMS_BORDER_TOP NC_("RID_SVXITEMS_BORDER_TOP", "top ") +#define RID_SVXITEMS_BORDER_BOTTOM NC_("RID_SVXITEMS_BORDER_BOTTOM", "bottom ") +#define RID_SVXITEMS_BORDER_LEFT NC_("RID_SVXITEMS_BORDER_LEFT", "left ") +#define RID_SVXITEMS_BORDER_RIGHT NC_("RID_SVXITEMS_BORDER_RIGHT", "right ") +#define RID_SVXITEMS_BORDER_DISTANCE NC_("RID_SVXITEMS_BORDER_DISTANCE", "Spacing ") +#define RID_SVXITEMS_ULSPACE_UPPER NC_("RID_SVXITEMS_ULSPACE_UPPER", "From top ") +#define RID_SVXITEMS_ULSPACE_LOWER NC_("RID_SVXITEMS_ULSPACE_LOWER", "From bottom ") +// To translators: %1 == will be replaced by the number of lines +#define RID_SVXITEMS_LINES NC_("RID_SVXITEMS_LINES", "%1 Lines") +#define RID_SVXITEMS_WIDOWS_COMPLETE NC_("RID_SVXITEMS_WIDOWS_COMPLETE", "Widow control") +#define RID_SVXITEMS_ORPHANS_COMPLETE NC_("RID_SVXITEMS_ORPHANS_COMPLETE", "Orphan control") +#define RID_SVXITEMS_HYPHEN_MINLEAD NC_("RID_SVXITEMS_HYPHEN_MINLEAD", "%1 characters at end of line") +#define RID_SVXITEMS_HYPHEN_MINTRAIL NC_("RID_SVXITEMS_HYPHEN_MINTRAIL", "%1 characters at beginning of line") +#define RID_SVXITEMS_HYPHEN_MAX NC_("RID_SVXITEMS_HYPHEN_MAX", "%1 hyphens") +#define RID_SVXITEMS_PAGEMODEL_COMPLETE NC_("RID_SVXITEMS_PAGEMODEL_COMPLETE", "Page Style: ") +#define RID_SVXITEMS_KERNING_COMPLETE NC_("RID_SVXITEMS_KERNING_COMPLETE", "Kerning ") +#define RID_SVXITEMS_KERNING_EXPANDED NC_("RID_SVXITEMS_KERNING_EXPANDED", "locked ") +#define RID_SVXITEMS_KERNING_CONDENSED NC_("RID_SVXITEMS_KERNING_CONDENSED", "Condensed ") +#define RID_SVXITEMS_GRAPHIC NC_("RID_SVXITEMS_GRAPHIC", "Graphic") +#define RID_SVXITEMS_EMPHASIS_NONE_STYLE NC_("RID_SVXITEMS_EMPHASIS_NONE_STYLE", "none") +#define RID_SVXITEMS_EMPHASIS_DOT_STYLE NC_("RID_SVXITEMS_EMPHASIS_DOT_STYLE", "Dots ") +#define RID_SVXITEMS_EMPHASIS_CIRCLE_STYLE NC_("RID_SVXITEMS_EMPHASIS_CIRCLE_STYLE", "Circle ") +// ??? disc == filled ring +#define RID_SVXITEMS_EMPHASIS_DISC_STYLE NC_("RID_SVXITEMS_EMPHASIS_DISC_STYLE", "Filled circle ") +#define RID_SVXITEMS_EMPHASIS_ACCENT_STYLE NC_("RID_SVXITEMS_EMPHASIS_ACCENT_STYLE", "Accent ") +#define RID_SVXITEMS_EMPHASIS_ABOVE_POS NC_("RID_SVXITEMS_EMPHASIS_ABOVE_POS", "Above") +#define RID_SVXITEMS_EMPHASIS_BELOW_POS NC_("RID_SVXITEMS_EMPHASIS_BELOW_POS", "Below") +#define RID_SVXITEMS_TWOLINES_OFF NC_("RID_SVXITEMS_TWOLINES_OFF", "Double-lined off") +#define RID_SVXITEMS_TWOLINES NC_("RID_SVXITEMS_TWOLINES", "Double-lined") +#define RID_SVXITEMS_SCRPTSPC_OFF NC_("RID_SVXITEMS_SCRPTSPC_OFF", "No automatic character spacing") +#define RID_SVXITEMS_SCRPTSPC_ON NC_("RID_SVXITEMS_SCRPTSPC_ON", "No automatic character spacing") +#define RID_SVXITEMS_HNGPNCT_OFF NC_("RID_SVXITEMS_HNGPNCT_OFF", "No hanging punctuation at line end") +#define RID_SVXITEMS_HNGPNCT_ON NC_("RID_SVXITEMS_HNGPNCT_ON", "Hanging punctuation at line end") +#define RID_SVXITEMS_FORBIDDEN_RULE_OFF NC_("RID_SVXITEMS_FORBIDDEN_RULE_OFF", "Apply list of forbidden characters to beginning and end of lines") +#define RID_SVXITEMS_FORBIDDEN_RULE_ON NC_("RID_SVXITEMS_FORBIDDEN_RULE_ON", "Don't apply list of forbidden characters to beginning and end of lines") +#define RID_SVXITEMS_CHARROTATE_OFF NC_("RID_SVXITEMS_CHARROTATE_OFF", "No rotated characters") +#define RID_SVXITEMS_CHARROTATE NC_("RID_SVXITEMS_CHARROTATE", "Character rotated by $(ARG1)°") +#define RID_SVXITEMS_CHARROTATE_FITLINE NC_("RID_SVXITEMS_CHARROTATE_FITLINE", "Fit to line") +#define RID_SVXITEMS_TEXTROTATE_OFF NC_("RID_SVXITEMS_TEXTROTATE_OFF", "Text is not rotated") +#define RID_SVXITEMS_TEXTROTATE NC_("RID_SVXITEMS_TEXTROTATE", "Text is rotated by $(ARG1)°") +#define RID_SVXITEMS_CHARSCALE NC_("RID_SVXITEMS_CHARSCALE", "Characters scaled $(ARG1)%") +#define RID_SVXITEMS_CHARSCALE_OFF NC_("RID_SVXITEMS_CHARSCALE_OFF", "No scaled characters") +#define RID_SVXITEMS_RELIEF_NONE NC_("RID_SVXITEMS_RELIEF_NONE", "No relief") +#define RID_SVXITEMS_RELIEF_EMBOSSED NC_("RID_SVXITEMS_RELIEF_EMBOSSED", "Relief") +#define RID_SVXITEMS_RELIEF_ENGRAVED NC_("RID_SVXITEMS_RELIEF_ENGRAVED", "Engraved") +#define RID_SVXITEMS_PARAVERTALIGN_AUTO NC_("RID_SVXITEMS_PARAVERTALIGN_AUTO", "Automatic text alignment") +#define RID_SVXITEMS_PARAVERTALIGN_BASELINE NC_("RID_SVXITEMS_PARAVERTALIGN_BASELINE", "Text aligned to base line") +#define RID_SVXITEMS_PARAVERTALIGN_TOP NC_("RID_SVXITEMS_PARAVERTALIGN_TOP", "Text aligned top") +#define RID_SVXITEMS_PARAVERTALIGN_CENTER NC_("RID_SVXITEMS_PARAVERTALIGN_CENTER", "Text aligned middle") +#define RID_SVXITEMS_PARAVERTALIGN_BOTTOM NC_("RID_SVXITEMS_PARAVERTALIGN_BOTTOM", "Text aligned bottom") +#define RID_SVXITEMS_FRMDIR_HORI_LEFT_TOP NC_("RID_SVXITEMS_FRMDIR_HORI_LEFT_TOP", "Text direction left-to-right (horizontal)") +#define RID_SVXITEMS_FRMDIR_HORI_RIGHT_TOP NC_("RID_SVXITEMS_FRMDIR_HORI_RIGHT_TOP", "Text direction right-to-left (horizontal)") +#define RID_SVXITEMS_FRMDIR_VERT_TOP_RIGHT NC_("RID_SVXITEMS_FRMDIR_VERT_TOP_RIGHT", "Text direction right-to-left (vertical)") +#define RID_SVXITEMS_FRMDIR_VERT_TOP_LEFT NC_("RID_SVXITEMS_FRMDIR_VERT_TOP_LEFT", "Text direction left-to-right (vertical)") +#define RID_SVXITEMS_FRMDIR_ENVIRONMENT NC_("RID_SVXITEMS_FRMDIR_ENVIRONMENT", "Use superordinate object text direction setting") +#define RID_SVXITEMS_PARASNAPTOGRID_ON NC_("RID_SVXITEMS_PARASNAPTOGRID_ON", "Paragraph snaps to text grid (if active)") +#define RID_SVXITEMS_PARASNAPTOGRID_OFF NC_("RID_SVXITEMS_PARASNAPTOGRID_OFF", "Paragraph does not snap to text grid") +#define RID_SVXITEMS_CHARHIDDEN_FALSE NC_("RID_SVXITEMS_CHARHIDDEN_FALSE", "Not hidden") +#define RID_SVXITEMS_CHARHIDDEN_TRUE NC_("RID_SVXITEMS_CHARHIDDEN_TRUE", "Hidden") -// Border lines (continued) -#define RID_DASH_DOT (RID_EDIT_START + 330) -#define RID_DASH_DOT_DOT (RID_EDIT_START + 331) +// enum SvxCellHorJustify ---------------------------------------------------- +#define RID_SVXITEMS_HORJUST_STANDARD NC_("RID_SVXITEMS_HORJUST_STANDARD", "Horizontal alignment default") +#define RID_SVXITEMS_HORJUST_LEFT NC_("RID_SVXITEMS_HORJUST_LEFT", "Align left") +#define RID_SVXITEMS_HORJUST_CENTER NC_("RID_SVXITEMS_HORJUST_CENTER", "Centered horizontally") +#define RID_SVXITEMS_HORJUST_RIGHT NC_("RID_SVXITEMS_HORJUST_RIGHT", "Align right") +#define RID_SVXITEMS_HORJUST_BLOCK NC_("RID_SVXITEMS_HORJUST_BLOCK", "Justify") +#define RID_SVXITEMS_HORJUST_REPEAT NC_("RID_SVXITEMS_HORJUST_REPEAT", "Repeat alignment") -#if 331 > (RID_EDIT_END-RID_EDIT_START) -#error Resource overflow in #line, #file -#endif +// enum SvxCellVerJustify ---------------------------------------------------- +#define RID_SVXITEMS_VERJUST_STANDARD NC_("RID_SVXITEMS_VERJUST_STANDARD", "Vertical alignment default") +#define RID_SVXITEMS_VERJUST_TOP NC_("RID_SVXITEMS_VERJUST_TOP", "Align to top") +#define RID_SVXITEMS_VERJUST_CENTER NC_("RID_SVXITEMS_VERJUST_CENTER", "Centered vertically") +#define RID_SVXITEMS_VERJUST_BOTTOM NC_("RID_SVXITEMS_VERJUST_BOTTOM", "Align to bottom") + +// enum SvxCellJustifyMethod ---------------------------------------------------- +#define RID_SVXITEMS_JUSTMETHOD_AUTO NC_("RID_SVXITEMS_JUSTMETHOD_AUTO", "Automatic") +#define RID_SVXITEMS_JUSTMETHOD_DISTRIBUTE NC_("RID_SVXITEMS_JUSTMETHOD_DISTRIBUTE", "Distributed") + +#define RID_SVXSTR_PAPERBIN NC_("RID_SVXSTR_PAPERBIN", "Paper tray") +#define RID_SVXSTR_PAPERBIN_SETTINGS NC_("RID_SVXSTR_PAPERBIN_SETTINGS", "[From printer settings]") + +#define RID_EDITUNDO_DEL NC_("RID_EDITUNDO_DEL", "Delete") +#define RID_EDITUNDO_MOVE NC_("RID_EDITUNDO_MOVE", "Move") +#define RID_EDITUNDO_INSERT NC_("RID_EDITUNDO_INSERT", "Insert") +#define RID_EDITUNDO_REPLACE NC_("RID_EDITUNDO_REPLACE", "Replace") +#define RID_EDITUNDO_SETATTRIBS NC_("RID_EDITUNDO_SETATTRIBS", "Apply attributes") +#define RID_EDITUNDO_RESETATTRIBS NC_("RID_EDITUNDO_RESETATTRIBS", "Reset attributes") +#define RID_EDITUNDO_INDENT NC_("RID_EDITUNDO_INDENT", "Indent") +#define RID_EDITUNDO_SETSTYLE NC_("RID_EDITUNDO_SETSTYLE", "Apply Styles") +#define RID_EDITUNDO_TRANSLITERATE NC_("RID_EDITUNDO_TRANSLITERATE", "Change Case") +#define RID_STR_WORD NC_("RID_STR_WORD", "Word is %x") +#define RID_STR_PARAGRAPH NC_("RID_STR_PARAGRAPH", "Paragraph is %x") +#define RID_SVXSTR_AUTOMATIC NC_("RID_SVXSTR_AUTOMATIC", "Automatic") + +#define RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION NC_("RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION", "Image bullet in paragraph") +#define RID_SVXSTR_A11Y_IMAGEBULLET_NAME NC_("RID_SVXSTR_A11Y_IMAGEBULLET_NAME", "Image bullet") +#define RID_SVXSTR_A11Y_PARAGRAPH_DESCRIPTION NC_("RID_SVXSTR_A11Y_PARAGRAPH_DESCRIPTION", "Paragraph: $(ARG) ") + +#define RID_SVXSTR_QUERY_CONTINUE NC_("RID_SVXSTR_QUERY_CONTINUE", "Continue checking at beginning of document?") +#define RID_SVXSTR_QUERY_BW_CONTINUE NC_("RID_SVXSTR_QUERY_BW_CONTINUE", "Continue checking at end of document?") +#define RID_SVXSTR_DIC_ERR_UNKNOWN NC_("RID_SVXSTR_DIC_ERR_UNKNOWN", "Word cannot be added to dictionary\ndue to unknown reason.") +#define RID_SVXSTR_DIC_ERR_FULL NC_("RID_SVXSTR_DIC_ERR_FULL", "The dictionary is already full.") +#define RID_SVXSTR_DIC_ERR_READONLY NC_("RID_SVXSTR_DIC_ERR_READONLY", "The dictionary is read-only.") + +#define RID_OUTLUNDO_DEPTH NC_("RID_OUTLUNDO_DEPTH", "Indent") +#define RID_OUTLUNDO_EXPAND NC_("RID_OUTLUNDO_EXPAND", "Show subpoints") +#define RID_OUTLUNDO_COLLAPSE NC_("RID_OUTLUNDO_COLLAPSE", "Collapse") +#define RID_OUTLUNDO_ATTR NC_("RID_OUTLUNDO_ATTR", "Apply attributes") +#define RID_OUTLUNDO_INSERT NC_("RID_OUTLUNDO_INSERT", "Insert") #endif diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx index f402730653a0..62e5de2aad2b 100644 --- a/include/editeng/editview.hxx +++ b/include/editeng/editview.hxx @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include diff --git a/include/editeng/eerdll.hxx b/include/editeng/eerdll.hxx index 4af426358849..1f1a8411c7c6 100644 --- a/include/editeng/eerdll.hxx +++ b/include/editeng/eerdll.hxx @@ -20,8 +20,8 @@ #ifndef INCLUDED_EDITENG_EERDLL_HXX #define INCLUDED_EDITENG_EERDLL_HXX -#include #include +#include #include class GlobalEditData; @@ -30,13 +30,7 @@ namespace editeng class SharedVclResources; } -class EDITENG_DLLPUBLIC EditResId: public ResId -{ -public: - EditResId( sal_uInt16 nId ); - static OUString GetString(sal_uInt16 nId) - { return EditResId(nId); } -}; +OUString EDITENG_DLLPUBLIC EditResId(const char *pId); class EditDLL { @@ -47,7 +41,7 @@ public: EditDLL(); ~EditDLL(); - static ResMgr* GetResMgr(); + static std::locale& GetResLocale(); GlobalEditData* GetGlobalData() const { return pGlobalData.get(); } std::shared_ptr GetSharedVclResources(); static EditDLL& Get(); diff --git a/include/editeng/frmdir.hxx b/include/editeng/frmdir.hxx index 85f60b30da2a..b0ada2cce30a 100644 --- a/include/editeng/frmdir.hxx +++ b/include/editeng/frmdir.hxx @@ -51,6 +51,7 @@ enum class SvxFrameDirection Environment = css::text::WritingMode2::CONTEXT }; +const char* getFrmDirResId(size_t nIndex); #endif // INCLUDED_EDITENG_FRMDIR_HXX diff --git a/include/editeng/itemtype.hxx b/include/editeng/itemtype.hxx index 873d5cd7febb..e6ac557e02c7 100644 --- a/include/editeng/itemtype.hxx +++ b/include/editeng/itemtype.hxx @@ -34,10 +34,10 @@ class IntlWrapper; static const sal_Unicode cpDelim[] = { ',' , ' ', '\0' }; -EDITENG_DLLPUBLIC OUString GetSvxString( sal_uInt16 nId ); +EDITENG_DLLPUBLIC OUString GetSvxString(const char* pId); EDITENG_DLLPUBLIC OUString GetMetricText( long nVal, MapUnit eSrcUnit, MapUnit eDestUnit, const IntlWrapper * pIntl ); OUString GetColorString( const Color& rCol ); -EDITENG_DLLPUBLIC sal_uInt16 GetMetricId( MapUnit eUnit ); +EDITENG_DLLPUBLIC const char* GetMetricId(MapUnit eUnit); inline long Scale( long nVal, long nMult, long nDiv ) diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index f7a015b4a0a5..7b7f028c6aec 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include diff --git a/include/editeng/outlobj.hxx b/include/editeng/outlobj.hxx index 24c806b6952e..394a878d1085 100644 --- a/include/editeng/outlobj.hxx +++ b/include/editeng/outlobj.hxx @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx index 45166193487c..ef1c058eaa4e 100644 --- a/include/formula/FormulaCompiler.hxx +++ b/include/formula/FormulaCompiler.hxx @@ -361,8 +361,8 @@ private: void InitSymbolsEnglishXL() const; /// only SymbolsEnglishXL, on demand void InitSymbolsOOXML() const; /// only SymbolsOOXML, on demand - void loadSymbols( sal_uInt16 nSymbols, FormulaGrammar::Grammar eGrammar, NonConstOpCodeMapPtr& rxMap, - SeparatorType eSepType = SeparatorType::SEMICOLON_BASE ) const; + void loadSymbols(const std::pair* pSymbols, FormulaGrammar::Grammar eGrammar, NonConstOpCodeMapPtr& rxMap, + SeparatorType eSepType = SeparatorType::SEMICOLON_BASE) const; /** Check pCurrentFactorToken for nParam's (0-based) ForceArray types and set ForceArray at rCurr if so. Set nParam+1 as 1-based diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx index 9b6cf62ecd19..e88cd775ca57 100644 --- a/include/formula/formula.hxx +++ b/include/formula/formula.hxx @@ -89,11 +89,6 @@ protected: class FORMULA_DLLPUBLIC FormulaDlg: private OModuleClient, public SfxModelessDialog, public IFormulaEditorHelper - // order of base classes is important, as OModuleClient controls the - // lifecycle of the ResMgr passed into SfxModelessDialog (via - // formula::ModuleRes), and at least with DBG_UTIL calling TestRes in - // ~Resource, the ResMgr must outlive the Resource (from which - // SfxModelessDialog ultimately derives) { friend class FormulaDlg_Impl; public: diff --git a/include/fpicker/fpicker.hrc b/include/fpicker/fpicker.hrc new file mode 100644 index 000000000000..ad0569aed0ed --- /dev/null +++ b/include/fpicker/fpicker.hrc @@ -0,0 +1,37 @@ +/* -*- 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/. + */ +#ifndef INCLUDED_FPICKER_FPICKER_HRC +#define INCLUDED_FPICKER_FPICKER_HRC + +#define NC_(Context, String) (Context "\004" u8##String) + +#define STR_SVT_FILEPICKER_AUTO_EXTENSION NC_("STR_SVT_FILEPICKER_AUTO_EXTENSION", "~Automatic file name extension") +#define STR_SVT_FILEPICKER_PASSWORD NC_("STR_SVT_FILEPICKER_PASSWORD", "Save with pass~word") +#define STR_SVT_FILEPICKER_FILTER_OPTIONS NC_("STR_SVT_FILEPICKER_FILTER_OPTIONS", "~Edit filter settings") +#define STR_SVT_FILEPICKER_READONLY NC_("STR_SVT_FILEPICKER_READONLY", "~Read-only") +#define STR_SVT_FILEPICKER_INSERT_AS_LINK NC_("STR_SVT_FILEPICKER_INSERT_AS_LINK", "~Link") +#define STR_SVT_FILEPICKER_SHOW_PREVIEW NC_("STR_SVT_FILEPICKER_SHOW_PREVIEW", "Pr~eview") +#define STR_SVT_FILEPICKER_PLAY NC_("STR_SVT_FILEPICKER_PLAY", "~Play") +#define STR_SVT_FILEPICKER_VERSION NC_("STR_SVT_FILEPICKER_VERSION", "~Version:") +#define STR_SVT_FILEPICKER_TEMPLATES NC_("STR_SVT_FILEPICKER_TEMPLATES", "S~tyles:") +#define STR_SVT_FILEPICKER_IMAGE_TEMPLATE NC_("STR_SVT_FILEPICKER_IMAGE_TEMPLATE", "Style:") +#define STR_SVT_FILEPICKER_SELECTION NC_("STR_SVT_FILEPICKER_SELECTION", "~Selection") +#define STR_SVT_FILEPICKER_FILTER_TITLE NC_("STR_SVT_FILEPICKER_FILTER_TITLE", "File ~type:") +#define STR_SVT_FOLDERPICKER_DEFAULT_TITLE NC_("STR_SVT_FOLDERPICKER_DEFAULT_TITLE", "Select Path") +#define STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION NC_("STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION", "Please select a folder.") +#define STR_SVT_ALREADYEXISTOVERWRITE NC_("STR_SVT_ALREADYEXISTOVERWRITE", "A file named \"$filename$\" already exists.\n\nDo you want to replace it?") +#define STR_SVT_DELETESERVICE NC_("STR_SVT_DELETESERVICE", "Are you sure you want to delete the service?\n\"$servicename$\"") +#define STR_SVT_ROOTLABEL NC_("STR_SVT_ROOTLABEL", "Root") +#define STR_FILTERNAME_ALL NC_("STR_FILTERNAME_ALL", "All files") +#define STR_FILEDLG_OPEN NC_("STR_FILEDLG_OPEN", "Open") +#define STR_FILEDLG_TYPE NC_("STR_FILEDLG_TYPE", "File ~type") +#define STR_FILEDLG_SAVE NC_("STR_FILEDLG_SAVE", "Save") + +#endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/rsc/rsc-vcl-shared-types.hxx b/include/rsc/rsc-vcl-shared-types.hxx deleted file mode 100644 index bc943b078fb9..000000000000 --- a/include/rsc/rsc-vcl-shared-types.hxx +++ /dev/null @@ -1,139 +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_RSC_RSC_VCL_SHARED_TYPES_HXX -#define INCLUDED_RSC_RSC_VCL_SHARED_TYPES_HXX - -#include -#include - -enum class TimeFieldFormat : sal_Int32 { F_NONE, F_SEC, F_SEC_CS }; - -enum class KeyFuncType : sal_Int32 { DONTKNOW, NEW, OPEN, SAVE, - SAVEAS, PRINT, CLOSE, QUIT, - CUT, COPY, PASTE, UNDO, - REDO, DELETE, REPEAT, FIND, - FINDBACKWARD, PROPERTIES, FRONT }; - -enum class MenuItemType { DONTKNOW, STRING, IMAGE, STRINGIMAGE, SEPARATOR }; - -enum class MenuItemBits : sal_Int16 -{ - NONE = 0x0000, - CHECKABLE = 0x0001, - RADIOCHECK = 0x0002, - AUTOCHECK = 0x0004, - ABOUT = 0x0008, - HELP = 0x0010, - POPUPSELECT = 0x0020, - // These have been said to be a preliminary (sic) solution since 2007 - NOSELECT = 0x0040, - ICON = 0x0080, - TEXT = 0x0100, -}; -namespace o3tl -{ - template<> struct typed_flags : is_typed_flags {}; -} - -enum class ToolBoxItemBits -{ - NONE = 0x0000, - CHECKABLE = 0x0001, - RADIOCHECK = 0x0002, - AUTOCHECK = 0x0004, - LEFT = 0x0008, - AUTOSIZE = 0x0010, - DROPDOWN = 0x0020, - REPEAT = 0x0040, - DROPDOWNONLY = 0x00a0, // 0x0080 | DROPDOWN - TEXT_ONLY = 0x0100, - ICON_ONLY = 0x0200 -}; -namespace o3tl -{ - template<> struct typed_flags : is_typed_flags {}; -} - -enum class ToolBoxItemType { DONTKNOW, BUTTON, SPACE, SEPARATOR, BREAK }; - -enum class ButtonType { SYMBOLONLY, TEXT, SYMBOLTEXT }; - -enum class SymbolType : sal_uInt16 -{ - DONTKNOW = 0, - IMAGE = 1, - ARROW_UP = 2, - ARROW_DOWN = 3, - ARROW_LEFT = 4, - ARROW_RIGHT = 5, - SPIN_UP = 6, - SPIN_DOWN = 7, - SPIN_LEFT = 8, - SPIN_RIGHT = 9, - FIRST = 10, - LAST = 11, - PREV = 12, - NEXT = 13, - PAGEUP = 14, - PAGEDOWN = 15, - PLAY = 16, - STOP = 19, - CLOSE = 25, - ROLLUP = 26, - ROLLDOWN = 27, - CHECKMARK = 28, - RADIOCHECKMARK = 29, - FLOAT = 31, - DOCK = 32, - HIDE = 33, - HELP = 34, - PLUS = 35, - MENU = SymbolType::SPIN_DOWN -}; - - -// Border styles for SetBorder() -enum class WindowBorderStyle : sal_Int16 -{ - NONE = 0x0000, - NORMAL = 0x0001, - MONO = 0x0002, - MENU = 0x0010, - NWF = 0x0020, - NOBORDER = 0x1000, - REMOVEBORDER = 0x2000 -}; -namespace o3tl -{ - template<> struct typed_flags : is_typed_flags {}; -} - -#define KEY_CODE_MASK ((sal_uInt16)0x0FFF) - -// Modifier keys -#define KEY_SHIFT ((sal_uInt16)0x1000) -#define KEY_MOD1 ((sal_uInt16)0x2000) -#define KEY_MOD2 ((sal_uInt16)0x4000) -#define KEY_MOD3 ((sal_uInt16)0x8000) -#define KEY_MODIFIERS_MASK ((sal_uInt16)0xF000) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/StyleManager.hxx b/include/sfx2/StyleManager.hxx index b67a710b92a4..7c3bcfeb1d3f 100644 --- a/include/sfx2/StyleManager.hxx +++ b/include/sfx2/StyleManager.hxx @@ -15,7 +15,7 @@ #include #include -#include +#include #include diff --git a/include/sfx2/StylePreviewRenderer.hxx b/include/sfx2/StylePreviewRenderer.hxx index 6e3cf72b2212..eb016d6cf1d4 100644 --- a/include/sfx2/StylePreviewRenderer.hxx +++ b/include/sfx2/StylePreviewRenderer.hxx @@ -12,7 +12,6 @@ #include #include -#include #include #include diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index 0b83b0561fcd..28e41d416863 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -75,7 +75,6 @@ namespace vcl { class Window; } struct SfxChildWinFactory; struct SfxStbCtrlFactory; struct SfxTbxCtrlFactory; -class SimpleResMgr; class ModalDialog; class SbxArray; class SbxValue; @@ -134,8 +133,8 @@ public: static SfxApplication* GetOrCreate(); static SfxApplication* Get(); - // Resource Manager - static ResMgr* GetSfxResManager(); + // Resource Locale + static std::locale* GetSfxResLocale(); // DDE #if defined(_WIN32) diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx index 014196c50578..de487dafaa3f 100644 --- a/include/sfx2/module.hxx +++ b/include/sfx2/module.hxx @@ -52,7 +52,7 @@ namespace com { namespace sun { namespace star { namespace frame { class SFX2_DLLPUBLIC SfxModule : public SfxShell { private: - ResMgr* pResMgr; + std::locale m_aResLocale; // Warning this cannot be turned into a unique_ptr. // SfxInterface destruction in the SfxSlotPool refers again to pImpl after deletion of pImpl has commenced. See tdf#100270 @@ -69,10 +69,10 @@ private: public: - SfxModule( ResMgr* pMgrP, std::initializer_list pFactoryList); - virtual ~SfxModule() override; + SfxModule(const std::locale& rResLocale, std::initializer_list pFactoryList); + virtual ~SfxModule() override; - ResMgr* GetResMgr(); + const std::locale& GetResLocale() const { return m_aResLocale; } SfxSlotPool* GetSlotPool() const; void RegisterToolBoxControl(const SfxTbxCtrlFactory&); diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx index e8b12ec54cec..a0a9afb0ef7f 100644 --- a/include/sfx2/objface.hxx +++ b/include/sfx2/objface.hxx @@ -26,7 +26,6 @@ #include #include #include -#include struct SfxInterface_Impl; class SfxConfigItem; diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 5b97ce138570..6b6f5758dfca 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc index 8f24aa447dbe..1b5e603d6b40 100644 --- a/include/sfx2/sfx.hrc +++ b/include/sfx2/sfx.hrc @@ -76,52 +76,6 @@ #define RID_DEFAULTABOUT (RID_SFX_START+0) -// +13 already used! -#define STR_STYLE_FILTER_HIERARCHICAL (RID_SFX_START+1200) - -#define STR_NONAME (RID_SFX_START+100) -#define STR_NONE (RID_SFX_START+101) -#define STR_STANDARD (RID_SFX_START+104) -#define STR_READONLY (RID_SFX_START+105) - -#define STR_SFX_FILTERNAME_ALL (RID_SFX_START+106) -#define STR_SFX_FILTERNAME_PDF (RID_SFX_START+107) -#define STR_EDIT (RID_SFX_START+108) - -#define STR_BYTES (RID_SFX_START+111) -#define STR_KB (RID_SFX_START+112) -#define STR_MB (RID_SFX_START+113) -#define STR_GB (RID_SFX_START+114) -#define STR_QUERY_LASTVERSION (RID_SFX_START+115) -#define STR_STANDARD_SHORTCUT (RID_SFX_START+117) -#define STR_REPAIREDDOCUMENT (RID_SFX_START+118) -#define STR_ERRUNOEVENTBINDUNG (RID_SFX_START+119) -#define STR_SHARED (RID_SFX_START+120) -#define RID_XMLSEC_DOCUMENTSIGNED (RID_SFX_START+121) -#define STR_EMBEDDED_TITLE (RID_SFX_START+122) -#define STR_PASSWD_EMPTY (RID_SFX_START+123) -#define STR_PASSWD_MIN_LEN (RID_SFX_START+124) -#define STR_NONCHECKEDOUT_DOCUMENT (RID_SFX_START+125) -#define STR_CHECKOUT (RID_SFX_START+126) -#define STR_READONLY_EDIT (RID_SFX_START+127) -#define STR_READONLY_DOCUMENT (RID_SFX_START+128) -#define STR_PASSWD_MIN_LEN1 (RID_SFX_START+129) -#define STR_MODULENOTINSTALLED (RID_SFX_START+130) -#define STR_CLASSIFIED_DOCUMENT (RID_SFX_START+131) -#define STR_TARGET_DOC_NOT_CLASSIFIED (RID_SFX_START+132) -#define STR_DOC_CLASSIFICATION_TOO_LOW (RID_SFX_START+133) -#define STR_CLASSIFIED_INTELLECTUAL_PROPERTY (RID_SFX_START+134) -#define STR_CLASSIFIED_NATIONAL_SECURITY (RID_SFX_START+135) -#define STR_CLASSIFIED_EXPORT_CONTROL (RID_SFX_START+136) -#define STR_READONLY_SIGN (RID_SFX_START+137) -#define STR_READONLY_PDF (RID_SFX_START+138) -#define STR_SIGNATURE_BROKEN (RID_SFX_START+139) -#define STR_SIGNATURE_INVALID (RID_SFX_START+140) -#define STR_SIGNATURE_SHOW (RID_SFX_START+141) -#define STR_SIGNATURE_NOTVALIDATED (RID_SFX_START+142) -#define STR_SIGNATURE_PARTIAL_OK (RID_SFX_START+143) -#define STR_SIGNATURE_OK (RID_SFX_START+144) - // group ids // !! If you add a new group, please change sfxbasecontroller.cxx and @@ -172,7 +126,7 @@ #define MID_DOCINFO_DESCRIPTION 0x13 #define MID_DOCINFO_KEYWORDS 0x17 #define MID_DOCINFO_SUBJECT 0x1b -#define MID_DOCINFO_TITLE 0x1d +#define MID_DOCINFO_TITLE 0x1d #define MID_DOCINFO_AUTOLOADENABLED 0x2d #define MID_DOCINFO_AUTOLOADURL 0x2e #define MID_DOCINFO_AUTOLOADSECS 0x2f @@ -183,8 +137,8 @@ // only for FastPropertySet #define MID_TYPE 0x38 -#define MID_VALUE 0x39 -#define MID_VALUESET 0x40 +#define MID_VALUE 0x39 +#define MID_VALUESET 0x40 // Config-Ids ----------------------------------------------------------- diff --git a/include/sfx2/sfxresid.hxx b/include/sfx2/sfxresid.hxx index 945d79939cdb..b7b7f553c4ef 100644 --- a/include/sfx2/sfxresid.hxx +++ b/include/sfx2/sfxresid.hxx @@ -20,18 +20,16 @@ #define INCLUDED_SFX2_SFXRESID_HXX #include -#include +#include +#include -struct SFX2_DLLPUBLIC SfxResMgr +struct SFX2_DLLPUBLIC SfxResLocale { - static ResMgr* GetResMgr(); - static void DeleteResMgr(); + static std::locale* GetResLocale(); + static void DeleteResLocale(); }; -inline OUString SfxResId(sal_uInt16 nId) -{ - return ResId(nId, *SfxResMgr::GetResMgr()); -} +SFX2_DLLPUBLIC OUString SfxResId(const char* pId); #endif diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index 82364685964e..e82a000a9f13 100644 --- a/include/sfx2/shell.hxx +++ b/include/sfx2/shell.hxx @@ -30,7 +30,6 @@ #include #include -class ResMgr; namespace vcl { class Window; } class ToolBox; class SfxItemPool; diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc new file mode 100644 index 000000000000..1b0ea6ccb2ff --- /dev/null +++ b/include/sfx2/strings.hrc @@ -0,0 +1,281 @@ +/* -*- 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_SFX2_INC_STRINGS_HRC +#define INCLUDED_SFX2_INC_STRINGS_HRC + +#define NC_(Context, String) (Context "\004" u8##String) + +#define STR_TEMPLATE_FILTER NC_("STR_TEMPLATE_FILTER", "Templates") +#define STR_SAVEDOC NC_("STR_SAVEDOC", "~Save") +#define STR_SAVEASDOC NC_("STR_SAVEASDOC", "Save ~As...") +#define STR_SAVEACOPY NC_("STR_SAVEACOPY", "Save a Copy...") +#define STR_CLOSEDOC NC_("STR_CLOSEDOC", "~Close") +#define STR_OPEN NC_("STR_OPEN", "Open") +#define STR_EDIT_TEMPLATE NC_("STR_EDIT_TEMPLATE", "Edit") +#define STR_DEFAULT_TEMPLATE NC_("STR_DEFAULT_TEMPLATE", "Set As Default") +#define STR_RESET_DEFAULT NC_("STR_RESET_DEFAULT", "Reset Default") +#define STR_DELETE NC_("STR_DELETE", "Delete") +#define STR_RENAME NC_("STR_RENAME", "Rename") +#define STR_CATEGORY_RENAME NC_("STR_CATEGORY_RENAME", "Rename Category") +#define STR_RENAME_TEMPLATE NC_("STR_RENAME_TEMPLATE", "Enter New Name: ") +#define STR_TEMPLATE_TOOLTIP NC_("STR_TEMPLATE_TOOLTIP", "Title: $1\nCategory: $2") +#define STR_TEMPLATE_SELECTION NC_("STR_TEMPLATE_SELECTION", "Select a Template") +#define STR_AUTOMATICVERSION NC_("STR_AUTOMATICVERSION", "Automatically saved version") +#define STR_EXPORTBUTTON NC_("STR_EXPORTBUTTON", "Export") +#define STR_LABEL_FILEFORMAT NC_("STR_LABEL_FILEFORMAT", "File format:") +#define STR_HIDDENINFO_CONTAINS NC_("STR_HIDDENINFO_CONTAINS", "This document contains:\n\n") +#define STR_HIDDENINFO_RECORDCHANGES NC_("STR_HIDDENINFO_RECORDCHANGES", "Recorded changes") +#define STR_HIDDENINFO_NOTES NC_("STR_HIDDENINFO_NOTES", "Notes") +#define STR_HIDDENINFO_DOCVERSIONS NC_("STR_HIDDENINFO_DOCVERSIONS", "Document versions") +#define STR_HIDDENINFO_CONTINUE_SAVING NC_("STR_HIDDENINFO_CONTINUE_SAVING", "Do you want to continue saving the document?") +#define STR_HIDDENINFO_CONTINUE_PRINTING NC_("STR_HIDDENINFO_CONTINUE_PRINTING", "Do you want to continue printing the document?") +#define STR_HIDDENINFO_CONTINUE_SIGNING NC_("STR_HIDDENINFO_CONTINUE_SIGNING", "Do you want to continue signing the document?") +#define STR_HIDDENINFO_CONTINUE_CREATEPDF NC_("STR_HIDDENINFO_CONTINUE_CREATEPDF", "Do you want to continue creating a PDF file?") +#define STR_NEW_FILENAME_SAVE NC_("STR_NEW_FILENAME_SAVE", "If you do not want to overwrite the original document, you should save your work under a new filename.") +// Used in the title of a shared document. +#define STR_SHARED NC_("STR_SHARED", " (shared)") +#define STR_XMLSEC_ODF12_EXPECTED NC_("STR_XMLSEC_ODF12_EXPECTED", "The document format version is set to ODF 1.1 (OpenOffice.org 2.x) in Tools-Options-Load/Save-General. Signing documents requires ODF 1.2 (OpenOffice.org 3.x).") +#define STR_XMLSEC_QUERY_SAVESIGNEDBEFORESIGN NC_("STR_XMLSEC_QUERY_SAVESIGNEDBEFORESIGN", "The document has to be saved before it can be signed. Saving the document removes all present signatures.\nDo you want to save the document?") +#define STR_QRYTEMPL_MESSAGE NC_("STR_QRYTEMPL_MESSAGE", "The template '$(ARG1)' on which this document is based, has been modified. Do you want to update style based formatting according to the modified template?") +#define STR_QRYTEMPL_UPDATE_BTN NC_("STR_QRYTEMPL_UPDATE_BTN", "~Update Styles") +#define STR_QRYTEMPL_KEEP_BTN NC_("STR_QRYTEMPL_KEEP_BTN", "~Keep Old Styles") +#define STR_ACTION_REFRESH NC_("STR_ACTION_REFRESH", "Refresh") +// leave ending space +#define STR_ACTION_DEFAULT NC_("STR_ACTION_DEFAULT", "Reset Default Template ") +#define STR_CATEGORY_NEW NC_("STR_CATEGORY_NEW", "New Category") +#define STR_CATEGORY_DELETE NC_("STR_CATEGORY_DELETE", "Delete Category") +#define STR_CATEGORY_SELECT NC_("STR_CATEGORY_SELECT", "Select Category") +#define STR_MSG_EXPORT_SUCCESS NC_("STR_MSG_EXPORT_SUCCESS", "$1 templates successfully exported.") +#define STR_MSG_QUERY_COPY NC_("STR_MSG_QUERY_COPY", "$1 could not be moved to the category \"$2\". Do you want to copy the template instead?") +#define STR_CREATE_ERROR NC_("STR_CREATE_ERROR", "Cannot create category: $1") +#define STR_ERROR_SAVEAS NC_("STR_ERROR_SAVEAS", "Cannot save template: $1") +#define STR_INPUT_NEW NC_("STR_INPUT_NEW", "Enter category name:") +#define STR_MSG_ERROR_LOCAL_MOVE NC_("STR_MSG_ERROR_LOCAL_MOVE", "Error moving the following templates to $1.\n$2") +#define STR_MSG_ERROR_EXPORT NC_("STR_MSG_ERROR_EXPORT", "Error exporting the following templates:\n$1") +#define STR_MSG_ERROR_IMPORT NC_("STR_MSG_ERROR_IMPORT", "Error importing the following templates to $1:\n$2") +#define STR_MSG_ERROR_DELETE_TEMPLATE NC_("STR_MSG_ERROR_DELETE_TEMPLATE", "The following templates cannot be deleted:\n$1") +#define STR_MSG_ERROR_DELETE_FOLDER NC_("STR_MSG_ERROR_DELETE_FOLDER", "The following folders cannot be deleted:\n$1") +#define STR_QMSG_SEL_FOLDER_DELETE NC_("STR_QMSG_SEL_FOLDER_DELETE", "Do you want to delete the selected folders?") +#define STR_QMSG_TEMPLATE_OVERWRITE NC_("STR_QMSG_TEMPLATE_OVERWRITE", "A template named $1 already exist in $2. Do you want to overwrite it?") +#define STR_QMSG_SEL_TEMPLATE_DELETE NC_("STR_QMSG_SEL_TEMPLATE_DELETE", "Do you want to delete the selected templates?") +#define STR_QMSG_ERROR_OPENING_FILE NC_("STR_QMSG_ERROR_OPENING_FILE", "An error occurred during opening the file. This may be caused by incorrect file contents.\n") +#define STR_QMSG_ERROR_OPENING_FILE_DETAILS NC_("STR_QMSG_ERROR_OPENING_FILE_DETAILS", "The error details are:\n") +#define STR_QMSG_ERROR_OPENING_FILE_CONTINUE NC_("STR_QMSG_ERROR_OPENING_FILE_CONTINUE", "\nProceeding with import may cause data loss or corruption, and application may become unstable or crash.\n\nDo you want to ignore the error and attempt to continue loading the file?") + +#define STR_HELP_WINDOW_TITLE NC_("STR_HELP_WINDOW_TITLE", "%PRODUCTNAME Help") +#define STR_HELP_BUTTON_INDEX_ON NC_("STR_HELP_BUTTON_INDEX_ON", "Show Navigation Pane") +#define STR_HELP_BUTTON_INDEX_OFF NC_("STR_HELP_BUTTON_INDEX_OFF", "Hide Navigation Pane") +#define STR_HELP_BUTTON_START NC_("STR_HELP_BUTTON_START", "First Page") +#define STR_HELP_BUTTON_PREV NC_("STR_HELP_BUTTON_PREV", "Previous Page") +#define STR_HELP_BUTTON_NEXT NC_("STR_HELP_BUTTON_NEXT", "Next Page") +#define STR_HELP_BUTTON_PRINT NC_("STR_HELP_BUTTON_PRINT", "Print...") +#define STR_HELP_BUTTON_ADDBOOKMARK NC_("STR_HELP_BUTTON_ADDBOOKMARK", "Add to Bookmarks...") +#define STR_HELP_BUTTON_SEARCHDIALOG NC_("STR_HELP_BUTTON_SEARCHDIALOG", "Find on this Page...") +#define STR_HELP_BUTTON_SOURCEVIEW NC_("STR_HELP_BUTTON_SOURCEVIEW", "HTML Source") +#define STR_HELP_MENU_TEXT_SELECTION_MODE NC_("STR_HELP_MENU_TEXT_SELECTION_MODE", "Select Text") +#define STR_HELP_MENU_TEXT_COPY NC_("STR_HELP_MENU_TEXT_COPY", "~Copy") +#define STR_INFO_NOSEARCHRESULTS NC_("STR_INFO_NOSEARCHRESULTS", "No topics found.") +#define STR_INFO_NOSEARCHTEXTFOUND NC_("STR_INFO_NOSEARCHTEXTFOUND", "The text you entered was not found.") +#define RID_HELP_ONSTARTUP_TEXT NC_("RID_HELP_ONSTARTUP_TEXT", "~Display %PRODUCTNAME %MODULENAME Help at Startup") + +#define STR_NONAME NC_("STR_NONAME", "Untitled") +#define STR_STANDARD_SHORTCUT NC_("STR_STANDARD_SHORTCUT", "Standard") +#define STR_BYTES NC_("STR_BYTES", "Bytes") +#define STR_KB NC_("STR_KB", "KB") +#define STR_MB NC_("STR_MB", "MB") +#define STR_GB NC_("STR_GB", "GB") +#define STR_QUERY_LASTVERSION NC_("STR_QUERY_LASTVERSION", "Cancel all changes?") +#define STR_NO_WEBBROWSER_FOUND NC_("STR_NO_WEBBROWSER_FOUND", "Opening \"$(ARG1)\" failed with error code $(ARG2) and message: \"$(ARG3)\"\nMaybe no web browser could be found on your system. In that case, please check your Desktop Preferences or install a web browser (for example, Firefox) in the default location requested during the browser installation.") +#define STR_NO_ABS_URI_REF NC_("STR_NO_ABS_URI_REF", "\"$(ARG1)\" is not an absolute URL that can be passed to an external application to open it.") +#define STR_GID_INTERN NC_("STR_GID_INTERN", "Internal") +#define STR_GID_APPLICATION NC_("STR_GID_APPLICATION", "Application") +#define STR_GID_VIEW NC_("STR_GID_VIEW", "View") +#define STR_GID_DOCUMENT NC_("STR_GID_DOCUMENT", "Documents") +#define STR_GID_EDIT NC_("STR_GID_EDIT", "Edit") +#define STR_GID_MACRO NC_("STR_GID_MACRO", "BASIC") +#define STR_GID_OPTIONS NC_("STR_GID_OPTIONS", "Options") +#define STR_GID_MATH NC_("STR_GID_MATH", "Math") +#define STR_GID_NAVIGATOR NC_("STR_GID_NAVIGATOR", "Navigate") +#define STR_GID_INSERT NC_("STR_GID_INSERT", "Insert") +#define STR_GID_FORMAT NC_("STR_GID_FORMAT", "Format") +#define STR_GID_TEMPLATE NC_("STR_GID_TEMPLATE", "Templates") +#define STR_GID_TEXT NC_("STR_GID_TEXT", "Text") +#define STR_GID_FRAME NC_("STR_GID_FRAME", "Frame") +#define STR_GID_GRAPHIC NC_("STR_GID_GRAPHIC", "Image") +#define STR_GID_TABLE NC_("STR_GID_TABLE", "Table") +#define STR_GID_ENUMERATION NC_("STR_GID_ENUMERATION", "Numbering") +#define STR_GID_DATA NC_("STR_GID_DATA", "Data") +#define STR_GID_SPECIAL NC_("STR_GID_SPECIAL", "Special Functions") +#define STR_GID_IMAGE NC_("STR_GID_IMAGE", "Image") +#define STR_GID_CHART NC_("STR_GID_CHART", "Chart") +#define STR_GID_EXPLORER NC_("STR_GID_EXPLORER", "Explorer") +#define STR_GID_CONNECTOR NC_("STR_GID_CONNECTOR", "Connector") +#define STR_GID_MODIFY NC_("STR_GID_MODIFY", "Modify") +#define STR_GID_DRAWING NC_("STR_GID_DRAWING", "Drawing") +#define STR_GID_CONTROLS NC_("STR_GID_CONTROLS", "Controls") +#define STR_QUITAPP NC_("STR_QUITAPP", "E~xit %PRODUCTNAME") +#define RID_STR_HELP NC_("RID_STR_HELP", "Help") +#define RID_STR_HLPFILENOTEXIST NC_("RID_STR_HLPFILENOTEXIST", "The help file for this topic is not installed.") +#define STR_QUICKSTART_EXIT NC_("STR_QUICKSTART_EXIT", "Exit Quickstarter") +#define STR_QUICKSTART_TIP NC_("STR_QUICKSTART_TIP", "%PRODUCTNAME %PRODUCTVERSION Quickstarter") +#define STR_QUICKSTART_FILEOPEN NC_("STR_QUICKSTART_FILEOPEN", "Open Document...") +#define STR_QUICKSTART_FROMTEMPLATE NC_("STR_QUICKSTART_FROMTEMPLATE", "From Template...") +#define STR_QUICKSTART_PRELAUNCH NC_("STR_QUICKSTART_PRELAUNCH", "Load %PRODUCTNAME During System Start-Up") +#define STR_QUICKSTART_PRELAUNCH_UNX NC_("STR_QUICKSTART_PRELAUNCH_UNX", "Disable systray Quickstarter") +#define STR_QUICKSTART_LNKNAME NC_("STR_QUICKSTART_LNKNAME", "%PRODUCTNAME %PRODUCTVERSION") +#define STR_QUICKSTART_FILE NC_("STR_QUICKSTART_FILE", "File") +#define STR_QUICKSTART_STARTCENTER NC_("STR_QUICKSTART_STARTCENTER", "Startcenter") +#define STR_QUICKSTART_RECENTDOC NC_("STR_QUICKSTART_RECENTDOC", "Recent Documents") +#define STR_QUERY_UPDATE_LINKS NC_("STR_QUERY_UPDATE_LINKS", "This document contains one or more links to external data.\n\nWould you like to change the document, and update all links\nto get the most recent data?") +#define STR_DDE_ERROR NC_("STR_DDE_ERROR", "DDE link to %1 for %2 area %3 are not available.") +#define STR_SECURITY_WARNING_NO_HYPERLINKS NC_("STR_SECURITY_WARNING_NO_HYPERLINKS", "For security reasons, the hyperlink cannot be executed.\nThe stated address will not be opened.") +#define RID_SECURITY_WARNING_TITLE NC_("RID_SECURITY_WARNING_TITLE", "Security Warning") +#define RID_SVXSTR_XMLSEC_QUERY_LOSINGSIGNATURE NC_("RID_SVXSTR_XMLSEC_QUERY_LOSINGSIGNATURE", "Saving will remove all existing signatures.\nDo you want to continue saving the document?") +#define RID_SVXSTR_XMLSEC_QUERY_SAVEBEFORESIGN NC_("RID_SVXSTR_XMLSEC_QUERY_SAVEBEFORESIGN", "The document has to be saved before it can be signed.\nDo you want to save the document?") +#define STR_QUERY_CANCELCHECKOUT NC_("STR_QUERY_CANCELCHECKOUT", "This will discard all changes on the server since check-out.\nDo you want to proceed?") +#define STR_INFO_WRONGDOCFORMAT NC_("STR_INFO_WRONGDOCFORMAT", "This document must be saved in OpenDocument file format before it can be digitally signed.") +#define RID_XMLSEC_DOCUMENTSIGNED NC_("RID_XMLSEC_DOCUMENTSIGNED", " (Signed)") +#define STR_EMBEDDED_TITLE NC_("STR_EMBEDDED_TITLE", " (Embedded document)") +#define STR_STANDARD NC_("STR_STANDARD", "Standard") +#define RID_SVXSTR_FILELINK NC_("RID_SVXSTR_FILELINK", "Document") +#define STR_NONE NC_("STR_NONE", "- None -") +#define RID_SVXSTR_GRAFIKLINK NC_("RID_SVXSTR_GRAFIKLINK", "Image") +#define STR_SFX_FILTERNAME_ALL NC_("STR_SFX_FILTERNAME_ALL", "All files") +#define STR_SFX_FILTERNAME_PDF NC_("STR_SFX_FILTERNAME_PDF", "PDF files") +#define RID_SVXSTR_EDITGRFLINK NC_("RID_SVXSTR_EDITGRFLINK", "Link Image") +// i66948 used in project scripting +#define STR_ERRUNOEVENTBINDUNG NC_("STR_ERRUNOEVENTBINDUNG", "An appropriate component method %1\ncould not be found.\n\nCheck spelling of method name.") +#define RID_SVXSTR_GRFILTER_OPENERROR NC_("RID_SVXSTR_GRFILTER_OPENERROR", "Image file cannot be opened") +#define RID_SVXSTR_GRFILTER_IOERROR NC_("RID_SVXSTR_GRFILTER_IOERROR", "Image file cannot be read") +#define RID_SVXSTR_GRFILTER_FORMATERROR NC_("RID_SVXSTR_GRFILTER_FORMATERROR", "Unknown image format") +#define RID_SVXSTR_GRFILTER_VERSIONERROR NC_("RID_SVXSTR_GRFILTER_VERSIONERROR", "This version of the image file is not supported") +#define RID_SVXSTR_GRFILTER_FILTERERROR NC_("RID_SVXSTR_GRFILTER_FILTERERROR", "Image filter not found") +#define RID_SVXSTR_END_REDLINING_WARNING NC_("RID_SVXSTR_END_REDLINING_WARNING", "This action will exit the change recording mode.\nAny information about changes will be lost.\n\nExit change recording mode?\n\n") +#define RID_SVXSTR_INCORRECT_PASSWORD NC_("RID_SVXSTR_INCORRECT_PASSWORD", "Incorrect password") + +#define STR_PASSWD_MIN_LEN NC_("STR_PASSWD_MIN_LEN", "(Minimum $(MINLEN) characters)") +#define STR_PASSWD_MIN_LEN1 NC_("STR_PASSWD_MIN_LEN1", "(Minimum 1 character)") +#define STR_PASSWD_EMPTY NC_("STR_PASSWD_EMPTY", "(The password can be empty)") +#define STR_MODULENOTINSTALLED NC_("STR_MODULENOTINSTALLED", "The action could not be executed. The %PRODUCTNAME program module needed for this action is currently not installed.") + +#define STR_FILTER_NOT_INSTALLED NC_("STR_FILTER_NOT_INSTALLED", "The selected filter $(FILTER) has not been installed.\nWould you like to do this now?") +#define STR_FILTER_CONSULT_SERVICE NC_("STR_FILTER_CONSULT_SERVICE", "The selected filter $(FILTER) is not included in your edition.\nYou can find information about orders on our homepage.") + +#define STR_WELCOME_LINE1 NC_("STR_WELCOME_LINE1", "Welcome to %PRODUCTNAME.") +#define STR_WELCOME_LINE2 NC_("STR_WELCOME_LINE2", "Drop a document here or pick an app from the left side to create one.") + +#define STR_SFX_FILEDLG_ACTUALVERSION NC_("STR_SFX_FILEDLG_ACTUALVERSION", "Current version") +#define STR_SFX_EXPLORERFILE_EXPORT NC_("STR_SFX_EXPLORERFILE_EXPORT", "Export") +#define STR_SFX_EXPLORERFILE_INSERT NC_("STR_SFX_EXPLORERFILE_INSERT", "Insert") +#define STR_SFX_EXPLORERFILE_BUTTONINSERT NC_("STR_SFX_EXPLORERFILE_BUTTONINSERT", "~Insert") +#define STR_SFX_IMPORT_ALL NC_("STR_SFX_IMPORT_ALL", "") +#define STR_PB_SAVEACOPY NC_("STR_PB_SAVEACOPY", "Save a Copy") +#define STR_PB_COMPAREDOC NC_("STR_PB_COMPAREDOC", "Compare to") +#define STR_PB_MERGEDOC NC_("STR_PB_MERGEDOC", "Merge with") + +#define STR_SFX_NEWOFFICEDOC NC_("STR_SFX_NEWOFFICEDOC", "%PRODUCTNAME document") +#define SFX_ST_DURATION_FORMAT NC_("SFX_ST_DURATION_FORMAT", " Y: %1 M: %2 D: %3 H: %4 M: %5 S: %6") +#define STR_SFX_REMOVE_PROPERTY NC_("STR_SFX_REMOVE_PROPERTY", "Remove Property") +#define STR_SFX_QUERY_WRONG_TYPE NC_("STR_SFX_QUERY_WRONG_TYPE", "The value entered does not match the specified type.\nThe value will be stored as text.") + +#define STR_QUERY_OVERWRITE NC_("STR_QUERY_OVERWRITE", "Style already exists. Overwrite?") + +#define STR_RESET NC_("STR_RESET", "~Reset") +#define STR_TABPAGE_INVALIDNAME NC_("STR_TABPAGE_INVALIDNAME", "This name is already in use.") +#define STR_TABPAGE_INVALIDSTYLE NC_("STR_TABPAGE_INVALIDSTYLE", "This Style does not exist.") +#define STR_TABPAGE_INVALIDPARENT NC_("STR_TABPAGE_INVALIDPARENT", "This Style cannot be used as a base Style,\nbecause it would result in a recursive reference.") +#define STR_POOL_STYLE_NAME NC_("STR_POOL_STYLE_NAME", "Name already exists as a default Style.\nPlease choose another name.") +#define STR_DELETE_STYLE_USED NC_("STR_DELETE_STYLE_USED", "One or more of the selected styles is in use in this document.\nIf you delete these styles, text will revert to the parent style.\nDo you still wish to delete these styles?\n") +#define STR_DELETE_STYLE NC_("STR_DELETE_STYLE", "Styles in use: ") +#define STR_SID_NAVIGATOR NC_("STR_SID_NAVIGATOR", "Navigator") +#define STR_SID_SIDEBAR NC_("STR_SID_SIDEBAR", "Sidebar") +#define STR_ERROR_WRONG_CONFIRM NC_("STR_ERROR_WRONG_CONFIRM", "Faulty password confirmation") +#define STR_PDF_EXPORT_SEND NC_("STR_PDF_EXPORT_SEND", "Send") +#define STR_FONT_TABPAGE NC_("STR_FONT_TABPAGE", "Font") +#define STR_PREVIEW_CHECKBOX NC_("STR_PREVIEW_CHECKBOX", "Show Previews") + +#define STR_VIEWVERSIONCOMMENT NC_("STR_VIEWVERSIONCOMMENT", "View Version Comment") +#define STR_NO_NAME_SET NC_("STR_NO_NAME_SET", "(no name set)") + +#define STR_STYLE_ELEMTLIST NC_("STR_STYLE_ELEMTLIST", "Style List") +#define STR_STYLE_FILTER_HIERARCHICAL NC_("STR_STYLE_FILTER_HIERARCHICAL", "Hierarchical") +#define STR_STYLE_FILL_FORMAT_MODE NC_("STR_STYLE_FILL_FORMAT_MODE", "Fill Format Mode") +#define STR_STYLE_NEW_STYLE_FROM_SELECTION NC_("STR_STYLE_NEW_STYLE_FROM_SELECTION", "New Style from Selection") +#define STR_STYLE_UPDATE_STYLE NC_("STR_STYLE_UPDATE_STYLE", "Update Style") + +#define STR_MACRO_LOSS NC_("STR_MACRO_LOSS", "Do you really want to cancel the recording? Any steps recorded up to this point will be lost.") +#define STR_CANCEL_RECORDING NC_("STR_CANCEL_RECORDING", "Cancel Recording") + +#define RID_CNT_STR_WAITING NC_("RID_CNT_STR_WAITING", "The templates are being initialized for first-time usage.") + +#define STR_NODEFPRINTER NC_("STR_NODEFPRINTER", "No default printer found.\nPlease choose a printer and try again.") +#define STR_NOSTARTPRINTER NC_("STR_NOSTARTPRINTER", "Could not start printer.\nPlease check your printer configuration.") +#define STR_ERROR_PRINTER_BUSY NC_("STR_ERROR_PRINTER_BUSY", "Printer busy") +#define STR_READONLY NC_("STR_READONLY", " (read-only)") +#define STR_PRINT_NEWORI NC_("STR_PRINT_NEWORI", "The page size and orientation have been modified.\nWould you like to save the new settings in the\nactive document?") +#define STR_PRINT_NEWSIZE NC_("STR_PRINT_NEWSIZE", "The page size has been modified.\nShould the new settings be saved\nin the active document?") +#define STR_PRINT_NEWORISIZE NC_("STR_PRINT_NEWORISIZE", "The page size and orientation have been modified.\nWould you like to save the new settings in the\nactive document?") +#define STR_CANT_CLOSE NC_("STR_CANT_CLOSE", "The document cannot be closed because a\n print job is being carried out.") +#define STR_ERROR_SEND_MAIL NC_("STR_ERROR_SEND_MAIL", "An error occurred in sending the message. Possible errors could be a missing user account or a defective setup.\nPlease check the %PRODUCTNAME settings or your e-mail program settings.") +#define STR_QUERY_OPENASTEMPLATE NC_("STR_QUERY_OPENASTEMPLATE", "This document cannot be edited, possibly due to missing access rights. Do you want to edit a copy of the document?") +#define STR_REPAIREDDOCUMENT NC_("STR_REPAIREDDOCUMENT", " (repaired document)") +#define STR_NONCHECKEDOUT_DOCUMENT NC_("STR_NONCHECKEDOUT_DOCUMENT", "This document is not checked out on the server.") +#define STR_READONLY_DOCUMENT NC_("STR_READONLY_DOCUMENT", "This document is open in read-only mode.") +#define STR_READONLY_PDF NC_("STR_READONLY_PDF", "This PDF is open in read-only mode to allow signing the existing file.") +#define STR_CLASSIFIED_DOCUMENT NC_("STR_CLASSIFIED_DOCUMENT", "The classification label of this document is %1.") +#define STR_TARGET_DOC_NOT_CLASSIFIED NC_("STR_TARGET_DOC_NOT_CLASSIFIED", "This document must be classified before the clipboard can be pasted.") +#define STR_DOC_CLASSIFICATION_TOO_LOW NC_("STR_DOC_CLASSIFICATION_TOO_LOW", "This document has a lower classification level than the clipboard.") +#define STR_CLASSIFIED_INTELLECTUAL_PROPERTY NC_("STR_CLASSIFIED_INTELLECTUAL_PROPERTY", "Intellectual Property:") +#define STR_CLASSIFIED_NATIONAL_SECURITY NC_("STR_CLASSIFIED_NATIONAL_SECURITY", "National Security:") +#define STR_CLASSIFIED_EXPORT_CONTROL NC_("STR_CLASSIFIED_EXPORT_CONTROL", "Export Control:") +#define STR_CHECKOUT NC_("STR_CHECKOUT", "Check Out") +#define STR_READONLY_EDIT NC_("STR_READONLY_EDIT", "Edit Document") +#define STR_READONLY_SIGN NC_("STR_READONLY_SIGN", "Sign Document") +#define STR_SIGNATURE_BROKEN NC_("STR_SIGNATURE_BROKEN", "This document has an invalid signature.") +#define STR_SIGNATURE_INVALID NC_("STR_SIGNATURE_INVALID", "The signature was valid, but the document has been modified") +#define STR_SIGNATURE_NOTVALIDATED NC_("STR_SIGNATURE_NOTVALIDATED", "The signature is OK, but the certificate could not be validated.") +#define STR_SIGNATURE_PARTIAL_OK NC_("STR_SIGNATURE_PARTIAL_OK", "The signature is OK, but the document is only partially signed.") +#define STR_SIGNATURE_OK NC_("STR_SIGNATURE_OK", "This document is digitally signed and the signature is valid.") +#define STR_SIGNATURE_SHOW NC_("STR_SIGNATURE_SHOW", "Show Signatures") + +#define STR_SFX_DOCK NC_("STR_SFX_DOCK", "Dock") +#define STR_SFX_UNDOCK NC_("STR_SFX_UNDOCK", "Undock") + +#define SFX_STR_SIDEBAR_MORE_OPTIONS NC_("SFX_STR_SIDEBAR_MORE_OPTIONS", "More Options") +#define SFX_STR_SIDEBAR_CLOSE_DECK NC_("SFX_STR_SIDEBAR_CLOSE_DECK", "Close Sidebar Deck") +#define SFX_STR_SIDEBAR_SETTINGS NC_("SFX_STR_SIDEBAR_SETTINGS", "Sidebar Settings") +#define SFX_STR_SIDEBAR_CUSTOMIZATION NC_("SFX_STR_SIDEBAR_CUSTOMIZATION", "Customization") +#define SFX_STR_SIDEBAR_RESTORE NC_("SFX_STR_SIDEBAR_RESTORE", "Restore Default") +#define SFX_STR_SIDEBAR_HIDE_SIDEBAR NC_("SFX_STR_SIDEBAR_HIDE_SIDEBAR", "Close Sidebar") + +#define STR_TEMPLATE_NAME1 NC_("STR_TEMPLATE_NAME1", "Abstract Green") +#define STR_TEMPLATE_NAME2 NC_("STR_TEMPLATE_NAME2", "Abstract Red") +#define STR_TEMPLATE_NAME3 NC_("STR_TEMPLATE_NAME3", "Abstract Yellow") +#define STR_TEMPLATE_NAME4 NC_("STR_TEMPLATE_NAME4", "Bright Blue") +#define STR_TEMPLATE_NAME5 NC_("STR_TEMPLATE_NAME5", "DNA") +#define STR_TEMPLATE_NAME6 NC_("STR_TEMPLATE_NAME6", "Inspiration") +#define STR_TEMPLATE_NAME7 NC_("STR_TEMPLATE_NAME7", "Lush Green") +#define STR_TEMPLATE_NAME8 NC_("STR_TEMPLATE_NAME8", "Metropolis") +#define STR_TEMPLATE_NAME9 NC_("STR_TEMPLATE_NAME9", "Sunset") +#define STR_TEMPLATE_NAME10 NC_("STR_TEMPLATE_NAME10", "Vintage") + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/styfitem.hxx b/include/sfx2/styfitem.hxx index 5c96960f428b..5f59f6e55b07 100644 --- a/include/sfx2/styfitem.hxx +++ b/include/sfx2/styfitem.hxx @@ -24,15 +24,20 @@ #include #include #include -#include -#include +#include #include struct SFX2_DLLPUBLIC SfxFilterTupel { OUString aName; sal_uInt16 nFlags; + SfxFilterTupel(const OUString& rName, sal_uInt16 nArg) + : aName(rName) + , nFlags(nArg) + { + } }; + typedef std::vector SfxStyleFilter; class SFX2_DLLPUBLIC SfxStyleFamilyItem @@ -43,7 +48,7 @@ class SFX2_DLLPUBLIC SfxStyleFamilyItem SfxStyleFilter aFilterList; public: - SfxStyleFamilyItem(SfxStyleFamily nFamily, const OUString &rName, const Image& rImage, const ResId &rStringArray); + SfxStyleFamilyItem(SfxStyleFamily nFamily, const OUString &rName, const Image& rImage, const std::pair* pStringArray, const std::locale& rLocale); const OUString& GetText() const { return aText; } SfxStyleFamily GetFamily() const { return nFamily; } diff --git a/include/sfx2/templatelocnames.hrc b/include/sfx2/templatelocnames.hrc deleted file mode 100644 index c4e005a12712..000000000000 --- a/include/sfx2/templatelocnames.hrc +++ /dev/null @@ -1,24 +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/. - */ - -#define NUM_TEMPLATE_NAMES 10 -#define TEMPL_LOC_OFFSET 2210 - -#define STR_TEMPLATE_NAME1 (TEMPL_LOC_OFFSET + 51) -#define STR_TEMPLATE_NAME2 (TEMPL_LOC_OFFSET + 52) -#define STR_TEMPLATE_NAME3 (TEMPL_LOC_OFFSET + 53) -#define STR_TEMPLATE_NAME4 (TEMPL_LOC_OFFSET + 54) -#define STR_TEMPLATE_NAME5 (TEMPL_LOC_OFFSET + 55) -#define STR_TEMPLATE_NAME6 (TEMPL_LOC_OFFSET + 56) -#define STR_TEMPLATE_NAME7 (TEMPL_LOC_OFFSET + 57) -#define STR_TEMPLATE_NAME8 (TEMPL_LOC_OFFSET + 58) -#define STR_TEMPLATE_NAME9 (TEMPL_LOC_OFFSET + 59) -#define STR_TEMPLATE_NAME10 (TEMPL_LOC_OFFSET + 60) - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx index 0601bf65f470..7301a2896946 100644 --- a/include/sfx2/templdlg.hxx +++ b/include/sfx2/templdlg.hxx @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include diff --git a/include/sfx2/tplpitem.hxx b/include/sfx2/tplpitem.hxx index a98f13ee75e8..d76551ca03c7 100644 --- a/include/sfx2/tplpitem.hxx +++ b/include/sfx2/tplpitem.hxx @@ -23,7 +23,7 @@ #include #include #include -#include +#include class SFX2_DLLPUBLIC SfxTemplateItem: public SfxFlagItem { diff --git a/include/svl/IndexedStyleSheets.hxx b/include/svl/IndexedStyleSheets.hxx index 7422dcda5a01..e6ae8d18730b 100644 --- a/include/svl/IndexedStyleSheets.hxx +++ b/include/svl/IndexedStyleSheets.hxx @@ -12,7 +12,7 @@ #include -#include +#include #include #include diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx index 0c3a86772f78..b3e52a3b6aae 100644 --- a/include/svl/srchitem.hxx +++ b/include/svl/srchitem.hxx @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include diff --git a/include/svl/style.hrc b/include/svl/style.hrc deleted file mode 100644 index 352cfe18e2b0..000000000000 --- a/include/svl/style.hrc +++ /dev/null @@ -1,34 +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 SFX_STYLE_HRC -#define SFX_STYLE_HRC - -#define SFXSTYLEBIT_AUTO 0x0000 ///< automatic: flags from application -#define SFXSTYLEBIT_HIDDEN 0x0200 ///< hidden styles (search mask) -#define SFXSTYLEBIT_HIERARCHY 0x1000 ///< hierarchical view - just for dialog -#define SFXSTYLEBIT_READONLY 0x2000 ///< readonly styles (search mask) -#define SFXSTYLEBIT_USED 0x4000 ///< used styles (search mask) -#define SFXSTYLEBIT_USERDEF 0x8000 ///< user defined styles (search mask) -#define SFXSTYLEBIT_ALL_VISIBLE 0xFDFF ///< all styles -#define SFXSTYLEBIT_ALL 0xFFFF ///< all styles - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/style.hxx b/include/svl/style.hxx index e0a4181fc198..1695c8fd3483 100644 --- a/include/svl/style.hxx +++ b/include/svl/style.hxx @@ -27,16 +27,37 @@ #include #include #include -#include #include #include #include #include #include -#include #include +// This is used as a flags enum in sw/, but only there, +// so I don't pull in o3tl::typed_flags here +enum class SfxStyleFamily { + None = 0x00, + Char = 0x01, + Para = 0x02, + Frame = 0x04, + Page = 0x08, + Pseudo = 0x10, + Table = 0x20, + Cell = 0x40, + All = 0x7fff +}; + +#define SFXSTYLEBIT_AUTO 0x0000 ///< automatic: flags from application +#define SFXSTYLEBIT_HIDDEN 0x0200 ///< hidden styles (search mask) +#define SFXSTYLEBIT_HIERARCHY 0x1000 ///< hierarchical view - just for dialog +#define SFXSTYLEBIT_READONLY 0x2000 ///< readonly styles (search mask) +#define SFXSTYLEBIT_USED 0x4000 ///< used styles (search mask) +#define SFXSTYLEBIT_USERDEF 0x8000 ///< user defined styles (search mask) +#define SFXSTYLEBIT_ALL_VISIBLE 0xFDFF ///< all styles +#define SFXSTYLEBIT_ALL 0xFFFF ///< all styles + class SfxItemSet; class SfxItemPool; class SfxStyleSheetBasePool; diff --git a/include/svl/svl.hrc b/include/svl/svl.hrc index 6ccd2435ad3a..f066331992df 100644 --- a/include/svl/svl.hrc +++ b/include/svl/svl.hrc @@ -19,85 +19,81 @@ #ifndef INCLUDED_SVL_SVL_HRC #define INCLUDED_SVL_SVL_HRC -#include +#define NC_(Context, String) (Context "\004" u8##String) -#define STR_SVT_MIMETYPE_START (RID_SVL_START) -#define STR_SVT_MIMETYPE_APP_OCTSTREAM (STR_SVT_MIMETYPE_START+0) -#define STR_SVT_MIMETYPE_APP_PDF (STR_SVT_MIMETYPE_START+1) -#define STR_SVT_MIMETYPE_APP_RTF (STR_SVT_MIMETYPE_START+2) -#define STR_SVT_MIMETYPE_APP_MSWORD (STR_SVT_MIMETYPE_START+3) -#define STR_SVT_MIMETYPE_APP_STARCALC (STR_SVT_MIMETYPE_START+4) -#define STR_SVT_MIMETYPE_APP_STARCHART (STR_SVT_MIMETYPE_START+5) -#define STR_SVT_MIMETYPE_APP_STARDRAW (STR_SVT_MIMETYPE_START+6) -#define STR_SVT_MIMETYPE_APP_STARIMAGE (STR_SVT_MIMETYPE_START+7) -#define STR_SVT_MIMETYPE_APP_STARMATH (STR_SVT_MIMETYPE_START+8) -#define STR_SVT_MIMETYPE_APP_STARWRITER (STR_SVT_MIMETYPE_START+9) -#define STR_SVT_MIMETYPE_APP_ZIP (STR_SVT_MIMETYPE_START+10) -#define STR_SVT_MIMETYPE_AUDIO_AIFF (STR_SVT_MIMETYPE_START+11) -#define STR_SVT_MIMETYPE_AUDIO_BASIC (STR_SVT_MIMETYPE_START+12) -#define STR_SVT_MIMETYPE_AUDIO_VORBIS (STR_SVT_MIMETYPE_START+13) -#define STR_SVT_MIMETYPE_AUDIO_MIDI (STR_SVT_MIMETYPE_START+14) -#define STR_SVT_MIMETYPE_AUDIO_WAV (STR_SVT_MIMETYPE_START+15) -#define STR_SVT_MIMETYPE_IMAGE_GIF (STR_SVT_MIMETYPE_START+16) -#define STR_SVT_MIMETYPE_IMAGE_JPEG (STR_SVT_MIMETYPE_START+17) -#define STR_SVT_MIMETYPE_IMAGE_PCX (STR_SVT_MIMETYPE_START+18) -#define STR_SVT_MIMETYPE_IMAGE_BMP (STR_SVT_MIMETYPE_START+19) -#define STR_SVT_MIMETYPE_TEXT_HTML (STR_SVT_MIMETYPE_START+20) -#define STR_SVT_MIMETYPE_TEXT_PLAIN (STR_SVT_MIMETYPE_START+21) -#define STR_SVT_MIMETYPE_TEXT_URL (STR_SVT_MIMETYPE_START+22) -#define STR_SVT_MIMETYPE_TEXT_VCARD (STR_SVT_MIMETYPE_START+23) -#define STR_SVT_MIMETYPE_VIDEO_THEORA (STR_SVT_MIMETYPE_START+24) -#define STR_SVT_MIMETYPE_VIDEO_VDO (STR_SVT_MIMETYPE_START+25) -#define STR_SVT_MIMETYPE_VIDEO_MSVIDEO (STR_SVT_MIMETYPE_START+26) -#define STR_SVT_MIMETYPE_X_STARMAIL (STR_SVT_MIMETYPE_START+27) -#define STR_SVT_MIMETYPE_X_VRML (STR_SVT_MIMETYPE_START+28) -#define STR_SVT_MIMETYPE_APP_STARHELP (STR_SVT_MIMETYPE_START+29) -#define STR_SVT_MIMETYPE_APP_STARIMPRESS (STR_SVT_MIMETYPE_START+30) +// Internet Media Type Presentations -#define STR_SVT_MIMETYPE_CNT_FSYSBOX (STR_SVT_MIMETYPE_START+35) -#define STR_SVT_MIMETYPE_CNT_FSYSFLD (STR_SVT_MIMETYPE_START+36) -#define STR_SVT_MIMETYPE_APP_GAL (STR_SVT_MIMETYPE_START+37) -#define STR_SVT_MIMETYPE_APP_GAL_THEME (STR_SVT_MIMETYPE_START+38) -#define STR_SVT_MIMETYPE_APP_STARW_GLOB (STR_SVT_MIMETYPE_START+39) -#define STR_SVT_MIMETYPE_APP_SDM (STR_SVT_MIMETYPE_START+40) -#define STR_SVT_MIMETYPE_APP_SMD (STR_SVT_MIMETYPE_START+41) -#define STR_SVT_MIMETYPE_APP_STARW_WEB (STR_SVT_MIMETYPE_START+42) -#define STR_SVT_MIMETYPE_FRAMESET (STR_SVT_MIMETYPE_START+48) -#define STR_SVT_MIMETYPE_MACRO (STR_SVT_MIMETYPE_START+49) -#define STR_SVT_MIMETYPE_CNT_SFSYSFOLDER (STR_SVT_MIMETYPE_START+50) -#define STR_SVT_MIMETYPE_APP_TEMPLATE (STR_SVT_MIMETYPE_START+51) -#define STR_SVT_MIMETYPE_IMAGE_GENERIC (STR_SVT_MIMETYPE_START+52) -#define STR_SVT_MIMETYPE_APP_MSEXCEL (STR_SVT_MIMETYPE_START+53) -#define STR_SVT_MIMETYPE_APP_MSEXCEL_TEMPL (STR_SVT_MIMETYPE_START+54) -#define STR_SVT_MIMETYPE_APP_MSPPOINT (STR_SVT_MIMETYPE_START+55) -#define STR_SVT_MIMETYPE_TEXT_VCALENDAR (STR_SVT_MIMETYPE_START+56) -#define STR_SVT_MIMETYPE_TEXT_ICALENDAR (STR_SVT_MIMETYPE_START+57) -#define STR_SVT_MIMETYPE_TEXT_XMLICALENDAR (STR_SVT_MIMETYPE_START+58) -#define STR_SVT_MIMETYPE_TEXT_CDE_CALENDAR_APP (STR_SVT_MIMETYPE_START+59) -#define STR_SVT_MIMETYPE_INET_MSG_RFC822 (STR_SVT_MIMETYPE_START+60) -#define STR_SVT_MIMETYPE_INET_MULTI_ALTERNATIVE (STR_SVT_MIMETYPE_START+61) -#define STR_SVT_MIMETYPE_INET_MULTI_DIGEST (STR_SVT_MIMETYPE_START+62) -#define STR_SVT_MIMETYPE_INET_MULTI_PARALLEL (STR_SVT_MIMETYPE_START+63) -#define STR_SVT_MIMETYPE_INET_MULTI_RELATED (STR_SVT_MIMETYPE_START+64) -#define STR_SVT_MIMETYPE_INET_MULTI_MIXED (STR_SVT_MIMETYPE_START+65) -#define STR_SVT_MIMETYPE_APP_IMPRESSPACKED (STR_SVT_MIMETYPE_START+66) -#define STR_SVT_MIMETYPE_APP_JAR (STR_SVT_MIMETYPE_START+67) -#define STR_SVT_MIMETYPE_IMAGE_PNG (STR_SVT_MIMETYPE_START+68) -#define STR_SVT_MIMETYPE_IMAGE_TIFF (STR_SVT_MIMETYPE_START+69) - -#define STR_SVT_MIMETYPE_APP_SXCALC (STR_SVT_MIMETYPE_START+70) -#define STR_SVT_MIMETYPE_APP_SXCHART (STR_SVT_MIMETYPE_START+71) -#define STR_SVT_MIMETYPE_APP_SXDRAW (STR_SVT_MIMETYPE_START+72) -#define STR_SVT_MIMETYPE_APP_SXMATH (STR_SVT_MIMETYPE_START+73) -#define STR_SVT_MIMETYPE_APP_SXWRITER (STR_SVT_MIMETYPE_START+74) -#define STR_SVT_MIMETYPE_APP_SXIMPRESS (STR_SVT_MIMETYPE_START+75) -#define STR_SVT_MIMETYPE_APP_SXGLOBAL (STR_SVT_MIMETYPE_START+76) -#define STR_SVT_MIMETYPE_APP_SXIPACKED (STR_SVT_MIMETYPE_START+77) - -#define STR_SVT_MIMETYPE_VIDEO_WEBM (STR_SVT_MIMETYPE_START+78) -#define STR_SVT_MIMETYPE_AUDIO_WEBM (STR_SVT_MIMETYPE_START+79) - -#define STR_SVT_MIMETYPE_END (STR_SVT_MIMETYPE_AUDIO_WEBM) +#define STR_SVT_MIMETYPE_APP_OCTSTREAM NC_("STR_SVT_MIMETYPE_APP_OCTSTREAM", "Binary file") +#define STR_SVT_MIMETYPE_APP_PDF NC_("STR_SVT_MIMETYPE_APP_PDF", "PDF file") +#define STR_SVT_MIMETYPE_APP_RTF NC_("STR_SVT_MIMETYPE_APP_RTF", "RTF File") +#define STR_SVT_MIMETYPE_APP_MSWORD NC_("STR_SVT_MIMETYPE_APP_MSWORD", "MS-Word document") +#define STR_SVT_MIMETYPE_APP_STARCALC NC_("STR_SVT_MIMETYPE_APP_STARCALC", "%PRODUCTNAME Spreadsheet") +#define STR_SVT_MIMETYPE_APP_STARCHART NC_("STR_SVT_MIMETYPE_APP_STARCHART", "%PRODUCTNAME Chart") +#define STR_SVT_MIMETYPE_APP_STARDRAW NC_("STR_SVT_MIMETYPE_APP_STARDRAW", "%PRODUCTNAME Drawing") +#define STR_SVT_MIMETYPE_APP_STARIMAGE NC_("STR_SVT_MIMETYPE_APP_STARIMAGE", "%PRODUCTNAME Image") +#define STR_SVT_MIMETYPE_APP_STARMATH NC_("STR_SVT_MIMETYPE_APP_STARMATH", "%PRODUCTNAME Formula") +#define STR_SVT_MIMETYPE_APP_STARWRITER NC_("STR_SVT_MIMETYPE_APP_STARWRITER", "%PRODUCTNAME Text") +#define STR_SVT_MIMETYPE_APP_ZIP NC_("STR_SVT_MIMETYPE_APP_ZIP", "ZIP file") +#define STR_SVT_MIMETYPE_APP_JAR NC_("STR_SVT_MIMETYPE_APP_JAR", "JAR file") +#define STR_SVT_MIMETYPE_AUDIO_AIFF NC_("STR_SVT_MIMETYPE_AUDIO_AIFF", "Audio file") +#define STR_SVT_MIMETYPE_AUDIO_BASIC NC_("STR_SVT_MIMETYPE_AUDIO_BASIC", "Audio file") +#define STR_SVT_MIMETYPE_AUDIO_MIDI NC_("STR_SVT_MIMETYPE_AUDIO_MIDI", "Audio file") +#define STR_SVT_MIMETYPE_AUDIO_VORBIS NC_("STR_SVT_MIMETYPE_AUDIO_VORBIS", "Audio file") +#define STR_SVT_MIMETYPE_AUDIO_WAV NC_("STR_SVT_MIMETYPE_AUDIO_WAV", "Audio file") +#define STR_SVT_MIMETYPE_AUDIO_WEBM NC_("STR_SVT_MIMETYPE_AUDIO_WEBM", "Audio file") +#define STR_SVT_MIMETYPE_IMAGE_GIF NC_("STR_SVT_MIMETYPE_IMAGE_GIF", "Image") +#define STR_SVT_MIMETYPE_IMAGE_PNG NC_("STR_SVT_MIMETYPE_IMAGE_PNG", "Image") +#define STR_SVT_MIMETYPE_IMAGE_TIFF NC_("STR_SVT_MIMETYPE_IMAGE_TIFF", "Image") +#define STR_SVT_MIMETYPE_IMAGE_JPEG NC_("STR_SVT_MIMETYPE_IMAGE_JPEG", "Image") +#define STR_SVT_MIMETYPE_IMAGE_PCX NC_("STR_SVT_MIMETYPE_IMAGE_PCX", "Image") +#define STR_SVT_MIMETYPE_IMAGE_BMP NC_("STR_SVT_MIMETYPE_IMAGE_BMP", "Bitmap") +#define STR_SVT_MIMETYPE_TEXT_HTML NC_("STR_SVT_MIMETYPE_TEXT_HTML", "HTML document") +#define STR_SVT_MIMETYPE_TEXT_PLAIN NC_("STR_SVT_MIMETYPE_TEXT_PLAIN", "Text file") +#define STR_SVT_MIMETYPE_TEXT_URL NC_("STR_SVT_MIMETYPE_TEXT_URL", "Bookmark") +#define STR_SVT_MIMETYPE_TEXT_VCARD NC_("STR_SVT_MIMETYPE_TEXT_VCARD", "vCard file") +#define STR_SVT_MIMETYPE_VIDEO_MSVIDEO NC_("STR_SVT_MIMETYPE_VIDEO_MSVIDEO", "Video file") +#define STR_SVT_MIMETYPE_VIDEO_THEORA NC_("STR_SVT_MIMETYPE_VIDEO_THEORA", "Video file") +#define STR_SVT_MIMETYPE_VIDEO_VDO NC_("STR_SVT_MIMETYPE_VIDEO_VDO", "Video file") +#define STR_SVT_MIMETYPE_VIDEO_WEBM NC_("STR_SVT_MIMETYPE_VIDEO_WEBM", "Video file") +#define STR_SVT_MIMETYPE_X_STARMAIL NC_("STR_SVT_MIMETYPE_X_STARMAIL", "Message") +#define STR_SVT_MIMETYPE_X_VRML NC_("STR_SVT_MIMETYPE_X_VRML", "VRML file") +#define STR_SVT_MIMETYPE_APP_STARIMPRESS NC_("STR_SVT_MIMETYPE_APP_STARIMPRESS", "%PRODUCTNAME Presentation") +#define STR_SVT_MIMETYPE_APP_IMPRESSPACKED NC_("STR_SVT_MIMETYPE_APP_IMPRESSPACKED", "%PRODUCTNAME Presentation (packed)") +#define STR_SVT_MIMETYPE_APP_STARHELP NC_("STR_SVT_MIMETYPE_APP_STARHELP", "%PRODUCTNAME Help") +#define STR_SVT_MIMETYPE_CNT_FSYSBOX NC_("STR_SVT_MIMETYPE_CNT_FSYSBOX", "Workplace") +#define STR_SVT_MIMETYPE_CNT_FSYSFLD NC_("STR_SVT_MIMETYPE_CNT_FSYSFLD", "Folder") +#define STR_SVT_MIMETYPE_APP_GAL NC_("STR_SVT_MIMETYPE_APP_GAL", "Gallery") +#define STR_SVT_MIMETYPE_APP_GAL_THEME NC_("STR_SVT_MIMETYPE_APP_GAL_THEME", "Gallery theme") +#define STR_SVT_MIMETYPE_APP_STARW_GLOB NC_("STR_SVT_MIMETYPE_APP_STARW_GLOB", "%PRODUCTNAME Master Document") +#define STR_SVT_MIMETYPE_APP_SDM NC_("STR_SVT_MIMETYPE_APP_SDM", "Message") +#define STR_SVT_MIMETYPE_APP_SMD NC_("STR_SVT_MIMETYPE_APP_SMD", "Message") +#define STR_SVT_MIMETYPE_APP_STARW_WEB NC_("STR_SVT_MIMETYPE_APP_STARW_WEB", "%PRODUCTNAME Writer/Web") +#define STR_SVT_MIMETYPE_FRAMESET NC_("STR_SVT_MIMETYPE_FRAMESET", "Frameset Document") +#define STR_SVT_MIMETYPE_MACRO NC_("STR_SVT_MIMETYPE_MACRO", "Macro file") +#define STR_SVT_MIMETYPE_CNT_SFSYSFOLDER NC_("STR_SVT_MIMETYPE_CNT_SFSYSFOLDER", "System folder") +#define STR_SVT_MIMETYPE_APP_TEMPLATE NC_("STR_SVT_MIMETYPE_APP_TEMPLATE", "%PRODUCTNAME Template") +#define STR_SVT_MIMETYPE_IMAGE_GENERIC NC_("STR_SVT_MIMETYPE_IMAGE_GENERIC", "Image") +#define STR_SVT_MIMETYPE_APP_MSEXCEL NC_("STR_SVT_MIMETYPE_APP_MSEXCEL", "MS Excel document") +#define STR_SVT_MIMETYPE_APP_MSEXCEL_TEMPL NC_("STR_SVT_MIMETYPE_APP_MSEXCEL_TEMPL", "MS Excel Template") +#define STR_SVT_MIMETYPE_APP_MSPPOINT NC_("STR_SVT_MIMETYPE_APP_MSPPOINT", "MS PowerPoint document") +#define STR_SVT_MIMETYPE_TEXT_VCALENDAR NC_("STR_SVT_MIMETYPE_TEXT_VCALENDAR", "vCalendar-file") +#define STR_SVT_MIMETYPE_TEXT_ICALENDAR NC_("STR_SVT_MIMETYPE_TEXT_ICALENDAR", "iCalendar-File") +#define STR_SVT_MIMETYPE_TEXT_XMLICALENDAR NC_("STR_SVT_MIMETYPE_TEXT_XMLICALENDAR", "XML-iCalendar-File") +#define STR_SVT_MIMETYPE_TEXT_CDE_CALENDAR_APP NC_("STR_SVT_MIMETYPE_TEXT_CDE_CALENDAR_APP", "CDE-Calendar-File") +#define STR_SVT_MIMETYPE_INET_MSG_RFC822 NC_("STR_SVT_MIMETYPE_INET_MSG_RFC822", "message/rfc822") +#define STR_SVT_MIMETYPE_INET_MULTI_ALTERNATIVE NC_("STR_SVT_MIMETYPE_INET_MULTI_ALTERNATIVE", "multipart/alternative") +#define STR_SVT_MIMETYPE_INET_MULTI_DIGEST NC_("STR_SVT_MIMETYPE_INET_MULTI_DIGEST", "multipart/digest") +#define STR_SVT_MIMETYPE_INET_MULTI_PARALLEL NC_("STR_SVT_MIMETYPE_INET_MULTI_PARALLEL", "multipart/parallel") +#define STR_SVT_MIMETYPE_INET_MULTI_RELATED NC_("STR_SVT_MIMETYPE_INET_MULTI_RELATED", "multipart/related") +#define STR_SVT_MIMETYPE_INET_MULTI_MIXED NC_("STR_SVT_MIMETYPE_INET_MULTI_MIXED", "multipart/mixed") +#define STR_SVT_MIMETYPE_APP_SXCALC NC_("STR_SVT_MIMETYPE_APP_SXCALC", "OpenOffice.org 1.0 Spreadsheet") +#define STR_SVT_MIMETYPE_APP_SXCHART NC_("STR_SVT_MIMETYPE_APP_SXCHART", "OpenOffice.org 1.0 Chart") +#define STR_SVT_MIMETYPE_APP_SXDRAW NC_("STR_SVT_MIMETYPE_APP_SXDRAW", "OpenOffice.org 1.0 Drawing") +#define STR_SVT_MIMETYPE_APP_SXMATH NC_("STR_SVT_MIMETYPE_APP_SXMATH", "OpenOffice.org 1.0 Formula") +#define STR_SVT_MIMETYPE_APP_SXWRITER NC_("STR_SVT_MIMETYPE_APP_SXWRITER", "OpenOffice.org 1.0 Text Document") +#define STR_SVT_MIMETYPE_APP_SXIMPRESS NC_("STR_SVT_MIMETYPE_APP_SXIMPRESS", "OpenOffice.org 1.0 Presentation") +#define STR_SVT_MIMETYPE_APP_SXGLOBAL NC_("STR_SVT_MIMETYPE_APP_SXGLOBAL", "OpenOffice.org 1.0 Master Document") +#define STR_SVT_MIMETYPE_APP_SXIPACKED NC_("STR_SVT_MIMETYPE_APP_SXIPACKED", "OpenOffice.org 1.0 Presentation (packed)") #endif diff --git a/include/svtools/DocumentInfoPreview.hxx b/include/svtools/DocumentInfoPreview.hxx index aa58ebc42bda..cec92f040b41 100644 --- a/include/svtools/DocumentInfoPreview.hxx +++ b/include/svtools/DocumentInfoPreview.hxx @@ -29,7 +29,6 @@ #include class ExtMultiLineEdit; -class SvtDocInfoTable_Impl; namespace com { namespace sun { namespace star { namespace document { class XDocumentProperties; } @@ -53,7 +52,6 @@ public: private: VclPtr m_pEditWin; - std::unique_ptr< SvtDocInfoTable_Impl > m_xInfoTable; void insertEntry(OUString const & title, OUString const & value); diff --git a/include/svtools/controldims.hrc b/include/svtools/controldims.hxx similarity index 100% rename from include/svtools/controldims.hrc rename to include/svtools/controldims.hxx diff --git a/include/svtools/ehdl.hxx b/include/svtools/ehdl.hxx index 51f78bf27506..50426b37fb2d 100644 --- a/include/svtools/ehdl.hxx +++ b/include/svtools/ehdl.hxx @@ -27,31 +27,34 @@ #include +typedef std::pair ErrMsgCode; +SVT_DLLPUBLIC const ErrMsgCode* getRID_ERRHDL(); +SVT_DLLPUBLIC const ErrMsgCode* getRID_ERRCTX(); + namespace vcl { class Window; } -class ResMgr; class SVT_DLLPUBLIC SfxErrorContext : private ErrorContext { public: SfxErrorContext( sal_uInt16 nCtxIdP, vcl::Window *pWin=nullptr, - sal_uInt16 nResIdP=USHRT_MAX, ResMgr *pMgrP=nullptr); + const ErrMsgCode* pIds = nullptr, const std::locale* pResLocaleP = nullptr); SfxErrorContext( sal_uInt16 nCtxIdP, const OUString &aArg1, vcl::Window *pWin=nullptr, - sal_uInt16 nResIdP=USHRT_MAX, ResMgr *pMgrP=nullptr); + const ErrMsgCode* pIds = nullptr, const std::locale* pResLocaleP = nullptr); bool GetString(ErrCode nErrId, OUString &rStr) override; private: sal_uInt16 nCtxId; - sal_uInt16 nResId; - ResMgr *pMgr; + const ErrMsgCode* pIds; + const std::locale *pResLocale; OUString aArg1; }; class SVT_DLLPUBLIC SfxErrorHandler : private ErrorHandler { public: - SfxErrorHandler(sal_uInt16 nId, ErrCode lStart, ErrCode lEnd, ResMgr *pMgr=nullptr); + SfxErrorHandler(const ErrMsgCode* pIds, ErrCode lStart, ErrCode lEnd, const std::locale* pResLocale = nullptr); virtual ~SfxErrorHandler() override; protected: @@ -61,10 +64,9 @@ private: ErrCode lStart; ErrCode lEnd; - sal_uInt16 nId; - ResMgr *pMgr; - std::unique_ptr - pFreeMgr; + const ErrMsgCode* pIds; + const std::locale* pResLocale; + std::unique_ptr xFreeLocale; SVT_DLLPRIVATE static void GetClassString(sal_uLong lErrId, OUString &); virtual bool CreateString(const ErrorInfo *, OUString &) const override; diff --git a/include/svtools/filectrl.hxx b/include/svtools/filectrl.hxx index 1dbb4f33dc81..22acd8ebbb44 100644 --- a/include/svtools/filectrl.hxx +++ b/include/svtools/filectrl.hxx @@ -25,15 +25,13 @@ #include #include - -#define STR_FILECTRL_BUTTONTEXT 333 // ID-Range?! - // Flags for internal use of FileControl enum class FileControlMode_Internal { INRESIZE = 0x0001, ORIGINALBUTTONTEXT = 0x0002, }; + namespace o3tl { template<> struct typed_flags : is_typed_flags {}; diff --git a/include/svtools/filedlg2.hrc b/include/svtools/filedlg2.hrc deleted file mode 100644 index 4da7f5e0f894..000000000000 --- a/include/svtools/filedlg2.hrc +++ /dev/null @@ -1,23 +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 . - */ -#define STR_FILEDLG_OPEN 1002 -#define STR_FILEDLG_TYPE 1005 -#define STR_FILEDLG_SAVE 1010 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/foldertree.hxx b/include/svtools/foldertree.hxx index 23fc485965e9..51a180c6729b 100644 --- a/include/svtools/foldertree.hxx +++ b/include/svtools/foldertree.hxx @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include diff --git a/include/svtools/soerr.hxx b/include/svtools/soerr.hxx index dfc1b88f3ed8..380efe1d0a2b 100644 --- a/include/svtools/soerr.hxx +++ b/include/svtools/soerr.hxx @@ -20,10 +20,12 @@ #define INCLUDED_SVTOOLS_SOERR_HXX #include +#ifndef __RSC +#include +#include +#endif // error codes -#define RID_SO_ERROR_HANDLER 32000 - #define SO_ERR(x) ErrCode(ERRCODE_AREA_SO | ERRCODE_CLASS_SO | x) #define SO_WRN(x) ErrCode(ERRCODE_AREA_SO | ERRCODE_CLASS_SO | ERRCODE_WARNING_MASK | x) @@ -35,10 +37,12 @@ #define ERRCODE_SO_NOTIMPL SO_ERR(33) // error contexts -#define RID_SO_ERRCTX 32001 - #define ERRCTX_SO_DOVERB 1 +#ifndef __RSC +SVT_DLLPUBLIC const ErrMsgCode* getRID_SO_ERROR_HANDLER(); +SVT_DLLPUBLIC const ErrMsgCode* getRID_SO_ERRCTX(); +#endif #endif diff --git a/include/svtools/sores.hxx b/include/svtools/sores.hxx deleted file mode 100644 index 581197c4a6ce..000000000000 --- a/include/svtools/sores.hxx +++ /dev/null @@ -1,104 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_SVTOOLS_SORES_HXX -#define INCLUDED_SVTOOLS_SORES_HXX - -// Strings -#define STR_ERROR_OBJNOCREATE 32014 -#define STR_ERROR_OBJNOCREATE_FROM_FILE 32015 -#define STR_ERROR_OBJNOCREATE_PLUGIN 32018 -#define STR_FURTHER_OBJECT 32026 -#define STR_UNKNOWN_SOURCE 32027 - -// Sot Format Strings -#define STR_FORMAT_START 32100 -#define STR_FORMAT_STRING (STR_FORMAT_START + 1) -#define STR_FORMAT_BITMAP (STR_FORMAT_START + 2) -#define STR_FORMAT_GDIMETAFILE (STR_FORMAT_START + 3) -#define STR_FORMAT_RTF (STR_FORMAT_START + 7) -#define STR_FORMAT_ID_DRAWING (STR_FORMAT_START + 8) -#define STR_FORMAT_ID_SVXB (STR_FORMAT_START + 9) -#define STR_FORMAT_ID_INTERNALLINK_STATE (STR_FORMAT_START + 13) -#define STR_FORMAT_ID_SOLK (STR_FORMAT_START + 14) -#define STR_FORMAT_ID_NETSCAPE_BOOKMARK (STR_FORMAT_START + 15) -#define STR_FORMAT_ID_STARSERVER (STR_FORMAT_START + 19) -#define STR_FORMAT_ID_STAROBJECT (STR_FORMAT_START + 20) -#define STR_FORMAT_ID_APPLETOBJECT (STR_FORMAT_START + 21) -#define STR_FORMAT_ID_PLUGIN_OBJECT (STR_FORMAT_START + 22) -#define STR_FORMAT_ID_STARWRITER_30 (STR_FORMAT_START + 23) -#define STR_FORMAT_ID_STARWRITER_40 (STR_FORMAT_START + 24) -#define STR_FORMAT_ID_STARWRITER_50 (STR_FORMAT_START + 25) -#define STR_FORMAT_ID_STARWRITERWEB_40 (STR_FORMAT_START + 26) -#define STR_FORMAT_ID_STARWRITERWEB_50 (STR_FORMAT_START + 27) -#define STR_FORMAT_ID_STARWRITERGLOB_40 (STR_FORMAT_START + 28) -#define STR_FORMAT_ID_STARWRITERGLOB_50 (STR_FORMAT_START + 29) -#define STR_FORMAT_ID_STARDRAW (STR_FORMAT_START + 30) -#define STR_FORMAT_ID_STARDRAW_40 (STR_FORMAT_START + 31) -#define STR_FORMAT_ID_STARIMPRESS_50 (STR_FORMAT_START + 32) -#define STR_FORMAT_ID_STARDRAW_50 (STR_FORMAT_START + 33) -#define STR_FORMAT_ID_STARCALC (STR_FORMAT_START + 34) -#define STR_FORMAT_ID_STARCALC_40 (STR_FORMAT_START + 35) -#define STR_FORMAT_ID_STARCALC_50 (STR_FORMAT_START + 36) -#define STR_FORMAT_ID_STARCHART (STR_FORMAT_START + 37) -#define STR_FORMAT_ID_STARCHART_40 (STR_FORMAT_START + 38) -#define STR_FORMAT_ID_STARCHART_50 (STR_FORMAT_START + 39) -#define STR_FORMAT_ID_STARIMAGE (STR_FORMAT_START + 40) -#define STR_FORMAT_ID_STARIMAGE_40 (STR_FORMAT_START + 41) -#define STR_FORMAT_ID_STARIMAGE_50 (STR_FORMAT_START + 42) -#define STR_FORMAT_ID_STARMATH (STR_FORMAT_START + 43) -#define STR_FORMAT_ID_STARMATH_40 (STR_FORMAT_START + 44) -#define STR_FORMAT_ID_STARMATH_50 (STR_FORMAT_START + 45) -#define STR_FORMAT_ID_STAROBJECT_PAINTDOC (STR_FORMAT_START + 46) -#define STR_FORMAT_ID_HTML (STR_FORMAT_START + 48) -#define STR_FORMAT_ID_HTML_SIMPLE (STR_FORMAT_START + 49) -#define STR_FORMAT_ID_BIFF_5 (STR_FORMAT_START + 52) -#define STR_FORMAT_ID_BIFF_8 (STR_FORMAT_START + 53) -#define STR_FORMAT_ID_SYLK (STR_FORMAT_START + 54) -#define STR_FORMAT_ID_LINK (STR_FORMAT_START + 56) -#define STR_FORMAT_ID_DIF (STR_FORMAT_START + 57) -#define STR_FORMAT_ID_MSWORD_DOC (STR_FORMAT_START + 60) -#define STR_FORMAT_ID_STAR_FRAMESET_DOC (STR_FORMAT_START + 61) -#define STR_FORMAT_ID_OFFICE_DOC (STR_FORMAT_START + 62) -#define STR_FORMAT_ID_NOTES_DOCINFO (STR_FORMAT_START + 63) -#define STR_FORMAT_ID_SFX_DOC (STR_FORMAT_START + 66) -#define STR_FORMAT_ID_FILEGRPDESCRIPTOR (STR_FORMAT_START + 86) -#define STR_FORMAT_ID_STARCHARTDOCUMENT_50 (STR_FORMAT_START + 102) -#define STR_FORMAT_ID_GRAPHOBJ (STR_FORMAT_START + 103) -#define STR_FORMAT_ID_STARWRITER_60 (STR_FORMAT_START + 104) -#define STR_FORMAT_ID_STARWRITERWEB_60 (STR_FORMAT_START + 105) -#define STR_FORMAT_ID_STARWRITERGLOB_60 (STR_FORMAT_START + 106) -#define STR_FORMAT_ID_STARDRAW_60 (STR_FORMAT_START + 107) -#define STR_FORMAT_ID_STARIMPRESS_60 (STR_FORMAT_START + 108) -#define STR_FORMAT_ID_STARCALC_60 (STR_FORMAT_START + 109) -#define STR_FORMAT_ID_STARCHART_60 (STR_FORMAT_START + 110) -#define STR_FORMAT_ID_STARMATH_60 (STR_FORMAT_START + 111) -#define STR_FORMAT_ID_WMF (STR_FORMAT_START + 112) -#define STR_FORMAT_ID_DBACCESS_QUERY (STR_FORMAT_START + 113) -#define STR_FORMAT_ID_DBACCESS_TABLE (STR_FORMAT_START + 114) -#define STR_FORMAT_ID_DBACCESS_COMMAND (STR_FORMAT_START + 115) -#define STR_FORMAT_ID_DIALOG_60 (STR_FORMAT_START + 116) -#define STR_FORMAT_ID_HTML_NO_COMMENT (STR_FORMAT_START + 119) -#define STR_FORMAT_ID_RICHTEXT (STR_FORMAT_START + 120) - -#define STR_FORMAT_END (STR_FORMAT_ID_RICHTEXT) - -#endif // INCLUDED_SVTOOLS_SORES_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/strings.hrc b/include/svtools/strings.hrc new file mode 100644 index 000000000000..f9dc617f4313 --- /dev/null +++ b/include/svtools/strings.hrc @@ -0,0 +1,357 @@ +/* -*- 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_INC_STRINGS_HRC +#define INCLUDED_SVTOOLS_INC_STRINGS_HRC + +#define NC_(Context, String) (Context "\004" u8##String) + +#define STR_UNDO NC_("STR_UNDO", "Undo: ") +#define STR_REDO NC_("STR_REDO", "Re~do: ") +#define STR_REPEAT NC_("STR_REPEAT", "~Repeat: ") + +#define STR_FORMAT_STRING NC_("STR_FORMAT_STRING", "Unformatted text") +#define STR_FORMAT_BITMAP NC_("STR_FORMAT_BITMAP", "Bitmap") +#define STR_FORMAT_GDIMETAFILE NC_("STR_FORMAT_GDIMETAFILE", "GDI metafile") +#define STR_FORMAT_RTF NC_("STR_FORMAT_RTF", "Formatted text [RTF]") +#define STR_FORMAT_ID_RICHTEXT NC_("STR_FORMAT_ID_RICHTEXT", "Formatted text [Richtext]") +#define STR_FORMAT_ID_DRAWING NC_("STR_FORMAT_ID_DRAWING", "Drawing format") +#define STR_FORMAT_ID_SVXB NC_("STR_FORMAT_ID_SVXB", "SVXB (StarView bitmap/animation)") +#define STR_FORMAT_ID_INTERNALLINK_STATE NC_("STR_FORMAT_ID_INTERNALLINK_STATE", "Status Info from Svx Internal Link") +#define STR_FORMAT_ID_SOLK NC_("STR_FORMAT_ID_SOLK", "SOLK (%PRODUCTNAME Link)") +#define STR_FORMAT_ID_NETSCAPE_BOOKMARK NC_("STR_FORMAT_ID_NETSCAPE_BOOKMARK", "Netscape Bookmark") +#define STR_FORMAT_ID_STARSERVER NC_("STR_FORMAT_ID_STARSERVER", "Star server format") +#define STR_FORMAT_ID_STAROBJECT NC_("STR_FORMAT_ID_STAROBJECT", "Star object format") +#define STR_FORMAT_ID_APPLETOBJECT NC_("STR_FORMAT_ID_APPLETOBJECT", "Applet object") +#define STR_FORMAT_ID_PLUGIN_OBJECT NC_("STR_FORMAT_ID_PLUGIN_OBJECT", "Plug-in object") +#define STR_FORMAT_ID_STARWRITER_30 NC_("STR_FORMAT_ID_STARWRITER_30", "StarWriter 3.0 object") +#define STR_FORMAT_ID_STARWRITER_40 NC_("STR_FORMAT_ID_STARWRITER_40", "StarWriter 4.0 object") +#define STR_FORMAT_ID_STARWRITER_50 NC_("STR_FORMAT_ID_STARWRITER_50", "StarWriter 5.0 object") +#define STR_FORMAT_ID_STARWRITERWEB_40 NC_("STR_FORMAT_ID_STARWRITERWEB_40", "StarWriter/Web 4.0 object") +#define STR_FORMAT_ID_STARWRITERWEB_50 NC_("STR_FORMAT_ID_STARWRITERWEB_50", "StarWriter/Web 5.0 object") +#define STR_FORMAT_ID_STARWRITERGLOB_40 NC_("STR_FORMAT_ID_STARWRITERGLOB_40", "StarWriter/Master 4.0 object") +#define STR_FORMAT_ID_STARWRITERGLOB_50 NC_("STR_FORMAT_ID_STARWRITERGLOB_50", "StarWriter/Master 5.0 object") +#define STR_FORMAT_ID_STARDRAW NC_("STR_FORMAT_ID_STARDRAW", "StarDraw object") +#define STR_FORMAT_ID_STARDRAW_40 NC_("STR_FORMAT_ID_STARDRAW_40", "StarDraw 4.0 object") +#define STR_FORMAT_ID_STARIMPRESS_50 NC_("STR_FORMAT_ID_STARIMPRESS_50", "StarImpress 5.0 object") +#define STR_FORMAT_ID_STARDRAW_50 NC_("STR_FORMAT_ID_STARDRAW_50", "StarDraw 5.0 object") +#define STR_FORMAT_ID_STARCALC NC_("STR_FORMAT_ID_STARCALC", "StarCalc object") +#define STR_FORMAT_ID_STARCALC_40 NC_("STR_FORMAT_ID_STARCALC_40", "StarCalc 4.0 object") +#define STR_FORMAT_ID_STARCALC_50 NC_("STR_FORMAT_ID_STARCALC_50", "StarCalc 5.0 object") +#define STR_FORMAT_ID_STARCHART NC_("STR_FORMAT_ID_STARCHART", "StarChart object") +#define STR_FORMAT_ID_STARCHART_40 NC_("STR_FORMAT_ID_STARCHART_40", "StarChart 4.0 object") +#define STR_FORMAT_ID_STARCHART_50 NC_("STR_FORMAT_ID_STARCHART_50", "StarChart 5.0 object") +#define STR_FORMAT_ID_STARIMAGE NC_("STR_FORMAT_ID_STARIMAGE", "StarImage object") +#define STR_FORMAT_ID_STARIMAGE_40 NC_("STR_FORMAT_ID_STARIMAGE_40", "StarImage 4.0 object") +#define STR_FORMAT_ID_STARIMAGE_50 NC_("STR_FORMAT_ID_STARIMAGE_50", "StarImage 5.0 object") +#define STR_FORMAT_ID_STARMATH NC_("STR_FORMAT_ID_STARMATH", "StarMath object") +#define STR_FORMAT_ID_STARMATH_40 NC_("STR_FORMAT_ID_STARMATH_40", "StarMath 4.0 object") +#define STR_FORMAT_ID_STARMATH_50 NC_("STR_FORMAT_ID_STARMATH_50", "StarMath 5.0 object") +#define STR_FORMAT_ID_STAROBJECT_PAINTDOC NC_("STR_FORMAT_ID_STAROBJECT_PAINTDOC", "StarObject Paint object") +#define STR_FORMAT_ID_HTML NC_("STR_FORMAT_ID_HTML", "HTML (HyperText Markup Language)") +#define STR_FORMAT_ID_HTML_SIMPLE NC_("STR_FORMAT_ID_HTML_SIMPLE", "HTML format") +#define STR_FORMAT_ID_BIFF_5 NC_("STR_FORMAT_ID_BIFF_5", "Biff5 (Microsoft Excel 5.0/95)") +#define STR_FORMAT_ID_BIFF_8 NC_("STR_FORMAT_ID_BIFF_8", "Biff8 (Microsoft Excel 97/2000/XP/2003)") +#define STR_FORMAT_ID_SYLK NC_("STR_FORMAT_ID_SYLK", "Sylk") +#define STR_FORMAT_ID_LINK NC_("STR_FORMAT_ID_LINK", "DDE link" ) +#define STR_FORMAT_ID_DIF NC_("STR_FORMAT_ID_DIF", "DIF") +#define STR_FORMAT_ID_MSWORD_DOC NC_("STR_FORMAT_ID_MSWORD_DOC", "Microsoft Word object") +#define STR_FORMAT_ID_STAR_FRAMESET_DOC NC_("STR_FORMAT_ID_STAR_FRAMESET_DOC", "StarFrameSet object") +#define STR_FORMAT_ID_OFFICE_DOC NC_("STR_FORMAT_ID_OFFICE_DOC", "Office document object") +#define STR_FORMAT_ID_NOTES_DOCINFO NC_("STR_FORMAT_ID_NOTES_DOCINFO", "Notes document info") +#define STR_FORMAT_ID_SFX_DOC NC_("STR_FORMAT_ID_SFX_DOC", "Sfx document") +#define STR_FORMAT_ID_STARCHARTDOCUMENT_50 NC_("STR_FORMAT_ID_STARCHARTDOCUMENT_50", "StarChart 5.0 object") +#define STR_FORMAT_ID_GRAPHOBJ NC_("STR_FORMAT_ID_GRAPHOBJ", "Graphic object") +#define STR_FORMAT_ID_STARWRITER_60 NC_("STR_FORMAT_ID_STARWRITER_60", "OpenOffice.org 1.0 Writer object") +#define STR_FORMAT_ID_STARWRITERWEB_60 NC_("STR_FORMAT_ID_STARWRITERWEB_60", "OpenOffice.org 1.0 Writer/Web object") +#define STR_FORMAT_ID_STARWRITERGLOB_60 NC_("STR_FORMAT_ID_STARWRITERGLOB_60", "OpenOffice.org 1.0 Writer/Master object") +#define STR_FORMAT_ID_STARDRAW_60 NC_("STR_FORMAT_ID_STARDRAW_60", "OpenOffice.org 1.0 Draw object") +#define STR_FORMAT_ID_STARIMPRESS_60 NC_("STR_FORMAT_ID_STARIMPRESS_60", "OpenOffice.org 1.0 Impress object") +#define STR_FORMAT_ID_STARCALC_60 NC_("STR_FORMAT_ID_STARCALC_60", "OpenOffice.org 1.0 Calc object") +#define STR_FORMAT_ID_STARCHART_60 NC_("STR_FORMAT_ID_STARCHART_60", "OpenOffice.org 1.0 Chart object") +#define STR_FORMAT_ID_STARMATH_60 NC_("STR_FORMAT_ID_STARMATH_60", "OpenOffice.org 1.0 Math object") +#define STR_FORMAT_ID_WMF NC_("STR_FORMAT_ID_WMF", "Windows metafile") +#define STR_FORMAT_ID_DBACCESS_QUERY NC_("STR_FORMAT_ID_DBACCESS_QUERY", "Data source object") +#define STR_FORMAT_ID_DBACCESS_TABLE NC_("STR_FORMAT_ID_DBACCESS_TABLE", "Data source table") +#define STR_FORMAT_ID_DBACCESS_COMMAND NC_("STR_FORMAT_ID_DBACCESS_COMMAND", "SQL query") +#define STR_FORMAT_ID_DIALOG_60 NC_("STR_FORMAT_ID_DIALOG_60", "OpenOffice.org 1.0 dialog") +#define STR_FORMAT_ID_FILEGRPDESCRIPTOR NC_("STR_FORMAT_ID_FILEGRPDESCRIPTOR", "Link") +#define STR_FORMAT_ID_HTML_NO_COMMENT NC_("STR_FORMAT_ID_HTML_NO_COMMENT", "HTML format without comments") + +#define STR_ERROR_OBJNOCREATE NC_("STR_ERROR_OBJNOCREATE", "Object % could not be inserted.") +#define STR_ERROR_OBJNOCREATE_FROM_FILE NC_("STR_ERROR_OBJNOCREATE_FROM_FILE", "Object from file % could not be inserted.") +#define STR_ERROR_OBJNOCREATE_PLUGIN NC_("STR_ERROR_OBJNOCREATE_PLUGIN", "Plug-in from document % could not be inserted.") +#define STR_FURTHER_OBJECT NC_("STR_FURTHER_OBJECT", "Further objects") +#define STR_UNKNOWN_SOURCE NC_("STR_UNKNOWN_SOURCE", "Unknown source") + +#define STR_SVT_FILEVIEW_COLUMN_TITLE NC_("STR_SVT_FILEVIEW_COLUMN_TITLE", "Name") +#define STR_SVT_FILEVIEW_COLUMN_SIZE NC_("STR_SVT_FILEVIEW_COLUMN_SIZE", "Size") +#define STR_SVT_FILEVIEW_COLUMN_DATE NC_("STR_SVT_FILEVIEW_COLUMN_DATE", "Date modified") +#define STR_SVT_FILEVIEW_COLUMN_TYPE NC_("STR_SVT_FILEVIEW_COLUMN_TYPE", "Type") +#define STR_SVT_BYTES NC_("STR_SVT_BYTES", "Bytes") +#define STR_SVT_KB NC_("STR_SVT_KB", "KB") +#define STR_SVT_MB NC_("STR_SVT_MB", "MB") +#define STR_SVT_GB NC_("STR_SVT_GB", "GB") + +// descriptions of accessible objects +#define STR_SVT_ACC_DESC_TABLISTBOX NC_("STR_SVT_ACC_DESC_TABLISTBOX", "Row: %1, Column: %2") +#define STR_SVT_ACC_DESC_FILEVIEW NC_("STR_SVT_ACC_DESC_FILEVIEW", ", Type: %1, URL: %2") +#define STR_SVT_ACC_DESC_FOLDER NC_("STR_SVT_ACC_DESC_FOLDER", "Folder") +#define STR_SVT_ACC_DESC_FILE NC_("STR_SVT_ACC_DESC_FILE", "File") +#define STR_SVT_ACC_EMPTY_FIELD NC_("STR_SVT_ACC_EMPTY_FIELD", "Empty Field") + +/* + * resources for CollatorResource / CollatorResourceData resp. + */ +/* alphanumeric sorting algorithm */ +#define STR_SVT_COLLATE_ALPHANUMERIC NC_("STR_SVT_COLLATE_ALPHANUMERIC", "Alphanumeric") +/* default or normal sorting algorithm */ +#define STR_SVT_COLLATE_NORMAL NC_("STR_SVT_COLLATE_NORMAL", "Normal") +/* default or normal sorting algorithm */ +#define STR_SVT_COLLATE_CHARSET NC_("STR_SVT_COLLATE_CHARSET", "Character set") +/* german dictionary word order / sorting */ +#define STR_SVT_COLLATE_DICTIONARY NC_("STR_SVT_COLLATE_DICTIONARY", "Dictionary") +/* chinese sorting algorithm */ +#define STR_SVT_COLLATE_PINYIN NC_("STR_SVT_COLLATE_PINYIN", "Pinyin") +/* chinese sorting algorithm */ +#define STR_SVT_COLLATE_STROKE NC_("STR_SVT_COLLATE_STROKE", "Stroke") +/* chinese sorting algorithm */ +#define STR_SVT_COLLATE_RADICAL NC_("STR_SVT_COLLATE_RADICAL", "Radical") +/* sorting according to the unicode code point of the character */ +#define STR_SVT_COLLATE_UNICODE NC_("STR_SVT_COLLATE_UNICODE", "Unicode") +/* chinese sorting algorithm */ +#define STR_SVT_COLLATE_ZHUYIN NC_("STR_SVT_COLLATE_ZHUYIN", "Zhuyin") +/* phone book sorting algorithm. e.g. German */ +#define STR_SVT_COLLATE_PHONEBOOK NC_("STR_SVT_COLLATE_PHONEBOOK", "Phone book") +#define STR_SVT_COLLATE_PHONETIC_F NC_("STR_SVT_COLLATE_PHONETIC_F", "Phonetic (alphanumeric first)") +#define STR_SVT_COLLATE_PHONETIC_L NC_("STR_SVT_COLLATE_PHONETIC_L", "Phonetic (alphanumeric last)") +/* alphanumeric indexentry algorithm */ +#define STR_SVT_INDEXENTRY_ALPHANUMERIC NC_("STR_SVT_INDEXENTRY_ALPHANUMERIC", "Alphanumeric") +/* korean dictionary indexentry algorithm */ +#define STR_SVT_INDEXENTRY_DICTIONARY NC_("STR_SVT_INDEXENTRY_DICTIONARY", "Dictionary") +/* chinese sorting algorithm */ +#define STR_SVT_INDEXENTRY_PINYIN NC_("STR_SVT_INDEXENTRY_PINYIN", "Pinyin") +/* chinese indexentry algorithm */ +#define STR_SVT_INDEXENTRY_RADICAL NC_("STR_SVT_INDEXENTRY_RADICAL", "Radical") +/* chinese indexentry algorithm */ +#define STR_SVT_INDEXENTRY_STROKE NC_("STR_SVT_INDEXENTRY_STROKE", "Stroke") +/* chinese indexentry algorithm */ +#define STR_SVT_INDEXENTRY_ZHUYIN NC_("STR_SVT_INDEXENTRY_ZHUYIN", "Zhuyin") +#define STR_SVT_INDEXENTRY_PHONETIC_FS NC_("STR_SVT_INDEXENTRY_PHONETIC_FS", "Phonetic (alphanumeric first, grouped by syllables)") +#define STR_SVT_INDEXENTRY_PHONETIC_FC NC_("STR_SVT_INDEXENTRY_PHONETIC_FC", "Phonetic (alphanumeric first, grouped by consonants)") +#define STR_SVT_INDEXENTRY_PHONETIC_LS NC_("STR_SVT_INDEXENTRY_PHONETIC_LS", "Phonetic (alphanumeric last, grouped by syllables)") +#define STR_SVT_INDEXENTRY_PHONETIC_LC NC_("STR_SVT_INDEXENTRY_PHONETIC_LC", "Phonetic (alphanumeric last, grouped by consonants)") + +#define STR_SVT_CALENDAR_DAY NC_("STR_SVT_CALENDAR_DAY", "Day") +#define STR_SVT_CALENDAR_WEEK NC_("STR_SVT_CALENDAR_WEEK", "Week") +#define STR_SVT_CALENDAR_TODAY NC_("STR_SVT_CALENDAR_TODAY", "Today") +#define STR_SVT_CALENDAR_NONE NC_("STR_SVT_CALENDAR_NONE", "None") + +#define STR_SVT_STYLE_LIGHT NC_("STR_SVT_STYLE_LIGHT", "Light") +#define STR_SVT_STYLE_LIGHT_ITALIC NC_("STR_SVT_STYLE_LIGHT_ITALIC", "Light Italic") +#define STR_SVT_STYLE_NORMAL NC_("STR_SVT_STYLE_NORMAL", "Regular") +#define STR_SVT_STYLE_NORMAL_ITALIC NC_("STR_SVT_STYLE_NORMAL_ITALIC", "Italic") +#define STR_SVT_STYLE_BOLD NC_("STR_SVT_STYLE_BOLD", "Bold") +#define STR_SVT_STYLE_BOLD_ITALIC NC_("STR_SVT_STYLE_BOLD_ITALIC", "Bold Italic") +#define STR_SVT_STYLE_BLACK NC_("STR_SVT_STYLE_BLACK", "Black") +#define STR_SVT_STYLE_BLACK_ITALIC NC_("STR_SVT_STYLE_BLACK_ITALIC", "Black Italic") +#define STR_SVT_STYLE_BOOK NC_("STR_SVT_STYLE_BOOK", "Book") +#define STR_SVT_STYLE_BOLD_OBLIQUE NC_("STR_SVT_STYLE_BOLD_OBLIQUE", "Bold Oblique") +#define STR_SVT_STYLE_CONDENSED NC_("STR_SVT_STYLE_CONDENSED", "Condensed") +#define STR_SVT_STYLE_CONDENSED_BOLD NC_("STR_SVT_STYLE_CONDENSED_BOLD", "Condensed Bold") +#define STR_SVT_STYLE_CONDENSED_BOLD_ITALIC NC_("STR_SVT_STYLE_CONDENSED_BOLD_ITALIC", "Condensed Bold Italic") +#define STR_SVT_STYLE_CONDENSED_BOLD_OBLIQUE NC_("STR_SVT_STYLE_CONDENSED_BOLD_OBLIQUE", "Condensed Bold Oblique") +#define STR_SVT_STYLE_CONDENSED_ITALIC NC_("STR_SVT_STYLE_CONDENSED_ITALIC", "Condensed Italic") +#define STR_SVT_STYLE_CONDENSED_OBLIQUE NC_("STR_SVT_STYLE_CONDENSED_OBLIQUE", "Condensed Oblique") +#define STR_SVT_STYLE_EXTRALIGHT NC_("STR_SVT_STYLE_EXTRALIGHT", "ExtraLight") +#define STR_SVT_STYLE_EXTRALIGHT_ITALIC NC_("STR_SVT_STYLE_EXTRALIGHT_ITALIC", "ExtraLight Italic") +#define STR_SVT_STYLE_OBLIQUE NC_("STR_SVT_STYLE_OBLIQUE", "Oblique") +#define STR_SVT_STYLE_SEMIBOLD NC_("STR_SVT_STYLE_SEMIBOLD", "Semibold") +#define STR_SVT_STYLE_SEMIBOLD_ITALIC NC_("STR_SVT_STYLE_SEMIBOLD_ITALIC", "Semibold Italic") +#define STR_SVT_FONTMAP_BOTH NC_("STR_SVT_FONTMAP_BOTH", "The same font will be used on both your printer and your screen.") +#define STR_SVT_FONTMAP_PRINTERONLY NC_("STR_SVT_FONTMAP_PRINTERONLY", "This is a printer font. The screen image may differ.") +#define STR_SVT_FONTMAP_STYLENOTAVAILABLE NC_("STR_SVT_FONTMAP_STYLENOTAVAILABLE", "This font style will be simulated or the closest matching style will be used.") +#define STR_SVT_FONTMAP_NOTAVAILABLE NC_("STR_SVT_FONTMAP_NOTAVAILABLE", "This font has not been installed. The closest available font will be used.") + +#define STR_FILECTRL_BUTTONTEXT NC_("STR_FILECTRL_BUTTONTEXT", "Browse...") +#define STR_TABBAR_PUSHBUTTON_MOVET0HOME NC_("STR_TABBAR_PUSHBUTTON_MOVET0HOME", "Move To Home") +#define STR_TABBAR_PUSHBUTTON_MOVELEFT NC_("STR_TABBAR_PUSHBUTTON_MOVELEFT", "Move Left") +#define STR_TABBAR_PUSHBUTTON_MOVERIGHT NC_("STR_TABBAR_PUSHBUTTON_MOVERIGHT", "Move Right") +#define STR_TABBAR_PUSHBUTTON_MOVETOEND NC_("STR_TABBAR_PUSHBUTTON_MOVETOEND", "Move To End") +#define STR_TABBAR_PUSHBUTTON_ADDTAB NC_("STR_TABBAR_PUSHBUTTON_ADDTAB", "Add") + +#define STR_SVT_ACC_RULER_HORZ_NAME NC_("STR_SVT_ACC_RULER_HORZ_NAME", "Horizontal Ruler") +#define STR_SVT_ACC_RULER_VERT_NAME NC_("STR_SVT_ACC_RULER_VERT_NAME", "Vertical Ruler") + +#define STR_SVT_1BIT_THRESHOLD NC_("STR_SVT_1BIT_THRESHOLD", "1 bit threshold") +#define STR_SVT_1BIT_DITHERED NC_("STR_SVT_1BIT_DITHERED", "1 bit dithered") +#define STR_SVT_4BIT_GRAYSCALE NC_("STR_SVT_4BIT_GRAYSCALE", "4 bit grayscale") +#define STR_SVT_4BIT_COLOR_PALETTE NC_("STR_SVT_4BIT_COLOR_PALETTE", "4 bit color") +#define STR_SVT_8BIT_GRAYSCALE NC_("STR_SVT_8BIT_GRAYSCALE", "8 bit grayscale") +#define STR_SVT_8BIT_COLOR_PALETTE NC_("STR_SVT_8BIT_COLOR_PALETTE", "8 bit color") +#define STR_SVT_24BIT_TRUE_COLOR NC_("STR_SVT_24BIT_TRUE_COLOR", "24 bit true color") +#define STR_SVT_ESTIMATED_SIZE_PIX_1 NC_("STR_SVT_ESTIMATED_SIZE_PIX_1", "The image needs about %1 KB of memory.") +#define STR_SVT_ESTIMATED_SIZE_PIX_2 NC_("STR_SVT_ESTIMATED_SIZE_PIX_2", "The image needs about %1 KB of memory, the file size is %2 KB.") +#define STR_SVT_ESTIMATED_SIZE_VEC NC_("STR_SVT_ESTIMATED_SIZE_VEC", "The file size is %1 KB.") +#define STR_SVT_HOST NC_("STR_SVT_HOST", "host") +#define STR_SVT_PORT NC_("STR_SVT_PORT", "port") +#define STR_SVT_PRNDLG_READY NC_("STR_SVT_PRNDLG_READY", "Ready") +#define STR_SVT_PRNDLG_PAUSED NC_("STR_SVT_PRNDLG_PAUSED", "Paused") +#define STR_SVT_PRNDLG_PENDING NC_("STR_SVT_PRNDLG_PENDING", "Pending deletion") +#define STR_SVT_PRNDLG_BUSY NC_("STR_SVT_PRNDLG_BUSY", "Busy") +#define STR_SVT_PRNDLG_INITIALIZING NC_("STR_SVT_PRNDLG_INITIALIZING", "Initializing") +#define STR_SVT_PRNDLG_WAITING NC_("STR_SVT_PRNDLG_WAITING", "Waiting") +#define STR_SVT_PRNDLG_WARMING_UP NC_("STR_SVT_PRNDLG_WARMING_UP", "Warming up") +#define STR_SVT_PRNDLG_PROCESSING NC_("STR_SVT_PRNDLG_PROCESSING", "Processing") +#define STR_SVT_PRNDLG_PRINTING NC_("STR_SVT_PRNDLG_PRINTING", "Printing") +#define STR_SVT_PRNDLG_OFFLINE NC_("STR_SVT_PRNDLG_OFFLINE", "Offline") +#define STR_SVT_PRNDLG_ERROR NC_("STR_SVT_PRNDLG_ERROR", "Error") +#define STR_SVT_PRNDLG_SERVER_UNKNOWN NC_("STR_SVT_PRNDLG_SERVER_UNKNOWN", "Unknown Server") +#define STR_SVT_PRNDLG_PAPER_JAM NC_("STR_SVT_PRNDLG_PAPER_JAM", "Paper jam") +#define STR_SVT_PRNDLG_PAPER_OUT NC_("STR_SVT_PRNDLG_PAPER_OUT", "Not enough paper") +#define STR_SVT_PRNDLG_MANUAL_FEED NC_("STR_SVT_PRNDLG_MANUAL_FEED", "Manual feed") +#define STR_SVT_PRNDLG_PAPER_PROBLEM NC_("STR_SVT_PRNDLG_PAPER_PROBLEM", "Paper problem") +#define STR_SVT_PRNDLG_IO_ACTIVE NC_("STR_SVT_PRNDLG_IO_ACTIVE", "I/O active") +#define STR_SVT_PRNDLG_OUTPUT_BIN_FULL NC_("STR_SVT_PRNDLG_OUTPUT_BIN_FULL", "Output bin full") +#define STR_SVT_PRNDLG_TONER_LOW NC_("STR_SVT_PRNDLG_TONER_LOW", "Toner low") +#define STR_SVT_PRNDLG_NO_TONER NC_("STR_SVT_PRNDLG_NO_TONER", "No toner") +#define STR_SVT_PRNDLG_PAGE_PUNT NC_("STR_SVT_PRNDLG_PAGE_PUNT", "Delete Page") +#define STR_SVT_PRNDLG_USER_INTERVENTION NC_("STR_SVT_PRNDLG_USER_INTERVENTION", "User intervention necessary") +#define STR_SVT_PRNDLG_OUT_OF_MEMORY NC_("STR_SVT_PRNDLG_OUT_OF_MEMORY", "Insufficient memory") +#define STR_SVT_PRNDLG_DOOR_OPEN NC_("STR_SVT_PRNDLG_DOOR_OPEN", "Cover open") +#define STR_SVT_PRNDLG_POWER_SAVE NC_("STR_SVT_PRNDLG_POWER_SAVE", "Power save mode") +#define STR_SVT_PRNDLG_DEFPRINTER NC_("STR_SVT_PRNDLG_DEFPRINTER", "Default printer") +#define STR_SVT_PRNDLG_JOBCOUNT NC_("STR_SVT_PRNDLG_JOBCOUNT", "%d documents") + +#define STR_WIZDLG_FINISH NC_("STR_WIZDLG_FINISH", "~Finish") +#define STR_WIZDLG_NEXT NC_("STR_WIZDLG_NEXT", "~Next >>") +#define STR_WIZDLG_PREVIOUS NC_("STR_WIZDLG_PREVIOUS", "<< Bac~k") +#define STR_WIZDLG_ROADMAP_TITLE NC_("STR_WIZDLG_ROADMAP_TITLE", "Steps") + +#define STR_NO_FIELD_SELECTION NC_("STR_NO_FIELD_SELECTION", "") +#define STR_FIELD_COMPANY NC_("STR_FIELD_COMPANY", "Company") +#define STR_FIELD_DEPARTMENT NC_("STR_FIELD_DEPARTMENT", "Department") +#define STR_FIELD_FIRSTNAME NC_("STR_FIELD_FIRSTNAME", "First name") +#define STR_FIELD_LASTNAME NC_("STR_FIELD_LASTNAME", "Last name") +#define STR_FIELD_STREET NC_("STR_FIELD_STREET", "Street") +#define STR_FIELD_COUNTRY NC_("STR_FIELD_COUNTRY", "Country") +#define STR_FIELD_ZIPCODE NC_("STR_FIELD_ZIPCODE", "ZIP Code") +#define STR_FIELD_CITY NC_("STR_FIELD_CITY", "City") +#define STR_FIELD_TITLE NC_("STR_FIELD_TITLE", "Title") +#define STR_FIELD_POSITION NC_("STR_FIELD_POSITION", "Position") +#define STR_FIELD_ADDRFORM NC_("STR_FIELD_ADDRFORM", "Addr. Form") +#define STR_FIELD_INITIALS NC_("STR_FIELD_INITIALS", "Initials") +#define STR_FIELD_SALUTATION NC_("STR_FIELD_SALUTATION", "Complimentary close") +#define STR_FIELD_HOMETEL NC_("STR_FIELD_HOMETEL", "Tel: Home") +#define STR_FIELD_WORKTEL NC_("STR_FIELD_WORKTEL", "Tel: Work") +#define STR_FIELD_FAX NC_("STR_FIELD_FAX", "FAX") +#define STR_FIELD_EMAIL NC_("STR_FIELD_EMAIL", "E-mail") +#define STR_FIELD_URL NC_("STR_FIELD_URL", "URL") +#define STR_FIELD_NOTE NC_("STR_FIELD_NOTE", "Note") +#define STR_FIELD_USER1 NC_("STR_FIELD_USER1", "User 1") +#define STR_FIELD_USER2 NC_("STR_FIELD_USER2", "User 2") +#define STR_FIELD_USER3 NC_("STR_FIELD_USER3", "User 3") +#define STR_FIELD_USER4 NC_("STR_FIELD_USER4", "User 4") +#define STR_FIELD_ID NC_("STR_FIELD_ID", "ID") +#define STR_FIELD_STATE NC_("STR_FIELD_STATE", "State") +#define STR_FIELD_OFFICETEL NC_("STR_FIELD_OFFICETEL", "Tel: Office") +#define STR_FIELD_PAGER NC_("STR_FIELD_PAGER", "Pager") +#define STR_FIELD_MOBILE NC_("STR_FIELD_MOBILE", "Mobile") +#define STR_FIELD_TELOTHER NC_("STR_FIELD_TELOTHER", "Tel: Other") +#define STR_FIELD_CALENDAR NC_("STR_FIELD_CALENDAR", "Calendar") +#define STR_FIELD_INVITE NC_("STR_FIELD_INVITE", "Invite") + +#define STR_SVT_DEFAULT_SERVICE_LABEL NC_("STR_SVT_DEFAULT_SERVICE_LABEL", "$user$'s $service$") + +#define STR_WARNING_JAVANOTFOUND NC_("STR_WARNING_JAVANOTFOUND", "PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. Please install a JRE and restart %PRODUCTNAME.") +#define STR_WARNING_JAVANOTFOUND_MAC NC_("STR_WARNING_JAVANOTFOUND_MAC", "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.") +#define STR_WARNING_INVALIDJAVASETTINGS_MAC NC_("STR_WARNING_INVALIDJAVASETTINGS_MAC", "The %PRODUCTNAME configuration has been changed. Under %PRODUCTNAME - Preferences - %PRODUCTNAME - Advanced, select the Java runtime environment you want to have used by %PRODUCTNAME.") +#define STR_WARNING_INVALIDJAVASETTINGS NC_("STR_WARNING_INVALIDJAVASETTINGS", "The %PRODUCTNAME configuration has been changed. Under Tools - Options - %PRODUCTNAME - Advanced, select the Java runtime environment you want to have used by %PRODUCTNAME.") +#define STR_ERROR_JVMCREATIONFAILED_MAC NC_("STR_ERROR_JVMCREATIONFAILED_MAC", "%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.") +#define STR_ERROR_JVMCREATIONFAILED NC_("STR_ERROR_JVMCREATIONFAILED", "%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.") +#define STR_WARNING_JAVANOTFOUND_TITLE NC_("STR_WARNING_JAVANOTFOUND_TITLE", "JRE Required") +#define STR_WARNING_INVALIDJAVASETTINGS_TITLE NC_("STR_WARNING_INVALIDJAVASETTINGS_TITLE", "Select JRE") +#define STR_ERROR_JVMCREATIONFAILED_TITLE NC_("STR_ERROR_JVMCREATIONFAILED_TITLE", "JRE is Defective") + +#define STR_DESCRIPTION_SOURCEFILE NC_("STR_DESCRIPTION_SOURCEFILE", "Source code") +#define STR_DESCRIPTION_BOOKMARKFILE NC_("STR_DESCRIPTION_BOOKMARKFILE", "Bookmark file") +#define STR_DESCRIPTION_GRAPHIC_DOC NC_("STR_DESCRIPTION_GRAPHIC_DOC", "Graphics") +#define STR_DESCRIPTION_CFGFILE NC_("STR_DESCRIPTION_CFGFILE", "Configuration file") +#define STR_DESCRIPTION_APPLICATION NC_("STR_DESCRIPTION_APPLICATION", "Application") +#define STR_DESCRIPTION_DATABASE_TABLE NC_("STR_DESCRIPTION_DATABASE_TABLE", "Database table") +#define STR_DESCRIPTION_SYSFILE NC_("STR_DESCRIPTION_SYSFILE", "System file") +#define STR_DESCRIPTION_WORD_DOC NC_("STR_DESCRIPTION_WORD_DOC", "MS Word document") +#define STR_DESCRIPTION_HELP_DOC NC_("STR_DESCRIPTION_HELP_DOC", "Help file") +#define STR_DESCRIPTION_HTMLFILE NC_("STR_DESCRIPTION_HTMLFILE", "HTML document") +#define STR_DESCRIPTION_ARCHIVFILE NC_("STR_DESCRIPTION_ARCHIVFILE", "Archive file") +#define STR_DESCRIPTION_LOGFILE NC_("STR_DESCRIPTION_LOGFILE", "Log file") +#define STR_DESCRIPTION_SDATABASE_DOC NC_("STR_DESCRIPTION_SDATABASE_DOC", "StarOffice Database") +#define STR_DESCRIPTION_GLOBALDOC NC_("STR_DESCRIPTION_GLOBALDOC", "StarWriter 4.0 / 5.0 Master Document") +#define STR_DESCRIPTION_SIMAGE_DOC NC_("STR_DESCRIPTION_SIMAGE_DOC", "StarOffice Image") +#define STR_DESCRIPTION_TEXTFILE NC_("STR_DESCRIPTION_TEXTFILE", "Text file") +#define STR_DESCRIPTION_LINK NC_("STR_DESCRIPTION_LINK", "Link") +#define STR_DESCRIPTION_SOFFICE_TEMPLATE_DOC NC_("STR_DESCRIPTION_SOFFICE_TEMPLATE_DOC", "StarOffice 3.0 - 5.0 Template") +#define STR_DESCRIPTION_EXCEL_DOC NC_("STR_DESCRIPTION_EXCEL_DOC", "MS Excel document") +#define STR_DESCRIPTION_EXCEL_TEMPLATE_DOC NC_("STR_DESCRIPTION_EXCEL_TEMPLATE_DOC", "MS Excel template") +#define STR_DESCRIPTION_BATCHFILE NC_("STR_DESCRIPTION_BATCHFILE", "Batch file") +#define STR_DESCRIPTION_FILE NC_("STR_DESCRIPTION_FILE", "File") +#define STR_DESCRIPTION_FOLDER NC_("STR_DESCRIPTION_FOLDER", "Folder") +#define STR_DESCRIPTION_FACTORY_WRITER NC_("STR_DESCRIPTION_FACTORY_WRITER", "Text Document") +#define STR_DESCRIPTION_FACTORY_CALC NC_("STR_DESCRIPTION_FACTORY_CALC", "Spreadsheet") +#define STR_DESCRIPTION_FACTORY_IMPRESS NC_("STR_DESCRIPTION_FACTORY_IMPRESS", "Presentation") +#define STR_DESCRIPTION_FACTORY_DRAW NC_("STR_DESCRIPTION_FACTORY_DRAW", "Drawing") +#define STR_DESCRIPTION_FACTORY_WRITERWEB NC_("STR_DESCRIPTION_FACTORY_WRITERWEB", "HTML document") +#define STR_DESCRIPTION_FACTORY_GLOBALDOC NC_("STR_DESCRIPTION_FACTORY_GLOBALDOC", "Master document") +#define STR_DESCRIPTION_FACTORY_MATH NC_("STR_DESCRIPTION_FACTORY_MATH", "Formula") +#define STR_DESCRIPTION_FACTORY_DATABASE NC_("STR_DESCRIPTION_FACTORY_DATABASE", "Database") +#define STR_DESCRIPTION_CALC_TEMPLATE NC_("STR_DESCRIPTION_CALC_TEMPLATE", "OpenOffice.org 1.0 Spreadsheet Template") +#define STR_DESCRIPTION_DRAW_TEMPLATE NC_("STR_DESCRIPTION_DRAW_TEMPLATE", "OpenOffice.org 1.0 Drawing Template") +#define STR_DESCRIPTION_IMPRESS_TEMPLATE NC_("STR_DESCRIPTION_IMPRESS_TEMPLATE", "OpenOffice.org 1.0 Presentation Template") +#define STR_DESCRIPTION_WRITER_TEMPLATE NC_("STR_DESCRIPTION_WRITER_TEMPLATE", "OpenOffice.org 1.0 Text Document Template") +#define STR_DESCRIPTION_LOCALE_VOLUME NC_("STR_DESCRIPTION_LOCALE_VOLUME", "Local drive") +#define STR_DESCRIPTION_FLOPPY_VOLUME NC_("STR_DESCRIPTION_FLOPPY_VOLUME", "Disk drive") +#define STR_DESCRIPTION_CDROM_VOLUME NC_("STR_DESCRIPTION_CDROM_VOLUME", "CD-ROM drive") +#define STR_DESCRIPTION_REMOTE_VOLUME NC_("STR_DESCRIPTION_REMOTE_VOLUME", "Network connection") +#define STR_DESCRIPTION_POWERPOINT NC_("STR_DESCRIPTION_POWERPOINT", "MS PowerPoint Document") +#define STR_DESCRIPTION_POWERPOINT_TEMPLATE NC_("STR_DESCRIPTION_POWERPOINT_TEMPLATE", "MS PowerPoint Template") +#define STR_DESCRIPTION_POWERPOINT_SHOW NC_("STR_DESCRIPTION_POWERPOINT_SHOW", "MS PowerPoint Show") +#define STR_DESCRIPTION_SXMATH_DOC NC_("STR_DESCRIPTION_SXMATH_DOC", "OpenOffice.org 1.0 Formula") +#define STR_DESCRIPTION_SXCHART_DOC NC_("STR_DESCRIPTION_SXCHART_DOC", "OpenOffice.org 1.0 Chart") +#define STR_DESCRIPTION_SXDRAW_DOC NC_("STR_DESCRIPTION_SXDRAW_DOC", "OpenOffice.org 1.0 Drawing") +#define STR_DESCRIPTION_SXCALC_DOC NC_("STR_DESCRIPTION_SXCALC_DOC", "OpenOffice.org 1.0 Spreadsheet") +#define STR_DESCRIPTION_SXIMPRESS_DOC NC_("STR_DESCRIPTION_SXIMPRESS_DOC", "OpenOffice.org 1.0 Presentation") +#define STR_DESCRIPTION_SXWRITER_DOC NC_("STR_DESCRIPTION_SXWRITER_DOC", "OpenOffice.org 1.0 Text Document") +#define STR_DESCRIPTION_SXGLOBAL_DOC NC_("STR_DESCRIPTION_SXGLOBAL_DOC", "OpenOffice.org 1.0 Master Document") +#define STR_DESCRIPTION_MATHML_DOC NC_("STR_DESCRIPTION_MATHML_DOC", "MathML Document") +#define STR_DESCRIPTION_OO_DATABASE_DOC NC_("STR_DESCRIPTION_OO_DATABASE_DOC", "OpenDocument Database") +#define STR_DESCRIPTION_OO_DRAW_DOC NC_("STR_DESCRIPTION_OO_DRAW_DOC", "OpenDocument Drawing") +#define STR_DESCRIPTION_OO_MATH_DOC NC_("STR_DESCRIPTION_OO_MATH_DOC", "OpenDocument Formula") +#define STR_DESCRIPTION_OO_GLOBAL_DOC NC_("STR_DESCRIPTION_OO_GLOBAL_DOC", "OpenDocument Master Document") +#define STR_DESCRIPTION_OO_IMPRESS_DOC NC_("STR_DESCRIPTION_OO_IMPRESS_DOC", "OpenDocument Presentation") +#define STR_DESCRIPTION_OO_CALC_DOC NC_("STR_DESCRIPTION_OO_CALC_DOC", "OpenDocument Spreadsheet") +#define STR_DESCRIPTION_OO_WRITER_DOC NC_("STR_DESCRIPTION_OO_WRITER_DOC", "OpenDocument Text") +#define STR_DESCRIPTION_OO_CALC_TEMPLATE NC_("STR_DESCRIPTION_OO_CALC_TEMPLATE", "OpenDocument Spreadsheet Template") +#define STR_DESCRIPTION_OO_DRAW_TEMPLATE NC_("STR_DESCRIPTION_OO_DRAW_TEMPLATE", "OpenDocument Drawing Template") +#define STR_DESCRIPTION_OO_IMPRESS_TEMPLATE NC_("STR_DESCRIPTION_OO_IMPRESS_TEMPLATE", "OpenDocument Presentation Template") +#define STR_DESCRIPTION_OO_WRITER_TEMPLATE NC_("STR_DESCRIPTION_OO_WRITER_TEMPLATE", "OpenDocument Text Template") +#define STR_DESCRIPTION_EXTENSION NC_("STR_DESCRIPTION_EXTENSION", "%PRODUCTNAME Extension") + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/svtools.hrc b/include/svtools/svtools.hrc deleted file mode 100644 index 70186f41fabb..000000000000 --- a/include/svtools/svtools.hrc +++ /dev/null @@ -1,247 +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_SVTOOLS_HRC -#define INCLUDED_SVTOOLS_SVTOOLS_HRC - -#include - -#define RID_SVTOOLS_BITMAP_START (RID_SVTOOLS_START + 0) -#define RID_SVTOOLS_IMAGELIST_START (RID_SVTOOLS_START + 0) - -// various unsorted stuff - -#define STR_SVT_FILEVIEW_COLUMN_TITLE (RID_SVTOOLS_START + 20) -#define STR_SVT_FILEVIEW_COLUMN_SIZE (RID_SVTOOLS_START + 21) -#define STR_SVT_FILEVIEW_COLUMN_DATE (RID_SVTOOLS_START + 22) -#define STR_SVT_BYTES (RID_SVTOOLS_START + 25) -#define STR_SVT_KB (RID_SVTOOLS_START + 26) -#define STR_SVT_MB (RID_SVTOOLS_START + 27) -#define STR_SVT_GB (RID_SVTOOLS_START + 28) -#define STR_SVT_FILEVIEW_COLUMN_TYPE (RID_SVTOOLS_START + 29) -#define STR_FILTERNAME_ALL (RID_SVTOOLS_START + 30) -//FREE -#define STR_SVT_1BIT_THRESHOLD (RID_SVTOOLS_START + 32) -#define STR_SVT_1BIT_DITHERED (RID_SVTOOLS_START + 33) -#define STR_SVT_4BIT_GRAYSCALE (RID_SVTOOLS_START + 34) -#define STR_SVT_4BIT_COLOR_PALETTE (RID_SVTOOLS_START + 35) -#define STR_SVT_8BIT_GRAYSCALE (RID_SVTOOLS_START + 36) -#define STR_SVT_8BIT_COLOR_PALETTE (RID_SVTOOLS_START + 37) -#define STR_SVT_24BIT_TRUE_COLOR (RID_SVTOOLS_START + 38) -#define STR_SVT_ESTIMATED_SIZE_PIX_1 (RID_SVTOOLS_START + 39) -#define STR_SVT_ESTIMATED_SIZE_PIX_2 (RID_SVTOOLS_START + 40) -#define STR_SVT_ESTIMATED_SIZE_VEC (RID_SVTOOLS_START + 41) -#define STR_SVT_HOST (RID_SVTOOLS_START + 42) -#define STR_SVT_PORT (RID_SVTOOLS_START + 43) - -// FREE - -#define STR_SVT_DEFAULT_SERVICE_LABEL (RID_SVTOOLS_START+57) - -#define STRARY_SVT_DOCINFO (RID_SVTOOLS_START+58) - -#define STR_BASICKEY_FORMAT_ON (RID_SVTOOLS_START+103) -#define STR_BASICKEY_FORMAT_OFF (RID_SVTOOLS_START+104) -#define STR_BASICKEY_FORMAT_YES (RID_SVTOOLS_START+105) -#define STR_BASICKEY_FORMAT_NO (RID_SVTOOLS_START+106) -#define STR_BASICKEY_FORMAT_TRUE (RID_SVTOOLS_START+107) -#define STR_BASICKEY_FORMAT_FALSE (RID_SVTOOLS_START+108) -#define STR_UNDO (RID_SVTOOLS_START+110) -#define STR_REDO (RID_SVTOOLS_START+111) -#define STR_REPEAT (RID_SVTOOLS_START+112) - -#define STR_BASICKEY_FORMAT_CURRENCY (RID_SVTOOLS_START+130) - -#define STR_SVT_PRNDLG_START (RID_SVTOOLS_START+141) - -#define STR_SVT_PRNDLG_READY (STR_SVT_PRNDLG_START+2) -#define STR_SVT_PRNDLG_PAUSED (STR_SVT_PRNDLG_START+3) -#define STR_SVT_PRNDLG_PENDING (STR_SVT_PRNDLG_START+4) -#define STR_SVT_PRNDLG_BUSY (STR_SVT_PRNDLG_START+5) -#define STR_SVT_PRNDLG_INITIALIZING (STR_SVT_PRNDLG_START+6) -#define STR_SVT_PRNDLG_WAITING (STR_SVT_PRNDLG_START+7) -#define STR_SVT_PRNDLG_WARMING_UP (STR_SVT_PRNDLG_START+8) -#define STR_SVT_PRNDLG_PROCESSING (STR_SVT_PRNDLG_START+9) -#define STR_SVT_PRNDLG_PRINTING (STR_SVT_PRNDLG_START+10) -#define STR_SVT_PRNDLG_OFFLINE (STR_SVT_PRNDLG_START+11) -#define STR_SVT_PRNDLG_ERROR (STR_SVT_PRNDLG_START+12) -#define STR_SVT_PRNDLG_SERVER_UNKNOWN (STR_SVT_PRNDLG_START+13) -#define STR_SVT_PRNDLG_PAPER_JAM (STR_SVT_PRNDLG_START+14) -#define STR_SVT_PRNDLG_PAPER_OUT (STR_SVT_PRNDLG_START+15) -#define STR_SVT_PRNDLG_MANUAL_FEED (STR_SVT_PRNDLG_START+16) -#define STR_SVT_PRNDLG_PAPER_PROBLEM (STR_SVT_PRNDLG_START+17) -#define STR_SVT_PRNDLG_IO_ACTIVE (STR_SVT_PRNDLG_START+18) -#define STR_SVT_PRNDLG_OUTPUT_BIN_FULL (STR_SVT_PRNDLG_START+19) -#define STR_SVT_PRNDLG_TONER_LOW (STR_SVT_PRNDLG_START+20) -#define STR_SVT_PRNDLG_NO_TONER (STR_SVT_PRNDLG_START+21) -#define STR_SVT_PRNDLG_PAGE_PUNT (STR_SVT_PRNDLG_START+22) -#define STR_SVT_PRNDLG_USER_INTERVENTION (STR_SVT_PRNDLG_START+23) -#define STR_SVT_PRNDLG_OUT_OF_MEMORY (STR_SVT_PRNDLG_START+24) -#define STR_SVT_PRNDLG_DOOR_OPEN (STR_SVT_PRNDLG_START+25) -#define STR_SVT_PRNDLG_POWER_SAVE (STR_SVT_PRNDLG_START+26) -#define STR_SVT_PRNDLG_DEFPRINTER (STR_SVT_PRNDLG_START+27) -#define STR_SVT_PRNDLG_JOBCOUNT (STR_SVT_PRNDLG_START+28) -#define STR_SVT_PRNDLG_END (STR_SVT_PRNDLG_JOBCOUNT) - -#define STR_SVT_CALENDAR_START (STR_SVT_PRNDLG_END+1) -#define STR_SVT_CALENDAR_DAY (STR_SVT_CALENDAR_START+0) -#define STR_SVT_CALENDAR_WEEK (STR_SVT_CALENDAR_START+1) -#define STR_SVT_CALENDAR_TODAY (STR_SVT_CALENDAR_START+2) -#define STR_SVT_CALENDAR_NONE (STR_SVT_CALENDAR_START+3) -#define STR_SVT_CALENDAR_END (STR_SVT_CALENDAR_NONE) - -#define STR_SVT_STYLE_START (STR_SVT_CALENDAR_END+1) -#define STR_SVT_STYLE_LIGHT (STR_SVT_STYLE_START+0) -#define STR_SVT_STYLE_LIGHT_ITALIC (STR_SVT_STYLE_START+1) -#define STR_SVT_STYLE_NORMAL (STR_SVT_STYLE_START+2) -#define STR_SVT_STYLE_NORMAL_ITALIC (STR_SVT_STYLE_START+3) -#define STR_SVT_STYLE_BOLD (STR_SVT_STYLE_START+4) -#define STR_SVT_STYLE_BOLD_ITALIC (STR_SVT_STYLE_START+5) -#define STR_SVT_STYLE_BLACK (STR_SVT_STYLE_START+6) -#define STR_SVT_STYLE_BLACK_ITALIC (STR_SVT_STYLE_START+7) -#define STR_SVT_STYLE_BOOK (STR_SVT_STYLE_START+8) -#define STR_SVT_STYLE_BOLD_OBLIQUE (STR_SVT_STYLE_START+9) -#define STR_SVT_STYLE_CONDENSED (STR_SVT_STYLE_START+10) -#define STR_SVT_STYLE_CONDENSED_BOLD (STR_SVT_STYLE_START+11) -#define STR_SVT_STYLE_CONDENSED_BOLD_ITALIC (STR_SVT_STYLE_START+12) -#define STR_SVT_STYLE_CONDENSED_BOLD_OBLIQUE (STR_SVT_STYLE_START+13) -#define STR_SVT_STYLE_CONDENSED_ITALIC (STR_SVT_STYLE_START+14) -#define STR_SVT_STYLE_CONDENSED_OBLIQUE (STR_SVT_STYLE_START+15) -#define STR_SVT_STYLE_EXTRALIGHT (STR_SVT_STYLE_START+16) -#define STR_SVT_STYLE_EXTRALIGHT_ITALIC (STR_SVT_STYLE_START+17) -#define STR_SVT_STYLE_OBLIQUE (STR_SVT_STYLE_START+18) -#define STR_SVT_STYLE_SEMIBOLD (STR_SVT_STYLE_START+19) -#define STR_SVT_STYLE_SEMIBOLD_ITALIC (STR_SVT_STYLE_START+20) -#define STR_SVT_STYLE_END (STR_SVT_STYLE_SEMIBOLD_ITALIC) - -#define STR_SVT_FONTMAP_START (STR_SVT_STYLE_END+1) -#define STR_SVT_FONTMAP_BOTH (STR_SVT_FONTMAP_START+0) -#define STR_SVT_FONTMAP_PRINTERONLY (STR_SVT_FONTMAP_START+1) -#define STR_SVT_FONTMAP_STYLENOTAVAILABLE (STR_SVT_FONTMAP_START+4) -#define STR_SVT_FONTMAP_NOTAVAILABLE (STR_SVT_FONTMAP_START+5) -#define STR_SVT_FONTMAP_END (STR_SVT_FONTMAP_NOTAVAILABLE) - -#define STR_SVT_ERRORCONTEXT_START (STR_SVT_FONTMAP_END+1) -#define RID_ERRCTX (STR_SVT_ERRORCONTEXT_START+2) -#define RID_ERRHDL (STR_SVT_ERRORCONTEXT_START+3) -#define STR_SVT_ERRORCONTEXT_END (RID_ERRHDL) - -#define STR_WIZARDDIALOG_START (STR_SVT_ERRORCONTEXT_END + 1) -#define STR_WIZDLG_FINISH (STR_WIZARDDIALOG_START + 0) -#define STR_WIZDLG_NEXT (STR_WIZARDDIALOG_START + 1) -#define STR_WIZDLG_PREVIOUS (STR_WIZARDDIALOG_START + 2) -#define STR_WIZDLG_ROADMAP_TITLE (STR_WIZARDDIALOG_START + 3) -#define STR_WIZARDDIALOG_END (STR_WIZDLG_ROADMAP_TITLE) - -#define STR_SVT_COLLATE_START (STR_WIZARDDIALOG_END+1) -#define STR_SVT_COLLATE_NORMAL (STR_SVT_COLLATE_START+0) -#define STR_SVT_COLLATE_DICTIONARY (STR_SVT_COLLATE_START+1) -#define STR_SVT_COLLATE_PINYIN (STR_SVT_COLLATE_START+2) -#define STR_SVT_COLLATE_STROKE (STR_SVT_COLLATE_START+3) -#define STR_SVT_COLLATE_RADICAL (STR_SVT_COLLATE_START+4) -#define STR_SVT_COLLATE_CHARSET (STR_SVT_COLLATE_START+5) -#define STR_SVT_COLLATE_ZHUYIN (STR_SVT_COLLATE_START+6) -#define STR_SVT_COLLATE_ALPHANUMERIC (STR_SVT_COLLATE_START+7) -#define STR_SVT_COLLATE_UNICODE (STR_SVT_COLLATE_START+8) -#define STR_SVT_COLLATE_PHONEBOOK (STR_SVT_COLLATE_START+9) -#define STR_SVT_COLLATE_PHONETIC_F (STR_SVT_COLLATE_START+10) -#define STR_SVT_COLLATE_PHONETIC_L (STR_SVT_COLLATE_START+11) -#define STR_SVT_COLLATE_END (STR_SVT_COLLATE_PHONETIC_L) - -// String-Ids for accessibility -#define STR_SVT_ACC_BEGIN (STR_SVT_COLLATE_END+1) -// free -#define STR_SVT_ACC_DESC_TABLISTBOX (STR_SVT_ACC_BEGIN+2) -#define STR_SVT_ACC_DESC_FILEVIEW (STR_SVT_ACC_BEGIN+3) -#define STR_SVT_ACC_DESC_FOLDER (STR_SVT_ACC_BEGIN+4) -#define STR_SVT_ACC_DESC_FILE (STR_SVT_ACC_BEGIN+5) -#define STR_SVT_ACC_EMPTY_FIELD (STR_SVT_ACC_BEGIN+6) -#define STR_SVT_ACC_LISTENTRY_SELCTED_STATE (STR_SVT_ACC_BEGIN+7) -#define STR_SVT_ACC_RULER_VERT_NAME (STR_SVT_ACC_BEGIN+8) -#define STR_SVT_ACC_RULER_HORZ_NAME (STR_SVT_ACC_BEGIN+9) -#define STR_SVT_ACC_END (STR_SVT_ACC_RULER_HORZ_NAME) - -#define STR_SVT_INDEXENTRY_START (STR_SVT_ACC_END + 1) -#define STR_SVT_INDEXENTRY_ALPHANUMERIC (STR_SVT_INDEXENTRY_START+0) -#define STR_SVT_INDEXENTRY_DICTIONARY (STR_SVT_INDEXENTRY_START+1) -#define STR_SVT_INDEXENTRY_PINYIN (STR_SVT_INDEXENTRY_START+2) -#define STR_SVT_INDEXENTRY_RADICAL (STR_SVT_INDEXENTRY_START+3) -#define STR_SVT_INDEXENTRY_STROKE (STR_SVT_INDEXENTRY_START+4) -#define STR_SVT_INDEXENTRY_ZHUYIN (STR_SVT_INDEXENTRY_START+5) -#define STR_SVT_INDEXENTRY_PHONETIC_FS (STR_SVT_INDEXENTRY_START+6) -#define STR_SVT_INDEXENTRY_PHONETIC_FC (STR_SVT_INDEXENTRY_START+7) -#define STR_SVT_INDEXENTRY_PHONETIC_LS (STR_SVT_INDEXENTRY_START+8) -#define STR_SVT_INDEXENTRY_PHONETIC_LC (STR_SVT_INDEXENTRY_START+9) -#define STR_SVT_INDEXENTRY_END (STR_SVT_INDEXENTRY_PHONETIC_LC) - -//String - Ids for Java errors, messages -#define STR_SVT_JAVAERROR_START (STR_SVT_INDEXENTRY_END + 1) -#define STR_ERROR_JVMCREATIONFAILED_TITLE (STR_SVT_JAVAERROR_START+1) -#define STR_WARNING_JAVANOTFOUND (STR_SVT_JAVAERROR_START+2) -#define STR_WARNING_JAVANOTFOUND_TITLE (STR_SVT_JAVAERROR_START+3) -#define STR_WARNING_INVALIDJAVASETTINGS (STR_SVT_JAVAERROR_START+4) -#define STR_WARNING_INVALIDJAVASETTINGS_MAC (STR_SVT_JAVAERROR_START+5) -#define STR_WARNING_INVALIDJAVASETTINGS_TITLE (STR_SVT_JAVAERROR_START+6) -#define STR_ERROR_JVMCREATIONFAILED (STR_SVT_JAVAERROR_START+7) -#define STR_ERROR_JVMCREATIONFAILED_MAC (STR_SVT_JAVAERROR_START+8) -#define STR_WARNING_JAVANOTFOUND_MAC (STR_SVT_JAVAERROR_START+9) -#define STR_SVT_JAVAERROR_END (STR_ERROR_JVMCREATIONFAILED_MAC) - -// String array to match UI language names to LanguageType values and vice versa -#define STR_ARR_SVT_LANGUAGE_TABLE_START (STR_SVT_JAVAERROR_END + 1) -#define STR_ARR_SVT_LANGUAGE_TABLE (STR_ARR_SVT_LANGUAGE_TABLE_START + 0) -#define STR_ARR_SVT_LANGUAGE_TABLE_END (STR_ARR_SVT_LANGUAGE_TABLE) - -#define STR_SVT_ADDRESSTEMPLATE_START (STR_ARR_SVT_LANGUAGE_TABLE_END+1) -#define STR_NO_FIELD_SELECTION (STR_SVT_ADDRESSTEMPLATE_START+0) -#define STR_FIELD_COMPANY (STR_SVT_ADDRESSTEMPLATE_START+1) -#define STR_FIELD_DEPARTMENT (STR_SVT_ADDRESSTEMPLATE_START+2) -#define STR_FIELD_FIRSTNAME (STR_SVT_ADDRESSTEMPLATE_START+3) -#define STR_FIELD_LASTNAME (STR_SVT_ADDRESSTEMPLATE_START+4) -#define STR_FIELD_STREET (STR_SVT_ADDRESSTEMPLATE_START+5) -#define STR_FIELD_COUNTRY (STR_SVT_ADDRESSTEMPLATE_START+6) -#define STR_FIELD_ZIPCODE (STR_SVT_ADDRESSTEMPLATE_START+7) -#define STR_FIELD_CITY (STR_SVT_ADDRESSTEMPLATE_START+8) -#define STR_FIELD_TITLE (STR_SVT_ADDRESSTEMPLATE_START+9) -#define STR_FIELD_POSITION (STR_SVT_ADDRESSTEMPLATE_START+10) -#define STR_FIELD_ADDRFORM (STR_SVT_ADDRESSTEMPLATE_START+11) -#define STR_FIELD_INITIALS (STR_SVT_ADDRESSTEMPLATE_START+12) -#define STR_FIELD_SALUTATION (STR_SVT_ADDRESSTEMPLATE_START+13) -#define STR_FIELD_HOMETEL (STR_SVT_ADDRESSTEMPLATE_START+14) -#define STR_FIELD_WORKTEL (STR_SVT_ADDRESSTEMPLATE_START+15) -#define STR_FIELD_FAX (STR_SVT_ADDRESSTEMPLATE_START+16) -#define STR_FIELD_EMAIL (STR_SVT_ADDRESSTEMPLATE_START+17) -#define STR_FIELD_URL (STR_SVT_ADDRESSTEMPLATE_START+18) -#define STR_FIELD_NOTE (STR_SVT_ADDRESSTEMPLATE_START+19) -#define STR_FIELD_USER1 (STR_SVT_ADDRESSTEMPLATE_START+20) -#define STR_FIELD_USER2 (STR_SVT_ADDRESSTEMPLATE_START+21) -#define STR_FIELD_USER3 (STR_SVT_ADDRESSTEMPLATE_START+22) -#define STR_FIELD_USER4 (STR_SVT_ADDRESSTEMPLATE_START+23) -#define STR_FIELD_ID (STR_SVT_ADDRESSTEMPLATE_START+24) -#define STR_FIELD_STATE (STR_SVT_ADDRESSTEMPLATE_START+25) -#define STR_FIELD_OFFICETEL (STR_SVT_ADDRESSTEMPLATE_START+26) -#define STR_FIELD_PAGER (STR_SVT_ADDRESSTEMPLATE_START+27) -#define STR_FIELD_MOBILE (STR_SVT_ADDRESSTEMPLATE_START+28) -#define STR_FIELD_TELOTHER (STR_SVT_ADDRESSTEMPLATE_START+29) -#define STR_FIELD_CALENDAR (STR_SVT_ADDRESSTEMPLATE_START+30) -#define STR_FIELD_INVITE (STR_SVT_ADDRESSTEMPLATE_START+31) -#define STR_SVT_ADDRESSTEMPLATE_END (STR_FIELD_INVITE) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/svtresid.hxx b/include/svtools/svtresid.hxx index 374406b1e455..8f6cfc8b43f0 100644 --- a/include/svtools/svtresid.hxx +++ b/include/svtools/svtresid.hxx @@ -21,19 +21,15 @@ #define INCLUDED_SVTOOLS_SVTRESID_HXX #include -#include #include -struct SVT_DLLPUBLIC SvtResMgr +struct SVT_DLLPUBLIC SvtResLocale { - static ResMgr* GetResMgr(); - static void DeleteResMgr(); + static std::locale* GetResLocale(); + static void DeleteResLocale(); }; -inline OUString SvtResId(sal_uInt16 nId) -{ - return ResId(nId, *SvtResMgr::GetResMgr()); -} +SVT_DLLPUBLIC OUString SvtResId(const char* pId); #endif // INCLUDED_SVTOOLS_SVTRESID_HXX diff --git a/include/svx/DescriptionGenerator.hxx b/include/svx/DescriptionGenerator.hxx index b1249859bfcc..ecbe8cc51093 100644 --- a/include/svx/DescriptionGenerator.hxx +++ b/include/svx/DescriptionGenerator.hxx @@ -68,12 +68,12 @@ public: /** Initialize the description with the specified string from the resource followed by the shape's style in parantheses and a colon. - @param nResourceId + @param pResourceId A resource id the specifies the introductory description of the shape that is made more specific by later calls to addProperty. */ - void Initialize (sal_Int32 nResourceId); + void Initialize(const char* pResourceId); /** Returns the description string and then resets it. Usually called as last method before destroying the object. @@ -114,7 +114,7 @@ public: @param aType Type of the property's value. It controls the transformation into the value's string representation. - @param nResourceId + @param pResourceId Id of the localized name of the property int the resource. @param nWhichId This which id is used to localize the property value. If it is @@ -122,7 +122,7 @@ public: */ void AddProperty (const OUString& sPropertyName, PropertyType aType, - sal_Int32 nResourceId, + const char* pResourceId, long nWhichId=-1); /** Append the given string as is to the current description. diff --git a/include/svx/dialmgr.hxx b/include/svx/dialmgr.hxx index 54951aaee993..ee9147d1f503 100644 --- a/include/svx/dialmgr.hxx +++ b/include/svx/dialmgr.hxx @@ -19,22 +19,11 @@ #ifndef INCLUDED_SVX_DIALMGR_HXX #define INCLUDED_SVX_DIALMGR_HXX -#include +#include #include -// forward --------------------------------------------------------------- - -struct SVX_DLLPUBLIC DialogsResMgr -{ - static ResMgr* GetResMgr(); -}; - -#define DIALOG_MGR() (*DialogsResMgr::GetResMgr()) - -inline OUString SvxResId(sal_uInt16 nId) -{ - return ResId(nId, DIALOG_MGR()); -} +SVX_DLLPUBLIC const std::locale& SvxResLocale(); +SVX_DLLPUBLIC OUString SvxResId(const char* pId); #endif diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc index 9cb968dc7a17..45f12bc3bc54 100644 --- a/include/svx/dialogs.hrc +++ b/include/svx/dialogs.hrc @@ -23,34 +23,6 @@ #include #include -// Resource-Id's ------------------------------------------------------------ - -// !!! IMPORTANT: consider and update FIRSTFREE when introducing new RIDs !!! (not for RIDs for Strings - they have there own) -#define RID_SVX_FIRSTFREE 330 - -// some strings also used in CUI -#define RID_SVXERRCTX (RID_SVX_START + 351) -#define RID_SVXSTR_COLOR (RID_SVX_START + 179) -#define RID_SVXSTR_NOFILL (RID_SVX_START + 190) -#define RID_SVXSTR_BY_AUTHOR (RID_SVX_START + 842) -#define RID_SVXSTR_TRANSPARENT (RID_SVX_START + 843) -#define RID_SVXSTR_DEFAULT (RID_SVX_START + 844) -#define RID_SVXSTR_INVISIBLE (RID_SVX_START + 178) -#define RID_SVXSTR_NONE (RID_SVX_START + 183) -#define RID_SVXSTR_SOLID (RID_SVX_START + 160) -#define RID_SVXSTR_LINEEND (RID_SVX_START + 237) -#define RID_SVXSTR_GRADIENT (RID_SVX_START + 161) -#define RID_SVXSTR_HATCH (RID_SVX_START + 180) -#define RID_SVXSTR_BITMAP (RID_SVX_START + 167) -#define RID_SVXSTR_PATTERN (RID_SVX_START + 168) -#define RID_SVXSTR_PATTERN_UNTITLED (RID_SVX_START + 169) -#define RID_SVXSTR_LINESTYLE (RID_SVX_START + 173) -#define RID_SVXSTR_FIELDUNIT_TABLE (RID_SVX_START + 311) -#define RID_SVXSTR_GALLERYPROPS_GALTHEME (RID_SVX_START + 251) -#define RID_SVXSTR_GALLERY_THEMEITEMS (RID_SVX_START + 252) - -#define RID_SVXSTR_GALLERY_PREVIEW (RID_SVX_START + 255) - // factory IDs of tabpages implemented in CUI #define RID_SVXPAGE_CHAR_TWOLINES (RID_SVX_START + 242) #define RID_SVXPAGE_EXT_PARAGRAPH (RID_SVX_START + 7) @@ -130,770 +102,6 @@ #define RID_SC_TP_DEFAULTS (RID_OFA_START + 253) #define SID_SC_TP_STAT (RID_OFA_START + 254) -// ResIds for dialogs from StarDraw -#define RID_SVXSW_FRAMEPOSITIONS (RID_SVX_START + 289) - -#define RID_SVXFLOAT3D_FAVORITE (RID_SVX_START + 73) -#define RID_SVXFLOAT3D_FIX_R (RID_SVX_START + 77) -#define RID_SVXFLOAT3D_FIX_G (RID_SVX_START + 78) -#define RID_SVXFLOAT3D_FIX_B (RID_SVX_START + 84) - -#define RID_SVXSTR_FRMSEL_TEXTS (RID_SVX_START + 93) -#define RID_SVXSTR_FRMSEL_DESCRIPTIONS (RID_SVX_START + 94) - -#define RID_SIDEBAR_EMPTY_PANEL_TEXT (RID_SVX_START + 321) - -// !!! IMPORTANT: consider and update RID_SVX_FIRSTFREE when introducing new RIDs !!! (see above) - -// Strings ------------------------------------------------------------------ - -// Strings for the language -#define RID_SVXSTR_LANGUAGE_ALL (RID_SVX_START + 15) - -// Strings from the search dialog -#define RID_SVXSTR_SEARCH_END_SHEET (RID_SVX_START + 71) -#define RID_SVXSTR_SEARCH_END (RID_SVX_START + 79) -#define RID_SVXSTR_SEARCH_STYLES (RID_SVX_START + 80) -#define RID_SVXSTR_SEARCH (RID_SVX_START + 81) -#define RID_SVXSTR_REPLACE (RID_SVX_START + 82) -#define RID_SVXSTR_WRITER_STYLES (RID_SVX_START + 83) -#define RID_SVXSTR_CALC_STYLES (RID_SVX_START + 85) -#define RID_SVXSTR_SEARCH_NOT_FOUND (RID_SVX_START + 88) -#define RID_SVXSTR_QUERY_EXIT_RECOVERY (RID_SVX_START + 89) -#define RID_SVXSTR_SEARCH_START (RID_SVX_START + 90) -// ResIds for the PageDialog - -// Strings of the ToolBox-Controls from tbcontrl.cxx -#define RID_SVXSTR_FRAME (RID_SVX_START + 192) -#define RID_SVXSTR_FRAME_STYLE (RID_SVX_START + 195) -#define RID_SVXSTR_CLEARFORM (RID_SVX_START + 197) -#define RID_SVXSTR_MORE (RID_SVX_START + 198) -#define RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE (RID_SVX_START + 199) -#define RID_SVXSTR_CHARFONTNAME (RID_SVX_START + 200) -#define RID_SVXSTR_MORE_STYLES (RID_SVX_START + 202) -#define RID_SVXSTR_MORENUMBERING (RID_SVX_START + 204) -#define RID_SVXSTR_MOREBULLETS (RID_SVX_START + 205) - -#define RID_SVXSTR_CUSTOM_PAL (RID_SVX_START + 206) -#define RID_SVXSTR_DOC_COLORS (RID_SVX_START + 207) -#define RID_SVXSTR_DOC_COLOR_PREFIX (RID_SVX_START + 208) - -// Strings for insert/overwrite mode -#define RID_SVXSTR_INSERT_HELPTEXT (RID_SVX_START + 210) -#define RID_SVXSTR_OVERWRITE_HELPTEXT (RID_SVX_START + 211) -#define RID_SVXSTR_OVERWRITE_TEXT (RID_SVX_START + 212) - -#define RID_SVXSTR_XMLSEC_SIG_OK (RID_SVX_START + 222) -#define RID_SVXSTR_XMLSEC_SIG_OK_NO_VERIFY (RID_SVX_START + 223) -#define RID_SVXSTR_XMLSEC_SIG_NOT_OK (RID_SVX_START + 224) -#define RID_SVXSTR_XMLSEC_NO_SIG (RID_SVX_START + 225) -#define RID_SVXSTR_XMLSEC_SIG_CERT_OK_PARTIAL_SIG (RID_SVX_START + 226) - -// Strings for the ruler -#define RID_SVXSTR_RULER_START (RID_SVX_START + 245) -#define RID_SVXSTR_RULER_TAB_LEFT (RID_SVX_START + 245) -#define RID_SVXSTR_RULER_TAB_RIGHT (RID_SVX_START + 246) -#define RID_SVXSTR_RULER_TAB_CENTER (RID_SVX_START + 247) -#define RID_SVXSTR_RULER_TAB_DECIMAL (RID_SVX_START + 248) - -// Color strings -#define RID_SVXSTR_COLOR_BLACK (RID_SVX_START + 275) -#define RID_SVXSTR_COLOR_BLUE (RID_SVX_START + 276) -#define RID_SVXSTR_COLOR_GREEN (RID_SVX_START + 277) -#define RID_SVXSTR_COLOR_CYAN (RID_SVX_START + 278) -#define RID_SVXSTR_COLOR_RED (RID_SVX_START + 279) -#define RID_SVXSTR_COLOR_MAGENTA (RID_SVX_START + 280) -#define RID_SVXSTR_COLOR_GREY (RID_SVX_START + 282) -#define RID_SVXSTR_COLOR_YELLOW (RID_SVX_START + 289) -#define RID_SVXSTR_COLOR_WHITE (RID_SVX_START + 290) -#define RID_SVXSTR_COLOR_BLUEGREY (RID_SVX_START + 291) -#define RID_SVXSTR_COLOR_ORANGE (RID_SVX_START + 292) -#define RID_SVXSTR_COLOR_TURQUOISE (RID_SVX_START + 293) -#define RID_SVXSTR_COLOR_TURQUOISE_DEF (RID_SVX_START + 294) -#define RID_SVXSTR_COLOR_BLUE_CLASSIC (RID_SVX_START + 295) -#define RID_SVXSTR_COLOR_BLUE_CLASSIC_DEF (RID_SVX_START + 296) - -// Line endings strings -#define RID_SVXSTR_ARROW (RID_SVX_START + 300) -#define RID_SVXSTR_SQUARE (RID_SVX_START + 301) -#define RID_SVXSTR_CIRCLE (RID_SVX_START + 302) - -#define RID_SVXSTR_TRANSPARENCE (RID_SVX_START + 305) -#define RID_SVXSTR_CENTERED (RID_SVX_START + 306) -#define RID_SVXSTR_NOTCENTERED (RID_SVX_START + 307) - -// String-Arrays -#define RID_SVXSTR_TEXTENCODING_TABLE (RID_SVX_START + 312) - -#define RID_SVXERRCODE (RID_SVX_START + 350) - -// gallery -#define RID_SVX_GALLERY_START (RID_SVX_START + 360) -// RID_SVX_GALLERY_END (RID_SVX_START + 410) - -// Define - Region for bitmap masking -// !!! don't use defines from this region !!! -#define RID_SVX_BMPMASK_START (RID_SVX_START + 420) -// RID_SVX_BMPMASK_END (RID_SVX_START + 440) - -// Define - Region for IMAP editor -// !!! don't use defines from this region !!! -#define RID_SVX_IMAP_START (RID_SVX_START + 450) -// RID_SVX_IMAP_END (RID_SVX_START + 460) - -// Define - Region for contour editor -// !!! don't use defines from this region !!! -#define RID_SVX_CONTOUR_START (RID_SVX_START + 461) -// RID_SVX_CONTOUR_END (RID_SVX_START + 471) - -// Defines for the 3D engine -#define RID_SVX_3D_UNDO_EXCHANGE_PASTE (RID_SVX_START + 489) -#define RID_SVX_3D_UNDO_ROTATE (RID_SVX_START + 495) -#define RID_SVX_3D_UNDO_EXTRUDE (RID_SVX_START + 496) -#define RID_SVX_3D_UNDO_LATHE (RID_SVX_START + 497) -#define RID_SVX_3D_UNDO_BREAK_LATHE (RID_SVX_START + 498) - -// ResIds for graphics drawmode -#define RID_SVXSTR_GRAFMODE_STANDARD (RID_SVX_START + 520) -#define RID_SVXSTR_GRAFMODE_GREYS (RID_SVX_START + 521) -#define RID_SVXSTR_GRAFMODE_MONO (RID_SVX_START + 522) -#define RID_SVXSTR_GRAFMODE_WATERMARK (RID_SVX_START + 523) - -// BM: some additional standard colors -#define RID_SVXSTR_COLOR_VIOLET (RID_SVX_START + 540) -#define RID_SVXSTR_COLOR_BORDEAUX (RID_SVX_START + 541) -#define RID_SVXSTR_COLOR_PALE_YELLOW (RID_SVX_START + 542) -#define RID_SVXSTR_COLOR_PALE_GREEN (RID_SVX_START + 543) -#define RID_SVXSTR_COLOR_DARKVIOLET (RID_SVX_START + 544) -#define RID_SVXSTR_COLOR_SALMON (RID_SVX_START + 545) -#define RID_SVXSTR_COLOR_SEABLUE (RID_SVX_START + 546) - -// LibreOffice palette colors -#define RID_SVXSTR_COLOR_LIBRE_GREEN_1 (RID_SVX_START + 548) -#define RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT (RID_SVX_START + 549) -#define RID_SVXSTR_COLOR_LIBRE_BLUE_ACCENT (RID_SVX_START + 550) -#define RID_SVXSTR_COLOR_LIBRE_ORANGE_ACCENT (RID_SVX_START + 551) -#define RID_SVXSTR_COLOR_LIBRE_PURPLE (RID_SVX_START + 552) -#define RID_SVXSTR_COLOR_LIBRE_PURPLE_ACCENT (RID_SVX_START + 553) -#define RID_SVXSTR_COLOR_LIBRE_YELLOW_ACCENT (RID_SVX_START + 554) - -// JP: string resource ids for table-autoformat-names, used in SW/SC -// !!! Urgent: the order of Ids is persistent. New Ids have to append !!! -#define RID_SVXSTR_TBLAFMT_BEGIN (RID_SVX_START + 560) -#define RID_SVXSTR_TBLAFMT_3D RID_SVXSTR_TBLAFMT_BEGIN -#define RID_SVXSTR_TBLAFMT_BLACK1 (RID_SVX_START + 561) -#define RID_SVXSTR_TBLAFMT_BLACK2 (RID_SVX_START + 562) -#define RID_SVXSTR_TBLAFMT_BLUE (RID_SVX_START + 563) -#define RID_SVXSTR_TBLAFMT_BROWN (RID_SVX_START + 564) -#define RID_SVXSTR_TBLAFMT_CURRENCY (RID_SVX_START + 565) -#define RID_SVXSTR_TBLAFMT_CURRENCY_3D (RID_SVX_START + 566) -#define RID_SVXSTR_TBLAFMT_CURRENCY_GRAY (RID_SVX_START + 567) -#define RID_SVXSTR_TBLAFMT_CURRENCY_LAVENDER (RID_SVX_START + 568) -#define RID_SVXSTR_TBLAFMT_CURRENCY_TURQUOISE (RID_SVX_START + 569) -#define RID_SVXSTR_TBLAFMT_GRAY (RID_SVX_START + 570) -#define RID_SVXSTR_TBLAFMT_GREEN (RID_SVX_START + 571) -#define RID_SVXSTR_TBLAFMT_LAVENDER (RID_SVX_START + 572) -#define RID_SVXSTR_TBLAFMT_RED (RID_SVX_START + 573) -#define RID_SVXSTR_TBLAFMT_TURQUOISE (RID_SVX_START + 574) -#define RID_SVXSTR_TBLAFMT_YELLOW (RID_SVX_START + 575) -#define RID_SVXSTR_TBLAFMT_END (RID_SVX_START + 576) - -// string resources for XLineCap item -#define RID_SVXSTR_LINECAP_BUTT (RID_SVX_START + 586 ) -#define RID_SVXSTR_LINECAP_ROUND (RID_SVX_START + 587 ) -#define RID_SVXSTR_LINECAP_SQUARE (RID_SVX_START + 588 ) - -// string resources for css::drawing::LineJoint item -#define RID_SVXSTR_LINEJOINT_NONE RID_SVXSTR_NONE -#define RID_SVXSTR_LINEJOINT_MIDDLE (RID_SVX_START + 589 ) -#define RID_SVXSTR_LINEJOINT_BEVEL (RID_SVX_START + 590 ) -#define RID_SVXSTR_LINEJOINT_MITER (RID_SVX_START + 591 ) -#define RID_SVXSTR_LINEJOINT_ROUND (RID_SVX_START + 592 ) - -// Default-Color-Names -#define RID_SVXSTR_COLOR_BLACK_DEF (RID_SVX_START + 595) -#define RID_SVXSTR_COLOR_BLUE_DEF (RID_SVX_START + 596) -#define RID_SVXSTR_COLOR_GREEN_DEF (RID_SVX_START + 597) -#define RID_SVXSTR_COLOR_CYAN_DEF (RID_SVX_START + 598) -#define RID_SVXSTR_COLOR_RED_DEF (RID_SVX_START + 599) -#define RID_SVXSTR_COLOR_MAGENTA_DEF (RID_SVX_START + 600) -#define RID_SVXSTR_COLOR_GREY_DEF (RID_SVX_START + 602) -#define RID_SVXSTR_COLOR_YELLOW_DEF (RID_SVX_START + 609) -#define RID_SVXSTR_COLOR_WHITE_DEF (RID_SVX_START + 610) -#define RID_SVXSTR_COLOR_BLUEGREY_DEF (RID_SVX_START + 611) -#define RID_SVXSTR_COLOR_ORANGE_DEF (RID_SVX_START + 612) -#define RID_SVXSTR_COLOR_VIOLET_DEF (RID_SVX_START + 613) -#define RID_SVXSTR_COLOR_BORDEAUX_DEF (RID_SVX_START + 614) -#define RID_SVXSTR_COLOR_PALE_YELLOW_DEF (RID_SVX_START + 615) -#define RID_SVXSTR_COLOR_PALE_GREEN_DEF (RID_SVX_START + 616) -#define RID_SVXSTR_COLOR_DARKVIOLET_DEF (RID_SVX_START + 617) -#define RID_SVXSTR_COLOR_SALMON_DEF (RID_SVX_START + 618) -#define RID_SVXSTR_COLOR_SEABLUE_DEF (RID_SVX_START + 619) -#define RID_SVXSTR_COLOR_CHART (RID_SVX_START + 621) -#define RID_SVXSTR_COLOR_CHART_DEF (RID_SVX_START + 622) -#define RID_SVXSTR_COLOR_PURPLE (RID_SVX_START + 623) -#define RID_SVXSTR_COLOR_PURPLE_DEF (RID_SVX_START + 624) -#define RID_SVXSTR_COLOR_SKYBLUE (RID_SVX_START + 625) -#define RID_SVXSTR_COLOR_SKYBLUE_DEF (RID_SVX_START + 626) -#define RID_SVXSTR_COLOR_YELLOWGREEN (RID_SVX_START + 627) -#define RID_SVXSTR_COLOR_YELLOWGREEN_DEF (RID_SVX_START + 628) -#define RID_SVXSTR_COLOR_PINK (RID_SVX_START + 629) -#define RID_SVXSTR_COLOR_PINK_DEF (RID_SVX_START + 630) - -// LibreOffice palette colors -#define RID_SVXSTR_COLOR_LIBRE_GREEN_1_DEF (RID_SVX_START + 631) -#define RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT_DEF (RID_SVX_START + 632) -#define RID_SVXSTR_COLOR_LIBRE_BLUE_ACCENT_DEF (RID_SVX_START + 633) -#define RID_SVXSTR_COLOR_LIBRE_ORANGE_ACCENT_DEF (RID_SVX_START + 634) -#define RID_SVXSTR_COLOR_LIBRE_PURPLE_DEF (RID_SVX_START + 635) -#define RID_SVXSTR_COLOR_LIBRE_PURPLE_ACCENT_DEF (RID_SVX_START + 636) -#define RID_SVXSTR_COLOR_LIBRE_YELLOW_ACCENT_DEF (RID_SVX_START + 637) - -// Tango palette colors -#define RID_SVXSTR_COLOR_TANGO_BUTTER (RID_SVX_START + 638) -#define RID_SVXSTR_COLOR_TANGO_ORANGE (RID_SVX_START + 639) -#define RID_SVXSTR_COLOR_TANGO_CHOCOLATE (RID_SVX_START + 640) -#define RID_SVXSTR_COLOR_TANGO_CHAMELEON (RID_SVX_START + 641) -#define RID_SVXSTR_COLOR_TANGO_SKY_BLUE (RID_SVX_START + 642) -#define RID_SVXSTR_COLOR_TANGO_PLUM (RID_SVX_START + 643) -#define RID_SVXSTR_COLOR_TANGO_SCARLET_RED (RID_SVX_START + 644) -#define RID_SVXSTR_COLOR_TANGO_ALUMINIUM (RID_SVX_START + 645) -#define RID_SVXSTR_COLOR_TANGO_BUTTER_DEF (RID_SVX_START + 646) -#define RID_SVXSTR_COLOR_TANGO_ORANGE_DEF (RID_SVX_START + 647) -#define RID_SVXSTR_COLOR_TANGO_CHOCOLATE_DEF (RID_SVX_START + 648) -#define RID_SVXSTR_COLOR_TANGO_CHAMELEON_DEF (RID_SVX_START + 649) -#define RID_SVXSTR_COLOR_TANGO_SKY_BLUE_DEF (RID_SVX_START + 650) -#define RID_SVXSTR_COLOR_TANGO_PLUM_DEF (RID_SVX_START + 651) -#define RID_SVXSTR_COLOR_TANGO_SCARLET_RED_DEF (RID_SVX_START + 652) -#define RID_SVXSTR_COLOR_TANGO_ALUMINIUM_DEF (RID_SVX_START + 653) - -// Default-Gradient-Names -#define RID_SVXSTR_GRDT0_DEF (RID_SVX_START + 2000) -#define RID_SVXSTR_GRDT1_DEF (RID_SVX_START + 2001) -#define RID_SVXSTR_GRDT2_DEF (RID_SVX_START + 2002) -#define RID_SVXSTR_GRDT3_DEF (RID_SVX_START + 2003) -#define RID_SVXSTR_GRDT4_DEF (RID_SVX_START + 2004) -#define RID_SVXSTR_GRDT5_DEF (RID_SVX_START + 2005) -#define RID_SVXSTR_GRDT6_DEF (RID_SVX_START + 2006) -#define RID_SVXSTR_GRDT7_DEF (RID_SVX_START + 2007) -#define RID_SVXSTR_GRDT8_DEF (RID_SVX_START + 2008) -#define RID_SVXSTR_GRDT9_DEF (RID_SVX_START + 2009) -#define RID_SVXSTR_GRDT10_DEF (RID_SVX_START + 2010) -#define RID_SVXSTR_GRDT11_DEF (RID_SVX_START + 2011) -#define RID_SVXSTR_GRDT12_DEF (RID_SVX_START + 2012) -#define RID_SVXSTR_GRDT13_DEF (RID_SVX_START + 2013) -#define RID_SVXSTR_GRDT14_DEF (RID_SVX_START + 2014) -#define RID_SVXSTR_GRDT15_DEF (RID_SVX_START + 2015) -#define RID_SVXSTR_GRDT16_DEF (RID_SVX_START + 2016) -#define RID_SVXSTR_GRDT17_DEF (RID_SVX_START + 2017) -#define RID_SVXSTR_GRDT18_DEF (RID_SVX_START + 2018) -#define RID_SVXSTR_GRDT19_DEF (RID_SVX_START + 2019) -#define RID_SVXSTR_GRDT20_DEF (RID_SVX_START + 2020) -#define RID_SVXSTR_GRDT21_DEF (RID_SVX_START + 2021) -#define RID_SVXSTR_GRDT22_DEF (RID_SVX_START + 2022) -#define RID_SVXSTR_GRDT23_DEF (RID_SVX_START + 2023) -#define RID_SVXSTR_GRDT24_DEF (RID_SVX_START + 2024) -#define RID_SVXSTR_GRDT25_DEF (RID_SVX_START + 2025) -#define RID_SVXSTR_GRDT26_DEF (RID_SVX_START + 2026) -#define RID_SVXSTR_GRDT27_DEF (RID_SVX_START + 2027) -#define RID_SVXSTR_GRDT28_DEF (RID_SVX_START + 2028) -#define RID_SVXSTR_GRDT29_DEF (RID_SVX_START + 2029) -#define RID_SVXSTR_GRDT30_DEF (RID_SVX_START + 2030) -#define RID_SVXSTR_GRDT31_DEF (RID_SVX_START + 2031) -#define RID_SVXSTR_GRDT32_DEF (RID_SVX_START + 2032) -#define RID_SVXSTR_GRDT33_DEF (RID_SVX_START + 2033) -#define RID_SVXSTR_GRDT34_DEF (RID_SVX_START + 2034) -#define RID_SVXSTR_GRDT35_DEF (RID_SVX_START + 2035) -#define RID_SVXSTR_GRDT36_DEF (RID_SVX_START + 2036) -#define RID_SVXSTR_GRDT37_DEF (RID_SVX_START + 2037) -#define RID_SVXSTR_GRDT38_DEF (RID_SVX_START + 2038) -#define RID_SVXSTR_GRDT39_DEF (RID_SVX_START + 2039) -#define RID_SVXSTR_GRDT40_DEF (RID_SVX_START + 2040) -#define RID_SVXSTR_GRDT41_DEF (RID_SVX_START + 2041) -#define RID_SVXSTR_GRDT42_DEF (RID_SVX_START + 2042) -#define RID_SVXSTR_GRDT43_DEF (RID_SVX_START + 2043) -#define RID_SVXSTR_GRDT44_DEF (RID_SVX_START + 2044) -#define RID_SVXSTR_GRDT45_DEF (RID_SVX_START + 2045) -#define RID_SVXSTR_GRDT46_DEF (RID_SVX_START + 2046) -#define RID_SVXSTR_GRDT47_DEF (RID_SVX_START + 2047) -#define RID_SVXSTR_GRDT48_DEF (RID_SVX_START + 2048) -#define RID_SVXSTR_GRDT49_DEF (RID_SVX_START + 2049) -#define RID_SVXSTR_GRDT50_DEF (RID_SVX_START + 2050) -#define RID_SVXSTR_GRDT51_DEF (RID_SVX_START + 2051) -#define RID_SVXSTR_GRDT52_DEF (RID_SVX_START + 2052) -#define RID_SVXSTR_GRDT53_DEF (RID_SVX_START + 2053) -#define RID_SVXSTR_GRDT54_DEF (RID_SVX_START + 2054) -#define RID_SVXSTR_GRDT55_DEF (RID_SVX_START + 2055) -#define RID_SVXSTR_GRDT56_DEF (RID_SVX_START + 2056) -#define RID_SVXSTR_GRDT57_DEF (RID_SVX_START + 2057) -#define RID_SVXSTR_GRDT58_DEF (RID_SVX_START + 2058) -#define RID_SVXSTR_GRDT59_DEF (RID_SVX_START + 2059) -#define RID_SVXSTR_GRDT60_DEF (RID_SVX_START + 2060) -#define RID_SVXSTR_GRDT61_DEF (RID_SVX_START + 2061) -#define RID_SVXSTR_GRDT62_DEF (RID_SVX_START + 2062) -#define RID_SVXSTR_GRDT63_DEF (RID_SVX_START + 2063) -#define RID_SVXSTR_GRDT64_DEF (RID_SVX_START + 2064) -#define RID_SVXSTR_GRDT65_DEF (RID_SVX_START + 2065) -#define RID_SVXSTR_GRDT66_DEF (RID_SVX_START + 2066) -#define RID_SVXSTR_GRDT67_DEF (RID_SVX_START + 2067) -#define RID_SVXSTR_GRDT68_DEF (RID_SVX_START + 2068) -#define RID_SVXSTR_GRDT69_DEF (RID_SVX_START + 2069) -#define RID_SVXSTR_GRDT70_DEF (RID_SVX_START + 2070) -#define RID_SVXSTR_GRDT71_DEF (RID_SVX_START + 2071) -#define RID_SVXSTR_GRDT72_DEF (RID_SVX_START + 2072) -#define RID_SVXSTR_GRDT73_DEF (RID_SVX_START + 2073) -#define RID_SVXSTR_GRDT74_DEF (RID_SVX_START + 2074) -#define RID_SVXSTR_GRDT75_DEF (RID_SVX_START + 2075) -#define RID_SVXSTR_GRDT76_DEF (RID_SVX_START + 2076) -#define RID_SVXSTR_GRDT77_DEF (RID_SVX_START + 2077) -#define RID_SVXSTR_GRDT78_DEF (RID_SVX_START + 2078) -#define RID_SVXSTR_GRDT79_DEF (RID_SVX_START + 2079) -#define RID_SVXSTR_GRDT80_DEF (RID_SVX_START + 2080) -#define RID_SVXSTR_GRDT81_DEF (RID_SVX_START + 2081) -#define RID_SVXSTR_GRDT82_DEF (RID_SVX_START + 2082) -#define RID_SVXSTR_GRDT83_DEF (RID_SVX_START + 2083) -#define RID_SVXSTR_GRDT84_DEF (RID_SVX_START + 2084) -#define RID_SVXSTR_GRDT85_DEF (RID_SVX_START + 2085) -#define RID_SVXSTR_GRDT86_DEF (RID_SVX_START + 2086) -#define RID_SVXSTR_GRDT87_DEF (RID_SVX_START + 2087) -#define RID_SVXSTR_GRDT0 (RID_SVX_START + 2100) -#define RID_SVXSTR_GRDT1 (RID_SVX_START + 2101) -#define RID_SVXSTR_GRDT2 (RID_SVX_START + 2102) -#define RID_SVXSTR_GRDT3 (RID_SVX_START + 2103) -#define RID_SVXSTR_GRDT4 (RID_SVX_START + 2104) -#define RID_SVXSTR_GRDT5 (RID_SVX_START + 2105) -#define RID_SVXSTR_GRDT6 (RID_SVX_START + 2106) -#define RID_SVXSTR_GRDT7 (RID_SVX_START + 2107) -#define RID_SVXSTR_GRDT8 (RID_SVX_START + 2108) -#define RID_SVXSTR_GRDT9 (RID_SVX_START + 2109) -#define RID_SVXSTR_GRDT10 (RID_SVX_START + 2110) -#define RID_SVXSTR_GRDT11 (RID_SVX_START + 2111) -#define RID_SVXSTR_GRDT12 (RID_SVX_START + 2112) -#define RID_SVXSTR_GRDT13 (RID_SVX_START + 2113) -#define RID_SVXSTR_GRDT14 (RID_SVX_START + 2114) -#define RID_SVXSTR_GRDT15 (RID_SVX_START + 2115) -#define RID_SVXSTR_GRDT16 (RID_SVX_START + 2116) -#define RID_SVXSTR_GRDT17 (RID_SVX_START + 2117) -#define RID_SVXSTR_GRDT18 (RID_SVX_START + 2118) -#define RID_SVXSTR_GRDT19 (RID_SVX_START + 2119) -#define RID_SVXSTR_GRDT20 (RID_SVX_START + 2120) -#define RID_SVXSTR_GRDT21 (RID_SVX_START + 2121) -#define RID_SVXSTR_GRDT22 (RID_SVX_START + 2122) -#define RID_SVXSTR_GRDT23 (RID_SVX_START + 2123) -#define RID_SVXSTR_GRDT24 (RID_SVX_START + 2124) -#define RID_SVXSTR_GRDT25 (RID_SVX_START + 2125) -#define RID_SVXSTR_GRDT26 (RID_SVX_START + 2126) -#define RID_SVXSTR_GRDT27 (RID_SVX_START + 2127) -#define RID_SVXSTR_GRDT28 (RID_SVX_START + 2128) -#define RID_SVXSTR_GRDT29 (RID_SVX_START + 2129) -#define RID_SVXSTR_GRDT30 (RID_SVX_START + 2130) -#define RID_SVXSTR_GRDT31 (RID_SVX_START + 2131) -#define RID_SVXSTR_GRDT32 (RID_SVX_START + 2132) -#define RID_SVXSTR_GRDT33 (RID_SVX_START + 2133) -#define RID_SVXSTR_GRDT34 (RID_SVX_START + 2134) -#define RID_SVXSTR_GRDT35 (RID_SVX_START + 2135) -#define RID_SVXSTR_GRDT36 (RID_SVX_START + 2136) -#define RID_SVXSTR_GRDT37 (RID_SVX_START + 2137) -#define RID_SVXSTR_GRDT38 (RID_SVX_START + 2138) -#define RID_SVXSTR_GRDT39 (RID_SVX_START + 2139) -#define RID_SVXSTR_GRDT40 (RID_SVX_START + 2140) -#define RID_SVXSTR_GRDT41 (RID_SVX_START + 2141) -#define RID_SVXSTR_GRDT42 (RID_SVX_START + 2142) -#define RID_SVXSTR_GRDT43 (RID_SVX_START + 2143) -#define RID_SVXSTR_GRDT44 (RID_SVX_START + 2144) -#define RID_SVXSTR_GRDT45 (RID_SVX_START + 2145) -#define RID_SVXSTR_GRDT46 (RID_SVX_START + 2146) -#define RID_SVXSTR_GRDT47 (RID_SVX_START + 2147) -#define RID_SVXSTR_GRDT48 (RID_SVX_START + 2148) -#define RID_SVXSTR_GRDT49 (RID_SVX_START + 2149) -#define RID_SVXSTR_GRDT50 (RID_SVX_START + 2150) -#define RID_SVXSTR_GRDT51 (RID_SVX_START + 2151) -#define RID_SVXSTR_GRDT52 (RID_SVX_START + 2152) -#define RID_SVXSTR_GRDT53 (RID_SVX_START + 2153) -#define RID_SVXSTR_GRDT54 (RID_SVX_START + 2154) -#define RID_SVXSTR_GRDT55 (RID_SVX_START + 2155) -#define RID_SVXSTR_GRDT56 (RID_SVX_START + 2156) -#define RID_SVXSTR_GRDT57 (RID_SVX_START + 2157) -#define RID_SVXSTR_GRDT58 (RID_SVX_START + 2158) -#define RID_SVXSTR_GRDT59 (RID_SVX_START + 2159) -#define RID_SVXSTR_GRDT60 (RID_SVX_START + 2160) -#define RID_SVXSTR_GRDT61 (RID_SVX_START + 2161) -#define RID_SVXSTR_GRDT62 (RID_SVX_START + 2162) -#define RID_SVXSTR_GRDT63 (RID_SVX_START + 2163) -#define RID_SVXSTR_GRDT64 (RID_SVX_START + 2164) -#define RID_SVXSTR_GRDT65 (RID_SVX_START + 2165) -#define RID_SVXSTR_GRDT66 (RID_SVX_START + 2166) -#define RID_SVXSTR_GRDT67 (RID_SVX_START + 2167) -#define RID_SVXSTR_GRDT68 (RID_SVX_START + 2168) -#define RID_SVXSTR_GRDT69 (RID_SVX_START + 2169) -#define RID_SVXSTR_GRDT70 (RID_SVX_START + 2170) -#define RID_SVXSTR_GRDT71 (RID_SVX_START + 2171) -#define RID_SVXSTR_GRDT72 (RID_SVX_START + 2172) -#define RID_SVXSTR_GRDT73 (RID_SVX_START + 2173) -#define RID_SVXSTR_GRDT74 (RID_SVX_START + 2174) -#define RID_SVXSTR_GRDT75 (RID_SVX_START + 2175) -#define RID_SVXSTR_GRDT76 (RID_SVX_START + 2176) -#define RID_SVXSTR_GRDT77 (RID_SVX_START + 2177) -#define RID_SVXSTR_GRDT78 (RID_SVX_START + 2178) -#define RID_SVXSTR_GRDT79 (RID_SVX_START + 2179) -#define RID_SVXSTR_GRDT80 (RID_SVX_START + 2180) -#define RID_SVXSTR_GRDT81 (RID_SVX_START + 2181) -#define RID_SVXSTR_GRDT82 (RID_SVX_START + 2182) -#define RID_SVXSTR_GRDT83 (RID_SVX_START + 2183) -#define RID_SVXSTR_GRDT84 (RID_SVX_START + 2184) -#define RID_SVXSTR_GRDT85 (RID_SVX_START + 2185) -#define RID_SVXSTR_GRDT86 (RID_SVX_START + 2186) -#define RID_SVXSTR_GRDT87 (RID_SVX_START + 2187) -#define RID_SVXSTR_GRDT_DEF_START RID_SVXSTR_GRDT0_DEF -#define RID_SVXSTR_GRDT_DEF_END RID_SVXSTR_GRDT87_DEF -#define RID_SVXSTR_GRDT_START RID_SVXSTR_GRDT0 -// RID_SVXSTR_GRDT_END RID_SVXSTR_GRDT87 - -// Default-Hatch-Names -#define RID_SVXSTR_HATCH0_DEF (RID_SVX_START + 661) -#define RID_SVXSTR_HATCH1_DEF (RID_SVX_START + 662) -#define RID_SVXSTR_HATCH2_DEF (RID_SVX_START + 663) -#define RID_SVXSTR_HATCH3_DEF (RID_SVX_START + 664) -#define RID_SVXSTR_HATCH4_DEF (RID_SVX_START + 665) -#define RID_SVXSTR_HATCH5_DEF (RID_SVX_START + 666) -#define RID_SVXSTR_HATCH6_DEF (RID_SVX_START + 667) -#define RID_SVXSTR_HATCH7_DEF (RID_SVX_START + 668) -#define RID_SVXSTR_HATCH8_DEF (RID_SVX_START + 669) -#define RID_SVXSTR_HATCH9_DEF (RID_SVX_START + 670) -#define RID_SVXSTR_HATCH10_DEF (RID_SVX_START + 671) -#define RID_SVXSTR_HATCH0 (RID_SVX_START + 672) -#define RID_SVXSTR_HATCH1 (RID_SVX_START + 673) -#define RID_SVXSTR_HATCH2 (RID_SVX_START + 674) -#define RID_SVXSTR_HATCH3 (RID_SVX_START + 675) -#define RID_SVXSTR_HATCH4 (RID_SVX_START + 676) -#define RID_SVXSTR_HATCH5 (RID_SVX_START + 677) -#define RID_SVXSTR_HATCH6 (RID_SVX_START + 678) -#define RID_SVXSTR_HATCH7 (RID_SVX_START + 679) -#define RID_SVXSTR_HATCH8 (RID_SVX_START + 680) -#define RID_SVXSTR_HATCH9 (RID_SVX_START + 681) -#define RID_SVXSTR_HATCH10 (RID_SVX_START + 682) -#define RID_SVXSTR_HATCH_DEF_START RID_SVXSTR_HATCH0_DEF -#define RID_SVXSTR_HATCH_DEF_END RID_SVXSTR_HATCH10_DEF -#define RID_SVXSTR_HATCH_START RID_SVXSTR_HATCH0 -// RID_SVXSTR_HATCH_END RID_SVXSTR_HATCH10 - -// Default-Bitmap-Names -#define RID_SVXSTR_BMP0_DEF (RID_SVX_START + 691) -#define RID_SVXSTR_BMP1_DEF (RID_SVX_START + 692) -#define RID_SVXSTR_BMP2_DEF (RID_SVX_START + 693) -#define RID_SVXSTR_BMP3_DEF (RID_SVX_START + 694) -#define RID_SVXSTR_BMP4_DEF (RID_SVX_START + 695) -#define RID_SVXSTR_BMP5_DEF (RID_SVX_START + 696) -#define RID_SVXSTR_BMP6_DEF (RID_SVX_START + 697) -#define RID_SVXSTR_BMP7_DEF (RID_SVX_START + 698) -#define RID_SVXSTR_BMP8_DEF (RID_SVX_START + 699) -#define RID_SVXSTR_BMP9_DEF (RID_SVX_START + 700) -#define RID_SVXSTR_BMP10_DEF (RID_SVX_START + 701) -#define RID_SVXSTR_BMP11_DEF (RID_SVX_START + 702) -#define RID_SVXSTR_BMP12_DEF (RID_SVX_START + 703) -#define RID_SVXSTR_BMP13_DEF (RID_SVX_START + 704) -#define RID_SVXSTR_BMP14_DEF (RID_SVX_START + 705) -#define RID_SVXSTR_BMP15_DEF (RID_SVX_START + 706) -#define RID_SVXSTR_BMP16_DEF (RID_SVX_START + 707) -#define RID_SVXSTR_BMP17_DEF (RID_SVX_START + 708) -#define RID_SVXSTR_BMP18_DEF (RID_SVX_START + 709) -#define RID_SVXSTR_BMP19_DEF (RID_SVX_START + 710) -#define RID_SVXSTR_BMP20_DEF (RID_SVX_START + 711) -#define RID_SVXSTR_BMP21_DEF (RID_SVX_START + 712) -#define RID_SVXSTR_BMP0 (RID_SVX_START + 713) -#define RID_SVXSTR_BMP1 (RID_SVX_START + 714) -#define RID_SVXSTR_BMP2 (RID_SVX_START + 715) -#define RID_SVXSTR_BMP3 (RID_SVX_START + 716) -#define RID_SVXSTR_BMP4 (RID_SVX_START + 717) -#define RID_SVXSTR_BMP5 (RID_SVX_START + 718) -#define RID_SVXSTR_BMP6 (RID_SVX_START + 719) -#define RID_SVXSTR_BMP7 (RID_SVX_START + 720) -#define RID_SVXSTR_BMP8 (RID_SVX_START + 721) -#define RID_SVXSTR_BMP9 (RID_SVX_START + 722) -#define RID_SVXSTR_BMP10 (RID_SVX_START + 723) -#define RID_SVXSTR_BMP11 (RID_SVX_START + 724) -#define RID_SVXSTR_BMP12 (RID_SVX_START + 725) -#define RID_SVXSTR_BMP13 (RID_SVX_START + 726) -#define RID_SVXSTR_BMP14 (RID_SVX_START + 727) -#define RID_SVXSTR_BMP15 (RID_SVX_START + 728) -#define RID_SVXSTR_BMP16 (RID_SVX_START + 729) -#define RID_SVXSTR_BMP17 (RID_SVX_START + 730) -#define RID_SVXSTR_BMP18 (RID_SVX_START + 731) -#define RID_SVXSTR_BMP19 (RID_SVX_START + 732) -#define RID_SVXSTR_BMP20 (RID_SVX_START + 733) -#define RID_SVXSTR_BMP21 (RID_SVX_START + 734) -#define RID_SVXSTR_BMP_DEF_START RID_SVXSTR_BMP0_DEF -#define RID_SVXSTR_BMP_DEF_END RID_SVXSTR_BMP21_DEF -#define RID_SVXSTR_BMP_START RID_SVXSTR_BMP0 -// RID_SVXSTR_BMP_END RID_SVXSTR_BMP21 - -// Default-Linestyle-Names -#define RID_SVXSTR_DASH0_DEF (RID_SVX_START + 740) -#define RID_SVXSTR_DASH1_DEF (RID_SVX_START + 741) -#define RID_SVXSTR_DASH2_DEF (RID_SVX_START + 742) -#define RID_SVXSTR_DASH3_DEF (RID_SVX_START + 743) -#define RID_SVXSTR_DASH4_DEF (RID_SVX_START + 744) -#define RID_SVXSTR_DASH5_DEF (RID_SVX_START + 745) -#define RID_SVXSTR_DASH6_DEF (RID_SVX_START + 746) -#define RID_SVXSTR_DASH7_DEF (RID_SVX_START + 747) -#define RID_SVXSTR_DASH8_DEF (RID_SVX_START + 748) -#define RID_SVXSTR_DASH9_DEF (RID_SVX_START + 749) -#define RID_SVXSTR_DASH10_DEF (RID_SVX_START + 750) -#define RID_SVXSTR_DASH11_DEF (RID_SVX_START + 751) -#define RID_SVXSTR_DASH12_DEF (RID_SVX_START + 752) -#define RID_SVXSTR_DASH0 (RID_SVX_START + 753) -#define RID_SVXSTR_DASH1 (RID_SVX_START + 754) -#define RID_SVXSTR_DASH2 (RID_SVX_START + 755) -#define RID_SVXSTR_DASH3 (RID_SVX_START + 756) -#define RID_SVXSTR_DASH4 (RID_SVX_START + 757) -#define RID_SVXSTR_DASH5 (RID_SVX_START + 758) -#define RID_SVXSTR_DASH6 (RID_SVX_START + 759) -#define RID_SVXSTR_DASH7 (RID_SVX_START + 760) -#define RID_SVXSTR_DASH8 (RID_SVX_START + 761) -#define RID_SVXSTR_DASH9 (RID_SVX_START + 762) -#define RID_SVXSTR_DASH10 (RID_SVX_START + 763) -#define RID_SVXSTR_DASH11 (RID_SVX_START + 764) -#define RID_SVXSTR_DASH12 (RID_SVX_START + 765) -#define RID_SVXSTR_DASH_DEF_START RID_SVXSTR_DASH0_DEF -#define RID_SVXSTR_DASH_DEF_END RID_SVXSTR_DASH12_DEF -#define RID_SVXSTR_DASH_START RID_SVXSTR_DASH0 -// RID_SVXSTR_DASH_END RID_SVXSTR_DASH12 - -// Default-Line-End-Names -// Shifted numbers. Old value range from +770 to +795 is unused now -#define RID_SVXSTR_LEND0_DEF (RID_SVX_START + 2770) -#define RID_SVXSTR_LEND1_DEF (RID_SVX_START + 2771) -#define RID_SVXSTR_LEND2_DEF (RID_SVX_START + 2772) -#define RID_SVXSTR_LEND3_DEF (RID_SVX_START + 2773) -#define RID_SVXSTR_LEND4_DEF (RID_SVX_START + 2774) -#define RID_SVXSTR_LEND5_DEF (RID_SVX_START + 2775) -#define RID_SVXSTR_LEND6_DEF (RID_SVX_START + 2776) -#define RID_SVXSTR_LEND7_DEF (RID_SVX_START + 2777) -#define RID_SVXSTR_LEND8_DEF (RID_SVX_START + 2778) -#define RID_SVXSTR_LEND9_DEF (RID_SVX_START + 2779) -#define RID_SVXSTR_LEND10_DEF (RID_SVX_START + 2780) -#define RID_SVXSTR_LEND11_DEF (RID_SVX_START + 2781) -#define RID_SVXSTR_LEND12_DEF (RID_SVX_START + 2782) -#define RID_SVXSTR_LEND13_DEF (RID_SVX_START + 2783) -#define RID_SVXSTR_LEND14_DEF (RID_SVX_START + 2784) -#define RID_SVXSTR_LEND15_DEF (RID_SVX_START + 2785) -#define RID_SVXSTR_LEND16_DEF (RID_SVX_START + 2786) -#define RID_SVXSTR_LEND17_DEF (RID_SVX_START + 2787) -#define RID_SVXSTR_LEND18_DEF (RID_SVX_START + 2788) -#define RID_SVXSTR_LEND19_DEF (RID_SVX_START + 2789) -#define RID_SVXSTR_LEND20_DEF (RID_SVX_START + 2790) -#define RID_SVXSTR_LEND0 (RID_SVX_START + 2791) -#define RID_SVXSTR_LEND1 (RID_SVX_START + 2792) -#define RID_SVXSTR_LEND2 (RID_SVX_START + 2793) -#define RID_SVXSTR_LEND3 (RID_SVX_START + 2794) -#define RID_SVXSTR_LEND4 (RID_SVX_START + 2795) -#define RID_SVXSTR_LEND5 (RID_SVX_START + 2796) -#define RID_SVXSTR_LEND6 (RID_SVX_START + 2797) -#define RID_SVXSTR_LEND7 (RID_SVX_START + 2798) -#define RID_SVXSTR_LEND8 (RID_SVX_START + 2799) -#define RID_SVXSTR_LEND9 (RID_SVX_START + 2800) -#define RID_SVXSTR_LEND10 (RID_SVX_START + 2801) -#define RID_SVXSTR_LEND11 (RID_SVX_START + 2802) -#define RID_SVXSTR_LEND12 (RID_SVX_START + 2803) -#define RID_SVXSTR_LEND13 (RID_SVX_START + 2804) -#define RID_SVXSTR_LEND14 (RID_SVX_START + 2805) -#define RID_SVXSTR_LEND15 (RID_SVX_START + 2806) -#define RID_SVXSTR_LEND16 (RID_SVX_START + 2807) -#define RID_SVXSTR_LEND17 (RID_SVX_START + 2808) -#define RID_SVXSTR_LEND18 (RID_SVX_START + 2809) -#define RID_SVXSTR_LEND19 (RID_SVX_START + 2810) -#define RID_SVXSTR_LEND20 (RID_SVX_START + 2811) -#define RID_SVXSTR_LEND_DEF_START RID_SVXSTR_LEND0_DEF -#define RID_SVXSTR_LEND_DEF_END RID_SVXSTR_LEND20_DEF -#define RID_SVXSTR_LEND_START RID_SVXSTR_LEND0 -// RID_SVXSTR_LEND_END RID_SVXSTR_LEND20 - -#define RID_SVXSTR_QRY_PRINT_TITLE (RID_SVX_START + 802) -#define RID_SVXSTR_QRY_PRINT_MSG (RID_SVX_START + 803) -#define RID_SVXSTR_QRY_PRINT_ALL (RID_SVX_START + 804) -#define RID_SVXSTR_QRY_PRINT_SELECTION (RID_SVX_START + 805) - -// strings for graphic attributes/undo -#define RID_SVXSTR_GRAFCROP (RID_SVX_START + 820) -#define RID_SVXSTR_UNDO_GRAFMODE (RID_SVX_START + 821) -#define RID_SVXSTR_UNDO_GRAFRED (RID_SVX_START + 822) -#define RID_SVXSTR_UNDO_GRAFGREEN (RID_SVX_START + 823) -#define RID_SVXSTR_UNDO_GRAFBLUE (RID_SVX_START + 824) -#define RID_SVXSTR_UNDO_GRAFLUMINANCE (RID_SVX_START + 825) -#define RID_SVXSTR_UNDO_GRAFCONTRAST (RID_SVX_START + 826) -#define RID_SVXSTR_UNDO_GRAFGAMMA (RID_SVX_START + 827) -#define RID_SVXSTR_UNDO_GRAFTRANSPARENCY (RID_SVX_START + 828) -#define RID_SVXSTR_UNDO_GRAFCROP (RID_SVXSTR_GRAFCROP) - -// strings for UNDO and REDO -#define RID_SVXSTR_NUM_UNDO_ACTIONS (RID_SVX_START + 846) -#define RID_SVXSTR_NUM_REDO_ACTIONS (RID_SVX_START + 847) -#define RID_SVXSTR_NUM_UNDO_ACTION (RID_SVX_START + 848) -#define RID_SVXSTR_NUM_REDO_ACTION (RID_SVX_START + 849) - -// Default-transparence-gradient-names -#define RID_SVXSTR_TRASNGR0_DEF (RID_SVX_START + 850) -#define RID_SVXSTR_TRASNGR0 (RID_SVX_START + 851) -#define RID_SVXSTR_TRASNGR_DEF_START RID_SVXSTR_TRASNGR0_DEF -#define RID_SVXSTR_TRASNGR_DEF_END RID_SVXSTR_TRASNGR0_DEF -#define RID_SVXSTR_TRASNGR_START RID_SVXSTR_TRASNGR0 -// RID_SVXSTR_TRASNGR_END RID_SVXSTR_TRASNGR0 - -// Accessibility strings. The actual string ids are defined in -// svx/inc/accessibility.hrc, the strings are defined in -// svx/source/accessibility/accessibility.src -#define RID_SVXSTR_ACCESSIBILITY_START (RID_SVX_START + 860) -// RID_SVXSTR_ACCESSIBILITY_END (RID_SVX_START + 950) - -#define RID_SVXSTR_EXPORT_GRAPHIC_TITLE (RID_SVX_START + 984) -#define RID_SVXSTR_SAVEAS_IMAGE (RID_SVX_START + 985) -#define RID_SVX_EXTRUSION_BAR (RID_SVX_START + 986) -#define RID_SVX_FONTWORK_BAR (RID_SVX_START + 987) - -// String for saving modified image (instead of original) -#define RID_SVXSTR_SAVE_MODIFIED_IMAGE (RID_SVX_START + 988) - -#define RID_SVXSTR_DEPTH_0 (RID_SVX_START + 992) -#define RID_SVXSTR_DEPTH_1 (RID_SVX_START + 993) -#define RID_SVXSTR_DEPTH_2 (RID_SVX_START + 994) -#define RID_SVXSTR_DEPTH_3 (RID_SVX_START + 995) -#define RID_SVXSTR_DEPTH_4 (RID_SVX_START + 996) - -#define RID_SVXSTR_DEPTH_0_INCH (RID_SVX_START + 997) -#define RID_SVXSTR_DEPTH_1_INCH (RID_SVX_START + 998) -#define RID_SVXSTR_DEPTH_2_INCH (RID_SVX_START + 999) -#define RID_SVXSTR_DEPTH_3_INCH (RID_SVX_START + 1000) -#define RID_SVXSTR_DEPTH_4_INCH (RID_SVX_START + 1001) - -#define RID_SVXSTR_PAGES (RID_SVX_START + 1002) - -#define RID_SVXSTR_UNDO_APPLY_FONTWORK_SHAPE (RID_SVX_START + 1118) -#define RID_SVXSTR_UNDO_APPLY_FONTWORK_SAME_LETTER_HEIGHT (RID_SVX_START + 1119) -#define RID_SVXSTR_UNDO_APPLY_FONTWORK_ALIGNMENT (RID_SVX_START + 1120) -#define RID_SVXSTR_UNDO_APPLY_FONTWORK_CHARACTER_SPACING (RID_SVX_START + 1122) -#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_ON_OFF (RID_SVX_START + 1123) -#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_DOWN (RID_SVX_START + 1124) -#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_UP (RID_SVX_START + 1125) -#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_LEFT (RID_SVX_START + 1126) -#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_RIGHT (RID_SVX_START + 1127) -#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_DEPTH (RID_SVX_START + 1128) -#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_ORIENTATION (RID_SVX_START + 1129) -#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_PROJECTION (RID_SVX_START + 1130) -#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_LIGHTING (RID_SVX_START + 1131) -#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_BRIGHTNESS (RID_SVX_START + 1132) -#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_SURFACE (RID_SVX_START + 1133) -#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_COLOR (RID_SVX_START + 1134) - -#define RID_SVXSTR_STYLEFAMILY_TABLEDESIGN (RID_SVX_START + 1168) - // if you add here, remember to adjust RID_SVXSTR_NEXTFREE - -#define RID_SVXSTR_BULLET_DESCRIPTIONS (RID_SVX_START + 1138)//? -#define RID_SVXSTR_SINGLENUM_DESCRIPTIONS (RID_SVX_START + 1146)//? -#define RID_SVXSTR_OUTLINENUM_DESCRIPTIONS (RID_SVX_START + 1154)//? -#define RID_SVXSTR_BULLET_DESCRIPTION_0 (RID_SVXSTR_BULLET_DESCRIPTIONS + 0)//? -#define RID_SVXSTR_BULLET_DESCRIPTION_1 (RID_SVXSTR_BULLET_DESCRIPTIONS + 1)//? -#define RID_SVXSTR_BULLET_DESCRIPTION_2 (RID_SVXSTR_BULLET_DESCRIPTIONS + 2)//? -#define RID_SVXSTR_BULLET_DESCRIPTION_3 (RID_SVXSTR_BULLET_DESCRIPTIONS + 3)//? -#define RID_SVXSTR_BULLET_DESCRIPTION_4 (RID_SVXSTR_BULLET_DESCRIPTIONS + 4)//? -#define RID_SVXSTR_BULLET_DESCRIPTION_5 (RID_SVXSTR_BULLET_DESCRIPTIONS + 5)//? -#define RID_SVXSTR_BULLET_DESCRIPTION_6 (RID_SVXSTR_BULLET_DESCRIPTIONS + 6)//? -#define RID_SVXSTR_BULLET_DESCRIPTION_7 (RID_SVXSTR_BULLET_DESCRIPTIONS + 7)//? -#define RID_SVXSTR_SINGLENUM_DESCRIPTION_0 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 0)//? -#define RID_SVXSTR_SINGLENUM_DESCRIPTION_1 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 1)//? -#define RID_SVXSTR_SINGLENUM_DESCRIPTION_2 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 2)//? -#define RID_SVXSTR_SINGLENUM_DESCRIPTION_3 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 3)//? -#define RID_SVXSTR_SINGLENUM_DESCRIPTION_4 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 4)//? -#define RID_SVXSTR_SINGLENUM_DESCRIPTION_5 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 5)//? -#define RID_SVXSTR_SINGLENUM_DESCRIPTION_6 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 6)//? -#define RID_SVXSTR_SINGLENUM_DESCRIPTION_7 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 7)//? -#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_0 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 0)//? -#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_1 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 1)//? -#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_2 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 2)//? -#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_3 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 3)//? -#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_4 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 4)//? -#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_5 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 5)//? -#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_6 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 6)//? -#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_7 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 7)//? - -#define RID_SVXSTR_FINDBAR_SEARCHFORMATTED (RID_SVX_START + 1188) -#define RID_SVXSTR_FINDBAR_MATCHCASE (RID_SVX_START + 1189) -#define RID_SVXSTR_FINDBAR_FIND (RID_SVX_START + 1190) - -#define RID_SVXSTR_NUMBULLET_CUSTOM_BULLET_DESCRIPTION (RID_SVX_START + 1193) -#define RID_SVXSTR_NUMBULLET_CUSTOM_NUMBERING_DESCRIPTION (RID_SVX_START + 1194) -#define RID_SVXSTR_NUMBULLET_CUSTOM_MULTILEVEL_DESCRIPTION (RID_SVX_START + 1195) - -// ooo-build specific resources - -#define SVX_OOO_BUILD_START (RID_SVX_START + 1230) -#define RID_SVXSTR_DOC_MODIFIED_YES (SVX_OOO_BUILD_START + 4) // 1234 -#define RID_SVXSTR_DOC_MODIFIED_NO (SVX_OOO_BUILD_START + 5) // 1235 -#define RID_SVXSTR_DOC_LOAD (SVX_OOO_BUILD_START + 6) // 1236 -#define RID_SVXSTR_ERR_OLD_PASSWD (SVX_OOO_BUILD_START + 7) // 1237 -#define RID_SVXSTR_ERR_REPEAT_PASSWD (SVX_OOO_BUILD_START + 8) // 1238 -#define RID_SVXSTR_FIT_SLIDE (SVX_OOO_BUILD_START + 10) // 1240 -#define RID_SVXSTR_WARN_MISSING_SMARTART (SVX_OOO_BUILD_START + 11) // 1241 - -#define RID_SVXSTR_SUCCESSRECOV (RID_SVX_START + 1283) -#define RID_SVXSTR_ORIGDOCRECOV (RID_SVX_START + 1284) -#define RID_SVXSTR_RECOVFAILED (RID_SVX_START + 1285) -#define RID_SVXSTR_RECOVINPROGR (RID_SVX_START + 1286) -#define RID_SVXSTR_NOTRECOVYET (RID_SVX_START + 1287) -#define RID_SVXSTR_RECOVERY_INPROGRESS (RID_SVX_START + 1288) -#define RID_SVXSTR_RECOVERYONLY_FINISH_DESCR (RID_SVX_START + 1289) -#define RID_SVXSTR_RECOVERYONLY_FINISH (RID_SVX_START + 1290) -#define RID_SVXSTR_ZOOMTOOL_HINT (RID_SVX_START + 1291) -#define RID_SVXSTR_ZOOM_IN (RID_SVX_START + 1293) -#define RID_SVXSTR_ZOOM_OUT (RID_SVX_START + 1294) -#define RID_SVXSTR_CUSTOM (RID_SVX_START + 1295) -#define RID_SVXSTR_INFINITY (RID_SVX_START + 1296) -#define RID_SVXSTR_WIREFRAME (RID_SVX_START + 1297) -#define RID_SVXSTR_MATTE (RID_SVX_START + 1298) -#define RID_SVXSTR_PLASTIC (RID_SVX_START + 1299) -#define RID_SVXSTR_METAL (RID_SVX_START + 1300) -#define RID_SVXSTR_CHARS_SPACING_VERY_TIGHT (RID_SVX_START + 1301) -#define RID_SVXSTR_CHARS_SPACING_TIGHT (RID_SVX_START + 1302) -#define RID_SVXSTR_CHARS_SPACING_NORMAL (RID_SVX_START + 1303) -#define RID_SVXSTR_CHARS_SPACING_LOOSE (RID_SVX_START + 1304) -#define RID_SVXSTR_CHARS_SPACING_VERY_LOOSE (RID_SVX_START + 1305) -#define RID_SVXSTR_CHARS_SPACING_CUSTOM (RID_SVX_START + 1306) -#define RID_SVXSTR_CHARS_SPACING_KERN_PAIRS (RID_SVX_START + 1307) -#define RID_SVXSTR_DIRECTION (RID_SVX_START + 1320) // needs 10 resource ids -#define RID_SVXSTR_PERSPECTIVE (RID_SVX_START + 1330) -#define RID_SVXSTR_PARALLEL (RID_SVX_START + 1331) -#define RID_SVXSTR_BRIGHT (RID_SVX_START + 1332) -#define RID_SVXSTR_NORMAL (RID_SVX_START + 1333) -#define RID_SVXSTR_DIM (RID_SVX_START + 1334) -#define RID_SVXSTR_ALIGN_LEFT (RID_SVX_START + 1368) -#define RID_SVXSTR_ALIGN_CENTER (RID_SVX_START + 1369) -#define RID_SVXSTR_ALIGN_RIGHT (RID_SVX_START + 1370) -#define RID_SVXSTR_ALIGN_WORD (RID_SVX_START + 1371) -#define RID_SVXSTR_ALIGN_STRETCH (RID_SVX_START + 1372) -#define RID_SVXSTR_ZOOM_25 (RID_SVX_START + 1382) -#define RID_SVXSTR_ZOOM_50 (RID_SVX_START + 1383) -#define RID_SVXSTR_ZOOM_75 (RID_SVX_START + 1384) -#define RID_SVXSTR_ZOOM_100 (RID_SVX_START + 1385) -#define RID_SVXSTR_ZOOM_150 (RID_SVX_START + 1386) -#define RID_SVXSTR_ZOOM_200 (RID_SVX_START + 1387) -#define RID_SVXSTR_ZOOM_WHOLE_PAGE (RID_SVX_START + 1388) -#define RID_SVXSTR_ZOOM_PAGE_WIDTH (RID_SVX_START + 1389) -#define RID_SVXSTR_ZOOM_OPTIMAL_VIEW (RID_SVX_START + 1390) - -#define RID_SVXSTR_WIDTH_LAST_CUSTOM (RID_SVX_START + 1391) -#define RID_SVXSTR_PT (RID_SVX_START + 1392) -#define RID_SVXSTRARY_PAPERSIZE_STD (RID_SVX_START + 1395) -#define RID_SVXSTRARY_PAPERSIZE_DRAW (RID_SVX_START + 1396) -#define RID_SVXSTRARY_NUMBERINGTYPE (RID_SVX_START + 1397) -#define RID_SVXSTRARY_SPACING (RID_SVX_START + 1398) -#define RID_SVXSTRARY_SAMECONTENT (RID_SVX_START + 1399) - -// Strings for SafeModeDialog -#define RID_SVXSTR_SAFEMODE_ZIP_FAILURE (RID_SVX_START + 1400) - - -// !!! IMPORTANT: consider and update RID_SVXSTR_NEXTFREE when introducing new RIDs for Strings !!! -#define RID_SVXSTR_NEXTFREE (RID_SVX_START + 1401) - // if we have _a_lot_ time, we should group the resource ids by type, instead // of grouping them by semantics. The reason is that resource ids have to be // unique relative to a fixed type (you can't have two dialogs with the same @@ -907,8 +115,6 @@ // TabPages -------------------------------------------------------------- #define RID_SW_TP_OPTTEST_PAGE (RID_OFA_START + 215) -#define STR_COLORTABLE (RID_OFA_START + 257) -#define STR_SWITCH (RID_OFA_START + 258) #define SID_SC_TP_FORMULA (RID_OFA_START + 259) #define SID_SC_TP_COMPATIBILITY (RID_OFA_START + 260) diff --git a/include/svx/fmresids.hrc b/include/svx/fmresids.hrc deleted file mode 100644 index ab86f858a531..000000000000 --- a/include/svx/fmresids.hrc +++ /dev/null @@ -1,147 +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_SVX_FMRESIDS_HRC -#define INCLUDED_SVX_FMRESIDS_HRC - -#include - -// String-Id's ----------------------------------------------------------- -#define RID_STR_INVALID_XMLNAME (RID_FORMS_START + 1) -#define RID_STR_INVALID_XMLPREFIX (RID_FORMS_START + 2) -#define RID_STR_DOUBLE_MODELNAME (RID_FORMS_START + 3) -#define RID_STR_EMPTY_SUBMISSIONNAME (RID_FORMS_START + 4) -#define RID_STR_QRY_REMOVE_BINDING (RID_FORMS_START + 5) -#define RID_STR_QRY_REMOVE_SUBMISSION (RID_FORMS_START + 6) -#define RID_STR_QRY_REMOVE_ATTRIBUTE (RID_FORMS_START + 7) -#define RID_STR_QRY_REMOVE_ELEMENT (RID_FORMS_START + 8) -#define RID_STR_QRY_REMOVE_INSTANCE (RID_FORMS_START + 9) - -#define RID_STR_STDFORMNAME (RID_FORMS_START + 11) -#define RID_STR_REC_TEXT (RID_FORMS_START + 12) -#define RID_STR_REC_FROM_TEXT (RID_FORMS_START + 13) -#define RID_STR_UNDO_PROPERTY (RID_FORMS_START + 14) -#define RID_STR_UNDO_CONTAINER_INSERT (RID_FORMS_START + 15) -#define RID_STR_UNDO_CONTAINER_REMOVE (RID_FORMS_START + 16) -#define RID_STR_UNDO_CONTAINER_REMOVE_MULTIPLE (RID_FORMS_START + 27) -#define RID_STR_UNDO_CONTAINER_REPLACE (RID_FORMS_START + 28) -#define RID_STR_UNDO_MODEL_REPLACE (RID_FORMS_START + 31) -#define RID_STR_NAVIGATIONBAR (RID_FORMS_START + 32) -#define RID_STR_FORM (RID_FORMS_START + 36) -#define RID_STR_FIELDSELECTION (RID_FORMS_START + 37) -#define RID_STR_NO_PROPERTIES (RID_FORMS_START + 38) -#define RID_STR_PROPERTIES_CONTROL (RID_FORMS_START + 39) -#define RID_STR_PROPERTIES_FORM (RID_FORMS_START + 40) -#define RID_STR_FMEXPLORER (RID_FORMS_START + 41) -#define RID_STR_FORMS (RID_FORMS_START + 42) -#define RID_STR_WRITEERROR (RID_FORMS_START + 43) -#define RID_STR_DELETECONFIRM_RECORD (RID_FORMS_START + 44) -#define RID_STR_DELETECONFIRM (RID_FORMS_START + 45) -#define RID_STR_COLUMN (RID_FORMS_START + 48) -#define RID_STR_PROPTITLE_NAVBAR (RID_FORMS_START + 51) -#define RID_STR_PROPTITLE_PUSHBUTTON (RID_FORMS_START + 52) -#define RID_STR_PROPTITLE_RADIOBUTTON (RID_FORMS_START + 53) -#define RID_STR_PROPTITLE_CHECKBOX (RID_FORMS_START + 54) -#define RID_STR_PROPTITLE_FIXEDTEXT (RID_FORMS_START + 55) -#define RID_STR_PROPTITLE_GROUPBOX (RID_FORMS_START + 56) -#define RID_STR_PROPTITLE_EDIT (RID_FORMS_START + 57) -#define RID_STR_PROPTITLE_LISTBOX (RID_FORMS_START + 58) -#define RID_STR_PROPTITLE_COMBOBOX (RID_FORMS_START + 59) -#define RID_STR_PROPTITLE_IMAGEBUTTON (RID_FORMS_START + 60) -#define RID_STR_PROPTITLE_IMAGECONTROL (RID_FORMS_START + 61) -#define RID_STR_PROPTITLE_FILECONTROL (RID_FORMS_START + 62) -#define RID_STR_PROPTITLE_DATEFIELD (RID_FORMS_START + 63) -#define RID_STR_PROPTITLE_TIMEFIELD (RID_FORMS_START + 64) -#define RID_STR_PROPTITLE_NUMERICFIELD (RID_FORMS_START + 65) -#define RID_STR_PROPTITLE_CURRENCYFIELD (RID_FORMS_START + 66) -#define RID_STR_PROPTITLE_PATTERNFIELD (RID_FORMS_START + 67) -#define RID_STR_PROPTITLE_DBGRID (RID_FORMS_START + 68) -#define RID_STR_PROPTITLE_MULTISELECT (RID_FORMS_START + 69) -#define RID_STR_DELETECONFIRM_RECORDS (RID_FORMS_START + 70) -#define RID_STR_CONTROL (RID_FORMS_START + 71) -#define RID_STR_POSTFIX_DATE (RID_FORMS_START + 72) -#define RID_STR_POSTFIX_TIME (RID_FORMS_START + 73) -#define RID_STR_NODATACONTROLS (RID_FORMS_START + 77) -#define RID_STR_FILTER_NAVIGATOR (RID_FORMS_START + 78) -#define RID_STR_FILTER_FILTER_FOR (RID_FORMS_START + 79) -#define RID_STR_FILTER_FILTER_OR (RID_FORMS_START + 80) -#define RID_STR_PROPTITLE_FORMATTED (RID_FORMS_START + 81) -#define RID_STR_SYNTAXERROR (RID_FORMS_START + 82) -#define RID_STR_QRY_REMOVE_MODEL (RID_FORMS_START + 83) -#define RID_STR_NOCONTROLS_FOR_EXTERNALDISPLAY (RID_FORMS_START + 84) -#define RID_STR_AUTOFIELD (RID_FORMS_START + 89) -#define RID_STR_SVT_SQL_SYNTAX_ERROR (RID_FORMS_START + 90) -#define RID_STR_SVT_SQL_SYNTAX_VALUE_NO_LIKE (RID_FORMS_START + 91) -#define RID_STR_SVT_SQL_SYNTAX_FIELD_NO_LIKE (RID_FORMS_START + 92) -#define RID_STR_SVT_SQL_SYNTAX_CRIT_NO_COMPARE (RID_FORMS_START + 93) -#define RID_STR_SVT_SQL_SYNTAX_INT_NO_VALID (RID_FORMS_START + 94) -#define RID_STR_SVT_SQL_SYNTAX_ACCESS_DAT_NO_VALID (RID_FORMS_START + 95) -#define RID_STR_SVT_SQL_SYNTAX_REAL_NO_VALID (RID_FORMS_START + 96) -#define RID_STR_SVT_SQL_SYNTAX_TABLE (RID_FORMS_START + 97) -#define RID_STR_SVT_SQL_SYNTAX_COLUMN (RID_FORMS_START + 98) -#define RID_STR_PROPTITLE_SCROLLBAR (RID_FORMS_START + 99) -#define RID_STR_PROPTITLE_SPINBUTTON (RID_FORMS_START + 100) -#define RID_STR_PROPTITLE_HIDDEN (RID_FORMS_START + 101) - // FREE -#define RID_STR_ELEMENT (RID_FORMS_START + 114) -#define RID_STR_ATTRIBUTE (RID_FORMS_START + 115) -#define RID_STR_BINDING (RID_FORMS_START + 116) -#define RID_STR_BINDING_EXPR (RID_FORMS_START + 117) -#define RID_STR_METHOD_POST (RID_FORMS_START + 118) -#define RID_STR_METHOD_PUT (RID_FORMS_START + 119) -#define RID_STR_METHOD_GET (RID_FORMS_START + 120) -#define RID_STR_REPLACE_NONE (RID_FORMS_START + 121) -#define RID_STR_REPLACE_INST (RID_FORMS_START + 122) -#define RID_STR_REPLACE_DOC (RID_FORMS_START + 123) -#define RID_STR_DATANAVIGATOR (RID_FORMS_START + 124) -#define RID_STR_DATANAV_SUBM_ACTION (RID_FORMS_START + 127) -#define RID_STR_DATANAV_SUBM_METHOD (RID_FORMS_START + 128) -#define RID_STR_DATANAV_SUBM_REF (RID_FORMS_START + 129) -#define RID_STR_DATANAV_SUBM_BIND (RID_FORMS_START + 130) -#define RID_STR_DATANAV_SUBM_REPLACE (RID_FORMS_START + 131) -#define RID_STR_DATANAV_ADD_ELEMENT (RID_FORMS_START + 132) -#define RID_STR_DATANAV_EDIT_ELEMENT (RID_FORMS_START + 133) -#define RID_STR_DATANAV_REMOVE_ELEMENT (RID_FORMS_START + 134) -#define RID_STR_DATANAV_ADD_ATTRIBUTE (RID_FORMS_START + 135) -#define RID_STR_DATANAV_EDIT_ATTRIBUTE (RID_FORMS_START + 136) -#define RID_STR_DATANAV_REMOVE_ATTRIBUTE (RID_FORMS_START + 137) -#define RID_STR_DATANAV_ADD_BINDING (RID_FORMS_START + 138) -#define RID_STR_DATANAV_EDIT_BINDING (RID_FORMS_START + 139) -#define RID_STR_DATANAV_REMOVE_BINDING (RID_FORMS_START + 140) -#define RID_STR_DATANAV_ADD_SUBMISSION (RID_FORMS_START + 141) -#define RID_STR_DATANAV_EDIT_SUBMISSION (RID_FORMS_START + 142) -#define RID_STR_DATANAV_REMOVE_SUBMISSION (RID_FORMS_START + 143) -#define RID_STR_SVT_SQL_SYNTAX_TABLE_OR_QUERY (RID_FORMS_START + 145) -#define RID_STR_SVT_SQL_SYNTAX_TABLE_EXISTS (RID_FORMS_START + 146) -#define RID_STR_SVT_SQL_SYNTAX_QUERY_EXISTS (RID_FORMS_START + 147) -#define RID_STR_READONLY_VIEW (RID_FORMS_START + 148) -#define RID_STR_ALREADYEXISTOVERWRITE (RID_FORMS_START + 149) -#define RID_STR_OBJECT_LABEL (RID_FORMS_START + 150) - -// Error-String-Id's ----------------------------------------------------------- -#define RID_ERR_START (RID_FORMS_START + 600) -#define RID_ERR_FIELDREQUIRED (RID_ERR_START + 2) - -// untyped resources ---------------------------------------------------------- - -#define RID_RSC_TABWIN_PREFIX ( RID_FORMS_START + 0 ) -#define RID_RSC_SQL_INTERNATIONAL ( RID_FORMS_START + 1 ) - -#endif // _FM_FMPAGE_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/gallery.hxx b/include/svx/gallery.hxx index d5a534615734..4d5b1e8b2fa6 100644 --- a/include/svx/gallery.hxx +++ b/include/svx/gallery.hxx @@ -25,18 +25,73 @@ #include // Defines for preinstalled themes -// Has to be in sync with svx/inc/galtheme.hrc #define GALLERY_THEME_3D 1 #define GALLERY_THEME_BULLETS 3 #define GALLERY_THEME_HOMEPAGE 10 #define GALLERY_THEME_HTMLBUTTONS 15 #define GALLERY_THEME_POWERPOINT 16 +#define GALLERY_THEME_RULERS 17 #define GALLERY_THEME_SOUNDS 18 +#define GALLERY_THEME_MYTHEME 20 #define GALLERY_THEME_USERSOUNDS 21 #define GALLERY_THEME_DUMMY5 36 #define GALLERY_THEME_FONTWORK 37 #define GALLERY_THEME_FONTWORK_VERTICAL 38 +#define RID_GALLERY_THEME_START (6000) + +// ATTENTION: This list has to be in sync with +// * share/gallery (theme files are identified by id) +// +// Since galleries may be copied from older offices to newer, do *never* change +// this IDs except adding new ones (and adapting GALLERY_THEME_LAST). The ID +// *is* written into the binary file *.thm (which is a gallery theme combined +// of three files, *.thm, *.sdv and *.sdg) + +#define RID_GALLERY_THEME_3D (RID_GALLERY_THEME_START + 1) +#define RID_GALLERY_THEME_ANIMATIONS (RID_GALLERY_THEME_START + 2) +#define RID_GALLERY_THEME_BULLETS (RID_GALLERY_THEME_START + 3) +#define RID_GALLERY_THEME_OFFICE (RID_GALLERY_THEME_START + 4) +#define RID_GALLERY_THEME_FLAGS (RID_GALLERY_THEME_START + 5) +#define RID_GALLERY_THEME_FLOWCHARTS (RID_GALLERY_THEME_START + 6) +#define RID_GALLERY_THEME_EMOTICONS (RID_GALLERY_THEME_START + 7) +#define RID_GALLERY_THEME_PHOTOS (RID_GALLERY_THEME_START + 8) +#define RID_GALLERY_THEME_BACKGROUNDS (RID_GALLERY_THEME_START + 9) +#define RID_GALLERY_THEME_HOMEPAGE (RID_GALLERY_THEME_START + 10) +#define RID_GALLERY_THEME_INTERACTION (RID_GALLERY_THEME_START + 11) +#define RID_GALLERY_THEME_MAPS (RID_GALLERY_THEME_START + 12) +#define RID_GALLERY_THEME_PEOPLE (RID_GALLERY_THEME_START + 13) +#define RID_GALLERY_THEME_SURFACES (RID_GALLERY_THEME_START + 14) + +#define RID_GALLERY_THEME_SOUNDS (RID_GALLERY_THEME_START + 18) +#define RID_GALLERY_THEME_SYMBOLS (RID_GALLERY_THEME_START + 19) +#define RID_GALLERY_THEME_MYTHEME (RID_GALLERY_THEME_START + 20) + +#define RID_GALLERY_THEME_ARROWS (RID_GALLERY_THEME_START + 22) +#define RID_GALLERY_THEME_BALLOONS (RID_GALLERY_THEME_START + 23) +#define RID_GALLERY_THEME_KEYBOARD (RID_GALLERY_THEME_START + 24) +#define RID_GALLERY_THEME_TIME (RID_GALLERY_THEME_START + 25) +#define RID_GALLERY_THEME_PRESENTATION (RID_GALLERY_THEME_START + 26) +#define RID_GALLERY_THEME_CALENDAR (RID_GALLERY_THEME_START + 27) +#define RID_GALLERY_THEME_NAVIGATION (RID_GALLERY_THEME_START + 28) +#define RID_GALLERY_THEME_COMMUNICATION (RID_GALLERY_THEME_START + 29) +#define RID_GALLERY_THEME_FINANCES (RID_GALLERY_THEME_START + 30) +#define RID_GALLERY_THEME_COMPUTER (RID_GALLERY_THEME_START + 31) +#define RID_GALLERY_THEME_CLIMA (RID_GALLERY_THEME_START + 32) +#define RID_GALLERY_THEME_EDUCATION (RID_GALLERY_THEME_START + 33) +#define RID_GALLERY_THEME_TROUBLE (RID_GALLERY_THEME_START + 34) +#define RID_GALLERY_THEME_SCREENBEANS (RID_GALLERY_THEME_START + 35) + +#define RID_GALLERY_THEME_COMPUTERS (RID_GALLERY_THEME_START + 39) +#define RID_GALLERY_THEME_DIAGRAMS (RID_GALLERY_THEME_START + 40) +#define RID_GALLERY_THEME_ENVIRONMENT (RID_GALLERY_THEME_START + 41) +#define RID_GALLERY_THEME_FINANCE (RID_GALLERY_THEME_START + 42) +#define RID_GALLERY_THEME_TRANSPORT (RID_GALLERY_THEME_START + 43) +#define RID_GALLERY_THEME_TXTSHAPES (RID_GALLERY_THEME_START + 44) + +#define RID_GALLERY_THEME_FIRST RID_GALLERY_THEME_3D +#define RID_GALLERY_THEME_LAST RID_GALLERY_THEME_TXTSHAPES + class Gallery; class VCDrawModel; class FmFormModel; diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx index ce89ab0ec5de..7ab20dee1ef0 100644 --- a/include/svx/galmisc.hxx +++ b/include/svx/galmisc.hxx @@ -31,7 +31,6 @@ #include #include #include -#include class GalleryTheme; class SotStorageStream; @@ -63,15 +62,6 @@ enum class SgaObjKind #define ID_IMAPINFO 2 -class ResMgr; - -SVX_DLLPUBLIC ResMgr* GetGalleryResMgr(); - -inline OUString GalResId(sal_uInt16 nId) -{ - return ResId(nId, *GetGalleryResMgr()); -} - #define STREAMBUF_SIZE 16384L enum class GalleryGraphicImportRet diff --git a/include/svx/strarray.hxx b/include/svx/strarray.hxx index 9b0f4ec8b9d4..a5dca6b84101 100644 --- a/include/svx/strarray.hxx +++ b/include/svx/strarray.hxx @@ -19,21 +19,45 @@ #ifndef INCLUDED_SVX_STRARRAY_HXX #define INCLUDED_SVX_STRARRAY_HXX -#include +#include #include +#include // class SvxStringArray ------------------------------------------------- -class SVX_DLLPUBLIC SvxStringArray : public ResStringArray +class SVX_DLLPUBLIC SvxStringArray { + std::vector m_aTranslations; public: - SvxStringArray( sal_uInt32 nResId ); - SvxStringArray( const ResId& rResId ); - ~SvxStringArray(); - - const OUString GetStringByPos( sal_uInt32 nPos ) const; + SvxStringArray(const char** pResId, size_t nLength); + const OUString GetString(sal_uInt32 nPos) const; }; +class SVX_DLLPUBLIC SvxFieldUnitTable +{ +public: + static OUString GetString(sal_uInt32 i); + static sal_uInt32 Count(); + static FieldUnit GetValue(sal_uInt32 i); +}; + +class SVX_DLLPUBLIC SvxNumberingTypeTable +{ +public: + static OUString GetString(sal_uInt32 i); + static sal_uInt32 Count(); + static int GetValue(sal_uInt32 i); + static sal_uInt32 FindIndex(int nValue); +}; + +class SVX_DLLPUBLIC SvxAttrNameTable +{ +public: + static OUString GetString(sal_uInt32 i); + static sal_uInt32 Count(); + static sal_uInt16 GetValue(sal_uInt32 i); + static sal_uInt32 FindIndex(int nValue); +}; #endif diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc new file mode 100644 index 000000000000..a3ec0eedc488 --- /dev/null +++ b/include/svx/strings.hrc @@ -0,0 +1,1261 @@ +/* -*- 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_SVX_INC_STRINGS_HRC +#define INCLUDED_SVX_INC_STRINGS_HRC + +#define NC_(Context, String) (Context "\004" u8##String) + +#define STR_ObjNameSingulNONE NC_("STR_ObjNameSingulNONE", "Drawing object") +#define STR_ObjNamePluralNONE NC_("STR_ObjNamePluralNONE", "Drawing objects") +#define STR_ObjNameSingulGRUP NC_("STR_ObjNameSingulGRUP", "Group object") +#define STR_ObjNamePluralGRUP NC_("STR_ObjNamePluralGRUP", "Group objects") +#define STR_ObjNameSingulGRUPEMPTY NC_("STR_ObjNameSingulGRUPEMPTY", "Blank group object") +#define STR_ObjNamePluralGRUPEMPTY NC_("STR_ObjNamePluralGRUPEMPTY", "Blank group objects") +#define STR_ObjNameSingulLINE NC_("STR_ObjNameSingulLINE", "Line") +#define STR_ObjNameSingulLINE_Hori NC_("STR_ObjNameSingulLINE_Hori", "Horizontal line") +#define STR_ObjNameSingulLINE_Vert NC_("STR_ObjNameSingulLINE_Vert", "Vertical line") +#define STR_ObjNameSingulLINE_Diag NC_("STR_ObjNameSingulLINE_Diag", "Diagonal line") +#define STR_ObjNamePluralLINE NC_("STR_ObjNamePluralLINE", "Lines") +#define STR_ObjNameSingulRECT NC_("STR_ObjNameSingulRECT", "Rectangle") +#define STR_ObjNamePluralRECT NC_("STR_ObjNamePluralRECT", "Rectangles") +#define STR_ObjNameSingulQUAD NC_("STR_ObjNameSingulQUAD", "Square") +#define STR_ObjNamePluralQUAD NC_("STR_ObjNamePluralQUAD", "Squares") +#define STR_ObjNameSingulPARAL NC_("STR_ObjNameSingulPARAL", "Parallelogram") +#define STR_ObjNamePluralPARAL NC_("STR_ObjNamePluralPARAL", "Parallelograms") +#define STR_ObjNameSingulRAUTE NC_("STR_ObjNameSingulRAUTE", "Rhombus") +#define STR_ObjNamePluralRAUTE NC_("STR_ObjNamePluralRAUTE", "Rhombuses") +#define STR_ObjNameSingulRECTRND NC_("STR_ObjNameSingulRECTRND", "Rounded rectangle") +#define STR_ObjNamePluralRECTRND NC_("STR_ObjNamePluralRECTRND", "Rounded Rectangles") +#define STR_ObjNameSingulQUADRND NC_("STR_ObjNameSingulQUADRND", "rounded square") +#define STR_ObjNamePluralQUADRND NC_("STR_ObjNamePluralQUADRND", "Rounded Squares") +#define STR_ObjNameSingulPARALRND NC_("STR_ObjNameSingulPARALRND", "Rounded Parallelogram") +#define STR_ObjNamePluralPARALRND NC_("STR_ObjNamePluralPARALRND", "Rounded parallelograms") +#define STR_ObjNameSingulRAUTERND NC_("STR_ObjNameSingulRAUTERND", "rounded rhombus") +#define STR_ObjNamePluralRAUTERND NC_("STR_ObjNamePluralRAUTERND", "Rounded rhombuses") +#define STR_ObjNameSingulCIRC NC_("STR_ObjNameSingulCIRC", "Circle") +#define STR_ObjNamePluralCIRC NC_("STR_ObjNamePluralCIRC", "Circles") +#define STR_ObjNameSingulSECT NC_("STR_ObjNameSingulSECT", "Circle sector") +#define STR_ObjNamePluralSECT NC_("STR_ObjNamePluralSECT", "Circle sectors") +#define STR_ObjNameSingulCARC NC_("STR_ObjNameSingulCARC", "Arc") +#define STR_ObjNamePluralCARC NC_("STR_ObjNamePluralCARC", "Arcs") +#define STR_ObjNameSingulCCUT NC_("STR_ObjNameSingulCCUT", "Circle segment") +#define STR_ObjNamePluralCCUT NC_("STR_ObjNamePluralCCUT", "Circle segments") +#define STR_ObjNameSingulCIRCE NC_("STR_ObjNameSingulCIRCE", "Ellipse") +#define STR_ObjNamePluralCIRCE NC_("STR_ObjNamePluralCIRCE", "Ellipses") +#define STR_ObjNameSingulSECTE NC_("STR_ObjNameSingulSECTE", "Ellipse Pie") +#define STR_ObjNamePluralSECTE NC_("STR_ObjNamePluralSECTE", "Ellipse Pies") +#define STR_ObjNameSingulCARCE NC_("STR_ObjNameSingulCARCE", "Elliptical arc") +#define STR_ObjNamePluralCARCE NC_("STR_ObjNamePluralCARCE", "Elliptical arcs") +#define STR_ObjNameSingulCCUTE NC_("STR_ObjNameSingulCCUTE", "Ellipse Segment") +#define STR_ObjNamePluralCCUTE NC_("STR_ObjNamePluralCCUTE", "Ellipse Segments") +#define STR_ObjNameSingulPOLY NC_("STR_ObjNameSingulPOLY", "Polygon") +#define STR_ObjNameSingulPOLY_PointCount NC_("STR_ObjNameSingulPOLY_PointCount", "Polygon %2 corners") +#define STR_ObjNamePluralPOLY NC_("STR_ObjNamePluralPOLY", "Polygons") +#define STR_ObjNameSingulPLIN NC_("STR_ObjNameSingulPLIN", "Polyline") +#define STR_ObjNameSingulPLIN_PointCount NC_("STR_ObjNameSingulPLIN_PointCount", "Polyline with %2 corners") +#define STR_ObjNamePluralPLIN NC_("STR_ObjNamePluralPLIN", "Polylines") +#define STR_ObjNameSingulPATHLINE NC_("STR_ObjNameSingulPATHLINE", "Bézier curve") +#define STR_ObjNamePluralPATHLINE NC_("STR_ObjNamePluralPATHLINE", "Bézier curves") +#define STR_ObjNameSingulPATHFILL NC_("STR_ObjNameSingulPATHFILL", "Bézier curve") +#define STR_ObjNamePluralPATHFILL NC_("STR_ObjNamePluralPATHFILL", "Bézier curves") +#define STR_ObjNameSingulFREELINE NC_("STR_ObjNameSingulFREELINE", "Freeform Line") +#define STR_ObjNamePluralFREELINE NC_("STR_ObjNamePluralFREELINE", "Freeform Lines") +#define STR_ObjNameSingulFREEFILL NC_("STR_ObjNameSingulFREEFILL", "Freeform Line") +#define STR_ObjNamePluralFREEFILL NC_("STR_ObjNamePluralFREEFILL", "Freeform Lines") +#define STR_ObjNameSingulCOMBLINE NC_("STR_ObjNameSingulCOMBLINE", "Curve") +#define STR_ObjNameSingulNATSPLN NC_("STR_ObjNameSingulNATSPLN", "Natural Spline") +#define STR_ObjNamePluralNATSPLN NC_("STR_ObjNamePluralNATSPLN", "Natural Splines") +#define STR_ObjNameSingulPERSPLN NC_("STR_ObjNameSingulPERSPLN", "Periodic Spline") +#define STR_ObjNamePluralPERSPLN NC_("STR_ObjNamePluralPERSPLN", "Periodic Splines") +#define STR_ObjNameSingulTEXT NC_("STR_ObjNameSingulTEXT", "Text Frame") +#define STR_ObjNamePluralTEXT NC_("STR_ObjNamePluralTEXT", "Text Frame") +#define STR_ObjNameSingulTEXTLNK NC_("STR_ObjNameSingulTEXTLNK", "Linked text frame") +#define STR_ObjNamePluralTEXTLNK NC_("STR_ObjNamePluralTEXTLNK", "Linked text frames") +#define STR_ObjNameSingulTITLETEXT NC_("STR_ObjNameSingulTITLETEXT", "Title text") +#define STR_ObjNamePluralTITLETEXT NC_("STR_ObjNamePluralTITLETEXT", "Title texts") +#define STR_ObjNameSingulOUTLINETEXT NC_("STR_ObjNameSingulOUTLINETEXT", "Outline Text") +#define STR_ObjNamePluralOUTLINETEXT NC_("STR_ObjNamePluralOUTLINETEXT", "Outline Texts") +#define STR_ObjNameSingulGRAF NC_("STR_ObjNameSingulGRAF", "Image") +#define STR_ObjNamePluralGRAF NC_("STR_ObjNamePluralGRAF", "Images") +#define STR_ObjNameSingulGRAFLNK NC_("STR_ObjNameSingulGRAFLNK", "Linked image") +#define STR_ObjNamePluralGRAFLNK NC_("STR_ObjNamePluralGRAFLNK", "Linked images") +#define STR_ObjNameSingulGRAFNONE NC_("STR_ObjNameSingulGRAFNONE", "Blank image object") +#define STR_ObjNamePluralGRAFNONE NC_("STR_ObjNamePluralGRAFNONE", "Blank image objects") +#define STR_ObjNameSingulGRAFNONELNK NC_("STR_ObjNameSingulGRAFNONELNK", "Blank linked image") +#define STR_ObjNamePluralGRAFNONELNK NC_("STR_ObjNamePluralGRAFNONELNK", "Blank linked images") +#define STR_ObjNameSingulGRAFMTF NC_("STR_ObjNameSingulGRAFMTF", "Metafile") +#define STR_ObjNamePluralGRAFMTF NC_("STR_ObjNamePluralGRAFMTF", "Metafiles") +#define STR_ObjNameSingulGRAFMTFLNK NC_("STR_ObjNameSingulGRAFMTFLNK", "Linked Metafile") +#define STR_ObjNamePluralGRAFMTFLNK NC_("STR_ObjNamePluralGRAFMTFLNK", "Linked Metafiles") +#define STR_ObjNameSingulGRAFBMP NC_("STR_ObjNameSingulGRAFBMP", "Image") +#define STR_ObjNameSingulGRAFBMPTRANS NC_("STR_ObjNameSingulGRAFBMPTRANS", "Image with transparency") +#define STR_ObjNameSingulGRAFBMPLNK NC_("STR_ObjNameSingulGRAFBMPLNK", "Linked Image") +#define STR_ObjNameSingulGRAFBMPTRANSLNK NC_("STR_ObjNameSingulGRAFBMPTRANSLNK", "Linked image with transparency") +#define STR_ObjNamePluralGRAFBMP NC_("STR_ObjNamePluralGRAFBMP", "Images") +#define STR_ObjNamePluralGRAFBMPTRANS NC_("STR_ObjNamePluralGRAFBMPTRANS", "Images with transparency") +#define STR_ObjNamePluralGRAFBMPLNK NC_("STR_ObjNamePluralGRAFBMPLNK", "Linked images") +#define STR_ObjNamePluralGRAFBMPTRANSLNK NC_("STR_ObjNamePluralGRAFBMPTRANSLNK", "Linked images with transparency") +#define STR_ObjNameSingulCUSTOMSHAPE NC_("STR_ObjNameSingulCUSTOMSHAPE", "Shape") +#define STR_ObjNamePluralCUSTOMSHAPE NC_("STR_ObjNamePluralCUSTOMSHAPE", "Shapes") +#define STR_ObjNameSingulGRAFSVG NC_("STR_ObjNameSingulGRAFSVG", "SVG") +#define STR_ObjNamePluralGRAFSVG NC_("STR_ObjNamePluralGRAFSVG", "SVGs") +#define STR_ObjNameSingulGRAFWMF NC_("STR_ObjNameSingulGRAFWMF", "WMF") +#define STR_ObjNamePluralGRAFWMF NC_("STR_ObjNamePluralGRAFWMF", "WMFs") +#define STR_ObjNameSingulGRAFEMF NC_("STR_ObjNameSingulGRAFEMF", "EMF") +#define STR_ObjNamePluralGRAFEMF NC_("STR_ObjNamePluralGRAFEMF", "EMFs") +#define STR_ObjNameSingulOLE2 NC_("STR_ObjNameSingulOLE2", "embedded object (OLE)") +#define STR_ObjNamePluralOLE2 NC_("STR_ObjNamePluralOLE2", "Embedded objects (OLE)") +#define STR_ObjNameSingulUno NC_("STR_ObjNameSingulUno", "Control") +#define STR_ObjNamePluralUno NC_("STR_ObjNamePluralUno", "Controls") +#define STR_ObjNameSingulFrame NC_("STR_ObjNameSingulFrame", "Frame") +#define STR_ObjNamePluralFrame NC_("STR_ObjNamePluralFrame", "Frames") +#define STR_ObjNameSingulEDGE NC_("STR_ObjNameSingulEDGE", "Object Connectors") +#define STR_ObjNamePluralEDGE NC_("STR_ObjNamePluralEDGE", "Object Connectors") +#define STR_ObjNameSingulCAPTION NC_("STR_ObjNameSingulCAPTION", "Callout") +#define STR_ObjNamePluralCAPTION NC_("STR_ObjNamePluralCAPTION", "Callouts") +#define STR_ObjNameSingulPAGE NC_("STR_ObjNameSingulPAGE", "Preview object") +#define STR_ObjNamePluralPAGE NC_("STR_ObjNamePluralPAGE", "Preview objects") +#define STR_ObjNameSingulMEASURE NC_("STR_ObjNameSingulMEASURE", "Dimension line") +#define STR_ObjNamePluralMEASURE NC_("STR_ObjNamePluralMEASURE", "Dimensioning objects") +#define STR_ObjNamePlural NC_("STR_ObjNamePlural", "Drawing objects") +#define STR_ObjNameNoObj NC_("STR_ObjNameNoObj", "No draw object") +#define STR_ObjNameSingulPlural NC_("STR_ObjNameSingulPlural", "Draw object(s)") +#define STR_ObjNameSingulCube3d NC_("STR_ObjNameSingulCube3d", "3D cube") +#define STR_ObjNamePluralCube3d NC_("STR_ObjNamePluralCube3d", "3D cubes") +#define STR_ObjNameSingulExtrude3d NC_("STR_ObjNameSingulExtrude3d", "Extrusion object") +#define STR_ObjNamePluralExtrude3d NC_("STR_ObjNamePluralExtrude3d", "Extrusion objects") +#define STR_ObjNameSingulLathe3d NC_("STR_ObjNameSingulLathe3d", "Rotation object") +#define STR_ObjNamePluralLathe3d NC_("STR_ObjNamePluralLathe3d", "Rotation objects") +#define STR_ObjNameSingulObj3d NC_("STR_ObjNameSingulObj3d", "3D object") +#define STR_ObjNamePluralObj3d NC_("STR_ObjNamePluralObj3d", "3D objects") +#define STR_ObjNameSingulScene3d NC_("STR_ObjNameSingulScene3d", "3D scene") +#define STR_ObjNamePluralScene3d NC_("STR_ObjNamePluralScene3d", "3D scenes") +#define STR_ObjNameSingulSphere3d NC_("STR_ObjNameSingulSphere3d", "Sphere") +#define STR_ObjNamePluralSphere3d NC_("STR_ObjNamePluralSphere3d", "Spheres") +#define STR_EditWithCopy NC_("STR_EditWithCopy", "with copy") +#define STR_EditPosSize NC_("STR_EditPosSize", "Set position and size for %1") +#define STR_EditDelete NC_("STR_EditDelete", "Delete %1") +#define STR_EditMovToTop NC_("STR_EditMovToTop", "Move %1 forward") +#define STR_EditMovToBtm NC_("STR_EditMovToBtm", "Move %1 further back") +#define STR_EditPutToTop NC_("STR_EditPutToTop", "Move %1 to front") +#define STR_EditPutToBtm NC_("STR_EditPutToBtm", "Move %1 to back") +#define STR_EditRevOrder NC_("STR_EditRevOrder", "Reverse order of %1") +#define STR_EditMove NC_("STR_EditMove", "Move %1") +#define STR_EditResize NC_("STR_EditResize", "Resize %1") +#define STR_EditRotate NC_("STR_EditRotate", "Rotate %1") +#define STR_EditMirrorHori NC_("STR_EditMirrorHori", "Flip %1 horizontal") +#define STR_EditMirrorVert NC_("STR_EditMirrorVert", "Flip %1 vertical") +#define STR_EditMirrorDiag NC_("STR_EditMirrorDiag", "Flip %1 diagonal") +#define STR_EditMirrorFree NC_("STR_EditMirrorFree", "Flip %1 freehand") +#define STR_EditShear NC_("STR_EditShear", "Distort %1 (slant)") +#define STR_EditCrook NC_("STR_EditCrook", "Arrange %1 in circle") +#define STR_EditCrookContortion NC_("STR_EditCrookContortion", "Curve %1 in circle") +#define STR_EditDistort NC_("STR_EditDistort", "Distort %1") +#define STR_EditRipUp NC_("STR_EditRipUp", "Undo %1") +#define STR_EditSetPointsSmooth NC_("STR_EditSetPointsSmooth", "Modify bézier properties of %1") +#define STR_EditSetSegmentsKind NC_("STR_EditSetSegmentsKind", "Modify bézier properties of %1") +#define STR_EditSetGlueEscDir NC_("STR_EditSetGlueEscDir", "Set exit direction for %1") +#define STR_EditSetGluePercent NC_("STR_EditSetGluePercent", "Set relative attribute at %1") +#define STR_EditSetGlueAlign NC_("STR_EditSetGlueAlign", "Set reference point for %1") +#define STR_EditGroup NC_("STR_EditGroup", "Group %1") +#define STR_EditUngroup NC_("STR_EditUngroup", "Ungroup %1") +#define STR_EditSetAttributes NC_("STR_EditSetAttributes", "Apply attributes to %1") +#define STR_EditSetStylesheet NC_("STR_EditSetStylesheet", "Apply Styles to %1") +#define STR_EditDelStylesheet NC_("STR_EditDelStylesheet", "Remove Style from %1") +#define STR_EditConvToPoly NC_("STR_EditConvToPoly", "Convert %1 to polygon") +#define STR_EditConvToPolys NC_("STR_EditConvToPolys", "Convert %1 to polygons") +#define STR_EditConvToCurve NC_("STR_EditConvToCurve", "Convert %1 to curve") +#define STR_EditConvToCurves NC_("STR_EditConvToCurves", "Convert %1 to curves") +#define STR_EditConvToContour NC_("STR_EditConvToContour", "Convert %1 to contour") +#define STR_EditConvToContours NC_("STR_EditConvToContours", "Convert %1 to contours") +#define STR_EditAlign NC_("STR_EditAlign", "Align %1") +#define STR_EditAlignVTop NC_("STR_EditAlignVTop", "Align %1 to top") +#define STR_EditAlignVBottom NC_("STR_EditAlignVBottom", "Align %1 to bottom") +#define STR_EditAlignVCenter NC_("STR_EditAlignVCenter", "Horizontally center %1") +#define STR_EditAlignHLeft NC_("STR_EditAlignHLeft", "Align %1 to left") +#define STR_EditAlignHRight NC_("STR_EditAlignHRight", "Align %1 to right") +#define STR_EditAlignHCenter NC_("STR_EditAlignHCenter", "Vertically center %1") +#define STR_EditAlignCenter NC_("STR_EditAlignCenter", "Center %1") +#define STR_EditTransform NC_("STR_EditTransform", "Transform %1") +#define STR_EditCombine_PolyPoly NC_("STR_EditCombine_PolyPoly", "Combine %1") +#define STR_EditMergeMergePoly NC_("STR_EditMergeMergePoly", "Merge %1") +#define STR_EditMergeSubstractPoly NC_("STR_EditMergeSubstractPoly", "Subtract %1") +#define STR_EditMergeIntersectPoly NC_("STR_EditMergeIntersectPoly", "Intersect %1") +#define STR_DistributeMarkedObjects NC_("STR_DistributeMarkedObjects", "Distribute selected objects") +#define STR_EqualizeWidthMarkedObjects NC_("STR_EqualizeWidthMarkedObjects", "Equalize Width %1") +#define STR_EqualizeHeightMarkedObjects NC_("STR_EqualizeHeightMarkedObjects", "Equalize Height %1") +#define STR_EditCombine_OnePoly NC_("STR_EditCombine_OnePoly", "Combine %1") +#define STR_EditDismantle_Polys NC_("STR_EditDismantle_Polys", "Split %1") +#define STR_EditDismantle_Lines NC_("STR_EditDismantle_Lines", "Split %1") +#define STR_EditImportMtf NC_("STR_EditImportMtf", "Split %1") +#define STR_ExchangePaste NC_("STR_ExchangePaste", "Insert object(s)") +#define STR_DragInsertPoint NC_("STR_DragInsertPoint", "Insert point to %1") +#define STR_DragInsertGluePoint NC_("STR_DragInsertGluePoint", "Insert glue point to %1") +#define STR_DragMethMovHdl NC_("STR_DragMethMovHdl", "Move reference-point") +#define STR_DragMethObjOwn NC_("STR_DragMethObjOwn", "Geometrically change %1") +#define STR_DragMethMove NC_("STR_DragMethMove", "Move %1") +#define STR_DragMethResize NC_("STR_DragMethResize", "Resize %1") +#define STR_DragMethRotate NC_("STR_DragMethRotate", "Rotate %1") +#define STR_DragMethMirrorHori NC_("STR_DragMethMirrorHori", "Flip %1 horizontal") +#define STR_DragMethMirrorVert NC_("STR_DragMethMirrorVert", "Flip %1 vertical") +#define STR_DragMethMirrorDiag NC_("STR_DragMethMirrorDiag", "Flip %1 diagonal") +#define STR_DragMethMirrorFree NC_("STR_DragMethMirrorFree", "Flip %1 freehand") +#define STR_DragMethGradient NC_("STR_DragMethGradient", "Interactive gradient for %1") +#define STR_DragMethTransparence NC_("STR_DragMethTransparence", "Interactive transparency for %1") +#define STR_DragMethShear NC_("STR_DragMethShear", "Distort %1 (slant)") +#define STR_DragMethCrook NC_("STR_DragMethCrook", "Arrange %1 in circle") +#define STR_DragMethCrookContortion NC_("STR_DragMethCrookContortion", "Curve %1 in circle") +#define STR_DragMethDistort NC_("STR_DragMethDistort", "Distort %1") +#define STR_DragMethCrop NC_("STR_DragMethCrop", "Crop %1") +#define STR_DragRectEckRad NC_("STR_DragRectEckRad", "Alter radius by %1") +#define STR_DragPathObj NC_("STR_DragPathObj", "Change %1") +#define STR_DragRectResize NC_("STR_DragRectResize", "Resize %1") +#define STR_DragCaptFram NC_("STR_DragCaptFram", "Move %1") +#define STR_DragCaptTail NC_("STR_DragCaptTail", "Move end point of %1") +#define STR_DragCircAngle NC_("STR_DragCircAngle", "Adjust angle by %1") +#define STR_DragEdgeTail NC_("STR_DragEdgeTail", "Change %1") +#define STR_ViewTextEdit NC_("STR_ViewTextEdit", "TextEdit: Paragraph %1, Row %2, Column %3") +#define STR_ViewMarked NC_("STR_ViewMarked", "%1 selected") +#define STR_ViewMarkedPoint NC_("STR_ViewMarkedPoint", "Point from %1") +#define STR_ViewMarkedPoints NC_("STR_ViewMarkedPoints", "%2 points from %1") +#define STR_ViewMarkedGluePoint NC_("STR_ViewMarkedGluePoint", "Glue point from %1") +#define STR_ViewMarkedGluePoints NC_("STR_ViewMarkedGluePoints", "%2 glue points from %1") +#define STR_ViewMarkObjs NC_("STR_ViewMarkObjs", "Mark objects") +#define STR_ViewMarkMoreObjs NC_("STR_ViewMarkMoreObjs", "Mark additional objects") +#define STR_ViewMarkPoints NC_("STR_ViewMarkPoints", "Mark points") +#define STR_ViewMarkMorePoints NC_("STR_ViewMarkMorePoints", "Mark additional points") +#define STR_ViewMarkGluePoints NC_("STR_ViewMarkGluePoints", "Mark glue points") +#define STR_ViewMarkMoreGluePoints NC_("STR_ViewMarkMoreGluePoints", "Mark additional glue points") +#define STR_ViewCreateObj NC_("STR_ViewCreateObj", "Create %1") +#define STR_UndoInsertObj NC_("STR_UndoInsertObj", "Insert %1") +#define STR_UndoCopyObj NC_("STR_UndoCopyObj", "Copy %1") +#define STR_UndoObjOrdNum NC_("STR_UndoObjOrdNum", "Change object order of %1") +#define STR_UndoObjSetText NC_("STR_UndoObjSetText", "Edit text of %1") +#define STR_UndoNewPage NC_("STR_UndoNewPage", "Insert page") +#define STR_UndoDelPage NC_("STR_UndoDelPage", "Delete page") +#define STR_UndoCopPage NC_("STR_UndoCopPage", "Copy page") +#define STR_UndoMovPage NC_("STR_UndoMovPage", "Change order of pages") +#define STR_UndoDelPageMasterDscr NC_("STR_UndoDelPageMasterDscr", "Clear background page assignment") +#define STR_UndoChgPageMasterDscr NC_("STR_UndoChgPageMasterDscr", "Change background page assignment") +#define STR_UndoMergeModel NC_("STR_UndoMergeModel", "Insert document") +#define STR_UndoNewLayer NC_("STR_UndoNewLayer", "Insert Layer") +#define STR_UndoDelLayer NC_("STR_UndoDelLayer", "Delete layer") +#define STR_UndoMovLayer NC_("STR_UndoMovLayer", "Change order of layers") +// Undo/Redo for setting object's name (#i73249#) +#define STR_UndoObjName NC_("STR_UndoObjName", "Change object name of %1 to") +#define STR_UndoObjTitle NC_("STR_UndoObjTitle", "Change object title of %1") +#define STR_UndoObjDescription NC_("STR_UndoObjDescription", "Change object description of %1") +#define STR_StandardLayerName NC_("STR_StandardLayerName", "Standard") +#define STR_ItemValON NC_("STR_ItemValON", "on") +#define STR_ItemValOFF NC_("STR_ItemValOFF", "off") +#define STR_ItemValYES NC_("STR_ItemValYES", "yes") +#define STR_ItemValNO NC_("STR_ItemValNO", "No") +#define STR_ItemValCAPTIONTYPE1 NC_("STR_ItemValCAPTIONTYPE1", "Type 1") +#define STR_ItemValCAPTIONTYPE2 NC_("STR_ItemValCAPTIONTYPE2", "Type 2") +#define STR_ItemValCAPTIONTYPE3 NC_("STR_ItemValCAPTIONTYPE3", "Type 3") +#define STR_ItemValCAPTIONTYPE4 NC_("STR_ItemValCAPTIONTYPE4", "Type 4") +#define STR_ItemValCAPTIONESCHORI NC_("STR_ItemValCAPTIONESCHORI", "Horizontal") +#define STR_ItemValCAPTIONESCVERT NC_("STR_ItemValCAPTIONESCVERT", "Vertical") +#define STR_ItemValCAPTIONESCBESTFIT NC_("STR_ItemValCAPTIONESCBESTFIT", "Automatic") +#define STR_ItemValFITTOSIZENONE NC_("STR_ItemValFITTOSIZENONE", "Off") +#define STR_ItemValFITTOSIZEPROP NC_("STR_ItemValFITTOSIZEPROP", "Proportional") +#define STR_ItemValFITTOSIZEALLLINES NC_("STR_ItemValFITTOSIZEALLLINES", "Fit to size (all rows separately) ") +#define STR_ItemValFITTOSIZERESIZEAT NC_("STR_ItemValFITTOSIZERESIZEAT", "Use hard attributes") +#define STR_ItemValTEXTVADJTOP NC_("STR_ItemValTEXTVADJTOP", "Top") +#define STR_ItemValTEXTVADJCENTER NC_("STR_ItemValTEXTVADJCENTER", "Center") +#define STR_ItemValTEXTVADJBOTTOM NC_("STR_ItemValTEXTVADJBOTTOM", "Bottom") +#define STR_ItemValTEXTVADJBLOCK NC_("STR_ItemValTEXTVADJBLOCK", "Use entire height") +#define STR_ItemValTEXTVADJSTRETCH NC_("STR_ItemValTEXTVADJSTRETCH", "Stretched") +#define STR_ItemValTEXTHADJLEFT NC_("STR_ItemValTEXTHADJLEFT", "Left") +#define STR_ItemValTEXTHADJCENTER NC_("STR_ItemValTEXTHADJCENTER", "Center") +#define STR_ItemValTEXTHADJRIGHT NC_("STR_ItemValTEXTHADJRIGHT", "Right") +#define STR_ItemValTEXTHADJBLOCK NC_("STR_ItemValTEXTHADJBLOCK", "Use entire width") +#define STR_ItemValTEXTHADJSTRETCH NC_("STR_ItemValTEXTHADJSTRETCH", "Stretched") +#define STR_ItemValTEXTANI_NONE NC_("STR_ItemValTEXTANI_NONE", "off") +#define STR_ItemValTEXTANI_BLINK NC_("STR_ItemValTEXTANI_BLINK", "flash") +#define STR_ItemValTEXTANI_SCROLL NC_("STR_ItemValTEXTANI_SCROLL", "Scroll Through") +#define STR_ItemValTEXTANI_ALTERNATE NC_("STR_ItemValTEXTANI_ALTERNATE", "alternating") +#define STR_ItemValTEXTANI_SLIDE NC_("STR_ItemValTEXTANI_SLIDE", "Scroll In") +#define STR_ItemValTEXTANI_LEFT NC_("STR_ItemValTEXTANI_LEFT", "left") +#define STR_ItemValTEXTANI_UP NC_("STR_ItemValTEXTANI_UP", "up") +#define STR_ItemValTEXTANI_RIGHT NC_("STR_ItemValTEXTANI_RIGHT", "right") +#define STR_ItemValTEXTANI_DOWN NC_("STR_ItemValTEXTANI_DOWN", "down") +#define STR_ItemValEDGE_ORTHOLINES NC_("STR_ItemValEDGE_ORTHOLINES", "Standard Connector") +#define STR_ItemValEDGE_THREELINES NC_("STR_ItemValEDGE_THREELINES", "Line Connector") +#define STR_ItemValEDGE_ONELINE NC_("STR_ItemValEDGE_ONELINE", "Straight Connector") +#define STR_ItemValEDGE_BEZIER NC_("STR_ItemValEDGE_BEZIER", "Curved Connector") +#define STR_ItemValMEASURE_STD NC_("STR_ItemValMEASURE_STD", "Standard") +#define STR_ItemValMEASURE_RADIUS NC_("STR_ItemValMEASURE_RADIUS", "Radius") +#define STR_ItemValMEASURE_TEXTHAUTO NC_("STR_ItemValMEASURE_TEXTHAUTO", "automatic") +#define STR_ItemValMEASURE_TEXTLEFTOUTSIDE NC_("STR_ItemValMEASURE_TEXTLEFTOUTSIDE", "left outside") +#define STR_ItemValMEASURE_TEXTINSIDE NC_("STR_ItemValMEASURE_TEXTINSIDE", "inside (centered)") +#define STR_ItemValMEASURE_TEXTRIGHTOUTSID NC_("STR_ItemValMEASURE_TEXTRIGHTOUTSID", "right outside") +#define STR_ItemValMEASURE_TEXTVAUTO NC_("STR_ItemValMEASURE_TEXTVAUTO", "automatic") +#define STR_ItemValMEASURE_ABOVE NC_("STR_ItemValMEASURE_ABOVE", "on the line") +#define STR_ItemValMEASURETEXT_BREAKEDLINE NC_("STR_ItemValMEASURETEXT_BREAKEDLINE", "broken line") +#define STR_ItemValMEASURE_BELOW NC_("STR_ItemValMEASURE_BELOW", "below the line") +#define STR_ItemValMEASURETEXT_VERTICALCEN NC_("STR_ItemValMEASURETEXT_VERTICALCEN", "centered") +#define STR_ItemValCIRC_FULL NC_("STR_ItemValCIRC_FULL", "full circle") +#define STR_ItemValCIRC_SECT NC_("STR_ItemValCIRC_SECT", "Circle Pie") +#define STR_ItemValCIRC_CUT NC_("STR_ItemValCIRC_CUT", "Circle segment") +#define STR_ItemValCIRC_ARC NC_("STR_ItemValCIRC_ARC", "Arc") +// Strings for the templates dialog +#define SIP_UNKNOWN_ATTR NC_("SIP_UNKNOWN_ATTR", "Unknown attribute") +// Strings for the templates dialog +#define SIP_XA_LINESTYLE NC_("SIP_XA_LINESTYLE", "Line style") +#define SIP_XA_LINEDASH NC_("SIP_XA_LINEDASH", "Line pattern") +#define SIP_XA_LINEWIDTH NC_("SIP_XA_LINEWIDTH", "Line width") +#define SIP_XA_LINECOLOR NC_("SIP_XA_LINECOLOR", "Line color") +#define SIP_XA_LINESTART NC_("SIP_XA_LINESTART", "Line head") +#define SIP_XA_LINEEND NC_("SIP_XA_LINEEND", "Line end") +#define SIP_XA_LINESTARTWIDTH NC_("SIP_XA_LINESTARTWIDTH", "Line head width") +#define SIP_XA_LINEENDWIDTH NC_("SIP_XA_LINEENDWIDTH", "Line end width") +#define SIP_XA_LINESTARTCENTER NC_("SIP_XA_LINESTARTCENTER", "Center arrowhead") +#define SIP_XA_LINEENDCENTER NC_("SIP_XA_LINEENDCENTER", "Center arrowend") +#define SIP_XA_LINETRANSPARENCE NC_("SIP_XA_LINETRANSPARENCE", "Line transparency") +#define SIP_XA_LINEJOINT NC_("SIP_XA_LINEJOINT", "Line joint") +#define SIP_XATTRSET_LINE NC_("SIP_XATTRSET_LINE", "Line attributes") +#define SIP_XA_FILLSTYLE NC_("SIP_XA_FILLSTYLE", "Fill style") +#define SIP_XA_FILLCOLOR NC_("SIP_XA_FILLCOLOR", "Fillcolor") +#define SIP_XA_FILLGRADIENT NC_("SIP_XA_FILLGRADIENT", "Gradient") +#define SIP_XA_FILLHATCH NC_("SIP_XA_FILLHATCH", "Hatching") +#define SIP_XA_FILLBITMAP NC_("SIP_XA_FILLBITMAP", "Fillbitmap") +#define SIP_XA_FILLTRANSPARENCE NC_("SIP_XA_FILLTRANSPARENCE", "Transparency") +#define SIP_XA_GRADIENTSTEPCOUNT NC_("SIP_XA_GRADIENTSTEPCOUNT", "Number of gradient steps") +#define SIP_XA_FILLBMP_TILE NC_("SIP_XA_FILLBMP_TILE", "Tile fill") +#define SIP_XA_FILLBMP_POS NC_("SIP_XA_FILLBMP_POS", "Fillbitmap position") +#define SIP_XA_FILLBMP_SIZEX NC_("SIP_XA_FILLBMP_SIZEX", "Fillbitmap width") +#define SIP_XA_FILLBMP_SIZEY NC_("SIP_XA_FILLBMP_SIZEY", "Height of fillbitmap") +#define SIP_XA_FILLFLOATTRANSPARENCE NC_("SIP_XA_FILLFLOATTRANSPARENCE", "Transparent gradient") +#define SIP_XA_SECONDARYFILLCOLOR NC_("SIP_XA_SECONDARYFILLCOLOR", "Fill reserved for 2") +#define SIP_XA_FILLBMP_SIZELOG NC_("SIP_XA_FILLBMP_SIZELOG", "Tile size not in %") +#define SIP_XA_FILLBMP_TILEOFFSETX NC_("SIP_XA_FILLBMP_TILEOFFSETX", "Tile offset X in %") +#define SIP_XA_FILLBMP_TILEOFFSETY NC_("SIP_XA_FILLBMP_TILEOFFSETY", "Tile offset Y in %") +#define SIP_XA_FILLBMP_STRETCH NC_("SIP_XA_FILLBMP_STRETCH", "Bitmap scaling") +#define SIP_XA_FILLBMP_POSOFFSETX NC_("SIP_XA_FILLBMP_POSOFFSETX", "Tile position X in %") +#define SIP_XA_FILLBMP_POSOFFSETY NC_("SIP_XA_FILLBMP_POSOFFSETY", "Tile position Y in %") +#define SIP_XA_FILLBACKGROUND NC_("SIP_XA_FILLBACKGROUND", "Background fill") +#define SIP_XATTRSET_FILL NC_("SIP_XATTRSET_FILL", "Area attributes") +#define SIP_XA_FORMTXTSTYLE NC_("SIP_XA_FORMTXTSTYLE", "Fontwork style") +#define SIP_XA_FORMTXTADJUST NC_("SIP_XA_FORMTXTADJUST", "Fontwork alignment") +#define SIP_XA_FORMTXTDISTANCE NC_("SIP_XA_FORMTXTDISTANCE", "Fontwork spacing") +#define SIP_XA_FORMTXTSTART NC_("SIP_XA_FORMTXTSTART", "Fontwork font begin") +#define SIP_XA_FORMTXTMIRROR NC_("SIP_XA_FORMTXTMIRROR", "Fontwork mirror") +#define SIP_XA_FORMTXTOUTLINE NC_("SIP_XA_FORMTXTOUTLINE", "Fontwork outline") +#define SIP_XA_FORMTXTSHADOW NC_("SIP_XA_FORMTXTSHADOW", "Fontwork shadow") +#define SIP_XA_FORMTXTSHDWCOLOR NC_("SIP_XA_FORMTXTSHDWCOLOR", "Fontwork shadow color") +#define SIP_XA_FORMTXTSHDWXVAL NC_("SIP_XA_FORMTXTSHDWXVAL", "Fontwork shadow offset X") +#define SIP_XA_FORMTXTSHDWYVAL NC_("SIP_XA_FORMTXTSHDWYVAL", "Fontwork shadow offset Y") +#define SIP_XA_FORMTXTHIDEFORM NC_("SIP_XA_FORMTXTHIDEFORM", "Hide fontwork outline") +#define SIP_XA_FORMTXTSHDWTRANSP NC_("SIP_XA_FORMTXTSHDWTRANSP", "Fontwork shadow transparency") +#define SIP_SA_SHADOW NC_("SIP_SA_SHADOW", "Shadow") +#define SIP_SA_SHADOWCOLOR NC_("SIP_SA_SHADOWCOLOR", "Shadow color") +#define SIP_SA_SHADOWXDIST NC_("SIP_SA_SHADOWXDIST", "Shadow spacing X") +#define SIP_SA_SHADOWYDIST NC_("SIP_SA_SHADOWYDIST", "Shadow spacing Y") +#define SIP_SA_SHADOWTRANSPARENCE NC_("SIP_SA_SHADOWTRANSPARENCE", "Shadow transparency") +#define SIP_SA_SHADOW3D NC_("SIP_SA_SHADOW3D", "3D shadow") +#define SIP_SA_SHADOWPERSP NC_("SIP_SA_SHADOWPERSP", "Perspective shadow") +#define SIP_SA_CAPTIONTYPE NC_("SIP_SA_CAPTIONTYPE", "Type of legend") +#define SIP_SA_CAPTIONFIXEDANGLE NC_("SIP_SA_CAPTIONFIXEDANGLE", "Fixed legend angle") +#define SIP_SA_CAPTIONANGLE NC_("SIP_SA_CAPTIONANGLE", "Legend angle") +#define SIP_SA_CAPTIONGAP NC_("SIP_SA_CAPTIONGAP", "Legend lines spacing") +#define SIP_SA_CAPTIONESCDIR NC_("SIP_SA_CAPTIONESCDIR", "Legend exit alignment") +#define SIP_SA_CAPTIONESCISREL NC_("SIP_SA_CAPTIONESCISREL", "Relative exit legend") +#define SIP_SA_CAPTIONESCREL NC_("SIP_SA_CAPTIONESCREL", "Relative exit legend") +#define SIP_SA_CAPTIONESCABS NC_("SIP_SA_CAPTIONESCABS", "Absolute exit of legend") +#define SIP_SA_CAPTIONLINELEN NC_("SIP_SA_CAPTIONLINELEN", "Legend line length") +#define SIP_SA_CAPTIONFITLINELEN NC_("SIP_SA_CAPTIONFITLINELEN", "AutoLength of legend lines") +#define SIP_SA_ECKENRADIUS NC_("SIP_SA_ECKENRADIUS", "Corner radius") +#define SIP_SA_TEXT_MINFRAMEHEIGHT NC_("SIP_SA_TEXT_MINFRAMEHEIGHT", "Minimal frame height") +#define SIP_SA_TEXT_AUTOGROWHEIGHT NC_("SIP_SA_TEXT_AUTOGROWHEIGHT", "AutoFit height") +#define SIP_SA_TEXT_FITTOSIZE NC_("SIP_SA_TEXT_FITTOSIZE", "Fit text to frame") +#define SIP_SA_TEXT_LEFTDIST NC_("SIP_SA_TEXT_LEFTDIST", "Left text frame spacing") +#define SIP_SA_TEXT_RIGHTDIST NC_("SIP_SA_TEXT_RIGHTDIST", "Right text frame spacing") +#define SIP_SA_TEXT_UPPERDIST NC_("SIP_SA_TEXT_UPPERDIST", "Upper text frame spacing") +#define SIP_SA_TEXT_LOWERDIST NC_("SIP_SA_TEXT_LOWERDIST", "Lower text frame spacing") +#define SIP_SA_TEXT_VERTADJUST NC_("SIP_SA_TEXT_VERTADJUST", "Vertical text anchor") +#define SIP_SA_TEXT_MAXFRAMEHEIGHT NC_("SIP_SA_TEXT_MAXFRAMEHEIGHT", "Maximal frame height") +#define SIP_SA_TEXT_MINFRAMEWIDTH NC_("SIP_SA_TEXT_MINFRAMEWIDTH", "Minimal frame width") +#define SIP_SA_TEXT_MAXFRAMEWIDTH NC_("SIP_SA_TEXT_MAXFRAMEWIDTH", "Maximal frame width") +#define SIP_SA_TEXT_AUTOGROWWIDTH NC_("SIP_SA_TEXT_AUTOGROWWIDTH", "AutoFit width") +#define SIP_SA_TEXT_HORZADJUST NC_("SIP_SA_TEXT_HORZADJUST", "Horizontal text anchor") +#define SIP_SA_TEXT_ANIKIND NC_("SIP_SA_TEXT_ANIKIND", "Ticker") +#define SIP_SA_TEXT_ANIDIRECTION NC_("SIP_SA_TEXT_ANIDIRECTION", "Ticker direction") +#define SIP_SA_TEXT_ANISTARTINSIDE NC_("SIP_SA_TEXT_ANISTARTINSIDE", "Ticker start inside") +#define SIP_SA_TEXT_ANISTOPINSIDE NC_("SIP_SA_TEXT_ANISTOPINSIDE", "Ticker stop inside") +#define SIP_SA_TEXT_ANICOUNT NC_("SIP_SA_TEXT_ANICOUNT", "Number of ticker runs") +#define SIP_SA_TEXT_ANIDELAY NC_("SIP_SA_TEXT_ANIDELAY", "Speed of ticker") +#define SIP_SA_TEXT_ANIAMOUNT NC_("SIP_SA_TEXT_ANIAMOUNT", "Ticker step size") +#define SIP_SA_TEXT_CONTOURFRAME NC_("SIP_SA_TEXT_CONTOURFRAME", "Outline text flow") +#define SIP_SA_CUSTOMSHAPE_ADJUSTMENT NC_("SIP_SA_CUSTOMSHAPE_ADJUSTMENT", "Shape Adjustment") +#define SIP_SA_XMLATTRIBUTES NC_("SIP_SA_XMLATTRIBUTES", "User-defined attributes") +#define SIP_SA_TEXT_USEFIXEDCELLHEIGHT NC_("SIP_SA_TEXT_USEFIXEDCELLHEIGHT", "Use font-independent line spacing") +#define SIP_SA_WORDWRAP NC_("SIP_SA_WORDWRAP", "Word wrap text in shape") +#define SIP_SA_CHAINNEXTNAME NC_("SIP_SA_CHAINNEXTNAME", "Next link in text chain") +#define SIP_SA_EDGEKIND NC_("SIP_SA_EDGEKIND", "Type of connector") +#define SIP_SA_EDGENODE1HORZDIST NC_("SIP_SA_EDGENODE1HORZDIST", "Horz. spacing object 1") +#define SIP_SA_EDGENODE1VERTDIST NC_("SIP_SA_EDGENODE1VERTDIST", "Vert. spacing object 1") +#define SIP_SA_EDGENODE2HORZDIST NC_("SIP_SA_EDGENODE2HORZDIST", "Horz. spacing object 2") +#define SIP_SA_EDGENODE2VERTDIST NC_("SIP_SA_EDGENODE2VERTDIST", "Vert. spacing object 2") +#define SIP_SA_EDGENODE1GLUEDIST NC_("SIP_SA_EDGENODE1GLUEDIST", "Glue spacing object 1") +#define SIP_SA_EDGENODE2GLUEDIST NC_("SIP_SA_EDGENODE2GLUEDIST", "Glue spacing object 2") +#define SIP_SA_EDGELINEDELTAANZ NC_("SIP_SA_EDGELINEDELTAANZ", "Number of movable lines") +#define SIP_SA_EDGELINE1DELTA NC_("SIP_SA_EDGELINE1DELTA", "Offset line 1") +#define SIP_SA_EDGELINE2DELTA NC_("SIP_SA_EDGELINE2DELTA", "Offset line 2") +#define SIP_SA_EDGELINE3DELTA NC_("SIP_SA_EDGELINE3DELTA", "Offset line 3") +#define SIP_SA_MEASUREKIND NC_("SIP_SA_MEASUREKIND", "Type of dimensioning") +#define SIP_SA_MEASURETEXTHPOS NC_("SIP_SA_MEASURETEXTHPOS", "Dimension value - horizontal position") +#define SIP_SA_MEASURETEXTVPOS NC_("SIP_SA_MEASURETEXTVPOS", "Dimension value - vertical position") +#define SIP_SA_MEASURELINEDIST NC_("SIP_SA_MEASURELINEDIST", "Dimension line space") +#define SIP_SA_MEASUREHELPLINEOVERHANG NC_("SIP_SA_MEASUREHELPLINEOVERHANG", "Dimension help line overhang") +#define SIP_SA_MEASUREHELPLINEDIST NC_("SIP_SA_MEASUREHELPLINEDIST", "Dimension help line spacing") +#define SIP_SA_MEASUREHELPLINE1LEN NC_("SIP_SA_MEASUREHELPLINE1LEN", "Backlog of dimension help line 1") +#define SIP_SA_MEASUREHELPLINE2LEN NC_("SIP_SA_MEASUREHELPLINE2LEN", "Backlog of dimension help line 2") +#define SIP_SA_MEASUREBELOWREFEDGE NC_("SIP_SA_MEASUREBELOWREFEDGE", "Lower edge dimensioning") +#define SIP_SA_MEASURETEXTROTA90 NC_("SIP_SA_MEASURETEXTROTA90", "Dimension value across dimension line") +#define SIP_SA_MEASURETEXTUPSIDEDOWN NC_("SIP_SA_MEASURETEXTUPSIDEDOWN", "Rotate dimension value by 180 degree") +#define SIP_SA_MEASUREOVERHANG NC_("SIP_SA_MEASUREOVERHANG", "Dimension line overhang") +#define SIP_SA_MEASUREUNIT NC_("SIP_SA_MEASUREUNIT", "Measure unit") +#define SIP_SA_MEASURESCALE NC_("SIP_SA_MEASURESCALE", "Additional scale factor") +#define SIP_SA_MEASURESHOWUNIT NC_("SIP_SA_MEASURESHOWUNIT", "Measure unit display") +#define SIP_SA_MEASUREFORMATSTRING NC_("SIP_SA_MEASUREFORMATSTRING", "Dimension value format") +#define SIP_SA_MEASURETEXTAUTOANGLE NC_("SIP_SA_MEASURETEXTAUTOANGLE", "AutoPositioning of the dimension value") +#define SIP_SA_MEASURETEXTAUTOANGLEVIEW NC_("SIP_SA_MEASURETEXTAUTOANGLEVIEW", "Angle for the automatic positioning of the dimension value") +#define SIP_SA_MEASURETEXTISFIXEDANGLE NC_("SIP_SA_MEASURETEXTISFIXEDANGLE", "Determination of the dimension value angle") +#define SIP_SA_MEASURETEXTFIXEDANGLE NC_("SIP_SA_MEASURETEXTFIXEDANGLE", "Angle of the dimension value") +#define SIP_SA_MEASUREDECIMALPLACES NC_("SIP_SA_MEASUREDECIMALPLACES", "Decimal places") +#define SIP_SA_CIRCKIND NC_("SIP_SA_CIRCKIND", "Type of circle") +#define SIP_SA_CIRCSTARTANGLE NC_("SIP_SA_CIRCSTARTANGLE", "Start angle") +#define SIP_SA_CIRCENDANGLE NC_("SIP_SA_CIRCENDANGLE", "End angle") +#define SIP_SA_OBJMOVEPROTECT NC_("SIP_SA_OBJMOVEPROTECT", "Protected object position") +#define SIP_SA_OBJSIZEPROTECT NC_("SIP_SA_OBJSIZEPROTECT", "Protected object size") +#define SIP_SA_OBJPRINTABLE NC_("SIP_SA_OBJPRINTABLE", "Object, printable") +#define SIP_SA_OBJVISIBLE NC_("SIP_SA_OBJVISIBLE", "Object, visible") +#define SIP_SA_LAYERID NC_("SIP_SA_LAYERID", "Level ID") +#define SIP_SA_LAYERNAME NC_("SIP_SA_LAYERNAME", "Layer") +#define SIP_SA_OBJECTNAME NC_("SIP_SA_OBJECTNAME", "Object name") +#define SIP_SA_ALLPOSITIONX NC_("SIP_SA_ALLPOSITIONX", "Position X, complete") +#define SIP_SA_ALLPOSITIONY NC_("SIP_SA_ALLPOSITIONY", "Position Y, complete") +#define SIP_SA_ALLSIZEWIDTH NC_("SIP_SA_ALLSIZEWIDTH", "Total Width") +#define SIP_SA_ALLSIZEHEIGHT NC_("SIP_SA_ALLSIZEHEIGHT", "Height, complete") +#define SIP_SA_ONEPOSITIONX NC_("SIP_SA_ONEPOSITIONX", "Single position X") +#define SIP_SA_ONEPOSITIONY NC_("SIP_SA_ONEPOSITIONY", "Single position Y") +#define SIP_SA_ONESIZEWIDTH NC_("SIP_SA_ONESIZEWIDTH", "Single width") +#define SIP_SA_ONESIZEHEIGHT NC_("SIP_SA_ONESIZEHEIGHT", "Single height") +#define SIP_SA_LOGICSIZEWIDTH NC_("SIP_SA_LOGICSIZEWIDTH", "Logical width") +#define SIP_SA_LOGICSIZEHEIGHT NC_("SIP_SA_LOGICSIZEHEIGHT", "Logical height") +#define SIP_SA_ROTATEANGLE NC_("SIP_SA_ROTATEANGLE", "Single rotation angle") +#define SIP_SA_SHEARANGLE NC_("SIP_SA_SHEARANGLE", "Single shear angle") +#define SIP_SA_MOVEX NC_("SIP_SA_MOVEX", "Move horizontally") +#define SIP_SA_MOVEY NC_("SIP_SA_MOVEY", "Move vertically") +#define SIP_SA_RESIZEXONE NC_("SIP_SA_RESIZEXONE", "Resize X, single") +#define SIP_SA_RESIZEYONE NC_("SIP_SA_RESIZEYONE", "Resize Y, single") +#define SIP_SA_ROTATEONE NC_("SIP_SA_ROTATEONE", "Single rotation") +#define SIP_SA_HORZSHEARONE NC_("SIP_SA_HORZSHEARONE", "Single horizontal shear") +#define SIP_SA_VERTSHEARONE NC_("SIP_SA_VERTSHEARONE", "Single vertical shear") +#define SIP_SA_RESIZEXALL NC_("SIP_SA_RESIZEXALL", "Resize X, complete") +#define SIP_SA_RESIZEYALL NC_("SIP_SA_RESIZEYALL", "Resize Y, complete") +#define SIP_SA_ROTATEALL NC_("SIP_SA_ROTATEALL", "Rotate all") +#define SIP_SA_HORZSHEARALL NC_("SIP_SA_HORZSHEARALL", "Shear horizontal, complete") +#define SIP_SA_VERTSHEARALL NC_("SIP_SA_VERTSHEARALL", "Shear vertical, complete") +#define SIP_SA_TRANSFORMREF1X NC_("SIP_SA_TRANSFORMREF1X", "Reference point 1 X") +#define SIP_SA_TRANSFORMREF1Y NC_("SIP_SA_TRANSFORMREF1Y", "Reference point 1 Y") +#define SIP_SA_TRANSFORMREF2X NC_("SIP_SA_TRANSFORMREF2X", "Reference point 2 X") +#define SIP_SA_TRANSFORMREF2Y NC_("SIP_SA_TRANSFORMREF2Y", "Reference point 2 Y") +#define SIP_EE_PARA_HYPHENATE NC_("SIP_EE_PARA_HYPHENATE", "Hyphenation") +#define SIP_EE_PARA_BULLETSTATE NC_("SIP_EE_PARA_BULLETSTATE", "Display bullets") +#define SIP_EE_PARA_OUTLLRSPACE NC_("SIP_EE_PARA_OUTLLRSPACE", "Numbering indents") +#define SIP_EE_PARA_OUTLLEVEL NC_("SIP_EE_PARA_OUTLLEVEL", "Numbering level") +#define SIP_EE_PARA_BULLET NC_("SIP_EE_PARA_BULLET", "Bullets and Numberings") +#define SIP_EE_PARA_LRSPACE NC_("SIP_EE_PARA_LRSPACE", "Indents") +#define SIP_EE_PARA_ULSPACE NC_("SIP_EE_PARA_ULSPACE", "Paragraph spacing") +#define SIP_EE_PARA_SBL NC_("SIP_EE_PARA_SBL", "Line spacing") +#define SIP_EE_PARA_JUST NC_("SIP_EE_PARA_JUST", "Paragraph alignment") +#define SIP_EE_PARA_TABS NC_("SIP_EE_PARA_TABS", "Tabulators") +#define SIP_EE_CHAR_COLOR NC_("SIP_EE_CHAR_COLOR", "Font color") +#define SIP_EE_CHAR_FONTINFO NC_("SIP_EE_CHAR_FONTINFO", "Character set") +#define SIP_EE_CHAR_FONTHEIGHT NC_("SIP_EE_CHAR_FONTHEIGHT", "Font size") +#define SIP_EE_CHAR_FONTWIDTH NC_("SIP_EE_CHAR_FONTWIDTH", "Font width") +#define SIP_EE_CHAR_WEIGHT NC_("SIP_EE_CHAR_WEIGHT", "Bold (thickness)") +#define SIP_EE_CHAR_UNDERLINE NC_("SIP_EE_CHAR_UNDERLINE", "Underline") +#define SIP_EE_CHAR_OVERLINE NC_("SIP_EE_CHAR_OVERLINE", "Overline") +#define SIP_EE_CHAR_STRIKEOUT NC_("SIP_EE_CHAR_STRIKEOUT", "Strikethrough") +#define SIP_EE_CHAR_ITALIC NC_("SIP_EE_CHAR_ITALIC", "Italic") +#define SIP_EE_CHAR_OUTLINE NC_("SIP_EE_CHAR_OUTLINE", "Outline") +#define SIP_EE_CHAR_SHADOW NC_("SIP_EE_CHAR_SHADOW", "Font shadow") +#define SIP_EE_CHAR_ESCAPEMENT NC_("SIP_EE_CHAR_ESCAPEMENT", "Superscript/subscript") +#define SIP_EE_CHAR_PAIRKERNING NC_("SIP_EE_CHAR_PAIRKERNING", "Kerning") +#define SIP_EE_CHAR_KERNING NC_("SIP_EE_CHAR_KERNING", "Manual kerning") +#define SIP_EE_CHAR_WLM NC_("SIP_EE_CHAR_WLM", "No underline for spaces") +#define SIP_EE_FEATURE_TAB NC_("SIP_EE_FEATURE_TAB", "Tabulator") +#define SIP_EE_FEATURE_LINEBR NC_("SIP_EE_FEATURE_LINEBR", "Optional line break") +#define SIP_EE_FEATURE_NOTCONV NC_("SIP_EE_FEATURE_NOTCONV", "Non-convertible character") +#define SIP_EE_FEATURE_FIELD NC_("SIP_EE_FEATURE_FIELD", "Fields") +#define SIP_SA_GRAFRED NC_("SIP_SA_GRAFRED", "Red") +#define SIP_SA_GRAFGREEN NC_("SIP_SA_GRAFGREEN", "Green") +#define SIP_SA_GRAFBLUE NC_("SIP_SA_GRAFBLUE", "Blue") +#define SIP_SA_GRAFLUMINANCE NC_("SIP_SA_GRAFLUMINANCE", "Brightness") +#define SIP_SA_GRAFCONTRAST NC_("SIP_SA_GRAFCONTRAST", "Contrast") +#define SIP_SA_GRAFGAMMA NC_("SIP_SA_GRAFGAMMA", "Gamma") +#define SIP_SA_GRAFTRANSPARENCE NC_("SIP_SA_GRAFTRANSPARENCE", "Transparency") +#define SIP_SA_GRAFINVERT NC_("SIP_SA_GRAFINVERT", "Invert") +#define SIP_SA_GRAFMODE NC_("SIP_SA_GRAFMODE", "Image mode") +#define SIP_SA_GRAFCROP NC_("SIP_SA_GRAFCROP", "Crop") +#define STR_ObjNameSingulMEDIA NC_("STR_ObjNameSingulMEDIA", "Media object") +#define STR_ObjNamePluralMEDIA NC_("STR_ObjNamePluralMEDIA", "Media objects") +// drawing layer table strings +#define STR_TABLE_INSCOL NC_("STR_TABLE_INSCOL", "Insert column") +#define STR_TABLE_INSROW NC_("STR_TABLE_INSROW", "Insert row") +#define STR_UNDO_COL_DELETE NC_("STR_UNDO_COL_DELETE", "Delete column") +#define STR_UNDO_ROW_DELETE NC_("STR_UNDO_ROW_DELETE", "Delete row") +#define STR_TABLE_SPLIT NC_("STR_TABLE_SPLIT", "Split cells") +#define STR_TABLE_MERGE NC_("STR_TABLE_MERGE", "Merge cells") +#define STR_TABLE_NUMFORMAT NC_("STR_TABLE_NUMFORMAT", "Format cell") +#define STR_TABLE_DISTRIBUTE_ROWS NC_("STR_TABLE_DISTRIBUTE_ROWS", "Distribute rows") +#define STR_TABLE_DISTRIBUTE_COLUMNS NC_("STR_TABLE_DISTRIBUTE_COLUMNS", "Distribute columns") +#define STR_TABLE_DELETE_CELL_CONTENTS NC_("STR_TABLE_DELETE_CELL_CONTENTS", "Delete cell contents") +#define STR_TABLE_STYLE NC_("STR_TABLE_STYLE", "Table style") +#define STR_TABLE_STYLE_SETTINGS NC_("STR_TABLE_STYLE_SETTINGS", "Table style settings") +#define STR_ObjNameSingulTable NC_("STR_ObjNameSingulTable", "Table") +#define STR_ObjNamePluralTable NC_("STR_ObjNamePluralTable", "Tables") +#define STR_ObjNameSingulFONTWORK NC_("STR_ObjNameSingulFONTWORK", "Font work") +// Strings for the Draw-Dialog -------------------------------------------- +#define RID_SVXSTR_SOLID NC_("RID_SVXSTR_SOLID", "Continuous") +#define RID_SVXSTR_GRADIENT NC_("RID_SVXSTR_GRADIENT", "Gradient") +#define RID_SVXSTR_BITMAP NC_("RID_SVXSTR_BITMAP", "Bitmap") +#define RID_SVXSTR_PATTERN NC_("RID_SVXSTR_PATTERN", "Pattern") +#define RID_SVXSTR_PATTERN_UNTITLED NC_("RID_SVXSTR_PATTERN_UNTITLED", "Untitled Pattern") +#define RID_SVXSTR_LINESTYLE NC_("RID_SVXSTR_LINESTYLE", "Line Style") +#define RID_SVXSTR_INVISIBLE NC_("RID_SVXSTR_INVISIBLE", "None") +#define RID_SVXSTR_COLOR NC_("RID_SVXSTR_COLOR", "Color") +#define RID_SVXSTR_HATCH NC_("RID_SVXSTR_HATCH", "Hatching") +#define RID_SVXSTR_LINEEND NC_("RID_SVXSTR_LINEEND", "Arrowheads") +#define RID_SVXSTR_COLOR_BLACK NC_("RID_SVXSTR_COLOR_BLACK", "Black") +#define RID_SVXSTR_COLOR_BLUE NC_("RID_SVXSTR_COLOR_BLUE", "Blue") +#define RID_SVXSTR_COLOR_GREEN NC_("RID_SVXSTR_COLOR_GREEN", "Green") +#define RID_SVXSTR_COLOR_CYAN NC_("RID_SVXSTR_COLOR_CYAN", "Cyan") +#define RID_SVXSTR_COLOR_RED NC_("RID_SVXSTR_COLOR_RED", "Red") +#define RID_SVXSTR_COLOR_MAGENTA NC_("RID_SVXSTR_COLOR_MAGENTA", "Magenta") +#define RID_SVXSTR_COLOR_GREY NC_("RID_SVXSTR_COLOR_GREY", "Gray") +#define RID_SVXSTR_COLOR_YELLOW NC_("RID_SVXSTR_COLOR_YELLOW", "Yellow") +#define RID_SVXSTR_COLOR_WHITE NC_("RID_SVXSTR_COLOR_WHITE", "White") +#define RID_SVXSTR_COLOR_BLUEGREY NC_("RID_SVXSTR_COLOR_BLUEGREY", "Blue gray") +/* Old default color Blue9, probably often u sed in saved files */ +#define RID_SVXSTR_COLOR_BLUE_CLASSIC NC_("RID_SVXSTR_COLOR_BLUE_CLASSIC", "Blue classic") +#define RID_SVXSTR_COLOR_ORANGE NC_("RID_SVXSTR_COLOR_ORANGE", "Orange") +#define RID_SVXSTR_ARROW NC_("RID_SVXSTR_ARROW", "Arrow") +#define RID_SVXSTR_SQUARE NC_("RID_SVXSTR_SQUARE", "Square") +#define RID_SVXSTR_CIRCLE NC_("RID_SVXSTR_CIRCLE", "Circle") +#define RID_SVXSTR_NONE NC_("RID_SVXSTR_NONE", "- none -") +#define RID_SVXSTR_TRANSPARENCE NC_("RID_SVXSTR_TRANSPARENCE", "Transparency") +#define RID_SVXSTR_CENTERED NC_("RID_SVXSTR_CENTERED", "Centered") +#define RID_SVXSTR_NOTCENTERED NC_("RID_SVXSTR_NOTCENTERED", "Not centered") +#define RID_SVXSTR_GRAFMODE_STANDARD NC_("RID_SVXSTR_GRAFMODE_STANDARD", "Default") +#define RID_SVXSTR_GRAFMODE_GREYS NC_("RID_SVXSTR_GRAFMODE_GREYS", "Grayscale") +#define RID_SVXSTR_GRAFMODE_MONO NC_("RID_SVXSTR_GRAFMODE_MONO", "Black/White") +#define RID_SVXSTR_GRAFMODE_WATERMARK NC_("RID_SVXSTR_GRAFMODE_WATERMARK", "Watermark") +// BM: some additional standard colors +#define RID_SVXSTR_COLOR_VIOLET NC_("RID_SVXSTR_COLOR_VIOLET", "Violet") +#define RID_SVXSTR_COLOR_BORDEAUX NC_("RID_SVXSTR_COLOR_BORDEAUX", "Bordeaux") +#define RID_SVXSTR_COLOR_PALE_YELLOW NC_("RID_SVXSTR_COLOR_PALE_YELLOW", "Pale yellow") +#define RID_SVXSTR_COLOR_PALE_GREEN NC_("RID_SVXSTR_COLOR_PALE_GREEN", "Pale green") +#define RID_SVXSTR_COLOR_DARKVIOLET NC_("RID_SVXSTR_COLOR_DARKVIOLET", "Dark violet") +#define RID_SVXSTR_COLOR_SALMON NC_("RID_SVXSTR_COLOR_SALMON", "Salmon") +#define RID_SVXSTR_COLOR_SEABLUE NC_("RID_SVXSTR_COLOR_SEABLUE", "Sea blue") +#define RID_SVXSTR_COLOR_CHART NC_("RID_SVXSTR_COLOR_CHART", "Chart") +#define RID_SVXSTR_COLOR_PURPLE NC_("RID_SVXSTR_COLOR_PURPLE", "Purple") +#define RID_SVXSTR_COLOR_SKYBLUE NC_("RID_SVXSTR_COLOR_SKYBLUE", "Sky blue") +#define RID_SVXSTR_COLOR_YELLOWGREEN NC_("RID_SVXSTR_COLOR_YELLOWGREEN", "Yellow green") +#define RID_SVXSTR_COLOR_PINK NC_("RID_SVXSTR_COLOR_PINK", "Pink") +#define RID_SVXSTR_COLOR_TURQUOISE NC_("RID_SVXSTR_COLOR_TURQUOISE", "Turquoise") +#define RID_SVXSTR_TBLAFMT_3D NC_("RID_SVXSTR_TBLAFMT_3D", "3D") +#define RID_SVXSTR_TBLAFMT_BLACK1 NC_("RID_SVXSTR_TBLAFMT_BLACK1", "Black 1") +#define RID_SVXSTR_TBLAFMT_BLACK2 NC_("RID_SVXSTR_TBLAFMT_BLACK2", "Black 2") +#define RID_SVXSTR_TBLAFMT_BLUE NC_("RID_SVXSTR_TBLAFMT_BLUE", "Blue") +#define RID_SVXSTR_TBLAFMT_BROWN NC_("RID_SVXSTR_TBLAFMT_BROWN", "Brown") +#define RID_SVXSTR_TBLAFMT_CURRENCY NC_("RID_SVXSTR_TBLAFMT_CURRENCY", "Currency") +#define RID_SVXSTR_TBLAFMT_CURRENCY_3D NC_("RID_SVXSTR_TBLAFMT_CURRENCY_3D", "Currency 3D") +#define RID_SVXSTR_TBLAFMT_CURRENCY_GRAY NC_("RID_SVXSTR_TBLAFMT_CURRENCY_GRAY", "Currency Gray") +#define RID_SVXSTR_TBLAFMT_CURRENCY_LAVENDER NC_("RID_SVXSTR_TBLAFMT_CURRENCY_LAVENDER", "Currency Lavender") +#define RID_SVXSTR_TBLAFMT_CURRENCY_TURQUOISE NC_("RID_SVXSTR_TBLAFMT_CURRENCY_TURQUOISE", "Currency Turquoise") +#define RID_SVXSTR_TBLAFMT_GRAY NC_("RID_SVXSTR_TBLAFMT_GRAY", "Gray") +#define RID_SVXSTR_TBLAFMT_GREEN NC_("RID_SVXSTR_TBLAFMT_GREEN", "Green") +#define RID_SVXSTR_TBLAFMT_LAVENDER NC_("RID_SVXSTR_TBLAFMT_LAVENDER", "Lavender") +#define RID_SVXSTR_TBLAFMT_RED NC_("RID_SVXSTR_TBLAFMT_RED", "Red") +#define RID_SVXSTR_TBLAFMT_TURQUOISE NC_("RID_SVXSTR_TBLAFMT_TURQUOISE", "Turquoise") +#define RID_SVXSTR_TBLAFMT_YELLOW NC_("RID_SVXSTR_TBLAFMT_YELLOW", "Yellow") +#define RID_SVXSTR_LINEJOINT_MIDDLE NC_("RID_SVXSTR_LINEJOINT_MIDDLE", "Line joint averaged") +#define RID_SVXSTR_LINEJOINT_BEVEL NC_("RID_SVXSTR_LINEJOINT_BEVEL", "Line joint bevel") +#define RID_SVXSTR_LINEJOINT_MITER NC_("RID_SVXSTR_LINEJOINT_MITER", "Line joint miter") +#define RID_SVXSTR_LINEJOINT_ROUND NC_("RID_SVXSTR_LINEJOINT_ROUND", "Line joint round") +// the familiar name for it +#define RID_SVXSTR_LINECAP_BUTT NC_("RID_SVXSTR_LINECAP_BUTT", "Line cap flat") +#define RID_SVXSTR_LINECAP_ROUND NC_("RID_SVXSTR_LINECAP_ROUND", "Line cap round") +#define RID_SVXSTR_LINECAP_SQUARE NC_("RID_SVXSTR_LINECAP_SQUARE", "Line cap square") +#define RID_SVXSTR_GRDT0 NC_("RID_SVXSTR_GRDT0", "Gradient") +#define RID_SVXSTR_GRDT1 NC_("RID_SVXSTR_GRDT1", "Linear blue/white") +#define RID_SVXSTR_GRDT2 NC_("RID_SVXSTR_GRDT2", "Linear magenta/green") +#define RID_SVXSTR_GRDT3 NC_("RID_SVXSTR_GRDT3", "Linear yellow/brown") +#define RID_SVXSTR_GRDT4 NC_("RID_SVXSTR_GRDT4", "Radial green/black") +#define RID_SVXSTR_GRDT5 NC_("RID_SVXSTR_GRDT5", "Radial red/yellow") +#define RID_SVXSTR_GRDT6 NC_("RID_SVXSTR_GRDT6", "Rectangular red/white") +#define RID_SVXSTR_GRDT7 NC_("RID_SVXSTR_GRDT7", "Square yellow/white") +#define RID_SVXSTR_GRDT8 NC_("RID_SVXSTR_GRDT8", "Ellipsoid blue gray/light blue") +#define RID_SVXSTR_GRDT9 NC_("RID_SVXSTR_GRDT9", "Axial light red/white") +// l means left +#define RID_SVXSTR_GRDT10 NC_("RID_SVXSTR_GRDT10", "Diagonal 1l") +// r means right +#define RID_SVXSTR_GRDT11 NC_("RID_SVXSTR_GRDT11", "Diagonal 1r") +// l means left +#define RID_SVXSTR_GRDT12 NC_("RID_SVXSTR_GRDT12", "Diagonal 2l") +// r means right +#define RID_SVXSTR_GRDT13 NC_("RID_SVXSTR_GRDT13", "Diagonal 2r") +// l means left +#define RID_SVXSTR_GRDT14 NC_("RID_SVXSTR_GRDT14", "Diagonal 3l") +// r means right +#define RID_SVXSTR_GRDT15 NC_("RID_SVXSTR_GRDT15", "Diagonal 3r") +// l means left +#define RID_SVXSTR_GRDT16 NC_("RID_SVXSTR_GRDT16", "Diagonal 4l") +// r means right +#define RID_SVXSTR_GRDT17 NC_("RID_SVXSTR_GRDT17", "Diagonal 4r") +#define RID_SVXSTR_GRDT18 NC_("RID_SVXSTR_GRDT18", "Diagonal Blue") +#define RID_SVXSTR_GRDT19 NC_("RID_SVXSTR_GRDT19", "Diagonal Green") +#define RID_SVXSTR_GRDT20 NC_("RID_SVXSTR_GRDT20", "Diagonal Orange") +#define RID_SVXSTR_GRDT21 NC_("RID_SVXSTR_GRDT21", "Diagonal Red") +#define RID_SVXSTR_GRDT22 NC_("RID_SVXSTR_GRDT22", "Diagonal Turquoise") +#define RID_SVXSTR_GRDT23 NC_("RID_SVXSTR_GRDT23", "Diagonal Violet") +#define RID_SVXSTR_GRDT24 NC_("RID_SVXSTR_GRDT24", "From a Corner") +#define RID_SVXSTR_GRDT25 NC_("RID_SVXSTR_GRDT25", "From a Corner, Blue") +#define RID_SVXSTR_GRDT26 NC_("RID_SVXSTR_GRDT26", "From a Corner, Green") +#define RID_SVXSTR_GRDT27 NC_("RID_SVXSTR_GRDT27", "From a Corner, Orange") +#define RID_SVXSTR_GRDT28 NC_("RID_SVXSTR_GRDT28", "From a Corner, Red") +#define RID_SVXSTR_GRDT29 NC_("RID_SVXSTR_GRDT29", "From a Corner, Turquoise") +#define RID_SVXSTR_GRDT30 NC_("RID_SVXSTR_GRDT30", "From a Corner, Violet") +#define RID_SVXSTR_GRDT31 NC_("RID_SVXSTR_GRDT31", "From the Middle") +#define RID_SVXSTR_GRDT32 NC_("RID_SVXSTR_GRDT32", "From the Middle, Blue") +#define RID_SVXSTR_GRDT33 NC_("RID_SVXSTR_GRDT33", "From the Middle, Green") +#define RID_SVXSTR_GRDT34 NC_("RID_SVXSTR_GRDT34", "From the Middle, Orange") +#define RID_SVXSTR_GRDT35 NC_("RID_SVXSTR_GRDT35", "From the Middle, Red") +#define RID_SVXSTR_GRDT36 NC_("RID_SVXSTR_GRDT36", "From the Middle, Turquoise") +#define RID_SVXSTR_GRDT37 NC_("RID_SVXSTR_GRDT37", "From the Middle, Violet") +#define RID_SVXSTR_GRDT38 NC_("RID_SVXSTR_GRDT38", "Horizontal") +#define RID_SVXSTR_GRDT39 NC_("RID_SVXSTR_GRDT39", "Horizontal Blue") +#define RID_SVXSTR_GRDT40 NC_("RID_SVXSTR_GRDT40", "Horizontal Green") +#define RID_SVXSTR_GRDT41 NC_("RID_SVXSTR_GRDT41", "Horizontal Orange") +#define RID_SVXSTR_GRDT42 NC_("RID_SVXSTR_GRDT42", "Horizontal Red") +#define RID_SVXSTR_GRDT43 NC_("RID_SVXSTR_GRDT43", "Horizontal Turquoise") +#define RID_SVXSTR_GRDT44 NC_("RID_SVXSTR_GRDT44", "Horizontal Violet") +#define RID_SVXSTR_GRDT45 NC_("RID_SVXSTR_GRDT45", "Radial") +#define RID_SVXSTR_GRDT46 NC_("RID_SVXSTR_GRDT46", "Radial Blue") +#define RID_SVXSTR_GRDT47 NC_("RID_SVXSTR_GRDT47", "Radial Green") +#define RID_SVXSTR_GRDT48 NC_("RID_SVXSTR_GRDT48", "Radial Orange") +#define RID_SVXSTR_GRDT49 NC_("RID_SVXSTR_GRDT49", "Radial Red") +#define RID_SVXSTR_GRDT50 NC_("RID_SVXSTR_GRDT50", "Radial Turquoise") +#define RID_SVXSTR_GRDT51 NC_("RID_SVXSTR_GRDT51", "Radial Violet") +#define RID_SVXSTR_GRDT52 NC_("RID_SVXSTR_GRDT52", "Vertical") +#define RID_SVXSTR_GRDT53 NC_("RID_SVXSTR_GRDT53", "Vertical Blue") +#define RID_SVXSTR_GRDT54 NC_("RID_SVXSTR_GRDT54", "Vertical Green") +#define RID_SVXSTR_GRDT55 NC_("RID_SVXSTR_GRDT55", "Vertical Orange") +#define RID_SVXSTR_GRDT56 NC_("RID_SVXSTR_GRDT56", "Vertical Red") +#define RID_SVXSTR_GRDT57 NC_("RID_SVXSTR_GRDT57", "Vertical Turquoise") +#define RID_SVXSTR_GRDT58 NC_("RID_SVXSTR_GRDT58", "Vertical Violet") +#define RID_SVXSTR_GRDT59 NC_("RID_SVXSTR_GRDT59", "Gray Gradient") +#define RID_SVXSTR_GRDT60 NC_("RID_SVXSTR_GRDT60", "Yellow Gradient") +#define RID_SVXSTR_GRDT61 NC_("RID_SVXSTR_GRDT61", "Orange Gradient") +#define RID_SVXSTR_GRDT62 NC_("RID_SVXSTR_GRDT62", "Red Gradient") +#define RID_SVXSTR_GRDT63 NC_("RID_SVXSTR_GRDT63", "Pink Gradient") +#define RID_SVXSTR_GRDT64 NC_("RID_SVXSTR_GRDT64", "Sky") +#define RID_SVXSTR_GRDT65 NC_("RID_SVXSTR_GRDT65", "Cyan Gradient") +#define RID_SVXSTR_GRDT66 NC_("RID_SVXSTR_GRDT66", "Blue Gradient") +#define RID_SVXSTR_GRDT67 NC_("RID_SVXSTR_GRDT67", "Purple Pipe") +#define RID_SVXSTR_GRDT68 NC_("RID_SVXSTR_GRDT68", "Night") +#define RID_SVXSTR_GRDT69 NC_("RID_SVXSTR_GRDT69", "Green Gradient") +#define RID_SVXSTR_GRDT70 NC_("RID_SVXSTR_GRDT70", "Tango Green") +#define RID_SVXSTR_GRDT71 NC_("RID_SVXSTR_GRDT71", "Subtle Tango Green") +#define RID_SVXSTR_GRDT72 NC_("RID_SVXSTR_GRDT72", "Tango Purple") +#define RID_SVXSTR_GRDT73 NC_("RID_SVXSTR_GRDT73", "Tango Red") +#define RID_SVXSTR_GRDT74 NC_("RID_SVXSTR_GRDT74", "Tango Blue") +#define RID_SVXSTR_GRDT75 NC_("RID_SVXSTR_GRDT75", "Tango Yellow") +#define RID_SVXSTR_GRDT76 NC_("RID_SVXSTR_GRDT76", "Tango Orange") +#define RID_SVXSTR_GRDT77 NC_("RID_SVXSTR_GRDT77", "Tango Gray") +#define RID_SVXSTR_GRDT78 NC_("RID_SVXSTR_GRDT78", "Clay") +#define RID_SVXSTR_GRDT79 NC_("RID_SVXSTR_GRDT79", "Olive Green") +#define RID_SVXSTR_GRDT80 NC_("RID_SVXSTR_GRDT80", "Silver") +#define RID_SVXSTR_GRDT81 NC_("RID_SVXSTR_GRDT81", "Sunburst") +#define RID_SVXSTR_GRDT82 NC_("RID_SVXSTR_GRDT82", "Brownie") +#define RID_SVXSTR_GRDT83 NC_("RID_SVXSTR_GRDT83", "Sunset") +#define RID_SVXSTR_GRDT84 NC_("RID_SVXSTR_GRDT84", "Deep Green") +#define RID_SVXSTR_GRDT85 NC_("RID_SVXSTR_GRDT85", "Deep Orange") +#define RID_SVXSTR_GRDT86 NC_("RID_SVXSTR_GRDT86", "Deep Blue") +#define RID_SVXSTR_GRDT87 NC_("RID_SVXSTR_GRDT87", "Purple Haze") +#define RID_SVXSTR_HATCH0 NC_("RID_SVXSTR_HATCH0", "Black 45 Degrees Wide") +#define RID_SVXSTR_HATCH1 NC_("RID_SVXSTR_HATCH1", "Black 45 Degrees") +#define RID_SVXSTR_HATCH2 NC_("RID_SVXSTR_HATCH2", "Black -45 Degrees") +#define RID_SVXSTR_HATCH3 NC_("RID_SVXSTR_HATCH3", "Black 90 Degrees") +#define RID_SVXSTR_HATCH4 NC_("RID_SVXSTR_HATCH4", "Red Crossed 45 Degrees") +#define RID_SVXSTR_HATCH5 NC_("RID_SVXSTR_HATCH5", "Red Crossed 0 Degrees") +#define RID_SVXSTR_HATCH6 NC_("RID_SVXSTR_HATCH6", "Blue Crossed 45 Degrees") +#define RID_SVXSTR_HATCH7 NC_("RID_SVXSTR_HATCH7", "Blue Crossed 0 Degrees") +#define RID_SVXSTR_HATCH8 NC_("RID_SVXSTR_HATCH8", "Blue Triple 90 Degrees") +#define RID_SVXSTR_HATCH9 NC_("RID_SVXSTR_HATCH9", "Black 0 Degrees") +#define RID_SVXSTR_HATCH10 NC_("RID_SVXSTR_HATCH10", "Hatching" ) +#define RID_SVXSTR_BMP0 NC_("RID_SVXSTR_BMP0", "Empty") +#define RID_SVXSTR_BMP1 NC_("RID_SVXSTR_BMP1", "Sky") +#define RID_SVXSTR_BMP2 NC_("RID_SVXSTR_BMP2", "Water") +#define RID_SVXSTR_BMP3 NC_("RID_SVXSTR_BMP3", "Coarse grained") +#define RID_SVXSTR_BMP4 NC_("RID_SVXSTR_BMP4", "Mercury") +#define RID_SVXSTR_BMP5 NC_("RID_SVXSTR_BMP5", "Space") +#define RID_SVXSTR_BMP6 NC_("RID_SVXSTR_BMP6", "Metal") +#define RID_SVXSTR_BMP7 NC_("RID_SVXSTR_BMP7", "Droplets") +#define RID_SVXSTR_BMP8 NC_("RID_SVXSTR_BMP8", "Marble") +#define RID_SVXSTR_BMP9 NC_("RID_SVXSTR_BMP9", "Linen") +#define RID_SVXSTR_BMP10 NC_("RID_SVXSTR_BMP10", "Stone") +#define RID_SVXSTR_BMP11 NC_("RID_SVXSTR_BMP11", "Gravel") +#define RID_SVXSTR_BMP12 NC_("RID_SVXSTR_BMP12", "Wall") +#define RID_SVXSTR_BMP13 NC_("RID_SVXSTR_BMP13", "Brownstone") +#define RID_SVXSTR_BMP14 NC_("RID_SVXSTR_BMP14", "Netting") +#define RID_SVXSTR_BMP15 NC_("RID_SVXSTR_BMP15", "Leaves") +#define RID_SVXSTR_BMP16 NC_("RID_SVXSTR_BMP16", "Artificial Turf") +#define RID_SVXSTR_BMP17 NC_("RID_SVXSTR_BMP17", "Daisy") +#define RID_SVXSTR_BMP18 NC_("RID_SVXSTR_BMP18", "Orange") +#define RID_SVXSTR_BMP19 NC_("RID_SVXSTR_BMP19", "Fiery") +#define RID_SVXSTR_BMP20 NC_("RID_SVXSTR_BMP20", "Roses") +#define RID_SVXSTR_BMP21 NC_("RID_SVXSTR_BMP21", "Bitmap") +#define RID_SVXSTR_DASH0 NC_("RID_SVXSTR_DASH0", "Ultrafine Dashed") +#define RID_SVXSTR_DASH1 NC_("RID_SVXSTR_DASH1", "Fine Dashed") +#define RID_SVXSTR_DASH2 NC_("RID_SVXSTR_DASH2", "2 Dots 3 Dashes") +#define RID_SVXSTR_DASH3 NC_("RID_SVXSTR_DASH3", "Fine Dotted") +#define RID_SVXSTR_DASH4 NC_("RID_SVXSTR_DASH4", "Line with Fine Dots") +#define RID_SVXSTR_DASH5 NC_("RID_SVXSTR_DASH5", "Fine Dashed") +#define RID_SVXSTR_DASH6 NC_("RID_SVXSTR_DASH6", "3 Dashes 3 Dots") +#define RID_SVXSTR_DASH7 NC_("RID_SVXSTR_DASH7", "Ultrafine Dotted") +#define RID_SVXSTR_DASH8 NC_("RID_SVXSTR_DASH8", "Line Style 9") +#define RID_SVXSTR_DASH9 NC_("RID_SVXSTR_DASH9", "2 Dots 1 Dash") +#define RID_SVXSTR_DASH10 NC_("RID_SVXSTR_DASH10", "Dashed") +#define RID_SVXSTR_DASH11 NC_("RID_SVXSTR_DASH11", "Dashed") +#define RID_SVXSTR_DASH12 NC_("RID_SVXSTR_DASH12", "Line Style") +#define RID_SVXSTR_LEND0 NC_("RID_SVXSTR_LEND0", "Arrow concave") +#define RID_SVXSTR_LEND1 NC_("RID_SVXSTR_LEND1", "Square 45") +#define RID_SVXSTR_LEND2 NC_("RID_SVXSTR_LEND2", "Small arrow") +#define RID_SVXSTR_LEND3 NC_("RID_SVXSTR_LEND3", "Dimension lines") +#define RID_SVXSTR_LEND4 NC_("RID_SVXSTR_LEND4", "Double Arrow") +#define RID_SVXSTR_LEND5 NC_("RID_SVXSTR_LEND5", "Rounded short arrow") +#define RID_SVXSTR_LEND6 NC_("RID_SVXSTR_LEND6", "Symmetric arrow") +#define RID_SVXSTR_LEND7 NC_("RID_SVXSTR_LEND7", "Line arrow") +#define RID_SVXSTR_LEND8 NC_("RID_SVXSTR_LEND8", "Rounded large arrow") +#define RID_SVXSTR_LEND9 NC_("RID_SVXSTR_LEND9", "Circle") +#define RID_SVXSTR_LEND10 NC_("RID_SVXSTR_LEND10", "Square") +#define RID_SVXSTR_LEND11 NC_("RID_SVXSTR_LEND11", "Arrow") +#define RID_SVXSTR_LEND12 NC_("RID_SVXSTR_LEND12", "Short line arrow") +#define RID_SVXSTR_LEND13 NC_("RID_SVXSTR_LEND13", "Triangle unfilled") +#define RID_SVXSTR_LEND14 NC_("RID_SVXSTR_LEND14", "Diamond unfilled") +#define RID_SVXSTR_LEND15 NC_("RID_SVXSTR_LEND15", "Diamond") +#define RID_SVXSTR_LEND16 NC_("RID_SVXSTR_LEND16", "Circle unfilled") +#define RID_SVXSTR_LEND17 NC_("RID_SVXSTR_LEND17", "Square 45 unfilled") +#define RID_SVXSTR_LEND18 NC_("RID_SVXSTR_LEND18", "Square unfilled") +#define RID_SVXSTR_LEND19 NC_("RID_SVXSTR_LEND19", "Half circle unfilled") +#define RID_SVXSTR_LEND20 NC_("RID_SVXSTR_LEND20", "Arrowhead") +#define RID_SVXSTR_TRASNGR0 NC_("RID_SVXSTR_TRASNGR0", "Transparency") +#define RID_SVXSTR_COLOR_LIBRE_GREEN_1 NC_("RID_SVXSTR_COLOR_LIBRE_GREEN_1", "Green 1 (%PRODUCTNAME Main Color)") +#define RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT NC_("RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT", "Green Accent") +#define RID_SVXSTR_COLOR_LIBRE_BLUE_ACCENT NC_("RID_SVXSTR_COLOR_LIBRE_BLUE_ACCENT", "Blue Accent") +#define RID_SVXSTR_COLOR_LIBRE_ORANGE_ACCENT NC_("RID_SVXSTR_COLOR_LIBRE_ORANGE_ACCENT", "Orange Accent") +#define RID_SVXSTR_COLOR_LIBRE_PURPLE NC_("RID_SVXSTR_COLOR_LIBRE_PURPLE", "Purple") +#define RID_SVXSTR_COLOR_LIBRE_PURPLE_ACCENT NC_("RID_SVXSTR_COLOR_LIBRE_PURPLE_ACCENT", "Purple Accent") +#define RID_SVXSTR_COLOR_LIBRE_YELLOW_ACCENT NC_("RID_SVXSTR_COLOR_LIBRE_YELLOW_ACCENT", "Yellow Accent") +// Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines +#define RID_SVXSTR_COLOR_TANGO_BUTTER NC_("RID_SVXSTR_COLOR_TANGO_BUTTER", "Tango: Butter") +// Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines +#define RID_SVXSTR_COLOR_TANGO_ORANGE NC_("RID_SVXSTR_COLOR_TANGO_ORANGE", "Tango: Orange") +// Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines +#define RID_SVXSTR_COLOR_TANGO_CHOCOLATE NC_("RID_SVXSTR_COLOR_TANGO_CHOCOLATE", "Tango: Chocolate") +// Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines +#define RID_SVXSTR_COLOR_TANGO_CHAMELEON NC_("RID_SVXSTR_COLOR_TANGO_CHAMELEON", "Tango: Chameleon") +// Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines +#define RID_SVXSTR_COLOR_TANGO_SKY_BLUE NC_("RID_SVXSTR_COLOR_TANGO_SKY_BLUE", "Tango: Sky Blue") +// Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines +#define RID_SVXSTR_COLOR_TANGO_PLUM NC_("RID_SVXSTR_COLOR_TANGO_PLUM", "Tango: Plum") +// Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines +#define RID_SVXSTR_COLOR_TANGO_SCARLET_RED NC_("RID_SVXSTR_COLOR_TANGO_SCARLET_RED", "Tango: Scarlet Red") +// Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines +#define RID_SVXSTR_COLOR_TANGO_ALUMINIUM NC_("RID_SVXSTR_COLOR_TANGO_ALUMINIUM", "Tango: Aluminium") +#define RID_SVXSTR_GALLERYPROPS_GALTHEME NC_("RID_SVXSTR_GALLERYPROPS_GALTHEME", "Gallery Theme") +#define RID_SVXSTR_GALLERY_THEMEITEMS NC_("RID_SVXSTR_GALLERY_THEMEITEMS", "Theme Items") +#define RID_SVXSTR_GALLERY_PREVIEW NC_("RID_SVXSTR_GALLERY_PREVIEW", "Preview") +#define RID_SVXSTR_SUCCESSRECOV NC_("RID_SVXSTR_SUCCESSRECOV", "Successfully recovered") +#define RID_SVXSTR_ORIGDOCRECOV NC_("RID_SVXSTR_ORIGDOCRECOV", "Original document recovered") +#define RID_SVXSTR_RECOVFAILED NC_("RID_SVXSTR_RECOVFAILED", "Recovery failed") +#define RID_SVXSTR_RECOVINPROGR NC_("RID_SVXSTR_RECOVINPROGR", "Recovery in progress") +#define RID_SVXSTR_NOTRECOVYET NC_("RID_SVXSTR_NOTRECOVYET", "Not recovered yet") +#define RID_SVXSTR_RECOVERY_INPROGRESS NC_("RID_SVXSTR_RECOVERY_INPROGRESS", "%PRODUCTNAME %PRODUCTVERSION has begun recovering your documents. Depending on the size of the documents this process can take some time.") +#define RID_SVXSTR_RECOVERYONLY_FINISH_DESCR NC_("RID_SVXSTR_RECOVERYONLY_FINISH_DESCR", "Recovery of your documents was finished. Click 'Finish' to see your documents.") +#define RID_SVXSTR_RECOVERYONLY_FINISH NC_("RID_SVXSTR_RECOVERYONLY_FINISH", "~Finish") +#define RID_SVXSTR_WIDTH_LAST_CUSTOM NC_("RID_SVXSTR_WIDTH_LAST_CUSTOM", "Last Custom Value") +#define RID_SVXSTR_PT NC_("RID_SVXSTR_PT", "pt") + +#define RID_SVXSTR_EXPORT_GRAPHIC_TITLE NC_("RID_SVXSTR_EXPORT_GRAPHIC_TITLE", "Image Export") +#define RID_SVXSTR_SAVEAS_IMAGE NC_("RID_SVXSTR_SAVEAS_IMAGE", "Save as Image") + +// Strings for the Draw Dialog -------------------------------------------- +#define RID_SVX_3D_UNDO_EXCHANGE_PASTE NC_("RID_SVX_3D_UNDO_EXCHANGE_PASTE", "Insert object(s)") +#define RID_SVX_3D_UNDO_ROTATE NC_("RID_SVX_3D_UNDO_ROTATE", "Rotate 3D object") +#define RID_SVX_3D_UNDO_EXTRUDE NC_("RID_SVX_3D_UNDO_EXTRUDE", "Create extrusion object") +#define RID_SVX_3D_UNDO_LATHE NC_("RID_SVX_3D_UNDO_LATHE", "Create rotation object") +#define RID_SVX_3D_UNDO_BREAK_LATHE NC_("RID_SVX_3D_UNDO_BREAK_LATHE", "Split 3D object") + +// Language-Strings ------------------------------------------------------ +#define RID_SVXSTR_LANGUAGE_ALL NC_("RID_SVXSTR_LANGUAGE_ALL", "[All]") + +#define RID_SVXSTR_GALLERY_FILTER NC_("RID_SVXSTR_GALLERY_FILTER", "Graphics filter") +#define RID_SVXSTR_GALLERY_NEWTHEME NC_("RID_SVXSTR_GALLERY_NEWTHEME", "New Theme") +#define RID_SVXSTR_GALLERY_CREATETHEME NC_("RID_SVXSTR_GALLERY_CREATETHEME", "New Theme...") +#define RID_SVXSTR_GALLERY_TITLE NC_("RID_SVXSTR_GALLERY_TITLE", "Title") +#define RID_SVXSTR_GALLERY_ICONVIEW NC_("RID_SVXSTR_GALLERY_ICONVIEW", "Icon View") +#define RID_SVXSTR_GALLERY_LISTVIEW NC_("RID_SVXSTR_GALLERY_LISTVIEW", "Detailed View") + +#define RID_GALLERYSTR_THEME_3D NC_("RID_GALLERYSTR_THEME_3D", "3D Effects") +#define RID_GALLERYSTR_THEME_ANIMATIONS NC_("RID_GALLERYSTR_THEME_ANIMATIONS", "Animations") +#define RID_GALLERYSTR_THEME_BULLETS NC_("RID_GALLERYSTR_THEME_BULLETS", "Bullets") +#define RID_GALLERYSTR_THEME_OFFICE NC_("RID_GALLERYSTR_THEME_OFFICE", "Office") +#define RID_GALLERYSTR_THEME_FLAGS NC_("RID_GALLERYSTR_THEME_FLAGS", "Flags") +#define RID_GALLERYSTR_THEME_FLOWCHARTS NC_("RID_GALLERYSTR_THEME_FLOWCHARTS", "Flow Charts") +#define RID_GALLERYSTR_THEME_EMOTICONS NC_("RID_GALLERYSTR_THEME_EMOTICONS", "Emoticons") +#define RID_GALLERYSTR_THEME_PHOTOS NC_("RID_GALLERYSTR_THEME_PHOTOS", "Images") +#define RID_GALLERYSTR_THEME_BACKGROUNDS NC_("RID_GALLERYSTR_THEME_BACKGROUNDS", "Backgrounds") +#define RID_GALLERYSTR_THEME_HOMEPAGE NC_("RID_GALLERYSTR_THEME_HOMEPAGE", "Homepage") +#define RID_GALLERYSTR_THEME_INTERACTION NC_("RID_GALLERYSTR_THEME_INTERACTION", "Interaction") +#define RID_GALLERYSTR_THEME_MAPS NC_("RID_GALLERYSTR_THEME_MAPS", "Maps") +#define RID_GALLERYSTR_THEME_PEOPLE NC_("RID_GALLERYSTR_THEME_PEOPLE", "People") +#define RID_GALLERYSTR_THEME_SURFACES NC_("RID_GALLERYSTR_THEME_SURFACES", "Surfaces") +#define RID_GALLERYSTR_THEME_COMPUTERS NC_("RID_GALLERYSTR_THEME_COMPUTERS", "Computers") +#define RID_GALLERYSTR_THEME_DIAGRAMS NC_("RID_GALLERYSTR_THEME_DIAGRAMS", "Diagrams") +#define RID_GALLERYSTR_THEME_ENVIRONMENT NC_("RID_GALLERYSTR_THEME_ENVIRONMENT", "Environment") +#define RID_GALLERYSTR_THEME_FINANCE NC_("RID_GALLERYSTR_THEME_FINANCE", "Finance") +#define RID_GALLERYSTR_THEME_TRANSPORT NC_("RID_GALLERYSTR_THEME_TRANSPORT", "Transport") +#define RID_GALLERYSTR_THEME_TXTSHAPES NC_("RID_GALLERYSTR_THEME_TXTSHAPES", "Textshapes") +#define RID_GALLERYSTR_THEME_SOUNDS NC_("RID_GALLERYSTR_THEME_SOUNDS", "Sounds") +#define RID_GALLERYSTR_THEME_SYMBOLS NC_("RID_GALLERYSTR_THEME_SYMBOLS", "Symbols") +#define RID_GALLERYSTR_THEME_MYTHEME NC_("RID_GALLERYSTR_THEME_MYTHEME", "My Theme") +#define RID_GALLERYSTR_THEME_ARROWS NC_("RID_GALLERYSTR_THEME_ARROWS", "Arrows") +#define RID_GALLERYSTR_THEME_BALLOONS NC_("RID_GALLERYSTR_THEME_BALLOONS", "Balloons") +#define RID_GALLERYSTR_THEME_KEYBOARD NC_("RID_GALLERYSTR_THEME_KEYBOARD", "Keyboard") +#define RID_GALLERYSTR_THEME_TIME NC_("RID_GALLERYSTR_THEME_TIME", "Time") +#define RID_GALLERYSTR_THEME_PRESENTATION NC_("RID_GALLERYSTR_THEME_PRESENTATION", "Presentation") +#define RID_GALLERYSTR_THEME_CALENDAR NC_("RID_GALLERYSTR_THEME_CALENDAR", "Calendar") +#define RID_GALLERYSTR_THEME_NAVIGATION NC_("RID_GALLERYSTR_THEME_NAVIGATION", "Navigation") +#define RID_GALLERYSTR_THEME_COMMUNICATION NC_("RID_GALLERYSTR_THEME_COMMUNICATION", "Communication") +#define RID_GALLERYSTR_THEME_FINANCES NC_("RID_GALLERYSTR_THEME_FINANCES", "Finances") +#define RID_GALLERYSTR_THEME_COMPUTER NC_("RID_GALLERYSTR_THEME_COMPUTER", "Computers") +#define RID_GALLERYSTR_THEME_CLIMA NC_("RID_GALLERYSTR_THEME_CLIMA", "Climate") +#define RID_GALLERYSTR_THEME_EDUCATION NC_("RID_GALLERYSTR_THEME_EDUCATION", "School & University") +#define RID_GALLERYSTR_THEME_TROUBLE NC_("RID_GALLERYSTR_THEME_TROUBLE", "Problem Solving") +#define RID_GALLERYSTR_THEME_SCREENBEANS NC_("RID_GALLERYSTR_THEME_SCREENBEANS", "Screen Beans") + +#define RID_SVXSTR_ALIGN_LEFT NC_("RID_SVXSTR_ALIGN_LEFT", "~Left Align") +#define RID_SVXSTR_ALIGN_CENTER NC_("RID_SVXSTR_ALIGN_CENTER", "~Center") +#define RID_SVXSTR_ALIGN_RIGHT NC_("RID_SVXSTR_ALIGN_RIGHT", "~Right Align") +#define RID_SVXSTR_ALIGN_WORD NC_("RID_SVXSTR_ALIGN_WORD", "~Word Justify") +#define RID_SVXSTR_ALIGN_STRETCH NC_("RID_SVXSTR_ALIGN_STRETCH", "S~tretch Justify") +#define RID_SVXSTR_CHARS_SPACING_VERY_TIGHT NC_("RID_SVXSTR_CHARS_SPACING_VERY_TIGHT", "~Very Tight") +#define RID_SVXSTR_CHARS_SPACING_TIGHT NC_("RID_SVXSTR_CHARS_SPACING_TIGHT", "~Tight") +#define RID_SVXSTR_CHARS_SPACING_NORMAL NC_("RID_SVXSTR_CHARS_SPACING_NORMAL", "~Normal") +#define RID_SVXSTR_CHARS_SPACING_LOOSE NC_("RID_SVXSTR_CHARS_SPACING_LOOSE", "~Loose") +#define RID_SVXSTR_CHARS_SPACING_VERY_LOOSE NC_("RID_SVXSTR_CHARS_SPACING_VERY_LOOSE", "Very ~Loose") +#define RID_SVXSTR_CHARS_SPACING_CUSTOM NC_("RID_SVXSTR_CHARS_SPACING_CUSTOM", "~Custom...") +#define RID_SVXSTR_CHARS_SPACING_KERN_PAIRS NC_("RID_SVXSTR_CHARS_SPACING_KERN_PAIRS", "~Kern Character Pairs") + +#define RID_SVXSTR_QRY_PRINT_TITLE NC_("RID_SVXSTR_QRY_PRINT_TITLE", "Printing selection") +#define RID_SVXSTR_QRY_PRINT_MSG NC_("RID_SVXSTR_QRY_PRINT_MSG", "Do you want to print the selection or the entire document?") +#define RID_SVXSTR_QRY_PRINT_ALL NC_("RID_SVXSTR_QRY_PRINT_ALL", "~All") +#define RID_SVXSTR_QRY_PRINT_SELECTION NC_("RID_SVXSTR_QRY_PRINT_SELECTION", "~Selection") + +#define RID_SVXSTR_PERSPECTIVE NC_("RID_SVXSTR_PERSPECTIVE", "~Perspective") +#define RID_SVXSTR_PARALLEL NC_("RID_SVXSTR_PARALLEL", "P~arallel") +#define RID_SVXSTR_DIRECTION_NW NC_("RID_SVXSTR_DIRECTION_NW", "Extrusion North-West") +#define RID_SVXSTR_DIRECTION_N NC_("RID_SVXSTR_DIRECTION_N", "Extrusion North") +#define RID_SVXSTR_DIRECTION_NE NC_("RID_SVXSTR_DIRECTION_NE", "Extrusion North-East") +#define RID_SVXSTR_DIRECTION_W NC_("RID_SVXSTR_DIRECTION_W", "Extrusion West") +#define RID_SVXSTR_DIRECTION_NONE NC_("RID_SVXSTR_DIRECTION_NONE", "Extrusion Backwards") +#define RID_SVXSTR_DIRECTION_E NC_("RID_SVXSTR_DIRECTION_E", "Extrusion East") +#define RID_SVXSTR_DIRECTION_SW NC_("RID_SVXSTR_DIRECTION_SW", "Extrusion South-West") +#define RID_SVXSTR_DIRECTION_S NC_("RID_SVXSTR_DIRECTION_S", "Extrusion South") +#define RID_SVXSTR_DIRECTION_SE NC_("RID_SVXSTR_DIRECTION_SE", "Extrusion South-East") +#define RID_SVXSTR_BRIGHT NC_("RID_SVXSTR_BRIGHT", "~Bright") +#define RID_SVXSTR_NORMAL NC_("RID_SVXSTR_NORMAL", "~Normal") +#define RID_SVXSTR_DIM NC_("RID_SVXSTR_DIM", "~Dim") +#define RID_SVXSTR_WIREFRAME NC_("RID_SVXSTR_WIREFRAME", "~Wire Frame") +#define RID_SVXSTR_MATTE NC_("RID_SVXSTR_MATTE", "~Matt") +#define RID_SVXSTR_PLASTIC NC_("RID_SVXSTR_PLASTIC", "~Plastic") +#define RID_SVXSTR_METAL NC_("RID_SVXSTR_METAL", "Me~tal") +#define RID_SVXSTR_DEPTH_0 NC_("RID_SVXSTR_DEPTH_0", "~0 cm") +#define RID_SVXSTR_DEPTH_1 NC_("RID_SVXSTR_DEPTH_1", "~1 cm") +#define RID_SVXSTR_DEPTH_2 NC_("RID_SVXSTR_DEPTH_2", "~2.5 cm") +#define RID_SVXSTR_DEPTH_3 NC_("RID_SVXSTR_DEPTH_3", "~5 cm") +#define RID_SVXSTR_DEPTH_4 NC_("RID_SVXSTR_DEPTH_4", "10 ~cm") +#define RID_SVXSTR_DEPTH_0_INCH NC_("RID_SVXSTR_DEPTH_0_INCH", "0 inch") +#define RID_SVXSTR_DEPTH_1_INCH NC_("RID_SVXSTR_DEPTH_1_INCH", "0.~5 inch") +#define RID_SVXSTR_DEPTH_2_INCH NC_("RID_SVXSTR_DEPTH_2_INCH", "~1 inch") +#define RID_SVXSTR_DEPTH_3_INCH NC_("RID_SVXSTR_DEPTH_3_INCH", "~2 inch") +#define RID_SVXSTR_DEPTH_4_INCH NC_("RID_SVXSTR_DEPTH_4_INCH", "~4 inch") +#define RID_SVXSTR_CUSTOM NC_("RID_SVXSTR_CUSTOM", "~Custom...") +#define RID_SVXSTR_INFINITY NC_("RID_SVXSTR_INFINITY", "~Infinity") + +#define RID_SVXSTR_NOFILL NC_("RID_SVXSTR_NOFILL", "No Fill") +#define RID_SVXSTR_TRANSPARENT NC_("RID_SVXSTR_TRANSPARENT", "Transparent") +#define RID_SVXSTR_DEFAULT NC_("RID_SVXSTR_DEFAULT", "Default") +#define RID_SVXSTR_FRAME NC_("RID_SVXSTR_FRAME", "Borders") +#define RID_SVXSTR_FRAME_STYLE NC_("RID_SVXSTR_FRAME_STYLE", "Border Style") +#define RID_SVXSTR_MORENUMBERING NC_("RID_SVXSTR_MORENUMBERING", "More Numbering...") +#define RID_SVXSTR_MOREBULLETS NC_("RID_SVXSTR_MOREBULLETS", "More Bullets...") +#define RID_SVXSTR_BY_AUTHOR NC_("RID_SVXSTR_BY_AUTHOR", "By author") +#define RID_SVXSTR_PAGES NC_("RID_SVXSTR_PAGES", "Pages") +#define RID_SVXSTR_CLEARFORM NC_("RID_SVXSTR_CLEARFORM", "Clear formatting") +#define RID_SVXSTR_MORE_STYLES NC_("RID_SVXSTR_MORE_STYLES", "More Styles...") +#define RID_SVXSTR_MORE NC_("RID_SVXSTR_MORE", "More Options...") +// This is duplicated in GenericCommands.xcu in officecfg. +#define RID_SVXSTR_CHARFONTNAME NC_("RID_SVXSTR_CHARFONTNAME", "Font Name") +#define RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE NC_("RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE", "Font Name. The current font is not available and will be substituted.") +#define RID_SVXSTR_CUSTOM_PAL NC_("RID_SVXSTR_CUSTOM_PAL", "custom") +#define RID_SVXSTR_DOC_COLORS NC_("RID_SVXSTR_DOC_COLORS", "Document colors") +#define RID_SVXSTR_DOC_COLOR_PREFIX NC_("RID_SVXSTR_DOC_COLOR_PREFIX", "Document Color") + +#define RID_SVX_EXTRUSION_BAR NC_("RID_SVX_EXTRUSION_BAR", "Extrusion") +#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_ON_OFF NC_("RID_SVXSTR_UNDO_APPLY_EXTRUSION_ON_OFF", "Apply Extrusion On/Off") +#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_DOWN NC_("RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_DOWN", "Tilt Down") +#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_UP NC_("RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_UP", "Tilt Up") +#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_LEFT NC_("RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_LEFT", "Tilt Left") +#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_RIGHT NC_("RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_RIGHT", "Tilt Right") +#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_DEPTH NC_("RID_SVXSTR_UNDO_APPLY_EXTRUSION_DEPTH", "Change Extrusion Depth") +#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_ORIENTATION NC_("RID_SVXSTR_UNDO_APPLY_EXTRUSION_ORIENTATION", "Change Orientation") +#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_PROJECTION NC_("RID_SVXSTR_UNDO_APPLY_EXTRUSION_PROJECTION", "Change Projection Type") +#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_LIGHTING NC_("RID_SVXSTR_UNDO_APPLY_EXTRUSION_LIGHTING", "Change Lighting") +#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_BRIGHTNESS NC_("RID_SVXSTR_UNDO_APPLY_EXTRUSION_BRIGHTNESS", "Change Brightness") +#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_SURFACE NC_("RID_SVXSTR_UNDO_APPLY_EXTRUSION_SURFACE", "Change Extrusion Surface") +#define RID_SVXSTR_UNDO_APPLY_EXTRUSION_COLOR NC_("RID_SVXSTR_UNDO_APPLY_EXTRUSION_COLOR", "Change Extrusion Color") + +#define RID_SVXFLOAT3D_FAVORITE NC_("RID_SVXFLOAT3D_FAVORITE", "Favorite") +#define RID_SVXFLOAT3D_FIX_R NC_("RID_SVXFLOAT3D_FIX_R", "R:") +#define RID_SVXFLOAT3D_FIX_G NC_("RID_SVXFLOAT3D_FIX_G", "G:") +#define RID_SVXFLOAT3D_FIX_B NC_("RID_SVXFLOAT3D_FIX_B", "B:") + +#define RID_SVX_FONTWORK_BAR NC_("RID_SVX_FONTWORK_BAR", "Fontwork") +#define RID_SVXSTR_UNDO_APPLY_FONTWORK_SHAPE NC_("RID_SVXSTR_UNDO_APPLY_FONTWORK_SHAPE", "Apply Fontwork Shape") +#define RID_SVXSTR_UNDO_APPLY_FONTWORK_SAME_LETTER_HEIGHT NC_("RID_SVXSTR_UNDO_APPLY_FONTWORK_SAME_LETTER_HEIGHT", "Apply Fontwork Same Letter Heights") +#define RID_SVXSTR_UNDO_APPLY_FONTWORK_ALIGNMENT NC_("RID_SVXSTR_UNDO_APPLY_FONTWORK_ALIGNMENT", "Apply Fontwork Alignment") +#define RID_SVXSTR_UNDO_APPLY_FONTWORK_CHARACTER_SPACING NC_("RID_SVXSTR_UNDO_APPLY_FONTWORK_CHARACTER_SPACING", "Apply Fontwork Character Spacing") + +#define RID_SVXSTR_A11Y_3D_MATERIAL_COLOR NC_("RID_SVXSTR_A11Y_3D_MATERIAL_COLOR", "3D material color") +#define RID_SVXSTR_A11Y_FILLSTYLE_NONE NC_("RID_SVXSTR_A11Y_FILLSTYLE_NONE", "None") +#define RID_SVXSTR_A11Y_FILLSTYLE_SOLID NC_("RID_SVXSTR_A11Y_FILLSTYLE_SOLID", "Solid") +#define RID_SVXSTR_A11Y_FILLSTYLE_HATCH NC_("RID_SVXSTR_A11Y_FILLSTYLE_HATCH", "With hatching") +#define RID_SVXSTR_A11Y_FILLSTYLE_GRADIENT NC_("RID_SVXSTR_A11Y_FILLSTYLE_GRADIENT", "Gradient") +#define RID_SVXSTR_A11Y_FILLSTYLE_BITMAP NC_("RID_SVXSTR_A11Y_FILLSTYLE_BITMAP", "Bitmap") +#define RID_SVXSTR_A11Y_WITH NC_("RID_SVXSTR_A11Y_WITH", "with") +#define RID_SVXSTR_A11Y_STYLE NC_("RID_SVXSTR_A11Y_STYLE", "Style") +#define RID_SVXSTR_A11Y_AND NC_("RID_SVXSTR_A11Y_AND", "and") +// SvxRectCtl +#define RID_SVXSTR_RECTCTL_ACC_CORN_NAME NC_("RID_SVXSTR_RECTCTL_ACC_CORN_NAME", "Corner control") +#define RID_SVXSTR_RECTCTL_ACC_CORN_DESCR NC_("RID_SVXSTR_RECTCTL_ACC_CORN_DESCR", "Selection of a corner point.") +#define RID_SVXSTR_RECTCTL_ACC_ANGL_NAME NC_("RID_SVXSTR_RECTCTL_ACC_ANGL_NAME", "Angle control") +#define RID_SVXSTR_RECTCTL_ACC_ANGL_DESCR NC_("RID_SVXSTR_RECTCTL_ACC_ANGL_DESCR", "Selection of a major angle.") +#define RID_SVXSTR_RECTCTL_ACC_CHLD_LT NC_("RID_SVXSTR_RECTCTL_ACC_CHLD_LT", "Top left") +#define RID_SVXSTR_RECTCTL_ACC_CHLD_MT NC_("RID_SVXSTR_RECTCTL_ACC_CHLD_MT", "Top middle") +#define RID_SVXSTR_RECTCTL_ACC_CHLD_RT NC_("RID_SVXSTR_RECTCTL_ACC_CHLD_RT", "Top right") +#define RID_SVXSTR_RECTCTL_ACC_CHLD_LM NC_("RID_SVXSTR_RECTCTL_ACC_CHLD_LM", "Left center") +#define RID_SVXSTR_RECTCTL_ACC_CHLD_MM NC_("RID_SVXSTR_RECTCTL_ACC_CHLD_MM", "Center") +#define RID_SVXSTR_RECTCTL_ACC_CHLD_RM NC_("RID_SVXSTR_RECTCTL_ACC_CHLD_RM", "Right center") +#define RID_SVXSTR_RECTCTL_ACC_CHLD_LB NC_("RID_SVXSTR_RECTCTL_ACC_CHLD_LB", "Bottom left") +#define RID_SVXSTR_RECTCTL_ACC_CHLD_MB NC_("RID_SVXSTR_RECTCTL_ACC_CHLD_MB", "Bottom middle") +#define RID_SVXSTR_RECTCTL_ACC_CHLD_RB NC_("RID_SVXSTR_RECTCTL_ACC_CHLD_RB", "Bottom right") +#define RID_SVXSTR_RECTCTL_ACC_CHLD_A000 NC_("RID_SVXSTR_RECTCTL_ACC_CHLD_A000", "0 degrees") +#define RID_SVXSTR_RECTCTL_ACC_CHLD_A045 NC_("RID_SVXSTR_RECTCTL_ACC_CHLD_A045", "45 degrees") +#define RID_SVXSTR_RECTCTL_ACC_CHLD_A090 NC_("RID_SVXSTR_RECTCTL_ACC_CHLD_A090", "90 degrees") +#define RID_SVXSTR_RECTCTL_ACC_CHLD_A135 NC_("RID_SVXSTR_RECTCTL_ACC_CHLD_A135", "135 degrees") +#define RID_SVXSTR_RECTCTL_ACC_CHLD_A180 NC_("RID_SVXSTR_RECTCTL_ACC_CHLD_A180", "180 degrees") +#define RID_SVXSTR_RECTCTL_ACC_CHLD_A225 NC_("RID_SVXSTR_RECTCTL_ACC_CHLD_A225", "225 degrees") +#define RID_SVXSTR_RECTCTL_ACC_CHLD_A270 NC_("RID_SVXSTR_RECTCTL_ACC_CHLD_A270", "270 degrees") +#define RID_SVXSTR_RECTCTL_ACC_CHLD_A315 NC_("RID_SVXSTR_RECTCTL_ACC_CHLD_A315", "315 degrees") +// SvxGraphCtrlAccessibleContext +#define RID_SVXSTR_GRAPHCTRL_ACC_NAME NC_("RID_SVXSTR_GRAPHCTRL_ACC_NAME", "Contour control") +#define RID_SVXSTR_GRAPHCTRL_ACC_DESCRIPTION NC_("RID_SVXSTR_GRAPHCTRL_ACC_DESCRIPTION", "This is where you can edit the contour.") +#define RID_SVXSTR_CHARACTER_SELECTION NC_("RID_SVXSTR_CHARACTER_SELECTION", "Special character selection") +#define RID_SVXSTR_CHAR_SEL_DESC NC_("RID_SVXSTR_CHAR_SEL_DESC", "Select special characters in this area.") +// The space behind is a must. +#define RID_SVXSTR_CHARACTER_CODE NC_("RID_SVXSTR_CHARACTER_CODE", "Character code ") + +#define RID_ERR_FIELDREQUIRED NC_("RID_ERR_FIELDREQUIRED", "Input required in field '#'. Please enter a value.") +#define RID_STR_FORMS NC_("RID_STR_FORMS", "Forms") +#define RID_STR_NO_PROPERTIES NC_("RID_STR_NO_PROPERTIES", "No control selected") +#define RID_STR_PROPERTIES_CONTROL NC_("RID_STR_PROPERTIES_CONTROL", "Properties: ") +#define RID_STR_PROPERTIES_FORM NC_("RID_STR_PROPERTIES_FORM", "Form Properties") +#define RID_STR_FMEXPLORER NC_("RID_STR_FMEXPLORER", "Form Navigator") +#define RID_STR_FORM NC_("RID_STR_FORM", "Form") +#define RID_STR_STDFORMNAME NC_("RID_STR_STDFORMNAME", "Form") +#define RID_STR_PROPTITLE_HIDDEN NC_("RID_STR_PROPTITLE_HIDDEN", "Hidden Control") +#define RID_STR_CONTROL NC_("RID_STR_CONTROL", "Control") +#define RID_STR_REC_TEXT NC_("RID_STR_REC_TEXT", "Record") +#define RID_STR_REC_FROM_TEXT NC_("RID_STR_REC_FROM_TEXT", "of") +#define RID_STR_FIELDSELECTION NC_("RID_STR_FIELDSELECTION", "Add field:") +#define RID_STR_WRITEERROR NC_("RID_STR_WRITEERROR", "Error writing data to database") +#define RID_STR_SYNTAXERROR NC_("RID_STR_SYNTAXERROR", "Syntax error in query expression") +#define RID_STR_DELETECONFIRM_RECORD NC_("RID_STR_DELETECONFIRM_RECORD", "You intend to delete 1 record.") +#define RID_STR_DELETECONFIRM_RECORDS NC_("RID_STR_DELETECONFIRM_RECORDS", "# records will be deleted.") +#define RID_STR_DELETECONFIRM NC_("RID_STR_DELETECONFIRM", "If you click Yes, you won't be able to undo this operation.\nDo you want to continue anyway?") +#define RID_STR_NAVIGATIONBAR NC_("RID_STR_NAVIGATIONBAR", "Navigation bar") +#define RID_STR_COLUMN NC_("RID_STR_COLUMN", "Col") +#define RID_STR_UNDO_PROPERTY NC_("RID_STR_UNDO_PROPERTY", "Set property '#'") +#define RID_STR_UNDO_CONTAINER_INSERT NC_("RID_STR_UNDO_CONTAINER_INSERT", "Insert in container") +#define RID_STR_UNDO_CONTAINER_REMOVE NC_("RID_STR_UNDO_CONTAINER_REMOVE", "Delete #") +#define RID_STR_UNDO_CONTAINER_REMOVE_MULTIPLE NC_("RID_STR_UNDO_CONTAINER_REMOVE_MULTIPLE", "Delete # objects") +#define RID_STR_UNDO_CONTAINER_REPLACE NC_("RID_STR_UNDO_CONTAINER_REPLACE", "Replace a container element") +#define RID_STR_UNDO_MODEL_REPLACE NC_("RID_STR_UNDO_MODEL_REPLACE", "Replace Control") +#define RID_STR_PROPTITLE_PUSHBUTTON NC_("RID_STR_PROPTITLE_PUSHBUTTON", "Push Button") +#define RID_STR_PROPTITLE_RADIOBUTTON NC_("RID_STR_PROPTITLE_RADIOBUTTON", "Option Button") +#define RID_STR_PROPTITLE_CHECKBOX NC_("RID_STR_PROPTITLE_CHECKBOX", "Check Box") +#define RID_STR_PROPTITLE_FIXEDTEXT NC_("RID_STR_PROPTITLE_FIXEDTEXT", "Label Field") +#define RID_STR_PROPTITLE_GROUPBOX NC_("RID_STR_PROPTITLE_GROUPBOX", "Group Box") +#define RID_STR_PROPTITLE_EDIT NC_("RID_STR_PROPTITLE_EDIT", "Text Box") +#define RID_STR_PROPTITLE_FORMATTED NC_("RID_STR_PROPTITLE_FORMATTED", "Formatted Field") +#define RID_STR_PROPTITLE_LISTBOX NC_("RID_STR_PROPTITLE_LISTBOX", "List Box") +#define RID_STR_PROPTITLE_COMBOBOX NC_("RID_STR_PROPTITLE_COMBOBOX", "Combo Box") +#define RID_STR_PROPTITLE_IMAGEBUTTON NC_("RID_STR_PROPTITLE_IMAGEBUTTON", "Image Button") +#define RID_STR_PROPTITLE_IMAGECONTROL NC_("RID_STR_PROPTITLE_IMAGECONTROL", "Image Control") +#define RID_STR_PROPTITLE_FILECONTROL NC_("RID_STR_PROPTITLE_FILECONTROL", "File Selection") +#define RID_STR_PROPTITLE_DATEFIELD NC_("RID_STR_PROPTITLE_DATEFIELD", "Date Field") +#define RID_STR_PROPTITLE_TIMEFIELD NC_("RID_STR_PROPTITLE_TIMEFIELD", "Time Field") +#define RID_STR_PROPTITLE_NUMERICFIELD NC_("RID_STR_PROPTITLE_NUMERICFIELD", "Numeric Field") +#define RID_STR_PROPTITLE_CURRENCYFIELD NC_("RID_STR_PROPTITLE_CURRENCYFIELD", "Currency Field") +#define RID_STR_PROPTITLE_PATTERNFIELD NC_("RID_STR_PROPTITLE_PATTERNFIELD", "Pattern Field") +#define RID_STR_PROPTITLE_DBGRID NC_("RID_STR_PROPTITLE_DBGRID", "Table Control ") +#define RID_STR_PROPTITLE_SCROLLBAR NC_("RID_STR_PROPTITLE_SCROLLBAR", "Scrollbar") +#define RID_STR_PROPTITLE_SPINBUTTON NC_("RID_STR_PROPTITLE_SPINBUTTON", "Spin Button") +#define RID_STR_PROPTITLE_NAVBAR NC_("RID_STR_PROPTITLE_NAVBAR", "Navigation Bar") +#define RID_STR_PROPTITLE_MULTISELECT NC_("RID_STR_PROPTITLE_MULTISELECT", "Multiselection") +#define RID_STR_NODATACONTROLS NC_("RID_STR_NODATACONTROLS", "No data-related controls in the current form!") +#define RID_STR_POSTFIX_DATE NC_("RID_STR_POSTFIX_DATE", " (Date)") +#define RID_STR_POSTFIX_TIME NC_("RID_STR_POSTFIX_TIME", " (Time)") +#define RID_STR_FILTER_NAVIGATOR NC_("RID_STR_FILTER_NAVIGATOR", "Filter navigator") +#define RID_STR_FILTER_FILTER_FOR NC_("RID_STR_FILTER_FILTER_FOR", "Filter for") +#define RID_STR_FILTER_FILTER_OR NC_("RID_STR_FILTER_FILTER_OR", "Or") +#define RID_STR_NOCONTROLS_FOR_EXTERNALDISPLAY NC_("RID_STR_NOCONTROLS_FOR_EXTERNALDISPLAY", "Valid bound controls which can be used in the table view do not exist in the current form.") +#define RID_STR_AUTOFIELD NC_("RID_STR_AUTOFIELD", "") +#define RID_STR_SVT_SQL_SYNTAX_ERROR NC_("RID_STR_SVT_SQL_SYNTAX_ERROR", "Syntax error in SQL statement") +#define RID_STR_SVT_SQL_SYNTAX_VALUE_NO_LIKE NC_("RID_STR_SVT_SQL_SYNTAX_VALUE_NO_LIKE", "The value #1 cannot be used with LIKE.") +#define RID_STR_SVT_SQL_SYNTAX_FIELD_NO_LIKE NC_("RID_STR_SVT_SQL_SYNTAX_FIELD_NO_LIKE", "LIKE cannot be used with this field.") +#define RID_STR_SVT_SQL_SYNTAX_ACCESS_DAT_NO_VALID NC_("RID_STR_SVT_SQL_SYNTAX_ACCESS_DAT_NO_VALID", "The value entered is not a valid date. Please enter a date in a valid format, for example, MM/DD/YY.") +#define RID_STR_SVT_SQL_SYNTAX_INT_NO_VALID NC_("RID_STR_SVT_SQL_SYNTAX_INT_NO_VALID", "The field cannot be compared with an integer.") +#define RID_STR_SVT_SQL_SYNTAX_TABLE NC_("RID_STR_SVT_SQL_SYNTAX_TABLE", "The database does not contain a table named \"#\".") +#define RID_STR_SVT_SQL_SYNTAX_TABLE_OR_QUERY NC_("RID_STR_SVT_SQL_SYNTAX_TABLE_OR_QUERY", "The database does contain neither a table nor a query named \"#\".") +#define RID_STR_SVT_SQL_SYNTAX_TABLE_EXISTS NC_("RID_STR_SVT_SQL_SYNTAX_TABLE_EXISTS", "The database already contains a table or view with name \"#\".") +#define RID_STR_SVT_SQL_SYNTAX_QUERY_EXISTS NC_("RID_STR_SVT_SQL_SYNTAX_QUERY_EXISTS", "The database already contains a query with name \"#\".") +#define RID_STR_SVT_SQL_SYNTAX_COLUMN NC_("RID_STR_SVT_SQL_SYNTAX_COLUMN", "The column \"#1\" is unknown in the table \"#2\".") +#define RID_STR_SVT_SQL_SYNTAX_REAL_NO_VALID NC_("RID_STR_SVT_SQL_SYNTAX_REAL_NO_VALID", "The field cannot be compared with a floating point number.") +#define RID_STR_SVT_SQL_SYNTAX_CRIT_NO_COMPARE NC_("RID_STR_SVT_SQL_SYNTAX_CRIT_NO_COMPARE", "The entered criterion cannot be compared with this field.") +#define RID_STR_DATANAVIGATOR NC_("RID_STR_DATANAVIGATOR", "Data Navigator") +#define RID_STR_READONLY_VIEW NC_("RID_STR_READONLY_VIEW", " (read-only)") +#define RID_STR_ALREADYEXISTOVERWRITE NC_("RID_STR_ALREADYEXISTOVERWRITE", "The file already exists. Overwrite?") +#define RID_STR_OBJECT_LABEL NC_("RID_STR_OBJECT_LABEL", "#object# label") + +#define RID_STR_QRY_REMOVE_MODEL NC_("RID_STR_QRY_REMOVE_MODEL", "Deleting the model '$MODELNAME' affects all controls currently bound to this model.\nDo you really want to delete this model?") +#define RID_STR_QRY_REMOVE_INSTANCE NC_("RID_STR_QRY_REMOVE_INSTANCE", "Deleting the instance '$INSTANCENAME' affects all controls currently bound to this instance.\nDo you really want to delete this instance?") +#define RID_STR_QRY_REMOVE_ELEMENT NC_("RID_STR_QRY_REMOVE_ELEMENT", "Deleting the element '$ELEMENTNAME' affects all controls currently bound to this element.\nDo you really want to delete this element?") +#define RID_STR_QRY_REMOVE_ATTRIBUTE NC_("RID_STR_QRY_REMOVE_ATTRIBUTE", "Do you really want to delete the attribute '$ATTRIBUTENAME'?") +#define RID_STR_QRY_REMOVE_SUBMISSION NC_("RID_STR_QRY_REMOVE_SUBMISSION", "Deleting the submission '$SUBMISSIONNAME' affects all controls currently bound to this submission.\n\nDo you really want to delete this submission?") +#define RID_STR_QRY_REMOVE_BINDING NC_("RID_STR_QRY_REMOVE_BINDING", "Deleting the binding '$BINDINGNAME' affects all controls currently bound to this binding.\n\nDo you really want to delete this binding?") +#define RID_STR_INVALID_XMLNAME NC_("RID_STR_INVALID_XMLNAME", "The name '%1' is not valid in XML. Please enter a different name.") +#define RID_STR_INVALID_XMLPREFIX NC_("RID_STR_INVALID_XMLPREFIX", "The prefix '%1' is not valid in XML. Please enter a different prefix.") +#define RID_STR_DOUBLE_MODELNAME NC_("RID_STR_DOUBLE_MODELNAME", "The name '%1' already exists. Please enter a new name.") +#define RID_STR_EMPTY_SUBMISSIONNAME NC_("RID_STR_EMPTY_SUBMISSIONNAME", "The submission must have a name.") +#define RID_STR_METHOD_POST NC_("RID_STR_METHOD_POST", "Post") +#define RID_STR_METHOD_PUT NC_("RID_STR_METHOD_PUT", "Put") +#define RID_STR_METHOD_GET NC_("RID_STR_METHOD_GET", "Get") +#define RID_STR_REPLACE_NONE NC_("RID_STR_REPLACE_NONE", "None") +#define RID_STR_REPLACE_INST NC_("RID_STR_REPLACE_INST", "Instance") +#define RID_STR_REPLACE_DOC NC_("RID_STR_REPLACE_DOC", "Document") +#define RID_STR_DATANAV_SUBM_BIND NC_("RID_STR_DATANAV_SUBM_BIND", "Binding: ") +#define RID_STR_DATANAV_SUBM_REF NC_("RID_STR_DATANAV_SUBM_REF", "Reference: ") +#define RID_STR_DATANAV_SUBM_ACTION NC_("RID_STR_DATANAV_SUBM_ACTION", "Action: ") +#define RID_STR_DATANAV_SUBM_METHOD NC_("RID_STR_DATANAV_SUBM_METHOD", "Method: ") +#define RID_STR_DATANAV_SUBM_REPLACE NC_("RID_STR_DATANAV_SUBM_REPLACE", "Replace: ") +#define RID_STR_DATANAV_ADD_ELEMENT NC_("RID_STR_DATANAV_ADD_ELEMENT", "Add Element") +#define RID_STR_DATANAV_EDIT_ELEMENT NC_("RID_STR_DATANAV_EDIT_ELEMENT", "Edit Element") +#define RID_STR_DATANAV_REMOVE_ELEMENT NC_("RID_STR_DATANAV_REMOVE_ELEMENT", "Delete Element") +#define RID_STR_DATANAV_ADD_ATTRIBUTE NC_("RID_STR_DATANAV_ADD_ATTRIBUTE", "Add Attribute") +#define RID_STR_DATANAV_EDIT_ATTRIBUTE NC_("RID_STR_DATANAV_EDIT_ATTRIBUTE", "Edit Attribute") +#define RID_STR_DATANAV_REMOVE_ATTRIBUTE NC_("RID_STR_DATANAV_REMOVE_ATTRIBUTE", "Delete Attribute") +#define RID_STR_DATANAV_ADD_BINDING NC_("RID_STR_DATANAV_ADD_BINDING", "Add Binding") +#define RID_STR_DATANAV_EDIT_BINDING NC_("RID_STR_DATANAV_EDIT_BINDING", "Edit Binding") +#define RID_STR_DATANAV_REMOVE_BINDING NC_("RID_STR_DATANAV_REMOVE_BINDING", "Delete Binding") +#define RID_STR_DATANAV_ADD_SUBMISSION NC_("RID_STR_DATANAV_ADD_SUBMISSION", "Add Submission") +#define RID_STR_DATANAV_EDIT_SUBMISSION NC_("RID_STR_DATANAV_EDIT_SUBMISSION", "Edit Submission") +#define RID_STR_DATANAV_REMOVE_SUBMISSION NC_("RID_STR_DATANAV_REMOVE_SUBMISSION", "Delete Submission") +#define RID_STR_ELEMENT NC_("RID_STR_ELEMENT", "Element") +#define RID_STR_ATTRIBUTE NC_("RID_STR_ATTRIBUTE", "Attribute") +#define RID_STR_BINDING NC_("RID_STR_BINDING", "Binding") +#define RID_STR_BINDING_EXPR NC_("RID_STR_BINDING_EXPR", "Binding expression") + +#define RID_SVXSTR_QUERY_EXIT_RECOVERY NC_("RID_SVXSTR_QUERY_EXIT_RECOVERY", "Are you sure you want to discard the %PRODUCTNAME document recovery data?") + +#define RID_SVXSTR_RULER_TAB_LEFT NC_("RID_SVXSTR_RULER_TAB_LEFT", "Left") +#define RID_SVXSTR_RULER_TAB_RIGHT NC_("RID_SVXSTR_RULER_TAB_RIGHT", "Right") +#define RID_SVXSTR_RULER_TAB_CENTER NC_("RID_SVXSTR_RULER_TAB_CENTER", "Center") +#define RID_SVXSTR_RULER_TAB_DECIMAL NC_("RID_SVXSTR_RULER_TAB_DECIMAL", "Decimal") + +#define RID_SVXSTR_INSERT_HELPTEXT NC_("RID_SVXSTR_INSERT_HELPTEXT", "Insert mode. Click to change to overwrite mode.") +#define RID_SVXSTR_OVERWRITE_HELPTEXT NC_("RID_SVXSTR_OVERWRITE_HELPTEXT", "Overwrite mode. Click to change to insert mode.") +// To be shown in the status bar when in overwrite mode, please try to make it not longer than the word 'Overwrite'. +#define RID_SVXSTR_OVERWRITE_TEXT NC_("RID_SVXSTR_OVERWRITE_TEXT", "Overwrite") +#define RID_SVXSTR_XMLSEC_SIG_OK NC_("RID_SVXSTR_XMLSEC_SIG_OK", "Digital Signature: The document signature is OK.") +#define RID_SVXSTR_XMLSEC_SIG_OK_NO_VERIFY NC_("RID_SVXSTR_XMLSEC_SIG_OK_NO_VERIFY", "Digital Signature: The document signature is OK, but the certificates could not be validated.") +#define RID_SVXSTR_XMLSEC_SIG_NOT_OK NC_("RID_SVXSTR_XMLSEC_SIG_NOT_OK", "Digital Signature: The document signature does not match the document content. We strongly recommend you to do not trust this document.") +#define RID_SVXSTR_XMLSEC_NO_SIG NC_("RID_SVXSTR_XMLSEC_NO_SIG", "Digital Signature: The document is not signed.") +#define RID_SVXSTR_XMLSEC_SIG_CERT_OK_PARTIAL_SIG NC_("RID_SVXSTR_XMLSEC_SIG_CERT_OK_PARTIAL_SIG", "Digital Signature: The document signature and the certificate are OK, but not all parts of the document are signed.") +#define RID_SVXSTR_DOC_MODIFIED_YES NC_("RID_SVXSTR_DOC_MODIFIED_YES", "The document has been modified. Click to save the document.") +#define RID_SVXSTR_DOC_MODIFIED_NO NC_("RID_SVXSTR_DOC_MODIFIED_NO", "The document has not been modified since the last save.") +#define RID_SVXSTR_DOC_LOAD NC_("RID_SVXSTR_DOC_LOAD", "Loading document...") +#define RID_SVXSTR_FIT_SLIDE NC_("RID_SVXSTR_FIT_SLIDE", "Fit slide to current window.") +#define RID_SVXSTR_WARN_MISSING_SMARTART NC_("RID_SVXSTR_WARN_MISSING_SMARTART", "Could not load all SmartArts. Saving in Microsoft Office 2010 or later would avoid this issue.") +#define RID_SVXSTR_ZOOMTOOL_HINT NC_("RID_SVXSTR_ZOOMTOOL_HINT", "Zoom level. Right-click to change zoom level or click to open Zoom dialog.") +#define RID_SVXSTR_ZOOM_IN NC_("RID_SVXSTR_ZOOM_IN", "Zoom In") +#define RID_SVXSTR_ZOOM_OUT NC_("RID_SVXSTR_ZOOM_OUT", "Zoom Out") +#define RID_SVXSTR_ZOOM_25 NC_("RID_SVXSTR_ZOOM_25", "25%") +#define RID_SVXSTR_ZOOM_50 NC_("RID_SVXSTR_ZOOM_50", "50%") +#define RID_SVXSTR_ZOOM_75 NC_("RID_SVXSTR_ZOOM_75", "75%") +#define RID_SVXSTR_ZOOM_100 NC_("RID_SVXSTR_ZOOM_100", "100%") +#define RID_SVXSTR_ZOOM_150 NC_("RID_SVXSTR_ZOOM_150", "150%") +#define RID_SVXSTR_ZOOM_200 NC_("RID_SVXSTR_ZOOM_200", "200%") +#define RID_SVXSTR_ZOOM_WHOLE_PAGE NC_("RID_SVXSTR_ZOOM_WHOLE_PAGE", "Entire Page") +#define RID_SVXSTR_ZOOM_PAGE_WIDTH NC_("RID_SVXSTR_ZOOM_PAGE_WIDTH", "Page Width") +#define RID_SVXSTR_ZOOM_OPTIMAL_VIEW NC_("RID_SVXSTR_ZOOM_OPTIMAL_VIEW", "Optimal View") +#define RID_SIDEBAR_EMPTY_PANEL_TEXT NC_("RID_SIDEBAR_EMPTY_PANEL_TEXT", "Properties for the task that you are performing are not available for the current selection") + +#define RID_SVXSTR_SEARCH_STYLES NC_("RID_SVXSTR_SEARCH_STYLES", "Including Styles") +#define RID_SVXSTR_WRITER_STYLES NC_("RID_SVXSTR_WRITER_STYLES", "Paragraph St~yles") +#define RID_SVXSTR_CALC_STYLES NC_("RID_SVXSTR_CALC_STYLES", "Cell St~yles") +#define RID_SVXSTR_SEARCH NC_("RID_SVXSTR_SEARCH", "(Search)") +#define RID_SVXSTR_REPLACE NC_("RID_SVXSTR_REPLACE", "(Replace)") +#define RID_SVXSTR_SEARCH_END NC_("RID_SVXSTR_SEARCH_END", "Reached the end of the document") +#define RID_SVXSTR_SEARCH_END_SHEET NC_("RID_SVXSTR_SEARCH_END_SHEET", "Reached the end of the sheet") +#define RID_SVXSTR_SEARCH_NOT_FOUND NC_("RID_SVXSTR_SEARCH_NOT_FOUND", "Search key not found") +#define RID_SVXSTR_SEARCH_START NC_("RID_SVXSTR_SEARCH_START", "Reached the beginning of the document") + +#define RID_SVXDLG_BMPMASK_STR_PALETTE NC_("RID_SVXDLG_BMPMASK_STR_PALETTE", "Color Palette") + +#define RID_SVXSTR_ERR_OLD_PASSWD NC_("RID_SVXSTR_ERR_OLD_PASSWD", "Invalid password") +#define RID_SVXSTR_ERR_REPEAT_PASSWD NC_("RID_SVXSTR_ERR_REPEAT_PASSWD", "Passwords do not match") + +#define RID_SVXSTR_BULLET_DESCRIPTION_0 NC_("RID_SVXSTR_BULLET_DESCRIPTION_0", "Solid small circular bullets") +#define RID_SVXSTR_BULLET_DESCRIPTION_1 NC_("RID_SVXSTR_BULLET_DESCRIPTION_1", "Solid large circular bullets") +#define RID_SVXSTR_BULLET_DESCRIPTION_2 NC_("RID_SVXSTR_BULLET_DESCRIPTION_2", "Solid diamond bullets") +#define RID_SVXSTR_BULLET_DESCRIPTION_3 NC_("RID_SVXSTR_BULLET_DESCRIPTION_3", "Solid large square bullets") +#define RID_SVXSTR_BULLET_DESCRIPTION_4 NC_("RID_SVXSTR_BULLET_DESCRIPTION_4", "Right pointing arrow bullets filled out") +#define RID_SVXSTR_BULLET_DESCRIPTION_5 NC_("RID_SVXSTR_BULLET_DESCRIPTION_5", "Right pointing arrow bullets") +#define RID_SVXSTR_BULLET_DESCRIPTION_6 NC_("RID_SVXSTR_BULLET_DESCRIPTION_6", "Check mark bullets") +#define RID_SVXSTR_BULLET_DESCRIPTION_7 NC_("RID_SVXSTR_BULLET_DESCRIPTION_7", "Tick mark bullets") +#define RID_SVXSTR_SINGLENUM_DESCRIPTION_0 NC_("RID_SVXSTR_SINGLENUM_DESCRIPTION_0", "Number 1) 2) 3)") +#define RID_SVXSTR_SINGLENUM_DESCRIPTION_1 NC_("RID_SVXSTR_SINGLENUM_DESCRIPTION_1", "Number 1. 2. 3.") +#define RID_SVXSTR_SINGLENUM_DESCRIPTION_2 NC_("RID_SVXSTR_SINGLENUM_DESCRIPTION_2", "Number (1) (2) (3)") +#define RID_SVXSTR_SINGLENUM_DESCRIPTION_3 NC_("RID_SVXSTR_SINGLENUM_DESCRIPTION_3", "Uppercase Roman number I. II. III.") +#define RID_SVXSTR_SINGLENUM_DESCRIPTION_4 NC_("RID_SVXSTR_SINGLENUM_DESCRIPTION_4", "Uppercase letter A) B) C)") +#define RID_SVXSTR_SINGLENUM_DESCRIPTION_5 NC_("RID_SVXSTR_SINGLENUM_DESCRIPTION_5", "Lowercase letter a) b) c)") +#define RID_SVXSTR_SINGLENUM_DESCRIPTION_6 NC_("RID_SVXSTR_SINGLENUM_DESCRIPTION_6", "Lowercase letter (a) (b) (c)") +#define RID_SVXSTR_SINGLENUM_DESCRIPTION_7 NC_("RID_SVXSTR_SINGLENUM_DESCRIPTION_7", "Lowercase Roman number i. ii. iii.") +#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_0 NC_("RID_SVXSTR_OUTLINENUM_DESCRIPTION_0", "Numeric, numeric, lowercase letters, solid small circular bullet") +#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_1 NC_("RID_SVXSTR_OUTLINENUM_DESCRIPTION_1", "Numeric, lowercase letters, solid small circular bullet") +#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_2 NC_("RID_SVXSTR_OUTLINENUM_DESCRIPTION_2", "Numeric, lowercase letters, lowercase Roman, uppercase letters, solid small circular bullet") +#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_3 NC_("RID_SVXSTR_OUTLINENUM_DESCRIPTION_3", "Numeric") +#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_4 NC_("RID_SVXSTR_OUTLINENUM_DESCRIPTION_4", "Uppercase Roman, uppercase letters, lowercase Roman, lowercase letters, solid small circular bullet") +#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_5 NC_("RID_SVXSTR_OUTLINENUM_DESCRIPTION_5", "Uppercase letters, uppercase Roman, lowercase letters, lowercase Roman, solid small circular bullet") +#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_6 NC_("RID_SVXSTR_OUTLINENUM_DESCRIPTION_6", "Numeric with all sublevels") +#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_7 NC_("RID_SVXSTR_OUTLINENUM_DESCRIPTION_7", "Right pointing bullet, right pointing arrow bullet, solid diamond bullet, solid small circular bullet") + +#define RID_SVXSTR_SAFEMODE_ZIP_FAILURE NC_("RID_SVXSTR_SAFEMODE_ZIP_FAILURE", "The zip file could not be created.") + +#define RID_SVXSTR_STYLEFAMILY_TABLEDESIGN NC_("RID_SVXSTR_STYLEFAMILY_TABLEDESIGN", "Table Design Styles") + +#define RID_SVXSTR_NUM_UNDO_ACTIONS NC_("RID_SVXSTR_NUM_UNDO_ACTIONS", "Actions to undo: $(ARG1)") +#define RID_SVXSTR_NUM_UNDO_ACTION NC_("RID_SVXSTR_NUM_UNDO_ACTION", "Actions to undo: $(ARG1)") +#define RID_SVXSTR_NUM_REDO_ACTIONS NC_("RID_SVXSTR_NUM_REDO_ACTIONS", "Actions to redo: $(ARG1)") +#define RID_SVXSTR_NUM_REDO_ACTION NC_("RID_SVXSTR_NUM_REDO_ACTION", "Actions to redo: $(ARG1)") + +#define RID_SVXSTR_FINDBAR_FIND NC_("RID_SVXSTR_FINDBAR_FIND", "Find") +#define RID_SVXSTR_FINDBAR_MATCHCASE NC_("RID_SVXSTR_FINDBAR_MATCHCASE", "Match Case") +#define RID_SVXSTR_FINDBAR_SEARCHFORMATTED NC_("RID_SVXSTR_FINDBAR_SEARCHFORMATTED", "Formatted Display") + +#define STR_IMAGE_ORIGINAL_SIZE NC_("STR_IMAGE_ORIGINAL_SIZE", "$(WIDTH) x $(HEIGHT) ($(WIDTH_IN_PX) x $(HEIGHT_IN_PX) px)") +#define STR_IMAGE_VIEW_SIZE NC_("STR_IMAGE_VIEW_SIZE", "$(WIDTH) x $(HEIGHT) at $(DPI) DPI") +#define STR_IMAGE_CAPACITY NC_("STR_IMAGE_CAPACITY", "$(CAPACITY) kiB") +#define STR_IMAGE_GIF NC_("STR_IMAGE_GIF", "Gif image") +#define STR_IMAGE_JPEG NC_("STR_IMAGE_JPEG", "Jpeg image") +#define STR_IMAGE_PNG NC_("STR_IMAGE_PNG", "PNG image") +#define STR_IMAGE_TIFF NC_("STR_IMAGE_TIFF", "TIFF image") +#define STR_IMAGE_WMF NC_("STR_IMAGE_WMF", "WMF image") +#define STR_IMAGE_MET NC_("STR_IMAGE_MET", "MET image") +#define STR_IMAGE_PCT NC_("STR_IMAGE_PCT", "PCT image") +#define STR_IMAGE_SVG NC_("STR_IMAGE_SVG", "SVG image") +#define STR_IMAGE_BMP NC_("STR_IMAGE_BMP", "BMP image") +#define STR_IMAGE_UNKNOWN NC_("STR_IMAGE_UNKNOWN", "Unknown") + +#define STR_SWITCH NC_("STR_SWITCH", "Switch") + +#define RID_SVXSTR_UNDO_GRAFMODE NC_("RID_SVXSTR_UNDO_GRAFMODE", "Image Mode") +#define RID_SVXSTR_UNDO_GRAFRED NC_("RID_SVXSTR_UNDO_GRAFRED", "Red") +#define RID_SVXSTR_UNDO_GRAFGREEN NC_("RID_SVXSTR_UNDO_GRAFGREEN", "Green") +#define RID_SVXSTR_UNDO_GRAFBLUE NC_("RID_SVXSTR_UNDO_GRAFBLUE", "Blue") +#define RID_SVXSTR_UNDO_GRAFLUMINANCE NC_("RID_SVXSTR_UNDO_GRAFLUMINANCE", "Brightness") +#define RID_SVXSTR_UNDO_GRAFCONTRAST NC_("RID_SVXSTR_UNDO_GRAFCONTRAST", "Contrast") +#define RID_SVXSTR_UNDO_GRAFGAMMA NC_("RID_SVXSTR_UNDO_GRAFGAMMA", "Gamma") +#define RID_SVXSTR_UNDO_GRAFTRANSPARENCY NC_("RID_SVXSTR_UNDO_GRAFTRANSPARENCY", "Transparency") +#define RID_SVXSTR_GRAFCROP NC_("RID_SVXSTR_GRAFCROP", "Crop") + +#define RID_SVXITEMS_ORI_STANDARD NC_("RID_SVXITEMS_ORI_STANDARD", "Default orientation") +#define RID_SVXITEMS_ORI_TOPBOTTOM NC_("RID_SVXITEMS_ORI_TOPBOTTOM", "From top to bottom") +#define RID_SVXITEMS_ORI_BOTTOMTOP NC_("RID_SVXITEMS_ORI_BOTTOMTOP", "Bottom to Top") +#define RID_SVXITEMS_ORI_STACKED NC_("RID_SVXITEMS_ORI_STACKED", "Stacked") +#define RID_SVXITEMS_MARGIN_LEFT NC_("RID_SVXITEMS_MARGIN_LEFT", "Left margin: ") +#define RID_SVXITEMS_MARGIN_TOP NC_("RID_SVXITEMS_MARGIN_TOP", "Top margin: ") +#define RID_SVXITEMS_MARGIN_RIGHT NC_("RID_SVXITEMS_MARGIN_RIGHT", "Right margin: ") +#define RID_SVXITEMS_MARGIN_BOTTOM NC_("RID_SVXITEMS_MARGIN_BOTTOM", "Bottom margin: ") +#define RID_SVXITEMS_PAGE_COMPLETE NC_("RID_SVXITEMS_PAGE_COMPLETE", "Page Description: ") +#define RID_SVXITEMS_PAGE_NUM_CHR_UPPER NC_("RID_SVXITEMS_PAGE_NUM_CHR_UPPER", "Capitals") +#define RID_SVXITEMS_PAGE_NUM_CHR_LOWER NC_("RID_SVXITEMS_PAGE_NUM_CHR_LOWER", "Lowercase") +#define RID_SVXITEMS_PAGE_NUM_ROM_UPPER NC_("RID_SVXITEMS_PAGE_NUM_ROM_UPPER", "Uppercase Roman") +#define RID_SVXITEMS_PAGE_NUM_ROM_LOWER NC_("RID_SVXITEMS_PAGE_NUM_ROM_LOWER", "Lowercase Roman") +#define RID_SVXITEMS_PAGE_NUM_ARABIC NC_("RID_SVXITEMS_PAGE_NUM_ARABIC", "Arabic") +#define RID_SVXITEMS_PAGE_NUM_NONE NC_("RID_SVXITEMS_PAGE_NUM_NONE", "None") +#define RID_SVXITEMS_PAGE_LAND_TRUE NC_("RID_SVXITEMS_PAGE_LAND_TRUE", "Landscape") +#define RID_SVXITEMS_PAGE_LAND_FALSE NC_("RID_SVXITEMS_PAGE_LAND_FALSE", "Portrait") +#define RID_SVXITEMS_PAGE_USAGE_LEFT NC_("RID_SVXITEMS_PAGE_USAGE_LEFT", "Left") +#define RID_SVXITEMS_PAGE_USAGE_RIGHT NC_("RID_SVXITEMS_PAGE_USAGE_RIGHT", "Right") +#define RID_SVXITEMS_PAGE_USAGE_ALL NC_("RID_SVXITEMS_PAGE_USAGE_ALL", "All") +#define RID_SVXITEMS_PAGE_USAGE_MIRROR NC_("RID_SVXITEMS_PAGE_USAGE_MIRROR", "Mirrored") +#define RID_SVXITEMS_AUTHOR_COMPLETE NC_("RID_SVXITEMS_AUTHOR_COMPLETE", "Author: ") +#define RID_SVXITEMS_DATE_COMPLETE NC_("RID_SVXITEMS_DATE_COMPLETE", "Date: ") +#define RID_SVXITEMS_TEXT_COMPLETE NC_("RID_SVXITEMS_TEXT_COMPLETE", "Text: ") +#define RID_SVXITEMS_BRUSH_CHAR NC_("RID_SVXITEMS_BRUSH_CHAR", "Character background") + +#define STR_COLORTABLE NC_("STR_COLORTABLE", "Color Palette") + +// String for saving modified image (instead of original) +#define RID_SVXSTR_SAVE_MODIFIED_IMAGE NC_("RID_SVXSTR_SAVE_MODIFIED_IMAGE", "The image has been modified. By default the original image will be saved.\nDo you want to save the modified version instead ?") + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx index c484c8736625..ab6a87344511 100644 --- a/include/svx/svddrgmt.hxx +++ b/include/svx/svddrgmt.hxx @@ -146,7 +146,7 @@ protected: void createSdrDragEntries_GlueDrag(); // old call forwarders to the SdrDragView - void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr) const; + void ImpTakeDescriptionStr(const char* pStrCacheID, OUString& rStr) const; SdrHdl* GetDragHdl() const { return getSdrDragView().mpDragHdl; } SdrHdlKind GetDragHdlKind() const { return getSdrDragView().meDragHdl; } SdrDragStat& DragStat() { return getSdrDragView().maDragStat; } diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx index ef0619358141..8cffd3cb6323 100644 --- a/include/svx/svdetc.hxx +++ b/include/svx/svdetc.hxx @@ -39,7 +39,6 @@ * is set. */ -class ResMgr; class SdrOutliner; class SdrModel; class SvtSysLocale; @@ -208,7 +207,6 @@ public: std::vector> aUserMakeObjUserDataHdl; SdrEngineDefaults* pDefaults; - ResMgr* pResMgr; OLEObjCache aOLEObjCache; @@ -224,7 +222,7 @@ SVX_DLLPUBLIC SdrGlobalData & GetSdrGlobalData(); namespace sdr { - SVX_DLLPUBLIC OUString GetResourceString(sal_uInt16 nResID); + SVX_DLLPUBLIC OUString GetResourceString(const char* pResID); } diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index 3009d9871bbb..dd2bd2ea3b4c 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -156,7 +156,7 @@ protected: SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList* pOL, SdrPageView* pPV, SdrSearchOptions nOptions, const SdrLayerIDSet* pMVisLay, SdrObject*& rpRootObj) const; SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList* pOL, SdrPageView* pPV, SdrSearchOptions nOptions, const SdrLayerIDSet* pMVisLay, SdrObject*& rpRootObj,const SdrMarkList * pMarkList) const; bool ImpIsFrameHandles() const; - void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, ImpTakeDescriptionOptions nOpt=ImpTakeDescriptionOptions::NONE) const; + void ImpTakeDescriptionStr(const char* pStrCacheID, OUString& rStr, ImpTakeDescriptionOptions nOpt=ImpTakeDescriptionOptions::NONE) const; // Generates a string including degrees symbol, from an angel specification in 1/100deg bool ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, bool bUnmark); diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index e330554c08cb..380564066a69 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -872,7 +872,7 @@ protected: tools::Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const; // for GetDragComment - void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr) const; + void ImpTakeDescriptionStr(const char* pStrCacheID, OUString& rStr) const; void ImpForcePlusData(); diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index 1781f6d5b128..6be7578d7d86 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/svx/svdstr.hrc b/include/svx/svdstr.hrc deleted file mode 100644 index 69bc66a44417..000000000000 --- a/include/svx/svdstr.hrc +++ /dev/null @@ -1,583 +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 . - */ - -#define SDR_ResourceBegin 2560 - -// Attention: All strings between SDR_StringCacheBegin and -// SDR_StringCacheEnd must be aligned next to each other. - -#define STR_ObjNameBegin (SDR_ResourceBegin) -#define STR_ObjNameSingulNONE (STR_ObjNameBegin + 0) -#define STR_ObjNamePluralNONE (STR_ObjNameBegin + 1) -#define STR_ObjNameSingulGRUP (STR_ObjNameBegin + 2) -#define STR_ObjNamePluralGRUP (STR_ObjNameBegin + 3) -#define STR_ObjNameSingulGRUPEMPTY (STR_ObjNameBegin + 4) -#define STR_ObjNamePluralGRUPEMPTY (STR_ObjNameBegin + 5) -#define STR_ObjNameSingulTable (STR_ObjNameBegin + 6) -#define STR_ObjNamePluralTable (STR_ObjNameBegin + 7) -#define STR_ObjNameSingulLINE (STR_ObjNameBegin + 8) -#define STR_ObjNameSingulLINE_Hori (STR_ObjNameBegin + 9) -#define STR_ObjNameSingulLINE_Vert (STR_ObjNameBegin + 10) -#define STR_ObjNameSingulLINE_Diag (STR_ObjNameBegin + 11) -#define STR_ObjNamePluralLINE (STR_ObjNameBegin + 12) -#define STR_ObjNameSingulRECT (STR_ObjNameBegin + 13) -#define STR_ObjNamePluralRECT (STR_ObjNameBegin + 14) -#define STR_ObjNameSingulQUAD (STR_ObjNameBegin + 15) -#define STR_ObjNamePluralQUAD (STR_ObjNameBegin + 16) -#define STR_ObjNameSingulPARAL (STR_ObjNameBegin + 17) -#define STR_ObjNamePluralPARAL (STR_ObjNameBegin + 18) -#define STR_ObjNameSingulRAUTE (STR_ObjNameBegin + 19) -#define STR_ObjNamePluralRAUTE (STR_ObjNameBegin + 20) -#define STR_ObjNameSingulRECTRND (STR_ObjNameBegin + 21) -#define STR_ObjNamePluralRECTRND (STR_ObjNameBegin + 22) -#define STR_ObjNameSingulQUADRND (STR_ObjNameBegin + 23) -#define STR_ObjNamePluralQUADRND (STR_ObjNameBegin + 24) -#define STR_ObjNameSingulPARALRND (STR_ObjNameBegin + 25) -#define STR_ObjNamePluralPARALRND (STR_ObjNameBegin + 26) -#define STR_ObjNameSingulRAUTERND (STR_ObjNameBegin + 27) -#define STR_ObjNamePluralRAUTERND (STR_ObjNameBegin + 28) -#define STR_ObjNameSingulCIRC (STR_ObjNameBegin + 29) -#define STR_ObjNamePluralCIRC (STR_ObjNameBegin + 30) -#define STR_ObjNameSingulSECT (STR_ObjNameBegin + 31) -#define STR_ObjNamePluralSECT (STR_ObjNameBegin + 32) -#define STR_ObjNameSingulCARC (STR_ObjNameBegin + 33) -#define STR_ObjNamePluralCARC (STR_ObjNameBegin + 34) -#define STR_ObjNameSingulCCUT (STR_ObjNameBegin + 35) -#define STR_ObjNamePluralCCUT (STR_ObjNameBegin + 36) -#define STR_ObjNameSingulCIRCE (STR_ObjNameBegin + 37) -#define STR_ObjNamePluralCIRCE (STR_ObjNameBegin + 38) -#define STR_ObjNameSingulSECTE (STR_ObjNameBegin + 39) -#define STR_ObjNamePluralSECTE (STR_ObjNameBegin + 40) -#define STR_ObjNameSingulCARCE (STR_ObjNameBegin + 41) -#define STR_ObjNamePluralCARCE (STR_ObjNameBegin + 42) -#define STR_ObjNameSingulCCUTE (STR_ObjNameBegin + 43) -#define STR_ObjNamePluralCCUTE (STR_ObjNameBegin + 44) -#define STR_ObjNameSingulPOLY (STR_ObjNameBegin + 45) -#define STR_ObjNameSingulPOLY_PointCount (STR_ObjNameBegin + 46) -#define STR_ObjNamePluralPOLY (STR_ObjNameBegin + 47) -#define STR_ObjNameSingulPLIN (STR_ObjNameBegin + 48) -#define STR_ObjNameSingulPLIN_PointCount (STR_ObjNameBegin + 49) -#define STR_ObjNamePluralPLIN (STR_ObjNameBegin + 50) -#define STR_ObjNameSingulPATHLINE (STR_ObjNameBegin + 51) -#define STR_ObjNamePluralPATHLINE (STR_ObjNameBegin + 52) -#define STR_ObjNameSingulPATHFILL (STR_ObjNameBegin + 53) -#define STR_ObjNamePluralPATHFILL (STR_ObjNameBegin + 54) -#define STR_ObjNameSingulFREELINE (STR_ObjNameBegin + 55) -#define STR_ObjNamePluralFREELINE (STR_ObjNameBegin + 56) -#define STR_ObjNameSingulFREEFILL (STR_ObjNameBegin + 57) -#define STR_ObjNamePluralFREEFILL (STR_ObjNameBegin + 58) -#define STR_ObjNameSingulCOMBLINE (STR_ObjNameBegin + 59) -#define STR_ObjNameSingulNATSPLN (STR_ObjNameBegin + 63) -#define STR_ObjNamePluralNATSPLN (STR_ObjNameBegin + 64) -#define STR_ObjNameSingulPERSPLN (STR_ObjNameBegin + 65) -#define STR_ObjNamePluralPERSPLN (STR_ObjNameBegin + 66) -#define STR_ObjNameSingulTEXT (STR_ObjNameBegin + 67) -#define STR_ObjNamePluralTEXT (STR_ObjNameBegin + 68) -#define STR_ObjNameSingulTEXTLNK (STR_ObjNameBegin + 69) -#define STR_ObjNamePluralTEXTLNK (STR_ObjNameBegin + 70) -#define STR_ObjNameSingulTITLETEXT (STR_ObjNameBegin + 75) -#define STR_ObjNamePluralTITLETEXT (STR_ObjNameBegin + 76) -#define STR_ObjNameSingulOUTLINETEXT (STR_ObjNameBegin + 77) -#define STR_ObjNamePluralOUTLINETEXT (STR_ObjNameBegin + 78) -#define STR_ObjNameSingulGRAF (STR_ObjNameBegin + 79) -#define STR_ObjNamePluralGRAF (STR_ObjNameBegin + 80) -#define STR_ObjNameSingulGRAFLNK (STR_ObjNameBegin + 81) -#define STR_ObjNamePluralGRAFLNK (STR_ObjNameBegin + 82) -#define STR_ObjNameSingulGRAFNONE (STR_ObjNameBegin + 83) -#define STR_ObjNamePluralGRAFNONE (STR_ObjNameBegin + 84) -#define STR_ObjNameSingulGRAFNONELNK (STR_ObjNameBegin + 85) -#define STR_ObjNamePluralGRAFNONELNK (STR_ObjNameBegin + 86) -#define STR_ObjNameSingulGRAFMTF (STR_ObjNameBegin + 87) -#define STR_ObjNamePluralGRAFMTF (STR_ObjNameBegin + 88) -#define STR_ObjNameSingulGRAFMTFLNK (STR_ObjNameBegin + 89) -#define STR_ObjNamePluralGRAFMTFLNK (STR_ObjNameBegin + 90) -#define STR_ObjNameSingulGRAFBMP (STR_ObjNameBegin + 91) -#define STR_ObjNamePluralGRAFBMP (STR_ObjNameBegin + 92) -#define STR_ObjNameSingulGRAFBMPLNK (STR_ObjNameBegin + 93) -#define STR_ObjNamePluralGRAFBMPLNK (STR_ObjNameBegin + 94) -#define STR_ObjNameSingulOLE2 (STR_ObjNameBegin + 99) -#define STR_ObjNamePluralOLE2 (STR_ObjNameBegin +100) -#define STR_ObjNameSingulFrame (STR_ObjNameBegin +104) -#define STR_ObjNamePluralFrame (STR_ObjNameBegin +105) -#define STR_ObjNameSingulEDGE (STR_ObjNameBegin +107) -#define STR_ObjNamePluralEDGE (STR_ObjNameBegin +108) -#define STR_ObjNameSingulCAPTION (STR_ObjNameBegin +109) -#define STR_ObjNamePluralCAPTION (STR_ObjNameBegin +110) -#define STR_ObjNameSingulPAGE (STR_ObjNameBegin +111) -#define STR_ObjNamePluralPAGE (STR_ObjNameBegin +112) -#define STR_ObjNameSingulMEASURE (STR_ObjNameBegin +113) -#define STR_ObjNamePluralMEASURE (STR_ObjNameBegin +114) -#define STR_ObjNamePlural (STR_ObjNameBegin +115) -#define STR_ObjNameNoObj (STR_ObjNameBegin +116) -#define STR_ObjNameSingulPlural (STR_ObjNameBegin +118) -#define STR_ObjNameSingulUno (STR_ObjNameBegin +119) -#define STR_ObjNamePluralUno (STR_ObjNameBegin +120) - -#define STR_ObjNameSingulCube3d (STR_ObjNameBegin + 121) -#define STR_ObjNamePluralCube3d (STR_ObjNameBegin + 122) -#define STR_ObjNameSingulExtrude3d (STR_ObjNameBegin + 123) -#define STR_ObjNamePluralExtrude3d (STR_ObjNameBegin + 124) -#define STR_ObjNameSingulLathe3d (STR_ObjNameBegin + 127) -#define STR_ObjNamePluralLathe3d (STR_ObjNameBegin + 128) -#define STR_ObjNameSingulObj3d (STR_ObjNameBegin + 129) -#define STR_ObjNamePluralObj3d (STR_ObjNameBegin + 130) -#define STR_ObjNameSingulScene3d (STR_ObjNameBegin + 133) -#define STR_ObjNamePluralScene3d (STR_ObjNameBegin + 134) -#define STR_ObjNameSingulSphere3d (STR_ObjNameBegin + 135) -#define STR_ObjNamePluralSphere3d (STR_ObjNameBegin + 136) - -#define STR_ObjNameSingulGRAFBMPTRANS (STR_ObjNameBegin + 137) -#define STR_ObjNameSingulGRAFBMPTRANSLNK (STR_ObjNameBegin + 138) - -#define STR_ObjNamePluralGRAFBMPTRANS (STR_ObjNameBegin + 139) -#define STR_ObjNamePluralGRAFBMPTRANSLNK (STR_ObjNameBegin + 140) - -#define STR_ObjNameSingulCUSTOMSHAPE (STR_ObjNameBegin + 141) -#define STR_ObjNamePluralCUSTOMSHAPE (STR_ObjNameBegin + 142) - -#define STR_ObjNameSingulMEDIA (STR_ObjNameBegin + 143) -#define STR_ObjNamePluralMEDIA (STR_ObjNameBegin + 144) - -#define STR_ObjNameSingulFONTWORK (STR_ObjNameBegin+145) - -// Svg support -#define STR_ObjNameSingulGRAFSVG (STR_ObjNameBegin + 147) -#define STR_ObjNamePluralGRAFSVG (STR_ObjNameBegin + 148) -#define STR_ObjNameSingulGRAFWMF (STR_ObjNameBegin + 149) -#define STR_ObjNamePluralGRAFWMF (STR_ObjNameBegin + 150) -#define STR_ObjNameSingulGRAFEMF (STR_ObjNameBegin + 151) -#define STR_ObjNamePluralGRAFEMF (STR_ObjNameBegin + 152) - -#define STR_ObjNameEnd (STR_ObjNamePluralGRAFEMF) - -#define STR_EditBegin (STR_ObjNameEnd+1) -#define STR_EditWithCopy (STR_EditBegin + 0) -#define STR_EditPosSize (STR_EditBegin + 1) -#define STR_EditDelete (STR_EditBegin + 2) -#define STR_EditMovToTop (STR_EditBegin + 3) -#define STR_EditMovToBtm (STR_EditBegin + 4) -#define STR_EditPutToTop (STR_EditBegin + 5) -#define STR_EditPutToBtm (STR_EditBegin + 6) -#define STR_EditRevOrder (STR_EditBegin + 7) -#define STR_EditMove (STR_EditBegin + 8) -#define STR_EditResize (STR_EditBegin + 9) -#define STR_EditRotate (STR_EditBegin + 10) -#define STR_EditMirrorHori (STR_EditBegin + 11) -#define STR_EditMirrorVert (STR_EditBegin + 12) -#define STR_EditMirrorDiag (STR_EditBegin + 13) -#define STR_EditMirrorFree (STR_EditBegin + 14) -#define STR_EditShear (STR_EditBegin + 15) -#define STR_EditCrook (STR_EditBegin + 16) -#define STR_EditCrookContortion (STR_EditBegin + 17) -#define STR_EditDistort (STR_EditBegin + 18) -#define STR_EditRipUp (STR_EditBegin + 19) -#define STR_EditSetPointsSmooth (STR_EditBegin + 20) -#define STR_EditSetSegmentsKind (STR_EditBegin + 21) -// free (22) -#define STR_EditSetGlueEscDir (STR_EditBegin + 23) -#define STR_EditSetGluePercent (STR_EditBegin + 24) -#define STR_EditSetGlueAlign (STR_EditBegin + 25) -#define STR_EditGroup (STR_EditBegin + 26) -#define STR_EditUngroup (STR_EditBegin + 27) -#define STR_EditSetAttributes (STR_EditBegin + 28) -#define STR_EditSetStylesheet (STR_EditBegin + 29) -#define STR_EditDelStylesheet (STR_EditBegin + 30) -#define STR_EditConvToPoly (STR_EditBegin + 31) -#define STR_EditConvToPolys (STR_EditBegin + 32) -#define STR_EditConvToCurve (STR_EditBegin + 33) -#define STR_EditConvToCurves (STR_EditBegin + 34) -#define STR_EditAlign (STR_EditBegin + 35) -#define STR_EditAlignVTop (STR_EditBegin + 36) -#define STR_EditAlignVBottom (STR_EditBegin + 37) -#define STR_EditAlignVCenter (STR_EditBegin + 38) -#define STR_EditAlignHLeft (STR_EditBegin + 39) -#define STR_EditAlignHRight (STR_EditBegin + 40) -#define STR_EditAlignHCenter (STR_EditBegin + 41) -#define STR_EditAlignCenter (STR_EditBegin + 42) -#define STR_EditTransform (STR_EditBegin + 43) -#define STR_EditCombine_PolyPoly (STR_EditBegin + 44) -#define STR_EditCombine_OnePoly (STR_EditBegin + 45) -#define STR_EditDismantle_Polys (STR_EditBegin + 46) -#define STR_EditDismantle_Lines (STR_EditBegin + 47) -#define STR_EditImportMtf (STR_EditBegin + 48) -// free (49-51) -#define STR_EditConvToContour (STR_EditBegin + 52) -#define STR_EditConvToContours (STR_EditBegin + 53) -#define STR_EditMergeMergePoly (STR_EditBegin + 54) -#define STR_EditMergeSubstractPoly (STR_EditBegin + 55) -#define STR_EditMergeIntersectPoly (STR_EditBegin + 56) -#define STR_DistributeMarkedObjects (STR_EditBegin + 57) -#define STR_EqualizeWidthMarkedObjects (STR_EditBegin + 58) -#define STR_EqualizeHeightMarkedObjects (STR_EditBegin + 59) -#define STR_EditEnd (STR_EqualizeHeightMarkedObjects) - -#define STR_ExchangeBegin (STR_EditEnd+1) -#define STR_ExchangePaste (STR_ExchangeBegin +0) -#define STR_ExchangeEnd (STR_ExchangePaste) - -#define STR_DragBegin (STR_ExchangeEnd+1) -#define STR_DragInsertPoint (STR_DragBegin + 0) -#define STR_DragInsertGluePoint (STR_DragBegin + 1) -#define STR_DragMethMovHdl (STR_DragBegin + 2) -#define STR_DragMethObjOwn (STR_DragBegin + 3) -#define STR_DragMethMove (STR_DragBegin + 4) -#define STR_DragMethResize (STR_DragBegin + 5) -#define STR_DragMethRotate (STR_DragBegin + 6) -#define STR_DragMethMirrorHori (STR_DragBegin + 7) -#define STR_DragMethMirrorVert (STR_DragBegin + 8) -#define STR_DragMethMirrorDiag (STR_DragBegin + 9) -#define STR_DragMethMirrorFree (STR_DragBegin +10) -#define STR_DragMethShear (STR_DragBegin +11) -#define STR_DragMethCrook (STR_DragBegin +12) -#define STR_DragMethCrookContortion (STR_DragBegin +13) -#define STR_DragMethDistort (STR_DragBegin +14) -#define STR_DragRectEckRad (STR_DragBegin +15) -#define STR_DragPathObj (STR_DragBegin +16) -#define STR_DragRectResize (STR_DragBegin +17) -#define STR_DragCaptFram (STR_DragBegin +18) -#define STR_DragCaptTail (STR_DragBegin +19) -#define STR_DragCircAngle (STR_DragBegin +20) -#define STR_DragEdgeTail (STR_DragBegin +21) -#define STR_DragMethGradient (STR_DragBegin +22) -#define STR_DragMethTransparence (STR_DragBegin +23) -#define STR_DragMethCrop (STR_DragBegin +24) -#define STR_DragEnd (STR_DragMethCrop) - -#define STR_ViewBegin (STR_DragEnd+1) -#define STR_ViewTextEdit (STR_ViewBegin + 0) -#define STR_ViewMarked (STR_ViewBegin + 1) -#define STR_ViewMarkedPoint (STR_ViewBegin + 2) -#define STR_ViewMarkedPoints (STR_ViewBegin + 3) -#define STR_ViewMarkedGluePoint (STR_ViewBegin + 4) -#define STR_ViewMarkedGluePoints (STR_ViewBegin + 5) -#define STR_ViewMarkObjs (STR_ViewBegin + 6) -#define STR_ViewMarkMoreObjs (STR_ViewBegin + 7) -#define STR_ViewMarkPoints (STR_ViewBegin + 8) -#define STR_ViewMarkMorePoints (STR_ViewBegin + 9) -#define STR_ViewMarkGluePoints (STR_ViewBegin +10) -#define STR_ViewMarkMoreGluePoints (STR_ViewBegin +11) -#define STR_ViewCreateObj (STR_ViewBegin +12) -#define STR_ViewEnd (STR_ViewCreateObj) - -#define STR_UndoBegin (STR_ViewEnd+1) -#define STR_UndoInsertObj (STR_UndoBegin + 0) -#define STR_UndoCopyObj (STR_UndoBegin + 1) -#define STR_UndoObjOrdNum (STR_UndoBegin + 2) -#define STR_UndoObjSetText (STR_UndoBegin + 3) - -#define STR_UndoNewPage (STR_UndoBegin + 4) -#define STR_UndoDelPage (STR_UndoBegin + 5) -#define STR_UndoCopPage (STR_UndoBegin + 6) -#define STR_UndoMovPage (STR_UndoBegin + 7) - -#define STR_UndoDelPageMasterDscr (STR_UndoBegin + 9) -#define STR_UndoChgPageMasterDscr (STR_UndoBegin +11) - -#define STR_UndoMergeModel (STR_UndoBegin +12) - -#define STR_UndoNewLayer (STR_UndoBegin +13) -#define STR_UndoDelLayer (STR_UndoBegin +14) -#define STR_UndoMovLayer (STR_UndoBegin +15) - -// #i73249# -#define STR_UndoObjName (STR_UndoBegin +16) -#define STR_UndoObjTitle (STR_UndoBegin +17) -#define STR_UndoObjDescription (STR_UndoBegin +18) -#define STR_UndoEnd (STR_UndoObjDescription) - -#define STR_LayerBegin (STR_UndoEnd+1) -#define STR_StandardLayerName (STR_LayerBegin +0) -#define STR_LayerEnd (STR_StandardLayerName) - -#define STR_ItemBegin (STR_LayerEnd+1) -#define STR_ItemValBegin (STR_ItemBegin) -#define STR_ItemValON (STR_ItemValBegin + 0) -#define STR_ItemValOFF (STR_ItemValBegin + 1) -#define STR_ItemValYES (STR_ItemValBegin + 2) -#define STR_ItemValNO (STR_ItemValBegin + 3) -#define STR_ItemValCAPTIONTYPE1 (STR_ItemValBegin + 4) -#define STR_ItemValCAPTIONTYPE2 (STR_ItemValBegin + 5) -#define STR_ItemValCAPTIONTYPE3 (STR_ItemValBegin + 6) -#define STR_ItemValCAPTIONTYPE4 (STR_ItemValBegin + 7) -#define STR_ItemValCAPTIONESCHORI (STR_ItemValBegin + 8) -#define STR_ItemValCAPTIONESCVERT (STR_ItemValBegin + 9) -#define STR_ItemValCAPTIONESCBESTFIT (STR_ItemValBegin + 10) -#define STR_ItemValFITTOSIZENONE (STR_ItemValBegin + 11) -#define STR_ItemValFITTOSIZEPROP (STR_ItemValBegin + 12) -#define STR_ItemValFITTOSIZEALLLINES (STR_ItemValBegin + 13) -#define STR_ItemValFITTOSIZERESIZEAT (STR_ItemValBegin + 14) -#define STR_ItemValTEXTVADJTOP (STR_ItemValBegin + 15) -#define STR_ItemValTEXTVADJCENTER (STR_ItemValBegin + 16) -#define STR_ItemValTEXTVADJBOTTOM (STR_ItemValBegin + 17) -#define STR_ItemValTEXTVADJBLOCK (STR_ItemValBegin + 18) -#define STR_ItemValTEXTVADJSTRETCH (STR_ItemValBegin + 19) -#define STR_ItemValTEXTHADJLEFT (STR_ItemValBegin + 20) -#define STR_ItemValTEXTHADJCENTER (STR_ItemValBegin + 21) -#define STR_ItemValTEXTHADJRIGHT (STR_ItemValBegin + 22) -#define STR_ItemValTEXTHADJBLOCK (STR_ItemValBegin + 23) -#define STR_ItemValTEXTHADJSTRETCH (STR_ItemValBegin + 24) -#define STR_ItemValTEXTANI_NONE (STR_ItemValBegin + 25) -#define STR_ItemValTEXTANI_BLINK (STR_ItemValBegin + 26) -#define STR_ItemValTEXTANI_SCROLL (STR_ItemValBegin + 27) -#define STR_ItemValTEXTANI_ALTERNATE (STR_ItemValBegin + 28) -#define STR_ItemValTEXTANI_SLIDE (STR_ItemValBegin + 29) -#define STR_ItemValTEXTANI_LEFT (STR_ItemValBegin + 30) -#define STR_ItemValTEXTANI_RIGHT (STR_ItemValBegin + 31) -#define STR_ItemValTEXTANI_UP (STR_ItemValBegin + 32) -#define STR_ItemValTEXTANI_DOWN (STR_ItemValBegin + 33) -#define STR_ItemValEDGE_ORTHOLINES (STR_ItemValBegin + 34) -#define STR_ItemValEDGE_THREELINES (STR_ItemValBegin + 35) -#define STR_ItemValEDGE_ONELINE (STR_ItemValBegin + 36) -#define STR_ItemValEDGE_BEZIER (STR_ItemValBegin + 37) -#define STR_ItemValMEASURE_STD (STR_ItemValBegin + 38) -#define STR_ItemValMEASURE_RADIUS (STR_ItemValBegin + 39) -#define STR_ItemValMEASURE_TEXTHAUTO (STR_ItemValBegin + 40) -#define STR_ItemValMEASURE_TEXTLEFTOUTSIDE (STR_ItemValBegin + 41) -#define STR_ItemValMEASURE_TEXTINSIDE (STR_ItemValBegin + 42) -#define STR_ItemValMEASURE_TEXTRIGHTOUTSID (STR_ItemValBegin + 43) -#define STR_ItemValMEASURE_TEXTVAUTO (STR_ItemValBegin + 44) -#define STR_ItemValMEASURE_ABOVE (STR_ItemValBegin + 45) -#define STR_ItemValMEASURETEXT_BREAKEDLINE (STR_ItemValBegin + 46) -#define STR_ItemValMEASURE_BELOW (STR_ItemValBegin + 47) -#define STR_ItemValMEASURETEXT_VERTICALCEN (STR_ItemValBegin + 48) -#define STR_ItemValCIRC_FULL (STR_ItemValBegin + 49) -#define STR_ItemValCIRC_SECT (STR_ItemValBegin + 50) -#define STR_ItemValCIRC_CUT (STR_ItemValBegin + 51) -#define STR_ItemValCIRC_ARC (STR_ItemValBegin + 52) -#define STR_ItemValEnd (STR_ItemValCIRC_ARC) - -// Strings for the template dialog -#define SIP_Begin (STR_ItemValEnd+1) - -#define SIP_UNKNOWN_ATTR (SIP_Begin + 0) -#define SIP_XA_LINESTYLE (SIP_Begin + 1) -#define SIP_XA_LINEDASH (SIP_Begin + 2) -#define SIP_XA_LINEWIDTH (SIP_Begin + 3) -#define SIP_XA_LINECOLOR (SIP_Begin + 4) -#define SIP_XA_LINESTART (SIP_Begin + 5) -#define SIP_XA_LINEEND (SIP_Begin + 6) -#define SIP_XA_LINESTARTWIDTH (SIP_Begin + 7) -#define SIP_XA_LINEENDWIDTH (SIP_Begin + 8) -#define SIP_XA_LINESTARTCENTER (SIP_Begin + 9) -#define SIP_XA_LINEENDCENTER (SIP_Begin + 10) -#define SIP_XA_LINETRANSPARENCE (SIP_Begin + 11) -#define SIP_XA_LINEJOINT (SIP_Begin + 12) -#define SIP_XATTRSET_LINE (SIP_Begin + 18) -#define SIP_XA_FILLSTYLE (SIP_Begin + 19) -#define SIP_XA_FILLCOLOR (SIP_Begin + 20) -#define SIP_XA_FILLGRADIENT (SIP_Begin + 21) -#define SIP_XA_FILLHATCH (SIP_Begin + 22) -#define SIP_XA_FILLBITMAP (SIP_Begin + 23) -#define SIP_XA_FILLTRANSPARENCE (SIP_Begin + 24) -#define SIP_XA_GRADIENTSTEPCOUNT (SIP_Begin + 25) -#define SIP_XA_FILLBMP_TILE (SIP_Begin + 26) -#define SIP_XA_FILLBMP_POS (SIP_Begin + 27) -#define SIP_XA_FILLBMP_SIZEX (SIP_Begin + 28) -#define SIP_XA_FILLBMP_SIZEY (SIP_Begin + 29) -#define SIP_XA_FILLFLOATTRANSPARENCE (SIP_Begin + 30) -#define SIP_XA_SECONDARYFILLCOLOR (SIP_Begin + 31) -#define SIP_XA_FILLBMP_SIZELOG (SIP_Begin + 32) -#define SIP_XA_FILLBMP_TILEOFFSETX (SIP_Begin + 33) -#define SIP_XA_FILLBMP_TILEOFFSETY (SIP_Begin + 34) -#define SIP_XA_FILLBMP_STRETCH (SIP_Begin + 35) -#define SIP_XA_FILLBMP_POSOFFSETX (SIP_Begin + 42) -#define SIP_XA_FILLBMP_POSOFFSETY (SIP_Begin + 43) -#define SIP_XA_FILLBACKGROUND (SIP_Begin + 44) -#define SIP_XATTRSET_FILL (SIP_Begin + 48) -#define SIP_XA_FORMTXTSTYLE (SIP_Begin + 49) -#define SIP_XA_FORMTXTADJUST (SIP_Begin + 50) -#define SIP_XA_FORMTXTDISTANCE (SIP_Begin + 51) -#define SIP_XA_FORMTXTSTART (SIP_Begin + 52) -#define SIP_XA_FORMTXTMIRROR (SIP_Begin + 53) -#define SIP_XA_FORMTXTOUTLINE (SIP_Begin + 54) -#define SIP_XA_FORMTXTSHADOW (SIP_Begin + 55) -#define SIP_XA_FORMTXTSHDWCOLOR (SIP_Begin + 56) -#define SIP_XA_FORMTXTSHDWXVAL (SIP_Begin + 57) -#define SIP_XA_FORMTXTSHDWYVAL (SIP_Begin + 58) -#define SIP_XA_FORMTXTHIDEFORM (SIP_Begin + 60) -#define SIP_XA_FORMTXTSHDWTRANSP (SIP_Begin + 61) -#define SIP_SA_SHADOW (SIP_Begin + 68) -#define SIP_SA_SHADOWCOLOR (SIP_Begin + 69) -#define SIP_SA_SHADOWXDIST (SIP_Begin + 70) -#define SIP_SA_SHADOWYDIST (SIP_Begin + 71) -#define SIP_SA_SHADOWTRANSPARENCE (SIP_Begin + 72) -#define SIP_SA_SHADOW3D (SIP_Begin + 73) -#define SIP_SA_SHADOWPERSP (SIP_Begin + 74) -#define SIP_SA_CAPTIONTYPE (SIP_Begin + 81) -#define SIP_SA_CAPTIONFIXEDANGLE (SIP_Begin + 82) -#define SIP_SA_CAPTIONANGLE (SIP_Begin + 83) -#define SIP_SA_CAPTIONGAP (SIP_Begin + 84) -#define SIP_SA_CAPTIONESCDIR (SIP_Begin + 85) -#define SIP_SA_CAPTIONESCISREL (SIP_Begin + 86) -#define SIP_SA_CAPTIONESCREL (SIP_Begin + 87) -#define SIP_SA_CAPTIONESCABS (SIP_Begin + 88) -#define SIP_SA_CAPTIONLINELEN (SIP_Begin + 89) -#define SIP_SA_CAPTIONFITLINELEN (SIP_Begin + 90) -#define SIP_SA_ECKENRADIUS (SIP_Begin + 98) -#define SIP_SA_TEXT_MINFRAMEHEIGHT (SIP_Begin + 99) -#define SIP_SA_TEXT_AUTOGROWHEIGHT (SIP_Begin + 100) -#define SIP_SA_TEXT_FITTOSIZE (SIP_Begin + 101) -#define SIP_SA_TEXT_LEFTDIST (SIP_Begin + 102) -#define SIP_SA_TEXT_RIGHTDIST (SIP_Begin + 103) -#define SIP_SA_TEXT_UPPERDIST (SIP_Begin + 104) -#define SIP_SA_TEXT_LOWERDIST (SIP_Begin + 105) -#define SIP_SA_TEXT_VERTADJUST (SIP_Begin + 106) -#define SIP_SA_TEXT_MAXFRAMEHEIGHT (SIP_Begin + 107) -#define SIP_SA_TEXT_MINFRAMEWIDTH (SIP_Begin + 108) -#define SIP_SA_TEXT_MAXFRAMEWIDTH (SIP_Begin + 109) -#define SIP_SA_TEXT_AUTOGROWWIDTH (SIP_Begin + 110) -#define SIP_SA_TEXT_HORZADJUST (SIP_Begin + 111) -#define SIP_SA_TEXT_ANIKIND (SIP_Begin + 112) -#define SIP_SA_TEXT_ANIDIRECTION (SIP_Begin + 113) -#define SIP_SA_TEXT_ANISTARTINSIDE (SIP_Begin + 114) -#define SIP_SA_TEXT_ANISTOPINSIDE (SIP_Begin + 115) -#define SIP_SA_TEXT_ANICOUNT (SIP_Begin + 116) -#define SIP_SA_TEXT_ANIDELAY (SIP_Begin + 117) -#define SIP_SA_TEXT_ANIAMOUNT (SIP_Begin + 118) -#define SIP_SA_TEXT_CONTOURFRAME (SIP_Begin + 119) -#define SIP_SA_CUSTOMSHAPE_ADJUSTMENT (SIP_Begin + 120) -#define SIP_SA_XMLATTRIBUTES (SIP_Begin + 121) -#define SIP_SA_TEXT_USEFIXEDCELLHEIGHT (SIP_Begin + 122) -#define SIP_SA_WORDWRAP (SIP_Begin + 123) -#define SIP_SA_CHAINNEXTNAME (SIP_Begin + 124) -#define SIP_SA_EDGEKIND (SIP_Begin + 128) -#define SIP_SA_EDGENODE1HORZDIST (SIP_Begin + 129) -#define SIP_SA_EDGENODE1VERTDIST (SIP_Begin + 130) -#define SIP_SA_EDGENODE2HORZDIST (SIP_Begin + 131) -#define SIP_SA_EDGENODE2VERTDIST (SIP_Begin + 132) -#define SIP_SA_EDGENODE1GLUEDIST (SIP_Begin + 133) -#define SIP_SA_EDGENODE2GLUEDIST (SIP_Begin + 134) -#define SIP_SA_EDGELINEDELTAANZ (SIP_Begin + 135) -#define SIP_SA_EDGELINE1DELTA (SIP_Begin + 136) -#define SIP_SA_EDGELINE2DELTA (SIP_Begin + 137) -#define SIP_SA_EDGELINE3DELTA (SIP_Begin + 138) -#define SIP_SA_MEASUREKIND (SIP_Begin + 148) -#define SIP_SA_MEASURETEXTHPOS (SIP_Begin + 149) -#define SIP_SA_MEASURETEXTVPOS (SIP_Begin + 150) -#define SIP_SA_MEASURELINEDIST (SIP_Begin + 151) -#define SIP_SA_MEASUREHELPLINEOVERHANG (SIP_Begin + 152) -#define SIP_SA_MEASUREHELPLINEDIST (SIP_Begin + 153) -#define SIP_SA_MEASUREHELPLINE1LEN (SIP_Begin + 154) -#define SIP_SA_MEASUREHELPLINE2LEN (SIP_Begin + 155) -#define SIP_SA_MEASUREBELOWREFEDGE (SIP_Begin + 156) -#define SIP_SA_MEASURETEXTROTA90 (SIP_Begin + 157) -#define SIP_SA_MEASURETEXTUPSIDEDOWN (SIP_Begin + 158) -#define SIP_SA_MEASUREOVERHANG (SIP_Begin + 159) -#define SIP_SA_MEASUREUNIT (SIP_Begin + 160) -#define SIP_SA_MEASURESCALE (SIP_Begin + 161) -#define SIP_SA_MEASURESHOWUNIT (SIP_Begin + 162) -#define SIP_SA_MEASUREFORMATSTRING (SIP_Begin + 163) -#define SIP_SA_MEASURETEXTAUTOANGLE (SIP_Begin + 164) -#define SIP_SA_MEASURETEXTAUTOANGLEVIEW (SIP_Begin + 165) -#define SIP_SA_MEASURETEXTISFIXEDANGLE (SIP_Begin + 166) -#define SIP_SA_MEASURETEXTFIXEDANGLE (SIP_Begin + 167) -#define SIP_SA_MEASUREDECIMALPLACES (SIP_Begin + 168) -#define SIP_SA_CIRCKIND (SIP_Begin + 173) -#define SIP_SA_CIRCSTARTANGLE (SIP_Begin + 174) -#define SIP_SA_CIRCENDANGLE (SIP_Begin + 175) -#define SIP_SA_OBJVISIBLE (SIP_Begin + 180) -#define SIP_SA_OBJMOVEPROTECT (SIP_Begin + 181) -#define SIP_SA_OBJSIZEPROTECT (SIP_Begin + 182) -#define SIP_SA_OBJPRINTABLE (SIP_Begin + 183) -#define SIP_SA_LAYERID (SIP_Begin + 184) -#define SIP_SA_LAYERNAME (SIP_Begin + 185) -#define SIP_SA_OBJECTNAME (SIP_Begin + 186) -#define SIP_SA_ALLPOSITIONX (SIP_Begin + 187) -#define SIP_SA_ALLPOSITIONY (SIP_Begin + 188) -#define SIP_SA_ALLSIZEWIDTH (SIP_Begin + 189) -#define SIP_SA_ALLSIZEHEIGHT (SIP_Begin + 190) -#define SIP_SA_ONEPOSITIONX (SIP_Begin + 191) -#define SIP_SA_ONEPOSITIONY (SIP_Begin + 192) -#define SIP_SA_ONESIZEWIDTH (SIP_Begin + 193) -#define SIP_SA_ONESIZEHEIGHT (SIP_Begin + 194) -#define SIP_SA_LOGICSIZEWIDTH (SIP_Begin + 195) -#define SIP_SA_LOGICSIZEHEIGHT (SIP_Begin + 196) -#define SIP_SA_ROTATEANGLE (SIP_Begin + 197) -#define SIP_SA_SHEARANGLE (SIP_Begin + 198) -#define SIP_SA_MOVEX (SIP_Begin + 199) -#define SIP_SA_MOVEY (SIP_Begin + 200) -#define SIP_SA_RESIZEXONE (SIP_Begin + 201) -#define SIP_SA_RESIZEYONE (SIP_Begin + 202) -#define SIP_SA_ROTATEONE (SIP_Begin + 203) -#define SIP_SA_HORZSHEARONE (SIP_Begin + 204) -#define SIP_SA_VERTSHEARONE (SIP_Begin + 205) -#define SIP_SA_RESIZEXALL (SIP_Begin + 206) -#define SIP_SA_RESIZEYALL (SIP_Begin + 207) -#define SIP_SA_ROTATEALL (SIP_Begin + 208) -#define SIP_SA_HORZSHEARALL (SIP_Begin + 209) -#define SIP_SA_VERTSHEARALL (SIP_Begin + 210) -#define SIP_SA_TRANSFORMREF1X (SIP_Begin + 211) -#define SIP_SA_TRANSFORMREF1Y (SIP_Begin + 212) -#define SIP_SA_TRANSFORMREF2X (SIP_Begin + 213) -#define SIP_SA_TRANSFORMREF2Y (SIP_Begin + 214) -#define SIP_EE_PARA_HYPHENATE (SIP_Begin + 215) -#define SIP_EE_PARA_BULLETSTATE (SIP_Begin + 216) -#define SIP_EE_PARA_OUTLLRSPACE (SIP_Begin + 217) -#define SIP_EE_PARA_OUTLLEVEL (SIP_Begin + 218) -#define SIP_EE_PARA_BULLET (SIP_Begin + 219) -#define SIP_EE_PARA_LRSPACE (SIP_Begin + 220) -#define SIP_EE_PARA_ULSPACE (SIP_Begin + 221) -#define SIP_EE_PARA_SBL (SIP_Begin + 222) -#define SIP_EE_PARA_JUST (SIP_Begin + 223) -#define SIP_EE_PARA_TABS (SIP_Begin + 224) -#define SIP_EE_CHAR_COLOR (SIP_Begin + 225) -#define SIP_EE_CHAR_FONTINFO (SIP_Begin + 226) -#define SIP_EE_CHAR_FONTHEIGHT (SIP_Begin + 227) -#define SIP_EE_CHAR_FONTWIDTH (SIP_Begin + 228) -#define SIP_EE_CHAR_WEIGHT (SIP_Begin + 229) -#define SIP_EE_CHAR_UNDERLINE (SIP_Begin + 230) -#define SIP_EE_CHAR_OVERLINE (SIP_Begin + 231) -#define SIP_EE_CHAR_STRIKEOUT (SIP_Begin + 232) -#define SIP_EE_CHAR_ITALIC (SIP_Begin + 233) -#define SIP_EE_CHAR_OUTLINE (SIP_Begin + 234) -#define SIP_EE_CHAR_SHADOW (SIP_Begin + 235) -#define SIP_EE_CHAR_ESCAPEMENT (SIP_Begin + 236) -#define SIP_EE_CHAR_PAIRKERNING (SIP_Begin + 237) -#define SIP_EE_CHAR_KERNING (SIP_Begin + 238) -#define SIP_EE_CHAR_WLM (SIP_Begin + 239) -#define SIP_EE_FEATURE_TAB (SIP_Begin + 240) -#define SIP_EE_FEATURE_LINEBR (SIP_Begin + 241) -#define SIP_EE_FEATURE_NOTCONV (SIP_Begin + 242) -#define SIP_EE_FEATURE_FIELD (SIP_Begin + 243) - -#define SIP_SA_GRAFRED (SIP_Begin + 244) -#define SIP_SA_GRAFGREEN (SIP_Begin + 245) -#define SIP_SA_GRAFBLUE (SIP_Begin + 246) -#define SIP_SA_GRAFLUMINANCE (SIP_Begin + 247) -#define SIP_SA_GRAFCONTRAST (SIP_Begin + 248) -#define SIP_SA_GRAFGAMMA (SIP_Begin + 249) -#define SIP_SA_GRAFTRANSPARENCE (SIP_Begin + 250) -#define SIP_SA_GRAFINVERT (SIP_Begin + 251) -#define SIP_SA_GRAFMODE (SIP_Begin + 252) -#define SIP_SA_GRAFCROP (SIP_Begin + 253) - -#define STR_TABLE_INSCOL (SIP_Begin + 265) -#define STR_TABLE_INSROW (SIP_Begin + 266) -#define STR_UNDO_COL_DELETE (SIP_Begin + 267) -#define STR_UNDO_ROW_DELETE (SIP_Begin + 268) -#define STR_TABLE_SPLIT (SIP_Begin + 269) -#define STR_TABLE_MERGE (SIP_Begin + 270) -#define STR_TABLE_NUMFORMAT (SIP_Begin + 271) -#define STR_TABLE_DISTRIBUTE_ROWS (SIP_Begin + 272) -#define STR_TABLE_DISTRIBUTE_COLUMNS (SIP_Begin + 273) -#define STR_TABLE_STYLE (SIP_Begin + 274) -#define STR_TABLE_STYLE_SETTINGS (SIP_Begin + 275) -#define STR_TABLE_DELETE_CELL_CONTENTS (SIP_Begin + 277) - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx index ec7b4a61e625..5f9b6049c5a9 100644 --- a/include/svx/svdundo.hxx +++ b/include/svx/svdundo.hxx @@ -128,9 +128,9 @@ protected: protected: SdrUndoObj(SdrObject& rNewObj); - void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, bool bRepeat = false) const; + void ImpTakeDescriptionStr(const char* pStrCacheID, OUString& rStr, bool bRepeat = false) const; - static SAL_WARN_UNUSED_RESULT OUString GetDescriptionStringForObject( const SdrObject& _rForObject, sal_uInt16 nStrCacheID, bool bRepeat = false ); + static SAL_WARN_UNUSED_RESULT OUString GetDescriptionStringForObject( const SdrObject& _rForObject, const char* pStrCacheID, bool bRepeat = false ); // #94278# new method for evtl. PageChange at UNDO/REDO void ImpShowPageOfThisObject(); @@ -557,7 +557,7 @@ protected: protected: SdrUndoPage(SdrPage& rNewPg); - static void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr); + static void ImpTakeDescriptionStr(const char* pStrCacheID, OUString& rStr); }; /** diff --git a/include/svx/svxerr.hxx b/include/svx/svxerr.hxx index 2c9fb5c08922..8ea7fce5b612 100644 --- a/include/svx/svxerr.hxx +++ b/include/svx/svxerr.hxx @@ -88,8 +88,10 @@ public: static void ensure(); }; -#endif +SVX_DLLPUBLIC const ErrMsgCode* getRID_SVXERRCODE(); +SVX_DLLPUBLIC const ErrMsgCode* getRID_SVXERRCTX(); +#endif #endif diff --git a/include/svx/svxitems.hrc b/include/svx/svxitems.hrc index 1870806f5c90..deb55860d82b 100644 --- a/include/svx/svxitems.hrc +++ b/include/svx/svxitems.hrc @@ -17,51 +17,79 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_SVXITEMS_HRC -#define INCLUDED_SVX_SVXITEMS_HRC +#ifndef INCLUDED_SVX_INC_SVX_ITEMS_HRC +#define INCLUDED_SVX_INC_SVX_ITEMS_HRC -#include +#include -// enum SvxCellOrientation -#define RID_SVXITEMS_ORI_STANDARD (RID_SVXITEMS_START + 410) -#define RID_SVXITEMS_ORI_TOPBOTTOM (RID_SVXITEMS_START + 411) -#define RID_SVXITEMS_ORI_BOTTOMTOP (RID_SVXITEMS_START + 412) -#define RID_SVXITEMS_ORI_STACKED (RID_SVXITEMS_START + 413) +#include "svx/svxitems.hrc" +#include "svx/svxids.hrc" +#include -// Complete-texts ----------------------------------------------------------- +#define NC_(Context, String) (Context "\004" u8##String) -#define RID_SVXITEMS_MARGIN_LEFT (RID_SVXITEMS_START + 480) -#define RID_SVXITEMS_MARGIN_TOP (RID_SVXITEMS_START + 481) -#define RID_SVXITEMS_MARGIN_RIGHT (RID_SVXITEMS_START + 482) -#define RID_SVXITEMS_MARGIN_BOTTOM (RID_SVXITEMS_START + 483) -#define RID_SVXITEMS_PAGE_COMPLETE (RID_SVXITEMS_START + 498) -#define RID_SVXITEMS_PAGE_NUM_BEGIN (RID_SVXITEMS_START + 499) -#define RID_SVXITEMS_PAGE_NUM_CHR_UPPER (RID_SVXITEMS_START + 499) -#define RID_SVXITEMS_PAGE_NUM_CHR_LOWER (RID_SVXITEMS_START + 500) -#define RID_SVXITEMS_PAGE_NUM_ROM_UPPER (RID_SVXITEMS_START + 501) -#define RID_SVXITEMS_PAGE_NUM_ROM_LOWER (RID_SVXITEMS_START + 502) -#define RID_SVXITEMS_PAGE_NUM_ARABIC (RID_SVXITEMS_START + 503) -#define RID_SVXITEMS_PAGE_NUM_NONE (RID_SVXITEMS_START + 504) -#define RID_SVXITEMS_PAGE_LAND_TRUE (RID_SVXITEMS_START + 505) -#define RID_SVXITEMS_PAGE_LAND_FALSE (RID_SVXITEMS_START + 506) -#define RID_SVXITEMS_PAGE_USAGE_LEFT (RID_SVXITEMS_START + 507) -#define RID_SVXITEMS_PAGE_USAGE_RIGHT (RID_SVXITEMS_START + 508) -#define RID_SVXITEMS_PAGE_USAGE_ALL (RID_SVXITEMS_START + 509) -#define RID_SVXITEMS_PAGE_USAGE_MIRROR (RID_SVXITEMS_START + 510) -#define RID_SVXITEMS_AUTHOR_COMPLETE (RID_SVXITEMS_START + 521) -#define RID_SVXITEMS_DATE_COMPLETE (RID_SVXITEMS_START + 522) -#define RID_SVXITEMS_TEXT_COMPLETE (RID_SVXITEMS_START + 523) - -#define RID_SVXITEMS_BRUSH_CHAR (RID_SVXITEMS_START + 527) -#define RID_ATTR_NAMES (RID_SVXITEMS_START + 528) - -// Overflow check -------------------------------------------------------- - -// Resource-Id's -#define ACT_RID_SVXITEMS_END RID_ATTR_NAMES -#if ACT_RID_SVXITEMS_END > RID_SVXITEMS_END -#error Resource overflow in #line, #file -#endif +const std::pair RID_ATTR_NAMES[] = +{ + { NC_("RID_ATTR_NAMES", "Scale") , SID_ATTR_ZOOM }, + { NC_("RID_ATTR_NAMES", "Brush") , SID_ATTR_BRUSH }, + { NC_("RID_ATTR_NAMES", "Tab stops") , SID_ATTR_TABSTOP }, + { NC_("RID_ATTR_NAMES", "Character") , SID_ATTR_CHAR }, + { NC_("RID_ATTR_NAMES", "Font") , SID_ATTR_CHAR_FONT }, + { NC_("RID_ATTR_NAMES", "Font posture") , SID_ATTR_CHAR_POSTURE }, + { NC_("RID_ATTR_NAMES", "Font weight") , SID_ATTR_CHAR_WEIGHT }, + { NC_("RID_ATTR_NAMES", "Shadowed") , SID_ATTR_CHAR_SHADOWED }, + { NC_("RID_ATTR_NAMES", "Individual words") , SID_ATTR_CHAR_WORDLINEMODE }, + { NC_("RID_ATTR_NAMES", "Outline") , SID_ATTR_CHAR_CONTOUR }, + { NC_("RID_ATTR_NAMES", "Strikethrough") , SID_ATTR_CHAR_STRIKEOUT }, + { NC_("RID_ATTR_NAMES", "Underline") , SID_ATTR_CHAR_UNDERLINE }, + { NC_("RID_ATTR_NAMES", "Font size") , SID_ATTR_CHAR_FONTHEIGHT }, + { NC_("RID_ATTR_NAMES", "Rel. Font size") , SID_ATTR_CHAR_PROPSIZE }, + { NC_("RID_ATTR_NAMES", "Font color") , SID_ATTR_CHAR_COLOR }, + { NC_("RID_ATTR_NAMES", "Kerning") , SID_ATTR_CHAR_KERNING }, + { NC_("RID_ATTR_NAMES", "Effects") , SID_ATTR_CHAR_CASEMAP }, + { NC_("RID_ATTR_NAMES", "Language"), SID_ATTR_CHAR_LANGUAGE }, + { NC_("RID_ATTR_NAMES", "Position") , SID_ATTR_CHAR_ESCAPEMENT }, + { NC_("RID_ATTR_NAMES", "Character blinking") , SID_ATTR_CHAR_AUTOKERN }, + { NC_("RID_ATTR_NAMES", "Character set color") , SID_ATTR_CHAR_CHARSETCOLOR }, + { NC_("RID_ATTR_NAMES", "Overline") , SID_ATTR_CHAR_OVERLINE }, + { NC_("RID_ATTR_NAMES", "Paragraph") , SID_ATTR_PARA }, + { NC_("RID_ATTR_NAMES", "Alignment") , SID_ATTR_PARA_ADJUST }, + { NC_("RID_ATTR_NAMES", "Line spacing") , SID_ATTR_PARA_LINESPACE }, + { NC_("RID_ATTR_NAMES", "Page Break") , SID_ATTR_PARA_PAGEBREAK }, + { NC_("RID_ATTR_NAMES", "Hyphenation") , SID_ATTR_PARA_HYPHENZONE }, + { NC_("RID_ATTR_NAMES", "Do not split paragraph"), SID_ATTR_PARA_SPLIT }, + { NC_("RID_ATTR_NAMES", "Orphans") , SID_ATTR_PARA_ORPHANS }, + { NC_("RID_ATTR_NAMES", "Widows") , SID_ATTR_PARA_WIDOWS }, + { NC_("RID_ATTR_NAMES", "Paragraph spacing") , SID_ATTR_PARA_ULSPACE }, + { NC_("RID_ATTR_NAMES", "Paragraph indent") , SID_ATTR_PARA_LRSPACE }, + { NC_("RID_ATTR_NAMES", "Indent") , SID_ATTR_LRSPACE }, + { NC_("RID_ATTR_NAMES", "Spacing") , SID_ATTR_ULSPACE }, + { NC_("RID_ATTR_NAMES", "Page") , SID_ATTR_PAGE }, + { NC_("RID_ATTR_NAMES", "Page Style") , SID_ATTR_PARA_MODEL }, + { NC_("RID_ATTR_NAMES", "Keep with next paragraph"), SID_ATTR_PARA_KEEP }, + { NC_("RID_ATTR_NAMES", "Blinking") , SID_ATTR_FLASH }, + { NC_("RID_ATTR_NAMES", "Register-true") , SID_ATTR_PARA_REGISTER }, + { NC_("RID_ATTR_NAMES", "Character background") , SID_ATTR_BRUSH_CHAR }, + { NC_("RID_ATTR_NAMES", "Asian font") , SID_ATTR_CHAR_CJK_FONT }, + { NC_("RID_ATTR_NAMES", "Size of Asian font") , SID_ATTR_CHAR_CJK_FONTHEIGHT }, + { NC_("RID_ATTR_NAMES", "Language of Asian font"), SID_ATTR_CHAR_CJK_LANGUAGE }, + { NC_("RID_ATTR_NAMES", "Posture of Asian font") , SID_ATTR_CHAR_CJK_POSTURE }, + { NC_("RID_ATTR_NAMES", "Weight of Asian font") , SID_ATTR_CHAR_CJK_WEIGHT }, + { NC_("RID_ATTR_NAMES", "CTL") , SID_ATTR_CHAR_CTL_FONT }, + { NC_("RID_ATTR_NAMES", "Size of complex scripts") , SID_ATTR_CHAR_CTL_FONTHEIGHT }, + { NC_("RID_ATTR_NAMES", "Language of complex scripts"),SID_ATTR_CHAR_CTL_LANGUAGE }, + { NC_("RID_ATTR_NAMES", "Posture of complex scripts"), SID_ATTR_CHAR_CTL_POSTURE }, + { NC_("RID_ATTR_NAMES", "Weight of complex scripts"), SID_ATTR_CHAR_CTL_WEIGHT }, + { NC_("RID_ATTR_NAMES", "Double-lined") , SID_ATTR_CHAR_TWO_LINES }, + { NC_("RID_ATTR_NAMES", "Emphasis mark") , SID_ATTR_CHAR_EMPHASISMARK }, + { NC_("RID_ATTR_NAMES", "Text spacing") , SID_ATTR_PARA_SCRIPTSPACE }, + { NC_("RID_ATTR_NAMES", "Hanging punctuation") , SID_ATTR_PARA_HANGPUNCTUATION }, + { NC_("RID_ATTR_NAMES", "Forbidden characters") , SID_ATTR_PARA_FORBIDDEN_RULES }, + { NC_("RID_ATTR_NAMES", "Rotation") , SID_ATTR_CHAR_ROTATED }, + { NC_("RID_ATTR_NAMES", "Character scaling") , SID_ATTR_CHAR_SCALEWIDTH }, + { NC_("RID_ATTR_NAMES", "Relief") , SID_ATTR_CHAR_RELIEF }, + { NC_("RID_ATTR_NAMES", "Vertical text alignment") , SID_PARA_VERTALIGN } +}; #endif diff --git a/include/svx/swframeposstrings.hxx b/include/svx/swframeposstrings.hxx index e04522e326cb..0a52979a0219 100644 --- a/include/svx/swframeposstrings.hxx +++ b/include/svx/swframeposstrings.hxx @@ -27,12 +27,9 @@ contains strings needed for positioning dialogs of frames and drawing in Writer */ -class ResStringArray; class SVX_DLLPUBLIC SvxSwFramePosString { public: - SvxSwFramePosString(); - ~SvxSwFramePosString(); enum StringId { LEFT , @@ -80,10 +77,7 @@ public: STR_MAX }; - OUString GetString(StringId eId) const; - -private: - std::unique_ptr pImpl; + static OUString GetString(StringId eId); }; #endif diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx index ef86f26957f6..6fb31324f2a6 100644 --- a/include/svx/tbcontrl.hxx +++ b/include/svx/tbcontrl.hxx @@ -130,7 +130,7 @@ // ITEMID_... defines in the *.cxx -#include +#include #include #include #include diff --git a/include/svx/txencbox.hxx b/include/svx/txencbox.hxx index dc86c1626f0a..b9827c3cc841 100644 --- a/include/svx/txencbox.hxx +++ b/include/svx/txencbox.hxx @@ -23,19 +23,14 @@ #include #include -class SvxTextEncodingTable; - class SVX_DLLPUBLIC SvxTextEncodingBox : public ListBox { private: - const SvxTextEncodingTable* m_pEncTable; - SVX_DLLPRIVATE sal_Int32 EncodingToPos_Impl( rtl_TextEncoding nEnc ) const; public: SvxTextEncodingBox( vcl::Window* pParent, WinBits nBits ); virtual ~SvxTextEncodingBox() override; - virtual void dispose() override; /** Fill with all known encodings but exclude those matching one or more given flags as defined in rtl/tencinfo.h diff --git a/include/svx/txenctab.hxx b/include/svx/txenctab.hxx index 2c288aeae31a..74a72372c896 100644 --- a/include/svx/txenctab.hxx +++ b/include/svx/txenctab.hxx @@ -22,23 +22,15 @@ #include #include #include -#include - // class SvxTextEncodingTable - - -class SVX_DLLPUBLIC SvxTextEncodingTable : public ResStringArray +class SVX_DLLPUBLIC SvxTextEncodingTable { public: - SvxTextEncodingTable(); - ~SvxTextEncodingTable(); - - const OUString GetTextString( const rtl_TextEncoding nEnc ) const; - rtl_TextEncoding GetTextEncoding( const OUString& rStr ) const; + static const OUString GetTextString(const rtl_TextEncoding nEnc); + static rtl_TextEncoding GetTextEncoding(const OUString& rStr); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/ucsubset.hrc b/include/svx/ucsubset.hrc index 1157a7e8d707..e826a84d83bb 100644 --- a/include/svx/ucsubset.hrc +++ b/include/svx/ucsubset.hrc @@ -21,7 +21,6 @@ // strings for unicode range descriptions (used e.g. by Charmap dialog) // (see the Unicode spec and TrueType::OS2.ulUnicodeRange description) -#define RID_SUBSETMAP 1243 #define RID_SUBSET_START (RID_SVX_START + 901) #define RID_SUBSETSTR_BASIC_LATIN (RID_SUBSET_START + 0) diff --git a/include/svx/xit.hxx b/include/svx/xit.hxx index 46e780fc9fa7..19b5b3c43881 100644 --- a/include/svx/xit.hxx +++ b/include/svx/xit.hxx @@ -63,7 +63,7 @@ public: Argument pPool2 can be null. If returned string equals NameOrIndex->GetName(), the name was already unique. */ - static OUString CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, const SfxItemPool* pPool2, SvxCompareValueFunc pCompareValueFunc, sal_uInt16 nPrefixResId, const XPropertyListRef &pDefaults ); + static OUString CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, const SfxItemPool* pPool2, SvxCompareValueFunc pCompareValueFunc, const char* pPrefixResId, const XPropertyListRef &pDefaults ); void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; diff --git a/include/tools/rcid.h b/include/tools/rcid.h deleted file mode 100644 index 7dd4c7f08fa4..000000000000 --- a/include/tools/rcid.h +++ /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 . - */ - -#ifndef INCLUDED_TOOLS_RCID_H -#define INCLUDED_TOOLS_RCID_H - -#include - -// Definition of the version number -#define RSCVERSION_ID 200U -// Definition of an invalid identifier -#define RC_NO_ID (sal_uInt32(0xFFFFFFFF)) - -// Resource types -// Minimum is 0x100 due to MS-Windows resource types -// (RSC_NOTYPE=0x100) is defined in resid.hxx -#define RSC_VERSIONCONTROL (RSC_NOTYPE + RESOURCE_TYPE(0x02)) // Version control - -#define RSC_RESOURCE (RSC_NOTYPE + RESOURCE_TYPE(0x10)) -#define RSC_STRING (RSC_NOTYPE + RESOURCE_TYPE(0x11)) - -#define RSC_STRINGARRAY (RSC_NOTYPE + RESOURCE_TYPE(0x79)) - -// (RSC_NOTYPE + 0x200) - (RSC_NOTYPE + 0x300) reserved for Sfx - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/tools/resary.hxx b/include/tools/resary.hxx index 5a935c271066..9573a9affd21 100644 --- a/include/tools/resary.hxx +++ b/include/tools/resary.hxx @@ -19,33 +19,8 @@ #ifndef INCLUDED_TOOLS_RESARY_HXX #define INCLUDED_TOOLS_RESARY_HXX -#include -#include -#include - #define RESARRAY_INDEX_NOTFOUND (0xffffffff) -class ResId; - -class SAL_WARN_UNUSED TOOLS_DLLPUBLIC ResStringArray -{ - struct Impl; - std::unique_ptr mpImpl; - - ResStringArray( const ResStringArray& ) = delete; - ResStringArray& operator=( const ResStringArray& ) = delete; - -public: - ResStringArray( const ResId& rResId ); - ~ResStringArray(); - - OUString GetString( sal_uInt32 nIndex ) const; - sal_IntPtr GetValue( sal_uInt32 nIndex ) const; - sal_uInt32 Count() const; - sal_uInt32 FindIndex( sal_IntPtr nValue ) const; - sal_uInt32 AddItem( const OUString& rString, sal_IntPtr nValue ); -}; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/tools/resid.hxx b/include/tools/resid.hxx deleted file mode 100644 index 329f39aaf0c2..000000000000 --- a/include/tools/resid.hxx +++ /dev/null @@ -1,99 +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_TOOLS_RESID_HXX -#define INCLUDED_TOOLS_RESID_HXX - -#include -#include -#include -#include -#include - -struct RSHEADER_TYPE; -struct RESOURCE_TYPE_Tag {}; -typedef o3tl::strong_int RESOURCE_TYPE; -#define RSC_NOTYPE RESOURCE_TYPE(0x100) -#define RSC_DONTRELEASE (sal_uInt32(1U << 31)) - -class ResMgr; - -class SAL_WARN_UNUSED ResId -{ - /* - Consider two cases: - either - (a) m_pResource is valid and points to a resource data buffer; - then m_nResId and m_pResMgr are not used and may be 0 and nullptr respectively - or - (b) m_pResource is NULL, then m_nResId and m_pResMgr must be valid. - In this case the highest bit, if set, decides whether or not to - release the Resource context after loading this id. - */ - RSHEADER_TYPE* m_pResource; - mutable sal_uInt32 m_nResId; // Resource Identifier - mutable RESOURCE_TYPE m_nRT; // type for loading (mutable to be set later) - mutable ResMgr * m_pResMgr; // load from this ResMgr (mutable for setting on demand) - - void ImplInit( sal_uInt32 nId, ResMgr& rMgr, RSHEADER_TYPE* pRes ) - { - m_pResource = pRes; m_nResId = nId; m_nRT = RSC_NOTYPE; m_pResMgr = &rMgr; - OSL_ENSURE( m_pResMgr != nullptr, "ResId without ResMgr created" ); - } - -public: - ResId( sal_uInt32 nId, ResMgr& rMgr ) - { - ImplInit( nId, rMgr, nullptr ); - } - - RESOURCE_TYPE GetRT() const { return m_nRT; } - - /** Set the type if not already set. Ask for type with GetRT() - - [Example] - ResId aId( 1000 ); - aId.SetRT( RSC_RESOURCE ); // settype window Resource - //aId.GetRT() == RSC_RESOURCE is true - - @see - ResId::GetRT2(), ResId::GetRT() - */ - const ResId & SetRT( RESOURCE_TYPE nType ) const - { - if( RSC_NOTYPE == m_nRT ) - m_nRT = nType; - return *this; - } - - ResMgr * GetResMgr() const { return m_pResMgr; } - void ClearResMgr() const { m_pResMgr = nullptr; } - - bool IsAutoRelease() const { return !(m_nResId & RSC_DONTRELEASE); } - - sal_uInt32 GetId() const { return m_nResId & ~RSC_DONTRELEASE; } - RSHEADER_TYPE* GetpResource() const { return m_pResource; } - - TOOLS_DLLPUBLIC OUString toString() const; - TOOLS_DLLPUBLIC operator OUString() const { return toString(); } -}; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/tools/resmgr.hxx b/include/tools/resmgr.hxx index 5c464ae05c9a..fe5b68e6328e 100644 --- a/include/tools/resmgr.hxx +++ b/include/tools/resmgr.hxx @@ -21,175 +21,16 @@ #include #include -#include -#include -#include +typedef OUString (*ResHookProc)(const OUString& rStr); -class SvStream; -class InternalResMgr; - -/// Defines structure used to build resource -struct RSHEADER_TYPE +namespace Translate { -private: - char nId[4]; ///< Identifier of resource - char nRT[4]; ///< Resource type - char nGlobOff[4]; ///< Global offset - char nLocalOff[4]; ///< Local offset - -public: - inline sal_uInt32 GetId(); ///< Identifier of resource - inline RESOURCE_TYPE GetRT(); ///< Resource type - inline sal_uInt32 GetGlobOff(); ///< Global offset - inline sal_uInt32 GetLocalOff(); ///< Local offset -}; - -typedef OUString (*ResHookProc)( const OUString& rStr ); - -// Initialization -enum class RCFlags -{ - NONE = 0x00, - GLOBAL = 0x01, // Global resource - AUTORELEASE = 0x02, - NOTFOUND = 0x04, - FALLBACK_DOWN = 0x08, - FALLBACK_UP = 0x10, -}; -namespace o3tl -{ - template<> struct typed_flags : is_typed_flags {}; -} - -class Resource; -class ResMgr; - -struct ImpRCStack -{ - // pResource and pClassRes equal NULL: resource was not loaded - RSHEADER_TYPE * pResource; ///< pointer to resource - void * pClassRes; ///< pointer to class specified init data - RCFlags Flags; ///< resource status - void * aResHandle; ///< Resource-Identifier from InternalResMgr - const Resource* pResObj; ///< pointer to Resource object - - void Clear(); - void Init( const Resource * pObj, sal_uInt32 nId ); -}; - -class SAL_WARN_UNUSED TOOLS_DLLPUBLIC ResMgr -{ -private: - InternalResMgr* pImpRes; - std::vector< ImpRCStack > aStack; ///< resource context stack - int nCurStack; - ResMgr* pFallbackResMgr; ///< fallback ResMgr in case the Resource - ///< was not contained in this ResMgr - ResMgr* pOriginalResMgr; ///< the res mgr that fell back to this - ///< stack level - - TOOLS_DLLPRIVATE void incStack(); - TOOLS_DLLPRIVATE void decStack(); - - TOOLS_DLLPRIVATE void Init( const OUString& rFileName ); - - TOOLS_DLLPRIVATE ResMgr( InternalResMgr * pImp ); - - #ifdef DBG_UTIL - TOOLS_DLLPRIVATE static void RscError_Impl( const sal_Char* pMessage, - ResMgr* pResMgr, - RESOURCE_TYPE nRT, - sal_uInt32 nId, - std::vector< ImpRCStack >& rResStack, - int nDepth ); - #endif - - // called from within GetResource() if a resource could not be found - TOOLS_DLLPRIVATE ResMgr* CreateFallbackResMgr( const ResId& rId, - const Resource* pResource ); - // creates a 1k sized buffer set to zero for unfound resources - // used in case RC_NOTFOUND - static void* pEmptyBuffer; - TOOLS_DLLPRIVATE static void* getEmptyBuffer(); - - // the next two methods are needed to prevent the string hook called - // with the res mgr mutex locked - // like GetString, but doesn't call the string hook - TOOLS_DLLPRIVATE static sal_uInt32 GetStringWithoutHook( OUString& rStr, - const sal_uInt8* pStr ); - // like ReadString but doesn't call the string hook - TOOLS_DLLPRIVATE OUString ReadStringWithoutHook(); - - ResMgr(const ResMgr&) = delete; - ResMgr& operator=(const ResMgr&) = delete; - -public: - static void DestroyAllResMgr(); ///< Called upon app shutdown - - ~ResMgr(); - - /// Language-dependent resource library - static ResMgr* SearchCreateResMgr( const sal_Char* pPrefixName, - LanguageTag& rLocale ); - static ResMgr* CreateResMgr( const sal_Char* pPrefixName, - const LanguageTag& aLocale = LanguageTag( LANGUAGE_SYSTEM) ); - - /// Check whether resource is available - bool IsAvailable( const ResId& rId, - const Resource* = nullptr) const; - - /// Search and load resource, given its ID - bool GetResource( const ResId& rId, const Resource * = nullptr ); - /// Free resource context - void PopContext( const Resource* = nullptr ); - - /// Increment resource pointer - void* Increment( sal_uInt32 nSize ); - - /// Return a string and its length out of the resource - static sal_uInt32 GetString( OUString& rStr, const sal_uInt8* pStr ); - - /// Return the size of a string in the resource - static sal_uInt32 GetStringSize( sal_uInt32 nLen ) - { nLen++; return (nLen + nLen%2); } - static sal_uInt32 GetStringSize( const sal_uInt8* pStr, sal_uInt32& nLen ); - - /// Return a long - static sal_Int32 GetLong( void const * pLong ); - - /// Return a pointer to the resource - void * GetClass(); - - const OUString& GetFileName() const; - - sal_Int32 ReadLong(); - OUString ReadString(); - - static void SetReadStringHook( ResHookProc pProc ); - static ResHookProc GetReadStringHook(); - static OUString ExpandVariables(const OUString& rString); - static void SetDefaultLocale( const LanguageTag& rLocale ); -}; - -inline sal_uInt32 RSHEADER_TYPE::GetId() -{ - return (sal_uInt32)ResMgr::GetLong( &nId ); -} - -inline RESOURCE_TYPE RSHEADER_TYPE::GetRT() -{ - return RESOURCE_TYPE(ResMgr::GetLong( &nRT )); -} - -inline sal_uInt32 RSHEADER_TYPE::GetGlobOff() -{ - return (sal_uInt32)ResMgr::GetLong( &nGlobOff ); -} - -inline sal_uInt32 RSHEADER_TYPE::GetLocalOff() -{ - return (sal_uInt32)ResMgr::GetLong( &nLocalOff ); + TOOLS_DLLPUBLIC std::locale Create(const sal_Char* pPrefixName, const LanguageTag& rLocale); + TOOLS_DLLPUBLIC OUString get(const char* pId, const std::locale &loc); + TOOLS_DLLPUBLIC void SetReadStringHook( ResHookProc pProc ); + TOOLS_DLLPUBLIC ResHookProc GetReadStringHook(); + TOOLS_DLLPUBLIC OUString ExpandVariables(const OUString& rString); } #endif diff --git a/include/tools/simplerm.hxx b/include/tools/simplerm.hxx deleted file mode 100644 index d82764f70f18..000000000000 --- a/include/tools/simplerm.hxx +++ /dev/null @@ -1,83 +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 . - */ - -// a simple resource manager : no stacks, no sharing of the impl class, only loading of strings and blobs -// but thread-safety !! :) - -#ifndef INCLUDED_TOOLS_SIMPLERM_HXX -#define INCLUDED_TOOLS_SIMPLERM_HXX - -#include -#include -#include -#include -#include - -class InternalResMgr; - -class SAL_WARN_UNUSED TOOLS_DLLPUBLIC SimpleResMgr final -{ - osl::Mutex m_aAccessSafety; - std::unique_ptr - m_pResImpl; - -public: - /** creates a new SimpleResManager - @param pPrefixName - denotes the prefix of the resource file name, - in ThreadTextEncoding - @param rLocale - denotes the locale of the resource file to - load. If empty (SYSTEM), a default locale will be used. - */ - SimpleResMgr( const sal_Char* pPrefixName, - const LanguageTag& rLocale); - - ~SimpleResMgr(); - - static SimpleResMgr* Create( const sal_Char* pPrefixName, - const LanguageTag& rLocale );// only in VCL - - bool IsValid() const { return m_pResImpl != nullptr; } - - /** reads the string with the given resource id - @param nId - the resource id of the string to read - @return - the string with the given resource id, or an empty string if the id does not denote - an existent string - @seealso IsAvailable - */ - OUString ReadString( sal_uInt32 nId ); - - /** checks whether a certain resource is available - @param _resourceType - the type of the resource to check. Currently, only RSC_STRING (strings) and RSC_RESOURCE (blobs) - are supported, for every other type, will be returned. - @param _resourceId - the id of the resource to lookup. - @return - if and only if a resource of the given type, with the given id, is available. - */ - bool IsAvailable( RESOURCE_TYPE _resourceType, sal_uInt32 _resourceId ); -}; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/unotools/componentresmodule.hxx b/include/unotools/componentresmodule.hxx index e363f658bac2..127954d7dfb9 100644 --- a/include/unotools/componentresmodule.hxx +++ b/include/unotools/componentresmodule.hxx @@ -21,14 +21,10 @@ #include #include - -#include - #include - #include -class ResMgr; +class LanguageTag; namespace utl { @@ -49,30 +45,16 @@ namespace utl ::std::unique_ptr< OComponentResModuleImpl > m_pImpl; public: - OComponentResourceModule( const OString& _rResFilePrefix ); + OComponentResourceModule(const OString& _rResFilePrefix, const LanguageTag& rLanguage); virtual ~OComponentResourceModule() override; - /// get the vcl res manager of the module - ResMgr* getResManager(); - - protected: - // OModule overridables - virtual void onLastClient() override; - }; - - //= ModuleRes - - /** specialized ResId, using the resource manager provided by a given OModule - */ - class UNOTOOLS_DLLPUBLIC ModuleRes : public ::ResId - { - public: - ModuleRes( sal_uInt16 _nId, OComponentResourceModule& _rModule ) : ResId( _nId, *_rModule.getResManager() ) { } + /// get the resource locale of the module + const std::locale& getResLocale(); }; //= defining a concrete module -#define DEFINE_MODULE( ModuleClass, ClientClass, ResClass ) \ +#define DEFINE_MODULE( ModuleClass, ClientClass ) \ /* -------------------------------------------------------------------- */ \ class ModuleClass : public ::utl::OComponentResourceModule \ { \ @@ -99,18 +81,6 @@ namespace utl }; \ \ /* -------------------------------------------------------------------- */ \ - class ResClass : public ::utl::ModuleRes \ - { \ - private: \ - typedef ::utl::ModuleRes BaseClass; \ - \ - public: \ - ResClass( sal_uInt16 _nId ) : BaseClass( _nId, ModuleClass::getInstance() ) \ - { \ - } \ - }; \ - \ - /* -------------------------------------------------------------------- */ \ template < class TYPE > \ class OAutoRegistration : public ::comphelper::OAutoRegistration< TYPE > \ { \ @@ -143,7 +113,7 @@ namespace utl }; \ \ ModuleClass::ModuleClass() \ - :BaseClass( OString( resprefix ) ) \ + :BaseClass( OString( resprefix ), Application::GetSettings().GetUILanguageTag() ) \ { \ } \ \ diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx index 96265f967bc9..a446405d544c 100644 --- a/include/vcl/builder.hxx +++ b/include/vcl/builder.hxx @@ -247,9 +247,6 @@ private: static void mungeAdjustment(ScrollBar &rTarget, const Adjustment &rAdjustment); static void mungeAdjustment(Slider &rTarget, const Adjustment &rAdjustment); - typedef std::map WidgetTranslations; - typedef std::map Translations; - struct stockinfo { OUString m_sStock; @@ -270,6 +267,8 @@ private: struct ParserState { + std::locale m_aResLocale; + std::vector m_aGroupMaps; std::vector m_aModelMaps; @@ -291,8 +290,6 @@ private: std::vector m_aButtonMenuMaps; - Translations m_aTranslations; - std::map, VclPtr> m_aRedundantParentWidgets; std::vector m_aSizeGroups; @@ -310,9 +307,6 @@ private: ParserState(); }; - void loadTranslations(const LanguageTag &rLanguageTag, const OUString &rUri); - OString getTranslation(const OString &rId, const OString &rProperty) const; - OString m_sID; OString m_sHelpRoot; ResHookProc m_pStringReplace; @@ -362,8 +356,6 @@ private: bool extractStock(const OString &id, stringmap &rMap); void extractMnemonicWidget(const OString &id, stringmap &rMap); - void handleTranslations(xmlreader::XmlReader &reader); - void handleChild(vcl::Window *pParent, xmlreader::XmlReader &reader); VclPtr handleObject(vcl::Window *pParent, xmlreader::XmlReader &reader); void handlePacking(vcl::Window *pCurrent, vcl::Window *pParent, xmlreader::XmlReader &reader); diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index 3872a8c2c156..6de11784086d 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/vcl/decoview.hxx b/include/vcl/decoview.hxx index 1cb36bb8d723..136780893f52 100644 --- a/include/vcl/decoview.hxx +++ b/include/vcl/decoview.hxx @@ -22,7 +22,7 @@ #include #include -#include +#include #include namespace tools { class Rectangle; } diff --git a/include/vcl/fpicker.hrc b/include/vcl/fpicker.hrc deleted file mode 100644 index 29c446ddbd36..000000000000 --- a/include/vcl/fpicker.hrc +++ /dev/null @@ -1,34 +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/. - */ -#ifndef INCLUDED_VCL_FPICKER_HRC -#define INCLUDED_VCL_FPICKER_HRC - -#include - -#define STR_SVT_FILEPICKER_START (RID_FPICKER_START+1) -#define STR_SVT_FILEPICKER_AUTO_EXTENSION (STR_SVT_FILEPICKER_START+ 0) -#define STR_SVT_FILEPICKER_PASSWORD (STR_SVT_FILEPICKER_START+ 1) -#define STR_SVT_FILEPICKER_FILTER_OPTIONS (STR_SVT_FILEPICKER_START+ 2) -#define STR_SVT_FILEPICKER_READONLY (STR_SVT_FILEPICKER_START+ 3) -#define STR_SVT_FILEPICKER_INSERT_AS_LINK (STR_SVT_FILEPICKER_START+ 4) -#define STR_SVT_FILEPICKER_SHOW_PREVIEW (STR_SVT_FILEPICKER_START+ 5) -#define STR_SVT_FILEPICKER_PLAY (STR_SVT_FILEPICKER_START+ 6) -#define STR_SVT_FILEPICKER_VERSION (STR_SVT_FILEPICKER_START+ 7) -#define STR_SVT_FILEPICKER_TEMPLATES (STR_SVT_FILEPICKER_START+ 8) -#define STR_SVT_FILEPICKER_IMAGE_TEMPLATE (STR_SVT_FILEPICKER_START+ 9) -#define STR_SVT_FILEPICKER_SELECTION (STR_SVT_FILEPICKER_START+10) -#define STR_SVT_FILEPICKER_FILTER_TITLE (STR_SVT_FILEPICKER_START+11) -#define STR_SVT_FOLDERPICKER_DEFAULT_TITLE (STR_SVT_FILEPICKER_START+12) -#define STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION (STR_SVT_FILEPICKER_START+13) -#define STR_SVT_ALREADYEXISTOVERWRITE (STR_SVT_FILEPICKER_START+14) -#define STR_SVT_DELETESERVICE (STR_SVT_FILEPICKER_START+15) -#define STR_SVT_ROOTLABEL (STR_SVT_FILEPICKER_START+16) - -#endif -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/image.hxx b/include/vcl/image.hxx index 6ee8f897e942..4577bd8fbed1 100644 --- a/include/vcl/image.hxx +++ b/include/vcl/image.hxx @@ -22,7 +22,6 @@ #include #include -#include #include #include #include diff --git a/include/vcl/keycod.hxx b/include/vcl/keycod.hxx index 89e57b988265..06843738eee1 100644 --- a/include/vcl/keycod.hxx +++ b/include/vcl/keycod.hxx @@ -21,7 +21,6 @@ #define INCLUDED_VCL_KEYCOD_HXX #include -#include #include #include #include diff --git a/include/vcl/keycodes.hxx b/include/vcl/keycodes.hxx index 06b7c124972f..cc7d51ec30b8 100644 --- a/include/vcl/keycodes.hxx +++ b/include/vcl/keycodes.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_KEYCODES_HXX #define INCLUDED_VCL_KEYCODES_HXX -#include +#include #undef DELETE #include #include diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index c828aae0baa3..680ccd9d5af2 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -21,7 +21,7 @@ #define INCLUDED_VCL_MENU_HXX #include -#include +#include #include #include #include diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 5136a343612a..28d05b7783ef 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -21,7 +21,7 @@ #define INCLUDED_VCL_TOOLBOX_HXX #include -#include +#include #include #include #include diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx index 10e97df02f3c..95e977c696dd 100644 --- a/include/vcl/vclenum.hxx +++ b/include/vcl/vclenum.hxx @@ -20,10 +20,122 @@ #ifndef INCLUDED_VCL_VCLENUM_HXX #define INCLUDED_VCL_VCLENUM_HXX -#include #include #include +enum class TimeFieldFormat : sal_Int32 { F_NONE, F_SEC, F_SEC_CS }; + +enum class KeyFuncType : sal_Int32 { DONTKNOW, NEW, OPEN, SAVE, + SAVEAS, PRINT, CLOSE, QUIT, + CUT, COPY, PASTE, UNDO, + REDO, DELETE, REPEAT, FIND, + FINDBACKWARD, PROPERTIES, FRONT }; + +enum class MenuItemType { DONTKNOW, STRING, IMAGE, STRINGIMAGE, SEPARATOR }; + +enum class MenuItemBits : sal_Int16 +{ + NONE = 0x0000, + CHECKABLE = 0x0001, + RADIOCHECK = 0x0002, + AUTOCHECK = 0x0004, + ABOUT = 0x0008, + HELP = 0x0010, + POPUPSELECT = 0x0020, + // These have been said to be a preliminary (sic) solution since 2007 + NOSELECT = 0x0040, + ICON = 0x0080, + TEXT = 0x0100, +}; +namespace o3tl +{ + template<> struct typed_flags : is_typed_flags {}; +} + +enum class ToolBoxItemBits +{ + NONE = 0x0000, + CHECKABLE = 0x0001, + RADIOCHECK = 0x0002, + AUTOCHECK = 0x0004, + LEFT = 0x0008, + AUTOSIZE = 0x0010, + DROPDOWN = 0x0020, + REPEAT = 0x0040, + DROPDOWNONLY = 0x00a0, // 0x0080 | DROPDOWN + TEXT_ONLY = 0x0100, + ICON_ONLY = 0x0200 +}; +namespace o3tl +{ + template<> struct typed_flags : is_typed_flags {}; +} + +enum class ToolBoxItemType { DONTKNOW, BUTTON, SPACE, SEPARATOR, BREAK }; + +enum class ButtonType { SYMBOLONLY, TEXT, SYMBOLTEXT }; + +enum class SymbolType : sal_uInt16 +{ + DONTKNOW = 0, + IMAGE = 1, + ARROW_UP = 2, + ARROW_DOWN = 3, + ARROW_LEFT = 4, + ARROW_RIGHT = 5, + SPIN_UP = 6, + SPIN_DOWN = 7, + SPIN_LEFT = 8, + SPIN_RIGHT = 9, + FIRST = 10, + LAST = 11, + PREV = 12, + NEXT = 13, + PAGEUP = 14, + PAGEDOWN = 15, + PLAY = 16, + STOP = 19, + CLOSE = 25, + ROLLUP = 26, + ROLLDOWN = 27, + CHECKMARK = 28, + RADIOCHECKMARK = 29, + FLOAT = 31, + DOCK = 32, + HIDE = 33, + HELP = 34, + PLUS = 35, + MENU = SymbolType::SPIN_DOWN +}; + + +// Border styles for SetBorder() +enum class WindowBorderStyle : sal_Int16 +{ + NONE = 0x0000, + NORMAL = 0x0001, + MONO = 0x0002, + MENU = 0x0010, + NWF = 0x0020, + NOBORDER = 0x1000, + REMOVEBORDER = 0x2000 +}; +namespace o3tl +{ + template<> struct typed_flags : is_typed_flags {}; +} + +#define KEY_CODE_MASK ((sal_uInt16)0x0FFF) + +// Modifier keys +#define KEY_SHIFT ((sal_uInt16)0x1000) +#define KEY_MOD1 ((sal_uInt16)0x2000) +#define KEY_MOD2 ((sal_uInt16)0x4000) +#define KEY_MOD3 ((sal_uInt16)0x8000) +#define KEY_MODIFIERS_MASK ((sal_uInt16)0xF000) + + + enum class ExtTimeFieldFormat { Short24H, Long24H diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 1422c14e4165..71ca0d2f282b 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx index 2dedfd4414d8..5ef5fc5d6596 100644 --- a/include/xmloff/xmlstyle.hxx +++ b/include/xmloff/xmlstyle.hxx @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index c82527530c7a..95eba463ef7c 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -51,6 +51,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ && echo 'BRAND_BASE_DIR=$${ORIGIN}/..' \ && echo 'BRAND_INI_DIR=$${ORIGIN}' \ && echo 'BRAND_SHARE_SUBDIR=$(LIBO_SHARE_FOLDER)' \ + && echo 'BRAND_SHARE_RESOURCE_SUBDIR=$(LIBO_SHARE_RESOURCE_FOLDER)' \ && echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/$(LIBO_SHARE_FOLDER)/registry res:$${BRAND_BASE_DIR}/$(LIBO_SHARE_FOLDER)/registry $(if $(ENABLE_DCONF),dconf:* )$(if $(filter WNT,$(OS)),winreg:LOCAL_MACHINE )bundledext:$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,louno):BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini sharedext:$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,louno):SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini userext:$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,louno):UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini $(if $(filter WNT,$(OS)),winreg:CURRENT_USER )user:!$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/registrymodifications.xcu' \ && echo 'LO_JAVA_DIR=$${BRAND_BASE_DIR}/$(LIBO_SHARE_JAVA_FOLDER)' \ && echo 'LO_LIB_DIR=$${BRAND_BASE_DIR}/$(LIBO_LIB_FOLDER)' \ diff --git a/l10ntools/Executable_transex3.mk b/l10ntools/Executable_transex3.mk deleted file mode 100644 index 4ae66a8f05a1..000000000000 --- a/l10ntools/Executable_transex3.mk +++ /dev/null @@ -1,40 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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/. -# - -$(eval $(call gb_Executable_Executable,transex3)) - -$(eval $(call gb_Executable_set_include,transex3,\ - -I$(SRCDIR)/l10ntools/inc \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_Executable_use_libraries,transex3,\ - sal \ -)) - -$(eval $(call gb_Executable_add_scanners,transex3,\ - l10ntools/source/srclex \ -)) - -$(call gb_LexTarget_get_scanner_target,l10ntools/source/srclex) : T_LEXFLAGS := -w - -$(eval $(call gb_Executable_use_static_libraries,transex3,\ - transex \ -)) - -$(eval $(call gb_Executable_add_exception_objects,transex3,\ - l10ntools/source/export \ -)) - -$(eval $(call gb_Executable_use_externals,transex3,\ - boost_headers \ - libxml2 \ -)) - -# vim:set noet sw=4 ts=4: diff --git a/l10ntools/Executable_uiex.mk b/l10ntools/Executable_uiex.mk deleted file mode 100644 index 064b2078479e..000000000000 --- a/l10ntools/Executable_uiex.mk +++ /dev/null @@ -1,36 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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/. -# - -$(eval $(call gb_Executable_Executable,uiex)) - -$(eval $(call gb_Executable_set_include,uiex,\ - -I$(SRCDIR)/l10ntools/inc \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_Executable_use_libraries,uiex,\ - sal \ -)) - -$(eval $(call gb_Executable_use_static_libraries,uiex,\ - transex \ -)) - -$(eval $(call gb_Executable_add_exception_objects,uiex,\ - l10ntools/source/uimerge \ -)) - -$(eval $(call gb_Executable_use_externals,uiex,\ - libexslt \ - libxml2 \ - libxslt \ - boost_headers \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/l10ntools/Module_l10ntools.mk b/l10ntools/Module_l10ntools.mk index d391ed7463c7..3806c7d6fe59 100644 --- a/l10ntools/Module_l10ntools.mk +++ b/l10ntools/Module_l10ntools.mk @@ -14,10 +14,8 @@ $(eval $(call gb_Module_add_targets_for_build,l10ntools,\ Executable_idxdict \ Executable_ulfex \ Executable_cfgex \ - Executable_uiex \ Executable_xrmex \ Executable_localize \ - Executable_transex3 \ Executable_pocheck \ Executable_propex \ Executable_treex \ diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx deleted file mode 100644 index a3f98ef3f2ac..000000000000 --- a/l10ntools/source/export.cxx +++ /dev/null @@ -1,1304 +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 "sal/config.h" - -#include -#include - -#include "helper.hxx" -#include "srclex.hxx" - -#include -#include -#include "common.hxx" -#include "export.hxx" -#include "tokens.h" -#include -#include -#include - -void yyerror( const char * ); -void YYWarning( const char * ); - -namespace { - -MergeDataFile * pMergeDataFile = nullptr; //TODO - -namespace global { - -OString inputPathname; -std::unique_ptr< Export > exporter; - -} - -OString lcl_GetListTyp( const ExportListType nTyp, const bool bUpperCamelCase ) -{ - OString sType; - switch (nTyp) - { - case ExportListType::String: - sType = bUpperCamelCase ? "StringList" : "stringlist"; - break; - case ExportListType::Filter: - sType = bUpperCamelCase ? "FilterList" : "filterlist"; - break; - case ExportListType::Item: - sType = bUpperCamelCase ? "ItemList" : "itemlist"; - break; - case ExportListType::Paired: - sType = bUpperCamelCase ? "PairedList" : "pairedlist"; - break; - default: break; - } - return sType; -} - -} - -extern "C" { - -FILE * init(int argc, char ** argv) -{ - common::HandledArgs aArgs; - if ( !common::handleArguments(argc, argv, aArgs) ) - { - common::writeUsage("transex3","*.src/*.hrc"); - std::exit(EXIT_FAILURE); - } - global::inputPathname = aArgs.m_sInputFile; - - FILE * pFile = std::fopen(global::inputPathname.getStr(), "r"); - if (pFile == nullptr) { - std::fprintf( - stderr, "Error: Cannot open file \"%s\"\n", - global::inputPathname.getStr()); - std::exit(EXIT_FAILURE); - } - - if (aArgs.m_bMergeMode) { - global::exporter.reset(new Export(aArgs.m_sMergeSrc, aArgs.m_sOutputFile, - aArgs.m_bUTF8BOM)); - } else { - global::exporter.reset(new Export(aArgs.m_sOutputFile)); - } - - global::exporter->Init(); - - return pFile; -} - -int Parse( int nTyp, const char *pTokenText ){ - global::exporter->Execute( nTyp , pTokenText ); - return 1; -} - -void Close() -{ - global::exporter->GetParseQueue()->Close(); - global::exporter.reset(); - // avoid nontrivial Export dtor being executed during exit -} - -int WorkOnTokenSet( int nTyp, char *pTokenText ) -{ - global::exporter->GetParseQueue()->Push( QueueEntry( nTyp , OString(pTokenText) ) ); - return 1; -} - -int SetError() -{ - // set error at global instance of class Export - global::exporter->SetError(); - return 1; -} - -int GetError() -{ - // get error at global instance of class Export - if (global::exporter->GetError()) - return 1; - return false; -} - -} // extern "C" - - -// class ResData - - -bool ResData::SetId( const OString& rId, IdLevel nLevel ) -{ - if ( nLevel > nIdLevel ) - { - nIdLevel = nLevel; - sId = rId; - - if ( bChild && bChildWithText ) - { - yyerror("ResId after child definition"); - SetError(); - } - - if ( sId.getLength() > 255 ) - { - YYWarning( "LocalId > 255 chars, truncating..." ); - sId = sId.copy(0, 255).trim(); - } - - return true; - } - - return false; -} - - -// class Export - - -namespace -{ - -sal_Int32 lcl_countOccurrences(const OString& text, char c) -{ - sal_Int32 n = 0; - for (sal_Int32 i = 0;; ++i) { - i = text.indexOf(c, i); - if (i == -1) { - break; - } - ++n; - } - return n; -} - -} - -Export::Export(const OString &rOutput) - : - bDefine( false ), - bNextMustBeDefineEOL( false ), - nLevel( 0 ), - nList( ExportListType::NONE ), - nListLevel( 0 ), - bMergeMode( false ), - bError( false ), - bReadOver( false ), - sFilename( global::inputPathname ), - pParseQueue( new ParserQueue( *this ) ) -{ - aOutput.mPo = new PoOfstream( rOutput, PoOfstream::APP ); - if (!aOutput.mPo->isOpen()) - { - std::fprintf(stderr, "ERROR : Can't open file %s\n", rOutput.getStr()); - std::exit(EXIT_FAILURE); - } -} - -Export::Export( - const OString &rMergeSource, const OString &rOutput, - bool bUTF8BOM) - : - bDefine( false ), - bNextMustBeDefineEOL( false ), - nLevel( 0 ), - nList( ExportListType::NONE ), - nListLevel( 0 ), - bMergeMode( true ), - sMergeSrc( rMergeSource ), - bError( false ), - bReadOver( false ), - sFilename( global::inputPathname ), - pParseQueue( new ParserQueue( *this ) ) -{ - aOutput.mSimple = new std::ofstream(); - aOutput.mSimple->open(rOutput.getStr(), std::ios_base::out | std::ios_base::trunc); - if (!aOutput.mSimple->is_open()) - { - std::fprintf(stderr, "ERROR : Can't open file %s\n", rOutput.getStr()); - std::exit(EXIT_FAILURE); - } - - if ( bUTF8BOM ) - *aOutput.mSimple << '\xEF' << '\xBB' << '\xBF'; -} - -void Export::Init() -{ - // resets the internal status, used before parsing another file - bDefine = false; - bNextMustBeDefineEOL = false; - nLevel = 0; - nList = ExportListType::NONE; - for ( size_t i = 0, n = aResStack.size(); i < n; ++i ) - delete aResStack[ i ]; - aResStack.clear(); -} - -Export::~Export() -{ - delete pParseQueue; - if ( bMergeMode ) - { - aOutput.mSimple->close(); - delete aOutput.mSimple; - } - else - { - aOutput.mPo->close(); - delete aOutput.mPo; - } - for ( size_t i = 0, n = aResStack.size(); i < n; ++i ) - delete aResStack[ i ]; - aResStack.clear(); - - if ( bMergeMode ) { - if ( !pMergeDataFile ) - pMergeDataFile = new MergeDataFile(sMergeSrc, global::inputPathname, true); - - delete pMergeDataFile; - } -} - -void Export::Execute( int nToken, const char * pToken ) -{ - - OString sToken( pToken ); - OString sOrig( sToken ); - - if ( nToken == CONDITION ) - { - OString sTestToken(pToken); - sTestToken = sTestToken.replaceAll("\t", OString()). - replaceAll(" ", OString()); - if (( !bReadOver ) && ( sTestToken.startsWith("#ifndef__RSC_PARSER"))) - bReadOver = true; - else if (( bReadOver ) && ( sTestToken.startsWith("#endif") )) - bReadOver = false; - } - if ((( nToken < FILTER_LEVEL ) || ( bReadOver )) && - (!(( bNextMustBeDefineEOL ) && ( sOrig == "\n" )))) { - // this tokens are not mandatory for parsing, so ignore them ... - if ( bMergeMode ) - WriteToMerged( sOrig , false ); // ... or write them directly to dest. - return; - } - - ResData *pResData = nullptr; - if ( nLevel ) { - // res. exists at cur. level - pResData = ( (nLevel-1) < aResStack.size() ) ? aResStack[ nLevel-1 ] : nullptr; - } - else if (( nToken != RESOURCE ) && - ( nToken != RESOURCEEXPR ) && - ( nToken != SMALRESOURCE ) && - ( nToken != LEVELUP ) && - ( nToken != NORMDEFINE ) && - ( nToken != RSCDEFINE ) && - ( nToken != CONDITION ) && - ( nToken != PRAGMA )) - { - // no res. exists at cur. level so return - if ( bMergeMode ) - WriteToMerged( sOrig , false ); - return; - } - - if ( bDefine ) { - if (( nToken != EMPTYLINE ) && ( nToken != LEVELDOWN ) && ( nToken != LEVELUP )) { - // cur. res. defined in macro - if ( bNextMustBeDefineEOL ) { - if ( nToken != RSCDEFINELEND ) { - // end of macro found, so destroy res. - bDefine = false; - Execute( LEVELDOWN, "" ); - bNextMustBeDefineEOL = false; - } - else { - // next line also in macro definition - bNextMustBeDefineEOL = false; - if ( bMergeMode ) - WriteToMerged( sOrig , false ); - return; - } - } - } - } - - bool bExecuteDown = false; - if ( nToken != LEVELDOWN ) { - sal_uInt16 nOpen = 0; - sal_uInt16 nClose = 0; - bool bReadOver1 = false; - for ( sal_Int32 i = 0; i < sToken.getLength(); i++ ) { - if ( sToken[i] == '"' ) - bReadOver1 = !bReadOver1; - if ( !bReadOver1 && ( sToken[i] == '{' )) - nOpen++; - } - - bReadOver1 = false; - for ( sal_Int32 i = 0; i < sToken.getLength(); i++ ) { - if ( sToken[i] == '"' ) - bReadOver1 = !bReadOver1; - if ( !bReadOver1 && ( sToken[i] == '}' )) - nClose++; - } - - if ( nOpen < nClose ) - bExecuteDown = true; - } - - bool bWriteToMerged = bMergeMode; - switch ( nToken ) { - - case NORMDEFINE: - if ( bMergeMode ) - WriteToMerged( sOrig , false ); - return; - case RSCDEFINE: - bDefine = true; // res. defined in macro - SAL_FALLTHROUGH; - case RESOURCE: - case RESOURCEEXPR: { - if ( nToken != RSCDEFINE ) - bNextMustBeDefineEOL = false; - // this is the beginning of a new res. - nLevel++; - if ( nLevel > 1 ) { - aResStack[ nLevel - 2 ]->bChild = true; - } - - // create new instance for this res. and fill mandatory fields - - pResData = new ResData( FullId() , sFilename ); - aResStack.push_back( pResData ); - sToken = sToken.replaceAll("\n", OString()). - replaceAll("\r", OString()). - replaceAll("{", OString()).replace('\t', ' '); - sToken = sToken.trim(); - OString sTLower = sToken.getToken(0, ' ').toAsciiLowerCase(); - pResData->sResTyp = sTLower; - OString sId( sToken.copy( pResData->sResTyp.getLength() + 1 )); - OString sCondition; - if ( sId.indexOf( '#' ) != -1 ) - { - // between ResTyp, Id and parentheses is a precomp. condition - sCondition = "#"; - sal_Int32 n = 0; - sId = sId.getToken(0, '#', n); - sCondition += sId.getToken(0, '#', n); - } - sId = sId.getToken(0, '/'); - CleanValue( sId ); - sId = sId.replaceAll("\t", OString()); - pResData->SetId( sId, IdLevel::Identifier ); - if (!sCondition.isEmpty()) - { - Execute( CONDITION, ""); // execute the precomp. condition - } - } - break; - case SMALRESOURCE: { - // this is the beginning of a new res. - bNextMustBeDefineEOL = false; - nLevel++; - if ( nLevel > 1 ) { - aResStack[ nLevel - 2 ]->bChild = true; - } - - // create new instance for this res. and fill mandatory fields - - pResData = new ResData( FullId() , sFilename ); - aResStack.push_back( pResData ); - sToken = sToken.replaceAll("\n", OString()). - replaceAll("\r", OString()). - replaceAll("{", OString()). - replaceAll("\t", OString()). - replaceAll(" ", OString()). - replaceAll("\\", OString()).toAsciiLowerCase(); - pResData->sResTyp = sToken; - } - break; - case LEVELUP: { - // push - if ( nList != ExportListType::NONE ) - { - nListLevel++; - break; - } - - OString sLowerTyp; - if ( pResData ) - sLowerTyp = "unknown"; - nLevel++; - if ( nLevel > 1 ) { - aResStack[ nLevel - 2 ]->bChild = true; - } - - ResData *pNewData = new ResData( FullId() , sFilename ); - pNewData->sResTyp = sLowerTyp; - aResStack.push_back( pNewData ); - } - break; - case LEVELDOWN: { - // pop - if ( nList == ExportListType::NONE || !nListLevel ) { - if ( nLevel ) { - if ( bDefine && (nLevel == 1 )) { - bDefine = false; - bNextMustBeDefineEOL = false; - } - WriteData( pResData ); - ResStack::iterator it = aResStack.begin(); - ::std::advance( it, nLevel-1 ); - delete *it; - aResStack.erase( it ); - nLevel--; - } - if( nList != ExportListType::NONE ) - { - nList = ExportListType::NONE; - nListLevel = 1; - } - } - else - { - if ( bDefine ) - bNextMustBeDefineEOL = true; - nListLevel--; - } - } - break; - case ASSIGNMENT: - { - // interpret different types of assignement - sal_Int32 n = 0; - OString sKey = sToken.getToken(0, '=', n). - replaceAll(" ", OString()). - replaceAll("\t", OString()); - OString sValue = sToken.getToken(0, '=', n); - CleanValue( sValue ); - sKey = sKey.toAsciiUpperCase(); - if (sKey == "IDENTIFIER") - { - OString sId( - sValue.replaceAll("\t", OString()). - replaceAll(" ", OString())); - pResData->SetId(sId, IdLevel::Identifier); - } - else if (sKey =="STRINGLIST") - { - nList = ExportListType::String; - nListLevel = 1; - } - else if (sKey == "FILTERLIST") - { - nList = ExportListType::Filter; - nListLevel = 1; - } - if (sToken.indexOf( '{' ) != -1 - && (lcl_countOccurrences(sToken, '{') - > lcl_countOccurrences(sToken, '}'))) - { - Parse( LEVELUP, "" ); - } - } - break; - case LISTASSIGNMENT: - { - OString sTmpToken( - sToken.replaceAll(" ", OString()).toAsciiLowerCase()); - sal_Int32 nPos = sTmpToken.indexOf("[en-us]="); - if (nPos != -1) { - OString sKey( - sTmpToken.copy(0 , nPos).replaceAll(" ", OString()). - replaceAll("\t", OString())); - OString sValue = sToken.getToken(1, '='); - CleanValue( sValue ); - sKey = sKey.toAsciiUpperCase(); - if (sKey == "STRINGLIST") - { - nList = ExportListType::String; - } - else if (sKey == "FILTERLIST") - { - nList = ExportListType::Filter; - } - else if (sKey == "PAIREDLIST") - { - nList = ExportListType::Paired; - } - else if (sKey == "ITEMLIST") - { - nList = ExportListType::Item; - } - if( nList != ExportListType::NONE ) - { - nListLevel = 1; - } - } - } - break; - case TEXT: - case LISTTEXT_: - case LISTTEXT: { - // this is an entry for a List - if ( nList != ExportListType::NONE ) - { - SetChildWithText(); - InsertListEntry( sOrig ); - } - } - break; - case LONGTEXTLINE: - case TEXTLINE: - if ( nLevel ) - { - CutComment( sToken ); - - // this is a text line!!! - OString t(sToken.getToken(0, '=')); - OString sKey( - t.getToken(0, '[').replaceAll(" ", OString()). - replaceAll("\t", OString())); - OString sText( GetText( sToken, nToken )); - OString sLang; - if ( sToken.getToken(0, '=').indexOf('[') != -1 ) - { - sLang = sToken.getToken(0, '=').getToken(1, '['). - getToken(0, ']'); - CleanValue( sLang ); - } - OString sLangIndex = sLang; - OString sOrigKey = sKey; - if ( !sText.isEmpty() && !sLang.isEmpty() ) - { - sKey = sKey.toAsciiUpperCase(); - if (sKey == "TEXT" || sKey == "MESSAGE" || sKey == "CUSTOMUNITTEXT") - { - SetChildWithText(); - if ( sLangIndex.equalsIgnoreAsciiCase("en-US") ) - pResData->SetId( sText, IdLevel::Text ); - - pResData->bText = true; - pResData->sTextTyp = sOrigKey; - if ( !bMergeMode ) - { - pResData->sText[ sLangIndex ] = sText; - } - } - else if ( sKey == "QUICKHELPTEXT" ) { - SetChildWithText(); - pResData->bQuickHelpText = true; - if ( !bMergeMode ) - { - pResData->sQuickHelpText[ sLangIndex ] = sText; - } - } - else if ( sKey == "TITLE" ) { - SetChildWithText(); - pResData->bTitle = true; - if ( !bMergeMode ) - { - pResData->sTitle[ sLangIndex ] = sText; - } - } - } - } - break; - case APPFONTMAPPING: - break; - case RSCDEFINELEND: - break; - case CONDITION: { - if ( nLevel && pResData ) { - WriteData( pResData, true ); - } - } - break; - case EMPTYLINE : { - if ( bDefine ) { - bNextMustBeDefineEOL = false; - bDefine = false; - while ( nLevel ) - Parse( LEVELDOWN, "" ); - } - } - break; - case PRAGMA : { - std::fprintf(stderr, "ERROR: archaic PRAGMA %s\n", sToken.getStr()); - std::exit(EXIT_FAILURE); - } - break; - } - if ( bWriteToMerged ) { - // the current token must be written to dest. without merging - - if( bDefine && sOrig.getLength() > 2 ){ - for( sal_Int32 n = 0; n < sOrig.getLength(); n++ ){ - if( sOrig[n] == '\n' && sOrig[n-1] != '\\'){ - sOrig = sOrig.replaceAt(n++, 0, "\\"); - } - } - } - WriteToMerged( sOrig , false); - } - - if ( bExecuteDown ) { - Parse( LEVELDOWN, "" ); - } -} - -void Export::CutComment( OString &rText ) -{ - if (rText.indexOf("//") != -1) { - OString sWork(rText.replaceAll("\\\"", "XX")); - bool bInner = false; - for (sal_Int32 i = 0; i < sWork.getLength() - 1; ++i) { - if (sWork[i] == '"') { - bInner = !bInner; - } else if (sWork[i] == '/' && !bInner && sWork[i + 1] == '/' ) { - rText = rText.copy(0, i); - break; - } - } - } -} - -void Export::WriteData( ResData *pResData, bool bCreateNew ) -{ - if ( bMergeMode ) { - MergeRest( pResData ); - return; - } - - // mandatory to export: en-US - - if (( !pResData->sText[ SOURCE_LANGUAGE ].isEmpty()) - || - ( !pResData->sQuickHelpText[ SOURCE_LANGUAGE ].isEmpty()) - || - ( !pResData->sTitle[ SOURCE_LANGUAGE ].isEmpty())) - - { - OString sGID = pResData->sGId; - OString sLID; - if (sGID.isEmpty()) - sGID = pResData->sId; - else - sLID = pResData->sId; - - OString sXText = pResData->sText[ SOURCE_LANGUAGE ]; - OString sXHText = pResData->sText[ X_COMMENT ]; - OString sXQHText = pResData->sQuickHelpText[ SOURCE_LANGUAGE ]; - OString sXTitle = pResData->sTitle[ SOURCE_LANGUAGE ]; - - if( !sXText.isEmpty() ) - { - ConvertExportContent(sXText); - ConvertExportContent(sXHText); - common::writePoEntry( - "Transex3", *aOutput.mPo, global::inputPathname, - pResData->sResTyp, sGID, sLID, sXHText, sXText); - } - if( !sXQHText.isEmpty() ) - { - ConvertExportContent(sXQHText); - common::writePoEntry( - "Transex3", *aOutput.mPo, global::inputPathname, pResData->sResTyp, - sGID, sLID, OString(), sXQHText, PoEntry::TQUICKHELPTEXT ); - } - if( !sXTitle.isEmpty() ) - { - ConvertExportContent(sXTitle); - common::writePoEntry( - "Transex3", *aOutput.mPo, global::inputPathname, pResData->sResTyp, - sGID, sLID, OString(), sXTitle, PoEntry::TTITLE ); - } - - if ( bCreateNew ) { - pResData->sText[ SOURCE_LANGUAGE ] = ""; - pResData->sQuickHelpText[ SOURCE_LANGUAGE ]= ""; - pResData->sTitle[ SOURCE_LANGUAGE ] = ""; - } - } - - if( nList != ExportListType::NONE ) - { - WriteExportList( pResData, pResData->m_aList, nList ); - if ( bCreateNew ) - pResData->m_aList.clear(); - } -} - -OString Export::GetPairedListID(const OString& rText) -{ -// < "STRING" ; IDENTIFIER ; > ; - return rText.getToken(1, ';').toAsciiUpperCase().replace('\t', ' ').trim(); -} - -OString Export::GetPairedListString(const OString& rText) -{ -// < "STRING" ; IDENTIFIER ; > ; - OString sString(rText.getToken(0, ';').replace('\t', ' ')); - sString = sString.trim(); - OString s1(sString.copy(sString.indexOf('"') + 1)); - sString = s1.copy(0, s1.lastIndexOf('"')); - return sString.trim(); -} - -OString Export::StripList(const OString & rText) -{ - OString s1 = rText.copy( rText.indexOf('\"') + 1); - return s1.copy( 0 , s1.lastIndexOf('\"')); -} - -void Export::WriteExportList(ResData *pResData, ExportList& rExportList, - const ExportListType nTyp) -{ - OString sGID(pResData->sGId); - if (sGID.isEmpty()) - sGID = pResData->sId; - else { - sGID += "."; - sGID += pResData->sId; - while (sGID.endsWith(".")) { - sGID = sGID.copy(0, sGID.getLength() - 1); - } - } - - for ( size_t i = 0; i < rExportList.size(); i++ ) - { - OString sLID; - OString sText(rExportList[ i ]); - - // Strip PairList Line String - if (nTyp == ExportListType::Paired) - { - sLID = GetPairedListID( sText ); - sText = GetPairedListString( sText ); - } - else - { - sText = StripList( sText ); - if( sText == "\\\"" ) - sText = "\""; - } - ConvertExportContent(sText); - - if (nTyp != ExportListType::Paired) - sLID = sText; - - OString sType = lcl_GetListTyp( nList, false ); - - common::writePoEntry( - "Transex3", *aOutput.mPo, global::inputPathname, - sType, sGID, sLID, OString(), sText); - } -} - -OString Export::FullId() -{ - OStringBuffer sFull; - if ( nLevel > 1 ) - { - sFull.append(aResStack[ 0 ]->sId); - for ( size_t i = 1; i < nLevel - 1; ++i ) - { - OString sToAdd = aResStack[ i ]->sId; - if (!sToAdd.isEmpty()) - sFull.append('.').append(sToAdd); - } - } - if (sFull.getLength() > 255) - { - printf("GroupID = %s\n", sFull.getStr()); - yyerror("GroupId > 255 chars"); - } - - return sFull.makeStringAndClear(); -} - -void Export::InsertListEntry(const OString &rLine) -{ - ResData *pResData = ( nLevel-1 < aResStack.size() ) ? aResStack[ nLevel-1 ] : nullptr; - - if (!pResData) - std::exit(EXIT_FAILURE); - - pResData->m_aList.push_back(rLine); -} - -void Export::CleanValue( OString &rValue ) -{ - while ( !rValue.isEmpty()) { - if (( rValue[0] == ' ' ) || ( rValue[0] == '\t' )) - rValue = rValue.copy( 1 ); - else - break; - } - - if ( !rValue.isEmpty()) { - for ( sal_Int32 i = rValue.getLength() - 1; i > 0; i-- ) { - if (( rValue[i] == ' ' ) || ( rValue[i] == '\t' ) || - ( rValue[i] == '\n' ) || ( rValue[i] == ';' ) || - ( rValue[i] == '{' ) || ( rValue[i] == '\\' ) || - ( rValue[i] == '\r' )) - rValue = rValue.copy(0, i); - else - break; - } - } -} - -enum class TextState { Text=1, Macro }; - -OString Export::GetText(const OString &rSource, int nToken) -{ - OString sReturn; - switch ( nToken ) - { - case TEXTLINE: - case LONGTEXTLINE: - { - OString sTmp(rSource.copy(rSource.indexOf('='))); - CleanValue( sTmp ); - sTmp = sTmp.replaceAll("\n", OString()). - replaceAll("\r", OString()). - replaceAll("\\\\\"", "-=<[BSlashBSlashHKom]>=-\""). - replaceAll("\\\"", "-=<[Hochkomma]>=-"). - replaceAll("\\", "-=<[0x7F]>=-"). - replaceAll("\\0x7F", "-=<[0x7F]>=-"); - - TextState nState = TextState::Text; - for (sal_Int32 i = 1; i <= lcl_countOccurrences(sTmp, '"'); ++i) - { - OString sToken(sTmp.getToken(i, '"')); - if (!sToken.isEmpty()) { - if ( nState == TextState::Text ) { - sReturn += sToken; - nState = TextState::Macro; - } - else { - sToken = sToken.replace('\t', ' '); - for (;;) { - sal_Int32 n = 0; - sToken = sToken.replaceFirst(" ", " ", &n); - if (n == -1) { - break; - } - } - sToken = sToken.trim(); - if (!sToken.isEmpty()) { - sReturn += "\\\" "; - sReturn += sToken; - sReturn += " \\\""; - } - nState = TextState::Text; - } - } - } - - sReturn = sReturn.replaceAll("-=<[0x7F]>=-", ""). - replaceAll("-=<[Hochkomma]>=-", "\""). - replaceAll("-=<[BSlashBSlashHKom]>=-", "\\\\"). - replaceAll("\\\\", "-=<[BSlashBSlash]>=-"). - replaceAll("-=<[BSlashBSlash]>=-", "\\"); - } - break; - } - return sReturn; -} - -void Export::WriteToMerged(const OString &rText , bool bSDFContent) -{ - OString sText(rText); - for (;;) { - sal_Int32 n = 0; - sText = sText.replaceFirst(" \n", "\n", &n); - if (n == -1) { - break; - } - } - if (pParseQueue->bNextIsM && bSDFContent && sText.getLength() > 2) { - for (sal_Int32 n = 0; n < sText.getLength(); ++n) { - if (sText[n] == '\n' && sText[n - 1] != '\\') { - sText = sText.replaceAt(n++, 0, "\\"); - } - } - } else if (pParseQueue->bLastWasM && sText.getLength() > 2) { - for (sal_Int32 n = 0; n < sText.getLength(); ++n) { - if (sText[n] == '\n' && sText[n - 1] != '\\') { - sText = sText.replaceAt(n++, 0, "\\"); - } - if (sText[n] == '\n') { - pParseQueue->bMflag = true; - } - } - } else if (pParseQueue->bCurrentIsM && bSDFContent && sText.getLength() > 2) - { - for (sal_Int32 n = 0; n < sText.getLength(); ++n) { - if (sText[n] == '\n' && sText[n - 1] != '\\') { - sText = sText.replaceAt(n++, 0, "\\"); - pParseQueue->bMflag = true; - } - } - } else if (pParseQueue->bMflag) { - for (sal_Int32 n = 1; n < sText.getLength(); ++n) { - if (sText[n] == '\n' && sText[n - 1] != '\\') { - sText = sText.replaceAt(n++, 0, "\\"); - } - } - } for (sal_Int32 i = 0; i < sText.getLength(); ++i) { - if (sText[i] == '\n') { - *aOutput.mSimple << '\n'; - } else { - char cChar = sText[i]; - *aOutput.mSimple << cChar; - } - } -} - -void Export::ConvertMergeContent( OString &rText ) -{ - rText = rText.replaceAll("\\\'","\'"); // Temporary: until PO files contain escaped single quotes - // (Maybe next PO update solve this) - rText = - helper::escapeAll( - rText.replaceAll("","\\0x7F"), - "\n""\t""\\""\"","\\n""\\t""\\\\""\\\""); - - rText = "\"" + rText + "\""; -} - -void Export::ConvertExportContent( OString& rText ) -{ - rText = helper::unEscapeAll(rText,"\\n""\\t""\\\\""\\\"","\n""\t""\\""\""); -} - -void Export::ResData2Output( MergeEntrys *pEntry, StringType nType, const OString& rTextType ) -{ - bool bAddSemicolon = false; - bool bFirst = true; - OString sCur; - - for( size_t n = 0; n < aLanguages.size(); n++ ){ - sCur = aLanguages[ n ]; - - OString sText; - bool bText = pEntry->GetText( sText, nType, sCur , true ); - if ( bText && !sText.isEmpty() ) { - OStringBuffer sOutput; - if ( bNextMustBeDefineEOL) { - if ( bFirst ) - sOutput.append("\t\\\n"); - else - sOutput.append(";\t\\\n"); - } - bFirst=false; - sOutput.append("\t" + rTextType); - - if ( !sCur.equalsIgnoreAsciiCase("en-US") ) { - sOutput.append("[ " + sCur + " ] "); - } - - ConvertMergeContent( sText ); - sOutput.append("= " + sText); - - if ( bDefine ) - sOutput.append(";\\\n"); - else if ( !bNextMustBeDefineEOL ) - sOutput.append(";\n"); - else - bAddSemicolon = true; - for ( size_t j = 1; j < nLevel; j++ ) - sOutput.append("\t"); - WriteToMerged( sOutput.makeStringAndClear() , true ); - } - } - - - if ( bAddSemicolon ) { - WriteToMerged( ";" , false ); - } -} - -void Export::MergeRest( ResData *pResData ) -{ - if ( !pMergeDataFile ){ - pMergeDataFile = new MergeDataFile( sMergeSrc, global::inputPathname, true ); - aLanguages = pMergeDataFile->GetLanguages(); - - } - - MergeEntrys *pEntry = nullptr; - if( pResData->bText || pResData->bQuickHelpText || pResData->bTitle ) - pEntry = pMergeDataFile->GetMergeEntrysCaseSensitive( pResData ); - - if ( pEntry ) - { - if ( pResData->bText ) - ResData2Output( pEntry, StringType::Text, pResData->sTextTyp ); - - if ( pResData->bQuickHelpText ) - ResData2Output( pEntry, StringType::QuickHelpText, OString("QuickHelpText") ); - - if ( pResData->bTitle ) - ResData2Output( pEntry, StringType::Title, OString("Title") ); - } - - // Merge Lists - if ( nList != ExportListType::NONE ) - { - OString sOldId = pResData->sId; - OString sOldGId = pResData->sGId; - OString sOldTyp = pResData->sResTyp; - - // Set pResData so we can find the corresponding string - if (!pResData->sGId.isEmpty()) - pResData->sGId = pResData->sGId + OString('.'); - pResData->sGId = pResData->sGId + pResData->sId; - - pResData->sResTyp = lcl_GetListTyp( nList, false ); - - OString sSpace; - for ( sal_uInt16 i = 1; i < nLevel-1; i++ ) - sSpace += "\t"; - - OString sCur; - for( size_t n = 0; n < aLanguages.size(); n++ ) - { - sCur = aLanguages[ n ]; - - sal_uInt16 nLIndex = 0; - sal_uInt16 nMaxIndex = pResData->m_aList.size(); - while( nLIndex < nMaxIndex ) - { - if ( nLIndex == 0 ) - { - OStringBuffer sHead; - if ( bNextMustBeDefineEOL ) - sHead.append("\\\n\t"); - sHead.append(sSpace + lcl_GetListTyp( nList, true ) + " [ " + sCur + " ] "); - - if ( bDefine || bNextMustBeDefineEOL ) - { - sHead.append("= \\\n" + sSpace + "\t{\\\n\t"); - } - else - { - sHead.append("= \n" + sSpace + "\t{\n\t"); - } - WriteToMerged(sHead.makeStringAndClear() , true); - } - - OString sLine = pResData->m_aList[ nLIndex ]; - if ( sLine.indexOf( '>' ) != -1 ) - { - if ((( sLine.indexOf( '{' ) == -1 ) || - ( sLine.indexOf( '{' ) >= sLine.indexOf( '"' ))) && - (( sLine.indexOf( '<' ) == -1 ) || - ( sLine.indexOf( '<' ) >= sLine.indexOf( '"' )))) - { - sLine = sLine.replaceFirst("\"", "< \"" ); - } - } - - // Set matching identifier - if ( nList == ExportListType::Paired ) - { - pResData->sId = GetPairedListID ( sLine ); - } - else - { - pResData->sId = - sLine.copy( - sLine.indexOf('"')+1, - sLine.lastIndexOf('"')-sLine.indexOf('"')-1); - ConvertExportContent( pResData->sId ); - } - - MergeEntrys* pEntrys = pMergeDataFile->GetMergeEntrysCaseSensitive( pResData ); - - if( pEntrys ) - { - OString sText; - pEntrys->GetText( sText, StringType::Text, sCur ); - if( !sText.isEmpty()) - { - ConvertMergeContent( sText ); - sLine = - sLine.copy( 0 , sLine.indexOf('"') ) + - sText + - sLine.copy( sLine.lastIndexOf('"') + 1 ); - } - } - - OString sText1( "\t" ); - sText1 += sLine; - if ( bDefine || bNextMustBeDefineEOL ) - sText1 += " ;\\\n"; - else - sText1 += " ;\n"; - sText1 += sSpace; - sText1 += "\t"; - WriteToMerged( sText1 ,true ); - ++nLIndex; - } - - if ( nLIndex > 0 ) - { - OString sFooter; - if (!sSpace.isEmpty()) - sFooter = sSpace.copy(1); - - if ( bNextMustBeDefineEOL ) - sFooter += "};"; - else if ( !bDefine ) - sFooter += "};\n\t"; - else - sFooter += "\n\n"; - WriteToMerged( sFooter ,true ); - } - } - pResData->sId = sOldId; - pResData->sGId = sOldGId; - pResData->sResTyp = sOldTyp; - } - pParseQueue->bMflag = false; -} - -void Export::SetChildWithText() -{ - if ( aResStack.size() > 1 ) { - for ( size_t i = 0; i < aResStack.size() - 1; i++ ) { - aResStack[ i ]->bChildWithText = true; - } - } -} - -void ParserQueue::Push( const QueueEntry& aEntry ) -{ - sal_Int32 nLen = aEntry.sLine.getLength(); - - if( !bStart ){ - aQueueCur->push( aEntry ); - if( nLen > 1 && aEntry.sLine[nLen-1] == '\n' ) - bStart = true; - else if ( aEntry.nTyp != IGNOREDTOKENS ){ - if( nLen > 1 && ( aEntry.sLine[nLen-1] == '\\') ){ - // Next is Macro - bCurrentIsM = true; - }else{ - // Next is no Macro - bCurrentIsM = false; - } - } - } - else{ - aQueueNext->push( aEntry ); - if( nLen > 1 && aEntry.sLine[nLen-1] != '\n' ){ - if( nLen > 1 && ( aEntry.sLine[nLen-1] == '\\') ){ - // Next is Macro - bNextIsM = true; - } - else{ - // Next is no Macro - bNextIsM = false; - } - }else if( nLen > 2 && aEntry.sLine[nLen-1] == '\n' ){ - if( aEntry.nTyp != IGNOREDTOKENS ){ - if( nLen > 2 && ( aEntry.sLine[nLen-2] == '\\') ){ - // Next is Macro - bNextIsM = true; - } - else{ - // Next is no Macro - bNextIsM = false; - } - } - // Pop current - Pop( *aQueueCur ); - bLastWasM = bCurrentIsM; - // next -> current - bCurrentIsM = bNextIsM; - std::queue* aQref = aQueueCur; - aQueueCur = aQueueNext; - aQueueNext = aQref; - - } - - else{ - // Pop current - Pop( *aQueueCur ); - bLastWasM = bCurrentIsM; - // next -> current - bCurrentIsM = bNextIsM; - std::queue* aQref = aQueueCur; - aQueueCur = aQueueNext; - aQueueNext = aQref; - } - } -} - -void ParserQueue::Close(){ - // Pop current - Pop( *aQueueCur ); - // next -> current - bLastWasM = bCurrentIsM; - bCurrentIsM = bNextIsM; - std::queue* aQref = aQueueCur; - aQueueCur = aQueueNext; - aQueueNext = aQref; - bNextIsM = false; - Pop( *aQueueNext ); -}; - -void ParserQueue::Pop( std::queue& aQueue ) -{ - while (!aQueue.empty()) - { - QueueEntry aEntry = aQueue.front(); - aQueue.pop(); - aExport.Execute(aEntry.nTyp, aEntry.sLine.getStr()); - } -} - -ParserQueue::ParserQueue( Export& aExportObj ) - : - bCurrentIsM( false ), - bNextIsM( false ) , - bLastWasM( false ), - bMflag( false ) , - aExport( aExportObj ) , - bStart( false ) -{ - aQueueNext = new std::queue; - aQueueCur = new std::queue; -} - - -ParserQueue::~ParserQueue() -{ - delete aQueueNext; - delete aQueueCur; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/l10ntools/source/gRun.sh b/l10ntools/source/gRun.sh index 496cbac4d40c..b9eec92733a2 100755 --- a/l10ntools/source/gRun.sh +++ b/l10ntools/source/gRun.sh @@ -490,10 +490,6 @@ ${MYCMD} --files sw/source/uibase/wrtsh/wrtsh.src ${MYCMD} --base uui/source --files alreadyopen.src filechanged.src ids.src lockfailed.src lockcorrupt.src nameclashdlg.src openlocked.src passworddlg.src passworderrs.src trylater.src -${MYCMD} --files vcl/source/edit/textundo.src - -${MYCMD} --base vcl/source/src --files app.src btntext.src fpicker.src helptext.src images.src menu.src print.src stdtext.src throbber.src units.src - ${MYCMD} --files wizards/source/euro/euro.src ${MYCMD} --files wizards/source/formwizard/dbwizres.src diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx index b977562fba2f..42c6184496fb 100644 --- a/l10ntools/source/localize.cxx +++ b/l10ntools/source/localize.cxx @@ -83,8 +83,17 @@ void handleCommand( const OString& rInPath, const OString& rOutPath, const OString& rExecutable) { - OStringBuffer buf(OString(getenv("WORKDIR_FOR_BUILD"))); - buf.append("/LinkTarget/Executable/"); + OStringBuffer buf; + if (rExecutable == "uiex" || rExecutable == "hrcex") + { + buf.append(OString(getenv("SRC_ROOT"))); + buf.append("/solenv/bin/"); + } + else + { + buf.append(OString(getenv("WORKDIR_FOR_BUILD"))); + buf.append("/LinkTarget/Executable/"); + } buf.append(rExecutable); buf.append(" -i "); buf.append(rInPath); @@ -143,9 +152,22 @@ void InitPoFile( aPoOutPut.close(); } -bool handleFile( - const OString& rProject, const OUString& rUrl, - const OString& rPotDir, bool bInitPoFile ) +bool fileExists(const OString& fileName) +{ + FILE *f = fopen(fileName.getStr(), "r"); + + if (f != nullptr) + { + fclose(f); + return true; + } + + return false; +} + +OString gDestRoot; + +bool handleFile(const OString& rProject, const OUString& rUrl, const OString& rPotDir) { struct Command { OUStringLiteral extension; @@ -153,8 +175,7 @@ bool handleFile( bool positive; }; static Command const commands[] = { - { OUStringLiteral(".src"), "transex3", false }, - { OUStringLiteral(".hrc"), "transex3", true }, + { OUStringLiteral(".hrc"), "hrcex", false }, { OUStringLiteral(".ulf"), "ulfex", false }, { OUStringLiteral(".xcu"), "cfgex", false }, { OUStringLiteral(".xrm"), "xrmex", false }, @@ -182,13 +203,35 @@ bool handleFile( } sInPath = OUStringToOString( sInPathTmp, RTL_TEXTENCODING_UTF8 ); } - OString sOutPath = rPotDir.concat(".pot"); + OString sOutPath; + if (commands[i].executable == "uiex" || commands[i].executable == "hrcex") + sOutPath = gDestRoot + "/" + rProject + "/messages.pot"; + else + sOutPath = rPotDir.concat(".pot"); - if ( bInitPoFile ) - { + if (!fileExists(sOutPath)) InitPoFile(rProject, sInPath, rPotDir, sOutPath); - } handleCommand(sInPath, sOutPath, commands[i].executable); + + { + //Delete pot file if it contain only the header + PoIfstream aPOStream(sOutPath); + PoEntry aPO; + aPOStream.readEntry( aPO ); + bool bDel = aPOStream.eof(); + aPOStream.close(); + if (bDel) + { + if ( system(OString("rm " + sOutPath).getStr()) != 0 ) + { + cerr + << "Error: Cannot remove entryless pot file: " + << sOutPath << "\n"; + throw false; //TODO + } + } + } + return true; } break; @@ -206,40 +249,13 @@ void handleFilesOfDir( typedef std::vector::const_iterator citer_t; - bool bFirstLocFile = true; ///< First file in directory which needs localization - for( citer_t aIt = aFiles.begin(); aIt != aFiles.end(); ++aIt ) - { - if (handleFile( rProject, *aIt, rPotDir, bFirstLocFile)) - { - bFirstLocFile = false; - } - } - - if( !bFirstLocFile ) - { - //Delete pot file if it contain only the header - OString sPotFile = rPotDir.concat(".pot"); - PoIfstream aPOStream( sPotFile ); - PoEntry aPO; - aPOStream.readEntry( aPO ); - bool bDel = aPOStream.eof(); - aPOStream.close(); - if( bDel ) - { - if ( system(OString("rm " + sPotFile).getStr()) != 0 ) - { - cerr - << "Error: Cannot remove entryless pot file: " - << sPotFile << "\n"; - throw false; //TODO - } - } - } + handleFile(rProject, *aIt, rPotDir); } bool includeProject(const OString& rProject) { static const char *projects[] = { + "include", "accessibility", "avmedia", "basctl", @@ -373,9 +389,19 @@ void handleDirectory( } } + OString aPotDir(rPotDir); if( !aFileNames.empty() ) { - handleFilesOfDir( aFileNames, rProject, rPotDir ); + OString aProject(rProject); + if (aProject == "include" && nLevel > 1) + { + aProject = aPotDir.copy(aPotDir.lastIndexOf('/') + 1); + aPotDir = aPotDir.copy(0, aPotDir.lastIndexOf("include")) + aProject + "/messages"; + } + if (aProject != "include") + { + handleFilesOfDir(aFileNames, aProject, aPotDir); + } } if (dir.close() != osl::FileBase::E_None) { @@ -386,7 +412,7 @@ void handleDirectory( //Remove empty pot directory OUString sPoPath = OStringToOUString( - rPotDir.copy(0,rPotDir.lastIndexOf('/')), RTL_TEXTENCODING_UTF8); + aPotDir.copy(0,aPotDir.lastIndexOf('/')), RTL_TEXTENCODING_UTF8); OUString sPoUrl; if (osl::FileBase::getFileURLFromSystemPath(sPoPath, sPoUrl) != osl::FileBase::E_None) @@ -427,7 +453,8 @@ void handleProjects(char * sSourceRoot, char const * sDestRoot) << "\n"; throw false; //TODO } - handleDirectory(rootUrl, 0, OString(), OString(sDestRoot)); + gDestRoot = OString(sDestRoot); + handleDirectory(rootUrl, 0, OString(), gDestRoot); } } diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index f8a191adb10d..f2ad01b3f68f 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -484,16 +484,9 @@ namespace // Check the validity of read entry bool lcl_CheckInputEntry(const GenPoEntry& rEntry) { - const OString sMsgCtxt = rEntry.getMsgCtxt(); - const sal_Int32 nFirstEndLine = sMsgCtxt.indexOf('\n'); - const sal_Int32 nLastEndLine = sMsgCtxt.lastIndexOf('\n'); - const sal_Int32 nLastDot = sMsgCtxt.lastIndexOf('.'); - const OString sType = sMsgCtxt.copy( nLastDot + 1 ); return !rEntry.getReference().isEmpty() && - nFirstEndLine > 0 && - nLastDot - nLastEndLine > 1 && - (sType == "text" || sType == "quickhelptext" || sType == "title")&& - !rEntry.getMsgId().isEmpty(); + !rEntry.getMsgCtxt().isEmpty() && + !rEntry.getMsgId().isEmpty(); } } diff --git a/l10ntools/source/uimerge.cxx b/l10ntools/source/uimerge.cxx deleted file mode 100644 index 0bc13697cd8e..000000000000 --- a/l10ntools/source/uimerge.cxx +++ /dev/null @@ -1,215 +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 - -#include - -#include - -#include -#include -#include -#include - -#include - -#include "common.hxx" -#include "helper.hxx" -#include "export.hxx" -#include "tokens.h" -#include "po.hxx" -#include -#include -#include - -static OString sInputFileName; -static OString sOutputFile; - -int extractTranslations() -{ - PoOfstream aPOStream( sOutputFile, PoOfstream::APP); - if (!aPOStream.isOpen()) - { - fprintf(stderr, "cannot open %s\n", sOutputFile.getStr()); - return 1; - } - - exsltRegisterAll(); - - OString sStyleSheet = OString(getenv("SRC_ROOT")) + OString("/solenv/bin/uilangfilter.xslt"); - - xsltStylesheetPtr stylesheet = xsltParseStylesheetFile (reinterpret_cast(sStyleSheet.getStr())); - - xmlDocPtr doc = xmlParseFile(sInputFileName.getStr()); - - xmlDocPtr res = xsltApplyStylesheet(stylesheet, doc, nullptr); - - for( xmlNodePtr nodeLevel1 = res->children; nodeLevel1 != nullptr; nodeLevel1 = nodeLevel1->next) - { - for( xmlNodePtr nodeLevel2 = nodeLevel1->children; nodeLevel2 != nullptr; nodeLevel2 = nodeLevel2->next) - { - if (nodeLevel2->type == XML_ELEMENT_NODE) - { - std::vector vIDs; - for(xmlAttrPtr attribute = nodeLevel2->properties; attribute != nullptr; attribute = attribute->next) - { - xmlChar *content = xmlNodeListGetString(res, attribute->children, 1); - vIDs.push_back(helper::xmlStrToOString(content)); - xmlFree(content); - } - OString sText = helper::UnQuotHTML(helper::xmlStrToOString(xmlNodeGetContent(nodeLevel2))); - common::writePoEntry( - "Uiex", aPOStream, sInputFileName, vIDs[0], - (vIDs.size()>=2) ? vIDs[1] : OString(), - (vIDs.size()>=3) ? vIDs[2] : OString(), - OString(), sText); - } - } - } - - xmlFreeDoc(res); - - xmlFreeDoc(doc); - - xsltFreeStylesheet(stylesheet); - - aPOStream.close(); - - return 0; -} - -namespace -{ - bool lcl_MergeLang( - const MergeDataHashMap &rMap, - const OString &rLanguage, - const OString &rDestinationFile) - { - std::ofstream aDestination( - rDestinationFile.getStr(), std::ios_base::out | std::ios_base::trunc); - if (!aDestination.is_open()) { - return false; - } - - aDestination << "\n"; - aDestination << "\n"; - - for (MergeDataHashMap::const_iterator aI = rMap.begin(), aEnd = rMap.end(); aI != aEnd; ++aI) - { - if (aI->second->sGID.isEmpty()) - continue; - - MergeEntrys* pEntrys = aI->second->GetMergeEntries(); - OString sOut; - pEntrys->GetText( sOut, StringType::Text, rLanguage ); - - if (sOut.isEmpty()) - continue; - - aDestination << " second->sGID << "\" i=\"" - << aI->second->sLID << "\">" - << helper::QuotHTML(sOut) << "\n"; - } - - aDestination << ""; - aDestination.close(); - - return true; - } - -} - -bool Merge( - const OString &rPOFile, - const OString &rSourceFile, - const OString &rDestinationDir, - const OString &rLanguage ) -{ - { - bool bDestinationIsDir(false); - - const OUString aDestDir(OStringToOUString(rDestinationDir, RTL_TEXTENCODING_UTF8)); - OUString aDestDirUrl; - if (osl::FileBase::E_None == osl::FileBase::getFileURLFromSystemPath(aDestDir, aDestDirUrl)) - { - osl::DirectoryItem aTmp; - if (osl::DirectoryItem::E_None == osl::DirectoryItem::get(aDestDirUrl, aTmp)) - { - osl::FileStatus aDestinationStatus(osl_FileStatus_Mask_Type); - if (osl::DirectoryItem::E_None == aTmp.getFileStatus(aDestinationStatus)) - bDestinationIsDir = aDestinationStatus.isDirectory(); - } - } - - if (!bDestinationIsDir) - { - fprintf(stderr, "%s must be a directory\n", rDestinationDir.getStr()); - return false; - } - } - - MergeDataFile aMergeDataFile( rPOFile, rSourceFile, false ); - std::vector aLanguages; - if( rLanguage.equalsIgnoreAsciiCase("ALL") ) - aLanguages = aMergeDataFile.GetLanguages(); - else - aLanguages.push_back(rLanguage); - - const MergeDataHashMap& rMap = aMergeDataFile.getMap(); - const OString aDestinationDir(rDestinationDir + "/"); - - bool bResult = true; - for(size_t n = 0; n < aLanguages.size(); ++n) - { - OString sCur = aLanguages[ n ]; - if (sCur.isEmpty() || sCur.equalsIgnoreAsciiCase("en-US")) - continue; - const OString aDestinationFile(aDestinationDir + sCur + ".ui"); - if (!lcl_MergeLang(rMap, sCur, aDestinationFile)) - bResult = false; - } - - return bResult; -} - -SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) -{ - int nRetValue = 0; - try - { - - common::HandledArgs aArgs; - if ( !common::handleArguments(argc, argv, aArgs) ) - { - common::writeUsage("uiex","*.ui"); - return 1; - } - - sInputFileName = aArgs.m_sInputFile; - sOutputFile = aArgs.m_sOutputFile; - - if (!aArgs.m_bMergeMode) - { - nRetValue = extractTranslations(); - } - else - { - Merge(aArgs.m_sMergeSrc, sInputFileName, sOutputFile, aArgs.m_sLanguage); - } - } - catch (std::exception& e) - { - fprintf(stderr, "exception: %s\n", e.what()); - return 1; - } - return nRetValue; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/leak-suppress.txt b/leak-suppress.txt index ce4b42350a2c..e9a01fd83e56 100644 --- a/leak-suppress.txt +++ b/leak-suppress.txt @@ -20,9 +20,6 @@ leak:SfxFilterContainer::ReadSingleFilter_Impl # build-time tool soltools/cpp: leak:soltools/cpp/_cpp.c -# resource managers, normally global objects -leak:ResMgr::CreateResMgr - # bridge's RTTI information, leaked knowingly leak:RTTI::getRTTI diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx index 0849b1a620d1..88cf455e728c 100644 --- a/libreofficekit/source/gtk/lokdocview.cxx +++ b/libreofficekit/source/gtk/lokdocview.cxx @@ -23,7 +23,6 @@ #include #include #include -#include #include #include "tilebuffer.hxx" diff --git a/odk/docs/idl/idl_chapter_refs.txt b/odk/docs/idl/idl_chapter_refs.txt index c9ffe1bbea74..8be5850fb4cb 100644 --- a/odk/docs/idl/idl_chapter_refs.txt +++ b/odk/docs/idl/idl_chapter_refs.txt @@ -5358,7 +5358,6 @@ com.sun.star.uno.XInterface LINK:Documentation/DevGuide/FirstSteps/Objects%2C_Interfaces%2C_and_Services#Interfaces DESCR:FirstSteps - Objects, Interfaces, and Services - Interfaces REF: -com.sun.star.resource.XResourceBundle com.sun.star.container.XNameAccess TOPIC: diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index ac292df2578e..f6f95a50f6fa 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -305,7 +305,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/report/inspection DefaultComponentInspectorModel \ )) $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/resource,\ - OfficeResourceLoader \ StringResource \ StringResourceWithLocation \ StringResourceWithStorage \ @@ -3086,8 +3085,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/report/meta,\ $(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/resource,\ MissingResourceException \ XLocale \ - XResourceBundle \ - XResourceBundleLoader \ XStringResourceManager \ XStringResourcePersistence \ XStringResourceResolver \ diff --git a/offapi/com/sun/star/resource/MissingResourceException.idl b/offapi/com/sun/star/resource/MissingResourceException.idl index 95e78e6a104a..9650d57ab61e 100644 --- a/offapi/com/sun/star/resource/MissingResourceException.idl +++ b/offapi/com/sun/star/resource/MissingResourceException.idl @@ -28,7 +28,7 @@ module com { module sun { module star { module resource { /** is used to signal that a resource is missing. - @see XResourceBundle + @see XStringResourceResolver */ published exception MissingResourceException: com::sun::star::uno::RuntimeException { diff --git a/offapi/com/sun/star/resource/OfficeResourceLoader.idl b/offapi/com/sun/star/resource/OfficeResourceLoader.idl deleted file mode 100644 index 1caf113084f3..000000000000 --- a/offapi/com/sun/star/resource/OfficeResourceLoader.idl +++ /dev/null @@ -1,69 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef __com_sun_star_resource_OfficeResourceLoader_idl__ -#define __com_sun_star_resource_OfficeResourceLoader_idl__ - -#include - -module com { module sun { module star { module resource { - -/** describes a XResourceBundleLoader which provides access to the OpenOffice.org - resource files. - -

An OpenOffice.org installation comes with a number of resource files in an proprietary - format, located inside the installation's program/resource directory. The OfficeResourceLoader - singleton (available at a component context as value with the key - /singletons/com.sun.star.resource.OfficeResourceLoader), provides access to some - types of resources within those files.

- -

Clients have to specify the resource file base name in the call to - XResourceBundleLoader::loadBundle() resp. XResourceBundleLoader::loadBundle_Default() - method. The loader will extent this base name so that the resulting name conforms to the OpenOffice.org - resource file naming conventions, and look up the respective resource file, for the requested locale, - in OpenOffice.org's installation.

- -

The lookup process uses the fallback mechanism as described at the XResourceBundle interface, - except that Locale.getDefault() is not used.

- -

Resource keys, as passed to the XResourceBundle::getDirectElement() or - com::sun::star::container::XNameAccess::getByName(), have the following format: - <resource_type>:<numeric_identifier>, where <resource_type> specifies - the type of the requested resource (see below) and <numeric_identifier> is the numeric - identifier of the resource.

- -

The following resource types are currently supported: -

    -
  • string: denotes a string resource
    • -
-

- -

Since the numeric resource identifiers are highly build-dependent (e.g. can change with any next - OpenOffice.org build), you are strongly discouraged from using the OfficeResourceLoader - service in a component which targets more than one particular OpenOffice.org build.

- - @since OOo 2.0.3 -*/ -singleton OfficeResourceLoader : XResourceBundleLoader; - -}; }; }; }; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/resource/XLocale.idl b/offapi/com/sun/star/resource/XLocale.idl index fe37fccfdb8d..562307d82def 100644 --- a/offapi/com/sun/star/resource/XLocale.idl +++ b/offapi/com/sun/star/resource/XLocale.idl @@ -30,7 +30,7 @@ module com { module sun { module star { module resource { /** offers some operations on com::sun::star::lang::Locale - structures.@see XResourceBundle + structures. @see Locale */ published interface XLocale: com::sun::star::uno::XInterface diff --git a/offapi/com/sun/star/resource/XResourceBundle.idl b/offapi/com/sun/star/resource/XResourceBundle.idl deleted file mode 100644 index c0011ac33afe..000000000000 --- a/offapi/com/sun/star/resource/XResourceBundle.idl +++ /dev/null @@ -1,226 +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 __com_sun_star_resource_XResourceBundle_idl__ -#define __com_sun_star_resource_XResourceBundle_idl__ - -#include -#include - - - -module com { module sun { module star { module resource { - -/** Resource bundles contain locale-specific objects. - -

When your program needs a locale-specific resource, such as - String for example, your program can load it from the - resource bundle that is appropriate for the current user's locale. In - this way, you can write program code that is largely independent of - the user's locale, which isolates most, if not all, of the - locale-specific information in resource bundles. - -

This allows you to write programs that can: - -

    - -
  • be easily localized, or translated, into different - languages. - -
  • handle multiple locales at once. - -
  • be easily modified, later, to support even more locales. - -
- -

One resource bundle is, conceptually, a set of related services - that supports XResourceBundle. Each related service of - XResourceBundle has the same base name plus an - additional component that identifies its locale. For example, suppose - your resource bundle is named MyResources. The first - service you are likely to implement is the default resource bundle, - which has the same name as its family--MyResources. You - can also provide as many related locale-specific services as you need. - - For example, perhaps you would provide a German one named - MyResources_de. - -

- Each related implementation of XResourceBundle contains - the same items, but the items have been translated for the locale - represented by that XResourceBundle implementation. For - example, both MyResources and MyResources_de - may have a String that is used on a button for - confirming operations. In MyResources the - String may contain OK and in - MyResources_de it may contain Gut. - -

- If there are different resources for different countries, you - can make specializations: for example, MyResources_de_CH - is the German language (de) in Switzerland (CH). If you only want to - modify some of the resources in the specialization, you can do so. - -

- When your program needs a locale-specific object, it loads - - the XResourceBundle implementation using the - XResourceBundleLoader service: - - @code{.java} - XResourceBundle myResources = xLoader.getBundle("MyResources", currentLocale); - @endcode - -

The first argument specifies the family name of the resource - bundle that contains the object in question. The second argument - indicates the desired locale. getBundle uses these two - arguments to construct the name of the ResourceBundle - subclass it should load according to the following specifications. - -

The resource bundle lookup searches for services with various - suffixes on the basis of (1) the desired locale and (2) the current - default locale as returned by Locale.getDefault(), and (3) the root - resource bundle (baseclass), in the following order from lower-level - (more specific) to parent-level (less specific): -

baseclass + "_" + language1 + "_" + country1 + "_" + variant1 -
baseclass + "_" + language1 + "_" + country1 -
baseclass + "_" + language1 -
baseclass + "_" + language2 + "_" + country2 + "_" + variant2 -
baseclass + "_" + language2 + "_" + country2 -
baseclass + "_" + language2 -
baseclass - -

For example, if the current default locale is en_US, the - locale that the caller is interested in is fr_CH, and the - resource bundle name is MyResources; resource bundle lookup - will search for the following services, in order: -
MyResources_fr_CH -
MyResources_fr -
MyResources_en_US -
MyResources_en -
MyResources - -

The result of the lookup is a service, but that service may be - backed by a property file on disk. If a lookup fails, - getBundle() throws a - MissingResourceException. - -

The base service must be fully qualified (for - example, myPackage::MyResources, not just - MyResources). - -

Resource bundles contain key/value pairs. The keys uniquely - identify a locale-specific object in the bundle. Here is an - example of a XResourceBundle implementation that contains - two key/value pairs: - - @code{.java} - class MyResource extends com.sun.star.resource.XResourceBundle - { - // some queryInterface stuff - - public final Object getDirectElement(String key) - { - if (key.equals("okKey")) return "Ok"; - if (key.equals("cancelKey")) return "Cancel"; - return null; - } - } - @endcode - -

Keys are always Strings. In this example, the keys - are OkKey and CancelKey. In the above - example, the values are also Strings--OK - and Cancel--but they do not have to be. The values can - be any type of object. - -

You retrieve an object from resource bundle using the appropriate - get method. Because OkKey and CancelKey - are both strings, you use getByName to retrieve them: - - @code{.java} - button1 = new Button(myResourceBundle.getByName("OkKey").getString()); - button2 = new Button(myResourceBundle.getByName("CancelKey").getString()); - @endcode - -

The get methods all require the key as an argument and return - the object if found. If the object is not found, the get methods - throw a com::sun::star::container::NoSuchElementException. - -

NOTE: You should always supply a base service - with no suffixes. This will be the class of "last resort" if a - locale is requested that does not exist. In fact, you must provide - all of the services in any given inheritance chain for which - you provide a resource. For example, if you provide - MyResources_fr_BE, you must provide both - MyResources and MyResources_fr, or the - resource bundle lookup will not work right. - -

You do not have to restrict yourself to using a single family of - ResourceBundles. For example, you could have a set of - bundles for exception messages, ExceptionResources - (ExceptionResources_fr, ExceptionResources_de, ...), - and one for widgets, WidgetResource (WidgetResources_fr, - WidgetResources_de, ...); breaking up the resources however you like. - - @see MissingResourceException - @see Locale - @version 0.1 26 May 1999 - @author Mark Davis - @author Markus Meyer - @deprecated draft -*/ -published interface XResourceBundle: com::sun::star::container::XNameAccess -{ - /** contains the parent bundle of this bundle. - -

The parent bundle is searched by the method - com::sun::star::container::XNameAccess::getByName() - when this bundle does not contain a particular resource. - */ - [attribute] XResourceBundle Parent; - - /** @returns - the locale for this resource bundle. - -

This function can be used to determine whether the - resource bundle that is returned really corresponds to the - requested locale or is a fallback. - - */ - com::sun::star::lang::Locale getLocale(); - - /** @returns - an object from a resource bundle or NULL if no resource - exists. - -

It does not look in the parents. - - @param key - specifies the element. - */ - any getDirectElement( [in] string key ); - -}; - - -}; }; }; }; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/resource/XResourceBundleLoader.idl b/offapi/com/sun/star/resource/XResourceBundleLoader.idl deleted file mode 100644 index fa25531647c1..000000000000 --- a/offapi/com/sun/star/resource/XResourceBundleLoader.idl +++ /dev/null @@ -1,67 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef __com_sun_star_resource_XResourceBundleLoader_idl__ -#define __com_sun_star_resource_XResourceBundleLoader_idl__ - -#include - -#include - -#include - -#include - - - -module com { module sun { module star { module resource { - - -/** makes it possible to load resource bundles. - -

The search algorithm is specified in the documentation of - XResourceBundle. The implementations must follow - the name scheme, but it is allowed to search in several locations. - - @see MissingResourceException - @see XResourceBundle - @see Locale - */ -published interface XResourceBundleLoader: com::sun::star::uno::XInterface -{ - - /** loads the appropriate resource bundle. - */ - com::sun::star::resource::XResourceBundle loadBundle_Default( [in] string aBaseName ) - raises( com::sun::star::resource::MissingResourceException ); - - - /** loads the appropriate resource bundle subclass. - */ - com::sun::star::resource::XResourceBundle loadBundle( [in] string abaseName, - [in] com::sun::star::lang::Locale aLocale ) - raises( com::sun::star::resource::MissingResourceException ); - -}; - - -}; }; }; }; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/type_reference/offapi.idl b/offapi/type_reference/offapi.idl index e796d59192e2..e0c1235cb0cf 100644 --- a/offapi/type_reference/offapi.idl +++ b/offapi/type_reference/offapi.idl @@ -9805,12 +9805,6 @@ module com { module resource { published exception MissingResourceException: ::com::sun::star::uno::RuntimeException { }; - published interface XResourceBundle; - published interface XResourceBundleLoader { - interface ::com::sun::star::uno::XInterface; - ::com::sun::star::resource::XResourceBundle loadBundle_Default([in] string aBaseName) raises (::com::sun::star::resource::MissingResourceException); - ::com::sun::star::resource::XResourceBundle loadBundle([in] string abaseName, [in] ::com::sun::star::lang::Locale aLocale) raises (::com::sun::star::resource::MissingResourceException); - }; published interface XLocale { interface ::com::sun::star::uno::XInterface; ::com::sun::star::lang::Locale create([in] string aLanguage, [in] string aCountry, [in] string aVariant); @@ -9832,12 +9826,6 @@ module com { string getDisplayName([in] ::com::sun::star::lang::Locale locale, [in] ::com::sun::star::lang::Locale inLocale); boolean equals([in] ::com::sun::star::lang::Locale l1, [in] ::com::sun::star::lang::Locale l2); }; - /** @deprecated */ published interface XResourceBundle { - interface ::com::sun::star::container::XNameAccess; - [attribute] ::com::sun::star::resource::XResourceBundle Parent; - ::com::sun::star::lang::Locale getLocale(); - any getDirectElement([in] string key); - }; }; module scanner { published enum ScanError { diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx index 6bd7c15b6831..30d3d2951b24 100644 --- a/oox/source/ppt/pptimport.cxx +++ b/oox/source/ppt/pptimport.cxx @@ -26,9 +26,10 @@ #include #include #include -#include +#include #include -#include +#include +#include #include "oox/ppt/pptimport.hxx" #include "oox/drawingml/chart/chartconverter.hxx" #include "oox/dump/pptxdumper.hxx" @@ -145,12 +146,11 @@ bool PowerPointImport::importDocument() { // Construct a warning message. INetURLObject aURL(getFileUrl()); - SfxErrorContext aContext(ERRCTX_SFX_OPENDOC, aURL.getName(INetURLObject::LAST_SEGMENT, true, INetURLObject::DecodeMechanism::WithCharset), nullptr, RID_ERRCTX); + SfxErrorContext aContext(ERRCTX_SFX_OPENDOC, aURL.getName(INetURLObject::LAST_SEGMENT, true, INetURLObject::DecodeMechanism::WithCharset), nullptr, getRID_ERRCTX()); OUString aWarning; aContext.GetString(ERRCODE_NONE.MakeWarning(), aWarning); aWarning += ":\n"; - static ResMgr* pResMgr = ResMgr::CreateResMgr("svx", Application::GetSettings().GetUILanguageTag()); - aWarning += ResId(RID_SVXSTR_WARN_MISSING_SMARTART, *pResMgr).toString(); + aWarning += SvxResId(RID_SVXSTR_WARN_MISSING_SMARTART); // Show it. WinBits eBits = WB_OK | WB_DEF_OK; diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 487d7e3c46af..c2ce94aa6835 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -299,7 +299,6 @@ $(eval $(call gb_Rdb_add_components,services,\ extensions/source/abpilot/abp \ extensions/source/config/ldap/ldapbe2 \ extensions/source/logging/log \ - extensions/source/resource/res \ extensions/source/scanner/scn \ extensions/source/update/feed/updatefeed \ xmlhelp/util/ucpchelp1 \ diff --git a/extensions/AllLangResTarget_upd.mk b/reportdesign/AllLangMoTarget_rpt.mk similarity index 52% rename from extensions/AllLangResTarget_upd.mk rename to reportdesign/AllLangMoTarget_rpt.mk index c05b888b2cdb..b2a4a0b85ea3 100644 --- a/extensions/AllLangResTarget_upd.mk +++ b/reportdesign/AllLangMoTarget_rpt.mk @@ -1,24 +1,13 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # -# # 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/. -# -# -$(eval $(call gb_AllLangResTarget_AllLangResTarget,upd)) +$(eval $(call gb_AllLangMoTarget_AllLangMoTarget,rpt)) -$(eval $(call gb_AllLangResTarget_add_srs,upd,\ - upd/res \ -)) +$(eval $(call gb_AllLangMoTarget_set_polocation,rpt,reportdesign)) -$(eval $(call gb_SrsTarget_SrsTarget,upd/res)) - -$(eval $(call gb_SrsTarget_add_files,upd/res,\ - extensions/source/update/check/updatehdl.src \ -)) - -# vim:set noet sw=4 ts=4: +# vim: set noet sw=4 ts=4: diff --git a/reportdesign/AllLangResTarget_rpt.mk b/reportdesign/AllLangResTarget_rpt.mk deleted file mode 100644 index 65c93a2fe4ee..000000000000 --- a/reportdesign/AllLangResTarget_rpt.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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/. -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,rpt)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,rpt,reportdesign)) - -$(eval $(call gb_AllLangResTarget_add_srs,rpt,\ - reportdesign/res \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,reportdesign/res)) - -$(eval $(call gb_SrsTarget_set_include,reportdesign/res,\ - $$(INCLUDE) \ - -I$(SRCDIR)/reportdesign/source/core/inc \ -)) - -$(eval $(call gb_SrsTarget_add_files,reportdesign/res,\ - reportdesign/source/core/resource/strings.src \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/reportdesign/AllLangResTarget_rptui.mk b/reportdesign/AllLangResTarget_rptui.mk deleted file mode 100644 index c0e799dfa39b..000000000000 --- a/reportdesign/AllLangResTarget_rptui.mk +++ /dev/null @@ -1,44 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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 . -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,rptui)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,rptui,reportdesign)) - -$(eval $(call gb_AllLangResTarget_add_srs,rptui,reportdesign/rptui)) - -$(eval $(call gb_SrsTarget_SrsTarget,reportdesign/rptui)) - -$(eval $(call gb_SrsTarget_set_include,reportdesign/rptui,\ - $$(INCLUDE) \ - -I$(SRCDIR)/reportdesign/source/ui/inc \ - -I$(SRCDIR)/reportdesign/inc \ -)) - - -$(eval $(call gb_SrsTarget_add_files,reportdesign/rptui,\ - reportdesign/source/ui/dlg/PageNumber.src \ - reportdesign/source/ui/dlg/CondFormat.src \ - reportdesign/source/ui/dlg/Navigator.src \ - reportdesign/source/ui/dlg/GroupsSorting.src \ - reportdesign/source/ui/inspection/inspection.src \ - reportdesign/source/ui/report/report.src \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk index 02fd8748d26c..dec0903992d0 100644 --- a/reportdesign/Library_rpt.mk +++ b/reportdesign/Library_rpt.mk @@ -74,7 +74,6 @@ $(eval $(call gb_Library_add_exception_objects,rpt,\ reportdesign/source/core/misc/reportformula \ reportdesign/source/core/resource/core_resource \ reportdesign/source/core/sdr/formatnormalizer \ - reportdesign/source/core/sdr/ModuleHelper \ reportdesign/source/core/sdr/PropertyForward \ reportdesign/source/core/sdr/ReportDrawPage \ reportdesign/source/core/sdr/ReportUndoFactory \ diff --git a/reportdesign/Module_reportdesign.mk b/reportdesign/Module_reportdesign.mk index 518addb5bd2c..d827dc1ba9c6 100644 --- a/reportdesign/Module_reportdesign.mk +++ b/reportdesign/Module_reportdesign.mk @@ -13,12 +13,11 @@ $(eval $(call gb_Module_add_targets,reportdesign,\ Library_rpt \ Library_rptui \ Library_rptxml \ + UIConfig_dbreport \ )) $(eval $(call gb_Module_add_l10n_targets,reportdesign,\ - AllLangResTarget_rpt \ - AllLangResTarget_rptui \ - UIConfig_dbreport \ + AllLangMoTarget_rpt \ )) # deactivated since sb123; diff --git a/reportdesign/inc/ModuleHelper.hxx b/reportdesign/inc/ModuleHelper.hxx deleted file mode 100644 index d88375a7f07a..000000000000 --- a/reportdesign/inc/ModuleHelper.hxx +++ /dev/null @@ -1,91 +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_REPORTDESIGN_INC_MODULEHELPER_HXX -#define INCLUDED_REPORTDESIGN_INC_MODULEHELPER_HXX - -#include "dllapi.h" -#include -#include - - -namespace rptui -{ - - - //= OModule - - class OModuleImpl; - class REPORTDESIGN_DLLPUBLIC OModule - { - friend class OModuleClient; - - private: - OModule() = delete; //TODO: get rid of this class - - protected: - static sal_Int32 s_nClients; /// number of registered clients - static OModuleImpl* s_pImpl; /// impl class. lives as long as at least one client for the module is registered - - public: - /// get the vcl res manager of the module - static ResMgr* getResManager(); - protected: - /// register a client for the module - static void registerClient(); - /// revoke a client for the module - static void revokeClient(); - - private: - /** ensure that the impl class exists - @precond m_aMutex is guarded when this method gets called - */ - static void ensureImpl(); - }; - - - //= OModuleClient - - /** base class for objects which uses any global module-specific resources - */ - class REPORTDESIGN_DLLPUBLIC OModuleClient - { - public: - OModuleClient() { OModule::registerClient(); } - ~OModuleClient() { OModule::revokeClient(); } - }; - - - //= ModuleRes - - /** specialized ResId, using the resource manager provided by the global module - */ - class REPORTDESIGN_DLLPUBLIC ModuleRes : public ::ResId - { - public: - ModuleRes(sal_uInt16 _nId) : ResId(_nId, *OModule::getResManager()) { } - }; - -} // namespace rptui - - -#endif // INCLUDED_REPORTDESIGN_INC_MODULEHELPER_HXX - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/inc/RptResId.hrc b/reportdesign/inc/RptResId.hrc deleted file mode 100644 index e635ad9a9c0b..000000000000 --- a/reportdesign/inc/RptResId.hrc +++ /dev/null @@ -1,204 +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_REPORTDESIGN_INC_RPTRESID_HRC -#define INCLUDED_REPORTDESIGN_INC_RPTRESID_HRC - -#include - -#define RID_DIALOG_START RID_RPT_START -#define RID_PAGE_START RID_RPT_START -#define RID_ERRORBOX_START RID_RPT_START -#define RID_QUERYBOX_START RID_RPT_START -#define RID_TOOLBOX_START RID_RPT_START -#define RID_BITMAP_START RID_RPT_START -#define RID_IMAGE_START RID_RPT_START -#define RID_IMAGELIST_START RID_RPT_START -#define RID_MENU_START RID_RPT_START -#define RID_STRING_START RID_RPT_START -#define RID_UNTYPED_START RID_RPT_START -#define RID_WARN_START RID_RPT_START -#define RID_CONTROL_START RID_RPT_START -#define RID_MISC_START RID_RPT_START - -// strings -#define RID_STR_PROPTITLE_FIXEDTEXT ( RID_STRING_START + 4 ) -#define RID_STR_PROPTITLE_FORMATTED ( RID_STRING_START + 5 ) -#define RID_STR_PROPTITLE_SHAPE ( RID_STRING_START + 6 ) -#define RID_STR_PROPTITLE_IMAGECONTROL ( RID_STRING_START + 7 ) -#define RID_STR_PROPTITLE_REPORT ( RID_STRING_START + 8 ) -#define RID_STR_PROPTITLE_SECTION ( RID_STRING_START + 9 ) -#define RID_STR_PROPTITLE_FUNCTION ( RID_STRING_START + 10 ) - -// undo strings -#define RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER ( RID_STRING_START + 11 ) -#define RID_STR_UNDO_ADD_REPORTHEADERFOOTER ( RID_STRING_START + 12 ) -#define RID_STR_UNDO_PROPERTY ( RID_STRING_START + 15 ) -#define RID_STR_UNDO_REMOVE_GROUP ( RID_STRING_START + 16 ) -#define RID_STR_UNDO_APPEND_GROUP ( RID_STRING_START + 17 ) -#define RID_STR_UNDO_MOVE_GROUP ( RID_STRING_START + 18 ) -#define RID_STR_UNDO_CONDITIONAL_FORMATTING ( RID_STRING_START + 19 ) -#define RID_STR_UNDO_REMOVE_SELECTION ( RID_STRING_START + 20 ) -#define RID_STR_UNDO_PASTE ( RID_STRING_START + 21 ) -#define RID_STR_UNDO_CHANGE_SIZE ( RID_STRING_START + 22 ) -#define RID_STR_UNDO_INSERT_CONTROL ( RID_STRING_START + 23 ) -#define RID_STR_UNDO_DELETE_CONTROL ( RID_STRING_START + 24 ) -#define RID_STR_UNDO_CHANGEPOSITION ( RID_STRING_START + 27 ) -#define RID_STR_UNDO_ADDFUNCTION ( RID_STRING_START + 28 ) - -// other -#define STR_RPT_LABEL ( RID_STRING_START + 33 ) -#define STR_RPT_EXPRESSION ( RID_STRING_START + 34 ) -#define STR_RPT_PN_PAGE ( RID_STRING_START + 36 ) -#define STR_RPT_PN_PAGE_OF ( RID_STRING_START + 37 ) -#define STR_RPT_PREFIXCHARS ( RID_STRING_START + 38 ) -#define STR_RPT_YEAR ( RID_STRING_START + 39 ) -#define STR_RPT_QUARTER ( RID_STRING_START + 40 ) -#define STR_RPT_MONTH ( RID_STRING_START + 41 ) -#define STR_RPT_WEEK ( RID_STRING_START + 42 ) -#define STR_RPT_DAY ( RID_STRING_START + 43 ) -#define STR_RPT_HOUR ( RID_STRING_START + 44 ) -#define STR_RPT_MINUTE ( RID_STRING_START + 45 ) -#define STR_RPT_INTERVAL ( RID_STRING_START + 46 ) -#define STR_RPT_HELP_FIELD ( RID_STRING_START + 47 ) -#define STR_RPT_HELP_HEADER ( RID_STRING_START + 48 ) -#define STR_RPT_HELP_FOOTER ( RID_STRING_START + 49 ) -#define STR_RPT_HELP_GROUPON ( RID_STRING_START + 50 ) -#define STR_RPT_HELP_INTERVAL ( RID_STRING_START + 51 ) -#define STR_RPT_HELP_KEEP ( RID_STRING_START + 52 ) -#define STR_RPT_HELP_SORT ( RID_STRING_START + 53 ) -#define RID_STR_GROUPHEADER ( RID_STRING_START + 54 ) -#define RID_STR_GROUPFOOTER ( RID_STRING_START + 55 ) -#define RID_STR_UNDO_REMOVE_FUNCTION ( RID_STRING_START + 56 ) -#define STR_NUMBERED_CONDITION ( RID_STRING_START + 57 ) - -// Property Browser Headline Id's ----------------------------------------------------------- -#define RID_STR_BRWTITLE_PROPERTIES ( RID_STRING_START + 60 ) -#define RID_STR_BRWTITLE_NO_PROPERTIES ( RID_STRING_START + 61 ) -#define RID_STR_BRWTITLE_MULTISELECT ( RID_STRING_START + 62 ) - -#define RID_STR_FIELDSELECTION ( RID_STRING_START + 69 ) - -#define RID_STR_UNDO_ADD_GROUP_HEADER ( RID_STRING_START + 70 ) -#define RID_STR_UNDO_REMOVE_GROUP_HEADER ( RID_STRING_START + 71 ) -#define RID_STR_UNDO_ADD_GROUP_FOOTER ( RID_STRING_START + 72 ) -#define RID_STR_UNDO_REMOVE_GROUP_FOOTER ( RID_STRING_START + 73 ) - -#define RID_STR_PROPPAGE_DEFAULT ( RID_STRING_START + 74 ) -#define RID_STR_PROPPAGE_DATA ( RID_STRING_START + 75 ) - -#define RID_STR_FILTER ( RID_STRING_START + 76 ) -// free - -#define RID_STR_FORCENEWPAGE (RID_STRING_START + 78) -#define RID_STR_NEWROWORCOL (RID_STRING_START + 79) -#define RID_STR_KEEPTOGETHER (RID_STRING_START + 80) -#define RID_STR_CANGROW (RID_STRING_START + 81) -#define RID_STR_CANSHRINK (RID_STRING_START + 82) -#define RID_STR_REPEATSECTION (RID_STRING_START + 83) - -#define RID_STR_PROPTITLE_GROUP (RID_STRING_START + 84) -#define RID_STR_PROPTITLE_FIXEDLINE (RID_STRING_START + 85) -// free -#define RID_STR_BACKTRANSPARENT (RID_STRING_START + 87) -#define RID_STR_CONTROLBACKGROUNDTRANSPARENT (RID_STRING_START + 88) -#define RID_STR_OVERLAP_OTHER_CONTROL (RID_STRING_START + 89) -#define RID_STR_ILLEGAL_POSITION (RID_STRING_START + 90) -#define RID_STR_PAGEHEADERFOOTER_INSERT (RID_STRING_START + 91) -#define RID_STR_PAGEHEADERFOOTER_DELETE (RID_STRING_START + 92) -#define RID_STR_BACKCOLOR (RID_STRING_START + 93) -#define RID_STR_PRINTREPEATEDVALUES (RID_STRING_START + 94) -#define RID_STR_CONDITIONALPRINTEXPRESSION (RID_STRING_START + 95) -#define RID_STR_STARTNEWCOLUMN (RID_STRING_START + 97) -#define RID_STR_STARTNEWPAGE (RID_STRING_START + 98) -#define RID_STR_RESETPAGENUMBER (RID_STRING_START + 99) -#define RID_STR_PRINTWHENGROUPCHANGE (RID_STRING_START + 102) -#define RID_STR_REPORTHEADERFOOTER_INSERT (RID_STRING_START + 103) -#define RID_STR_REPORTHEADERFOOTER_DELETE (RID_STRING_START + 104) -#define RID_STR_VISIBLE (RID_STRING_START + 105) - -#define RID_STR_DETAIL (RID_STRING_START + 106) -#define RID_STR_PAGE_HEADER (RID_STRING_START + 107) -#define RID_STR_GROUPKEEPTOGETHER (RID_STRING_START + 108) -#define RID_STR_PAGE_FOOTER (RID_STRING_START + 109) -#define RID_STR_PAGEHEADEROPTION (RID_STRING_START + 110) -#define RID_STR_PAGEFOOTEROPTION (RID_STRING_START + 111) -#define RID_STR_REPORT_HEADER (RID_STRING_START + 112) -#define RID_STR_REPORT_FOOTER (RID_STRING_START + 113) -#define RID_STR_SCOPE_GROUP (RID_STRING_START + 114) -#define RID_STR_UNDO_ALIGNMENT (RID_STRING_START + 117) -#define RID_STR_HEADER (RID_STRING_START + 118) -#define RID_STR_FOOTER (RID_STRING_START + 119) -#define RID_STR_DATAFIELD (RID_STRING_START + 120) -#define RID_STR_FONT (RID_STRING_START + 121) -#define RID_STR_COULD_NOT_CREATE_REPORT (RID_STRING_START + 122) -#define RID_STR_PRESERVEIRI (RID_STRING_START + 123) -#define RID_STR_IMPORT_GRAPHIC (RID_STRING_START + 124) -#define RID_STR_POSITIONX (RID_STRING_START + 125) -#define RID_STR_POSITIONY (RID_STRING_START + 126) -#define RID_STR_WIDTH (RID_STRING_START + 127) -#define RID_STR_HEIGHT (RID_STRING_START + 128) -#define RID_STR_DELETE (RID_STRING_START + 129) -#define RID_STR_DEEPTRAVERSING (RID_STRING_START + 130) -#define RID_STR_PREEVALUATED (RID_STRING_START + 131) -#define RID_STR_FUNCTIONS (RID_STRING_START + 132) -#define RID_STR_GROUPS (RID_STRING_START + 133) -#define RID_STR_FUNCTION (RID_STRING_START + 134) -#define RID_STR_FORMULA (RID_STRING_START + 135) -#define RID_STR_INITIALFORMULA (RID_STRING_START + 136) -#define RID_STR_UNDO_CHANGEFONT (RID_STRING_START + 137) -#define RID_STR_UNDO_CHANGEPAGE (RID_STRING_START + 138) -#define RID_STR_CAUGHT_FOREIGN_EXCEPTION (RID_STRING_START + 139) -#define RID_STR_FORMULALIST (RID_STRING_START + 140) -#define RID_STR_SCOPE (RID_STRING_START + 141) -#define RID_STR_TYPE (RID_STRING_START + 142) -#define RID_STR_MIMETYPE (RID_STRING_START + 143) -#define RID_STR_CHARTTYPE (RID_STRING_START + 144) -#define RID_STR_MASTERFIELDS (RID_STRING_START + 145) -#define RID_STR_DETAILFIELDS (RID_STRING_START + 146) -#define RID_STR_EXPLANATION (RID_STRING_START + 147) -#define RID_STR_DETAILLABEL (RID_STRING_START + 148) -#define RID_STR_MASTERLABEL (RID_STRING_START + 149) -#define RID_STR_PREVIEW_COUNT (RID_STRING_START + 150) -#define RID_ERR_NO_COMMAND (RID_STRING_START + 151) -#define RID_ERR_NO_OBJECTS (RID_STRING_START + 152) -#define RID_STR_AREA (RID_STRING_START + 153) -// free -#define RID_STR_UNDO_SHRINK (RID_STRING_START + 155) -#define RID_STR_F_COUNTER (RID_STRING_START + 156) -#define RID_STR_F_ACCUMULATION (RID_STRING_START + 157) -#define RID_STR_F_MINIMUM (RID_STRING_START + 158) -#define RID_STR_F_MAXIMUM (RID_STRING_START + 159) -#define RID_STR_VERTICALALIGN (RID_STRING_START + 160) -#define RID_STR_PARAADJUST (RID_STRING_START + 161) - -// untyped --------------------------------------------------------------------- -#define RID_STR_BOOL (RID_UNTYPED_START + 0 ) -#define RID_STR_FORCENEWPAGE_CONST (RID_UNTYPED_START + 1 ) -#define RID_STR_KEEPTOGETHER_CONST (RID_UNTYPED_START + 2) -#define RID_STR_GROUPKEEPTOGETHER_CONST (RID_UNTYPED_START + 3) -#define RID_STR_REPORTPRINTOPTION_CONST (RID_UNTYPED_START + 4) -#define RID_STR_SECTIONPAGEBREAK_CONST (RID_UNTYPED_START + 5) -#define RID_STR_TYPE_CONST (RID_UNTYPED_START + 6) -#define RID_STR_VERTICAL_ALIGN_CONST (RID_UNTYPED_START + 7) -#define RID_STR_PARAADJUST_CONST (RID_UNTYPED_START + 8) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx index b78d56997bf5..7df624f28418 100644 --- a/reportdesign/inc/UndoActions.hxx +++ b/reportdesign/inc/UndoActions.hxx @@ -151,8 +151,7 @@ namespace rptui ::dbaui::IController* m_pController; public: - OCommentUndoAction( SdrModel& rMod - ,sal_uInt16 nCommentID); + OCommentUndoAction(SdrModel& rMod, const char* pCommentID); virtual ~OCommentUndoAction() override; virtual OUString GetComment() const override { return m_strComment; } @@ -180,7 +179,7 @@ namespace rptui ,Action _eAction ,const css::uno::Reference< css::container::XIndexContainer >& rContainer ,const css::uno::Reference< css::uno::XInterface>& xElem - ,sal_uInt16 _nCommentId); + ,const char* pCommentId); virtual ~OUndoContainerAction() override; virtual void Undo() override; @@ -206,7 +205,7 @@ namespace rptui ,OReportHelper> _pMemberFunction ,const css::uno::Reference< css::report::XReportDefinition >& _xReport ,const css::uno::Reference< css::uno::XInterface>& xElem - ,sal_uInt16 _nCommentId); + ,const char* pCommentId); protected: virtual void implReInsert( ) override; @@ -227,7 +226,7 @@ namespace rptui ,OGroupHelper> _pMemberFunction ,const css::uno::Reference< css::report::XGroup >& _xGroup ,const css::uno::Reference< css::uno::XInterface>& xElem - ,sal_uInt16 _nCommentId); + ,const char* pCommentId); protected: virtual void implReInsert( ) override; diff --git a/dbaccess/source/inc/sdbtstrings.hrc b/reportdesign/inc/core_resource.hxx similarity index 78% rename from dbaccess/source/inc/sdbtstrings.hrc rename to reportdesign/inc/core_resource.hxx index 2268ad83e892..5d6643b83276 100644 --- a/dbaccess/source/inc/sdbtstrings.hrc +++ b/reportdesign/inc/core_resource.hxx @@ -16,16 +16,15 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef DBACCESS_SHARED_SDBTSTRINGS_HRC -#define DBACCESS_SHARED_SDBTSTRINGS_HRC +#ifndef INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_CORE_RESOURCE_HXX +#define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_CORE_RESOURCE_HXX + +#include "dllapi.h" #include -#define STRINGCONSTANTS_INCLUDED_INDIRECT -#include "stringconstants.hrc" -#undef STRINGCONSTANTS_INCLUDED_INDIRECT -#include "stringconstants.inc" +OUString REPORTDESIGN_DLLPUBLIC RptResId(const char* pId); -#endif // DBACCESS_SHARED_SDBTSTRINGS_HRC +#endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_CORE_RESOURCE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/inc/pch/precompiled_rpt.hxx b/reportdesign/inc/pch/precompiled_rpt.hxx index c596f6e5a543..4e5e9da61abf 100644 --- a/reportdesign/inc/pch/precompiled_rpt.hxx +++ b/reportdesign/inc/pch/precompiled_rpt.hxx @@ -266,8 +266,6 @@ #include #include #include -#include -#include #include #include #include @@ -317,7 +315,6 @@ #include #include #include -#include #include #include #include diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx index bcbaff0a411b..75292c8b43d1 100644 --- a/reportdesign/inc/pch/precompiled_rptui.hxx +++ b/reportdesign/inc/pch/precompiled_rptui.hxx @@ -180,7 +180,6 @@ #include #include #include -#include #include #include #include @@ -379,8 +378,6 @@ #include #include #include -#include -#include #include #include #include @@ -527,7 +524,6 @@ #include #include #include -#include #include #include #include diff --git a/reportdesign/inc/stringarray.hrc b/reportdesign/inc/stringarray.hrc new file mode 100644 index 000000000000..6c91b21102b4 --- /dev/null +++ b/reportdesign/inc/stringarray.hrc @@ -0,0 +1,83 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * 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/. + */ + +#ifndef INCLUDED_REPORTDESIGN_INC_FNP_HRC +#define INCLUDED_REPORTDESIGN_INC_FNP_HRC + +#define NC_(Context, String) (Context "\004" u8##String) + +const char* RID_STR_FORCENEWPAGE_CONST[] = +{ + NC_("RID_STR_FORCENEWPAGE_CONST", "None"), + NC_("RID_STR_FORCENEWPAGE_CONST", "Before Section"), + NC_("RID_STR_FORCENEWPAGE_CONST", "After Section"), + NC_("RID_STR_FORCENEWPAGE_CONST", "Before & After Section"), + nullptr +}; + +const char* RID_STR_GROUPKEEPTOGETHER_CONST[] = +{ + NC_("RID_STR_GROUPKEEPTOGETHER_CONST", "Per Page"), + NC_("RID_STR_GROUPKEEPTOGETHER_CONST", "Per Column"), + nullptr +}; + +const char* RID_STR_REPORTPRINTOPTION_CONST[] = +{ + NC_("RID_STR_REPORTPRINTOPTION_CONST", "All Pages"), + NC_("RID_STR_REPORTPRINTOPTION_CONST", "Not With Report Header"), + NC_("RID_STR_REPORTPRINTOPTION_CONST", "Not With Report Footer"), + NC_("RID_STR_REPORTPRINTOPTION_CONST", "Not With Report Header/Footer"), + nullptr +}; + +const char* RID_STR_TYPE_CONST[] = +{ + NC_("RID_STR_TYPE_CONST", "Field or Formula"), + NC_("RID_STR_TYPE_CONST", "Function"), + NC_("RID_STR_TYPE_CONST", "Counter"), + NC_("RID_STR_TYPE_CONST", "User defined Function"), + nullptr +}; + +const char* RID_STR_BOOL[] = +{ + NC_("RID_STR_BOOL", "No"), + NC_("RID_STR_BOOL", "Yes"), + nullptr +}; + +const char* RID_STR_KEEPTOGETHER_CONST[] = +{ + NC_("RID_STR_KEEPTOGETHER_CONST", "No"), + NC_("RID_STR_KEEPTOGETHER_CONST", "Whole Group"), + NC_("RID_STR_KEEPTOGETHER_CONST", "With First Detail"), + nullptr +}; + +const char* RID_STR_VERTICAL_ALIGN_CONST[] = +{ + NC_("RID_STR_VERTICAL_ALIGN_CONST", "Top"), + NC_("RID_STR_VERTICAL_ALIGN_CONST", "Middle"), + NC_("RID_STR_VERTICAL_ALIGN_CONST", "Bottom"), + nullptr +}; + +const char* RID_STR_PARAADJUST_CONST[] = +{ + NC_("RID_STR_PARAADJUST_CONST", "Left"), + NC_("RID_STR_PARAADJUST_CONST", "Right"), + NC_("RID_STR_PARAADJUST_CONST", "Block"), + NC_("RID_STR_PARAADJUST_CONST", "Center"), + nullptr +}; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/reportdesign/inc/strings.hrc b/reportdesign/inc/strings.hrc new file mode 100644 index 000000000000..1766d3f6b209 --- /dev/null +++ b/reportdesign/inc/strings.hrc @@ -0,0 +1,189 @@ +/* -*- 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_REPORTDESIGN_INC_STRINGS_HRC +#define INCLUDED_REPORTDESIGN_INC_STRINGS_HRC + +#define NC_(Context, String) (Context "\004" u8##String) + +#define RID_STR_PROPPAGE_DEFAULT NC_("RID_STR_PROPPAGE_DEFAULT", "General") +#define RID_STR_PROPPAGE_DATA NC_("RID_STR_PROPPAGE_DATA", "Data") +#define RID_STR_FORCENEWPAGE NC_("RID_STR_FORCENEWPAGE", "Force New Page") +#define RID_STR_NEWROWORCOL NC_("RID_STR_NEWROWORCOL", "New Row Or Column") +#define RID_STR_KEEPTOGETHER NC_("RID_STR_KEEPTOGETHER", "Keep Together") +#define RID_STR_CANGROW NC_("RID_STR_CANGROW", "Can Grow") +#define RID_STR_CANSHRINK NC_("RID_STR_CANSHRINK", "Can Shrink") +#define RID_STR_REPEATSECTION NC_("RID_STR_REPEATSECTION", "Repeat Section") +#define RID_STR_PRINTREPEATEDVALUES NC_("RID_STR_PRINTREPEATEDVALUES", "Print repeated values") +#define RID_STR_CONDITIONALPRINTEXPRESSION NC_("RID_STR_CONDITIONALPRINTEXPRESSION", "Conditional Print Expression") +#define RID_STR_STARTNEWCOLUMN NC_("RID_STR_STARTNEWCOLUMN", "Start new column") +#define RID_STR_STARTNEWPAGE NC_("RID_STR_STARTNEWPAGE", "Start new page") +#define RID_STR_RESETPAGENUMBER NC_("RID_STR_RESETPAGENUMBER", "Reset page number") +#define RID_STR_CHARTTYPE NC_("RID_STR_CHARTTYPE", "Chart type") +#define RID_STR_PRINTWHENGROUPCHANGE NC_("RID_STR_PRINTWHENGROUPCHANGE", "Print repeated value on group change") +#define RID_STR_VISIBLE NC_("RID_STR_VISIBLE", "Visible") +#define RID_STR_GROUPKEEPTOGETHER NC_("RID_STR_GROUPKEEPTOGETHER", "Group keep together") +#define RID_STR_PAGEHEADEROPTION NC_("RID_STR_PAGEHEADEROPTION", "Page header") +#define RID_STR_PAGEFOOTEROPTION NC_("RID_STR_PAGEFOOTEROPTION", "Page footer") +#define RID_STR_DEEPTRAVERSING NC_("RID_STR_DEEPTRAVERSING", "Deep traversing") +#define RID_STR_PREEVALUATED NC_("RID_STR_PREEVALUATED", "Pre evaluation") +#define RID_STR_POSITIONX NC_("RID_STR_POSITIONX", "Position X") +#define RID_STR_POSITIONY NC_("RID_STR_POSITIONY", "Position Y") +#define RID_STR_WIDTH NC_("RID_STR_WIDTH", "Width") +#define RID_STR_HEIGHT NC_("RID_STR_HEIGHT", "Height") +#define RID_STR_INITIALFORMULA NC_("RID_STR_INITIALFORMULA", "Initial value") +#define RID_STR_PRESERVEIRI NC_("RID_STR_PRESERVEIRI", "Preserve as Link") +#define RID_STR_FORMULA NC_("RID_STR_FORMULA", "Formula") +#define RID_STR_DATAFIELD NC_("RID_STR_DATAFIELD", "Data field") +#define RID_STR_FONT NC_("RID_STR_FONT", "Font") +#define RID_STR_BACKCOLOR NC_("RID_STR_BACKCOLOR", "Background color") +#define RID_STR_BACKTRANSPARENT NC_("RID_STR_BACKTRANSPARENT", "Background Transparent") +#define RID_STR_CONTROLBACKGROUNDTRANSPARENT NC_("RID_STR_CONTROLBACKGROUNDTRANSPARENT", "Background Transparent") +#define RID_STR_OVERLAP_OTHER_CONTROL NC_("RID_STR_OVERLAP_OTHER_CONTROL", "This operation is not allowed. The control overlaps with another one.") +#define RID_STR_ILLEGAL_POSITION NC_("RID_STR_ILLEGAL_POSITION", "This position can not be set. It is invalid.") +#define RID_STR_SCOPE_GROUP NC_("RID_STR_SCOPE_GROUP", "Group: %1") +#define RID_STR_FORMULALIST NC_("RID_STR_FORMULALIST", "Function") +#define RID_STR_SCOPE NC_("RID_STR_SCOPE", "Scope") +#define RID_STR_TYPE NC_("RID_STR_TYPE", "Data Field Type") +#define RID_STR_MASTERFIELDS NC_("RID_STR_MASTERFIELDS", "Link master fields") +#define RID_STR_DETAILFIELDS NC_("RID_STR_DETAILFIELDS", "Link slave fields") +#define RID_STR_EXPLANATION ("Charts can be used to display detailed data about the current record of the report. To do this, you can specify which columns in the chart match which columns in the report.") +#define RID_STR_DETAILLABEL NC_("RID_STR_DETAILLABEL", "Chart") +#define RID_STR_MASTERLABEL NC_("RID_STR_MASTERLABEL", "Report") +#define RID_STR_PREVIEW_COUNT NC_("RID_STR_PREVIEW_COUNT", "Preview Row(s)") +#define RID_STR_AREA NC_("RID_STR_AREA", "Area") +#define RID_STR_MIMETYPE NC_("RID_STR_MIMETYPE", "Report Output Format") +#define RID_STR_VERTICALALIGN NC_("RID_STR_VERTICALALIGN", "Vert. Alignment") +#define RID_STR_PARAADJUST NC_("RID_STR_PARAADJUST", "Horz. Alignment") +#define RID_STR_F_COUNTER NC_("RID_STR_F_COUNTER", "Counter") +#define RID_STR_F_ACCUMULATION NC_("RID_STR_F_ACCUMULATION", "Accumulation") +#define RID_STR_F_MINIMUM NC_("RID_STR_F_MINIMUM", "Minimum") +#define RID_STR_F_MAXIMUM NC_("RID_STR_F_MAXIMUM", "Maximum") + +#define RID_STR_BRWTITLE_PROPERTIES NC_("RID_STR_BRWTITLE_PROPERTIES", "Properties: ") +#define RID_STR_BRWTITLE_NO_PROPERTIES NC_("RID_STR_BRWTITLE_NO_PROPERTIES", "No Control marked") +#define RID_STR_BRWTITLE_MULTISELECT NC_("RID_STR_BRWTITLE_MULTISELECT", "Multiselection") +#define RID_STR_PROPTITLE_IMAGECONTROL NC_("RID_STR_PROPTITLE_IMAGECONTROL", "Image Control") +#define RID_STR_PROPTITLE_FIXEDTEXT NC_("RID_STR_PROPTITLE_FIXEDTEXT", "Label field") +#define RID_STR_PROPTITLE_FIXEDLINE NC_("RID_STR_PROPTITLE_FIXEDLINE", "Line") +#define RID_STR_PROPTITLE_FORMATTED NC_("RID_STR_PROPTITLE_FORMATTED", "Formatted Field") +#define RID_STR_PROPTITLE_SHAPE NC_("RID_STR_PROPTITLE_SHAPE", "Shape") +#define RID_STR_PROPTITLE_REPORT NC_("RID_STR_PROPTITLE_REPORT", "Report") +#define RID_STR_PROPTITLE_SECTION NC_("RID_STR_PROPTITLE_SECTION", "Section") +#define RID_STR_PROPTITLE_FUNCTION NC_("RID_STR_PROPTITLE_FUNCTION", "Function") +#define RID_STR_PROPTITLE_GROUP NC_("RID_STR_PROPTITLE_GROUP", "Group") +#define RID_STR_UNDO_CHANGEPOSITION NC_("RID_STR_UNDO_CHANGEPOSITION", "Change Object") +#define RID_STR_UNDO_MOVE_GROUP NC_("RID_STR_UNDO_MOVE_GROUP", "Move Group(s)") +#define RID_STR_UNDO_CONDITIONAL_FORMATTING NC_("RID_STR_UNDO_CONDITIONAL_FORMATTING", "Conditional Formatting") +#define RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER NC_("RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER", "Remove report header / report footer") +#define RID_STR_UNDO_ADD_REPORTHEADERFOOTER NC_("RID_STR_UNDO_ADD_REPORTHEADERFOOTER", "Add report header / report footer") +// The # character is used for replacing +#define RID_STR_UNDO_PROPERTY NC_("RID_STR_UNDO_PROPERTY", "Change property '#'") +#define RID_STR_UNDO_ADD_GROUP_HEADER NC_("RID_STR_UNDO_ADD_GROUP_HEADER", "Add group header ") +#define RID_STR_UNDO_REMOVE_GROUP_HEADER NC_("RID_STR_UNDO_REMOVE_GROUP_HEADER", "Remove group header ") +#define RID_STR_UNDO_ADD_GROUP_FOOTER NC_("RID_STR_UNDO_ADD_GROUP_FOOTER", "Add group footer ") +#define RID_STR_UNDO_REMOVE_GROUP_FOOTER NC_("RID_STR_UNDO_REMOVE_GROUP_FOOTER", "Remove group footer ") +#define RID_STR_UNDO_ADDFUNCTION NC_("RID_STR_UNDO_ADDFUNCTION", "Add function") +#define STR_RPT_LABEL NC_("STR_RPT_LABEL", "~Report name") +#define RID_STR_UNDO_REMOVE_GROUP NC_("RID_STR_UNDO_REMOVE_GROUP", "Delete Group") +#define RID_STR_UNDO_APPEND_GROUP NC_("RID_STR_UNDO_APPEND_GROUP", "Add Group") +#define RID_STR_UNDO_REMOVE_SELECTION NC_("RID_STR_UNDO_REMOVE_SELECTION", "Delete Selection") +#define RID_STR_UNDO_REMOVE_FUNCTION NC_("RID_STR_UNDO_REMOVE_FUNCTION", "Delete Function") +#define RID_STR_UNDO_CHANGE_SIZE NC_("RID_STR_UNDO_CHANGE_SIZE", "Change Size") +#define RID_STR_UNDO_PASTE NC_("RID_STR_UNDO_PASTE", "Paste") +#define RID_STR_UNDO_INSERT_CONTROL NC_("RID_STR_UNDO_INSERT_CONTROL", "Insert Control") +#define RID_STR_UNDO_DELETE_CONTROL NC_("RID_STR_UNDO_DELETE_CONTROL", "Delete Control") +// Please try to avoid spaces in the name. It is used as a programmatic one. +#define RID_STR_GROUPHEADER NC_("RID_STR_GROUPHEADER", "GroupHeader") +// Please try to avoid spaces in the name. It is used as a programmatic one. +#define RID_STR_GROUPFOOTER NC_("RID_STR_GROUPFOOTER", "GroupFooter") +#define RID_STR_FIELDSELECTION NC_("RID_STR_FIELDSELECTION", "Add field:") +#define RID_STR_FILTER NC_("RID_STR_FILTER", "Filter") +#define RID_STR_UNDO_ALIGNMENT NC_("RID_STR_UNDO_ALIGNMENT", "Change Alignment") +// # will be replaced with a name. +#define RID_STR_HEADER NC_("RID_STR_HEADER", "# Header") +// # will be replaced with a name."; +#define RID_STR_FOOTER NC_("RID_STR_FOOTER", "# Footer") +#define RID_STR_IMPORT_GRAPHIC NC_("RID_STR_IMPORT_GRAPHIC", "Insert graphics") +#define RID_STR_DELETE NC_("RID_STR_DELETE", "Delete") +#define RID_STR_FUNCTION NC_("RID_STR_FUNCTION", "Function") +#define RID_STR_COULD_NOT_CREATE_REPORT NC_("RID_STR_COULD_NOT_CREATE_REPORT", "An error occurred while creating the report.") +#define RID_STR_CAUGHT_FOREIGN_EXCEPTION NC_("RID_STR_CAUGHT_FOREIGN_EXCEPTION", "An exception of type $type$ was caught.") +#define RID_STR_UNDO_CHANGEFONT NC_("RID_STR_UNDO_CHANGEFONT", "Change font") +#define RID_STR_UNDO_CHANGEPAGE NC_("RID_STR_UNDO_CHANGEPAGE", "Change page attributes") +#define RID_STR_PAGEHEADERFOOTER_INSERT NC_("RID_STR_PAGEHEADERFOOTER_INSERT", "Insert Page Header/Footer") +#define RID_STR_PAGEHEADERFOOTER_DELETE NC_("RID_STR_PAGEHEADERFOOTER_DELETE", "Delete Page Header/Footer") +#define RID_STR_REPORTHEADERFOOTER_INSERT NC_("RID_STR_REPORTHEADERFOOTER_INSERT", "Insert Report Header/Footer") +#define RID_STR_REPORTHEADERFOOTER_DELETE NC_("RID_STR_REPORTHEADERFOOTER_DELETE", "Delete Report Header/Footer") +#define RID_ERR_NO_COMMAND NC_("RID_ERR_NO_COMMAND", "The report can not be executed unless it is bound to content.") +#define RID_ERR_NO_OBJECTS NC_("RID_ERR_NO_OBJECTS", "The report can not be executed unless at least one object has been inserted.") +#define RID_STR_UNDO_SHRINK NC_("RID_STR_UNDO_SHRINK", "Shrink Section") +#define RID_STR_DETAIL NC_("RID_STR_DETAIL", "Detail") +#define RID_STR_PAGE_HEADER NC_("RID_STR_PAGE_HEADER", "Page Header") +#define RID_STR_PAGE_FOOTER NC_("RID_STR_PAGE_FOOTER", "Page Footer") +#define RID_STR_REPORT_HEADER NC_("RID_STR_REPORT_HEADER", "Report Header") +#define RID_STR_REPORT_FOOTER NC_("RID_STR_REPORT_FOOTER", "Report Footer") + +#define STR_NUMBERED_CONDITION NC_("STR_NUMBERED_CONDITION", "Condition $number$") + +#define STR_RPT_EXPRESSION NC_("STR_RPT_EXPRESSION", "Field/Expression") +#define STR_RPT_PREFIXCHARS NC_("STR_RPT_PREFIXCHARS", "Prefix Characters") +#define STR_RPT_YEAR NC_("STR_RPT_YEAR", "Year") +#define STR_RPT_QUARTER NC_("STR_RPT_QUARTER", "Quarter") +#define STR_RPT_MONTH NC_("STR_RPT_MONTH", "Month") +#define STR_RPT_WEEK NC_("STR_RPT_WEEK", "Week") +#define STR_RPT_DAY NC_("STR_RPT_DAY", "Day") +#define STR_RPT_HOUR NC_("STR_RPT_HOUR", "Hour") +#define STR_RPT_MINUTE NC_("STR_RPT_MINUTE", "Minute") +#define STR_RPT_INTERVAL NC_("STR_RPT_INTERVAL", "Interval") +#define STR_RPT_HELP_FIELD NC_("STR_RPT_HELP_FIELD", "Select a field or type an expression to sort or group on.") +#define STR_RPT_HELP_HEADER NC_("STR_RPT_HELP_HEADER", "Display a header for this group?") +#define STR_RPT_HELP_FOOTER NC_("STR_RPT_HELP_FOOTER", "Display a footer for this group?") +#define STR_RPT_HELP_GROUPON NC_("STR_RPT_HELP_GROUPON", "Select the value or range of values that starts a new group.") +#define STR_RPT_HELP_INTERVAL NC_("STR_RPT_HELP_INTERVAL", "Interval or number of characters to group on.") +#define STR_RPT_HELP_KEEP NC_("STR_RPT_HELP_KEEP", "Keep group together on one page?") +#define STR_RPT_HELP_SORT NC_("STR_RPT_HELP_SORT", "Select ascending or descending sort order. Ascending means from A to Z or 0 to 9") + +// The space after the word is no error. #PAGENUMBER# is a replacement and & must not be translated as well as " +#define STR_RPT_PN_PAGE NC_("STR_RPT_PN_PAGE", "\"Page \" & #PAGENUMBER#") +// The space before and after the word is no error. #PAGECOUNT# is a replacement and & must not be translated as well as " +#define STR_RPT_PN_PAGE_OF NC_("STR_RPT_PN_PAGE_OF", " & \" of \" & #PAGECOUNT#") + +#define RID_STR_FUNCTIONS NC_("RID_STR_FUNCTIONS", "Functions") +#define RID_STR_GROUPS NC_("RID_STR_GROUPS", "Groups") + +#define RID_STR_DETAIL NC_("RID_STR_DETAIL", "Detail") +#define RID_STR_PAGE_HEADER NC_("RID_STR_PAGE_HEADER", "Page Header") +#define RID_STR_PAGE_FOOTER NC_("RID_STR_PAGE_FOOTER", "Page Footer") +#define RID_STR_GROUP_HEADER NC_("RID_STR_GROUP_HEADER", "Group Header") +#define RID_STR_GROUP_FOOTER NC_("RID_STR_GROUP_FOOTER", "Group Footer") +#define RID_STR_REPORT_HEADER NC_("RID_STR_REPORT_HEADER", "Report Header") +#define RID_STR_REPORT_FOOTER NC_("RID_STR_REPORT_FOOTER", "Report Footer") +#define RID_STR_ERROR_WRONG_ARGUMENT NC_("RID_STR_ERROR_WRONG_ARGUMENT", "You tried to set an illegal argument. Please have a look at '#1' for valid arguments.") +#define RID_STR_ARGUMENT_IS_NULL NC_("RID_STR_ARGUMENT_IS_NULL", "The element is invalid.") +#define RID_STR_FIXEDTEXT NC_("RID_STR_FIXEDTEXT", "Label field") +#define RID_STR_FORMATTEDFIELD NC_("RID_STR_FORMATTEDFIELD", "Formatted field") +#define RID_STR_IMAGECONTROL NC_("RID_STR_IMAGECONTROL", "Image control") +#define RID_STR_REPORT NC_("RID_STR_REPORT", "Report") +#define RID_STR_SHAPE NC_("RID_STR_SHAPE", "Shape") +#define RID_STR_FIXEDLINE NC_("RID_STR_FIXEDLINE", "Fixed line") + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/inc/strings.hxx b/reportdesign/inc/strings.hxx index d5fd6ad8385b..06d88c360909 100644 --- a/reportdesign/inc/strings.hxx +++ b/reportdesign/inc/strings.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_REPORTDESIGN_INC_STRINGS_HRC -#define INCLUDED_REPORTDESIGN_INC_STRINGS_HRC +#ifndef INCLUDED_REPORTDESIGN_INC_STRINGS_HXX +#define INCLUDED_REPORTDESIGN_INC_STRINGS_HXX // Dialog Controls @@ -17,6 +17,271 @@ #define RID_STR_CLASS_IMAGECONTROL "Graphic" #define RID_STR_CLASS_FORMATTEDFIELD "FormattedField" +//= service names + +#define SERVICE_FIXEDTEXT "com.sun.star.report.FixedText" +#define SERVICE_FORMATTEDFIELD "com.sun.star.report.FormattedField" +#define SERVICE_IMAGECONTROL "com.sun.star.report.ImageControl" +#define SERVICE_FORMATCONDITION "com.sun.star.report.FormatCondition" +#define SERVICE_FUNCTION "com.sun.star.report.Function" +#define SERVICE_REPORTDEFINITION "com.sun.star.report.ReportDefinition" +#define SERVICE_SHAPE "com.sun.star.report.Shape" +#define SERVICE_FIXEDLINE "com.sun.star.report.FixedLine" +#define SERVICE_SECTION "com.sun.star.report.Section" +#define SERVICE_GROUP "com.sun.star.report.Group" + +//= property names + +#define PROPERTY_VISIBLE "Visible" +#define PROPERTY_NAME "Name" +#define PROPERTY_HEIGHT "Height" +#define PROPERTY_BACKCOLOR "BackColor" +#define PROPERTY_BACKTRANSPARENT "BackTransparent" +#define PROPERTY_CONTROLBACKGROUND "ControlBackground" +#define PROPERTY_CONTROLBACKGROUNDTRANSPARENT "ControlBackgroundTransparent" +#define PROPERTY_FORCENEWPAGE "ForceNewPage" +#define PROPERTY_NEWROWORCOL "NewRowOrCol" +#define PROPERTY_KEEPTOGETHER "KeepTogether" +#define PROPERTY_CANGROW "CanGrow" +#define PROPERTY_CANSHRINK "CanShrink" +#define PROPERTY_REPEATSECTION "RepeatSection" +#define PROPERTY_GROUP "Group" +#define PROPERTY_REPORTDEFINITION "ReportDefinition" + +#define PROPERTY_GROUPINTERVAL "GroupInterval" +#define PROPERTY_EXPRESSION "Expression" +#define PROPERTY_GROUPON "GroupOn" +#define PROPERTY_SORTASCENDING "SortAscending" + +#define PROPERTY_MASTERFIELDS "MasterFields" +#define PROPERTY_DETAILFIELDS "DetailFields" +#define PROPERTY_CAPTION "Caption" +#define PROPERTY_COMMAND "Command" +#define PROPERTY_BACKGRAPHICLOCATION "BackGraphicLocation" +#define PROPERTY_ORIENTATION "Orientation" +#define PROPERTY_PAPERSIZE "Size" +#define PROPERTY_GROUPKEEPTOGETHER "GroupKeepTogether" +#define PROPERTY_PAGEHEADEROPTION "PageHeaderOption" +#define PROPERTY_PAGEFOOTEROPTION "PageFooterOption" +#define PROPERTY_COMMANDTYPE "CommandType" +#define PROPERTY_REPORTHEADERON "ReportHeaderOn" +#define PROPERTY_REPORTFOOTERON "ReportFooterOn" +#define PROPERTY_PAGEHEADERON "PageHeaderOn" +#define PROPERTY_PAGEFOOTERON "PageFooterOn" +#define PROPERTY_HEADERON "HeaderOn" +#define PROPERTY_FOOTERON "FooterOn" +#define PROPERTY_WIDTH "Width" +#define PROPERTY_POSITIONX "PositionX" +#define PROPERTY_POSITIONY "PositionY" +#define PROPERTY_DATAFIELD "DataField" +#define PROPERTY_PARAADJUST "ParaAdjust" +#define PROPERTY_FONTDESCRIPTOR "FontDescriptor" +#define PROPERTY_FONTDESCRIPTORASIAN "FontDescriptorAsian" +#define PROPERTY_FONTDESCRIPTORCOMPLEX "FontDescriptorComplex" +#define PROPERTY_CONTROLTEXTEMPHASISMARK "ControlTextEmphasis" +#define PROPERTY_CHARRELIEF "CharRelief" +#define PROPERTY_CHARCOLOR "CharColor" +#define PROPERTY_VERTICALALIGN "VerticalAlign" +#define PROPERTY_IMAGEPOSITION "ImagePosition" +#define PROPERTY_IMAGEURL "ImageURL" +#define PROPERTY_CHARUNDERLINECOLOR "CharUnderlineColor" +#define PROPERTY_LABEL "Label" +#define PROPERTY_EFFECTIVEDEFAULT "EffectiveDefault" +#define PROPERTY_EFFECTIVEMAX "EffectiveMax" +#define PROPERTY_EFFECTIVEMIN "EffectiveMin" +#define PROPERTY_FORMATKEY "FormatKey" +#define PROPERTY_MAXTEXTLEN "MaxTextLen" +#define PROPERTY_LISTSOURCE "ListSource" +#define PROPERTY_FORMATSSUPPLIER "FormatsSupplier" +#define PROPERTY_CONTROLBORDER "ControlBorder" +#define PROPERTY_CONTROLBORDERCOLOR "ControlBorderColor" +#define PROPERTY_BORDER "Border" +#define PROPERTY_BORDERCOLOR "BorderColor" +#define PROPERTY_DEFAULTCONTROL "DefaultControl" + +#define PROPERTY_LEFTMARGIN "LeftMargin" +#define PROPERTY_RIGHTMARGIN "RightMargin" +#define PROPERTY_TOPMARGIN "TopMargin" +#define PROPERTY_BOTTOMMARGIN "BottomMargin" + +#define PROPERTY_PRINTREPEATEDVALUES "PrintRepeatedValues" +#define PROPERTY_CONDITIONALPRINTEXPRESSION "ConditionalPrintExpression" +#define PROPERTY_STARTNEWCOLUMN "StartNewColumn" +#define PROPERTY_RESETPAGENUMBER "ResetPageNumber" +#define PROPERTY_PRINTWHENGROUPCHANGE "PrintWhenGroupChange" +#define PROPERTY_STATE "State" +#define PROPERTY_TIME_STATE "TimeState" +#define PROPERTY_DATE_STATE "DateState" +#define PROPERTY_TRISTATE "TriState" +#define PROPERTY_LISTSOURCETYPE "ListSourceType" +#define PROPERTY_FONTCHARWIDTH "FontCharWidth" +#define PROPERTY_FONTCHARSET "CharFontCharSet" +#define PROPERTY_FONTFAMILY "CharFontFamily" +#define PROPERTY_CHARFONTHEIGHT "CharHeight" +#define PROPERTY_FONTHEIGHT "FontHeight" +#define PROPERTY_FONTKERNING "FontKerning" +#define PROPERTY_FONT "FontDescriptor" +#define PROPERTY_FONTNAME "FontName" +#define PROPERTY_FONTORIENTATION "CharRotation" +#define PROPERTY_FONTPITCH "CharFontPitch" +#define PROPERTY_FONTSLANT "FontSlant" +#define PROPERTY_CHARSTRIKEOUT "CharStrikeout" +#define PROPERTY_FONTSTRIKEOUT "FontStrikeout" +#define PROPERTY_FONTSTYLENAME "CharFontStyleName" +#define PROPERTY_FONTUNDERLINE "CharUnderline" +#define PROPERTY_FONTWEIGHT "CharWeight" +#define PROPERTY_FONTWIDTH "FontWidth" +#define PROPERTY_FONTWORDLINEMODE "FontWordLineMode" +#define PROPERTY_FONTTYPE "FontType" + +#define PROPERTY_ENABLED "Enabled" + +#define PROPERTY_CHAREMPHASIS "CharEmphasis" +#define PROPERTY_CHARFONTNAME "CharFontName" +#define PROPERTY_CHARFONTSTYLENAME "CharFontStyleName" +#define PROPERTY_CHARFONTFAMILY "CharFontFamily" +#define PROPERTY_CHARFONTCHARSET "CharFontCharSet" +#define PROPERTY_CHARFONTPITCH "CharFontPitch" +#define PROPERTY_CHARHEIGHT "CharHeight" +#define PROPERTY_CHARUNDERLINE "CharUnderline" +#define PROPERTY_CHARWEIGHT "CharWeight" +#define PROPERTY_CHARPOSTURE "CharPosture" +#define PROPERTY_CHARWORDMODE "CharWordMode" +#define PROPERTY_CHARROTATION "CharRotation" +#define PROPERTY_CHARSCALEWIDTH "CharScaleWidth" + +// Asian +#define PROPERTY_CHAREMPHASISASIAN "CharEmphasisAsian" +#define PROPERTY_CHARFONTNAMEASIAN "CharFontNameAsian" +#define PROPERTY_CHARFONTSTYLENAMEASIAN "CharFontStyleNameAsian" +#define PROPERTY_CHARFONTFAMILYASIAN "CharFontFamilyAsian" +#define PROPERTY_CHARFONTCHARSETASIAN "CharFontCharSetAsian" +#define PROPERTY_CHARFONTPITCHASIAN "CharFontPitchAsian" +#define PROPERTY_CHARHEIGHTASIAN "CharHeightAsian" +#define PROPERTY_CHARUNDERLINEASIAN "CharUnderlineAsian" +#define PROPERTY_CHARWEIGHTASIAN "CharWeightAsian" +#define PROPERTY_CHARPOSTUREASIAN "CharPostureAsian" +#define PROPERTY_CHARWORDMODEASIAN "CharWordModeAsian" +#define PROPERTY_CHARROTATIONASIAN "CharRotationAsian" +#define PROPERTY_CHARSCALEWIDTHASIAN "CharScaleWidthAsian" +#define PROPERTY_CHARLOCALEASIAN "CharLocaleAsian" + +// Complex +#define PROPERTY_CHAREMPHASISCOMPLEX "CharEmphasisComplex" +#define PROPERTY_CHARFONTNAMECOMPLEX "CharFontNameComplex" +#define PROPERTY_CHARFONTSTYLENAMECOMPLEX "CharFontStyleNameComplex" +#define PROPERTY_CHARFONTFAMILYCOMPLEX "CharFontFamilyComplex" +#define PROPERTY_CHARFONTCHARSETCOMPLEX "CharFontCharSetComplex" +#define PROPERTY_CHARFONTPITCHCOMPLEX "CharFontPitchComplex" +#define PROPERTY_CHARHEIGHTCOMPLEX "CharHeightComplex" +#define PROPERTY_CHARUNDERLINECOMPLEX "CharUnderlineComplex" +#define PROPERTY_CHARWEIGHTCOMPLEX "CharWeightComplex" +#define PROPERTY_CHARPOSTURECOMPLEX "CharPostureComplex" +#define PROPERTY_CHARWORDMODECOMPLEX "CharWordModeComplex" +#define PROPERTY_CHARROTATIONCOMPLEX "CharRotationComplex" +#define PROPERTY_CHARSCALEWIDTHCOMPLEX "CharScaleWidthComplex" +#define PROPERTY_CHARLOCALECOMPLEX "CharLocaleComplex" + +#define PROPERTY_STATUSINDICATOR "StatusIndicator" +#define PROPERTY_SECTION "Section" +#define PROPERTY_FILTER "Filter" +#define PROPERTY_ESCAPEPROCESSING "EscapeProcessing" + +#define PROPERTY_MULTILINE "MultiLine" +#define PROPERTY_ACTIVECONNECTION "ActiveConnection" +#define PROPERTY_DATASOURCENAME "DataSourceName" +#define PROPERTY_FORMULA "Formula" +#define PROPERTY_INITIALFORMULA "InitialFormula" +#define PROPERTY_PREEVALUATED "PreEvaluated" +#define PROPERTY_DEEPTRAVERSING "DeepTraversing" +#define PROPERTY_MIMETYPE "MimeType" +#define PROPERTY_BACKGROUNDCOLOR "BackgroundColor" +#define PROPERTY_TEXT "Text" +#define PROPERTY_TEXTCOLOR "TextColor" +#define PROPERTY_TEXTLINECOLOR "TextLineColor" +#define PROPERTY_FONTRELIEF "FontRelief" +#define PROPERTY_FONTEMPHASISMARK "FontEmphasisMark" +#define PROPERTY_ZORDER "ZOrder" +#define PROPERTY_OPAQUE "Opaque" +#define PROPERTY_TRANSFORMATION "Transformation" +#define PROPERTY_CUSTOMSHAPEENGINE "CustomShapeEngine" +#define PROPERTY_CUSTOMSHAPEDATA "CustomShapeData" +#define PROPERTY_CUSTOMSHAPEGEOMETRY "CustomShapeGeometry" + +#define PROPERTY_NUMBERINGTYPE "NumberingType" +#define PROPERTY_PAGESTYLELAYOUT "PageStyleLayout" +#define PROPERTY_ISLANDSCAPE "IsLandscape" +#define PROPERTY_ALIGN "Align" +#define PROPERTY_TYPE "Type" + +#define PROPERTY_PRESERVEIRI "PreserveIRI" +#define PROPERTY_SCALEMODE "ScaleMode" + +#define PROPERTY_LINESTYLE "LineStyle" +#define PROPERTY_LINEDASH "LineDash" +#define PROPERTY_LINECOLOR "LineColor" +#define PROPERTY_LINETRANSPARENCE "LineTransparence" +#define PROPERTY_LINEWIDTH "LineWidth" + +#define PROPERTY_CHARFLASH "CharFlash" +#define PROPERTY_CHARESCAPEMENTHEIGHT "CharEscapementHeight" +#define PROPERTY_CHARLOCALE "CharLocale" +#define PROPERTY_CHARESCAPEMENT "CharEscapement" +#define PROPERTY_CHARCASEMAP "CharCaseMap" +#define PROPERTY_CHARCOMBINEISON "CharCombineIsOn" +#define PROPERTY_CHARCOMBINEPREFIX "CharCombinePrefix" +#define PROPERTY_CHARCOMBINESUFFIX "CharCombineSuffix" +#define PROPERTY_CHARHIDDEN "CharHidden" +#define PROPERTY_CHARSHADOWED "CharShadowed" +#define PROPERTY_CHARCONTOURED "CharContoured" +#define PROPERTY_CHARAUTOKERNING "CharAutoKerning" +#define PROPERTY_CHARKERNING "CharKerning" +#define PROPERTY_HYPERLINKURL "HyperLinkURL" +#define PROPERTY_HYPERLINKTARGET "HyperLinkTarget" +#define PROPERTY_HYPERLINKNAME "HyperLinkName" +#define PROPERTY_VISITEDCHARSTYLENAME "VisitedCharStyleName" +#define PROPERTY_UNVISITEDCHARSTYLENAME "UnvisitedCharStyleName" +#define PROPERTY_ORDER "Order" +#define PROPERTY_APPLYFILTER "ApplyFilter" +#define PROPERTY_MAXROWS "MaxRows" + +#define PROPERTY_REPORTNAME "ReportName" +#define CFG_REPORTDESIGNER "SunReportBuilder" +#define DBREPORTHEADER "ReportHeader" +#define DBREPORTFOOTER "ReportFooter" +#define DBPAGEHEADER "PageHeader" +#define DBPAGEFOOTER "PageFooter" +#define DBGROUPHEADER "GroupHeader" +#define DBGROUPFOOTER "GroupFooter" +#define DBDETAIL "Detail" +#define REPORTCONTROLFORMAT "ReportControlFormat" +#define CURRENT_WINDOW "CurrentWindow" +#define PROPERTY_FONTCOLOR "FontColor" +#define PROPERTY_EMPTY_IS_NULL "ConvertEmptyToNull" +#define PROPERTY_FILTERPROPOSAL "UseFilterValueProposal" +#define PROPERTY_POSITION "Position" +#define PROPERTY_FORMATKEYDATE "FormatKeyDate" +#define PROPERTY_FORMATKEYTIME "FormatKeyTime" +#define DBOVERLAPPEDCONTROL "OverlappedControl" +#define PROPERTY_FORMULALIST "FormulaList" +#define PROPERTY_SCOPE "Scope" +#define PROPERTY_CHARTTYPE "ChartType" +#define PROPERTY_PREVIEW_COUNT "RowLimit" +#define PROPERTY_TITLE "Title" +#define PROPERTY_AREA "Area" +#define PROPERTY_FILLCOLOR "FillColor" +#define DBTEXTBOXBOUNDCONTENT "TextBoxBoundContent" + +#define SERVICE_SETTINGSIMPORTER "com.sun.star.comp.Report.XMLOasisSettingsImporter" +#define SERVICE_STYLESIMPORTER "com.sun.star.comp.Report.XMLOasisStylesImporter" +#define SERVICE_CONTENTIMPORTER "com.sun.star.comp.Report.XMLOasisContentImporter" +#define SERVICE_IMPORTFILTER "com.sun.star.document.ImportFilter" +#define SERVICE_METAIMPORTER "com.sun.star.comp.Report.XMLOasisMetaImporter" +#define PROPERTY_BORDERLEFT "BorderLeft" +#define PROPERTY_BORDERRIGHT "BorderRight" +#define PROPERTY_BORDERTOP "BorderTop" +#define PROPERTY_BORDERBOTTOM "BorderBottom" + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx index 5438cba7aedb..be9c96ccdd64 100644 --- a/reportdesign/source/core/api/FixedLine.cxx +++ b/reportdesign/source/core/api/FixedLine.cxx @@ -18,8 +18,8 @@ */ #include "FixedLine.hxx" #include -#include "corestrings.hrc" -#include "core_resource.hrc" +#include "strings.hxx" +#include "strings.hrc" #include "core_resource.hxx" #include #include @@ -136,7 +136,7 @@ OFixedLine::OFixedLine(uno::Reference< uno::XComponentContext > const & _xContex ,m_LineTransparence(0) ,m_LineWidth(0) { - m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_FIXEDLINE); + m_aProps.aComponent.m_sName = RptResId(RID_STR_FIXEDLINE); m_aProps.aComponent.m_nWidth = MIN_WIDTH; } @@ -153,7 +153,7 @@ OFixedLine::OFixedLine(uno::Reference< uno::XComponentContext > const & _xContex ,m_LineTransparence(0) ,m_LineWidth(0) { - m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_FIXEDLINE); + m_aProps.aComponent.m_sName = RptResId(RID_STR_FIXEDLINE); m_aProps.aComponent.m_xFactory = _xFactory; osl_atomic_increment( &m_refCount ); try diff --git a/reportdesign/source/core/api/FixedText.cxx b/reportdesign/source/core/api/FixedText.cxx index db3dd5ae2427..0ebad3934f31 100644 --- a/reportdesign/source/core/api/FixedText.cxx +++ b/reportdesign/source/core/api/FixedText.cxx @@ -18,9 +18,9 @@ */ #include "FixedText.hxx" #include -#include "corestrings.hrc" +#include "strings.hxx" #include -#include "core_resource.hrc" +#include "strings.hrc" #include "core_resource.hxx" #include "Tools.hxx" #include @@ -47,7 +47,7 @@ OFixedText::OFixedText(uno::Reference< uno::XComponentContext > const & _xContex ,FixedTextPropertySet(_xContext,IMPLEMENTS_PROPERTY_SET,lcl_getFixedTextOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) { - m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_FIXEDTEXT); + m_aProps.aComponent.m_sName = RptResId(RID_STR_FIXEDTEXT); m_aProps.aComponent.m_nBorder = 0; // no border } @@ -58,7 +58,7 @@ OFixedText::OFixedText(uno::Reference< uno::XComponentContext > const & _xContex ,FixedTextPropertySet(_xContext,IMPLEMENTS_PROPERTY_SET,lcl_getFixedTextOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) { - m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_FIXEDTEXT); + m_aProps.aComponent.m_sName = RptResId(RID_STR_FIXEDTEXT); m_aProps.aComponent.m_nBorder = 0; // no border m_aProps.aComponent.m_xFactory = _xFactory; osl_atomic_increment( &m_refCount ); diff --git a/reportdesign/source/core/api/FormatCondition.cxx b/reportdesign/source/core/api/FormatCondition.cxx index 81687c85ca4a..d5ff822d2678 100644 --- a/reportdesign/source/core/api/FormatCondition.cxx +++ b/reportdesign/source/core/api/FormatCondition.cxx @@ -18,7 +18,7 @@ */ #include "FormatCondition.hxx" #include -#include "corestrings.hrc" +#include "strings.hxx" #include #include #include diff --git a/reportdesign/source/core/api/FormattedField.cxx b/reportdesign/source/core/api/FormattedField.cxx index 4aa4fbd7edb5..b00c5e1d6669 100644 --- a/reportdesign/source/core/api/FormattedField.cxx +++ b/reportdesign/source/core/api/FormattedField.cxx @@ -19,8 +19,8 @@ #include "FormattedField.hxx" #include #include -#include "corestrings.hrc" -#include "core_resource.hrc" +#include "strings.hxx" +#include "strings.hrc" #include "core_resource.hxx" #include #include @@ -54,7 +54,7 @@ OFormattedField::OFormattedField(uno::Reference< uno::XComponentContext > const ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) ,m_nFormatKey(0) { - m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_FORMATTEDFIELD); + m_aProps.aComponent.m_sName = RptResId(RID_STR_FORMATTEDFIELD); } OFormattedField::OFormattedField(uno::Reference< uno::XComponentContext > const & _xContext @@ -65,7 +65,7 @@ OFormattedField::OFormattedField(uno::Reference< uno::XComponentContext > const ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) ,m_nFormatKey(0) { - m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_FORMATTEDFIELD); + m_aProps.aComponent.m_sName = RptResId(RID_STR_FORMATTEDFIELD); m_aProps.aComponent.m_xFactory = _xFactory; osl_atomic_increment( &m_refCount ); { diff --git a/reportdesign/source/core/api/Function.cxx b/reportdesign/source/core/api/Function.cxx index 8696f41e3bf4..e365dc928e70 100644 --- a/reportdesign/source/core/api/Function.cxx +++ b/reportdesign/source/core/api/Function.cxx @@ -18,7 +18,7 @@ */ #include "Function.hxx" #include -#include "corestrings.hrc" +#include "strings.hxx" #include #include #include diff --git a/reportdesign/source/core/api/Functions.cxx b/reportdesign/source/core/api/Functions.cxx index 9c9d84bd124c..d70ca0fcf427 100644 --- a/reportdesign/source/core/api/Functions.cxx +++ b/reportdesign/source/core/api/Functions.cxx @@ -19,7 +19,7 @@ #include "Functions.hxx" #include "Function.hxx" #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include #include #include @@ -77,7 +77,7 @@ void SAL_CALL OFunctions::insertByIndex( ::sal_Int32 Index, const uno::Any& aEle checkIndex(Index); uno::Reference< report::XFunction > xFunction(aElement,uno::UNO_QUERY); if ( !xFunction.is() ) - throw lang::IllegalArgumentException(RPT_RESSTRING(RID_STR_ARGUMENT_IS_NULL),*this,2); + throw lang::IllegalArgumentException(RptResId(RID_STR_ARGUMENT_IS_NULL),*this,2); if ( bAdd ) m_aFunctions.push_back(xFunction); @@ -120,7 +120,7 @@ void SAL_CALL OFunctions::replaceByIndex( ::sal_Int32 Index, const uno::Any& Ele checkIndex(Index); uno::Reference< report::XFunction > xFunction(Element,uno::UNO_QUERY); if ( !xFunction.is() ) - throw lang::IllegalArgumentException(RPT_RESSTRING(RID_STR_ARGUMENT_IS_NULL),*this,2); + throw lang::IllegalArgumentException(RptResId(RID_STR_ARGUMENT_IS_NULL),*this,2); TFunctions::iterator aPos = m_aFunctions.begin(); ::std::advance(aPos,Index); aOldElement <<= *aPos; diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx index f32a33ed5437..6bcba7b6dbc6 100644 --- a/reportdesign/source/core/api/Group.cxx +++ b/reportdesign/source/core/api/Group.cxx @@ -22,8 +22,8 @@ #include #include #include -#include "corestrings.hrc" -#include "core_resource.hrc" +#include "strings.hxx" +#include "strings.hrc" #include "core_resource.hxx" #include "Tools.hxx" #include @@ -118,7 +118,7 @@ void SAL_CALL OGroup::setHeaderOn( sal_Bool _headeron ) { if ( bool(_headeron) != m_xHeader.is() ) { - OUString sName(RPT_RESSTRING(RID_STR_GROUP_HEADER)); + OUString sName(RptResId(RID_STR_GROUP_HEADER)); setSection(PROPERTY_HEADERON,_headeron,sName,m_xHeader); } } @@ -133,7 +133,7 @@ void SAL_CALL OGroup::setFooterOn( sal_Bool _footeron ) { if ( bool(_footeron) != m_xFooter.is() ) { - OUString sName(RPT_RESSTRING(RID_STR_GROUP_FOOTER)); + OUString sName(RptResId(RID_STR_GROUP_FOOTER)); setSection(PROPERTY_FOOTERON,_footeron,sName,m_xFooter); } } diff --git a/reportdesign/source/core/api/Groups.cxx b/reportdesign/source/core/api/Groups.cxx index d94a6e016234..3a4ae59b9872 100644 --- a/reportdesign/source/core/api/Groups.cxx +++ b/reportdesign/source/core/api/Groups.cxx @@ -21,7 +21,7 @@ #include #include #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include namespace reportdesign @@ -81,7 +81,7 @@ void SAL_CALL OGroups::insertByIndex( ::sal_Int32 Index, const uno::Any& aElemen checkIndex(Index); uno::Reference< report::XGroup > xGroup(aElement,uno::UNO_QUERY); if ( !xGroup.is() ) - throw lang::IllegalArgumentException(RPT_RESSTRING(RID_STR_ARGUMENT_IS_NULL),*this,2); + throw lang::IllegalArgumentException(RptResId(RID_STR_ARGUMENT_IS_NULL),*this,2); if ( bAdd ) m_aGroups.push_back(xGroup); @@ -122,7 +122,7 @@ void SAL_CALL OGroups::replaceByIndex( ::sal_Int32 Index, const uno::Any& Elemen checkIndex(Index); uno::Reference< report::XGroup > xGroup(Element,uno::UNO_QUERY); if ( !xGroup.is() ) - throw lang::IllegalArgumentException(RPT_RESSTRING(RID_STR_ARGUMENT_IS_NULL),*this,2); + throw lang::IllegalArgumentException(RptResId(RID_STR_ARGUMENT_IS_NULL),*this,2); TGroups::iterator aPos = m_aGroups.begin(); ::std::advance(aPos,Index); aOldElement <<= *aPos; diff --git a/reportdesign/source/core/api/ImageControl.cxx b/reportdesign/source/core/api/ImageControl.cxx index a42673323e4b..f0d48b45976a 100644 --- a/reportdesign/source/core/api/ImageControl.cxx +++ b/reportdesign/source/core/api/ImageControl.cxx @@ -19,8 +19,8 @@ #include "ImageControl.hxx" #include #include -#include "corestrings.hrc" -#include "core_resource.hrc" +#include "strings.hxx" +#include "strings.hrc" #include "core_resource.hxx" #include "Tools.hxx" #include @@ -119,7 +119,7 @@ OImageControl::OImageControl(uno::Reference< uno::XComponentContext > const & _x ,m_nScaleMode(awt::ImageScaleMode::NONE) ,m_bPreserveIRI(true) { - m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_IMAGECONTROL); + m_aProps.aComponent.m_sName = RptResId(RID_STR_IMAGECONTROL); } OImageControl::OImageControl(uno::Reference< uno::XComponentContext > const & _xContext @@ -131,7 +131,7 @@ OImageControl::OImageControl(uno::Reference< uno::XComponentContext > const & _x ,m_nScaleMode(awt::ImageScaleMode::NONE) ,m_bPreserveIRI(true) { - m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_IMAGECONTROL); + m_aProps.aComponent.m_sName = RptResId(RID_STR_IMAGECONTROL); m_aProps.aComponent.m_xFactory = _xFactory; osl_atomic_increment( &m_refCount ); { diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx index 3c6c4baac61d..5504abb4a4de 100644 --- a/reportdesign/source/core/api/ReportComponent.cxx +++ b/reportdesign/source/core/api/ReportComponent.cxx @@ -18,7 +18,7 @@ */ #include "ReportComponent.hxx" -#include "corestrings.hrc" +#include "strings.hxx" #include #include #include diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 1124d6881d83..04f5a8b7679e 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -37,9 +37,9 @@ #include "Shape.hxx" #include "Tools.hxx" #include "UndoEnv.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include "core_resource.hxx" -#include "corestrings.hrc" +#include "strings.hxx" #include #include @@ -537,13 +537,13 @@ OReportDefinition::OReportDefinition(uno::Reference< uno::XComponentContext > co ,m_aProps(new OReportComponentProperties(_xContext)) ,m_pImpl(new OReportDefinitionImpl(m_aMutex)) { - m_aProps->m_sName = RPT_RESSTRING(RID_STR_REPORT); + m_aProps->m_sName = RptResId(RID_STR_REPORT); osl_atomic_increment(&m_refCount); { init(); m_pImpl->m_xGroups = new OGroups(this,m_aProps->m_xContext); m_pImpl->m_xDetail = OSection::createOSection(this,m_aProps->m_xContext); - m_pImpl->m_xDetail->setName(RPT_RESSTRING(RID_STR_DETAIL)); + m_pImpl->m_xDetail->setName(RptResId(RID_STR_DETAIL)); } osl_atomic_decrement( &m_refCount ); } @@ -556,7 +556,7 @@ OReportDefinition::OReportDefinition(uno::Reference< uno::XComponentContext > co ,m_aProps(new OReportComponentProperties(_xContext)) ,m_pImpl(new OReportDefinitionImpl(m_aMutex)) { - m_aProps->m_sName = RPT_RESSTRING(RID_STR_REPORT); + m_aProps->m_sName = RptResId(RID_STR_REPORT); m_aProps->m_xFactory = _xFactory; osl_atomic_increment(&m_refCount); { @@ -564,7 +564,7 @@ OReportDefinition::OReportDefinition(uno::Reference< uno::XComponentContext > co init(); m_pImpl->m_xGroups = new OGroups(this,m_aProps->m_xContext); m_pImpl->m_xDetail = OSection::createOSection(this,m_aProps->m_xContext); - m_pImpl->m_xDetail->setName(RPT_RESSTRING(RID_STR_DETAIL)); + m_pImpl->m_xDetail->setName(RptResId(RID_STR_DETAIL)); } osl_atomic_decrement( &m_refCount ); } @@ -855,7 +855,7 @@ void SAL_CALL OReportDefinition::setReportHeaderOn( sal_Bool _reportheaderon ) { if ( bool(_reportheaderon) != m_pImpl->m_xReportHeader.is() ) { - setSection(PROPERTY_REPORTHEADERON,_reportheaderon,RPT_RESSTRING(RID_STR_REPORT_HEADER),m_pImpl->m_xReportHeader); + setSection(PROPERTY_REPORTHEADERON,_reportheaderon,RptResId(RID_STR_REPORT_HEADER),m_pImpl->m_xReportHeader); } } @@ -869,7 +869,7 @@ void SAL_CALL OReportDefinition::setReportFooterOn( sal_Bool _reportfooteron ) { if ( bool(_reportfooteron) != m_pImpl->m_xReportFooter.is() ) { - setSection(PROPERTY_REPORTFOOTERON,_reportfooteron,RPT_RESSTRING(RID_STR_REPORT_FOOTER),m_pImpl->m_xReportFooter); + setSection(PROPERTY_REPORTFOOTERON,_reportfooteron,RptResId(RID_STR_REPORT_FOOTER),m_pImpl->m_xReportFooter); } } @@ -883,7 +883,7 @@ void SAL_CALL OReportDefinition::setPageHeaderOn( sal_Bool _pageheaderon ) { if ( bool(_pageheaderon) != m_pImpl->m_xPageHeader.is() ) { - setSection(PROPERTY_PAGEHEADERON,_pageheaderon,RPT_RESSTRING(RID_STR_PAGE_HEADER),m_pImpl->m_xPageHeader); + setSection(PROPERTY_PAGEHEADERON,_pageheaderon,RptResId(RID_STR_PAGE_HEADER),m_pImpl->m_xPageHeader); } } @@ -897,7 +897,7 @@ void SAL_CALL OReportDefinition::setPageFooterOn( sal_Bool _pagefooteron ) { if ( bool(_pagefooteron) != m_pImpl->m_xPageFooter.is() ) { - setSection(PROPERTY_PAGEFOOTERON,_pagefooteron,RPT_RESSTRING(RID_STR_PAGE_FOOTER),m_pImpl->m_xPageFooter); + setSection(PROPERTY_PAGEFOOTERON,_pagefooteron,RptResId(RID_STR_PAGE_FOOTER),m_pImpl->m_xPageFooter); } } @@ -1281,7 +1281,7 @@ void SAL_CALL OReportDefinition::loadFromStorage( const uno::Reference< embed::X void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XStorage >& _xStorageToSaveTo, const uno::Sequence< beans::PropertyValue >& _aMediaDescriptor ) { if ( !_xStorageToSaveTo.is() ) - throw lang::IllegalArgumentException(RPT_RESSTRING(RID_STR_ARGUMENT_IS_NULL),*this,1); + throw lang::IllegalArgumentException(RptResId(RID_STR_ARGUMENT_IS_NULL),*this,1); SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard(m_aMutex); @@ -1437,7 +1437,7 @@ void SAL_CALL OReportDefinition::switchToStorage( const uno::Reference< embed::XStorage >& xStorage) { if (!xStorage.is()) - throw lang::IllegalArgumentException(RPT_RESSTRING(RID_STR_ARGUMENT_IS_NULL),*this,1); + throw lang::IllegalArgumentException(RptResId(RID_STR_ARGUMENT_IS_NULL),*this,1); { ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx index 8661cf2b94bc..2a8b1cd0fb56 100644 --- a/reportdesign/source/core/api/ReportEngineJFree.cxx +++ b/reportdesign/source/core/api/ReportEngineJFree.cxx @@ -45,8 +45,8 @@ #include #include "Tools.hxx" -#include "corestrings.hrc" -#include "core_resource.hrc" +#include "strings.hxx" +#include "strings.hrc" #include "core_resource.hxx" #include @@ -195,7 +195,7 @@ OUString OReportEngineJFree::getNewOutputName() ::utl::TempFile aTestFile(sName, false, &sExt); if ( !aTestFile.IsValid() ) { - sName = RPT_RESSTRING(RID_STR_REPORT); + sName = RptResId(RID_STR_REPORT); ::utl::TempFile aFile(sName, false, &sExt); sFileURL = aFile.GetURL(); } diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx index c8b29a7798b4..c712046276d3 100644 --- a/reportdesign/source/core/api/Section.cxx +++ b/reportdesign/source/core/api/Section.cxx @@ -25,9 +25,9 @@ #include #include #include -#include "corestrings.hrc" +#include "strings.hxx" #include "core_resource.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include "Tools.hxx" #include "RptModel.hxx" #include "RptPage.hxx" diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx index ce0b655d3496..3ed54547b154 100644 --- a/reportdesign/source/core/api/Shape.cxx +++ b/reportdesign/source/core/api/Shape.cxx @@ -28,8 +28,8 @@ #include #include -#include "corestrings.hrc" -#include "core_resource.hrc" +#include "strings.hxx" +#include "strings.hrc" #include "core_resource.hxx" #include "Tools.hxx" #include "RptObject.hxx" @@ -59,7 +59,7 @@ OShape::OShape(uno::Reference< uno::XComponentContext > const & _xContext) ,m_nZOrder(0) ,m_bOpaque(false) { - m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_SHAPE); + m_aProps.aComponent.m_sName = RptResId(RID_STR_SHAPE); } OShape::OShape(uno::Reference< uno::XComponentContext > const & _xContext @@ -73,7 +73,7 @@ OShape::OShape(uno::Reference< uno::XComponentContext > const & _xContext ,m_bOpaque(false) ,m_sServiceName(_sServiceName) { - m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_SHAPE); + m_aProps.aComponent.m_sName = RptResId(RID_STR_SHAPE); m_aProps.aComponent.m_xFactory = _xFactory; osl_atomic_increment( &m_refCount ); { diff --git a/reportdesign/source/core/api/Tools.cxx b/reportdesign/source/core/api/Tools.cxx index 44c2b0e5ed76..886e7fe16675 100644 --- a/reportdesign/source/core/api/Tools.cxx +++ b/reportdesign/source/core/api/Tools.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include "Tools.hxx" -#include "core_resource.hrc" +#include "strings.hrc" #include "core_resource.hxx" #include @@ -45,7 +45,7 @@ void throwIllegallArgumentException( const OUString& _sTypeName ,sal_Int16 ArgumentPosition_ ) { - OUString sErrorMessage(RPT_RESSTRING(RID_STR_ERROR_WRONG_ARGUMENT)); + OUString sErrorMessage(RptResId(RID_STR_ERROR_WRONG_ARGUMENT)); sErrorMessage = sErrorMessage.replaceAt(sErrorMessage.indexOf('#'),2,_sTypeName); throw lang::IllegalArgumentException(sErrorMessage,ExceptionContext_,ArgumentPosition_); } diff --git a/reportdesign/source/core/inc/ReportUndoFactory.hxx b/reportdesign/source/core/inc/ReportUndoFactory.hxx index 0f247e4aad36..7829022d4a6f 100644 --- a/reportdesign/source/core/inc/ReportUndoFactory.hxx +++ b/reportdesign/source/core/inc/ReportUndoFactory.hxx @@ -21,13 +21,11 @@ #include #include -#include "ModuleHelper.hxx" namespace rptui { class OReportUndoFactory : public SdrUndoFactory { - OModuleClient m_aModuleClient; ::std::unique_ptr m_pUndoFactory; OReportUndoFactory(const OReportUndoFactory&) = delete; diff --git a/reportdesign/source/core/inc/Tools.hxx b/reportdesign/source/core/inc/Tools.hxx index 37a7357cf006..64ad3ab96f78 100644 --- a/reportdesign/source/core/inc/Tools.hxx +++ b/reportdesign/source/core/inc/Tools.hxx @@ -28,7 +28,7 @@ #include "Section.hxx" -#include "corestrings.hrc" +#include "strings.hxx" namespace reportdesign { diff --git a/reportdesign/source/core/inc/core_resource.hrc b/reportdesign/source/core/inc/core_resource.hrc deleted file mode 100644 index 9b4e58889fe5..000000000000 --- a/reportdesign/source/core/inc/core_resource.hrc +++ /dev/null @@ -1,46 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef REPORTDESIGN_CORE_RESOURCE_HRC_ -#define REPORTDESIGN_CORE_RESOURCE_HRC_ - -#include - -#define RID_CORE_STRINGS_START RID_RPT_START - -//- String-IDs -#define RID_STR_DETAIL ( RID_CORE_STRINGS_START + 0 ) -#define RID_STR_PAGE_HEADER ( RID_CORE_STRINGS_START + 1 ) -#define RID_STR_PAGE_FOOTER ( RID_CORE_STRINGS_START + 2 ) -#define RID_STR_REPORT_HEADER ( RID_CORE_STRINGS_START + 3 ) -#define RID_STR_REPORT_FOOTER ( RID_CORE_STRINGS_START + 4 ) -#define RID_STR_ERROR_WRONG_ARGUMENT ( RID_CORE_STRINGS_START + 6 ) -#define RID_STR_ARGUMENT_IS_NULL ( RID_CORE_STRINGS_START + 7 ) -#define RID_STR_SHAPE ( RID_CORE_STRINGS_START + 8 ) -#define RID_STR_REPORT ( RID_CORE_STRINGS_START + 9 ) -#define RID_STR_IMAGECONTROL ( RID_CORE_STRINGS_START + 10 ) -#define RID_STR_FIXEDTEXT ( RID_CORE_STRINGS_START + 11 ) -#define RID_STR_FORMATTEDFIELD ( RID_CORE_STRINGS_START + 12 ) -#define RID_STR_GROUP_HEADER ( RID_CORE_STRINGS_START + 13 ) -#define RID_STR_GROUP_FOOTER ( RID_CORE_STRINGS_START + 14 ) -#define RID_STR_FIXEDLINE ( RID_CORE_STRINGS_START + 15 ) - -#endif // REPORTDESIGN_CORE_RESOURCE_HRC_ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/inc/core_resource.hxx b/reportdesign/source/core/inc/core_resource.hxx deleted file mode 100644 index 797dc6f77de5..000000000000 --- a/reportdesign/source/core/inc/core_resource.hxx +++ /dev/null @@ -1,66 +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_REPORTDESIGN_SOURCE_CORE_INC_CORE_RESOURCE_HXX -#define INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_CORE_RESOURCE_HXX - - -#include -#include - -class SimpleResMgr; - -namespace reportdesign -{ - -#define RPT_RESSTRING(id) ResourceManager::loadString(id) - - - //= ResourceManager - //= handling resources within the DBA-Core library - - class ResourceManager - { - static SimpleResMgr* m_pImpl; - - // no instantiation allowed - ResourceManager() = delete; - - // we'll instantiate one static member of the following class, which, in its dtor, - // ensures that m_pImpl will be deleted - class EnsureDelete - { - public: - EnsureDelete() { } - ~EnsureDelete(); - }; - friend class EnsureDelete; - - public: - /** loads the string with the specified resource id from the FormLayer resource file - */ - static OUString loadString(sal_uInt16 _nResId); - }; - - -} - - -#endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_CORE_RESOURCE_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/resource/core_resource.cxx b/reportdesign/source/core/resource/core_resource.cxx index 67813be52298..21718d124830 100644 --- a/reportdesign/source/core/resource/core_resource.cxx +++ b/reportdesign/source/core/resource/core_resource.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include "core_resource.hxx" -#include +#include // ---- needed as long as we have no contexts for components --- #include @@ -30,36 +30,11 @@ #include #include -#include "ModuleHelper.hxx" -namespace reportdesign +OUString RptResId(const char* pId) { - using namespace ::com::sun::star; - - //= ResourceManager - - SimpleResMgr* ResourceManager::m_pImpl = nullptr; - - - ResourceManager::EnsureDelete::~EnsureDelete() - { - delete ResourceManager::m_pImpl; - } - - OUString ResourceManager::loadString(sal_uInt16 _nResId) - { - if (!m_pImpl) - { - // now that we have an impl class make sure it's deleted on unloading the library - static ResourceManager::EnsureDelete s_aDeleteTheImplClass; - - m_pImpl = SimpleResMgr::Create("rpt", Application::GetSettings().GetUILanguageTag()); - } - return m_pImpl->ReadString(_nResId); - } - - + static std::locale loc = Translate::Create("rpt", Application::GetSettings().GetUILanguageTag()); + return Translate::get(pId, loc); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/resource/strings.src b/reportdesign/source/core/resource/strings.src deleted file mode 100644 index 027f30415769..000000000000 --- a/reportdesign/source/core/resource/strings.src +++ /dev/null @@ -1,97 +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 "core_resource.hrc" - -String RID_STR_DETAIL -{ - Text [ en-US ] = "Detail"; -}; - -String RID_STR_PAGE_HEADER -{ - Text [ en-US ] = "Page Header"; -}; - -String RID_STR_PAGE_FOOTER -{ - Text [ en-US ] = "Page Footer"; -}; - -String RID_STR_GROUP_HEADER -{ - Text [ en-US ] = "Group Header"; -}; - -String RID_STR_GROUP_FOOTER -{ - Text [ en-US ] = "Group Footer"; -}; - -String RID_STR_REPORT_HEADER -{ - Text [ en-US ] = "Report Header"; -}; - -String RID_STR_REPORT_FOOTER -{ - Text [ en-US ] = "Report Footer"; -}; - -String RID_STR_ERROR_WRONG_ARGUMENT -{ - Text [ en-US ] = "You tried to set an illegal argument. Please have a look at '#1' for valid arguments."; -}; - -String RID_STR_ARGUMENT_IS_NULL -{ - Text [ en-US ] = "The element is invalid."; -}; - -String RID_STR_FIXEDTEXT -{ - Text [ en-US ] = "Label field" ; -}; - -String RID_STR_FORMATTEDFIELD -{ - Text [ en-US ] = "Formatted field"; -}; - -String RID_STR_IMAGECONTROL -{ - Text [ en-US ] = "Image control" ; -}; - -String RID_STR_REPORT -{ - Text [ en-US ] = "Report"; -}; - -String RID_STR_SHAPE -{ - Text [ en-US ] = "Shape"; -}; - -String RID_STR_FIXEDLINE -{ - Text [ en-US ] = "Fixed line"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/sdr/ModuleHelper.cxx b/reportdesign/source/core/sdr/ModuleHelper.cxx deleted file mode 100644 index 58f1691227b1..000000000000 --- a/reportdesign/source/core/sdr/ModuleHelper.cxx +++ /dev/null @@ -1,124 +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 -#include "ModuleHelper.hxx" -#include -#include -#include -#include -#include -#include -#include -#include - -#define ENTER_MOD_METHOD() \ - ::osl::MutexGuard aGuard(theOModuleMutex::get()); \ - ensureImpl() - - -namespace rptui -{ - - using namespace ::com::sun::star; - -//= OModuleImpl - -/** implementation for OModule. not threadsafe, has to be guarded by its owner -*/ -class OModuleImpl -{ - std::unique_ptr m_pResources; - -public: - /// ctor - OModuleImpl(); - - /// get the manager for the resources of the module - ResMgr* getResManager(); -}; - - -OModuleImpl::OModuleImpl() - :m_pResources(nullptr) -{ -} - - -ResMgr* OModuleImpl::getResManager() -{ - // note that this method is not threadsafe, which counts for the whole class ! - - if (!m_pResources) - { - // create a manager with a fixed prefix - m_pResources.reset( ResMgr::CreateResMgr("rptui") ); - } - return m_pResources.get(); -} - - -//= OModule - - -namespace -{ - // access safety - struct theOModuleMutex : public rtl::Static< osl::Mutex, theOModuleMutex > {}; -} - -sal_Int32 OModule::s_nClients = 0; -OModuleImpl* OModule::s_pImpl = nullptr; - -ResMgr* OModule::getResManager() -{ - ENTER_MOD_METHOD(); - return s_pImpl->getResManager(); -} - - -void OModule::registerClient() -{ - ::osl::MutexGuard aGuard(theOModuleMutex::get()); - ++s_nClients; -} - - -void OModule::revokeClient() -{ - ::osl::MutexGuard aGuard(theOModuleMutex::get()); - if (!--s_nClients && s_pImpl) - { - delete s_pImpl; - s_pImpl = nullptr; - } -} - - -void OModule::ensureImpl() -{ - if (s_pImpl) - return; - s_pImpl = new OModuleImpl(); -} - - -} // namespace dbaui - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx b/reportdesign/source/core/sdr/PropertyForward.cxx index d65386302c23..0b06d5946698 100644 --- a/reportdesign/source/core/sdr/PropertyForward.cxx +++ b/reportdesign/source/core/sdr/PropertyForward.cxx @@ -23,7 +23,7 @@ #include #include #include -#include "corestrings.hrc" +#include "strings.hxx" namespace rptui { diff --git a/reportdesign/source/core/sdr/ReportDrawPage.cxx b/reportdesign/source/core/sdr/ReportDrawPage.cxx index 4fb8ca0d3a6c..56573be9421a 100644 --- a/reportdesign/source/core/sdr/ReportDrawPage.cxx +++ b/reportdesign/source/core/sdr/ReportDrawPage.cxx @@ -20,7 +20,7 @@ #include "RptObject.hxx" #include "RptModel.hxx" #include "RptDef.hxx" -#include "corestrings.hrc" +#include "strings.hxx" #include #include #include diff --git a/reportdesign/source/core/sdr/ReportUndoFactory.cxx b/reportdesign/source/core/sdr/ReportUndoFactory.cxx index 984da1343982..712eb12e8727 100644 --- a/reportdesign/source/core/sdr/ReportUndoFactory.cxx +++ b/reportdesign/source/core/sdr/ReportUndoFactory.cxx @@ -19,13 +19,13 @@ #include "ReportUndoFactory.hxx" #include "RptObject.hxx" #include "UndoActions.hxx" -#include "RptResId.hrc" +#include "strings.hrc" namespace rptui { using namespace ::com::sun::star; -SdrUndoAction* lcl_createUndo(SdrObject& rObject,Action _eAction,sal_uInt16 _nCommentId) +SdrUndoAction* lcl_createUndo(SdrObject& rObject, Action _eAction, const char* pCommentId) { OObjectBase* pObj = dynamic_cast(&rObject); if ( !pObj ) @@ -35,9 +35,9 @@ SdrUndoAction* lcl_createUndo(SdrObject& rObject,Action _eAction,sal_uInt16 _nCo uno::Reference< report::XGroup> xGroup = xSection->getGroup(); SdrUndoAction* pUndo = nullptr; if ( xGroup.is() ) - pUndo = new OUndoGroupSectionAction(*rObject.GetModel(),_eAction,OGroupHelper::getMemberFunction(xSection),xGroup,xReportComponent,_nCommentId); + pUndo = new OUndoGroupSectionAction(*rObject.GetModel(),_eAction,OGroupHelper::getMemberFunction(xSection),xGroup,xReportComponent,pCommentId); else - pUndo = new OUndoReportSectionAction(*rObject.GetModel(),_eAction,OReportHelper::getMemberFunction(xSection),xSection->getReportDefinition(),xReportComponent,_nCommentId); + pUndo = new OUndoReportSectionAction(*rObject.GetModel(),_eAction,OReportHelper::getMemberFunction(xSection),xSection->getReportDefinition(),xReportComponent,pCommentId); return pUndo; } diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx index 4eb29d0c3b89..36a25e337294 100644 --- a/reportdesign/source/core/sdr/RptModel.cxx +++ b/reportdesign/source/core/sdr/RptModel.cxx @@ -20,6 +20,7 @@ #include "RptModel.hxx" #include "RptPage.hxx" #include +#include #include #include @@ -31,7 +32,7 @@ #include #include "rptui_slotid.hrc" #include "RptDef.hxx" -#include "corestrings.hrc" +#include "strings.hxx" #include "FixedLine.hxx" #include "FormattedField.hxx" #include "FixedText.hxx" @@ -186,5 +187,4 @@ uno::Reference< uno::XInterface > OReportModel::createShape(const OUString& aSer } //rptui - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index d82f4a457851..8e82dcab9b77 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -27,11 +27,10 @@ #include #include #include "RptPage.hxx" -#include "corestrings.hrc" +#include "strings.hxx" #include -#include "ModuleHelper.hxx" -#include +#include #include "strings.hxx" #include #include diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx index 08edfe1cdc60..68a6023f1a71 100644 --- a/reportdesign/source/core/sdr/UndoActions.cxx +++ b/reportdesign/source/core/sdr/UndoActions.cxx @@ -21,13 +21,13 @@ #include "UndoEnv.hxx" #include "formatnormalizer.hxx" #include "conditionupdater.hxx" -#include "corestrings.hrc" +#include "strings.hxx" #include "rptui_slotid.hrc" #include "RptDef.hxx" -#include "ModuleHelper.hxx" +#include "core_resource.hxx" #include "RptObject.hxx" #include "RptPage.hxx" -#include "RptResId.hrc" +#include "strings.hrc" #include "RptModel.hxx" #include @@ -79,12 +79,12 @@ namespace rptui } -OCommentUndoAction::OCommentUndoAction(SdrModel& _rMod,sal_uInt16 nCommentID) +OCommentUndoAction::OCommentUndoAction(SdrModel& _rMod,const char* pCommentID) :SdrUndoAction(_rMod) { m_pController = static_cast< OReportModel& >( _rMod ).getController(); - if ( nCommentID ) - m_strComment = ModuleRes(nCommentID); + if (pCommentID) + m_strComment = RptResId(pCommentID); } OCommentUndoAction::~OCommentUndoAction() { @@ -102,8 +102,8 @@ OUndoContainerAction::OUndoContainerAction(SdrModel& _rMod ,Action _eAction ,const uno::Reference< container::XIndexContainer >& rContainer ,const Reference< XInterface > & xElem - ,sal_uInt16 _nCommentId) - :OCommentUndoAction(_rMod,_nCommentId) + ,const char* pCommentId) + :OCommentUndoAction(_rMod, pCommentId) ,m_xElement(xElem) ,m_xContainer(rContainer) ,m_eAction( _eAction ) @@ -246,8 +246,8 @@ OUndoGroupSectionAction::OUndoGroupSectionAction(SdrModel& _rMod ,OGroupHelper> _pMemberFunction ,const uno::Reference< report::XGroup >& _xGroup ,const Reference< XInterface > & xElem - ,sal_uInt16 _nCommentId) -:OUndoContainerAction(_rMod,_eAction,nullptr,xElem,_nCommentId) + ,const char* pCommentId) +:OUndoContainerAction(_rMod,_eAction,nullptr,xElem,pCommentId) ,m_aGroupHelper(_xGroup) ,m_pMemberFunction(_pMemberFunction) { @@ -292,8 +292,8 @@ OUndoReportSectionAction::OUndoReportSectionAction(SdrModel& _rMod ,OReportHelper> _pMemberFunction ,const uno::Reference< report::XReportDefinition >& _xReport ,const Reference< XInterface > & xElem - ,sal_uInt16 _nCommentId) -:OUndoContainerAction(_rMod,_eAction,nullptr,xElem,_nCommentId) + ,const char* pCommentId) +:OUndoContainerAction(_rMod,_eAction,nullptr,xElem,pCommentId) ,m_aReportHelper(_xReport) ,m_pMemberFunction(_pMemberFunction) { @@ -338,7 +338,7 @@ void OUndoReportSectionAction::implReRemove( ) } ORptUndoPropertyAction::ORptUndoPropertyAction(SdrModel& rNewMod, const PropertyChangeEvent& evt) - :OCommentUndoAction(rNewMod,0) + :OCommentUndoAction(rNewMod,nullptr) ,m_xObj(evt.Source, UNO_QUERY) ,m_aPropertyName(evt.PropertyName) ,m_aNewValue(evt.NewValue) @@ -381,7 +381,7 @@ void ORptUndoPropertyAction::setProperty(bool _bOld) OUString ORptUndoPropertyAction::GetComment() const { - OUString aStr( ModuleRes(RID_STR_UNDO_PROPERTY) ); + OUString aStr( RptResId(RID_STR_UNDO_PROPERTY) ); return aStr.replaceFirst("#", m_aPropertyName); } diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx index ed3caaaba4a8..38c03995ec8d 100644 --- a/reportdesign/source/core/sdr/UndoEnv.cxx +++ b/reportdesign/source/core/sdr/UndoEnv.cxx @@ -20,13 +20,12 @@ #include "UndoEnv.hxx" #include "formatnormalizer.hxx" #include "conditionupdater.hxx" -#include "corestrings.hrc" +#include "strings.hxx" #include "rptui_slotid.hrc" #include "RptDef.hxx" -#include "ModuleHelper.hxx" #include "RptObject.hxx" #include "RptPage.hxx" -#include "RptResId.hrc" +#include "strings.hrc" #include "RptModel.hxx" #include diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx index 5a5696861bb9..b2887720d4cd 100644 --- a/reportdesign/source/filter/xml/xmlCell.cxx +++ b/reportdesign/source/filter/xml/xmlCell.cxx @@ -31,7 +31,7 @@ #include #include #include -#include "xmlstrings.hrc" +#include "strings.hxx" #include "xmlTable.hxx" #include "xmlFormattedField.hxx" #include "xmlImage.hxx" diff --git a/reportdesign/source/filter/xml/xmlColumn.cxx b/reportdesign/source/filter/xml/xmlColumn.cxx index f010f246c351..a563799502c2 100644 --- a/reportdesign/source/filter/xml/xmlColumn.cxx +++ b/reportdesign/source/filter/xml/xmlColumn.cxx @@ -30,7 +30,7 @@ #include #include #include -#include "xmlstrings.hrc" +#include "strings.hxx" #define PROPERTY_ID_WIDTH 1 #define PROPERTY_ID_HEIGHT 2 diff --git a/reportdesign/source/filter/xml/xmlComponent.cxx b/reportdesign/source/filter/xml/xmlComponent.cxx index cc9b689d1dde..788a0a3a09be 100644 --- a/reportdesign/source/filter/xml/xmlComponent.cxx +++ b/reportdesign/source/filter/xml/xmlComponent.cxx @@ -24,7 +24,7 @@ #include #include "xmlEnums.hxx" #include "xmlHelper.hxx" -#include "xmlstrings.hrc" +#include "strings.hxx" #include "xmlStyleImport.hxx" #include #include diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx index d44a982b8b33..767f1733c942 100644 --- a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx +++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx @@ -24,7 +24,7 @@ #include "xmlEnums.hxx" #include "xmlControlProperty.hxx" #include "xmlComponent.hxx" -#include "xmlstrings.hrc" +#include "strings.hxx" namespace rptxml { diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index f37e32667841..7a66a583f019 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -31,7 +31,7 @@ #include #include #include "xmlHelper.hxx" -#include "xmlstrings.hrc" +#include "strings.hxx" #include "xmlPropertyHandler.hxx" #include #include diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx index 21a8fc1a6306..d8ce3fa9cd2e 100644 --- a/reportdesign/source/filter/xml/xmlFixedContent.cxx +++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx @@ -24,7 +24,7 @@ #include "xmlEnums.hxx" #include "xmlReportElement.hxx" #include "xmlCell.hxx" -#include "xmlstrings.hrc" +#include "strings.hxx" #include #include #include diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.cxx b/reportdesign/source/filter/xml/xmlFormatCondition.cxx index 323d47e897d8..0e66bb46e689 100644 --- a/reportdesign/source/filter/xml/xmlFormatCondition.cxx +++ b/reportdesign/source/filter/xml/xmlFormatCondition.cxx @@ -27,7 +27,7 @@ #include #include #include -#include "xmlstrings.hrc" +#include "strings.hxx" #include "xmlStyleImport.hxx" namespace rptxml diff --git a/reportdesign/source/filter/xml/xmlFunction.cxx b/reportdesign/source/filter/xml/xmlFunction.cxx index 586296daf52d..76c7c00f18ae 100644 --- a/reportdesign/source/filter/xml/xmlFunction.cxx +++ b/reportdesign/source/filter/xml/xmlFunction.cxx @@ -23,7 +23,7 @@ #include #include "xmlHelper.hxx" #include "xmlEnums.hxx" -#include "xmlstrings.hrc" +#include "strings.hxx" namespace rptxml { diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx index d3e0095f4731..6582a4543444 100644 --- a/reportdesign/source/filter/xml/xmlHelper.cxx +++ b/reportdesign/source/filter/xml/xmlHelper.cxx @@ -31,7 +31,7 @@ #include #include #include -#include "xmlstrings.hrc" +#include "strings.hxx" #include "xmlEnums.hxx" #include #include diff --git a/reportdesign/source/filter/xml/xmlRow.cxx b/reportdesign/source/filter/xml/xmlRow.cxx index fbf2ab633345..1f9862a01ab2 100644 --- a/reportdesign/source/filter/xml/xmlRow.cxx +++ b/reportdesign/source/filter/xml/xmlRow.cxx @@ -28,7 +28,7 @@ #include #include #include -#include "xmlstrings.hrc" +#include "strings.hxx" namespace rptxml { diff --git a/reportdesign/source/filter/xml/xmlSection.cxx b/reportdesign/source/filter/xml/xmlSection.cxx index c8e714237f0a..f69b5e3edffa 100644 --- a/reportdesign/source/filter/xml/xmlSection.cxx +++ b/reportdesign/source/filter/xml/xmlSection.cxx @@ -29,7 +29,7 @@ #include "xmlStyleImport.hxx" #include #include -#include "xmlstrings.hrc" +#include "strings.hxx" #include "xmlTable.hxx" diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx index c36fdfc33077..5ff337bcaf4f 100644 --- a/reportdesign/source/filter/xml/xmlTable.cxx +++ b/reportdesign/source/filter/xml/xmlTable.cxx @@ -29,7 +29,7 @@ #include #include "xmlCondPrtExpr.hxx" #include "xmlStyleImport.hxx" -#include "xmlstrings.hrc" +#include "strings.hxx" #include #include #include diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index f691cf7bbbac..7925036608fa 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -57,7 +57,7 @@ #include #include "xmlEnums.hxx" #include "xmlStyleImport.hxx" -#include "xmlstrings.hrc" +#include "strings.hxx" #include "xmlPropertyHandler.hxx" #include #include "ReportDefinition.hxx" diff --git a/reportdesign/source/inc/corestrings.hrc b/reportdesign/source/inc/corestrings.hrc deleted file mode 100644 index 2d5505b2afea..000000000000 --- a/reportdesign/source/inc/corestrings.hrc +++ /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 . - */ -#ifndef REPORTDESIGN_SHARED_CORESTRINGS_HRC -#define REPORTDESIGN_SHARED_CORESTRINGS_HRC - -#include - -#define STRINGCONSTANTS_INCLUDED_INDIRECT -#include "stringconstants.hrc" -#undef STRINGCONSTANTS_INCLUDED_INDIRECT - -#endif // REPORTDESIGN_SHARED_CORESTRINGS_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/inc/stringconstants.hrc b/reportdesign/source/inc/stringconstants.hrc deleted file mode 100644 index 1cfe717f8092..000000000000 --- a/reportdesign/source/inc/stringconstants.hrc +++ /dev/null @@ -1,257 +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_REPORTDESIGN_SOURCE_INC_STRINGCONSTANTS_HRC -#define INCLUDED_REPORTDESIGN_SOURCE_INC_STRINGCONSTANTS_HRC - -#ifndef STRINGCONSTANTS_INCLUDED_INDIRECT -#error "don't include this file directly! use dbastrings.hrc or dbustrings.hrc instead!" -#endif - -//= service names - -#define SERVICE_FIXEDTEXT "com.sun.star.report.FixedText" -#define SERVICE_FORMATTEDFIELD "com.sun.star.report.FormattedField" -#define SERVICE_IMAGECONTROL "com.sun.star.report.ImageControl" -#define SERVICE_FORMATCONDITION "com.sun.star.report.FormatCondition" -#define SERVICE_FUNCTION "com.sun.star.report.Function" -#define SERVICE_REPORTDEFINITION "com.sun.star.report.ReportDefinition" -#define SERVICE_SHAPE "com.sun.star.report.Shape" -#define SERVICE_FIXEDLINE "com.sun.star.report.FixedLine" -#define SERVICE_SECTION "com.sun.star.report.Section" -#define SERVICE_GROUP "com.sun.star.report.Group" - -//= property names - -#define PROPERTY_VISIBLE "Visible" -#define PROPERTY_NAME "Name" -#define PROPERTY_HEIGHT "Height" -#define PROPERTY_BACKCOLOR "BackColor" -#define PROPERTY_BACKTRANSPARENT "BackTransparent" -#define PROPERTY_CONTROLBACKGROUND "ControlBackground" -#define PROPERTY_CONTROLBACKGROUNDTRANSPARENT "ControlBackgroundTransparent" -#define PROPERTY_FORCENEWPAGE "ForceNewPage" -#define PROPERTY_NEWROWORCOL "NewRowOrCol" -#define PROPERTY_KEEPTOGETHER "KeepTogether" -#define PROPERTY_CANGROW "CanGrow" -#define PROPERTY_CANSHRINK "CanShrink" -#define PROPERTY_REPEATSECTION "RepeatSection" -#define PROPERTY_GROUP "Group" -#define PROPERTY_REPORTDEFINITION "ReportDefinition" - -#define PROPERTY_GROUPINTERVAL "GroupInterval" -#define PROPERTY_EXPRESSION "Expression" -#define PROPERTY_GROUPON "GroupOn" -#define PROPERTY_SORTASCENDING "SortAscending" - -#define PROPERTY_MASTERFIELDS "MasterFields" -#define PROPERTY_DETAILFIELDS "DetailFields" -#define PROPERTY_CAPTION "Caption" -#define PROPERTY_COMMAND "Command" -#define PROPERTY_BACKGRAPHICLOCATION "BackGraphicLocation" -#define PROPERTY_ORIENTATION "Orientation" -#define PROPERTY_PAPERSIZE "Size" -#define PROPERTY_GROUPKEEPTOGETHER "GroupKeepTogether" -#define PROPERTY_PAGEHEADEROPTION "PageHeaderOption" -#define PROPERTY_PAGEFOOTEROPTION "PageFooterOption" -#define PROPERTY_COMMANDTYPE "CommandType" -#define PROPERTY_REPORTHEADERON "ReportHeaderOn" -#define PROPERTY_REPORTFOOTERON "ReportFooterOn" -#define PROPERTY_PAGEHEADERON "PageHeaderOn" -#define PROPERTY_PAGEFOOTERON "PageFooterOn" -#define PROPERTY_HEADERON "HeaderOn" -#define PROPERTY_FOOTERON "FooterOn" -#define PROPERTY_WIDTH "Width" -#define PROPERTY_POSITIONX "PositionX" -#define PROPERTY_POSITIONY "PositionY" -#define PROPERTY_DATAFIELD "DataField" -#define PROPERTY_PARAADJUST "ParaAdjust" -#define PROPERTY_FONTDESCRIPTOR "FontDescriptor" -#define PROPERTY_FONTDESCRIPTORASIAN "FontDescriptorAsian" -#define PROPERTY_FONTDESCRIPTORCOMPLEX "FontDescriptorComplex" -#define PROPERTY_CONTROLTEXTEMPHASISMARK "ControlTextEmphasis" -#define PROPERTY_CHARRELIEF "CharRelief" -#define PROPERTY_CHARCOLOR "CharColor" -#define PROPERTY_VERTICALALIGN "VerticalAlign" -#define PROPERTY_IMAGEPOSITION "ImagePosition" -#define PROPERTY_IMAGEURL "ImageURL" -#define PROPERTY_CHARUNDERLINECOLOR "CharUnderlineColor" -#define PROPERTY_LABEL "Label" -#define PROPERTY_EFFECTIVEDEFAULT "EffectiveDefault" -#define PROPERTY_EFFECTIVEMAX "EffectiveMax" -#define PROPERTY_EFFECTIVEMIN "EffectiveMin" -#define PROPERTY_FORMATKEY "FormatKey" -#define PROPERTY_MAXTEXTLEN "MaxTextLen" -#define PROPERTY_LISTSOURCE "ListSource" -#define PROPERTY_FORMATSSUPPLIER "FormatsSupplier" -#define PROPERTY_CONTROLBORDER "ControlBorder" -#define PROPERTY_CONTROLBORDERCOLOR "ControlBorderColor" -#define PROPERTY_BORDER "Border" -#define PROPERTY_BORDERCOLOR "BorderColor" -#define PROPERTY_DEFAULTCONTROL "DefaultControl" - -#define PROPERTY_LEFTMARGIN "LeftMargin" -#define PROPERTY_RIGHTMARGIN "RightMargin" -#define PROPERTY_TOPMARGIN "TopMargin" -#define PROPERTY_BOTTOMMARGIN "BottomMargin" - -#define PROPERTY_PRINTREPEATEDVALUES "PrintRepeatedValues" -#define PROPERTY_CONDITIONALPRINTEXPRESSION "ConditionalPrintExpression" -#define PROPERTY_STARTNEWCOLUMN "StartNewColumn" -#define PROPERTY_RESETPAGENUMBER "ResetPageNumber" -#define PROPERTY_PRINTWHENGROUPCHANGE "PrintWhenGroupChange" -#define PROPERTY_STATE "State" -#define PROPERTY_TIME_STATE "TimeState" -#define PROPERTY_DATE_STATE "DateState" -#define PROPERTY_TRISTATE "TriState" -#define PROPERTY_LISTSOURCETYPE "ListSourceType" -#define PROPERTY_FONTCHARWIDTH "FontCharWidth" -#define PROPERTY_FONTCHARSET "CharFontCharSet" -#define PROPERTY_FONTFAMILY "CharFontFamily" -#define PROPERTY_CHARFONTHEIGHT "CharHeight" -#define PROPERTY_FONTHEIGHT "FontHeight" -#define PROPERTY_FONTKERNING "FontKerning" -#define PROPERTY_FONT "FontDescriptor" -#define PROPERTY_FONTNAME "FontName" -#define PROPERTY_FONTORIENTATION "CharRotation" -#define PROPERTY_FONTPITCH "CharFontPitch" -#define PROPERTY_FONTSLANT "FontSlant" -#define PROPERTY_CHARSTRIKEOUT "CharStrikeout" -#define PROPERTY_FONTSTRIKEOUT "FontStrikeout" -#define PROPERTY_FONTSTYLENAME "CharFontStyleName" -#define PROPERTY_FONTUNDERLINE "CharUnderline" -#define PROPERTY_FONTWEIGHT "CharWeight" -#define PROPERTY_FONTWIDTH "FontWidth" -#define PROPERTY_FONTWORDLINEMODE "FontWordLineMode" -#define PROPERTY_FONTTYPE "FontType" - -#define PROPERTY_ENABLED "Enabled" - -#define PROPERTY_CHAREMPHASIS "CharEmphasis" -#define PROPERTY_CHARFONTNAME "CharFontName" -#define PROPERTY_CHARFONTSTYLENAME "CharFontStyleName" -#define PROPERTY_CHARFONTFAMILY "CharFontFamily" -#define PROPERTY_CHARFONTCHARSET "CharFontCharSet" -#define PROPERTY_CHARFONTPITCH "CharFontPitch" -#define PROPERTY_CHARHEIGHT "CharHeight" -#define PROPERTY_CHARUNDERLINE "CharUnderline" -#define PROPERTY_CHARWEIGHT "CharWeight" -#define PROPERTY_CHARPOSTURE "CharPosture" -#define PROPERTY_CHARWORDMODE "CharWordMode" -#define PROPERTY_CHARROTATION "CharRotation" -#define PROPERTY_CHARSCALEWIDTH "CharScaleWidth" - -// Asian -#define PROPERTY_CHAREMPHASISASIAN "CharEmphasisAsian" -#define PROPERTY_CHARFONTNAMEASIAN "CharFontNameAsian" -#define PROPERTY_CHARFONTSTYLENAMEASIAN "CharFontStyleNameAsian" -#define PROPERTY_CHARFONTFAMILYASIAN "CharFontFamilyAsian" -#define PROPERTY_CHARFONTCHARSETASIAN "CharFontCharSetAsian" -#define PROPERTY_CHARFONTPITCHASIAN "CharFontPitchAsian" -#define PROPERTY_CHARHEIGHTASIAN "CharHeightAsian" -#define PROPERTY_CHARUNDERLINEASIAN "CharUnderlineAsian" -#define PROPERTY_CHARWEIGHTASIAN "CharWeightAsian" -#define PROPERTY_CHARPOSTUREASIAN "CharPostureAsian" -#define PROPERTY_CHARWORDMODEASIAN "CharWordModeAsian" -#define PROPERTY_CHARROTATIONASIAN "CharRotationAsian" -#define PROPERTY_CHARSCALEWIDTHASIAN "CharScaleWidthAsian" -#define PROPERTY_CHARLOCALEASIAN "CharLocaleAsian" - -// Complex -#define PROPERTY_CHAREMPHASISCOMPLEX "CharEmphasisComplex" -#define PROPERTY_CHARFONTNAMECOMPLEX "CharFontNameComplex" -#define PROPERTY_CHARFONTSTYLENAMECOMPLEX "CharFontStyleNameComplex" -#define PROPERTY_CHARFONTFAMILYCOMPLEX "CharFontFamilyComplex" -#define PROPERTY_CHARFONTCHARSETCOMPLEX "CharFontCharSetComplex" -#define PROPERTY_CHARFONTPITCHCOMPLEX "CharFontPitchComplex" -#define PROPERTY_CHARHEIGHTCOMPLEX "CharHeightComplex" -#define PROPERTY_CHARUNDERLINECOMPLEX "CharUnderlineComplex" -#define PROPERTY_CHARWEIGHTCOMPLEX "CharWeightComplex" -#define PROPERTY_CHARPOSTURECOMPLEX "CharPostureComplex" -#define PROPERTY_CHARWORDMODECOMPLEX "CharWordModeComplex" -#define PROPERTY_CHARROTATIONCOMPLEX "CharRotationComplex" -#define PROPERTY_CHARSCALEWIDTHCOMPLEX "CharScaleWidthComplex" -#define PROPERTY_CHARLOCALECOMPLEX "CharLocaleComplex" - -#define PROPERTY_STATUSINDICATOR "StatusIndicator" -#define PROPERTY_SECTION "Section" -#define PROPERTY_FILTER "Filter" -#define PROPERTY_ESCAPEPROCESSING "EscapeProcessing" - -#define PROPERTY_MULTILINE "MultiLine" -#define PROPERTY_ACTIVECONNECTION "ActiveConnection" -#define PROPERTY_DATASOURCENAME "DataSourceName" -#define PROPERTY_FORMULA "Formula" -#define PROPERTY_INITIALFORMULA "InitialFormula" -#define PROPERTY_PREEVALUATED "PreEvaluated" -#define PROPERTY_DEEPTRAVERSING "DeepTraversing" -#define PROPERTY_MIMETYPE "MimeType" -#define PROPERTY_BACKGROUNDCOLOR "BackgroundColor" -#define PROPERTY_TEXT "Text" -#define PROPERTY_TEXTCOLOR "TextColor" -#define PROPERTY_TEXTLINECOLOR "TextLineColor" -#define PROPERTY_FONTRELIEF "FontRelief" -#define PROPERTY_FONTEMPHASISMARK "FontEmphasisMark" -#define PROPERTY_ZORDER "ZOrder" -#define PROPERTY_OPAQUE "Opaque" -#define PROPERTY_TRANSFORMATION "Transformation" -#define PROPERTY_CUSTOMSHAPEENGINE "CustomShapeEngine" -#define PROPERTY_CUSTOMSHAPEDATA "CustomShapeData" -#define PROPERTY_CUSTOMSHAPEGEOMETRY "CustomShapeGeometry" - -#define PROPERTY_NUMBERINGTYPE "NumberingType" -#define PROPERTY_PAGESTYLELAYOUT "PageStyleLayout" -#define PROPERTY_ISLANDSCAPE "IsLandscape" -#define PROPERTY_ALIGN "Align" -#define PROPERTY_TYPE "Type" - -#define PROPERTY_PRESERVEIRI "PreserveIRI" -#define PROPERTY_SCALEMODE "ScaleMode" - -#define PROPERTY_LINESTYLE "LineStyle" -#define PROPERTY_LINEDASH "LineDash" -#define PROPERTY_LINECOLOR "LineColor" -#define PROPERTY_LINETRANSPARENCE "LineTransparence" -#define PROPERTY_LINEWIDTH "LineWidth" - -#define PROPERTY_CHARFLASH "CharFlash" -#define PROPERTY_CHARESCAPEMENTHEIGHT "CharEscapementHeight" -#define PROPERTY_CHARLOCALE "CharLocale" -#define PROPERTY_CHARESCAPEMENT "CharEscapement" -#define PROPERTY_CHARCASEMAP "CharCaseMap" -#define PROPERTY_CHARCOMBINEISON "CharCombineIsOn" -#define PROPERTY_CHARCOMBINEPREFIX "CharCombinePrefix" -#define PROPERTY_CHARCOMBINESUFFIX "CharCombineSuffix" -#define PROPERTY_CHARHIDDEN "CharHidden" -#define PROPERTY_CHARSHADOWED "CharShadowed" -#define PROPERTY_CHARCONTOURED "CharContoured" -#define PROPERTY_CHARAUTOKERNING "CharAutoKerning" -#define PROPERTY_CHARKERNING "CharKerning" -#define PROPERTY_HYPERLINKURL "HyperLinkURL" -#define PROPERTY_HYPERLINKTARGET "HyperLinkTarget" -#define PROPERTY_HYPERLINKNAME "HyperLinkName" -#define PROPERTY_VISITEDCHARSTYLENAME "VisitedCharStyleName" -#define PROPERTY_UNVISITEDCHARSTYLENAME "UnvisitedCharStyleName" -#define PROPERTY_ORDER "Order" -#define PROPERTY_APPLYFILTER "ApplyFilter" -#define PROPERTY_MAXROWS "MaxRows" - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/inc/uistrings.hrc b/reportdesign/source/inc/uistrings.hrc deleted file mode 100644 index 4aaca430f215..000000000000 --- a/reportdesign/source/inc/uistrings.hrc +++ /dev/null @@ -1,57 +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 REPORTDESIGN_SHARED_UISTRINGS_HRC -#define REPORTDESIGN_SHARED_UISTRINGS_HRC - -#include - -#define STRINGCONSTANTS_INCLUDED_INDIRECT -#include "stringconstants.hrc" -#undef STRINGCONSTANTS_INCLUDED_INDIRECT - -#define PROPERTY_REPORTNAME "ReportName" -#define CFG_REPORTDESIGNER "SunReportBuilder" -#define DBREPORTHEADER "ReportHeader" -#define DBREPORTFOOTER "ReportFooter" -#define DBPAGEHEADER "PageHeader" -#define DBPAGEFOOTER "PageFooter" -#define DBGROUPHEADER "GroupHeader" -#define DBGROUPFOOTER "GroupFooter" -#define DBDETAIL "Detail" -#define REPORTCONTROLFORMAT "ReportControlFormat" -#define CURRENT_WINDOW "CurrentWindow" -#define PROPERTY_FONTCOLOR "FontColor" -#define PROPERTY_EMPTY_IS_NULL "ConvertEmptyToNull" -#define PROPERTY_FILTERPROPOSAL "UseFilterValueProposal" -#define PROPERTY_POSITION "Position" -#define PROPERTY_FORMATKEYDATE "FormatKeyDate" -#define PROPERTY_FORMATKEYTIME "FormatKeyTime" -#define DBOVERLAPPEDCONTROL "OverlappedControl" -#define PROPERTY_FORMULALIST "FormulaList" -#define PROPERTY_SCOPE "Scope" -#define PROPERTY_CHARTTYPE "ChartType" -#define PROPERTY_PREVIEW_COUNT "RowLimit" -#define PROPERTY_TITLE "Title" -#define PROPERTY_AREA "Area" -#define PROPERTY_FILLCOLOR "FillColor" -#define DBTEXTBOXBOUNDCONTENT "TextBoxBoundContent" - -#endif // REPORTDESIGN_SHARED_UISTRINGS_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/inc/xmlstrings.hrc b/reportdesign/source/inc/xmlstrings.hrc deleted file mode 100644 index ab0082a40dc1..000000000000 --- a/reportdesign/source/inc/xmlstrings.hrc +++ /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 . - */ -#ifndef REPORTDESIGN_SHARED_XMLSTRINGS_HRC -#define REPORTDESIGN_SHARED_XMLSTRINGS_HRC - -#include - -#define STRINGCONSTANTS_INCLUDED_INDIRECT -#include "stringconstants.hrc" -#undef STRINGCONSTANTS_INCLUDED_INDIRECT - -//= XML - -#define SERVICE_SETTINGSIMPORTER "com.sun.star.comp.Report.XMLOasisSettingsImporter" -#define SERVICE_STYLESIMPORTER "com.sun.star.comp.Report.XMLOasisStylesImporter" -#define SERVICE_CONTENTIMPORTER "com.sun.star.comp.Report.XMLOasisContentImporter" -#define SERVICE_IMPORTFILTER "com.sun.star.document.ImportFilter" -#define SERVICE_METAIMPORTER "com.sun.star.comp.Report.XMLOasisMetaImporter" -#define PROPERTY_BORDERLEFT "BorderLeft" -#define PROPERTY_BORDERRIGHT "BorderRight" -#define PROPERTY_BORDERTOP "BorderTop" -#define PROPERTY_BORDERBOTTOM "BorderBottom" - -#endif // REPORTDESIGN_SHARED_XMLSTRINGS_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 4d89af8070e7..2092c538a2ee 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -33,10 +33,10 @@ #include "rptui_slotid.hrc" #include +#include "core_resource.hxx" #include "helpids.hrc" -#include "RptResId.hrc" -#include "ModuleHelper.hxx" -#include "uistrings.hrc" +#include "strings.hrc" +#include "strings.hxx" #include "ColumnInfo.hxx" #include @@ -320,7 +320,7 @@ void OAddFieldWindow::Update() m_aActions->EnableItem(m_aActions->GetItemId(j),false); } - OUString aTitle(ModuleRes(RID_STR_FIELDSELECTION)); + OUString aTitle(RptResId(RID_STR_FIELDSELECTION)); SetText(aTitle); if ( m_xRowSet.is() ) { diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx index 0a3b665085f5..3ac4e1581c24 100644 --- a/reportdesign/source/ui/dlg/CondFormat.cxx +++ b/reportdesign/source/ui/dlg/CondFormat.cxx @@ -19,10 +19,10 @@ #include "CondFormat.hxx" -#include "uistrings.hrc" -#include "RptResId.hrc" +#include "strings.hxx" +#include "strings.hrc" #include "rptui_slotid.hrc" -#include "ModuleHelper.hxx" +#include "core_resource.hxx" #include "helpids.hrc" #include "UITools.hxx" #include "ReportController.hxx" @@ -434,7 +434,7 @@ namespace rptui short nRet = ModalDialog::Execute(); if ( nRet == RET_OK ) { - const OUString sUndoAction( ModuleRes( RID_STR_UNDO_CONDITIONAL_FORMATTING ) ); + const OUString sUndoAction( RptResId( RID_STR_UNDO_CONDITIONAL_FORMATTING ) ); const UndoContext aUndoContext( m_rController.getUndoManager(), sUndoAction ); try { diff --git a/reportdesign/source/ui/dlg/CondFormat.src b/reportdesign/source/ui/dlg/CondFormat.src deleted file mode 100644 index ecf70cae59fd..000000000000 --- a/reportdesign/source/ui/dlg/CondFormat.src +++ /dev/null @@ -1,28 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#include "RptResId.hrc" -#include "helpids.hrc" -#include "rptui_slotid.hrc" - -String STR_NUMBERED_CONDITION -{ - Text [ en-US ] = "Condition $number$"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index f93326f6eaec..fcec991d2348 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -20,9 +20,9 @@ #include "Condition.hxx" #include "UITools.hxx" #include "CondFormat.hxx" -#include "RptResId.hrc" +#include "core_resource.hxx" +#include "strings.hrc" #include "ReportController.hxx" -#include "ModuleHelper.hxx" #include "ColorChanger.hxx" #include "helpids.hrc" #include "reportformula.hxx" @@ -445,7 +445,7 @@ void Condition::fillFormatCondition(const uno::Reference< report::XFormatConditi void Condition::setConditionIndex( size_t _nCondIndex, size_t _nCondCount ) { m_nCondIndex = _nCondIndex; - OUString sHeader( ModuleRes( STR_NUMBERED_CONDITION ) ); + OUString sHeader( RptResId( STR_NUMBERED_CONDITION ) ); sHeader = sHeader.replaceFirst( "$number$", OUString::number( _nCondIndex + 1) ); m_pHeader->SetText( sHeader ); diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx index 8c72bb98375b..7e5639e6cd34 100644 --- a/reportdesign/source/ui/dlg/DateTime.cxx +++ b/reportdesign/source/ui/dlg/DateTime.cxx @@ -18,16 +18,15 @@ */ #include "DateTime.hxx" #include -#include "RptResId.hrc" +#include "strings.hrc" #include "rptui_slotid.hrc" -#include "ModuleHelper.hxx" #include "helpids.hrc" #include #include #include #include "UITools.hxx" #include "RptDef.hxx" -#include "uistrings.hrc" +#include "strings.hxx" #include "ReportController.hxx" #include #include diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 50bd4d4c31b8..5bd6b8b632a9 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -26,14 +26,14 @@ #include #include -#include "RptResId.hrc" +#include "strings.hrc" #include "rptui_slotid.hrc" -#include "ModuleHelper.hxx" +#include "core_resource.hxx" #include "helpids.hrc" #include "GroupExchange.hxx" #include "UITools.hxx" #include "UndoActions.hxx" -#include "uistrings.hrc" +#include "strings.hxx" #include "ReportController.hxx" #include "ColumnInfo.hxx" @@ -318,7 +318,7 @@ void OFieldExpressionControl::moveGroups(const uno::Sequence& _aGroups m_bIgnoreEvent = true; { sal_Int32 nRow = _nRow; - const OUString sUndoAction(ModuleRes(RID_STR_UNDO_MOVE_GROUP)); + const OUString sUndoAction(RptResId(RID_STR_UNDO_MOVE_GROUP)); const UndoContext aUndoContext( m_pParent->m_pController->getUndoManager(), sUndoAction ); uno::Reference< report::XGroups> xGroups = m_pParent->getGroups(); @@ -379,7 +379,7 @@ void OFieldExpressionControl::lateInit() SetFont(aFont); InsertHandleColumn(static_cast(GetTextWidth(OUString('0')) * 4)/*, sal_True */); - InsertDataColumn( FIELD_EXPRESSION, OUString(ModuleRes(STR_RPT_EXPRESSION)), 100); + InsertDataColumn( FIELD_EXPRESSION, RptResId(STR_RPT_EXPRESSION), 100); m_pComboCell = VclPtr::Create( &GetDataWindow() ); m_pComboCell->SetSelectHdl(LINK(this,OFieldExpressionControl,CBChangeHdl)); @@ -430,7 +430,7 @@ bool OFieldExpressionControl::SaveModified() if ( m_aGroupPositions[nRow] == NO_GROUP ) { bAppend = true; - OUString sUndoAction(ModuleRes(RID_STR_UNDO_APPEND_GROUP)); + OUString sUndoAction(RptResId(RID_STR_UNDO_APPEND_GROUP)); m_pParent->m_pController->getUndoManager().EnterListAction( sUndoAction, OUString(), 0, ViewShellId(-1) ); xGroup = m_pParent->getGroups()->createGroup(); xGroup->setHeaderOn(true); @@ -756,7 +756,7 @@ void OFieldExpressionControl::DeleteRows() if ( bFirstTime ) { bFirstTime = false; - OUString sUndoAction(ModuleRes(RID_STR_UNDO_REMOVE_SELECTION)); + OUString sUndoAction(RptResId(RID_STR_UNDO_REMOVE_SELECTION)); m_pParent->m_pController->getUndoManager().EnterListAction( sUndoAction, OUString(), 0, ViewShellId(-1) ); } @@ -972,10 +972,18 @@ IMPL_LINK(OGroupsSortingDialog, OnControlFocusGot, Control&, rControl, void ) { if ( m_pFieldExpression && m_pFieldExpression->getExpressionControl() ) { - Control* pControls[] = { m_pFieldExpression->getExpressionControl(), m_pHeaderLst, m_pFooterLst, m_pGroupOnLst, m_pGroupIntervalEd, m_pKeepTogetherLst, m_pOrderLst}; + const std::pair pControls[] = { + { m_pFieldExpression->getExpressionControl(), STR_RPT_HELP_FIELD }, + { m_pHeaderLst, STR_RPT_HELP_HEADER }, + { m_pFooterLst, STR_RPT_HELP_FOOTER }, + { m_pGroupOnLst, STR_RPT_HELP_GROUPON }, + { m_pGroupIntervalEd, STR_RPT_HELP_INTERVAL }, + { m_pKeepTogetherLst, STR_RPT_HELP_KEEP }, + { m_pOrderLst, STR_RPT_HELP_SORT } + }; for (size_t i = 0; i < SAL_N_ELEMENTS(pControls); ++i) { - if ( &rControl == pControls[i] ) + if (&rControl == pControls[i].first) { ListBox* pListBox = dynamic_cast< ListBox* >( &rControl ); if ( pListBox ) @@ -984,7 +992,7 @@ IMPL_LINK(OGroupsSortingDialog, OnControlFocusGot, Control&, rControl, void ) if ( pNumericField ) pNumericField->SaveValue(); //shows the text given by the id in the multiline edit - m_pHelpWindow->SetText(OUString(ModuleRes(static_cast(i+STR_RPT_HELP_FIELD)))); + m_pHelpWindow->SetText(RptResId(pControls[i].second)); break; } } @@ -1106,23 +1114,23 @@ void OGroupsSortingDialog::displayGroup(const uno::Reference& _x case sdbc::DataType::LONGVARCHAR: case sdbc::DataType::VARCHAR: case sdbc::DataType::CHAR: - m_pGroupOnLst->InsertEntry(OUString(ModuleRes(STR_RPT_PREFIXCHARS))); + m_pGroupOnLst->InsertEntry(RptResId(STR_RPT_PREFIXCHARS)); m_pGroupOnLst->SetEntryData(1,reinterpret_cast(report::GroupOn::PREFIX_CHARACTERS)); break; case sdbc::DataType::DATE: case sdbc::DataType::TIME: case sdbc::DataType::TIMESTAMP: { - const sal_uInt16 nIds[] = { STR_RPT_YEAR, STR_RPT_QUARTER,STR_RPT_MONTH,STR_RPT_WEEK,STR_RPT_DAY,STR_RPT_HOUR,STR_RPT_MINUTE }; - for (sal_uInt16 i = 0; i < SAL_N_ELEMENTS(nIds); ++i) + const char* aIds[] = { STR_RPT_YEAR, STR_RPT_QUARTER,STR_RPT_MONTH,STR_RPT_WEEK,STR_RPT_DAY,STR_RPT_HOUR,STR_RPT_MINUTE }; + for (sal_uInt16 i = 0; i < SAL_N_ELEMENTS(aIds); ++i) { - m_pGroupOnLst->InsertEntry(OUString(ModuleRes(nIds[i]))); + m_pGroupOnLst->InsertEntry(RptResId(aIds[i])); m_pGroupOnLst->SetEntryData(i+1,reinterpret_cast(i+2)); } } break; default: - m_pGroupOnLst->InsertEntry(OUString(ModuleRes(STR_RPT_INTERVAL))); + m_pGroupOnLst->InsertEntry(RptResId(STR_RPT_INTERVAL)); m_pGroupOnLst->SetEntryData(1,reinterpret_cast(report::GroupOn::INTERVAL)); break; } diff --git a/reportdesign/source/ui/dlg/GroupsSorting.src b/reportdesign/source/ui/dlg/GroupsSorting.src deleted file mode 100644 index 9ae6ebda573a..000000000000 --- a/reportdesign/source/ui/dlg/GroupsSorting.src +++ /dev/null @@ -1,108 +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 "RptResId.hrc" -#include "helpids.hrc" -#include - -String STR_RPT_EXPRESSION -{ - Text [ en-US ] = "Field/Expression" ; -}; - -String STR_RPT_PREFIXCHARS -{ - Text [ en-US ] = "Prefix Characters" ; -}; - -String STR_RPT_YEAR -{ - Text [ en-US ] = "Year" ; -}; - -String STR_RPT_QUARTER -{ - Text [ en-US ] = "Quarter" ; -}; - -String STR_RPT_MONTH -{ - Text [ en-US ] = "Month" ; -}; - -String STR_RPT_WEEK -{ - Text [ en-US ] = "Week" ; -}; - -String STR_RPT_DAY -{ - Text [ en-US ] = "Day" ; -}; - -String STR_RPT_HOUR -{ - Text [ en-US ] = "Hour" ; -}; - -String STR_RPT_MINUTE -{ - Text [ en-US ] = "Minute" ; -}; - -String STR_RPT_INTERVAL -{ - Text [ en-US ] = "Interval" ; -}; - -String STR_RPT_HELP_FIELD -{ - Text [ en-US ] = "Select a field or type an expression to sort or group on." ; -}; - -String STR_RPT_HELP_HEADER -{ - Text [ en-US ] = "Display a header for this group?" ; -}; - -String STR_RPT_HELP_FOOTER -{ - Text [ en-US ] = "Display a footer for this group?" ; -}; - -String STR_RPT_HELP_GROUPON -{ - Text [ en-US ] = "Select the value or range of values that starts a new group." ; -}; - -String STR_RPT_HELP_INTERVAL -{ - Text [ en-US ] = "Interval or number of characters to group on." ; -}; - -String STR_RPT_HELP_KEEP -{ - Text [ en-US ] = "Keep group together on one page?" ; -}; - -String STR_RPT_HELP_SORT -{ - Text [ en-US ] = "Select ascending or descending sort order. Ascending means from A to Z or 0 to 9" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index 4d1b2d745925..cdefb2f4bd25 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -19,7 +19,7 @@ #include "Navigator.hxx" -#include "uistrings.hrc" +#include "strings.hxx" #include "bitmaps.hlst" #include "ReportController.hxx" #include "UITools.hxx" @@ -33,7 +33,7 @@ #include #include #include "helpids.hrc" -#include "RptResId.hrc" +#include "strings.hrc" #include "rptui_slotid.hrc" #include #include @@ -44,7 +44,7 @@ #include #include #include "ReportVisitor.hxx" -#include "ModuleHelper.hxx" +#include "core_resource.hxx" #include #include @@ -552,7 +552,7 @@ void NavigatorTree::traverseSection(const uno::Reference< report::XSection>& _xS void NavigatorTree::traverseFunctions(const uno::Reference< report::XFunctions>& _xFunctions,SvTreeListEntry* _pParent) { - SvTreeListEntry* pFunctions = insertEntry(OUString(ModuleRes(RID_STR_FUNCTIONS)), _pParent, RID_SVXBMP_RPT_NEW_FUNCTION, TREELIST_APPEND, new UserData(this,_xFunctions)); + SvTreeListEntry* pFunctions = insertEntry(RptResId(RID_STR_FUNCTIONS), _pParent, RID_SVXBMP_RPT_NEW_FUNCTION, TREELIST_APPEND, new UserData(this,_xFunctions)); const sal_Int32 nCount = _xFunctions->getCount(); for (sal_Int32 i = 0; i< nCount; ++i) { @@ -622,7 +622,7 @@ void NavigatorTree::traversePageFooter(const uno::Reference< report::XSection>& void NavigatorTree::traverseGroups(const uno::Reference< report::XGroups>& _xGroups) { SvTreeListEntry* pReport = find(_xGroups->getReportDefinition()); - insertEntry(OUString(ModuleRes(RID_STR_GROUPS)), pReport, RID_SVXBMP_SORTINGANDGROUPING, TREELIST_APPEND, new UserData(this,_xGroups)); + insertEntry(RptResId(RID_STR_GROUPS), pReport, RID_SVXBMP_SORTINGANDGROUPING, TREELIST_APPEND, new UserData(this,_xGroups)); } void NavigatorTree::traverseGroup(const uno::Reference< report::XGroup>& _xGroup) diff --git a/reportdesign/source/ui/dlg/Navigator.src b/reportdesign/source/ui/dlg/Navigator.src deleted file mode 100644 index c0caf74d1dad..000000000000 --- a/reportdesign/source/ui/dlg/Navigator.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 "RptResId.hrc" -#include "helpids.hrc" -#include "rptui_slotid.hrc" -#include -#include - -String RID_STR_FUNCTIONS -{ - Text [ en-US ] = "Functions" ; -}; - -String RID_STR_GROUPS -{ - Text [ en-US ] = "Groups" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/PageNumber.cxx b/reportdesign/source/ui/dlg/PageNumber.cxx index cbe3fe9a7ef6..184b8040e390 100644 --- a/reportdesign/source/ui/dlg/PageNumber.cxx +++ b/reportdesign/source/ui/dlg/PageNumber.cxx @@ -18,16 +18,15 @@ */ #include "PageNumber.hxx" #include -#include "RptResId.hrc" +#include "strings.hrc" #include "rptui_slotid.hrc" -#include "ModuleHelper.hxx" #include "RptDef.hxx" #include "helpids.hrc" #include #include #include "UITools.hxx" -#include "uistrings.hrc" +#include "strings.hxx" #include "ReportController.hxx" #include #include diff --git a/reportdesign/source/ui/dlg/PageNumber.src b/reportdesign/source/ui/dlg/PageNumber.src deleted file mode 100644 index be120f608e77..000000000000 --- a/reportdesign/source/ui/dlg/PageNumber.src +++ /dev/null @@ -1,34 +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 "RptResId.hrc" -#include "helpids.hrc" -#include - -String STR_RPT_PN_PAGE -{ - Text [ en-US ] = "\"Page \" & #PAGENUMBER#" ; - Text [ x-comment ] = "The space after the word is no error. #PAGENUMBER# is a replacement and & must not be translated as well as \""; -}; -String STR_RPT_PN_PAGE_OF -{ - Text [ en-US ] = " & \" of \" & #PAGECOUNT#" ; - Text [ x-comment ] = "The space before and after the word is no error. #PAGECOUNT# is a replacement and & must not be translated as well as \""; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx index 2651ef18bd59..5bb8c376f1c5 100644 --- a/reportdesign/source/ui/dlg/dlgpage.cxx +++ b/reportdesign/source/ui/dlg/dlgpage.cxx @@ -23,8 +23,7 @@ #include #include #include "dlgpage.hxx" -#include "ModuleHelper.hxx" -#include "RptResId.hrc" +#include "strings.hrc" #include #include #include diff --git a/reportdesign/source/ui/inc/ColorListener.hxx b/reportdesign/source/ui/inc/ColorListener.hxx index 6b6aea5ee854..6150a14c4924 100644 --- a/reportdesign/source/ui/inc/ColorListener.hxx +++ b/reportdesign/source/ui/inc/ColorListener.hxx @@ -22,7 +22,6 @@ #include #include #include -#include "ModuleHelper.hxx" #include namespace rptui @@ -32,7 +31,6 @@ namespace rptui OColorListener(const OColorListener&) = delete; void operator =(const OColorListener&) = delete; protected: - OModuleClient m_aModuleClient; Link m_aCollapsedLink; svtools::ColorConfig m_aColorConfig; svtools::ExtendedColorConfig m_aExtendedColorConfig; diff --git a/reportdesign/source/ui/inc/CondFormat.hxx b/reportdesign/source/ui/inc/CondFormat.hxx index 9f1daeacc9f2..0118fe54eac1 100644 --- a/reportdesign/source/ui/inc/CondFormat.hxx +++ b/reportdesign/source/ui/inc/CondFormat.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_CONDFORMAT_HXX #define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_CONDFORMAT_HXX -#include "ModuleHelper.hxx" - #include #include @@ -69,7 +67,6 @@ namespace rptui { typedef ::std::vector< VclPtr > Conditions; - OModuleClient m_aModuleClient; VclPtr m_pConditionPlayground; Conditions m_aConditions; VclPtr m_pScrollWindow; diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx b/reportdesign/source/ui/inc/GeometryHandler.hxx index ff2bd78f92ec..58e1270a974e 100644 --- a/reportdesign/source/ui/inc/GeometryHandler.hxx +++ b/reportdesign/source/ui/inc/GeometryHandler.hxx @@ -90,12 +90,12 @@ namespace rptui */ sal_uInt32 impl_getDataFieldType_throw(const OUString& _sDataField = OUString()) const; - css::uno::Any getConstantValue(bool bToControlValue,sal_uInt16 nResId,const css::uno::Any& _aValue,const OUString& _sConstantName,const OUString & PropertyName ); + css::uno::Any getConstantValue(bool bToControlValue,const char** pResId,const css::uno::Any& _aValue,const OUString& _sConstantName,const OUString & PropertyName ); css::beans::Property getProperty(const OUString & PropertyName); static void implCreateListLikeControl( const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory ,css::inspection::LineDescriptor & out_Descriptor - ,sal_uInt16 _nResId + ,const char** pResId ,bool _bReadOnlyControl ,bool _bTrueIfListBoxFalseIfComboBox ); diff --git a/reportdesign/source/ui/inc/Navigator.hxx b/reportdesign/source/ui/inc/Navigator.hxx index 29f6e28f4c33..43550c9f3929 100644 --- a/reportdesign/source/ui/inc/Navigator.hxx +++ b/reportdesign/source/ui/inc/Navigator.hxx @@ -20,7 +20,6 @@ #define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_NAVIGATOR_HXX #include -#include "ModuleHelper.hxx" #include namespace rptui { @@ -28,7 +27,6 @@ namespace rptui class ONavigatorImpl; class ONavigator : public FloatingWindow { - OModuleClient m_aModuleClient; ::std::unique_ptr m_pImpl; ONavigator(const ONavigator&) = delete; void operator =(const ONavigator&) = delete; diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx index 499372f6a5df..55f952147e6b 100644 --- a/reportdesign/source/ui/inc/ReportController.hxx +++ b/reportdesign/source/ui/inc/ReportController.hxx @@ -20,7 +20,6 @@ #define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_REPORTCONTROLLER_HXX #include "DesignView.hxx" -#include "ModuleHelper.hxx" #include "ReportControllerObserver.hxx" #include "RptDef.hxx" @@ -83,7 +82,6 @@ namespace rptui ,public ::comphelper::OPropertyArrayUsageHelper < OReportController_BASE > { private: - OModuleClient m_aModuleClient; ::comphelper::OInterfaceContainerHelper2 m_aSelectionListeners; css::uno::Sequence< css::beans::PropertyValue> @@ -201,20 +199,20 @@ namespace rptui ,sal_Int32 _nGroupPos ,bool _bShow); - void executeMethodWithUndo(sal_uInt16 _nUndoStrId,const ::std::mem_fun_t& _pMemfun); - void alignControlsWithUndo(sal_uInt16 _nUndoStrId, ControlModification _nControlModification, bool _bAlignAtSection = false); + void executeMethodWithUndo(const char* pUndoStrId,const ::std::mem_fun_t& _pMemfun); + void alignControlsWithUndo(const char* pUndoStrId, ControlModification _nControlModification, bool _bAlignAtSection = false); css::uno::Reference< css::frame::XFrame > getXFrame(); /** shrink a section - @param _nUndoStrId the string id of the string which is shown in undo menu + @param pUndoStrId the string id of the string which is shown in undo menu @param _nShrinkId ID of what you would like to shrink. */ static void shrinkSectionBottom(const css::uno::Reference< css::report::XSection >& _xSection); static void shrinkSectionTop(const css::uno::Reference< css::report::XSection >& _xSection); public: - void shrinkSection(sal_uInt16 _nUndoStrId, const css::uno::Reference< css::report::XSection >& _xSection, sal_Int32 _nShrinkId); + void shrinkSection(const char* pUndoStrId, const css::uno::Reference< css::report::XSection >& _xSection, sal_Int32 _nShrinkId); /** opens the file open dialog to allow the user to select a image which will be * bound to a newly created image button. @@ -299,7 +297,7 @@ namespace rptui /** set the property at all selected controls. @return when the selection is not empty */ - bool impl_setPropertyAtControls_throw(const sal_uInt16 _nUndoResId + bool impl_setPropertyAtControls_throw(const char* pUndoResId ,const OUString& _sProperty ,const css::uno::Any& _aValue ,const css::uno::Sequence< css::beans::PropertyValue >& _aArgs); diff --git a/reportdesign/source/ui/inc/RptUndo.hxx b/reportdesign/source/ui/inc/RptUndo.hxx index 50374e4dcb97..e9f03e722470 100644 --- a/reportdesign/source/ui/inc/RptUndo.hxx +++ b/reportdesign/source/ui/inc/RptUndo.hxx @@ -54,7 +54,7 @@ namespace rptui OSectionUndo( OReportModel& rMod ,sal_uInt16 _nSlot ,Action _eAction - ,sal_uInt16 nCommentID); + ,const char* pCommentID); virtual ~OSectionUndo() override; virtual void Undo() override; @@ -106,7 +106,7 @@ namespace rptui ,OGroupHelper> _pMemberFunction ,const css::uno::Reference< css::report::XGroup >& _xGroup ,Action _eAction - ,sal_uInt16 nCommentID); + ,const char* pCommentID); virtual OUString GetComment() const override; }; @@ -125,7 +125,7 @@ namespace rptui void implReRemove( ); public: OGroupUndo(OReportModel& rMod - ,sal_uInt16 nCommentID + ,const char* pCommentID ,Action _eAction ,const css::uno::Reference< css::report::XGroup>& _xGroup ,const css::uno::Reference< css::report::XReportDefinition >& _xReportDefinition); diff --git a/reportdesign/source/ui/inc/SectionWindow.hxx b/reportdesign/source/ui/inc/SectionWindow.hxx index fefc2d7d5ac2..cafca76a2551 100644 --- a/reportdesign/source/ui/inc/SectionWindow.hxx +++ b/reportdesign/source/ui/inc/SectionWindow.hxx @@ -66,7 +66,7 @@ namespace rptui * \param _pIsSectionOn * @return sal_True when title was set otherwise FALSE */ - bool setGroupSectionTitle(const css::uno::Reference< css::report::XGroup>& _xGroup,sal_uInt16 _nResId,::std::mem_fun_t< css::uno::Reference< css::report::XSection> , OGroupHelper> _pGetSection, const ::std::mem_fun_t& _pIsSectionOn); + bool setGroupSectionTitle(const css::uno::Reference< css::report::XGroup>& _xGroup,const char* pResId,::std::mem_fun_t< css::uno::Reference< css::report::XSection> , OGroupHelper> _pGetSection, const ::std::mem_fun_t& _pIsSectionOn); /** set the title of the (report/page) header or footer * @@ -76,7 +76,7 @@ namespace rptui * \param _pIsSectionOn * @return sal_True when title was set otherwise FALSE */ - bool setReportSectionTitle(const css::uno::Reference< css::report::XReportDefinition>& _xReport,sal_uInt16 _nResId,::std::mem_fun_t< css::uno::Reference< css::report::XSection> , OReportHelper> _pGetSection, const ::std::mem_fun_t& _pIsSectionOn); + bool setReportSectionTitle(const css::uno::Reference< css::report::XReportDefinition>& _xReport,const char* pResId,::std::mem_fun_t< css::uno::Reference< css::report::XSection> , OReportHelper> _pGetSection, const ::std::mem_fun_t& _pIsSectionOn); void ImplInitSettings(); DECL_LINK(Collapsed, OColorListener&, void); diff --git a/reportdesign/source/ui/inc/metadata.hxx b/reportdesign/source/ui/inc/metadata.hxx index c9e0e6a3e989..812a4bc0c9f0 100644 --- a/reportdesign/source/ui/inc/metadata.hxx +++ b/reportdesign/source/ui/inc/metadata.hxx @@ -19,11 +19,10 @@ #ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_METADATA_HXX #define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_METADATA_HXX -#include "ModuleHelper.hxx" - #include #include #include +#include //= UI flags (for all browseable properties) enum class PropUIFlags { @@ -47,7 +46,6 @@ namespace rptui //= OPropertyInfoService class OPropertyInfoService - :public OModuleClient { OPropertyInfoService(const OPropertyInfoService&) = delete; void operator =(const OPropertyInfoService&) = delete; diff --git a/reportdesign/source/ui/inc/propbrw.hxx b/reportdesign/source/ui/inc/propbrw.hxx index e205d41e19b4..6d4c6351704a 100644 --- a/reportdesign/source/ui/inc/propbrw.hxx +++ b/reportdesign/source/ui/inc/propbrw.hxx @@ -29,7 +29,6 @@ #include #include #include -#include "ModuleHelper.hxx" namespace rptui { @@ -44,7 +43,6 @@ class OObjectBase; class PropBrw : public DockingWindow , public SfxListener, public SfxBroadcaster { private: - OModuleClient m_aModuleClient; css::uno::Reference< css::uno::XComponentContext > m_xInspectorContext; css::uno::Reference< css::uno::XComponentContext > diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index 3eba1fced3e4..b7eec893da1c 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -22,7 +22,7 @@ #include #include #include -#include "uistrings.hrc" +#include "strings.hxx" #include #include #include @@ -47,8 +47,9 @@ #include "metadata.hxx" #include #include +#include "core_resource.hxx" #include "helpids.hrc" -#include "RptResId.hrc" +#include "strings.hrc" #include "PropertyForward.hxx" namespace rptui @@ -495,13 +496,13 @@ bool DataProviderHandler::impl_dialogLinkedFields_nothrow( ::osl::ClearableMutex aSeq[2] <<= aParam; aParam.Name = "Explanation"; - aParam.Value <<= OUString(ModuleRes(RID_STR_EXPLANATION)); + aParam.Value <<= RptResId(RID_STR_EXPLANATION); aSeq[3] <<= aParam; aParam.Name = "DetailLabel"; - aParam.Value <<= OUString(ModuleRes(RID_STR_DETAILLABEL)); + aParam.Value <<= RptResId(RID_STR_DETAILLABEL); aSeq[4] <<= aParam; aParam.Name = "MasterLabel"; - aParam.Value <<= OUString(ModuleRes(RID_STR_MASTERLABEL)); + aParam.Value <<= RptResId(RID_STR_MASTERLABEL); aSeq[5] <<= aParam; uno::Reference< ui::dialogs::XExecutableDialog > xDialog( diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx index 72ccc2b5211b..b832c74bc759 100644 --- a/reportdesign/source/ui/inspection/DefaultInspection.cxx +++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx @@ -19,8 +19,8 @@ #include "DefaultInspection.hxx" #include #include -#include -#include "ModuleHelper.hxx" +#include +#include "core_resource.hxx" #include "helpids.hrc" #include #include @@ -201,7 +201,7 @@ namespace rptui const struct { const sal_Char* programmaticName; - sal_uInt16 uiNameResId; + const char* uiNameResId; OString helpId; } aCategories[] = { { "General", RID_STR_PROPPAGE_DEFAULT, HID_RPT_PROPDLG_TAB_GENERAL }, @@ -214,7 +214,7 @@ namespace rptui for ( size_t i=0; iProgrammaticName = OUString::createFromAscii( aCategories[i].programmaticName ); - pReturn->UIName = ModuleRes( aCategories[i].uiNameResId ); + pReturn->UIName = RptResId( aCategories[i].uiNameResId ); pReturn->HelpURL = HelpIdUrl::getHelpURL( aCategories[i].helpId ); } diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index c865a1293f8b..0b409b0a5767 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -29,7 +29,7 @@ #include #include -#include "uistrings.hrc" +#include "strings.hxx" #include "reportformula.hxx" #include @@ -69,8 +69,9 @@ #include #include -#include "ModuleHelper.hxx" -#include "RptResId.hrc" +#include "core_resource.hxx" +#include "stringarray.hrc" +#include "strings.hrc" #include "RptDef.hxx" #include "UITools.hxx" @@ -668,16 +669,14 @@ beans::PropertyState SAL_CALL GeometryHandler::getPropertyState(const OUString & void GeometryHandler::implCreateListLikeControl( const uno::Reference< inspection::XPropertyControlFactory >& _rxControlFactory ,inspection::LineDescriptor & out_Descriptor - ,sal_uInt16 _nResId + ,const char** pResId ,bool _bReadOnlyControl ,bool _bTrueIfListBoxFalseIfComboBox ) { - ModuleRes aRes(_nResId); - ResStringArray aResList(aRes); std::vector aList; - for (sal_uInt32 i = 0; i < aResList.Count(); ++i) - aList.push_back(aResList.GetString(i)); + for (const char** pItem = pResId; *pItem; ++pItem) + aList.push_back(RptResId(*pItem)); implCreateListLikeControl(_rxControlFactory, out_Descriptor, aList, _bReadOnlyControl, _bTrueIfListBoxFalseIfComboBox); } @@ -760,10 +759,10 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const case PROPERTY_ID_BACKTRANSPARENT: case PROPERTY_ID_CONTROLBACKGROUNDTRANSPARENT: { - sal_uInt16 nResId = RID_STR_BOOL; + const char** pResId = RID_STR_BOOL; if ( PROPERTY_ID_KEEPTOGETHER == nId && uno::Reference< report::XGroup>(m_xReportComponent,uno::UNO_QUERY).is()) - nResId = RID_STR_KEEPTOGETHER_CONST; - implCreateListLikeControl(_xControlFactory,aOut,nResId,false,true); + pResId = RID_STR_KEEPTOGETHER_CONST; + implCreateListLikeControl(_xControlFactory,aOut,pResId,false,true); } break; case PROPERTY_ID_INITIALFORMULA: @@ -928,13 +927,14 @@ beans::Property GeometryHandler::getProperty(const OUString & PropertyName) return beans::Property(); return *pFind; } -uno::Any GeometryHandler::getConstantValue(bool _bToControlValue,sal_uInt16 _nResId,const uno::Any& _aValue,const OUString& _sConstantName,const OUString & PropertyName ) +uno::Any GeometryHandler::getConstantValue(bool _bToControlValue,const char** pResId,const uno::Any& _aValue,const OUString& _sConstantName,const OUString & PropertyName ) { - ModuleRes aRes(_nResId); - ResStringArray aResList(aRes); - uno::Sequence< OUString > aSeq(aResList.Count()); - for (sal_uInt32 i = 0; i < aResList.Count(); ++i) - aSeq[i] = aResList.GetString(i); + std::vector aList; + for (const char** pItem = pResId; *pItem; ++pItem) + aList.push_back(RptResId(*pItem)); + uno::Sequence< OUString > aSeq(aList.size()); + for (size_t i = 0; i < aList.size(); ++i) + aSeq[i] = aList[i]; uno::Reference< inspection::XStringRepresentation > xConversionHelper = inspection::StringRepresentation::createConstant( m_xContext,m_xTypeConverter,_sConstantName,aSeq); if ( _bToControlValue ) @@ -1069,16 +1069,17 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & Prope { OUString sValue; _rControlValue >>= sValue; - ModuleRes aRes(RID_STR_TYPE_CONST); - ResStringArray aResList(aRes); + sal_uInt32 nFound(RESARRAY_INDEX_NOTFOUND); - for (sal_uInt32 i = 0; i < aResList.Count(); ++i) + sal_uInt32 i = 0; + for (const char** pItem = RID_STR_TYPE_CONST; *pItem; ++pItem) { - if (aResList.GetString(i) == sValue) + if (sValue == RptResId(*pItem)) { nFound = i; break; } + ++i; } if (nFound != RESARRAY_INDEX_NOTFOUND) aPropertyValue <<= nFound; @@ -1091,16 +1092,17 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & Prope { OUString sValue; _rControlValue >>= sValue; - ModuleRes aRes(RID_STR_VERTICAL_ALIGN_CONST); - ResStringArray aResList(aRes); + sal_uInt32 nFound(RESARRAY_INDEX_NOTFOUND); - for (sal_uInt32 i = 0; i < aResList.Count(); ++i) + sal_uInt32 i = 0; + for (const char** pItem = RID_STR_VERTICAL_ALIGN_CONST; *pItem; ++pItem) { - if (aResList.GetString(i) == sValue) + if (sValue == RptResId(*pItem)) { nFound = i; break; } + ++i; } if (nFound != RESARRAY_INDEX_NOTFOUND) aPropertyValue <<= static_cast(nFound); @@ -1110,17 +1112,19 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & Prope { OUString sValue; _rControlValue >>= sValue; - ModuleRes aRes(RID_STR_PARAADJUST_CONST); - ResStringArray aResList(aRes); + sal_uInt32 nFound(RESARRAY_INDEX_NOTFOUND); - for (sal_uInt32 i = 0; i < aResList.Count(); ++i) + sal_uInt32 i = 0; + for (const char** pItem = RID_STR_PARAADJUST_CONST; *pItem; ++pItem) { - if (aResList.GetString(i) == sValue) + if (sValue == RptResId(*pItem)) { nFound = i; break; } + ++i; } + if (nFound != RESARRAY_INDEX_NOTFOUND) aPropertyValue <<= static_cast(nFound); } @@ -1236,30 +1240,24 @@ uno::Any SAL_CALL GeometryHandler::convertToControlValue(const OUString & Proper break; case PROPERTY_ID_TYPE: { - ModuleRes aRes(RID_STR_TYPE_CONST); - ResStringArray aResList(aRes); - if (m_nDataFieldType < aResList.Count()) - aControlValue <<= aResList.GetString(m_nDataFieldType); + if (m_nDataFieldType < SAL_N_ELEMENTS(RID_STR_TYPE_CONST) - 1) + aControlValue <<= RptResId(RID_STR_TYPE_CONST[m_nDataFieldType]); } break; case PROPERTY_ID_VERTICALALIGN: { style::VerticalAlignment nParagraphVertAlign = style::VerticalAlignment_TOP; aPropertyValue >>= nParagraphVertAlign; - ModuleRes aRes(RID_STR_VERTICAL_ALIGN_CONST); - ResStringArray aResList(aRes); - if (sal_uInt32(nParagraphVertAlign) < aResList.Count()) - aControlValue <<= aResList.GetString((sal_uInt32)nParagraphVertAlign); + if (sal_uInt32(nParagraphVertAlign) < SAL_N_ELEMENTS(RID_STR_VERTICAL_ALIGN_CONST) - 1) + aControlValue <<= RptResId(RID_STR_VERTICAL_ALIGN_CONST[(sal_uInt32)nParagraphVertAlign]); } break; case PROPERTY_ID_PARAADJUST: { sal_Int16 nParagraphAdjust = (sal_Int16)style::ParagraphAdjust_LEFT; aPropertyValue >>= nParagraphAdjust; - ModuleRes aRes(RID_STR_PARAADJUST_CONST); - ResStringArray aResList(aRes); - if (static_cast(nParagraphAdjust) < aResList.Count()) - aControlValue <<= aResList.GetString(nParagraphAdjust); + if (static_cast(nParagraphAdjust) < SAL_N_ELEMENTS(RID_STR_PARAADJUST_CONST) - 1) + aControlValue <<= RptResId(RID_STR_VERTICAL_ALIGN_CONST[nParagraphAdjust]); } break; case PROPERTY_ID_BACKCOLOR: @@ -1607,7 +1605,7 @@ bool GeometryHandler::impl_dialogFilter_nothrow( OUString& _out_rSelectedClause, // create the dialog uno::Reference< ui::dialogs::XExecutableDialog > xDialog = sdb::FilterDialog::createWithQuery(m_xContext, xComposer, m_xRowSet, xInspectorWindow); - const OUString sPropertyUIName(OUString(ModuleRes(RID_STR_FILTER))); + const OUString sPropertyUIName(RptResId(RID_STR_FILTER)); // initialize the dialog xDialog->setTitle( sPropertyUIName ); @@ -1640,7 +1638,7 @@ void GeometryHandler::checkPosAndSize( const awt::Point& _aNewPos, ::Point aPos(VCLPoint(_aNewPos)); if ( aPos.X() < 0 || aPos.Y() < 0 ) // TODO: have to check size with pos aka || (aPos.X() + aAwtSize.Width) > m_xSection->getReportDefinition()-> - throw beans::PropertyVetoException(ModuleRes(RID_STR_ILLEGAL_POSITION),xSourceReportComponent); + throw beans::PropertyVetoException(RptResId(RID_STR_ILLEGAL_POSITION),xSourceReportComponent); ::tools::Rectangle aSourceRect(aPos,VCLSize(_aSize)); @@ -1653,7 +1651,7 @@ void GeometryHandler::checkPosAndSize( const awt::Point& _aNewPos, const ::tools::Rectangle aBoundRect(VCLPoint(xReportComponent->getPosition()),VCLSize(xReportComponent->getSize())); const ::tools::Rectangle aRect = aSourceRect.GetIntersection(aBoundRect); if ( !aRect.IsEmpty() && (aRect.Left() != aRect.Right() && aRect.Top() != aRect.Bottom() ) ) - throw beans::PropertyVetoException(ModuleRes( RID_STR_OVERLAP_OTHER_CONTROL),xSourceReportComponent); + throw beans::PropertyVetoException(RptResId( RID_STR_OVERLAP_OTHER_CONTROL),xSourceReportComponent); } } } @@ -1745,7 +1743,7 @@ void GeometryHandler::impl_fillScopeList_nothrow(::std::vector< OUString >& _out else if ( xSection == xReportDefinition->getDetail() ) nPos = xGroups->getCount()-1; - const OUString sGroup = ModuleRes(RID_STR_SCOPE_GROUP); + const OUString sGroup = RptResId(RID_STR_SCOPE_GROUP); for (sal_Int32 i = 0 ; i <= nPos ; ++i) { xGroup.set(xGroups->getByIndex(i),uno::UNO_QUERY_THROW); @@ -1772,7 +1770,7 @@ uno::Reference< report::XFunctionsSupplier> GeometryHandler::fillScope_throw(OUS const uno::Reference< report::XGroup> xGroup(xSection->getGroup(),uno::UNO_QUERY); if ( xGroup.is() ) { - OUString sGroupName = ModuleRes(RID_STR_SCOPE_GROUP); + OUString sGroupName = RptResId(RID_STR_SCOPE_GROUP); _rsNamePostfix = xGroup->getExpression(); m_sScope = sGroupName.replaceFirst("%1",_rsNamePostfix); xReturn = xGroup.get(); @@ -1784,7 +1782,7 @@ uno::Reference< report::XFunctionsSupplier> GeometryHandler::fillScope_throw(OUS if ( nCount ) { const uno::Reference< report::XGroup> xGroup2(xGroups->getByIndex(nCount - 1),uno::UNO_QUERY_THROW); - OUString sGroupName = ModuleRes(RID_STR_SCOPE_GROUP); + OUString sGroupName = RptResId(RID_STR_SCOPE_GROUP); _rsNamePostfix = xGroup2->getExpression(); m_sScope = sGroupName.replaceFirst("%1",_rsNamePostfix); xReturn = xGroup2.get(); @@ -1809,7 +1807,7 @@ uno::Reference< report::XFunctionsSupplier> GeometryHandler::fillScope_throw(OUS for (sal_Int32 i = 0 ; i < nCount; ++i) { const uno::Reference< report::XGroup> xGroup(xGroups->getByIndex(i),uno::UNO_QUERY_THROW); - OUString sGroupName = ModuleRes(RID_STR_SCOPE_GROUP); + OUString sGroupName = RptResId(RID_STR_SCOPE_GROUP); if ( m_sScope == sGroupName.replaceFirst("%1",xGroup->getExpression()) ) { _rsNamePostfix = xGroup->getExpression(); @@ -1855,7 +1853,7 @@ bool GeometryHandler::isDefaultFunction( const OUString& _sQuotedFunction uno::Reference< report::XGroup> xGroup(aFind.first->second.second,uno::UNO_QUERY); if ( xGroup.is() ) { - OUString sGroupName = ModuleRes(RID_STR_SCOPE_GROUP); + OUString sGroupName = RptResId(RID_STR_SCOPE_GROUP); m_sScope = sGroupName.replaceFirst("%1",xGroup->getExpression()); } else @@ -1920,7 +1918,7 @@ void GeometryHandler::loadDefaultFunctions() if ( m_aDefaultFunctions.empty() ) { m_aCounterFunction.m_bPreEvaluated = false; - m_aCounterFunction.m_sName = ModuleRes(RID_STR_F_COUNTER); + m_aCounterFunction.m_sName = RptResId(RID_STR_F_COUNTER); m_aCounterFunction.m_sFormula = "rpt:[%FunctionName] + 1"; m_aCounterFunction.m_sSearchString = "rpt:\\[[:alpha:]+([:space:]*[:alnum:]*)*\\][:space:]*\\+[:space:]*[:digit:]*"; m_aCounterFunction.m_sInitialFormula.IsPresent = true; @@ -1930,21 +1928,21 @@ void GeometryHandler::loadDefaultFunctions() aDefault.m_bPreEvaluated = true; - aDefault.m_sName = ModuleRes(RID_STR_F_ACCUMULATION); + aDefault.m_sName = RptResId(RID_STR_F_ACCUMULATION); aDefault.m_sFormula = "rpt:[%Column] + [%FunctionName]"; aDefault.m_sSearchString = "rpt:\\[[:alpha:]+([:space:]*[:alnum:]*)*\\][:space:]*\\+[:space:]*\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]"; aDefault.m_sInitialFormula.IsPresent = true; aDefault.m_sInitialFormula.Value = "rpt:[%Column]"; m_aDefaultFunctions.push_back(aDefault); - aDefault.m_sName = ModuleRes(RID_STR_F_MINIMUM); + aDefault.m_sName = RptResId(RID_STR_F_MINIMUM); aDefault.m_sFormula = "rpt:IF([%Column] < [%FunctionName];[%Column];[%FunctionName])"; aDefault.m_sSearchString = "rpt:IF\\((\\[[:alpha:]+([:space:]*[:alnum:]*)*\\])[:space:]*<[:space:]*(\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]);[:space:]*\\1[:space:]*;[:space:]*\\3[:space:]*\\)"; aDefault.m_sInitialFormula.IsPresent = true; aDefault.m_sInitialFormula.Value = "rpt:[%Column]"; m_aDefaultFunctions.push_back(aDefault); - aDefault.m_sName = ModuleRes(RID_STR_F_MAXIMUM); + aDefault.m_sName = RptResId(RID_STR_F_MAXIMUM); aDefault.m_sFormula = "rpt:IF([%Column] > [%FunctionName];[%Column];[%FunctionName])"; aDefault.m_sSearchString = "rpt:IF\\((\\[[:alpha:]+([:space:]*[:alnum:]*)*\\])[:space:]*>[:space:]*(\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]);[:space:]*\\1[:space:]*;[:space:]*\\3[:space:]*\\)"; aDefault.m_sInitialFormula.IsPresent = true; @@ -2112,7 +2110,7 @@ bool GeometryHandler::impl_isCounterFunction_throw(const OUString& _sQuotedFunct const uno::Reference< report::XGroup > xGroup(aFind.first->second.second,uno::UNO_QUERY); if ( xGroup.is() ) { - OUString sGroupName = ModuleRes(RID_STR_SCOPE_GROUP); + OUString sGroupName = RptResId(RID_STR_SCOPE_GROUP); Out_sScope = sGroupName.replaceFirst("%1",xGroup->getExpression()); } else diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx index 552938e817cd..7cbd0cb839c7 100644 --- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx +++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx @@ -20,7 +20,7 @@ #include #include #include -#include "uistrings.hrc" +#include "strings.hxx" #include #include #include diff --git a/reportdesign/source/ui/inspection/inspection.src b/reportdesign/source/ui/inspection/inspection.src deleted file mode 100644 index 7720b82aa816..000000000000 --- a/reportdesign/source/ui/inspection/inspection.src +++ /dev/null @@ -1,348 +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 "RptResId.hrc" -#include "rptui_slotid.hrc" -#include - -String RID_STR_PROPPAGE_DEFAULT -{ - Text [ en-US ] = "General" ; -}; - -String RID_STR_PROPPAGE_DATA -{ - Text [ en-US ] = "Data" ; -}; - -StringArray RID_STR_BOOL -{ - ItemList [ en-US ] = - { - < "No" ; >; - < "Yes" ; >; - }; -}; - -String RID_STR_FORCENEWPAGE -{ - Text [ en-US ] = "Force New Page" ; -}; - -StringArray RID_STR_FORCENEWPAGE_CONST -{ - ItemList [ en-US ] = - { - < "None" ; >; - < "Before Section" ; >; - < "After Section" ; >; - < "Before & After Section" ; >; - }; -}; - -String RID_STR_NEWROWORCOL -{ - Text [ en-US ] = "New Row Or Column" ; -}; - -String RID_STR_KEEPTOGETHER -{ - Text [ en-US ] = "Keep Together" ; -}; - -StringArray RID_STR_KEEPTOGETHER_CONST -{ - ItemList [ en-US ] = - { - < "No" ; >; - < "Whole Group" ; >; - < "With First Detail" ; >; - }; -}; -String RID_STR_CANGROW -{ - Text [ en-US ] = "Can Grow" ; -}; -String RID_STR_CANSHRINK -{ - Text [ en-US ] = "Can Shrink" ; -}; -String RID_STR_REPEATSECTION -{ - Text [ en-US ] = "Repeat Section" ; -}; -String RID_STR_PRINTREPEATEDVALUES -{ - Text [ en-US ] = "Print repeated values" ; -}; -String RID_STR_CONDITIONALPRINTEXPRESSION -{ - Text [ en-US ] = "Conditional Print Expression" ; -}; -String RID_STR_STARTNEWCOLUMN -{ - Text [ en-US ] = "Start new column" ; -}; -String RID_STR_STARTNEWPAGE -{ - Text [ en-US ] = "Start new page" ; -}; -String RID_STR_RESETPAGENUMBER -{ - Text [ en-US ] = "Reset page number" ; -}; -String RID_STR_CHARTTYPE -{ - Text [ en-US ] = "Chart type" ; -}; -String RID_STR_PRINTWHENGROUPCHANGE -{ - Text [ en-US ] = "Print repeated value on group change" ; -}; -String RID_STR_VISIBLE -{ - Text [ en-US ] = "Visible" ; -}; -String RID_STR_GROUPKEEPTOGETHER -{ - Text [ en-US ] = "Group keep together" ; -}; - -StringArray RID_STR_GROUPKEEPTOGETHER_CONST -{ - ItemList [ en-US ] = - { - < "Per Page" ; >; - < "Per Column" ; >; - }; -}; - -StringArray RID_STR_SECTIONPAGEBREAK_CONST -{ - ItemList [ en-US ] = - { - < "None" ; >; - < "Section" ; >; - < "Automatic" ; >; - }; -}; - -String RID_STR_PAGEHEADEROPTION -{ - Text [ en-US ] = "Page header" ; -}; - -String RID_STR_PAGEFOOTEROPTION -{ - Text [ en-US ] = "Page footer" ; -}; - -StringArray RID_STR_REPORTPRINTOPTION_CONST -{ - ItemList [ en-US ] = - { - < "All Pages" ; >; - < "Not With Report Header" ; >; - < "Not With Report Footer" ; >; - < "Not With Report Header/Footer" ; >; - }; -}; -String RID_STR_DEEPTRAVERSING -{ - Text [ en-US ] = "Deep traversing" ; -}; -String RID_STR_PREEVALUATED -{ - Text [ en-US ] = "Pre evaluation" ; -}; -String RID_STR_POSITIONX -{ - Text [ en-US ] = "Position X"; -}; -String RID_STR_POSITIONY -{ - Text [ en-US ] = "Position Y"; -}; -String RID_STR_WIDTH -{ - Text [ en-US ] = "Width"; -}; -String RID_STR_HEIGHT -{ - Text [ en-US ] = "Height"; -}; -String RID_STR_INITIALFORMULA -{ - Text [ en-US ] = "Initial value" ; -}; -String RID_STR_PRESERVEIRI -{ - Text [ en-US ] = "Preserve as Link" ; -}; -String RID_STR_FORMULA -{ - Text [ en-US ] = "Formula" ; -}; -String RID_STR_DATAFIELD -{ - Text [ en-US ] = "Data field" ; -}; -String RID_STR_FONT -{ - Text [ en-US ] = "Font" ; -}; -String RID_STR_BACKCOLOR -{ - Text [ en-US ] = "Background color"; -}; -String RID_STR_BACKTRANSPARENT -{ - Text [ en-US ] = "Background Transparent"; -}; -String RID_STR_CONTROLBACKGROUNDTRANSPARENT -{ - Text [ en-US ] = "Background Transparent"; -}; -String RID_STR_OVERLAP_OTHER_CONTROL -{ - Text [ en-US ] = "This operation is not allowed. The control overlaps with another one."; -}; -String RID_STR_ILLEGAL_POSITION -{ - Text [ en-US ] = "This position can not be set. It is invalid."; -}; -String RID_STR_SCOPE_GROUP -{ - Text [ en-US ] = "Group: %1"; -}; -String RID_STR_FORMULALIST -{ - Text [ en-US ] = "Function"; -}; -String RID_STR_SCOPE -{ - Text [ en-US ] = "Scope"; -}; -String RID_STR_TYPE -{ - Text [ en-US ] = "Data Field Type"; -}; - -StringArray RID_STR_TYPE_CONST -{ - ItemList [ en-US ] = - { - < "Field or Formula"; >; - < "Function"; >; - < "Counter"; >; - < "User defined Function"; >; - }; -}; - -String RID_STR_MASTERFIELDS -{ - Text [ en-US ] = "Link master fields" ; -}; - -String RID_STR_DETAILFIELDS -{ - Text [ en-US ] = "Link slave fields" ; -}; - -String RID_STR_EXPLANATION -{ - Text [ en-US ] = "Charts can be used to display detailed data about the current record of the report. To do this, you can specify which columns in the chart match which columns in the report."; -}; - -String RID_STR_DETAILLABEL -{ - Text [ en-US ] = "Chart" ; -}; - -String RID_STR_MASTERLABEL -{ - Text [ en-US ] = "Report" ; -}; - -String RID_STR_PREVIEW_COUNT -{ - Text [ en-US ] = "Preview Row(s)" ; -}; - -String RID_STR_AREA -{ - Text [ en-US ] = "Area" ; -}; - -String RID_STR_MIMETYPE -{ - Text [ en-US ] = "Report Output Format" ; -}; - -String RID_STR_VERTICALALIGN -{ - Text [ en-US ] = "Vert. Alignment" ; -}; - -StringArray RID_STR_VERTICAL_ALIGN_CONST -{ - ItemList [ en-US ] = - { - < "Top"; >; - < "Middle"; >; - < "Bottom"; >; - }; -}; - -String RID_STR_PARAADJUST -{ - Text [ en-US ] = "Horz. Alignment" ; -}; - -StringArray RID_STR_PARAADJUST_CONST -{ - ItemList [ en-US ] = - { - < "Left"; >; - < "Right"; >; - < "Block"; >; - < "Center"; >; - }; -}; - -String RID_STR_F_COUNTER -{ - Text [ en-US ] = "Counter" ; -}; - -String RID_STR_F_ACCUMULATION -{ - Text [ en-US ] = "Accumulation" ; -}; - -String RID_STR_F_MINIMUM -{ - Text [ en-US ] = "Minimum" ; -}; - -String RID_STR_F_MAXIMUM -{ - Text [ en-US ] = "Maximum" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx index 7b3e73b8cf2b..adae3e8f6505 100644 --- a/reportdesign/source/ui/inspection/metadata.cxx +++ b/reportdesign/source/ui/inspection/metadata.cxx @@ -19,9 +19,10 @@ #include "metadata.hxx" #include #include +#include "core_resource.hxx" #include "helpids.hrc" -#include "RptResId.hrc" -#include "uistrings.hrc" +#include "strings.hrc" +#include "strings.hxx" #include @@ -78,7 +79,7 @@ namespace rptui #define DEF_INFO( ident, uinameres, helpid, flags ) \ OPropertyInfoImpl( PROPERTY_##ident, PROPERTY_ID_##ident, \ - OUString( ModuleRes( RID_STR_##uinameres ) ), HID_RPT_PROP_##helpid, flags ) + RptResId( RID_STR_##uinameres ), HID_RPT_PROP_##helpid, flags ) #define DEF_INFO_1( ident, uinameres, helpid, flag1 ) \ DEF_INFO( ident, uinameres, helpid, PropUIFlags::flag1 ) @@ -94,9 +95,6 @@ namespace rptui if ( s_pPropertyInfos ) return s_pPropertyInfos; - OModuleClient aResourceAccess; - // this ensures that we have our resource file loaded - static OPropertyInfoImpl aPropertyInfos[] = { /* diff --git a/reportdesign/source/ui/misc/ColorListener.cxx b/reportdesign/source/ui/misc/ColorListener.cxx index bbd66c5c84ba..5064d6451b63 100644 --- a/reportdesign/source/ui/misc/ColorListener.cxx +++ b/reportdesign/source/ui/misc/ColorListener.cxx @@ -20,7 +20,7 @@ #include #include -#include "uistrings.hrc" +#include "strings.hxx" namespace rptui diff --git a/reportdesign/source/ui/misc/RptUndo.cxx b/reportdesign/source/ui/misc/RptUndo.cxx index 09325299e7aa..dec9f097b337 100644 --- a/reportdesign/source/ui/misc/RptUndo.cxx +++ b/reportdesign/source/ui/misc/RptUndo.cxx @@ -18,7 +18,7 @@ */ #include "RptUndo.hxx" -#include "uistrings.hrc" +#include "strings.hxx" #include "rptui_slotid.hrc" #include "UITools.hxx" #include "UndoEnv.hxx" @@ -113,8 +113,8 @@ namespace OSectionUndo::OSectionUndo(OReportModel& _rMod ,sal_uInt16 _nSlot ,Action _eAction - ,sal_uInt16 nCommentID) -: OCommentUndoAction(_rMod,nCommentID) + ,const char* pCommentID) +: OCommentUndoAction(_rMod,pCommentID) ,m_eAction(_eAction) ,m_nSlot(_nSlot) ,m_bInserted(false) @@ -220,7 +220,7 @@ OReportSectionUndo::OReportSectionUndo(OReportModel& _rMod,sal_uInt16 _nSlot ,OReportHelper> _pMemberFunction ,const uno::Reference< report::XReportDefinition >& _xReport ,Action _eAction) -: OSectionUndo(_rMod,_nSlot,_eAction,0) +: OSectionUndo(_rMod,_nSlot,_eAction,nullptr) ,m_aReportHelper(_xReport) ,m_pMemberFunction(_pMemberFunction) { @@ -257,8 +257,8 @@ OGroupSectionUndo::OGroupSectionUndo(OReportModel& _rMod,sal_uInt16 _nSlot ,OGroupHelper> _pMemberFunction ,const uno::Reference< report::XGroup >& _xGroup ,Action _eAction - ,sal_uInt16 nCommentID) -: OSectionUndo(_rMod,_nSlot,_eAction,nCommentID) + ,const char* pCommentID) +: OSectionUndo(_rMod,_nSlot,_eAction,pCommentID) ,m_aGroupHelper(_xGroup) ,m_pMemberFunction(_pMemberFunction) { @@ -323,11 +323,11 @@ void OGroupSectionUndo::implReRemove( ) OGroupUndo::OGroupUndo(OReportModel& _rMod - ,sal_uInt16 nCommentID + ,const char* pCommentID ,Action _eAction ,const uno::Reference< report::XGroup>& _xGroup ,const uno::Reference< report::XReportDefinition >& _xReportDefinition) -: OCommentUndoAction(_rMod,nCommentID) +: OCommentUndoAction(_rMod,pCommentID) ,m_xGroup(_xGroup) ,m_xReportDefinition(_xReportDefinition) ,m_eAction(_eAction) diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 443e23ca2c1f..9d7a3eed25ad 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -100,11 +100,11 @@ #include "dlgpage.hxx" #include #include "rptui_slotid.hrc" -#include "uistrings.hrc" +#include "strings.hxx" +#include "core_resource.hxx" #include "RptObject.hxx" -#include "ModuleHelper.hxx" #include "RptDef.hxx" -#include "RptResId.hrc" +#include "strings.hrc" #include "ReportDefinition.hxx" #include "RptModel.hxx" @@ -163,14 +163,14 @@ void adjustSectionName(const uno::Reference< report::XGroup >& _xGroup,sal_Int32 OSL_ENSURE(_xGroup.is(),"Group is NULL -> GPF"); if ( _xGroup->getHeaderOn() && _xGroup->getHeader()->getName().isEmpty() ) { - OUString sName = ModuleRes(RID_STR_GROUPHEADER); + OUString sName = RptResId(RID_STR_GROUPHEADER); sName += OUString::number(_nPos); _xGroup->getHeader()->setName(sName); } if ( _xGroup->getFooterOn() && _xGroup->getFooter()->getName().isEmpty() ) { - OUString sName = ModuleRes(RID_STR_GROUPFOOTER); + OUString sName = RptResId(RID_STR_GROUPFOOTER); sName += OUString::number(_nPos); _xGroup->getFooter()->setName(sName); } diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index fccb41abb983..83233bb7e67f 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -37,7 +37,7 @@ #include "ScrollHelper.hxx" #include "Navigator.hxx" #include "SectionWindow.hxx" -#include "RptResId.hrc" +#include "strings.hrc" #include #include diff --git a/reportdesign/source/ui/report/FixedTextColor.cxx b/reportdesign/source/ui/report/FixedTextColor.cxx index de398d2aa1ab..51b1f3cb9f05 100644 --- a/reportdesign/source/ui/report/FixedTextColor.cxx +++ b/reportdesign/source/ui/report/FixedTextColor.cxx @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx index 54b7fbfc80f0..db79387e4701 100644 --- a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx +++ b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index d23550f9de16..2e0a68235562 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -112,17 +112,17 @@ #include #include +#include "core_resource.hxx" #include "DesignView.hxx" -#include "ModuleHelper.hxx" #include "RptObject.hxx" #include "RptUndo.hxx" -#include "uistrings.hrc" +#include "strings.hxx" #include "RptDef.hxx" #include "ReportSection.hxx" #include "SectionView.hxx" #include "UndoActions.hxx" #include "dlgpage.hxx" -#include "RptResId.hrc" +#include "strings.hrc" #include #include @@ -407,7 +407,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const case SID_REPORTHEADERFOOTER: { aReturn.bEnabled = isEditable(); - OUString sText = ModuleRes((m_xReportDefinition.is() && m_xReportDefinition->getReportHeaderOn()) ? RID_STR_REPORTHEADERFOOTER_DELETE : RID_STR_REPORTHEADERFOOTER_INSERT); + OUString sText = RptResId((m_xReportDefinition.is() && m_xReportDefinition->getReportHeaderOn()) ? RID_STR_REPORTHEADERFOOTER_DELETE : RID_STR_REPORTHEADERFOOTER_INSERT); aReturn.sTitle = sText; } break; @@ -416,7 +416,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const case SID_PAGEHEADERFOOTER: { aReturn.bEnabled = isEditable(); - OUString sText = ModuleRes((m_xReportDefinition.is() && m_xReportDefinition->getPageHeaderOn()) ? RID_STR_PAGEHEADERFOOTER_DELETE : RID_STR_PAGEHEADERFOOTER_INSERT); + OUString sText = RptResId((m_xReportDefinition.is() && m_xReportDefinition->getPageHeaderOn()) ? RID_STR_PAGEHEADERFOOTER_DELETE : RID_STR_PAGEHEADERFOOTER_INSERT); aReturn.sTitle = sText; } break; @@ -569,7 +569,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const aReturn.bEnabled = !pSectionWindow->getReportSection().isUiActive(); } { - OUString sText = ModuleRes(RID_STR_DELETE); + OUString sText = RptResId(RID_STR_DELETE); aReturn.sTitle = sText; } break; @@ -1153,7 +1153,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > { uno::Reference< report::XFunctions> xFunctions(xFunction->getParent(),uno::UNO_QUERY_THROW); sal_Int32 nIndex = getPositionInIndexAccess(xFunctions.get(),xFunction); - const OUString sUndoAction = ModuleRes(RID_STR_UNDO_REMOVE_FUNCTION); + const OUString sUndoAction = RptResId(RID_STR_UNDO_REMOVE_FUNCTION); UndoContext aUndoContext( getUndoManager(), sUndoAction ); xFunctions->removeByIndex(nIndex); select(uno::makeAny(xFunctions->getParent())); @@ -1436,7 +1436,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > ::std::vector< uno::Reference< uno::XInterface > > aControlsFormats; lcl_getReportControlFormat( aArgs, getDesignView(), xWindow, aControlsFormats ); - const OUString sUndoAction(ModuleRes(RID_STR_UNDO_CHANGEFONT)); + const OUString sUndoAction(RptResId(RID_STR_UNDO_CHANGEFONT)); UndoContext aUndoContext( getUndoManager(), sUndoAction ); ::std::vector< uno::Reference< uno::XInterface > >::const_iterator aIter = aControlsFormats.begin(); @@ -1513,7 +1513,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > if ( !aControlsFormats.empty() ) { - const OUString sUndoAction( ModuleRes( RID_STR_UNDO_CHANGEFONT ) ); + const OUString sUndoAction( RptResId( RID_STR_UNDO_CHANGEFONT ) ); UndoContext aUndoContext( getUndoManager(), sUndoAction ); ::std::vector< uno::Reference< uno::XInterface > >::const_iterator aIter = aControlsFormats.begin(); @@ -2450,7 +2450,7 @@ void OReportController::openPageDialog(const uno::Reference& _ else { uno::Reference< beans::XPropertySet> xProp(getUsedStyle(m_xReportDefinition),uno::UNO_QUERY_THROW); - const OUString sUndoAction(ModuleRes(RID_STR_UNDO_CHANGEPAGE)); + const OUString sUndoAction(RptResId(RID_STR_UNDO_CHANGEPAGE)); UndoContext aUndoContext( getUndoManager(), sUndoAction ); const SfxPoolItem* pItem = nullptr; if ( SfxItemState::SET == pSet->GetItemState( RPTUI_ID_SIZE,true,&pItem)) @@ -2575,17 +2575,17 @@ void OReportController::Notify(SfxBroadcaster & /* _rBc */, SfxHint const & _rHi } } -void OReportController::executeMethodWithUndo(sal_uInt16 _nUndoStrId,const ::std::mem_fun_t& _pMemfun) +void OReportController::executeMethodWithUndo(const char* pUndoStrId,const ::std::mem_fun_t& _pMemfun) { - const OUString sUndoAction = ModuleRes(_nUndoStrId); + const OUString sUndoAction = RptResId(pUndoStrId); UndoContext aUndoContext( getUndoManager(), sUndoAction ); _pMemfun( getDesignView() ); InvalidateFeature( SID_UNDO ); } -void OReportController::alignControlsWithUndo(sal_uInt16 _nUndoStrId, ControlModification _nControlModification, bool _bAlignAtSection) +void OReportController::alignControlsWithUndo(const char* pUndoStrId, ControlModification _nControlModification, bool _bAlignAtSection) { - const OUString sUndoAction = ModuleRes(_nUndoStrId); + const OUString sUndoAction = RptResId(pUndoStrId); UndoContext aUndoContext( getUndoManager(), sUndoAction ); getDesignView()->alignMarkedObjects(_nControlModification,_bAlignAtSection); InvalidateFeature( SID_UNDO ); @@ -2659,11 +2659,11 @@ void OReportController::shrinkSectionTop(const uno::Reference& _xSection->setHeight(nNewSectionHeight); } -void OReportController::shrinkSection(sal_uInt16 _nUndoStrId, const uno::Reference& _xSection, sal_Int32 _nSid) +void OReportController::shrinkSection(const char* pUndoStrId, const uno::Reference& _xSection, sal_Int32 _nSid) { if ( _xSection.is() ) { - const OUString sUndoAction = ModuleRes(_nUndoStrId); + const OUString sUndoAction = RptResId(pUndoStrId); UndoContext aUndoContext( getUndoManager(), sUndoAction ); if (_nSid == SID_SECTION_SHRINK) @@ -2835,7 +2835,7 @@ uno::Reference OReportController::executeReport() uno::Reference xModel; if ( m_xReportDefinition.is() ) { - sal_uInt16 nErrorId = RID_ERR_NO_COMMAND; + const char* pErrorId = RID_ERR_NO_COMMAND; bool bEnabled = !m_xReportDefinition->getCommand().isEmpty(); if ( bEnabled ) { @@ -2848,20 +2848,20 @@ uno::Reference OReportController::executeReport() bEnabled = pPage->GetObjCount() != 0; } if ( !bEnabled ) - nErrorId = RID_ERR_NO_OBJECTS; + pErrorId = RID_ERR_NO_OBJECTS; } dbtools::SQLExceptionInfo aInfo; if ( !bEnabled ) { sdb::SQLContext aFirstMessage; - OUString sInfo = ModuleRes( nErrorId ); + OUString sInfo = RptResId( pErrorId ); aFirstMessage.Message = sInfo; aInfo = aFirstMessage; if ( isEditable() ) { sal_uInt16 nCommand = 0; - if ( nErrorId == RID_ERR_NO_COMMAND ) + if (!strcmp(pErrorId, RID_ERR_NO_COMMAND)) { if ( !m_bShowProperties ) executeUnChecked(SID_SHOW_PROPERTYBROWSER,uno::Sequence< beans::PropertyValue>()); @@ -2904,7 +2904,7 @@ uno::Reference OReportController::executeReport() // our first message says: we caught an exception sdb::SQLContext aFirstMessage; - OUString sInfo(ModuleRes(RID_STR_CAUGHT_FOREIGN_EXCEPTION)); + OUString sInfo(RptResId(RID_STR_CAUGHT_FOREIGN_EXCEPTION)); sInfo = sInfo.replaceAll("$type$", aCaughtException.getValueTypeName()); aFirstMessage.Message = sInfo; @@ -2930,7 +2930,7 @@ uno::Reference OReportController::executeReport() } if (aInfo.isValid()) { - const OUString suSQLContext = ModuleRes( RID_STR_COULD_NOT_CREATE_REPORT ); + const OUString suSQLContext = RptResId( RID_STR_COULD_NOT_CREATE_REPORT ); aInfo.prepend(suSQLContext); } m_bInGeneratePreview = false; @@ -2986,7 +2986,7 @@ uno::Reference< sdbc::XRowSet > const & OReportController::getRowSet() void OReportController::insertGraphic() { - const OUString sTitle(ModuleRes(RID_STR_IMPORT_GRAPHIC)); + const OUString sTitle(RptResId(RID_STR_IMPORT_GRAPHIC)); // build some arguments for the upcoming dialog try { @@ -3082,7 +3082,7 @@ void SAL_CALL OReportController::removeSelectionChangeListener( const Reference< void OReportController::createNewFunction(const uno::Any& _aValue) { uno::Reference< container::XIndexContainer> xFunctions(_aValue,uno::UNO_QUERY_THROW); - const OUString sNewName = ModuleRes(RID_STR_FUNCTION); + const OUString sNewName = RptResId(RID_STR_FUNCTION); uno::Reference< report::XFunction> xFunction(report::Function::create(m_xContext)); xFunction->setName(sNewName); // the call below will also create an undo action -> listener @@ -3217,7 +3217,7 @@ void OReportController::createDateTime(const Sequence< PropertyValue >& _aArgs) { getDesignView()->unmarkAllObjects(); - const OUString sUndoAction(ModuleRes(RID_STR_UNDO_INSERT_CONTROL)); + const OUString sUndoAction(RptResId(RID_STR_UNDO_INSERT_CONTROL)); UndoContext aUndoContext( getUndoManager(), sUndoAction ); SequenceAsHashMap aMap(_aArgs); @@ -3245,7 +3245,7 @@ void OReportController::createPageNumber(const Sequence< PropertyValue >& _aArgs { getDesignView()->unmarkAllObjects(); - const OUString sUndoAction(ModuleRes(RID_STR_UNDO_INSERT_CONTROL)); + const OUString sUndoAction(RptResId(RID_STR_UNDO_INSERT_CONTROL)); UndoContext aUndoContext( getUndoManager(), sUndoAction ); if ( !m_xReportDefinition->getPageHeaderOn() ) @@ -3257,12 +3257,12 @@ void OReportController::createPageNumber(const Sequence< PropertyValue >& _aArgs SequenceAsHashMap aMap(_aArgs); bool bStateOfPage = aMap.getUnpackedValueOrDefault(PROPERTY_STATE, false); - OUString sFunction( ModuleRes(STR_RPT_PN_PAGE) ); + OUString sFunction( RptResId(STR_RPT_PN_PAGE) ); sFunction = sFunction.replaceFirst("#PAGENUMBER#", "PageNumber()"); if ( bStateOfPage ) { - sFunction += ModuleRes(STR_RPT_PN_PAGE_OF); + sFunction += RptResId(STR_RPT_PN_PAGE_OF); sFunction = sFunction.replaceFirst("#PAGECOUNT#", "PageCount()"); } @@ -3288,7 +3288,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) } uno::Reference xCurrentSection = getDesignView()->getCurrentSection(); - UndoContext aUndoContext( getUndoManager(), OUString( ModuleRes( RID_STR_UNDO_INSERT_CONTROL ) ) ); + UndoContext aUndoContext(getUndoManager(), RptResId(RID_STR_UNDO_INSERT_CONTROL)); try { @@ -3742,7 +3742,7 @@ void OReportController::switchReportSection(const sal_Int16 _nId) std::unique_ptr< UndoContext > pUndoContext; if ( SID_REPORTHEADERFOOTER == _nId ) { - const OUString sUndoAction(ModuleRes(bSwitchOn ? RID_STR_UNDO_ADD_REPORTHEADERFOOTER : RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER)); + const OUString sUndoAction(RptResId(bSwitchOn ? RID_STR_UNDO_ADD_REPORTHEADERFOOTER : RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER)); pUndoContext.reset( new UndoContext( getUndoManager(), sUndoAction ) ); addUndoAction(new OReportSectionUndo(*(m_aReportModel),SID_REPORTHEADER_WITHOUT_UNDO @@ -3789,7 +3789,7 @@ void OReportController::switchPageSection(const sal_Int16 _nId) std::unique_ptr< UndoContext > pUndoContext; if ( SID_PAGEHEADERFOOTER == _nId ) { - const OUString sUndoAction(ModuleRes(bSwitchOn ? RID_STR_UNDO_ADD_REPORTHEADERFOOTER : RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER)); + const OUString sUndoAction(RptResId(bSwitchOn ? RID_STR_UNDO_ADD_REPORTHEADERFOOTER : RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER)); pUndoContext.reset( new UndoContext( getUndoManager(), sUndoAction ) ); addUndoAction(new OReportSectionUndo(*m_aReportModel @@ -4127,14 +4127,14 @@ bool OReportController::isFormatCommandEnabled(sal_uInt16 _nCommand,const uno::R return bRet; } -bool OReportController::impl_setPropertyAtControls_throw(const sal_uInt16 _nUndoResId,const OUString& _sProperty,const uno::Any& _aValue,const Sequence< PropertyValue >& _aArgs) +bool OReportController::impl_setPropertyAtControls_throw(const char* pUndoResId,const OUString& _sProperty,const uno::Any& _aValue,const Sequence< PropertyValue >& _aArgs) { ::std::vector< uno::Reference< uno::XInterface > > aSelection; uno::Reference< awt::XWindow> xWindow; lcl_getReportControlFormat( _aArgs, getDesignView(), xWindow, aSelection ); ::std::vector< uno::Reference< uno::XInterface > >::const_iterator aIter = aSelection.begin(); - const OUString sUndoAction = ModuleRes( _nUndoResId ); + const OUString sUndoAction = RptResId( pUndoResId ); UndoContext aUndoContext( getUndoManager(), sUndoAction ); for(; aIter != aSelection.end();++aIter) diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 544dfb203638..7363f3eaaf9d 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -20,7 +20,7 @@ #include "ReportSection.hxx" #include "ReportWindow.hxx" #include "DesignView.hxx" -#include "uistrings.hrc" +#include "strings.hxx" #include "RptObject.hxx" #include "RptModel.hxx" #include "SectionView.hxx" @@ -50,7 +50,7 @@ #include "RptDef.hxx" #include "SectionWindow.hxx" #include "helpids.hrc" -#include "RptResId.hrc" +#include "strings.hrc" #include "dlgedclip.hxx" #include "UndoActions.hxx" #include "rptui_slotid.hrc" diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx index 8ac0e90fa598..6513c2cba02c 100644 --- a/reportdesign/source/ui/report/ReportWindow.cxx +++ b/reportdesign/source/ui/report/ReportWindow.cxx @@ -32,7 +32,7 @@ #include "RptDef.hxx" #include "dlgedfunc.hxx" #include "RptModel.hxx" -#include "uistrings.hrc" +#include "strings.hxx" #include "RptPage.hxx" #include "ReportController.hxx" #include "EndMarker.hxx" diff --git a/reportdesign/source/ui/report/SectionView.cxx b/reportdesign/source/ui/report/SectionView.cxx index d94fe0deb51d..b179abc92811 100644 --- a/reportdesign/source/ui/report/SectionView.cxx +++ b/reportdesign/source/ui/report/SectionView.cxx @@ -26,7 +26,7 @@ #include #include "ReportSection.hxx" #include "ReportWindow.hxx" -#include "uistrings.hrc" +#include "strings.hxx" #include #include diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx index 6e4a3fa386e6..ebcc09695dbb 100644 --- a/reportdesign/source/ui/report/SectionWindow.cxx +++ b/reportdesign/source/ui/report/SectionWindow.cxx @@ -24,9 +24,10 @@ #include "RptDef.hxx" #include "ReportSection.hxx" #include "DesignView.hxx" -#include "uistrings.hrc" +#include "strings.hxx" +#include "core_resource.hxx" #include "helpids.hrc" -#include "RptResId.hrc" +#include "strings.hrc" #include "StartMarker.hxx" #include "EndMarker.hxx" #include "ViewsWindow.hxx" @@ -149,7 +150,7 @@ void OSectionWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) } else { - OUString sTitle = ModuleRes(RID_STR_DETAIL); + OUString sTitle = RptResId(RID_STR_DETAIL); m_aStartMarker->setTitle(sTitle); m_aStartMarker->Invalidate(InvalidateFlags::Children); } @@ -165,20 +166,20 @@ void OSectionWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) } } -bool OSectionWindow::setReportSectionTitle(const uno::Reference< report::XReportDefinition>& _xReport,sal_uInt16 _nResId,::std::mem_fun_t , OReportHelper> _pGetSection, const ::std::mem_fun_t& _pIsSectionOn) +bool OSectionWindow::setReportSectionTitle(const uno::Reference< report::XReportDefinition>& _xReport,const char* pResId,::std::mem_fun_t , OReportHelper> _pGetSection, const ::std::mem_fun_t& _pIsSectionOn) { OReportHelper aReportHelper(_xReport); const bool bRet = _pIsSectionOn(&aReportHelper) && _pGetSection(&aReportHelper) == m_aReportSection->getSection(); if ( bRet ) { - OUString sTitle = ModuleRes(_nResId); + OUString sTitle = RptResId(pResId); m_aStartMarker->setTitle(sTitle); m_aStartMarker->Invalidate(InvalidateFlags::Children); } return bRet; } -bool OSectionWindow::setGroupSectionTitle(const uno::Reference< report::XGroup>& _xGroup,sal_uInt16 _nResId,::std::mem_fun_t , OGroupHelper> _pGetSection, const ::std::mem_fun_t& _pIsSectionOn) +bool OSectionWindow::setGroupSectionTitle(const uno::Reference< report::XGroup>& _xGroup,const char* pResId,::std::mem_fun_t , OGroupHelper> _pGetSection, const ::std::mem_fun_t& _pIsSectionOn) { OGroupHelper aGroupHelper(_xGroup); const bool bRet = _pIsSectionOn(&aGroupHelper) && _pGetSection(&aGroupHelper) == m_aReportSection->getSection() ; @@ -191,8 +192,7 @@ bool OSectionWindow::setGroupSectionTitle(const uno::Reference< report::XGroup>& sExpression = sLabel; } - ModuleRes aRes(_nResId); - OUString sTitle(aRes); + OUString sTitle(RptResId(pResId)); sTitle = sTitle.replaceFirst("#", sExpression); m_aStartMarker->setTitle( sTitle ); m_aStartMarker->Invalidate(InvalidateFlags::Children); @@ -317,7 +317,7 @@ void OSectionWindow::zoom(const Fraction& _aZoom) IMPL_LINK_NOARG( OSectionWindow, StartSplitHdl, Splitter*, void) { - const OUString sUndoAction( ModuleRes( RID_STR_UNDO_CHANGE_SIZE ) ); + const OUString sUndoAction( RptResId( RID_STR_UNDO_CHANGE_SIZE ) ); getViewsWindow()->getView()->getReportView()->getController().getUndoManager().EnterListAction( sUndoAction, OUString(), 0, ViewShellId(-1) ); } diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx index 5e070d8076f7..ac3c7b5a6221 100644 --- a/reportdesign/source/ui/report/StartMarker.cxx +++ b/reportdesign/source/ui/report/StartMarker.cxx @@ -19,9 +19,8 @@ #include "StartMarker.hxx" #include #include -#include "RptResId.hrc" +#include "strings.hrc" #include "bitmaps.hlst" -#include "ModuleHelper.hxx" #include "ColorChanger.hxx" #include "ReportDefines.hxx" #include "SectionWindow.hxx" diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index a8c1f9d021ee..b97a72d1efa2 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -26,21 +26,20 @@ #include "ReportController.hxx" #include "UITools.hxx" #include "RptDef.hxx" -#include "RptResId.hrc" +#include "strings.hrc" #include "SectionView.hxx" #include "ReportSection.hxx" -#include "uistrings.hrc" +#include "strings.hxx" #include "rptui_slotid.hrc" #include "dlgedclip.hxx" #include "ColorChanger.hxx" #include "RptObject.hxx" -#include "ModuleHelper.hxx" #include "EndMarker.hxx" #include #include #include #include - +#include "core_resource.hxx" #include "helpids.hrc" #include #include @@ -1234,7 +1233,7 @@ void OViewsWindow::EndDragObj_removeInvisibleObjects() void OViewsWindow::EndDragObj(bool _bControlKeyPressed, const OSectionView* _pSection, const Point& _aPnt) { - const OUString sUndoAction = ModuleRes(RID_STR_UNDO_CHANGEPOSITION); + const OUString sUndoAction = RptResId(RID_STR_UNDO_CHANGEPOSITION); const UndoContext aUndoContext( getView()->getReportView()->getController().getUndoManager(), sUndoAction ); Point aNewPos = _aPnt; diff --git a/reportdesign/source/ui/report/dlgedfac.cxx b/reportdesign/source/ui/report/dlgedfac.cxx index 0bc995800283..bc4e87011c39 100644 --- a/reportdesign/source/ui/report/dlgedfac.cxx +++ b/reportdesign/source/ui/report/dlgedfac.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include "dlgedfac.hxx" -#include "uistrings.hrc" +#include "strings.hxx" #include "RptObject.hxx" #include #include diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx index 62b8fe3fef35..a57d3eec9dc9 100644 --- a/reportdesign/source/ui/report/dlgedfunc.cxx +++ b/reportdesign/source/ui/report/dlgedfunc.cxx @@ -48,7 +48,7 @@ #include "ScrollHelper.hxx" #include "UITools.hxx" -#include +#include #include "UndoEnv.hxx" #include #include diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index 5e7316b7dcd3..7c0ffd2b9149 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -21,7 +21,7 @@ #include "RptObject.hxx" #include "ReportController.hxx" #include -#include +#include #include "rptui_slotid.hrc" #include #include @@ -47,9 +47,10 @@ #include #include #include +#include "core_resource.hxx" #include "SectionView.hxx" #include "ReportSection.hxx" -#include "uistrings.hrc" +#include "strings.hxx" #include "DesignView.hxx" #include "ViewsWindow.hxx" #include "UITools.hxx" @@ -332,52 +333,52 @@ OUString PropBrw::GetHeadlineName( const uno::Sequence< Reference xNameCont(_aObjects[0],uno::UNO_QUERY); Reference< lang::XServiceInfo > xServiceInfo( xNameCont->getByName("ReportComponent"), UNO_QUERY ); if ( xServiceInfo.is() ) { - sal_uInt16 nResId = 0; + const char* pResId = nullptr; if ( xServiceInfo->supportsService( SERVICE_FIXEDTEXT ) ) { - nResId = RID_STR_PROPTITLE_FIXEDTEXT; + pResId = RID_STR_PROPTITLE_FIXEDTEXT; } else if ( xServiceInfo->supportsService( SERVICE_IMAGECONTROL ) ) { - nResId = RID_STR_PROPTITLE_IMAGECONTROL; + pResId = RID_STR_PROPTITLE_IMAGECONTROL; } else if ( xServiceInfo->supportsService( SERVICE_FORMATTEDFIELD ) ) { - nResId = RID_STR_PROPTITLE_FORMATTED; + pResId = RID_STR_PROPTITLE_FORMATTED; } else if ( xServiceInfo->supportsService( SERVICE_SHAPE ) ) { - nResId = RID_STR_PROPTITLE_SHAPE; + pResId = RID_STR_PROPTITLE_SHAPE; } else if ( xServiceInfo->supportsService( SERVICE_REPORTDEFINITION ) ) { - nResId = RID_STR_PROPTITLE_REPORT; + pResId = RID_STR_PROPTITLE_REPORT; } else if ( xServiceInfo->supportsService( SERVICE_SECTION ) ) { - nResId = RID_STR_PROPTITLE_SECTION; + pResId = RID_STR_PROPTITLE_SECTION; } else if ( xServiceInfo->supportsService( SERVICE_FUNCTION ) ) { - nResId = RID_STR_PROPTITLE_FUNCTION; + pResId = RID_STR_PROPTITLE_FUNCTION; } else if ( xServiceInfo->supportsService( SERVICE_GROUP ) ) { - nResId = RID_STR_PROPTITLE_GROUP; + pResId = RID_STR_PROPTITLE_GROUP; } else if ( xServiceInfo->supportsService( SERVICE_FIXEDLINE ) ) { - nResId = RID_STR_PROPTITLE_FIXEDLINE; + pResId = RID_STR_PROPTITLE_FIXEDLINE; } else { @@ -386,16 +387,16 @@ OUString PropBrw::GetHeadlineName( const uno::Sequence< Reference -#include "helpids.hrc" - -// Property Browser Headline ---------------------------------------------------------------- - -String RID_STR_BRWTITLE_PROPERTIES -{ - Text [ en-US ] = "Properties: "; -}; -String RID_STR_BRWTITLE_NO_PROPERTIES -{ - Text [ en-US ] = "No Control marked"; -}; -String RID_STR_BRWTITLE_MULTISELECT -{ - Text [ en-US ] = "Multiselection"; -}; - -String RID_STR_PROPTITLE_IMAGECONTROL -{ - Text [ en-US ] = "Image Control" ; -}; -String RID_STR_PROPTITLE_FIXEDTEXT -{ - Text [ en-US ] = "Label field" ; -}; -String RID_STR_PROPTITLE_FIXEDLINE -{ - Text [ en-US ] = "Line" ; -}; -String RID_STR_PROPTITLE_FORMATTED -{ - Text [ en-US ] = "Formatted Field"; -}; -String RID_STR_PROPTITLE_SHAPE -{ - Text [ en-US ] = "Shape"; -}; -String RID_STR_PROPTITLE_REPORT -{ - Text [ en-US ] = "Report"; -}; -String RID_STR_PROPTITLE_SECTION -{ - Text [ en-US ] = "Section"; -}; -String RID_STR_PROPTITLE_FUNCTION -{ - Text [ en-US ] = "Function"; -}; -String RID_STR_PROPTITLE_GROUP -{ - Text [ en-US ] = "Group"; -}; - -String RID_STR_UNDO_CHANGEPOSITION -{ - Text [ en-US ] = "Change Object"; -}; -String RID_STR_UNDO_MOVE_GROUP -{ - Text [ en-US ] = "Move Group(s)"; -}; -String RID_STR_UNDO_CONDITIONAL_FORMATTING -{ - Text [ en-US ] = "Conditional Formatting"; -}; -String RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER -{ - Text [ en-US ] = "Remove report header / report footer"; -}; - -String RID_STR_UNDO_ADD_REPORTHEADERFOOTER -{ - Text [ en-US ] = "Add report header / report footer"; -}; - -String RID_STR_UNDO_PROPERTY -{ - Text [ en-US ] = "Change property '#'"; - Text [ x-comment ] = "The # character is used for replacing"; -}; - -String RID_STR_UNDO_ADD_GROUP_HEADER -{ - Text [ en-US ] = "Add group header "; -}; - -String RID_STR_UNDO_REMOVE_GROUP_HEADER -{ - Text [ en-US ] = "Remove group header "; -}; - -String RID_STR_UNDO_ADD_GROUP_FOOTER -{ - Text [ en-US ] = "Add group footer "; -}; - -String RID_STR_UNDO_REMOVE_GROUP_FOOTER -{ - Text [ en-US ] = "Remove group footer "; -}; -String RID_STR_UNDO_ADDFUNCTION -{ - Text [ en-US ] = "Add function"; -}; - -String STR_RPT_LABEL -{ - Text [ en-US ] = "~Report name" ; -}; - -String RID_STR_UNDO_REMOVE_GROUP -{ - Text [ en-US ] = "Delete Group" ; -}; - -String RID_STR_UNDO_APPEND_GROUP -{ - Text [ en-US ] = "Add Group" ; -}; - -String RID_STR_UNDO_REMOVE_SELECTION -{ - Text [ en-US ] = "Delete Selection" ; -}; -String RID_STR_UNDO_REMOVE_FUNCTION -{ - Text [ en-US ] = "Delete Function" ; -}; - -String RID_STR_UNDO_CHANGE_SIZE -{ - Text [ en-US ] = "Change Size" ; -}; - -String RID_STR_UNDO_PASTE -{ - Text [ en-US ] = "Paste" ; -}; - -String RID_STR_UNDO_INSERT_CONTROL -{ - Text [ en-US ] = "Insert Control" ; -}; - -String RID_STR_UNDO_DELETE_CONTROL -{ - Text [ en-US ] = "Delete Control" ; -}; - -String RID_STR_GROUPHEADER -{ - Text [ en-US ] = "GroupHeader"; - Text [ x-comment ] = "Please try to avoid spaces in the name. It is used as a programmatic one."; -}; -String RID_STR_GROUPFOOTER -{ - Text [ en-US ] = "GroupFooter"; - Text [ x-comment ] = "Please try to avoid spaces in the name. It is used as a programmatic one."; -}; - -String RID_STR_FIELDSELECTION -{ - Text [ en-US ] = "Add field:"; -}; - -String RID_STR_FILTER -{ - Text [ en-US ] = "Filter" ; -}; - -String RID_STR_UNDO_ALIGNMENT -{ - Text [ en-US ] = "Change Alignment" ; -}; -String RID_STR_HEADER -{ - Text [ en-US ] = "# Header" ; - Text[ x-comment ] = "# will be replaced with a name."; -}; -String RID_STR_FOOTER -{ - Text [ en-US ] = "# Footer" ; - Text[ x-comment ] = "# will be replaced with a name."; -}; -String RID_STR_IMPORT_GRAPHIC -{ - Text [ en-US ] = "Insert graphics" ; -}; -String RID_STR_DELETE -{ - Text [ en-US ] = "Delete" ; -}; -String RID_STR_FUNCTION -{ - Text [ en-US ] = "Function" ; -}; - -String RID_STR_COULD_NOT_CREATE_REPORT -{ - Text [ en-US ] = "An error occurred while creating the report." ; -}; -String RID_STR_CAUGHT_FOREIGN_EXCEPTION -{ - Text [ en-US ] = "An exception of type $type$ was caught." ; -}; -String RID_STR_UNDO_CHANGEFONT -{ - Text [ en-US ] = "Change font"; -}; -String RID_STR_UNDO_CHANGEPAGE -{ - Text [ en-US ] = "Change page attributes"; -}; -String RID_STR_PAGEHEADERFOOTER_INSERT -{ - Text [ en-US ] = "Insert Page Header/Footer"; -}; -String RID_STR_PAGEHEADERFOOTER_DELETE -{ - Text [ en-US ] = "Delete Page Header/Footer"; -}; -String RID_STR_REPORTHEADERFOOTER_INSERT -{ - Text [ en-US ] = "Insert Report Header/Footer"; -}; -String RID_STR_REPORTHEADERFOOTER_DELETE -{ - Text [ en-US ] = "Delete Report Header/Footer"; -}; -String RID_ERR_NO_COMMAND -{ - Text [ en-US ] = "The report can not be executed unless it is bound to content."; -}; -String RID_ERR_NO_OBJECTS -{ - Text [ en-US ] = "The report can not be executed unless at least one object has been inserted."; -}; -String RID_STR_UNDO_SHRINK -{ - Text [ en-US ] = "Shrink Section"; -}; -String RID_STR_DETAIL -{ - Text [ en-US ] = "Detail"; -}; -String RID_STR_PAGE_HEADER -{ - Text [ en-US ] = "Page Header"; -}; -String RID_STR_PAGE_FOOTER -{ - Text [ en-US ] = "Page Footer"; -}; -String RID_STR_REPORT_HEADER -{ - Text [ en-US ] = "Report Header"; -}; -String RID_STR_REPORT_FOOTER -{ - Text [ en-US ] = "Report Footer"; -}; -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/uiconfig/dbreport/ui/backgrounddialog.ui b/reportdesign/uiconfig/dbreport/ui/backgrounddialog.ui index c08ef8bfd0b5..81f06b43ac9e 100644 --- a/reportdesign/uiconfig/dbreport/ui/backgrounddialog.ui +++ b/reportdesign/uiconfig/dbreport/ui/backgrounddialog.ui @@ -1,11 +1,11 @@ - + False 6 - Section Setup + Section Setup dialog @@ -97,7 +97,7 @@ True False 0.4699999988079071 - Background + Background False diff --git a/reportdesign/uiconfig/dbreport/ui/chardialog.ui b/reportdesign/uiconfig/dbreport/ui/chardialog.ui index 47491da9b178..8fc9aa4da781 100644 --- a/reportdesign/uiconfig/dbreport/ui/chardialog.ui +++ b/reportdesign/uiconfig/dbreport/ui/chardialog.ui @@ -1,11 +1,11 @@ - + False 6 - Character Settings + Character Settings dialog @@ -96,7 +96,7 @@ True False - Font + Font False @@ -109,7 +109,7 @@ True False - Font Effects + Font Effects 1 @@ -123,7 +123,7 @@ True False - Position + Position 2 @@ -137,7 +137,7 @@ True False - Asian Layout + Asian Layout 3 @@ -151,7 +151,7 @@ True False - Highlighting + Highlighting 4 @@ -165,7 +165,7 @@ True False - Alignment + Alignment 5 diff --git a/reportdesign/uiconfig/dbreport/ui/condformatdialog.ui b/reportdesign/uiconfig/dbreport/ui/condformatdialog.ui index a336a5bfbc8f..623ffc6c4755 100644 --- a/reportdesign/uiconfig/dbreport/ui/condformatdialog.ui +++ b/reportdesign/uiconfig/dbreport/ui/condformatdialog.ui @@ -1,13 +1,13 @@ - + False True True 6 - Conditional Formatting + Conditional Formatting dialog diff --git a/reportdesign/uiconfig/dbreport/ui/conditionwin.ui b/reportdesign/uiconfig/dbreport/ui/conditionwin.ui index 9c141ffdc11f..b5bb144de770 100644 --- a/reportdesign/uiconfig/dbreport/ui/conditionwin.ui +++ b/reportdesign/uiconfig/dbreport/ui/conditionwin.ui @@ -1,6 +1,6 @@ - + @@ -53,8 +53,8 @@ True False - Field Value Is - Expression Is + Field Value Is + Expression Is @@ -68,14 +68,14 @@ True False - between - not between - equal to - not equal to - greater than - less than - greater than or equal to - less than or equal to + between + not between + equal to + not equal to + greater than + less than + greater than or equal to + less than or equal to @@ -104,7 +104,7 @@ - ... + ... True True True @@ -127,7 +127,7 @@ True False - and + and False @@ -155,7 +155,7 @@ - ... + ... True True True @@ -217,7 +217,7 @@ True False .uno:Bold - Bold + Bold True cmd/sc_bold.png @@ -232,7 +232,7 @@ True False .uno:Italic - Italic + Italic True cmd/sc_italic.png @@ -247,7 +247,7 @@ True False .uno:Underline - Underline + Underline True cmd/sc_underline.png @@ -272,7 +272,7 @@ True False .uno:BackgroundColor - Background Color + Background Color True cmd/sc_backgroundcolor.png @@ -287,7 +287,7 @@ True False .uno:FontColor - Font Color + Font Color True cmd/sc_fontcolor.png @@ -302,7 +302,7 @@ True False .uno:FontDialog - Character Formatting + Character Formatting True cmd/sc_fontdialog.png @@ -368,7 +368,7 @@ 6 - - + - True True True @@ -382,7 +382,7 @@ - + + + True True True diff --git a/reportdesign/uiconfig/dbreport/ui/datetimedialog.ui b/reportdesign/uiconfig/dbreport/ui/datetimedialog.ui index 065a46346028..3b877c6ba235 100644 --- a/reportdesign/uiconfig/dbreport/ui/datetimedialog.ui +++ b/reportdesign/uiconfig/dbreport/ui/datetimedialog.ui @@ -1,11 +1,11 @@ - + False 6 - Date and Time + Date and Time dialog @@ -84,7 +84,7 @@ 12 - _Include Date + _Include Date True True False @@ -105,7 +105,7 @@ False 12 0 - _Format: + _Format: True datelistbox @@ -116,7 +116,7 @@ - Include _Time + Include _Time True True False @@ -137,7 +137,7 @@ False 12 0 - Fo_rmat: + Fo_rmat: True timelistbox diff --git a/reportdesign/uiconfig/dbreport/ui/floatingfield.ui b/reportdesign/uiconfig/dbreport/ui/floatingfield.ui index 050cc6104a1c..da3057f645fa 100644 --- a/reportdesign/uiconfig/dbreport/ui/floatingfield.ui +++ b/reportdesign/uiconfig/dbreport/ui/floatingfield.ui @@ -1,6 +1,6 @@ - + True @@ -8,7 +8,7 @@ True True 6 - Sorting and Grouping + Sorting and Grouping utility @@ -27,7 +27,7 @@ True False - Sort Ascending + Sort Ascending True cmd/sc_sortup.png @@ -40,7 +40,7 @@ True False - Sort Descending + Sort Descending True cmd/sc_sortdown.png @@ -53,7 +53,7 @@ True False - Remove sorting + Remove sorting True cmd/sc_removefiltersort.png @@ -76,7 +76,7 @@ True False - Insert + Insert True @@ -95,7 +95,7 @@ True False start - Highlight the fields to insert into the selected section of the template, then click Insert or press Enter. + Highlight the fields to insert into the selected section of the template, then click Insert or press Enter. True 60 0 diff --git a/reportdesign/uiconfig/dbreport/ui/floatingnavigator.ui b/reportdesign/uiconfig/dbreport/ui/floatingnavigator.ui index e4d3ef8d8107..5163b146441e 100644 --- a/reportdesign/uiconfig/dbreport/ui/floatingnavigator.ui +++ b/reportdesign/uiconfig/dbreport/ui/floatingnavigator.ui @@ -1,13 +1,13 @@ - + True False True 6 - Report navigator + Report navigator utility diff --git a/reportdesign/uiconfig/dbreport/ui/floatingsort.ui b/reportdesign/uiconfig/dbreport/ui/floatingsort.ui index d29f7b102e52..40fe9c3f67b9 100644 --- a/reportdesign/uiconfig/dbreport/ui/floatingsort.ui +++ b/reportdesign/uiconfig/dbreport/ui/floatingsort.ui @@ -1,6 +1,6 @@ - + True @@ -8,7 +8,7 @@ True True 6 - Sorting and Grouping + Sorting and Grouping utility @@ -50,7 +50,7 @@ True False 0 - Group actions + Group actions True toolbox @@ -72,7 +72,7 @@ True False - Move up + Move up True cmd/sc_moveup.png @@ -85,7 +85,7 @@ True False - Move down + Move down True cmd/sc_movedown.png @@ -98,7 +98,7 @@ True False - Delete + Delete True cmd/sc_deleterows.png @@ -149,7 +149,7 @@ True False - Groups + Groups @@ -189,7 +189,7 @@ True False 0 - Sorting + Sorting True sorting @@ -205,7 +205,7 @@ True False 0 - Group Header + Group Header True header @@ -221,7 +221,7 @@ True False 0 - Group Footer + Group Footer True footer @@ -237,7 +237,7 @@ True False 0 - Group On + Group On True group @@ -253,7 +253,7 @@ True False 0 - Group Interval + Group Interval True interval @@ -269,7 +269,7 @@ True False 0 - Keep Together + Keep Together True keep @@ -287,8 +287,8 @@ True 0 - Ascending - Descending + Ascending + Descending @@ -305,8 +305,8 @@ True 0 - Present - Not present + Present + Not present @@ -323,9 +323,9 @@ True 0 - No - Whole Group - With First Detail + No + Whole Group + With First Detail @@ -342,8 +342,8 @@ True 1 - Present - Not present + Present + Not present @@ -360,7 +360,7 @@ True 0 - Each Value + Each Value

@@ -391,7 +391,7 @@ True False - Properties + Properties @@ -433,7 +433,7 @@ True False - Help + Help diff --git a/reportdesign/uiconfig/dbreport/ui/groupsortmenu.ui b/reportdesign/uiconfig/dbreport/ui/groupsortmenu.ui index b9df6f291084..b4825b5916cb 100644 --- a/reportdesign/uiconfig/dbreport/ui/groupsortmenu.ui +++ b/reportdesign/uiconfig/dbreport/ui/groupsortmenu.ui @@ -1,6 +1,6 @@ - + True @@ -9,7 +9,7 @@ True False - _Delete + _Delete True diff --git a/reportdesign/uiconfig/dbreport/ui/navigatormenu.ui b/reportdesign/uiconfig/dbreport/ui/navigatormenu.ui index 2b3cab082f74..29da91edc09c 100644 --- a/reportdesign/uiconfig/dbreport/ui/navigatormenu.ui +++ b/reportdesign/uiconfig/dbreport/ui/navigatormenu.ui @@ -1,6 +1,6 @@ - + True @@ -9,7 +9,7 @@ True False - Sorting and Grouping... + Sorting and Grouping... True @@ -23,7 +23,7 @@ True False - Page Header/Footer... + Page Header/Footer... True @@ -31,7 +31,7 @@ True False - Report Header/Footer... + Report Header/Footer... True @@ -45,7 +45,7 @@ True False - New Function + New Function True @@ -59,7 +59,7 @@ True False - Properties... + Properties... True @@ -67,7 +67,7 @@ True False - _Delete + _Delete True diff --git a/reportdesign/uiconfig/dbreport/ui/pagedialog.ui b/reportdesign/uiconfig/dbreport/ui/pagedialog.ui index 9a8061da18a5..5fa08b2a48ab 100644 --- a/reportdesign/uiconfig/dbreport/ui/pagedialog.ui +++ b/reportdesign/uiconfig/dbreport/ui/pagedialog.ui @@ -1,11 +1,11 @@ - + False 6 - Page Setup + Page Setup dialog @@ -96,7 +96,7 @@ True False - Page + Page False @@ -110,7 +110,7 @@ True False 0.4699999988079071 - Background + Background 1 diff --git a/reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui b/reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui index 50c54bf0b56d..0fe1de492856 100644 --- a/reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui +++ b/reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Page Numbers + Page Numbers dialog @@ -95,7 +95,7 @@ 6 - _Page N + _Page N True True False @@ -113,7 +113,7 @@ - Page _N of M + Page _N of M True True False @@ -137,7 +137,7 @@ True False - Format + Format @@ -174,7 +174,7 @@ 6 - _Top of Page (Header) + _Top of Page (Header) True True False @@ -192,7 +192,7 @@ - _Bottom of Page (Footer) + _Bottom of Page (Footer) True True False @@ -216,7 +216,7 @@ True False - Position + Position @@ -259,9 +259,9 @@ start True - Left - Center - Right + Left + Center + Right @@ -274,7 +274,7 @@ True False 0 - _Alignment: + _Alignment: True alignment @@ -285,7 +285,7 @@ - Show Number on First Page + Show Number on First Page True True False @@ -306,7 +306,7 @@ True False - General + General diff --git a/rsc/Executable_rsc.mk b/rsc/Executable_rsc.mk deleted file mode 100644 index 06b119805d10..000000000000 --- a/rsc/Executable_rsc.mk +++ /dev/null @@ -1,86 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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/. -# - -$(eval $(call gb_Executable_Executable,rsc)) - -$(eval $(call gb_Executable_use_external,rsc,boost_headers)) - -$(eval $(call gb_Executable_set_include,rsc,\ - $$(INCLUDE) \ - -I$(SRCDIR)/rsc/inc \ -)) - -$(eval $(call gb_Executable_use_sdk_api,rsc)) - -$(eval $(call gb_Executable_add_defs,rsc,\ - -DSOLAR \ -)) - -$(eval $(call gb_Executable_use_libraries,rsc,\ - comphelper \ - $(if $(filter TRUE,$(DISABLE_DYNLOADING)),cppu) \ - i18nlangtag \ - tl \ - sal \ -)) - -$(eval $(call gb_Executable_use_externals,rsc,\ - $(if $(filter TRUE,$(DISABLE_DYNLOADING)),liblangtag) \ - $(if $(filter TRUE,$(DISABLE_DYNLOADING)),libxml2) \ -)) - -$(eval $(call gb_Executable_add_grammars,rsc,\ - rsc/source/parser/rscyacc \ -)) - -$(eval $(call gb_Executable_add_exception_objects,rsc,\ - rsc/source/parser/erscerr \ - rsc/source/parser/rscdb \ - rsc/source/parser/rscibas \ - rsc/source/parser/rscicpx \ - rsc/source/parser/rscinit \ - rsc/source/parser/rsckey \ - rsc/source/parser/rsclex \ - rsc/source/parser/rscpar \ - rsc/source/prj/gui \ - rsc/source/prj/start \ - rsc/source/res/rscall \ - rsc/source/res/rscarray \ - rsc/source/res/rscclass \ - rsc/source/res/rscclobj \ - rsc/source/res/rscconst \ - rsc/source/res/rsccont \ - rsc/source/res/rscmgr \ - rsc/source/res/rscrange \ - rsc/source/res/rscstr \ - rsc/source/res/rsctop \ - rsc/source/rsc/rsc \ - rsc/source/tools/rscchar \ - rsc/source/tools/rscdef \ - rsc/source/tools/rschash \ - rsc/source/tools/rsctools \ - rsc/source/tools/rsctree \ -)) - -$(eval $(call gb_Executable_add_cobjects,rsc,\ - rsc/source/rscpp/cpp1 \ - rsc/source/rscpp/cpp2 \ - rsc/source/rscpp/cpp3 \ - rsc/source/rscpp/cpp4 \ - rsc/source/rscpp/cpp5 \ - rsc/source/rscpp/cpp6 \ -)) - -ifneq ($(OS),WNT) -$(eval $(call gb_Executable_add_defs,rsc,\ - -Dunix \ -)) -endif - -# vim: set noet sw=4 ts=4: diff --git a/rsc/Makefile b/rsc/Makefile deleted file mode 100644 index ccb1c85a04da..000000000000 --- a/rsc/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- - -module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) - -include $(module_directory)/../solenv/gbuild/partial_build.mk - -# vim: set noet sw=4 ts=4: diff --git a/rsc/README b/rsc/README deleted file mode 100644 index ed940f727fb0..000000000000 --- a/rsc/README +++ /dev/null @@ -1,32 +0,0 @@ -Resource Compiler. - -This compiler converts .src files and .hrc equivalents into binary -.res files. The basic idea is that this provides a map between -integer identifiers and the resources: string, pixmap (only the -file-name), and VCL control properties. - -In more detail: - -Typically we would have a .hrc file with entries like this: - -#define SID_STR_FOO 1234 - -And then a .src file with some entries like this: - -String SID_STR_FOO -{ - Text [ en-US ] = "Foo !" ; -}; - -This is compiled into a binary resource file, we have many of these -which live in program/resource/ and then tends to get used in the code -thus: - -String aStr( ResId( SID_STR_FOO ) ); - -It is important to note that any appearance of hierarchical structure -in the .src files is in fact a mirage. The file is compiled at root -into a plain map. - -There is some German documentation about it in a subdirectory called -[git:rsc/doku]. Seems to be very old (January 1992). diff --git a/rsc/documentation/rsc.odt b/rsc/documentation/rsc.odt deleted file mode 100644 index 3b93057a625601f9a11387f56b9d5fb3bddffe5d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 34312 zcma%h18`;C5^g-1aN=ZQ+qUgYY@Ikcv2EM7ZQGn^V%yHddGr4l@4j30s_w4ZyUyaCEZ;7}(lcnHw26 zngeaQG$jKUD<4ETSaCKDpf0WgQj+cm$j)8~(U}FR{Hn%b5B~noqqvast=Y!z^nwXdy0l5BUf%Xp- z1A;$OZ5+7%F~m#cWN*XuHy17&18aZ-m!lEaf0E+*Pc+xxhW;UOwKBJ{tuT1KOL?Gjeir(*He5^iNa9M*qgyI@w$OjWRZ(2Ur3Aa@&EPk&co6U)aAG z{;#C|!u}^EAQ1R(Lx1`34;TM7$Hc(ELjRBZe_1lMH#WBVH~v2y_=9DpH>Ec=a5SKG zHV3#66A}C~j{gyGCL+FnMfWcnd^~@XF$LHF>lpY#4-9FMUP zmz9Bysgr>zfDd3ptMY?~{y#IPwzxN!GuG=GK4g{tbf^2yn19 zF#5ynzp<pY;DdP$eg;_uYYA(l$DI9Z*;;wTl z=KV@GnrKBZugy*(Ex<0b(2KhN(lmTlf-R@v4Ipgw?EY#pTo|Qk&6m@Yq1P$QT9u`v zqqDfa@lb#?{xt`$oXY2=iArRhqMm*~#BO~0?BRFQn}=;Z*FN=9=9d;r{>rJIE?vq| zez`Wk!Iwj0rxm;lGJ>Qi41~L=C4aB0_s=Z+d(TqeCrJ()g-(b-t&4yMw9-*5pnKp-2(E4F$&RvzRh4pz2J{{74B% zVXJb@SX2(mf~WPQCdENS()(coAY5w zqq~oG&vum@JydEQ`30tKuAS5MMp2m;GCvDz9?SgGkP3|HXzs)Sq{QgMb~%)XgNQ%S zXVZk3S!Ari>%;GJO^Revu{>prOkfJsH`Ajp>ls5k&DcFaADlY(8;cAhQ>-(UkH+rnzlV&_4<-t}=vNCei23eL^q2+W6~tA9%#G>9 zyDTsV{}ouUYBQXKnk+-vzk|zcC9`d15YM0?0BQNS3!?BVmV9V#fj_fLKW*PfPO0I3fdTJe8Qp3^l1*ji3k>_sanvWNT9rpa zPcB?9ovD5YlZpZCgBmZ0VA-pXk!FZl1)}b*>n_OAZ;-VFeNrc!qQe`Xr(?-*xS%05 znV6ODxVNqE7!ca}q-n2zrJSF4TlVQIVza&au7C}5pBM9Dgj?!5Y-WVYWDDL}#} zf3@0Eg{kr%J=dE0)n?zs)RHA4N1b&K-AdOdW{T8!K7#Bgj)EVnX|15Gk#b)ev{eN` zpB}uDrO41Ck`?53UsdxWkT=qz`j3*e7F!zt`VPzX{Z_TkK7O7~E9d*OsjV(+&|R70 zp4dU3N}Ns=hlRh)lp{QYRb6n%rqdO}G-NRrf&Ew~k(mz~LtUq2D(CO>CT-0WY;M{ zfh)T(<&M4>=z-{N?qYvCSu^#s?6HHJx!+tKj&%pVO=FviTwGVM->w1G_1>b7d>YU{ zGP`JeF6L`K^6~dN!hlhaySxo42Q?klb{)qfPjnzEADu@uFE?s4n9 zsuMG^Kykm{OdJl-o64@;!E*;kMno_;6qkIV!{w~T2Q6;l=nGuriXLXW4*7L{5iLKU z_G;6@{h)$5JqBv!wd}frov`^qDu{TrH}EF}N`b9pP5nB^UDUyE1UFNQB(? zAZETe)5lTwPVr>z12qw>A<#RH9(%OW*3r>NSx@u&KP_;!8))#p3fzmx&nddTo$I(> z-tg|>im-yD)`2-mS$-!8u=AJc;xo_+71v#P=3XAJ z=QYElH{OZ5yX@JxlR(xhi0ZIctNgyFus2S=iN`W{f(;U4fXwP9@sGnn$Py~A~mwplHu zmUiA(bUa#$kE-UI;LHcI**?e6{C=aW$2Nti=6*8qLEVLrb~TK~cDwQ6Rzp_1_R!Xm z&*RRcHGLvsK9VPR7PGbGl9_|aGo^EOV_i{WpY_pLkY8f^Az}}+b8GyP6M5hh`0?Ug?=uc?DN3)`{3z%!h^lG!!>S*zpdHy$tC$_>Z|7)t~Vb9 zdVKpz+$>^`H#!3ODHXTBgMWLsWLN1APaWF|4qP^Cb99Gd$IR8lLxj$wPVd2+7FC}_`LY1~*ffe|8_-Af34Vb1 zOyS*`C(=+~drqrt*DhI9qT%tMHG!pAvMX&%VK*Z;^|5%G}JMZ4|>Y3W2Z^ZCB_|8H1>fh3f zY6Q%AfP>W->)cWQ{kcSzB)5nORzmJvb-(C*aWZuBqan#MR_Mg2Oru<74Ah`!qK(gKzEyN(9V5uf%Y&L?OK6(oWH-sLq z^OgPGk1b+k~ID-%@d@2?2(gM}Rcr)t=W7p{8*{*_Wzy=Kh#@9rnm;N?3%l919 z%M=HO$9H&pfAW6ioYH=~oz1k7-LPgbXVMwtUi?Is_ayM1$nW}islN?(BKV~hYk-d; z!#d?xD$_~sUh6%`=&2w^=!hVqW~cLc$2$i37ce%(jxczx7U|BUAQVzMTIkxs8>R4FMkqs#}`^U`b(w%0?cIQ!Snh_{2uLusTZvFePgXvd?!jg)oht86}x6Vq4k`{MTc; zA8tzO4w8NQoy);babF5c5*CY67KgIqc^PQ7I`S@YAscIDs!5=e11pNtqNh*YU_!r$@5-GWqv);+BD*_$?223bKM8U z+B^Q;a_ciLP(<)j4+|uN*!_z_1I11P#67sNOMoT6pU0`d3HVT#leS)Qx1Bh>Jl?B> zX8A*3;xE0gu+OPGZxp+YnR4hPX=gM)QPouG1n4T z3#K^muH4d%E>1_#Lb+|UtBeue9WnX%dgVx$r>v3ULZaOF;jZTWifFv-pK z)K!mk@2mPUV+UtFAMD^S6>x}Wy3lhsM(dR4rIRdi1kanryJ)GlH1Q;cOUg3=5$X0w zM~#~_xfZLvdZ<>fX6M=PTbqWzE^FEsgx%_g(rK?~cLi)ePEF8~XOs>yTkfF&vVk zic_gr_ukNej)04&UKYJ|NRFaz2_bl@)}5SRovpAb?m2I=Je!@D~)x<7nF+0(_1>13I?AXqYy4 zwRDZwZkjVY@gv7Qv--6wsfP`@Fc?a=)5(T|zhXj`pCl_6&kEO~hZsgr7)L_l!uZO1HEFGQ)&&u^u#_rd`=+9IgMsFYE&Q}Z3*aOX9O9~TEFX^!WAIxji z0Z^|a^#DC!vTXDPDwma#{DM)BhO2iN!J1wu6AIa9!Q=woT(4jy%su@+Q5!${rq_0J zpySB-9Wc6K7TUvJYmT2qon;!oJnZEqHbpoF$&0}$%ki$@!QAT0{ob1a<{xjiWwi5-*1qO5kaxjUrU)U;2Hw-SDeFe@A=>n z^yHqy&k^DcY|su-nuPu_xDYQESQ`YwQr~ad)ELpi=p1EJppWQ<;zXl5D6EIwGp(Q& z*v>P4F51)3{hwE#=dZ>y%qPC_cHA>W{tqtn7gP1UCru?L!x{F(2y5VD8in1rMuhFH zK0ePC2cOW;mLNYa@+mESd_Hp^fFHyl_W&7!dDHEN5OI#8kk6o~AQZp_?Js5bYmA0P zaw?!Mz>VV{o_29Z=h$OmM~~Fya|)RHS%Cn92EjX*WlUplcTm zpn*Uglu<$%zL!?qn?y)_qsqwB0$+a|;JvP=^uQ^tgv{ z*v4UqdENA?@r1Qj4vwCUZE#m+kp_E>24LYmG(bTuf*vZp5SAOD#$09IZM$&4}k6l3kH&3NZ-b9qpHlZF3{>8@0PSAF`{3<;_}+vh=GeW$l^YiJNa?+CT%NF;0h7 z&9mq^*;uX$`75=(#|*Ht7QQS}WMhO6ab5P#4C`z64>Lmn9e`p3WM&4IX^kVz*x#jZ z^U!mn(0O7%XA_VaK89B^bxZuJ;TO7%u&sR&xT682Pq4wC;vrav%51rZ@4(E(QDC~I z@bOb+F7)VD7AOrFhQ(}xcsdl<1}-iU2fKb_hWV6)x~gLxGAapxe+v~{xY>fi`UJ}A zyU`)V&~Wv_FP6xJwN6O}?MC)VqJtmuNsC6-iS0}qmgsI6^ePf099mHUQSXL}ZL`o= zOnF$5`|bUccCM6B#DX*UIN}!DsrOqth6>7zwyHx{mEr>GHery&u6BbTcnv++p$^)} zzlEp4dA0HDxhZvSUFZ9x8qlJ^L@^h3qf+8*@JCwGni#z8^9SUtiyD3e!KVcxxEc&1 zGIvw3eXELm{-uiSavwd3ZVn(L33X@(5ejiQ70BaqIK^Fpv zdCQ=Kk=Q?CR()8Flxbqkwpf95ByL6otG^Kc&{aQyLl74G@q4sSFc{}83Z!;y3n7#V zxa6`TbneR_%I{`y4f;SUV=5TN0Zc94r=R@d7yq>PbFNl{oh(MvT0U>C6!k?=#&5)< znsR(w23WQz=ruXQvGV0K*s6dzG?PR~wOGCjbpv_PhlVR^pzddO`bLCC{NJw5qy zs)6mNmW=sjX&79zPH6DjqknNPJ1=#vv?Nlt~+icIyG zqC>s*&Je-axWrP>m(C$6f@of~pTcbK!I*Ba-B~}B7)pC7y`Dpu&(~UZfFoIp#mw_W z_tq)E3qqVp+#TRNX{*FMN6CxFnVoiFiydZ%(j2psjxf(dj4|!J;{+1#|3&)vUT0aO zeoq7y5etrSBsnCJXkd_r0TOq?aK50 zMV&1wpr`7srwIH7;RBg|2Dj2~y4wh;j!00ZkAZiX*?VpHrSq-T>Lep<`H9Tk>}U)skBS&TW?9DkW``6ZJ`XEq#vqe0>vpc zSG(d@(7*xP-(RRjW68eX;(n`p{8GF4%VxYoaUMZ@1T>aR27Dsp8etO`Cl>jq;MRGX za^}d+FZJf02WU{ObsQQihsWFM+HTzYG~y&++w3S4cPH{IHWSS1b%X?aip`T6SZ)P_ zb1JLDR0Fv-Gk#Z*)*iT~Kp&%SC&%V0d-O`u*I2UP&_IF8riitU?@^cZB-K!aKyu`J>jlgu6KJo#U z?GD#4bRy1?y2pKftU-<-Z;oi{P!xea%)9P6l#XD3j@#ALpqFJZcJJXEkp~Xs`19EA zP2Tew_KKol6VHrkdP$~uDAFsQ%`BO_yDiJ&V_3}vZrxa^a(7A>1nN=VT`$HbhEr3>EZzS|Vgq z+;}zo)atJJ)YXmtxat|I7XoA6>@>hRyd^Q65*#&PsyBX}b$s_d@f9`CmO)h+OSr6N z`dMad@&ZWR_OpZtAe<+bqzX;!FfH#@ktl;(BZ3MP857)+xhhj44Ed9W{FV8lvE0-J zU}%Bl3lAMe8wU8~uOalm_3*91dQ><4sm}%Xr$!sI0_#^>Q=37dDBSEPMDS{{W(8eW zs@!BkWa4RhZMz*~l<6l9Le;?NPS2&Qb;&=YFp^eB3@Saz6bs9yigiCQR(MG^iGse?J6Ke`^ZS=mbsXjd&EccyzTn zbl}spF}xlfPt-mweM)i$%c*8s|5T*ewN^UmVe=UPd?6UkL(PNtAU@Mj7ZNKrjU3EU znSKX2Gf30XA%lMVTpJBkBx~Y_bv>$N1=}vQu&&gQBR?2jXsbXQT7cvVQ~NN}J5G6= zkUMg}awCgV*6&lcvaGK~zwZo{9^<;>*(8rsb(E1BSv%0aGc4NEZ)*#tf*B;PMmTh@ zTXaH}2Hgn+C*1cP&g;DbV#0k@c?#aXCK7s)UPCsEAqoBzGL26JCAg|<3_DiYcBZ`R zYCBXlb9Apu6&6g~AUq%>u$sWB&rbY}^sd&wDn=PYKx7t-`^yfgTT3bGI196)1Cu*Q zO>@#YU*?nd-JbrE*Djq;FPmROv_FoMUnNoJp5L}%{tr9@>+1|f@L^)ga!@omwJ5H6LKd-$-N>Anp%S>B2FP$LCDz> zSGMiGX0oX0LdI}gdf1pI{W=sOhEoj{^F>z?A-?wGb!O>@0RXuyTR0zNAU$~1ysKfisM0+9(Ip{=fPuNQN_wUzwXe^_d-Sx23; z*o;p{J#LN%x4qV8UxBEdjCZ(0i5hic$fQAGJjwDZ!Na}*M{FZaG53tN46}gV>5ke0 zS00gh|6nJ5^IZ1MMr;^jQ|&Ip<#PE0kCQ9#a(gEIy(yf(#pGc`n4A%v?RpfKx)sIY z`E5tjE965iOin9mV%Pl}s;-oUR#d0UFQ7B26A|oXpY~;*o-Z^#yDt?yJiZR9`aLhK zn1(dM7db9|hAKL#XQ0z{U5y?a{WP6cm8ObfKsi)$;Ws1h-?S@6<_+@CY*Qc@b%&~1 z-p|)i)jHJ670g^SS*%)3?W3EnqhGGnGyDco1qnA9?FIsBefE8KVx|ai0RGvilH?(0<62lj@ZH ztY9hFFwLI|UodfSb+~m6O|Wdy2{#$Ry$#&(eRGgpJC@wjH(Xf8%1EhgccvhliYzP; zozR%NV0hfjATypCwQJg_|Ana)D`}zQXl$Z{XlVUQ1ym82WUPL z*$a83{TT2U)fOV|!di&%vkX_N5=~8=MGtoyL~2v^FQE}PfViW$J-nlZ?X2^lc{MuK z*|QIHKtF3sh_d26$Qyph&BQvDu$XYzT5nnh&cx5<0o3u>WXX}ajbVym}af(LJQ*;r$l&E2R$3U zq+FRwUp}1#SGy-PIPDat(o}EElj}5<6lh}FQFWTZ0RbPbv0OLBs5JL~meyUCAq?2-n-R@qMC(Xs>;N z&F9>2^kwGW5gX-)5@c1+cjA%P8~QhV2jvh=HJOieRDx6?-R}Ru%fWG+$f#qVZ;`sx>7u=R;^SV zk_@FTayX+!qZ-9#zP`GZI%pYqa@gN29c)G$f#!RC%{nY6Lo&s!*+FMKKuBot}?o2 zk9a0paknR8>l3xob@gp%YvctVe`agg8=s=610_I-buFYXW3U$MrzCFI?z}3RVG)#) zu0PX7Rn@!QS|0$U47=nPo}o7TtAqOrS`|P z!@=R49p%|t7v_A`I3B-Ia4FiMSo$ZA7wKt#7*kWBtO40Tp1iQr87(!CL-8xa22#HJ z^W?F%$FV)Rm7L!iR^Y&gJfp=So`LHR3wW}vqtEM}lV~0=)Ec4Da#@7k-3X(Ea-G*; zR@LY0vD7hFB@S*a$C|3wEsa1=E7r++CAqwT3H28D+O8^->2-$h%t5#-5)aM6r*K6a zV<+1@PTq$MQv?N{A#hvGVb){22B5A^aVIAXyE2}$!Gp}RT;~}^)@EzN&>nH&a)fFR z$U}}Qo#7w1uz(0(K;D|xELfT6wNq2GM6GT?#uHQy1ohiB#Cc0O&q#J9P!BZuxtDCp z&pP3RJHvL4AUBH!8Ld9hdGu%PU+BsT_%4DSLsKcEo6PJSTr972>p$C`x;ENoY3^^<+O}DW zeQiw-n6jH#&GQ&qYJM|D(dX-LQXRBU&t_RAg)%yocMHnZh`QY_S^9-GvrE4Qj%ss} z8ia0YRp!yla!W+ugG`LT0~U9NQYVNJ?!?h~ZVExMWLY;ukA`~9@Zio#TwYCIjZ_%~ znM5F}j>*=^QKrO->ERlOh%TCuayQ7E1(8{9pC;D_h|VJDc%VJeD@fpY78`+(U<6^B5WsI+j9j$7KCba95%V%&5J&rL36UwVG(Zf`n zFa^!AF~|Lc>3rUYt!HSgouYj=CaoJ(()r zmWmR0fWXGFiqX_*>QzX|VdR5i38vuA43)zI0}Sr(V2B&`@pI96S7JW9;g96UP-TXd zIoTtV4V>mnn{at`e)DQ974?YTb<|R4I7&`eWMQet0}ohzKY%TexypTVsEDK9*W?r! z(;H)?W=w9l`WX<}mUZoo=ESD>>kaxW-62#5Gx-2|o0N&F9P)Vo+fPfG6)3P{ufZo= z;5LX$?5#x?rXH>1o7Nzje$)`x3sS<$yM)}%mQfZ40L85*+2L1&MQq4z1a9k~eKkC_ z3F^hy9xiKj@nnU`Yh!tq!5d6cV5vuhVUn$AqdF9H4B-8SF>5o{lR>Olp0=)Qz>)jr zyg^ZnPp~{~un-=iT-y^nI)Fg0LOFa9UEV%!8@ogzcam1_R+vSk9&UMrMjWNWQDz!E zqlk2!TsC_IUVWiMUm`yrZ^4Al8);Mj5=K`j!rf%6xVM~>?oL0D(J^h!kcCQ$Mm63B zrP~*FT#W}j2wmyxvlB`oaaQb`ouqav!L;?QN9+J6PNSd;ZQ*t762EpH$qyJJr3k6` zLr5H0gf@F^(*EN5cN)H&#wZF4ym=I?3(MYJZXSu7OhL^Ux0+U1?sB3fzre;rO9A(~ zF@+^2|3|Xv)F#x_8hPC;ysS>1#4)mlua#mfMTd@gY!%3|f&J0O<7=jjTC-5~Q60+r z2=3BS&zcX?d9K+VG%feJ@nttF4`N7Un&s$izJ8f()zF|Om>j_5?x}(JafF5)5gN8+ z5jJ&S_(^yCCo9$Rq>$0kpD2>2KUW8AQp%5-#7LK@7R#}`OP(CMGo{!2w2#-12faV` z>X)BHULqygQLK6-MrfMRVxK{ZS@nO>oG)f(hop&Li~191(1we6jTcc*i41O#CDF|= zI-Il`?j1C62=f=zn2ab^F;+s+(R;Tl$c+r8HUJAW91L7@=npE&$p`>_ZWA0yQ;P-$y@@P+ON_b z9P4{{;8GdsPh-Z~z?{v^Prlmwv`mC?P91~?@@co6J+_2q_IyU-L9d1jl;tHEZtD=v zL<|ANgZehxw2Za=-vn6>9A?5Kjr#8xP9^K#?(msj49ivr;_Q!nQjOw3vhJAK3yRqe%(^f|dP##S)8HwXv`u^;dIwL*_-FE_# zhTA-7>2VmQr}tbkxoc8xtF98{V{+d%7*4sa>(jH9xUg1HD;u!UUUKQU2Pb!8gGZJ* zan%<#$WNbjF03>RZnLhk4bXjm2BVtyG16zIn>XY;b*Yv&hey%3i4{0Mh)B#KtJ2m{ z#T&rtNTo1YkrGg7H21%%wJA}fypOY6Op&!11+`3vw~d1*SK6l5(ZZ&c56Nikw3tn` z!=|!YwlK49q>-{XvVUxW=EIJixJ!vT zRGm1G)(9%KLMvbYoNbw$-u|8!MBdWU0CVCc#^-dY!Y`@8kLXE8)5GVM#-LUQ*JKI3 z)yXT{+t%I$)0YdYblkU1pW5MS0e)A1SDJ4o`=UcGc#5vqwOwxrVrzQc^-*f<^RM z@U`?|=Zi@g{M4_KdJ=XPuX*GHl;urW70pfrFutPB)xK0+YA*HR1x@6Quq4fLB30Kt zjHcnENx0iS-6wUc#(j*z+*AbG0%w{arOPfe7f;j_Cr=Ky9)*tbTXHFJdsPb+`-e7L zPQI+yr+bB)Sly{pVE)-DpzY0wTDqSXeiR+ZnH2g72yGdh)H9r-g>J@J8qXAk@ z>0STkjcuISTS7Cp`@ueZe6#X;vm%@N{p-H^CRGW6LBFkA2Gn%>aWxeP6!gu~OT4bRrrW<*jRXN^LwK81*4SV%TOgLv+@AC)#Y`b-j%B}e8Wk_+6+V!rGbQ36zbmJj?X}H6XrfIu@VX7-c z-}rui{O;cN-9EFdBsJy4qZf9%Y!x1mZ#^Mk%$=7j>HvAT|MSMk%H>o24KLGT1bxOYbQECBG!acWEh+|rvlJg)ChpR%nDsS>&K+X7p9ks1VW|8*Xk1lsfZpVL z?68EEl++|KQ|al{M)egqYjI$bGV)dfa41&S~Je<9_%=~v5l{uxUz$Jj>_%h0Q@|_jw@%rOmy*D}1znuXJG4uahaHlUz+8 z6-oG_@At#Lg@QRWrp4>kD$)!}kt~n;;{}oqEK=&3z;AmMs8l+*G1#nQ4JDM}< zDDwv5hDlD*LZsf%n;vL?1Uzardv`{5*q3I?q&hFtdQh&(LEt|m<8IyqZVUoIyT_d0 zBGqo(K7Le}PbT}pgGpduYmol#R<}MljJ&8+>`>xv{T;PlG9;!(*9Fv>bkpf{nBA4m zvyH4=3Af#0^Fl>4d8y@ee%t^gWXd??U(a^Hm|%!KJ0W05g!%mnDBqyB1Nj2#j}5i3&u zxGz$eT>9RodQ!mDGfHjo_~iqPxRq*G^0i2zqM1*5$FQM)$_jMjm#jW8=IRv9=Lq_vqMV3v8fDIj^EFtEnFWu^nMT;uG zTbVjOh+@6VkTWdke#z($ABvEl4Sh<{M zrO&oKP_ao z7(;vOr%`W$UEpB?@g5K%=Qo3a4Nkcb$9t7|>mSZkk-a9B} z8m?w&@VzKe;IhPH!qvs+{k(iT_-Q@NE*Q5)Vqf@8SoT%DH7}$w&*}i$IWf4_F3Lq* z#fn8DAF5>vtT+}Q9CLEa*XhTiT(-x!M_VmIK4yQMp1x8&SAChVHsh~B?oZsH9hCSE z&{9{Hh`cr@YLFae>(>Q1GDN07;Ogqm*>~1f!N0N{NDb0Rbp-+S5On76;wQ(HDP#wz z;cOZtmTc{e=Bx#19Ie7c4Hp1X`O=e$$4u~)>6l3>%!a8e$LyGWk-4w~DOWbKF@)em zAp()`WA|LG6;@Tx8g(}=8hgx3+t$nXmF{yBX*nvtyE7r%RVsk%ZFuYBXu&2@?*L8Z+UKw@Um??0-ggc(rGc?+~e1MbPI)8SAr{0tXNQJKqn6444 z-Xz9Vu69d!@moVNi0f*&V}&Hy=8UoVv<6ASFrSAP4eX=@X-d0-gvMMCzg-h4p1LQc z)0C#n|CAN|0*I0ufl#E_vrF{BHpsQum4_HpTeRVN_6c*AOll!swuqdl#w>tQsJQZ- z_x7Fm>v_%JqR%{JIS&*oC{KIUgo$69R83r7FELjo&Ns)jZgph*_;-nhPA0|Kt|f}| zwM>~o436n2lA;(}5AV;l*_W=90m&IARxmnURcYEW^KP?Ma0~mKIYb18lvK%t)lP_% z6p1i^7?6G}Rf=0+SN7&|cE{jsSGp)3sizQsr|0>Y(4$3pO3%0uc(4_gbAv{mF+i`S zR@C0A@zO@o*>q!Ct!p}vaa1)mW{(UpQQPM)XFdi48(0SjZ2JT+BwZroXU^IxQTJ|h z?25y7UzQV0XOuL7Gr!gr{`O6f#t6p)j4pK^bb0b2;$tmR@#D=N>t05(Z3_rRJ*(65$ z!b+)NXL%N6{y?#*iv9HJ=RLr_kMOX_AXx#qr@G}0Bb-dPhuju+pkk7k?ybSVTafh) z0?h+qlH+Fv?y{N`*9BIr5Zh6m-)Gn8hQ`p=Wx9^Ff zSk-4Wzx3E)nzZHJ+r`N_P~3~)s|%Jq%qe1GwYNSE)@UC50dvhO?*Pfi^ zN-bsvxDYn7ZL;+MZ!gP;aB}h*WGC5Sgta!=nIv@4fz|Cd8uPdyjjwKTYJr#um;=g0 zvn?_)QE?J70W$BP7S7VmU#cX3u6fW=`vSo7X?0q0V0>bji(yJkuoolQD>0#l7uF#O zZ}!@O1RH)E#X16>Im^*8m$@eV%sS-LnJ)XzM#sxvuXC$W6%b<_&lTwbZ8q^Q>2P&a zx1331vf_;y`&RQt_8H&}Euqw{Qcy16VYA##M>3AB*b?~qYK{`C^nYe6c!ztV+7X<< z#0!x_T1mDmS;QBNu};iyZ+MnVqSNHvTj9gMr@;wLQ> z?lTnube^q9S|fywZ0hgWv@+U{>vmrM+KMVAn@nW6()-9D<)+OJ#Ax# z7+u$mD@*{P@y)^6cU**2uvibodsz2>m774isc+qFS{K z4bvT;G99eZrO+EH=A4W~-?0)wY(ySj>{*kLPDMmhW^Le*?Q#U4_a@ms-4G{spDw72 z;6wz`Qw0fjd4!PL;pWsy%<=o?Qznx8{PFbj4Xk&K@1pPWA|UHii!Qt6NhRQDXmBDz zvuLy?d=adt^k@@f0C>%1Q>JL8!#3ztmo~FFR8qB$)noRnt{=98XX1cgf?s;kq>k`~ z=Fi?(a;sifWuoOXVp{6*wtV!&xoWo}b;=5F6v}IoP|@HZVgJtpd23?*Cqn6;b@s&T zg)#wgW+KYyEhRY$p`!t>TY}X~P{`?&v`r|Tf+DrjIy7I2nUsSha-}X0wSN{suZ4T0 z+Z0I^MeN%cz9@z@14WZA%L7J74=|z*iknqrm-y zz;f;I-ejfZBGv~j*q4k=KOLEMraI?=h9nv?KUyMOT|K8(5M0}DXOn?188JOBg`7?^ z0mT4rp|gu;$c0?+b9H35qu2K^6wv8_j{-YqYqe@1=($ozY&4e|7ay^Ra6Mtw!yNt` zi|25cbsPyUKjf`ckA=ZCfdrSm@tHYf?XJg?MR}^MgA@pVJS)uF%oH z9Z>sf=>G<=i@s5?G{|+A@fQBN-5*5d7TjX>;8pI59EiqV4f*YJPurTV%1iUc;VF)7 z_7%S%k0*=qim2KyeMgOC`VUYF{sQB&zN^m@>{ddHK1SURc(g%j~)w3o=&J;`piQTOzFJ-UcWj ze%O(RMnQA!KOv=fyyAro8iH$vIn!+1gK1fwumJ$VW}_sqfBpu&l*@rvl)wvTUkGBJ zy>+9V(@L;LMGpA8%a$7Wz)4fnN(%+q9cesgz_XxHrZToDxg})t9u0Q48ACm2Op*qw zcL^phPvwu;e)yH>_5ShWx1Sg*wo~2qaX%ITd`?Z;W~!Jwarm)vSJ@GD2^xBIMnRhD zX;fyog(m(jZW|6ilKkFM$%v#w#ZeZg-cbwZ*6O&{0-#G(27z)rcM7X8%ym3YID~oh z-n7U&)m|pix5*+yyQ41|y|9?AvU+t-n1#oO;tE`(Eqw1$ldR-^#<9|Zo9|D9 zP+gbCyKa_O86~v?sRZ?veP@QyjkbZ>o!p_w%o(NlJ?AP+9@cm^ppL3(zw@B>OW9C$ ztde24ON0E)_y5!0TSiBcBx|B#W@ct)rV^I0#LUc4VrFJ$#uBT<%*@PK;u16KNprVf z_ss2?clVt4Z`U&8WMrN+3lB?o&#=!e>_fnrgzeb0oXMww#&Y+}4w;FgN%hL$&Aw%e zr8=Y|=!#u-V3_*~c|nju)o;vv-$6misTq36z)CSBf+eC@sXrGV!K-HlGSUSEuX`$< z-Xpg7);6C>5oHT{xV3iNd|a#R;IwQ$Upg*(fU5>-!iNegfHokRWW#Z z9cC{GvF))-KceV2I0RHMYmhf~$8w62t$F*;C!;SSB@Khm-a&RI;JULqi#ksFf9D5u zzyP#$j7YJRE}XEM;VI9(gkjZV$hQz=<4M$G(4~h?sl_luHz7!4re6)Tp0S9SXi7`&b&vxLYg z>-6mEes`U?y;2>~N=xgn-&nS%h1+Y?Skq`?fUdP@=e)`V)@Q9Sn$8t4Vl8Pine-+m zux`^ziwmsZShz=vD`?bMSbxEQz1d#hg%9fGyODzXgnP2J+^X`S20qHo;Y);t;q%~f zJeT$MK-(?0BFdVYk?e`*}4mvNaAl(riF3U3C)FFx8P`>>Y!1A&14ucQ8|i zFMn7qg71)4xB&a>8w=!XM$|V{14Z#7KX1t%_Z59qn2Q;=&e9wfyL_=;=>&T}8Er z_&iJOC&sSaO_N}+B+tv)Z~Wt#l||P)^ogT|#}S-6gz2=)8XVo%>PlCDQTxEf^P>9% zr?5FNi6#4SJQxJT#7iw|Bu=YJf9YaG95eRlRW+`;xhnw}(3W6D39B-WT z-6?x9$hA@Y@SW|t>@sMb?bvTX6xmK9DmB-8JdZnpMMi-|rNO|g*gDb7(R{J6C{&Lp zA`WXPEw}MF$6|!8G}THaudQPRdaAGUg$~~o_1qbdDDrm%nc4?^H6ZXW0ZIt2%h zAR%PtroTn(?1suH6)Chcpi{Y2)D1KkMO^{U9=FWNRK$ZzeB5OnhFsQSuw#~aNZM9h z5u)Kt$z8;dtoRSy7dG?8=c(GWw#WCl-k3(F`vW2dN&kr}9R^!kk9>X^5ztqdw4Kf# zk!`?vrrHd!g(i#~(4y+9_v#~p)=6H6wKEq2C4esNF0jpJpnDm_Nm8LJ>|5Ah3eP}v z#X5?yY_n|pVlb_jCsIV9i`G+pD7<#mBu_w`$J~4?8%EVy_;LSP|9qaXS4z$lhU#1v zE!a+nXz&vg(uwr#?40i`>!{4E@a;YjV|WoLdKm@7rXaCpA{Yw zr^cAy^oC4WYCAzrmqV>7r&=yYP65diFojjDQ2l$*z=4oA46Bw7DYbpbu)x!H>Cj_3 z2~gBzlu15_dp{^zoLPJnBz7qVBK*BpZ3pd9nBhs@LQdvkyKMN~MbD+U1Vl@vb2$aN z-&L|50+_G$k|l3HR*5xD1IQBheoJp}7<@+|cfjj0|H}7EyCG0I$bSe~HWC-#Rlpc# zm0=RNF2zF}Ti|MvoCusfQG{D?sZhbx1~iMRre71Vxk?L?@%s!MQNXrZTLoFn(h)!T zO}2sgP(cH8yx$6Z*2CG@hqD>h6U< zEYTHLsZZ^THu&~P+QXh_g4dYiGOFp zKVP~~XpbFem|5s=2-(Z194Wc^kk$j>X zF}qxQ&txSP2-vq%MMjIH!?k9~$)A9pzJxvaPjTZ@7lnRXSAkW^q{i%b8A>(;1vV?2 zoFAuyxAwtaM3daZvcS}z#dz1Ak+Vlc=4*M!)mm>DfX$JAE`ji~a+7>!))Ns5x7uNS z?N%sFqAK~OgUusE);QK(1R?m#<`}+UZL-v-52P~Chvly5PGBV2LRy47avlS~ZaUrr z)uh|(O6!y`v21a)(4$hRl=eidXTy|PjJVFlG4gp638B{_#+CMZMfXjQ*A5@9-O5RI zM=xz$sR8d8adpg72t_Cnj(J;flviY{LAQYzGV5I?#i$;9Ug^h3MtoWJK zHCsB7`gx(TZ6z_FO-!KuE@h&GX2-~6L{1a!981JE&_iTp;${FSqozzifY?>SfXYN_ zr&f8>%!ZMpRIr!P{lJp3?B5WMp188~7@oDng;q08(LD_#XF2V%Q)0311u(<%1# zH%QNGI6!pvzj%AzL)4C=zkLfe0>T-5eIRu`*=7wJ_|Z?L*8+qKvm*}6?ppXGN~7k; zDa=^I5kCIOa-LVpye2Vyn%r?QtTp9Fjq=*0BJXX((&7AIE%(`Nd>wKX!YrPzV0yk9 z^k{Ja5myF;KZ4SMdV^r7l3JT3NPxUaxja>CZk4foSQ71?#XSAEaz)21A6>~^1pa}j1q8o4UjTX4|P7KlJYvuMG zB{mQ~q6)6CmL2}RA+;1dS8F0Kvh3Ok&nEmJpNUk&L6U@Nu0iOpCau~10B1|vm6(-X zuxLN8v?8lU>9TaaPO>lVk|q{_j%itNKtW#MkW<1@)87K3^f1iha3Eofl+G~pB@=>p zMTN7EmD!GzF=?|kADpn`Ih3FZaVJO1FoR>Jf@ICQuS9jHDZ@2liyIqF_Bs~1&R?Ap zdMHwY_HMGVl$P3hZ%TJVdUenp=KRrKdwj1ZaVeiFzas9hgMf{?r;(Vsijo4tX;llu zL&XM+N6D1bjvfhs!dQp_2_hl%=r_I(-gyU*a8W3CxLOKBl0L4)l06}?=F&8fC-i5h zC8`suXwNAG_diDS3bW>0i9KFE?i&<6O&Y6Q9O_d?T+8qdX=4tF-8 zt}p3U#h~GcM8RP0l}2^x9n2DzoQZbjsx&r5bO)f)UD`ccR(7qQF>k)^gdQhMf*~Y5EB9z zx%>{6%USK*Q*g&aE9I-kniZY7J($_^5qD(HHhGf=x^rNgr~Jf`FX5q&yyGj%y^XD{ zzBrv`C|m)rH1pYac-?F8fCSKe%^4(%o)QAC^ob1gK$n+$%lio5JZ7$IN;rFW-dq<2 z)+%F%!OxaEehp8G7!rN63vUrqMhWyjG!on+B;#?WiI5jQek6R#*o(KH;!Y$@0LHMW zwW`xCWL;zBu4Lo8`R;pu0>@`}G2As}jBa7~FdQ>IJgMityg6=p&cXHEy1B+k;iRFl zu_6!f{!yoHVp~lH^}c?FGC3kH-X>?VQNa-h~ zpeen_S2PodP8$aRA;?9ji2_5=J2jj0Se?MTjo++-6YpVad9HKt&{&SDyIb@uc76#~ ztUSq9Xqg=lUlTZRsv;8%jrqv3h+D<)9}{Sqeyd1u3!xLO1ko>)Gd?yO=Hd3Dpu9eD z$>U^-2Fb`Aiw|2QN8@nQf4*R(s;`s)M0jbnqPKb0K_F3|;~ZDufh*>hv<09F%x5|s zFUd$cl&1`yWq9_FbXI5VXxI`IKlQGD zvEvUF zxsp|4(c?<>Hh7#0N)Q${C}F&Y=pn~K%2eMO~e=&6vDCGBzzfkBEtsyZ-DI%mvB~m zp;Os(buuepDeEoE;@#SZ6f@sA)8IW@s0e$#<*zGwFft4$nD?EJBX42kUSUm#=BA}eO+t?PPnM9lexD3qmL>DY&~$t2mw%J?a|3C!S)gV4otoPt&e8m<3xOQ6} zo~$~q<&}R#yIdc6m*3r)$F{T)MjMRA3$Z$=iwJIXRrEJ-JxgGiH0|2?6>@a21G1ib>mOEk%?2Uo8}A#% z@&diz_+R_nlQpJ1jnXPae>`<)nm6Pv`G?Mj7{HQ%pf7QQ+PmV;K^Xc}@)=dKGGU#6 zXSF1zFXDR8%>Z5vpneO=D~+N0njRi&uf0ImTLPN|WbC(pgKU5eI_CE~0&1e79hpTW z?2v?~F4s;SBEz6-`6!}6j5@(r6e>^3LhrgA@>(WpwtvnXXPq5Tq!z)kBCULdOe`O@8BQ$)v zsDt^!l4EGe&^5c`GE`M?Cg0Ga>Y0;JrPTTInVfb*?0QTm^SOo&I`K<)ogWO=(0YJ} zmw}SqePF`II1?|f4OlAE;Ani!%s#*(@F7$PL98L>%nTYqD_Y^=GY8ky8E&9@DhTh; z9tnzMI*_ERdr%Cdc)NLclQ9r56@snfU=u1ip(z|Qy5|6jnpN{?y&Polf)>4Bc7tYF{43m8m0y(>3}$63J7S) zxLOp30S{v^;?N{$8l1T4J+cM3*F4@^4zC@^dwY-a2BdS7e6Qy5%2;|8ZJc0#+`?D_ zT4>AACvahkA(?Bg}5z#6yvBLyzEPo7Zw1N2_JMxe@`$$vERoYc56-*eRh| z>um6xjtJN+gs~780Fk9@`57}078V*{oa=kA&7CLB-k8y-b)0h_JXse$K0p&f5UnZq z_k$_#>E}ACK2M;axNqv9LNbugC zPA0?KiCfNbgH)=uJ5AErKm(RKVAlxe&encIhM-kr@&I-^{^3X2?=J<3p#)hbGp;yg zs!i(qC{g+kI1sWnm{=i5^O*I(?{FOgM)h>M6)Akp3>A3yg0ydI=DSeM%5>?v83pma z_@jt4y5f7=Xc9p)tM*tY_(F=mi)KE)ccBUH8p zb^#6HynmJPBBAfl>0hVe4-BD`DX{MWF1GQx`ND_oFZ}cpEZ7jc5oRO2%p5EJenXVJ(XflVB zP_wOW9!IyR_pheuAAy3Mh)I>m%Ufui>j!XokeOo>zm4i#-F%uK4{>5=C(bJQv3#38 zN;!fhC4vgT2<4+j)kpry%~hOCoS$QDkxK*ao2|9syOqtJ#;Gv`r5n8d`Y0j3?k8f% z`pN~Io~H#HgZID)zUw(6YlQfck`Y1Etcz~7!n%fM+v;Jw@OoYiJiO_v^US@R-u9TG zXdW0CMlgQbGF~%cj3C5PD(k%k5V4_#9DDF_`s zKvlpKLmaDFCfF_Omz!z$S*nj@bx0RAJR2fj*jnX<+elK(2_^$@yb|7YUET1{2F%^p#in;!!nBCT=8zBS&aJrQo>~p3XidJQ=qnGlg%CTm*P168c72ZCY`nIc*$#lSm*9LtDMUlPF*m!O_9B<#%;O$OxAF^wd%;ftYU%tAYBGnbn&aEW zXy`0@y7bq{%%9zoTqDP|!jr<*E|E4Y6o8>q^QqT46yo%Jj-bR#8Thg&Fxks!26duX zf`s;uj`XT=qG$mFF)qLw%X@xb6k<{_4zB2MzF20ID8r1|sFE%b8MP#ARgH*Lm>!f!v6*fx&C` z(Cc-_2>|;Qw!DMZAgCEWg@kCsGLLt>=8Lpy*++RZ&al&xQ*2DSHLw$qhs=%yvY1*L znK_~^qoyg$?pQg?bUBMRblVXKS)o3or`Ej_nrpB-31ewBBeB_A;Qf2FW7ZbCFQAn_ znLHbM{Cchs(|Th;8W5)A{L^8^5j)U@a);}8HGN>L83z6J(Rmizarryy;q<( zvrsR!k{|aCV^KCccsEZHI7c@_^($=a&1XKBD4P*@Iek)nSWQ<+UND~T2xGAB7AMAD z&5MZAO)a^Hn*+~%jB4#=yqRi%0)(wIv!&oTllD4j$xa5+7k>}f*#Ia>v>_C-eRgdN z!$JN6j#G4cdCM22G-B^tuKodU4i60MfL)Mc=HgP9lH09a(5p#M4%X+FJ-skl57!hT z6dk-_S)R`K_|!2Un`S3mudj?8JKg-0Frd*y<|H)@moj%KOSZHG9E{HPxkY- z(@I2s)@XSx7++~Wvb1`ru4v&hUPrQ`|2pwO!{09To8HL{&h31CUaKGK~DnePNvUJ z=G3D7$FQH;1Y98|VjRgy0?{t#PkpFK4}sE#Usb$7sdVTKZ}D6;u94ig}Stj8I;+_XBlIG0HF#((j%u?fvX`@-B^Flk1C`- zLDH#0+&C^C!ovbLlpfI*k)|$w^E=7yNyiQJu)ke1S}+=k?=Sf8MM~A>MHy zvEC8)nSLj}A^t)HS*Gt?o+IhX0FmW3hH6$Jcl}Ly$eX!UTvfIboJ1waf*JN$UC6`k zL470qGBk8ce}WZWw75~O;0weVW1v}+|H;A5T%mZvf%Vj2aX3frIBsKGCOPn3en&jv zDPTN#^f#T##pmhmZ45^7FcmWbP*I@B?TkB0# zdo(eF+7!6X-*yb5d}kX0$sYxab)1)&ruF#POLB^hL#(XD0vsTD6BS!0Vd0th>Oz+) z9mSk}_6%XcM?!)ar1$5N){MyrE;zJex~?)2;Y_GJ5XxAp_X(~>F-rwWE{4~gX&!XY zX&RozULFp=`oY9)jWq+LVD<7%cAvOx%#I3KUcSBe?GwDvq6CL2v_CKyI3R+71tfa> zl(s4N7b8c}&9CA^SH7lUCKIFW{n-ZaN7q+Kzqu%|Wb%I})9 z1th~WdbbU>A#f(hOJoTKInWCfJ#RB>NJ_^St1{xAib|RWM29X=;QTa<>04gbmi{Ag zOx}O9PQKgBkxkh()Hxr|?;wiy-nP6W*s!v%ZXfaB`rukNdPYH6i7?MzJV>bp0ymf2?7D4DtOLN~$sMyQ0U^7y4 zcNBTaZ1==Rbf5PD<3IL~ek`HzQh`WjqwvxLKiG0YtDy0Ra;j&6N& zI=jJkbUq7)zRf#w0lFa=`|4b6Z#uv8f0ig7WhB!vR|NoAOauO3C5r!`!JzBJoB#1a zS@F4He3U3wG+9Xs~Mhq4T3+m%5u;O2Zvh z+`i;Qd=OvQiVJ^HbjdhfU6!2p#v8nx`;|hSgt(7{(U79wkSh{n6%w!#iK<;EFej4k zpyVwejNpKZ78ua0Jgu3ivm6sLiPqMYX5yxVrkY|p{*5jbTKBTro0**#=U z-e12u+&tg>p1gj=oqTwBpxMg4c&X9>cr(2L4CKq10!MlB5yY201cvey$c3l)zaRep z?GPg>&$-3LcO${?-+y9L($jyFl9G~^hJ}LqS*%i}O-n=L@$z6NAt50s*i&z@$Y#B^ zw6T$untC+37PBPfzR!HhJ%SoNl94~9-L{04G95(fsI`|droG# z*|Bc5WP_Qmi@0Bj*h-M5KAoPF?cDKy5pU_VuReMXVetAnf1#DvNLnb zQv%1E>CMacUwh|6bF|51R%Ap(xlZTXa6CCapNFZ94Zq{@-05oLM@4UDX6EzFPJZvV zmy(i_hK7c>x3``i!Swgr-;2%m2P-unlnU4T#v?(gor-d>hvwB6j?KDbxDeEA|SE^caSDlZ?G*$E1b*5>)_ zWNJDT^;0a}b*sx)GMTPIwI;8;d~BjUvai3t*~s~H#qsfKucn64{kXL}&YnxM64V_$C^-14--4-*PBw0<_q*4-7rrqJ|9xysjPAiI z+sU)GhKBogPvFeV%=GkhAT;_)^jo9N=JD^}zkdDF(9k%=vOinnbaqs$GnJE+l>GKB zI#Y#v4Ue0f`}+F&v`07BCApr}D#|e?IhoyTIhkIE&*Nb#^8Mw}emsr!e51V<%hHcl zUP%cR6Z6RWRTZ`&M8p`Kq-=LE8lRDo@$HptjKu4V*xt`->9M4;vLVuFG|Bb8QoDUc zMqX4j$ldK~SKOV3j;;aUsC5Gb3~VB;iT)RFUnS$2`EF7@0PA1y6zqe--P7|6)KTFZ)y2YGKh;>Oe2pYORDdZiX$lc`lIEm!J}#!{J^o12}m zPK4Q5SPBXY9UUB0Vg3F6K|w(Wqi}26KZcr}ogH5E;6#~pwSh{drt9^-G`IcU-rhnm z?(_b5`u_g@*_rjKhN2=05|X@vf`2>+3B5~oNR)Q*ErN4j-E`XW$sVMsxh^q{?l-{yt8x9yqKSpbGZ`s=;)|Q z`(yoPy{U#XGBVQ1?)dc7vGpX|skM!{{mu)j=&d$v^AQ-Vrjw6l@vefE zm6rPX`OyHaa`Sc5em|TdbjQKPb!=30I^VED_ShtDq>-1Gr{R_~{}?76zXsS&e(t(Y z_FJ`TX`dxN+>d6v7X5w;KgUJ57doFvO5DbEAhs?#_e||Dhj@AtI%;|z%**lI(6Qj#r4r0ULs2r>ALgNn<(fQN;PHWTT@(Nm4x zK%-l-)gpFe-}Q-6R~Y{akv}bvR~Col(uG*qg2CGYu0uolf;`p@=duMR7_+YcsG#eQ zY}<|6CO}Aa=m)yw1Ki}p{ot2DTH+5_?F;OI;8Tvs(gm`l3-56OMn*Q|k9FvaYTJzr zLV$VzJdy({ste7702Gg4D1ds?jl{9_FbMy7E$6yg+*tc@Dpns?UjO-It@NzTjE(Fa z=)M~okH?Q&`!gT}obv=4O)Lq}gMxmi7-=@o?qUs61*N}AL)z$widU8^C_T=e`&B8* zyct!OeyWEv6#lcMTam?pl62&&Y5fs3S1Vm};VRe4QUf)98t$dJe_=LNi?cNqr%qBJ zEjx_mWNjXWOWHNhw>F~gc@Dd;Favc_5RiD0f@Zh79$1_cJCMdIat^<9VqEVDc*EDZ ze&qaw(rb`!4{jic^%aPOlo||3QOg zPcLZZV5MhkPyb)O|2t)@zfrcev30clpiy)D-_&!kv9Yw(vo^B)-_-l$^>Vb=*Zck- z^l<*Jo!@Otz8l&9e`tP23jgY!&zAn@9?kbthT!)q?AyrFilpz=YU4XoNyCTE1o(?A^h=dik6_aChpyp((Q{e1c1KNe` z5=WpByrRz(UlWS|VE54R{@e|G)f;_pkG_^m(AUR(n$j{2I8+4LCenQSg@DzE6n7+b+NFy6U zgGhi>S=0jWaW3X@rqS)2RkfOlMSxh zD^t92;vc9&?3Z>lS?QIY06dTMMpW!Q1;l(r=z>zR(^{hpPwNlP!)`Tm9*DYOK*MX= z=GH=s6UG^1zsVw(Q?-n9bGhMW=eV}~tu0-rU_Wl}PIENO!^>GZQN?UGb~t034NopA zn(eYPmsWFj(-LI`b2x>|?{^M-sP%Xg)6z@$!Uf}AH!(P_l$>nF)5nNJE~gxJqI{r) zH9#H^cmY`#yHBtRtMiI5OWz8!v-wDp=`>&%MClUE3!aYKHI%e6Uh{0b^2mK7{y;xW z(J^&IXLCy%3N)rCZ^l3$TXxN46~=?28&u3`C%c6zttHbHe@FxG<%jot^m zSl%suT`dtbyp-ffOJJ|MTFZ^0TN6jkqja375_mgRj4y zXLhO#+uKnjC9}tmr`du(mw&6+)U}ZWJCTkz0A)OzMT>KDVQbgv`3BSVJu2rO8|?iH zo=Y@ClX2WJ`(0JHmx1Rgn@H=fTSjk@!S^W;QR}$nB3km-Ot7hJz1H{@vQ7)Ht{q1K z#?gRB3?Zx-`j9;$I=$gZ=RvUdRY0Cw?o{2yafuU1EEzCd210V^g#=L#DnFKY(i(V^ zDMIK-M^<6QR{m2Ax5=zUG`<8V%25NBq&q^|o80j@87onsm&9=(hvpxSZF3J%(Lc`sc6NQ$cI5lQyv%sjLU&P&_vd>{Sismz=iOg5JIJMe^2Tj z3po5@6No7svh=K$o<+(kzUZ){&jq8KFi1CYMevpHAJ|$ zb~=`E-^!FmA#91o(^1;v>W6|Q{IyG16XsH7L1FglN7KHb4OTa0YXFa3H(9J0Fj#Q( z;_?Ne(QwLL;E%#Xx3wG=iH)KGd7{HYT5{C*fmx;mNXZ>i+9A)q(@V=Wk$YHLT*G3PtH@9fQly^lXaE8bbME~$Q>}w zOtsR1f$@DWRssbAGdSbAndf2fHT9KhAOD6kL9w3#OpR9W#s{wfTsd*(OHLL!` z7pb|HKNcf>R0l95h{Z5n0Mmp{%shb8@+M0$9_2WwQ+a#|FS7)p^yuQckvETw$X^mMYn>}vbvFjNDV?XIRPr7`jwZl7Zsi#UB*Xsg; zO=rp;wcJEvO4sQmO}KhxRnVQ42iak7rJ*-y;#OEm4lUIA*18z3$qxpjJmB+0rkzYVOk?g6Rx#EoDAha!DVDF`UM14Fhz-Ko zBXUs}6J~U6xk%I%b%#=1!h(ukjg-|cvCVKV6o1d?Es*r&9$V9pW<{fA2wS~IE6#T` z#Ub2^TvOF1jjFZmDzGk`r0;V7QT04J>RL0E@1eYv?KeNRsk4#Q^;i5z(Y<59tO>*B z7`Ix7vf>6PlYl8F)Vp@5b8Y)0H+12wUhk;~{wf=xuboVZC|z*&IXN7l_c<6`{1Y!PIlBx4}lu9}a_DQOJ3yX=v9E)g+R5 z*AMZj)$SaBl~fsWPQlibMLQT2u;t`hrR$vbfD@wAC znj0{@bD++gsQ?MRr00RTcu`$>Ma}PiK$oTRW_&?+4t>8mVZYgqCDOdvmW>3WeZC)f z%i2)Un&{v=QPVJdUnVtqSKIa6h7;PD!x8_X!HAHdjh&UGN-osFoX2S!%d64@pDL3Q5v#K~# zp}UhW8*1}D-plv?3f$R0?-LzO7Bl{3x&bv@nMS?F1yKKTx&#{L0A{DpEDT1Jktrc! zb!sXoh>fMqXX;{GVi%$>+e2hY+%3G)=vg`noER+*H82O|ymrM2X?e(Lb$Ljs+dzftV>s|4|R?wh;i9yUffa5-` ztrIlP!gD6@K`Bs%s$mlGfrOw;#Vd2bggq*m0{$)4d5tAH>o2>Ph~?g}Tw@-vo~Ocq z)B|h-r|f}M@TAhcGdoGjIAZQB^lzKuhU*wzVaZGeSWCLs_- zr{l2|Q}4$uM2Hk$nH4W#cgp!FG`0NYX=N*}aDMe&x9j~3ULSjC$%rb=HSvHAOVnm^ z$qF4f0pzoxg-hC1M1T8LjYnrg8-wAihlv+RzoYDxkdjHjOz8o_s`-1A{}Mqxqq)bM zAu_0L7^Da6BklRO{r48hn!%zPndC{gw&L?x_h5=3yQ=(1xv(Amb`TM$CkUWl}T!VMe+p~ zlRfO-Y7a_W#K)955I0?7Lk12~6+K?Dk{u+1=vsuV_3^w(2k03<3ar~qD=!s}2!I6| zU|x(W3d}n&Je<;3lyA&W`z>tfwV&NDxt78g^V?l;&-#B~YPUt*?XXTpueZF;(ip$cWm&*Zb^qN0Sgduz`h~#i|>FZ8to#6*@{XB!lUf* z)7nG7okvLOlFBf5JlBCZ@uR~Pua0~WFE>K*($&TMIJ`G<#hyvWWd(`_@~XOejJ53& z4N3O-NSMpnM7(;(1`IJvr>`oUp;UJjn6#i3TJ*cy((?v?{vq zkLGV2_=H|!k-DE8zlm`pn^5+>wO*loMK6P;1ejDuc6niLN)bfe!t9?s&IV||A&8fI zN%Zc8O<-CZOIVxNU^bJS#CF2Fl*K)ci-#|5!nQ_nF0_Drl3<@$Dj1!;YjQVvbY)u z!m<3;(#)Esd&fXQBv7Zjm9H5mgljjv^GiTxsCMCazJ7LACf`}ZOc;h=URdbIkS7M% zX>IzD~o{6lq(fkmj z`}qR^U7?&}YY>+4&p4YaE9_+xw-@Ct)1y5@Hz3} zeD5Ke+A;|sl0Ltx*T;zd;UpOd3LfNs(#L!09c16s@Z!C=8w4kaf17*kojE|d%dPjt zjSKOK3Gv~`wtUm~C*IAM=3{LKLdT8c-iBp6iYErsyudUWn9{bTXzlXu2xWHlby@Nu zIl&km^bIUGJCGTw)&cMa-#VfimD@VGgvIM&O+m zo17K|9RKnOnM8u?6^ZVKP+JOlhEfIrX=u?8FH(d3j>%E-SB6b!wx!#^?m)AtVjj!M z#+53I>+&u+=xYWHOEj_qSVa%^J69%bkd6YD3$d@wLM2UA6@;#pf>xtv8we-$tD$35 zpEp$!%EaGMySWu|iR!t4ZB|(q&d?yJs$10(-fut+wX)xq6&B=)?Rb+W^PS<_X#>Af zZ{7G>-s`W7tS&8EEW|$z61G3$HU(}MsAU0YzkJ-)aOq9K#Xte1BMl5jdF71vK3}~# z@Wysmrm#g(++}j<9Yamsg&0$I`UPBnuma069Wgi$te1{@< zllsCX-w4~D$hLcc`oo^5Li-%4QC9c+b0I{kvJlKArm30r>E&}LLY1l2D`bm2SjMU`k13XM=pl{BVB@K7;m7xY+8Z5oGat2l)oKA7P#6 zY2)~|&B(A4IAXMm+HmcICP`w@oO=y03!DJ705*BW@8x9fo^r^h?@BO3hlrMe{3 z5%Dz?wE9uecW{>Pfu4S=zvpY|A9}kd3*(qjX-xW^1eajB0FsAnTr?Q&2OOC@$pZiN zZR(NvI;3jYZC=wQ>w+HV+~8Z%y5YeH+=DFSEyV8rovH>!^LaJWl;Z@}7NIomk0g`s zEA3)Ko*G$u78k=9A$NEVF#*;f6JIhzJmZ)wI7^_*rGr{K=irljkOk8IavAx$g>@C=4u?W7^EV|HH8hUMvyC_)RPC!;H1=9cNdFo|eUG5q1cnT3tM zM|i^@dTSzQi;l2J#4JnLM>E(*Hal}ThN>Jdve*6>$8AiH;05gmYL*M~>2E+F6abWu z1z&)F(2{EpFu{DnEuY&zV3d#7KgG)IgUQ_0*63fgs#=~;1U{^NZvU(${h|EHe*THD z{Gs&+#Pe6K-A_FCPpSQ|^H)Ojf7Sf!68I+<@1J7$0qXpPnfDLHKThvoSIGZV1ULBi z>*aq~`J>@~MQ#7N;rkZ<3`_s3=3fEJf7YC}{BYD?Fy22j|7iK2Ed>Dh1T_B?BPYVl diff --git a/rsc/documentation/rscerror.odt b/rsc/documentation/rscerror.odt deleted file mode 100644 index effe74db93fb101438c060bfefbd9eff519a75f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19538 zcmeFYWndgjk}fJ{W@ct)v>0tMTi9Z?m@KluVzQXYVrFJ$W@cu|Vz}~|IdkXk+ugVK z-}~{ZJG-kQBQm~>%!}&%7Ix#r`+?>ArAB}mni=zoafPnld ze>DbhGGubIu@(^i_#klsI5>VZCrHN1#6m^_02lpN{;QVkpQ=oZ|HWtL>|p&Dmx(bmz#8zU+m6hv zOsvd*^Zr5jKLz!N_unDe+S>k0(Vss2qliP|lac(>j{jzGHZq~Vt@{UtkicJH%m6@ugQ1hHgOI$1kptlKU*>0K zXX2!gw*Wf3>1*2qeAnosoryk(Ec4m5q;``{Vsj zx&M<-z{Hr(+7M{wY-k1$0stA+R0Np+o%D~k0VWnsAM=XQ*xlF~;3&lU&!+wZ`5(Oh znrV(sA9x&{ER0G1!s}#cWDQ_6wsi(N36gzG*1w1rHXnNbBhl9Ak2(G$)$ZRoS$Y2{ zZ)fOWXy#yOXZ|-g2g~18uC@*)e^c35dH&XDZ2lo)>;!Q5yN;EIm7VpU%>iwJjIQPu zP5?(cL*oxz{|{bH4sLET=6?>gv*SlACIC|lAi(4w-T8C>2$IPFO>Ie7|7UD$|1&oB z{}~&{AGUu^a=t$X{@+*s8kWDv|L`#|Ffe~PtPdacuLI%Z%n{)9XSf~z_?bHG4aaRB z1n-WHoY?z>>9seb<#P}{m!;_+pv&WDsWK1`$C|h+w3i#1ryvXdlK`=o-sr^`%9B_j zSYZ38vHdNStYch*=nw?VKp{ zmf5<~-!{>7T4MQ4c+*t+fOP%6eT+IeiLV~VDkieD7y z=1xvdLOoiv@p1@mhT4m(=PuMpx3zz+MHBYZ^79M6>JGI-OO1%NJC14DHC*=$zqF+0 z`JL`0;Rl!5MkYj^O##7`wLErMbUYXbSMJ{hCu-Zvzaz53s@sl|Wpjh=Q8e-kcRYBy zyQnNB)O4I8g)5X_&h+fIUk=JULS}juXZY~RKe%qjTD(=2Xe1VB^yMPw^PGr@`$CP; z#-dN+<4FdCB_W*m%bU~W=Q85Mnc)$!`YHDk4>0iVv-$CgudELvvo{2Ry6Ill-9g*5t2vV_P1 zweu3IpP|7F|MY}yBtW5+D#|SZK$4XwtnZxVP|B@Zg>coH#t*K@^YvI^X2il%eKf1c zz!LD%K^74)C$Xgc_GR;s7kPs^S+63|o!$pjZTQv7>W)Nh^h@4bEZNF0dDFn~9Cx#3 zZaPLcR8oT($OQ_`X;nTW3Q?l6^V?Q6a@wpJlB3+qecS5_ zkTT6j%9mR1yFnnH>yv*4qpLu#mkiIM!~N|PT-IJBTuWFf z01<&oaCQ}}vuAE~=QD?}vdx3r6zRbcHZVU*K3|?AIHv8J!z#*tKD8!{3I?h*RXZDk z$MhuT&kK-4+F97V#kb0xE~prwv>W`KDJK(URjw>5(nYc%IhYyxPSOxzTxE5EFrHIE z1!G)4^bk?6d@z-q6SAr_HT9;RZk$gQ*OoFblmw9shWQFb!njUaL&`4Ak8ZI$yX}q} z8Ze9O{a-s%$XOVcE}z1r_Xkpn$q=P6<0JP`+d5PNU7tRQYUWhz3LSjCj#Mm z?oz(yksbT>emNEI#O}n{?zdQ%k>ST9Mk*&#htUttQiL3Z>f=hNxbOB%3o=p(U`3fTAw=20A~RC%#jB0epnil9kL!6!L&@ zkUa#w9XUFUIg24gu3Vh`1o3;@(O)hf%Oh6li*UmL(KGro6`ZIEy6#kcWwpUg+_lKw zezS0Gv*6FdtiE`z`oxiAEuC-He#B?T3bb7q3$QA# zhRTrlp<{)?$K|!!uP9MW?m+p+J}D{%v?`KQx|J38Ep}(_r$Mmr#Vm>bfWiUQ20)M% z@ynykxQr4^hX`qW$cAe0c0b}GzJOT=f(t+;>(2g_DND!N`-`{3C+l2q@mo1Uhi{kS z&|0$vE#kEG4&GXkZ>Hoka(k9bw7({nto6PG+DW1uS+e2!U7}xaKtwKngR-U#Lk?|V zb*Rn+msisyfH(opVzq7r9DxGHG1XTX=K-@Q;jLoYWy4hHhIF1|Lf2AGygf8<(cKgi znC(Jes7Y zeVQ0q>-ZuE4b#seWFG(t0>ViS0`gybZ}<=IZEOp4`m>h&aNcKvXAaxaG4B_&mTeyB z=Yrr+KD7!JZK5lUsf75g2Cny`XOcnR!8owcN|0Mtu<`AY?d?05jJC=4arYNqZcK*G+1I|yYH1~_J*sJG`8?euW{U!g&JGjYYn4WAZBZ;;O3Q(FQC#H} z;||dHK0)Ctdb60`0PL6~lPFwn5wyBEA!h*|})-~1^k>_y=HqzvPLP9;Oj<4K4L9iMIf2cyTrT3oRM_ zw{4uJ3`kYtNDhrCgR8#DvD9A?z9*5xKf2e}^xlBfwo9*{t}ZVtJ2ReOTwh$sC%80A zfCVCmq3OIojM_D$ZGvX!Vzz^9)Z*lA7xP_=rp?Q_`qd8VGuM#@Ex!pU%HHLbD3+(&%=I-7WOFvtXYZPPbRu1gjG25K|IS*_O52Y9&O`wRd9E zh&9xh#En`@8gk)ecVSq~*W$N`2yCWsZY; zsoGdP>i2tdvR^+&IQ#;ScM`=tew4psX)1z?pNzsk-R7qtm2mbHa72ln)L9l2wbDt5 zcQrzoIh^m+vXZ`tF}XzBIUV#Pv1RUP?LzF@?#Yvfp;Gd#cdm$3BVLh4R*KVaGVDGF_zBWid#1KS7ujUsLGJRyxuzY!fH^xlWAjU%sZ|#odQwA1I$~q;{;Qay+Gb#q z*Y}VvdcLOp0p)uaDpWn`=R8_f;_TEBK568WOhW<+Vav3yGS8a|QgRltmPZs+8YG~m z(P&|PN93IE#}@m@e2+g_5#z^>wX>bU+~a(MCt??bWK2nt1ZAqBF^!Y$$BsMJM5?ttO+A_c+ki@ zGe2+3_No)W?(m`6zjrt&yBPt8HHVq!t#c$VW8RV{Zt@Hm`$7KQGuhCNf5O&o@S${LhbKG1I8MoOMi&HZz-`~s`UHpMmIOJgGugxj|~J)r-|AY+1G+@ z#|dJgFR_Sp*=gWTDMFsgKB*pM!NBE%ISk)R;!tlFacx%=)`0w0Abqa_d$-^=9|_ z`&oKprwK#EikyiFA(O!bvIpkBAfn|cud&A{`g(fMXcLB8R`$}pmMZODf(~TjN2X^B z`nE^39;W>~5+AtY8v;OX0wZtj^6t(T0QF}O;hcoy|Mn@MB z>h7qA*)(yPu6!dUKZ%U{JIc38B#&k{Y7C3+%WVEd9wvlRQbwoF;px%truBLYe~Ak? z!jXK)=%pV_!P%dXN!B&@y}VruNDlXU5E(Cv^tM0qPM+{S#HTb)az$ptTdpLeyEeP- zMC;>N(PdaIO{|_r5U=SJFWH1@l^r*ivcyqWjE03#YX@EVKa>>UHa}m6opgG-+KjLq z*0{24OTnAgpYRTY2zx2FA5s;uL<$L=J}_apWeU^le`_?JzEH__#+vk>KUbLnBeZ3L z@JT)PS}r)F*vwog1pyzb&lLK}M-!YV8HjFmJJ*kaTkU>LcbdAq zt9p=6mV&u5Lh!g3`R>HhwGp~)U#ZDd-C18&AOw<4F(JlJPhbLw$fuD}Q?fv^D$0meEiZ z@}4ln#mIvIM#sY|cZ)s&rP72>krj7>Hn*%if#h6Gu)`LMtc%^D0EtXgyX*)IyJw3| znW}P02=t`pE07U@{%Rr1{d8wqTuuR)PkN`&Qo6k;gBktd$#^+7%~fe zbDIsvxXhR#j~POZeJrcUEmD?(`WIWqHaSIv;xW!kpYa#jYv-qDrn78*2=o)jo#$jF z75$)h{4vW{4$SDNc+)m@pG3%T@j??E3}dD-TxY$$U!d@~pQR4H5NN_5S4(j2da|%6 zIn}>!3*kM%q*>0i{c2}^O>!M0Ufo0w;^nX@HYNyoIqZ@uV@EmnwflsTwC#l+j*<9W z?HwokM9!UJ5i_C#|zqzLq;AUqe0z7o2al>;aIxd}uq=75f}tl1jL{ zpBO=&TYTISo&({7*$kIZbjuxlCw(637T8}=CNJJhud(;51d4u|OpS*+^sziS1&50D zb9zx6bh2*sdh!i96bCp!tNJ`F>4`9~dGk#UdTLs#PTXG|T#tBdXadFJye{m3*j|_~ zXIERJLT3X8g+#!$6tlW0fBB<<^0VJE)gTRIO-l@jt}+JUm+r57Q0v6MPV+{wH6v~* zg<3E%d(w!me{r!Sp`)J0S4Ht{a3=-?+HWBR^@rOSh=Iut{4$dAAFw75dN!yQ>$ifW zZtodza8VB(33IYz(-k774C?#L*|1w)XYsI%In~_Q=CT_d+LNRML07VPZxgwaJ*LeNF#bKu>Z!eL#VbTSP>j~-r zDlqDS`TC<a=wZ7m|Ar)J3oah`;z!L z>Xfo%lY9FxZ0mGhg^N$1BUWzdzQu#*g4;@l<-UG_(5a(K#&ni<3O=0hzP7!O_JOsx z2O{dB)QEBI7;DppyjXuSX3&x`&A2@KHb$Y&PnRUDjGS-Y*>4lr=S}&a8_8i;-XiX*y_^vF<9I@$vqwY?8I8!`S-^ z8Qs86r(gzd^g~N%7uM371C)=ngX;V@zOSE0Oh^In&lYS!^XoI!7`I(pcjI4aOSA0J zM$6K@zSHNXqZ5_umF)Kw?x$ksryAESDc4?#Lq1RxyLo#Ulm!&f8dAEumIZYf3ZAmR zOVI9U!KpAXN|}~b4tQB4`&6qh(yp22&4qjd9a+X>>xKf~o>O@McfKncWm=#&~(VUKkG2!V55}Im3y5yt!-Wrb$SUXiAI6vmA_UrXGf=6&zAyLNFfdYjS zV*zKhxRms1(VA~Ab3A40%sc!%nz~+vC{%3FoThk*`w4>B>ykSnu;=&V%xqE*wz2nFijqcD)HL91~v- z-T{7bUbU|0hpy-{q(H(acoTXVnju6eKP5Xj*lP(!=)rgtx$`Qm%YHp)Hc2;3Bw-X* zP5C|C$Ac>ehl}e1zm?znOUp(rmAJS7A>OXRqRI8^D@VDttY2-#jQx4g@X!#?We$jU zwBUv!{(|j9N!?Y^Am3VeA1rp?r;mlL0{Q}}%3+iN2eK`3Pq4y~Hsm0O{nrb@$hmQ_ z%5B`{*xyH8J2YoZAbHD2CQhMw16NBrFguEPiNYM~Z-DZm+76f_RlySOa=L?qh$!^j z_qQGCwyz+{x)9&(RZBi|jS+Pn8Ia08UI)>}$yV+oVY79WWHOadYoN36$&)ZP)C?RB zSk`RmZwWzPg!Y}#6oHtSW*z$-*bC&&A%zvID)TH68oXlYh#d6D#z5Ei&hj z$PZ1=I31%seOq(iIoo{;Gk!HI^Qd~C|GlF9n)B_do{uPl2d9U`N-zwEA9g_qD)B0Gb#Qf8YnPlluvv6P!!Lh^qijIlFZwp&n zR8I5P$-p5yhjk3NT%&d4pW|6yJ6j1O^8~~%X>922_vM)(lW9D)XZyG(ocw`kScI?S zM_bHVglDaDHVZQdY^ad42#gIYm%3U5x$KkHB8FP&nf&K7&O`)X%rfvYZFCy3%1ft+ zhYleU`_(OVWzD-TLBS5S6BmM~EZ5{k;g=(rF5$w3D5Y|}y}a8wv@-rLpEjO-Qg^xr!3DWMY@ETPka1i6yHSR}(U7um zcUmqRuVNQqYr&f+QI&&OYYw{xw8rCw`QT~M8~etb`j zXWsRIfo1ZtLF2Mo%N%Ftd`S?u;LkAi^It%hGJdJJYc~6?n`)fM6-bdB@j&iVl~xE$ zD-V9G{oCZ;DK$;K1jcIZBCm8mI%qi#4>APt0!qh? z1VF1Ri<@HTK>B!Cd5IFkuAcoo7*{H#Q%egnB$aBA!SLK2(4c4(w7pR)o}we}v+E*{ zBOE(HX19BnzhS#cru>KmbFeaCr8E;wA$l;t zA#(F(e35^2Fn<+YL4j~et}TQ&l1O6+WOlX<7D8asa>x#$4{4dw#9I7`6bSY$&CP}Z zf2>?+-Dv99CJwkV&a(Z5r0x)XMb2<&3fqNtHhHs+fGL$1vy+gf3DV)0poS`gdRTR} zQNiey?cw76iq0>Wp+1+e5-s z$WX{=6N?dS)9XoyqCgyknbp%O(%;f(8)V@=bm_+xv0kGuVTPx;xrF%9?*(-#Am;|2 z8(0`H#jjwL{@6mvTgD`E-Udb9+0uwJF7Qo*5>lSnyIWGjM%?*~;&^gbk$@d9J^EL!P>9W38a0cR97;by1sQ+;CLv;HP4 z?%-V|$0Z1KKQm3_HfoT}fj-@W<)m71-W}aPBynNm=_$=U{7i0) z8J+;Cf;#h1kZosb{tEf)dkDtNm(K4KWJ1Vz#NA^SwOcnS%sgGj z3cFOx%tWQu)=p7c$nF^$^qKWeZW*kXm;QH8J3IoMvs2;{D6>JKEY``Pf|V8~rx+x2!4W(X&Dx1}*-@;n^6 zH;8{ZR+x^T5A~>WeBJ(Wx!QB@|gxE3b*~2WEKV{f362@>+HD^B^MYuR3z?I9;okJ;| zkrQeAwx8g&V?5XAy;c&&KVu)a66xU-gHDxiUN^HwuGkN^6rObSMMt&7GhN04A!l`t zQ_S^K2J3{fp^dbrp48KDXAo>8XCYbF1h{1rgUB!VJ`F>n{92j-6+iS!8$fpATn({d z{OBBX_a#DkyEuOechBUCNl>?tW~@E98QPY_c4WF}wOlml5FQ7KbsL1)Pc z3=8y46}rr!bI(E1MX0||q$e+KQFF#AiVm==@>>|m{t_tmuRfi z0Glez!IQ_rDY|Ic(F=eq0}d3Ge@2hLM^YJB;5NP7W}}}n@}MvUI_|hh3RKrhv`q+a zfw8{n-aYEUbU7sW;> zkjxNQho__)op(wBP8x`f=J$!R{p z6C=$Dw+ik3@k`I@IPL*~p#*0NMx*KP^9AhttXZ=tj2nJ67ex!mHUw+JFWnG{`re;4 zk6RzswOvXZPlILphGlaL3otSpR1Ia^Vxh4JI(CIine8$c^x^LwKljK$UYokCj-xOb z9yIl%nQQI``J{|A9DKW`#2T5sB+_%4M(+9DO=j#>gMqfBF59AJv>&=Q&s5;KcxC_c zKxp>M;A=3e$XPsDsSnUJJ`rYRwVU(uawACsA;@sK1L3pK`RW z#kEqcQ?jF`F_3(um%;cps#gBZ#nak4mTha{n=4Ybau*`@&r>(>UrI4UmyNi>=(v33 zZL+FgS$_oIuqfgdb9h6+UGb(}wM7yg0o2nR$~8v6=6&zfhW6&?Ln)oXE&;cTj)PT?wY&pVi0$>qBP~hY$R8pSeu?P%tcvXj!fxkYhg2*o^XhJW1|h>S72;^Y z4iNZyH+)(1l#?q~sS~8ZMr6d|GfV^EE zAt4})4&Luo>F?MA9rvA-o3xcFa#G3){b-IG1})vD+$M6B>uqGwGmx}bcz-)fzN%)4MVJ8s&O=ZLRi%5*-c> zEWFyv%{9JUZ?8&)r$jY}6cpzGs9Boo)3-RrMrBMby{f@mVmEmzf?xP;FEktd}YK(PS{@DXd`VRbAQG};Pt6BH@IUk_>t~l z$1l5(gENW}4xzp}if~bNS2(2>O4uoT`LsLzJvkZa#~SP}sd=tt;VJx6Xk?F&SpCsB z&a(0E2ug$C9;^=7e3XHdwdOfI>lkTwb0I}uQ$d>~=W%gpWaKL`dHOLLUJs^-miZZE zRLw%HNoq}W;*8E0-*2k%03H&qx7g~0{P;H{YDb1`4YXS(YD?Ijbl6$f z_yhs#6c{ZctTz>F9m(4cLA(13o&#~HCP3+tHa7FK3;}xS#MAak>YGCC%{zq4#ZE>d zKi`S`bMeiJ6qT8$?>5w=?X2gkRljvsJqS81zDS@n=nAnGng)pwn?h)L!gP73qn@Uq z!_~7dLML|tR~Z6GIHB*qX=&|2iZn>h&g+g)Nx^3~B4^M~L4NrP+L(#78GyF$ITbhE z75_|1H+W_(A~|i%bGlY)5M}!rKqkH&wc&WlujQL*hrxY9^a*wWH&)m)hZcU6eQpP` zWMPKCHayGE)~4i{^I^V@k7)kqgfoL(kiz}LJLsQ4gWE9?3>K1)I09nOe+C--9oLGs zy*#_{5rg`t;CwKsnmgMV0Szsz9hsf}K4r24nuUB(ltP5VgZp4Xl#v!!{`f8f0RaVp z0sA;p5f@c;OFLVYkyi5|91iN zej*I@AHyKtoVyEc%_`TOyBNL&+&OHbB_goxYVP=um zW#89{&GWUEyB@zAa(^>iRMejd33tTYuhvKDdM__$5tU&!vY$V{|1P?+g!c9IU0PZa zUg7Je+Bn}Hb9BGa=fK#&{tE^Sp~!zk_WzUq9;5#|OW3-8(bFU3Gk>~08Xt_O*P!~G zkro$+fq`M7kA;a@rd6}Q-sTY!5^{BQMM+5+hRy7KwJjkj8JM_nEF9Xv?{>M_HD9J< zlUH7TzB?5A5y&hkC`d|53IG6XY;3rM?6-TTr>FDtsZKVp_eSdL8XFhMDi?GR%gV~q z)6+j^3e^$X2y$`NH#BfFGf#}Xhjv6Y@CQdmdf%NUj{)7?o61Z80I$dEKCS5`-wbV<6=jFS2 zSZ9LR!G)RQ5gx}2XNEJ`gWiKX=>K^y{BJuyC_y6=3!R>w5#r#uy*@dA`}R#uP0ifg zTwGjSQc_Y?b+#`I+t|qHe7&v3cB5S`k*Q3(uDG(&?(urB-q_0ODo?-`~p8 zQec9<)#HBLrD`YKPLp312n1?sE+(^^SqreSv3=N=i)+5Wrl#g%qeJ*Maap6{>#L5> zz?l@`;_i}lnNGv`?a|EZ>+4+}qGA#YDJ5keRq2PVv$6~>*4vbASy@{+}7JJP&puuhU`l$X+$P z(^QT`ykq-<9O8LBx?q*1r*$bm~tR zqD~K93c(*x{tMr=Ek(#PL7bbL`!Qv{K~?B?WTd8A(eLf;eK5n+MxNs%XVyS0yJ=dM!9~v6E8ZOwT{OHL|)_1RMxdaCH z$7_I&j*h+k)$v@($IOh0jn!}a2B=w|n^XJp#qQ<7J~ad!8p(RSm6wNyhm^GI>n1@j zoZH*WV=A|;HJ?qsjpWJkF%q#*T4G{@VNYOXCCkd}$Fa2Z;rXW)77kjcaVJJc1zgY5 zBJOW*YwPRlYil*3)kkNGR2pnI&R>vbcrJQfGiQiDMv(^@E+8mKzr}@-k8fGhy8aZb zE*S~uPOm*d&fB|vO+o;g_rv#`tu!>)teBp-)aJ=0Cd9=p z_O8rAAqXiMVKHc4?hc{1T%9gf{i>{-WCuQvr*MuansFnP3@lft26$PRRi#EF@)g*v zhujNi3J*u|*%4t>VzvaQZ=3;_Ylj|BVCpm2&1Vah>gRy_T#Z%>Oe@DkyS#(-qT^3b zzfWwiT+dgJ+^!IHzxhLC)hqdTb`$%d|ds>h%Zl*1;$~ zoVTp+H_^T`0hlbFESnp|vJbwFJQUAiW!8vvx3lPfb=2jbn0aeMcU$L=qys4NebaKaD>tRu2xnK{z=}zY306Fznzaz#zI3 ziVdq<{xhV*#|jJ@W^W<}MD9aH#Yg$?LD(1qEldH9PD~Carem>VKz|mLfD3^ifbm5U zW=Kc}n&BqP%udcgO-SbJ6twmB$XIoy+~VWR*`0Dp_KnEe)H6eZ!LaJWE>#X=TFPN* z^SUE?z80pYycNFX#d><;6v8V@|GZ4PW>+8`uYST0Ms5V_iJBZ5x0D-!&#h!#b3FFa z2>rE@Ft9`spDcdwdgAepZ^N2uC^?;EMZ4dV2!^fk6=hY!8P+Se1=W-M^c9JKl^+gp z@+W9klr3fTn|Rb-}}1RR(Y=Lzu_5g{_WiOoAXTH z)dqQ-K^oin=i?TB_xFQ0ripjl?TT6#achzBUuI9y2esG4YEl({%vXDFJ`D*90^$$; zxB32F(0-x_USN>$%{YQj`#>O8hW`Ct)F&jHOIQ%m# z8vL)@>VqHT&yM8J@n7Foe|9mBPVOIRPk#ke>#aDfG~%{jsMyukwCyOxFg96Tm`wAG z_a--=P}n%e`pQUm2a@qpm@hRg2OR>;p2$2BxsPIRq20icqYdP$7m!?Ct5Gk(-yeIB zzkvBXJ(?a_E$}Ex;}9TQ_u!fH*oj3!-0XA(-4{HWT;2?2dc&EqZ*P+`JIzoc6=qE8 z5L4qJAjSMDy>W}~?@|gziy?qC4~Zo|Ci;Pj6e=o3_8ZkKzV32JHOSG(o}-Uj)tTj2 zS%iefaT;$G&vMw5?8h}^YG{vH_VH$F?}AzOdEf|)(scB8KXq5)PM6>G;UI@bNqiL^ zo}mEu*^!gw^}4b_LvGmg;(=<0l@T$!X@~`Wz1AcXt3>fNtF}@uiQd;O%_WZDoCJ;7 zlO_jo-3iKkdu$r@NJK?l*NaJ&kAgnHgsLa)$;P@NO8vgG=8g$}r5um_t1NjqLMFG= zRFW|gxu+5%9&r#YF6=~eesEL>ezv4;wCniIz9HDz-Sne#=< z_PuB*WH?$ehV*Rv>J9tjA7F%Sk`Tu@%;+`TGz=CYc+hUM!M^4oJz?HQTDgvDtq~!1 zazfsa z9O{W9!Df<39AyJ+-w2+Jcp-cU4>|YZ3Ip1Atnbn|=7}s@))DoH!$?aG{R=cyt6r|V zZHOoNTHAIZel`IfpGma%DCm~&2cICL9|=pt?l`+D$z-bO6SK19-s`2lD^e;pV4hVx zXxy^uF(-)Bs2$U!mVElopVjLPc!EZH%gEW(7k>@_KSMx2L&JKMrppZQHmgoydl_4) zDQ=z|>S2$2axc>xO&j5lQmQ36&&nDTK2buTmzIZ}-IpH-=-S)y7G= zu+)i0yedO{@CTcwegNwuoVth*xighjNJX+FFcm``IH#qPOX#?dbtf8ynGOH(58P;U zCX6puHjcgVg8WzuPFtih9vcygS8tD@Wax{zFC3I^cnJssm<28i)fcJAGdi7P zQhZ<564fRtU07i3oWwJNV1G?;&J$is$K|fT2#wB&Gqor~KMqs$FI+d)uViS4)^fVy znKNXe(#B(t)kwE&^@5qDROb z>4GhS8A$#$gQA9zszH{pLpf;*J)Csh?#^ZH)@A#E+KWWBMCH6S)j2J*2#ptp2=m)6`y36B8k-vR)$&{BOb5u zFZZw?>77!o!7yQsE*UIA`U_>#)yGFpBxK%P71d33+9(pJ*i&=iej#qn?4gMq3`#Zl z&2UtCq((P3G%R>%YppqIx}E5fgAIsa|I2Uw4)@#i>B1+2y!x~1(Ke%T`qogd-Y?~tJvYVT-0~E z8we|bn5w884x-gx6k6`r6z&k{NOIButWoacwky+3|OT%&J5 zTF_c+OV-d_!-k<;EMhM{TcOuZd&}=$?O`GwSP>Ql96y zCGL13bS#m4J3fojs837s`{|7^A}rh@C&naQGZD-;l0)B3T5#VPLTm-k@C&51;tZEC(1%`O z6R#@Pw%2vYPm{R)o0zX4{ZvD2pEbu%HU(mQdlF~Z5N_KjVeo#@badLcL zsL^j1L^r4Ty~N8=xu>py-29L=na6PnbSnv=S}0*%ce?tT=BbXNIEXK#RbDGa ze^v`mpGI*kb-&Z{r#{^2*Kf*AZr;Yu=N!`eL6^f2>|7e23^oXGtOrh6E10*w=GM_X zO}bqQ9^U#Ii#4`eo>g>((HB#6Kvk^qHeDT@KDNM^{@$q4ac$O)y@*)%pDDq2!q>1` z)^2ky~d4f zj8;aFD-wzla?cDXO%F^BE2W&Bs$`!A22?x$VBc(l^SVF^UAB>sk_}zX$@%3)$G7?; zhq)<-xrc*_2WzKBr!BEQVaC+3$)@@2JU@)xBH!7{VScny>T@}}yMv6XIpy5jwTvFT z`@VFoIbifx1@~$77)fqY=GHnB=`V_*j2R2(oRro4w6T&-m93aq8-wnOT?Cbs*Y&Et z6I-o`EYZUqtJ8zsrM!$%&{MTa*y+6SuU3H|TC&8IH$Obh_h3!+mR3V`)1|ifJTc0D zeSCRiltV{#|GrdeR3!Rwa;wz1JYT+)VuLdRFhof@1mcVi3XECZR*OwAb7t&)Puuu% zik8xb;{Q3<7R*%%mOqos<7kTWT4j`pcN`C%E99%q!2`Z}FYD6S;3+19b^A6X!*TN_ z!remAbk%peZORq6KE55Tf>!_hAEl$H@pO7@a?HWw>%4vUN81bh%}EEbs{1BpFzz2g zMoAq|@m+~pZ6#q7>TNk;XQPIS+s6_?)@xp_hTIxT@nN+m_iR8uf~IG${NcT!mV3s> zlRPL_Pwz4(8-vvR;8!@c)s=<5QaaDn3OCCTt>t)Vg<-3G9V6XwPk; z5_f>IAP7GzkH*K1+@*IrW$n5>3i^ry)kuGR{rtF6<=Qy2XjQw1y2#@L^()M@WdpVL z@c4;6mC3zV)r|+&J!$#T-j&ioFUccsuTmem{_}7F>{5QM-7x<(TlH5(*g61XLP`ZL zDgdh(*>Ojp<#k`T0B24+Zi$K6`Bx4~!h$ERXn-GAQMb~&Ok(b1Mv#K`sSg>z_wD{- zBV)`b{@Qen*GPPXv8VW{j4;=V)76?+hlze8@CtFf`3(E6O3q!VlPtC0`k9rds^EuO zv5cY%ZBD-HK&BRV^OEecg8R!|oUm0Z!$vGR6IkhG*^h>T+vAVquA5yC(GW(_ta7&+<>t=>7neG3KBaYqj0g8<#-EvC@CRJeeK{~D z`tkB~rcQqVn;9nRVq)LH|2%l$W-_m*MFIf;Cv+S zmZ{1Cdq_~$4luA*h9^zcvU#+`k71|5ErrzLht+G0y)W7fp+0_4 zT>DUst9|LNsPrX#O+MKamGvH+|MJ96{cW`8YwaKMd+!T^b6mM8r2_>a$x<$?0M(de z5K<8ml?TPV@Xhb!Bg-{d&CuUDjaQuWhP<-_ZwYHA2g67YUtoX3?C#%b>d-V@RH98f zkK=8UDi9VWm~~x$Eie(N`r^ppW)dytfy^T%!Wn4hOJzc28l8b;4R*D7P-E{Jbb1dl zPuZ9F>$K2I#7MBVu>XMp3)*W?7mo!xjb*2eGWd1W-uv04G!+&@Y<}c)WEslRI&}w^ zj1d#Z9|@XW9N-Y{gM8?ti=HVt%pn`SB4YBN>LQid z;Tpcv?!DqDH?%~=O>EWwNCfZ6MPFKc1I2h?fK(Ysi4Z}3D>c-%ZV*7~ gCZXhkzR$KGGQXVzeB@{CqGxHpa$g03g@DEYSX; zVnFz(tF;5yKbm-no$Rf-{^r7EZD0j-;Bo|T{U<4||3q{BZRj5oS4%T%3tnPVM@L&O zdU_WZ7djVaIvaZvdPYu8PWr!FiT`QJ2=H&5t&_dw-zXyhJZH|e7frb7b_y4kFVsB(*`EUGx4B!uzncjrn$iUHn z*4Yf`LPAXVPe1;L!F$V%1>6w`rS&cb3X^q(!nAsRvXblWGIarLDXxW)rI2ak2 zX&ITASPfVWdFcPk&_4_V?16uW7VRI_Kt3i0MrK+D4q8SIWkx10W_B)Cj(_(1e{noU z04_@dYZE5}6CfYZnpQ=LhyFiB|IiIIGIRVBSF`{(fF;m@kMW{4eSj} z>rTb=!E{Yxe$OFi#(()YvVtx@OtE`n1=i1f<&j7aZ#Y*cmY;P~)qIOJV-f_vZ25ds?cp?;$xCuuSR#?Z z8L-x6Q>W!+CB)g#ezEfC!zG3C%c#4L0pVanUAmh1``5Vx;hT6SjF24&& zi;F&2xAZ>ycaNlJ=T#~k)5PDSOH z)(|m)nVe>5f*<)l8<3vFWMF*77?nm9Y3OFb)jmE%c%d3O766SnF_A7EaNd=-t@NCn zeG`1g1YmXC0Uy}H6{++w8pYJ6uh34DVpwB*IfMUhClal}uMi9mU+gu%{mAzfM9DM# z`Fnj(33k%XDDw_1HAQu%BB&6TiCRX#h9HSPqc3Qcc*im1gLiFFvrmLe{ejRkhGiE4 z;m7-6o#W%bK`mhEngH_qams$p4h9FEgKia~(TbEj%7_#nI5B`&baOs(JTFAa;B@Ad zDI+7M!!jY{SXvMP4dLu>Qc9n;5B|XTPcn(gS*3p0M1WQ;Eyap5F9GHHKmq$lh<4M3 z%!fY{NJpmM`IvGL?Y!PS2w2etY?K*Zeiff<*j^ZD<`$@>oPW~1U1Iw1=S~3y71K9# zJ&7}NIXQ{Ug4m+mRhR^#)QOPc(4LO4QuegzA3NZr(G^-aVzGt0@SEP5Sk7=7GK3_K zZi`(mWu%(#nMeKE;C=2x{C(;2k}TD)=;QRGiuNd7H!GmAO2mk{dR9O+%apU$kb`D) z;?k7M3~i<+p43SHm%5Gzj?C$1c_`wH?eylLB=C%qct~@bs#oC(Zly4oRc$kXNn2-* zQ{gaCDM=Z72Ko2j{1sgLu#L@oEN1Pg-zS`h5@Dq65*TDK$dznMmNU~!FC;1!5U-Ep zj>whuJe6lz(4_jR>l?B#_)yyy#IyAWAZVG2MR<+dNjkJ&x2Iz41;dG-z+uW{-in12 z*{w%(w@p3(`f|-+<^($~&>O}P1-}ze4Vmw0^Yu>R=K?6&M|Qsqq7*HcJ*#lOR7^_K zXH{6WMDn>bs^aLT05Ig8$8d*PtY*y>R zgLumNb57nS*)lIOG+*eg@K|91U5Y&|sn>kRMy4r?-(f!dY_ z?3gZsH1gRuKs;5;Pc_;^Ht4+ zgXPuJXZtPyy5;@68}NEXAJAfDqxbf*E4aP-8oiUY*=;4=+H(2$m_^mHp!NDP_d1{Q zG<4ge0ox;scxv8Nl zWd3Aq_)U*?uG{lk|Lk?{UH0hZ#r^2zI(jdft79sM|8lx!$Md#d!|3TchM&Wcp93hc2_G1k{ei{1em=5`gNWxr~9wZy?E3; zJqQr*TquJ1e=R2va9?hVzf5&B9MiNWh`#oj0HhXNCQth2zR8_laz~>gpy?rDBnEdp z9?v91KUMO2@jhN#EZwzL@NVY3x^C6J?1XbCG>QfsIdfkPu=Vr-u<<>$q3HL5x}u*r zJ(qEe*xp-QOg27J0CT#8ep*xx|qOH#4 zD$h=%d&T^gbOT@qh6nPI2GKyV}ZFmuaE!QJ3`h$hKMR zO2fe-_B{*)hz9iUNIy2U?6J&bdFoVh@*w@vPqk#U<9x|}T$a-ch`2@gXpW-!5}JJ` z0SNLy)cxK~aS^!$-Glk{a}6KctDAS*Yuw|x#@{M!%!pS;RPtf zyd*C>W0eg({@Y+G*QVU6@NNWT7Pls=)i1twme(`YrVyhBnng;!PTpNM8X9e-%Z#I2 ziLc`gz;T2)P6dq zR#=WE-LcU5M>Jr~`kst^ zGFG9Xncvyj8e%#O^z0#&`dP)Q8SyFzwqX;Uj{BR}3+D75@Zar?-TCyNAbYxgO>Qd4d61U_b+?x(ENU(4 zQ#Uk=Cnnm_N*=wjbCD$9z?&i#s|jz%f-OdpPbjs3As;rYtlg zwJ{4S2ajhB9R)v23shYqzmb* zUZwEgW&Uir0_`3gfxvY2TyqHS=BRHx#Bcl!@uU41I_A@)_xwjc!)uYLnZCPHEB2Z# zJI&nT8hX#}Vg#gbz_E!0HVtfawY>dKEi9{ZUL(<~HXqsDqv5la*A)Ny+o6D{ z+n=@GrMgB%Zb?qNx|wn;o`2S@bbNRKz8-6$z@AqfCd6|e10Hv`Gx4&#`OdSwU8lGr z`Eu|&4Q(PN=xxO_IL)?dAz#n*qTzBbnMaXDsoyaWA94@Go$(29+wLU9v|^9 z`QH_Im))M}C$*De9Q?S<^Vtq}slk>;yuQ~ICB!_PN$Bh4xBkw9Fz8c&y}cP}BOPY3 z-b=U#30f(5Kj!i|O7TVwe$i;na&u-#vsJ^{?8&^PM)i>_;ppJzXUXn0s)3;ipQ0UK zTHKr2MBq+sFAh?EP~c^=8L;tbfm~l0cH3$lz)k-GYar%gYdYp)s7XGr^s)y@&kZo? z1DSU$*JBlB*8=kdbn zK48Zkcj8YTKBeZ&xTP$HS{PVu-qb?s>hzU#8pc zRnwv)Xz^S6=}`I__3Ap+woFyma0gjq$bisR0=TJ=bB38LuKQjLEDK*uBM+<(UI}tG zK_MBJLGC7el}c91Y7&Yt?ouoc2o?Y|!NapJ(K|@T!KL@a!f7qF)tcP?iI$Dg3j%RO zygCy)AZm-xkz6TORl69>7lPB#(x$LRK2J1J2LFIpeqlyspnfjWq^loNzyZB?)Dr zP2_U1*use^;*v$OdK+@7y7mZL;RmP^-x~A!br>!g_i6^|anKR6wcFOL z)$J9h(U%vnwj2tg#9@s~a{)!u>zj4OsEu`@Yri&xhs4aht>Iq5J=ih4VdehBnjK;h zDPBN(|72^rnaVI{x{M|tq4ow-ifrx60aGnT7Ki)9a!YGhY+EI3VCF|i>3(&^T};UK z3;LIuz&Kg-_{QEswI+FQ&i*xi@gLeGgpl)a%YjE= z);V%P2QWlytc1q+L~Oo#S_11xGNzr-&$C|yHWWsZE%AG|3O!5^n7F}|uEs?aBr~z= zf5wKrZWY7%an{DL=91c-vfFAwwt@%y^Nxfu2!jhEJfUfnZtwNdfm4QoyoTy=hfbMn zzc5}ofaW5=fvm9SIf=*uNK#)m&oAE@nH(V~_Ot9xxU&5*?au~2zg)Y310b_yGab(! zS_b|68tg@h1N|xNBX@E9gX-d{4_Y19_UgCoG>mS$jIH?UcQh|Q80pG!DINTBw?3j- z7DY}n(6uGNX3!~j>1Sa!3S*y98%?3@KgLAAgp+2Zv4=_JN<$dlPQ;85SrXhcSP#TlsIq6H0HptLio2T5nnSQf>SwrpbS}(Shx-R5&z23gV^K5(FpV_0B z%I5KTJ9|zz;^!Iv>RC?GpB^o^dpp@}U=`pv+(S2iH`iryjKEefIBAYx^u~=NC2f5{ z&C;~6DvC>dg!=-kLvC)?d9M;VEOW!_r*GqB~XokFLUxPW(nkqG(-oYIp&0) z00vV_`a<4{b3;u;+M$Uv_v&R_S z`##x++Aet7Pn-Mrx?m^fT1i9cTY>C{Kjfo60|-deoZE=)rzZrcpYyU_@!m?lbQ})$XVw?fqPfj=J_+QDhE~tnaz`- z?^Rgytv&0i*7&#I5b-R)C{r2&^f|uHTc*%comd-n^a+Sa8X!4*;7Xn@YYiUSe8+gY z-#H803Ea#uWSC9b0=4!$fxM6;tL(VA_v78UAk+S>*|FKh^OKvXvMdhY94Y;mA=CIs zV`39Bd~l*Or|+7;7!2rn!W%V;#=O2ha|2g!hCWy!!qn{kgB&R~_Ze)3QUbdk?{v z;7~9dGo!>0F)X4tq!lWJ zbFBrl5PQpxDf6=gHJ&D4v< z6U|PVO*+Bs1GZd^(`0|OmBSX+i3fDM0+vA|K3PCZsmfp~V{Lbi?HW-uV1G`oWGlTf z{0Z@IPWg!7981GruQCOPkxwS)$jW&eFN!4>;+SR#21I5|u~+C*&K>NU@Ex7}9%i0q zFvL=!J?O29NkS1`_Uyn?-f z^xQh+~kZnb#jEBB3eA7~j|lp=XQ zu6<^v7?uMPG?A&{M1&Y*_(H^B9SV^!#yxy*F4*OYoA&kmnjw5co1S*X*J$L9n!D4> zQ$6`X_M${{_H|hj_GGrtyYwQjC=MQq2f2zt?se#0=bOID`J)Lk{5VDNep6 zKbaDg=BG+bQRG2rdXCdn`XK&ZZ?}XIj`Y?wY$MH={1d{|U5O}k72lfLI)C5xg@082 zt3FNBE+MN@fCz;S>L?}HH`O>gfx?y21+Hude%teNdRuMt$*=_pd{XOPneEMwl^$HX zaSbNwVBqfI7e0{#WyL%lM@ z+Kc77tjy_}kG|7C^+l-AFZ}G_BPtvQeMli~6?`aCR;Bnyvm@_m6|@}kbjWa+E==9E zL+M1&kP06mF3n)sE{E{t&$%zb@(9QyJN6UqQTZ>7VBX6Z{oGIiXdx_zRkRpNMsWFH zFxkJU%3?U9R53lU(z@IYZqp?S8keC36Q{8EvG|4x0=nL3dS~s;8z6$YzmB`uhvtH1|C&d;BQ=jtFm zyenPWrdfDxHKK^VX)iy{T}@$394^6ON4_QL9o(y3w7<_&T7i1IhI-|yIl2~e;Vo;} z{8rpW^UHGPG4-3R-cQdCKg#UW>(Jtm;#<#fN=EOV{YtNLL>!f{={8kEm92d25*;n) zJgBE-`8ZP`u61_S=y5&%b2w)BGA3}CBkFrkkE45uhh|B~fs5pLR5`GAVP3c5_VtuRjUN*MA-l#oRE`YW{kZHCxV!CC4dlhX(&h3$ za-XBUQkc1ZfVK2eUG<|u6%f9^rQ2E4`q!i5#gQ}9GZ){J)9``tSl)@mH}qgC4M)fY zbPFy7n-vX&=Z8@VCNX#>DK^NY7Iz?t0I`-zRfjvgd(urhJot;B76K)JFr{9=xzqb{ zg))1gPR>)q2I;R^sw){{`qKN0YuT9x8m?;cWGZ zKw`!H&uKPcY&jEi3_pDvbH=ps z4Y_idzKl<=3R7g#GT=9tseM5+zq$CNCar-IVYKs)1dayP(-n@1{0yf)7SW_U%*j?z zTyRtz?q{Q_D#ZeF?F0;k~dNe5@|ZsS4t+p=Eu~C5miA97}93E^&QgL0NR^;S4e znE}RfUNR09uJMq()z{x80_4A< zRcYZNzY2@D@&x?S^!HUKl`ugS(|>AgXmsu9C-7A6tfTNEjeiel7Zp5xB&EnxFAA}v zXb}nACUph|4%S#SQADYYG%bn@Sf6~4@hD)MgZW}b440|3UmE0x*4xWY3ukGdZ#88F z3#x^=+}Dc^kzBq}!MHEw@Leid+p<{;OT{^pyN8Dl==$RlFS6hpcH(bhxCFK|tGi*i z#aS2#&(~ftE^#=@az&f`=lF?qm>ayip_ZOC5(mdonXQJtNO0r~l`r_%KM@}x7wrbT zmRbuEG;#oFBzn{z(@5Fxi_`vl21``B&I2}|mdLbB;(ajuKdcZPRa)T*`7l@#e% zR5TFJ*|$g;b@w2Y`vL?L5AimLXiK53zHvl()FXbB+l&_CAEYbtAV1U5PS&)#1_v&`SF38ly5^ahfUHM3I5+8#ID423<8U>M z{yXu2MihcA4cbaoLG*!bfCqI_ncOuDY8cu@*t1fg8}$RnA&Z?UBu1!b%QPgqeWz8U zXgN+(%u@{)v#}_;l|xf`GFO&*l|^0rq)O5rAp>-uFEcY6@6-O}EBWNJ7Hk zi#Q*%rOGaG_vP$tIcffC(yK+N`CZfL`kzJj-ybdLGwJcw*xvRn5+Eu){49;!HaZVqb^ zpDHx?&=4G*bMalide-JJ)7m9=;4aZw7k!k?2@YXiaR9WvV+E&}UI)cnUwL@Q5uM_K zy?TnyP9s(qF-}g@R#c$RcUJLpa`fI_hxg`ZzZ|V&LScm3zo1may@68{!8RYGU*amtJX_%a!Ps;Z0_t7^@1@QL4DonSs<#?#uCq!^4T!hM#@r`e4z3FRxNqM*t)><=6 zj6PyV9j@u(izNs}g&~CnLx1Dp7M9l%RoVLjUAk&#e!G*$8>KfBn}uN-WPYXDuY*C) zr_sFtf3Z8E#J5nb^_-qr>WwRD1kJ_bOQ0neQf_8~j&|_qHV@OM!_86&GK@-EwUm+b zNV`*XIbY4!!2~&FUCd9t$KhpS8B!s^ZwuA+pmEXZSq1G$YwQYN#dgvtw_;^m4dTQO ztp2R!lgv@JPb68TmIgPg=%$L_6RH z_ajCwkbk3V1V27JX~+XaF(?soLj|kv4(kdSPGMjQm0#+ptM-%VnfEKwm6{2PX&&B; z38|Qhc$ksIBUBT^O=?XF;79m54x%L{RTX_ficWp9&}u(v9y_`DnyBbySu{o6wju^6 z>Wv%hL(oyZXB}2wlkw`4voX7&QT-d@XYDM;xgs61_n8hH5VYbSw#X2PMB)0W|Hwh)3V+U~`wYp{FyrX`Q6Ovim5~Qn4%g(33;C zvjCN}`*nZ_fT#D2!5C5BlWF01z5B3}Lp%ahqT{4Zlqsg;;{}tNSGtXKSS!rs z(^zTSr!_d>Ln(EoEdm}8rX;qz`HAU!^>sT+m{2A#VNEV=bQdZe9%K>wc|Jc1PJ9)! zr(`Qs!H9%8=f82~4OUR)cuUp;i4Io`ew#3B?Mc?9Dm^|-cN7&U(W*mpGyKuy`m%-`ZBjjoVvE1LydCrp?>!!?)ZAkNL)#oJ zxyR(urz}-VO$;JX_+B-qbhyOhSbog9RUya<^W5!ByG8?lZW_3;T$J_$58ClqPfw7oXDyaSB@E};opUvZ!>q0(xkaV@b zG22jQ6pT#e8!OX)UtsWB_14Z))iLixS6HGwPKiA}9DMyHU7?E9K_%#KLVPEue3*$! zx{MO;Aw-#<8Z4Foom9!hM2CiJ7sFcsGFg<6=x#1+k!vr z-`g$Vd@nhx#O&c5Yz`4)8NQL$SFU1ku$(=z0d@b4(01N@CF5&O!M?8nl;->q#65ULn@KYAMXZg5t1`*`@gVCQF z>|IVpeR^Kuo0A2*XorR>vAi%5v;sa$IpM5SVH5B*&euz-Y@_FVS9YdwSLZ+c>O@~m z;|jHm>eV)tO8I);@iq#j>r?!+8^{WAsy3x66?jjMlgCJgDAJqpL&p;nRC|KMD$L1$ zPirheJN^DxFbB^dZZaxXtYPtLmj>#iPHq~yTZ2D6X?`v01*HXvwD=C6*gpyGQ|+X(mMlK8hs>zWpCjIgvdU|KQYSoZN*(P8tcwzw52IQov8OKAZ1$^#z)!<`c z_PBK_7A)G{QP%m02%AxMc#R%v*n?N5Bm-v#%m?Q)NN)xuyr?g%NI`!jeQ4Uz3m++= z4o%~tqmJ9JS>mIjQYtk(NqE4mThYl)AdPkz{jk|SV*eYiK z0I@jh)NUh<>Z`PtS863-Dk8O5$W+k^UF>Qln(~5;k;abNbE#CTyBVN?xNDjwtPYWp z8h<~~A{NxP6wb{8&q5~Um|=h3G8HPdgw4g8jw%k>RzI=KndzlT-p)r}E(vP|^*XP9 z)R`|4p@y!p1#S)F;brn7iIGw2N+yD4FIt?#uz{BB{Dbrw z<5|71MksMB{P%a8u+Dj0E%XnRT{K}RpL;_*);Zt|*|ejiyEX{fZSrxctkkk&Az(yh z0cHeNv(fSVo|CnbKP$^@EnGM+(JEyoN_nY9)nkprXrcJ#*Y0qZtTM_w_^k_1OAf{P z_3Y(<=kl9Qc^}hFid-A6jS0OCcLaUv7_PJ3dY68O6W@Db!l2QTN4i>`dVXLGF}Ytu zf4y8@thlKAKJ1r1$yM^fX%}@2{KQMBcN)HE3QEsHm8%WJ6%o|~%VyJf>EaH5#R7GZ zngPRdi*&)HLB%HG-}kpHBhv*e8u*EA+@rLDOkV*TIhIF4Z_zfyTgH9e8BZj=rbFya}saNhVxxE~0&VsF^sBSDCx zeb!h;YQ3P??m$fSMKHnGpq;yP5X@)2dA1G}rNDEg3@Usw_&3>@B8mobaXgW%pCT7w zQO<)tIsS3Mo__8S2foyv^8?2 ztYiDB9_7bu2^?-8;&zkgZ7>G(*{@zOw`RJOS*y}?HnnHmpIFQCayaMkY~BrEkCs!~ zD>^~DEhj?tRU(BDfgIIdR5k8O`Tdv{hoQZ+dwoFM!j%wY2iw|tR1d+?%M~DFQ z%TekQ>36TVH5ItQmr5%}_UQyhd=V2cGIbY0Hu8Y@wFDExDkC@h8xdW7(8wk6HgeF)S={6d{4e)pD6ecS~pCUkKH;0 zvaV52mD6EXy4?|6l2p7|$(b4B5scd)ijIhuj*|X#J4dA#EcWiMt-eO4*KrA{wE1>_TZ3LY}JN?H?>4Iz{r5mWiP4E|>1~k}}&NO|p zuEV>42L6_-p^TSvlYfPbL6XT=Ql_|N>bU8d0o=*vA4p&A{c*JW3ehD_W)*j&zh~YZ zt(u?Q@aB%2nZ?w(4iy*jsyav%^F|-4Q~zH71{4aP6N=H}N(h@G7jxDLbw{VPgpn#F zCAV*?ayw(RIw^W6Qia_@O1q|%77Y#@*i%LPV5EuBSnm<^TB;iqgt}9)gNif7PUZhq ztvVXZj?mbse(+(KL|=X4aKmfECM$uh+341^OiIx9KrBWzOv6z`yoY+&_I{2!oQ3&; zK$5l1`Iy;z-mjE+Ek&Nx3B9|LFYf928iG@tJX9Iis+y>p;z>Wa^o<6n-;k;er^hJn zu3z>MZ&o2a58$@KET$OdQ$-_pRxf=_84Q0C8BZx=rH5^hh?pGCW9%i4+jwxHG;wlFog<2Rmg0j%Ou(XA?@G==ePPi(x7XWyrdz8PXTk+jJ# zodXJWDqBO|phJr*<#3WJtn$=|j_)ul=5|7PtI$Hk-H2 zwdnEBU}_iOK~Iz;ZqaU*b&sOMCPIwtu}=exygL1)C$ioFW--ZT(+v|J-q$1bUAB<; zvt%rupd^?pkCx>h2&h+wktWjTw`wb9(C56!O1&cGA;0c$xWP0Qj&5+$7lN1vq48$Z zQ|1f$=KB!Yi`a7=GTmvY# zlr_2%0QZpzm~XyGSaydcLJ8x)V$j@^vA6!bbG#8ldgOk4Q4!&tdMQh?&CLdK^mZY4 zsWKI?uP~3zZTU3iTUgJiZ1V@pp7G&uEru5Qf%+cwN}hu+OY(UUhk?NnP>9o$Y*D$}iRD*2 zL&Xdt)e59)m$R=I1&Vat!yQYs7T}As7du7nlwk_1X$x^exOu+l^^ENaSCIAKg=~!} zsZmSR3kJh#n<*2t8PIu@O~)%6)5w(|T`9>z+-_5jOPbQXR_1#G+gR)>R3um&8b$dW z0oI!zhYk2W_UrP@WCZX94nH`X2LEiZT|@s}zp_~{JgOyUOqdULm5ub;YIlPIG>N?aKZW3Uznp{JxE% z9FNvKFo!lHslawI5AX#mcb;Ky3r}qc~aDfNtul{=nJ}IZ$WlLB$0-0fg|fY=R-=h`TZif&0%E z6{H|-8gk>8VuQ5our#`4>(g(#knUxx;{~##?9if3O-d%y7&dSo`qwLK^{=Vb5iDQs zIK(j3-DU#?r$CE}@;~{E+@}a7#l#6-=4=Ho996QSOK1RY!D~@R&?GuIVO>I9s@i$M zi6hfW#ZG%vbKex`;+dt&fp=lsM=MdAYiKyMWZp=RO(9KcbB3?WMz267WLv{q1K`rsyC#S{!~w{p>@3S+V>1@Ks854OXG9*&drFPSka+AAzxjLy4uv=i<7}o`Sl!*ga-|^(sZNm<-t`~ zjKQ$>sJ)^L!|UYWWvN(Qor+j>L^ld{c?bAm{7!dX-_NkG`u7O3gNF9sy?|S^`b8Jog9I~VUoI>TapdJ0>qM<$h=D3d3M%xUimQAVJaBG+WBrUSd8&mWO)Yx7f)U#JaCC z>yC=U+dM+5FM(C&{Y7|E@%%DG@{Oy?03PMwXtAnj9aY%t5ovXzq*sD6AAv%N2nH6Y z9JUU(L}_V5Axfm8jMHSF+vL`r%ZkvyVno>%xd({2I4tO>+i8&c3K#y`!m^V+9oU*+ zvnL^Ztdhakqb)l@dp|;iqsxiPlpX41t!U)5A;POE0B>E6DX6Wpp-Fy|Up5)5sXbL! zsR?Z)GrFBy?f}IdEv7#IrN$|GBG{ETn>@N+nLNx8o;P|>r4&2Q$|B=SL;L&O&7^{- zo_QC6jFNES3i-a_u)kV)wB3MrZGIdG1!IcX7{a%e@wHWdV3~9u4w|NSr0_5?K~knQ z1z5|peK7Z+ZXyb@QrGx^V(@t&d*ggaHl}q9M(G8`5?&WwVYC^ApGlL`WZpYt2;vHV znXdCZD_|?BURY_V@jY)9UK^%~BL(5W63vJYLH&cuhjmOfsj1EIbdJEswVY|pv7nrG zaB#79hgH#>wnBPr-MEh(R`1tv$0(&bTIy_#G20+_2-xY zjUzER_t;(vm^~A7CO#!_mHSK?2>#7%BOcyhsk{pLv3OmixhR~;jVrtqZLS=PPCCFG zI@DPcop^p@yH81of$!pyQc&-ATP)*s)9Nfl5pVz;K1E}nL)%zJ>Q|R~iHv3F2_$`V zdrk@jT5Zgn#)V;P=#=&6+01*BL|?*$t@(0;a4QH8CrOon$Fo%N?#+)qN?;se-$H!ZkQUmoOTv zPaok_DDz&`cRH$j52{!-9zX6d2P&}X3vr)p~|MF z>gYqlt>4buIwvWG^H5h~9KVRJCDPs-45Elo2iC|z`E*eUwdQ}JLZ#kvM+x7mx-W#; z@iC0O#ycCtz%?Y$ErJ1D;SZO#`M%%efGtBr@89n_R5*? zJ8FCDcq;d;Om8r;TK7uWryZ88^H~ zx#o+cFQ=o2mP$5Tsz@RXwFyj-={)R#CyGV;W}%!SRC8~^FW9o-3bOB z_CapBlZkY6WA2tAwf&OLel|QyIyK`KQP^ke>v0%)7{wULx40qTxW&G>G8i$ySQLi8 zG2Q`%FbkwrdA7dP=({Ie(P%&~&Fo&J$ca zS7D2&A_KNOnUpl82taM#zF&E@_II2SL}D9rGJzF0(NYr?y*G|^KZM^U?IoFZz)s#o z?CCB(?;BME`>BWhE|FwUuUnY-UNLVWsW6&OahXA#$7B*o4C_?Hdh ztMChaO(TgLq3Z0YZqlp5PdJp6HuBf$a(q?ObGc(oN+QMXeE-_gg7Xt#qgf7gi zlmU&{R$A@ctrFg4tKH?YUMK$LDh@_}wg!p@HK&<-I#qV4F-OTbE|7GinOW&S9&eUf zu`G}q1a&U|8jl+O0iVgH60S|x?C=YdtS*&Xr0yUrJwj-$5au&X4`o=`m7yOCdqEy& zA-5N_9P|4x-z&5f3NmlWfq07$qkBf^!f7T;6*@%(i6KetzpG)I+M4ZUcRp1h!(Y{K zlf-12f;vR6%Ztl)6G1lL+WYnM9s$AolfWCCg^3?no7GP-jX!lR--wkpip(Xi#|sS% z_C(OTAv_s5+ap@~qUMfa4ioS9oS=gR?73W%w0CgQ8`0klE{JklF7&fr`?m+`l59;C z3w~2da31O6OHs`2<{nXbbblB$k)vTs{XJ zi^5{AC6EMa^A+Xh=9~|q8aeQlvn}b_LG2oXIUmcm*Yaj)}` z)juYz%31o)cH<{b?>clBcSnqw4MfA@Cv>2O$eq3WaM6|?kQ;VpC8`z=oL-TZ4CU$(wsQ%nO>#JX<=nHcsyF>O1H6i?8ob<{hK-)nMxW81K|`KRQ(z!u8?v9yRSORos*IP zEZZuQ;@+8!qJ$Tl>MAzd48E12zhWLNuazES6X|eqWXQOI4xcSM6i>_sWSM44g5Gcz zJ(24EutBL+qfh`zV=xvg;?z&YPLBk-gKcIRI%9v%>S8Q2f|rkB{m*wv-JFc4&0i+% zuUi0ZEtIyeQEOZA-O^fPjSXZfJdfY&Gqj+{Q;uIUK$ZB~l}KmifZPaSkfw3OROkl5t|w1uKUHc~QrF z<^LG-`;J|$3zTYyJgSi`7!2l4C^NHTZxV`PJMs?@FAYZ8N|qvtj?+%h{Bn^GpBV^; zgNR01rxWUwE`&Vt>_RD`Riroi(qxN*wJNZ zA*Gx@64R7KQ|C$BIvH($;K=`<_TDl)j%CRf63LUht>n z?@d!>#NJNon!ME|!itNg@wg%bK{se0VWNBC#H5X z@iLtcqYvta?KIAPI9xFoMyOlckMw2cs*SfTjkYzw5=`pt>39yt#;B#ouU~{rx;-O^ zucAy0N*n59~;v({5#thHYFd;?;P-3(slA2lN-Lj`p!9L-vqg0@ebd012AQo)H)MX|j zL#E<8dp)-&Ep#&J4;_u0)7mp?QjutfPh}C1xyR-?>kn&x{T3sC&~jna^}!HcgKWDq zo^cL)i4(LSy&+Vc;yaFjbrvd-Oou$P9vqluLlDA22Z61Hxryj` z!O}kD!D54RRR5bl#NP{jU)pxnzyVaVs*Jwi8K56LxarKDjWEeUFmYLRGeCl*u51QX&Is z5bu}}*V=2}5U0(KA8BXAS)_I+yY}0ppw%G}9f4eh$*S>R4$!zhUhxA6;q((!5Ng{F zY~AIGF6@(@_N)lrtvCa2CYW*zQ`#mr@GIBj(ztdCj82u&<;2W)iRf-| zq;#^rl`(c7FRd|4{e(+qG(QA?PAC*HUPrx3PNhOxmw%XQSXCMm?J>`EZ<=bbnQ}sB zlv8=JWQ9%yVKCO9TNxE1)XCrjQd%NPCvvJf*jRhBRd*u}1Oj^?M-bPdcN(k&YO~Y}(mi8L51BE0xc?Fc^`eRZ zR7lYmhfX84q=D}IchJ-qLU6YiC{vrEC55b+IjBi<{+ByzKA=lk+Mo>!$a&lqnVUC7 zjqwYB%OQk!`CQxs5-pY zjTJ{sK@EE7QLlolE@bR)zTHte%Jdb_BpdCA>4@-9&^Gy)j4BO=5{sLCaizQanVNov zV|gsicYy?{6n6-cM2FB`yIDamzG~@uCE@v15)NoPYoe7EX=fQLo65!-#!Ai+mAoUA z&w)WF5=oYjMjBGOuU~?iP4uQ6`q&)$=Fv|c`dPpjpqAk?7InPw!!Yh9x97dQib%ll!5;wTii zQd4Fok)cuni;R5rGZnkc2eX7&R$wUZamZC>Q_NP_{4q=$=jW=D1^>r;;TLM1qQ&>d zUY3nW<1>JYhVXMsm>i96uNaVlbX?^X-s&U7aj%ZhB5N*7@%{Nq`6m3vhP!FB`PoU?!RogD?E4UudslOZ5-% zHX3JlP3A()SuQM0U+!q&-V+(v^c!p11of}LhE?MYtq5Yr6%FWkKiCa=cSp=m@24aHy7yWx5H%8u)I}XkLzLc)8`! zZo(|Bj6qjBTPb0wOitIj6_J`X5fcL|$)Jk(Nhyox5@JD+?R9lCr75%o<+Lb6O!xDa zZ{=m3M6VR)2Q5z}sqL?+exkCGVJmR2wc7@D@DEK%3X(|*{oD~rl~jQ8v`l}gB$DFL zAS<$@Iz+4BlU-SwNZu(nzR^l(7TrMkmkJYBA9Rw)Q6KVV{AbioXA9EaOwJ}Jujq>4rV%%539^We(@%lFnH)AXcFVc4UQ!I+ z1Z%1Wn$KTqfSNeIOLgR56Fi169Z(n)dQM8Io|BY32y`BhGxmm!OJ3XqrPW3q@NS~*DbJ=nc^P7&%!2yfi5(iy(6r{=x#kUChp7_i~3Qs5f-afs6iYl&i@*WyV_*oaje~ zr^bL+VqaD>01CSQESWL?>i3QY;|CL)Or^Nzdv$L*tPb&*r0?^Djd-2k@x19C>ou~! z>12OH!FDoGcQEPD)fm)4F~l@2R$=`XR`F_T6D`7-HdS`&&ZyFJ&4MQ48ur9ID@~5$ z_VXA}0r5@-@?AJb!-5hA^6fxDI zmoaYZV1*gMC<@Gifup*XZ!5@1pPY)tt4J4BUr^)Zj>?C5Q+E(~n0br5oIk^l0;2<6 zE*Zag+_oIvr0?^Y;{nv=bwJ?7`}&bIrDHm5dM3R=1vEGf3a&n{?GvXf<1#A3HXc2# zfvLMfCuVW+#mD;ffJR)h9lEX_#~f3%KA<^(TWHf7yZQ7O zp9srQt)&5TqYOCfN`L>N+0UNh+D~Awt0Wou>^Z9f+eWfNlmyg?1!RvOoE)*w!A5!- z^QYMY=$y#eY+NI$!CqvI8c@QNt%)~me2-qUbPXW;Q3yBQ!o=Sv32M%uzNhCtAjSiy zaM0qw0$YlM^3`kk_=CTOHt%am9LLolQDLeK{334~bdp|v+MBdzDS@W9?hbU{UBo(D z-X;rJOpxmZ`DNtyzz}2UOXe^d&brKOee*4)edtc$UcaU*l5ZSeIK#ssvkmjeQoL0@ z7d&tP7i1`-|JU;%y8e+S~|LSR=@zQ&woc{^$8O;78hgh&} z2Q%-tuAdVvd)#QNz;%ERB9?jX#AexGC5!mDQN>qFh~x+%o90*3+jC3B=NU+cm}758 zZghYNxb{voQ<^Q@lDWF~^4~_3$d=-62h(Z-^xPbupRw3j7?Y`3`aNrC$iWb51;F`P ztw-jkNq)4d(Sq;qkXS&|X{{|G&Rb}ohLkmav9qQ+MjU2jXZD~#sGI4)nZ4ZM67xJA z+wNl5I@l_>MZ|yYihRk@nL35~f#6ZAO2D&8Ry;T5Pe@&2TJ6ABd4D?W-^zN-%3Cz} zU2lt2%Z^wXZbf3@q5rD8S{u3Tb=a6msYw;R%ryGM%V zU|ZZrP4Q$>oo-Z1X$n-Dh2E>bdBYHoGqa?Uw?SKPFrZQ?C5WLg(w;gQKykS8HOq#` zAW_Wj`n5f0;&UfZLFb4aUfm(Pfj#V7_kIGA$`2W*8H-tVNl-Uy9QAiM zyZJDIuyLGR!P+h_4>-6nFZx0h0oqQzhtDl5q!(0>xG4&mWz$-+V6wtOiQ; zJ^>$A6BX&a@von~KdSbnD=$59-S0~Farfg`uyo{x?m+p1RT%%gPYUWUyw3q=SN8G= zCVqV#aA1CcW26>x8mSdq<zm`k|E-f z*c`dYtz4Xha$xq`L|)sGQ-8bW3Sj-=#r}zTM;RM~cSu9eu@0@z0yzEs)F-JcsieU((O(VyTA`^lq7L2?^}#0+7-7XW~!KtAk7F)UOMi&*6>O* zs%!WLFZ|CwADZ2XT1>u)>T1m%9=-+#ETxroTWCB)y=cx@?c(P&Oo)-k++c0*uH#y=5`LfFdUla;Fs8;%)VgC*CbeA6T)$ z%-7z6b-+bjkE*n|t0Jnlr^(braiJ92XN)Qb>{0srZQw;xQ@a z>f;zlR%|asIe_rY8kaWB-!=j5;?7*SGf&B;ZSUGEGZMw#`uaYOYF$^dN#g(l;Owsa9u^XMflywnE2nxK=OxJ5)1_Hp1<}DX_ zzvjv9Wt;8}bwK*P@&fvtoiy0b!9~9Kd?lvfN|7PSOvjtu$EXOzu*-c6#kE{n*K(J; zp+!Z{OdaJs-aOM8g0bEsoqgQJ9k{9Eqxn%Xy9w-o_)#&S3Wmk6li2+18J` zj^(N~YY(z&hsUxEtvh6kuD)N+#NFb(IiL48V z_VkIu%Hy0}_e9K6YE$^UQ;%H9qj-+Pe^nilCic;%F`TK85aX`4V*I6Xi%pYGU>z-r z!=hp{bs?6fvr$Pv%=mDVn@C$is!8D|Wp0cDr^e%WTs2AMk$$PB%z-N#n|zn4TTydg zG+!RkJzgY$+5b(=0=al%6uY9|KuC`W2Y+_7=%eOBIw0nce&ALYrnnlE`u3u4|sNid6ZDHjazPcOnODKyGI)n)hzkvydI%e^_F-@<~Kvn62&a0y; z$cbcQ8PI#LD6}zbYn)MK6SryWn1lsK;4nHTxEzSS4_Adf^0j*y(tR|tz^rKSh<#Oy~bBs>AF(0Ra{BAjBy!^2M54-ogCZUH`jcSOW4c{4V}(JMt;@1^tw_ z7-Ue|+%@F%2+BoCe0_ec7dV)3V1n3a6*mG%qeHY*m9DGb-Kv4bx?`lL5UgrGH^9C0 zO;Q}={@yTOuHZGfu2?zLv453XHKSIK!}!R&uARDqF>TffB0SzS2%W6bEc;zZ@%y+I zk+yJARChH^@uy<>>ujmS4$A{uT^2DW?nqbn@bAuOI03?lQf`io8;D>G#61?8WwU6l zl|kI9s+y-i;hI09Xb7l&&<7KcFLgAX#3rE$Y$=0?7(m1Y7F&~!SlI~RzO3;?e z%(s3+CQ|-l)n72DkxH%_dRYy&=?XZDb=rO9CP;mAiBDw^cclim!sbTK62vxO9uV;b zH_cJq5WDohfKzW}^b%s3G`MDW(U6{a2DI2w%SD1cfTj$pj7sQ~*ID3v&P>63#e@6K z=Q5m(xq4}h>}&YIr1e;7cT^7H)`~XeFU8fZKNvhuDqC2}gNVQCiZAs+sxB=`y>wu2 z(XX6+av+}xTPm=lP*Z^8(_1o$`k+X}=$E5Bl`P6{!PAHFmzrGc2v}sV9i&3tkx4R` zwOp07?G3b^7VpE+tgQ1Z8_1RBrw7v@IB?_DC@Q$6=}}3mB*v{RveHRHgZ1NdIp(lx z8oE?R)f46pDGRT|%5LH}gWo>Wot46zJ+?g45(-fbv2?2G~Xb{Fo0(Rf2jiL|^ z@+{HR2DId>o$iM?@bnmajCLt=qW}s{+l4k`oNqc_bm${>lC-^8Uzq9uClktb!zl}s zF=Q@|6BHBZIh`cNHXT3m>cH2|aDTv%YZafKC&?&&Q94H8rz+@qeeGl74xuO=(z!B3 zv&HB8w!??EseQ5?s!3!%8QGP%KapE8aKY60nog|-ewfqQKVYjm*M}C{D~;qCBXvrg zWP*7(<8i|hQrr(Qq6Z}!W7^~{>m0e~>0&T&jM9h%2I;zgpjzipOpv+$nSfBq;VjpA z_O6^u5x9R>nd2!FH$a{JM?>M@@up<@IapSSRcE`pYfE9lM&$#wJp9X8RkEm{Z>5Rm zdyT`Pfs3!hCKN4awF49qf)6d6`qS;ejR!+vWWHK2$-!Y?zaMMZzDU?}CTWu>-^#u4 z8yCM|@Fg}vR4eyJj;IX7#19qs&r9%S50nZm{aWTVK{O59^(B<{SgW+Unypd^D|gJ+ ztNJ{WXEN6$O{=MV!-6g+f&_s{feRaqZ&)E(F}kxR+JKMLSmBR@g3Jn5UU%?0A@Imv z-E}+5F=@nfgrtCKgDO9u&gCB5OXjjL{Z4*bHz~3+V=yqn62EuQ6kE;wAy3Nx8IZ}cT8C)jre<%fyySv|L}P!PP*K>Rm@_=7O~3Qf zD6H{*-y~lpC;6ihGd{8?#Xi8yBvJn{tFV9SjMe$4vbbyIc1OdUv zc=w-CJby=u-ym5WJ_SZ~|MkWKM)6cKbGA0H(KokpWN`YOrMI&&4U>}>b2D>F*X)z`yM8^z z*R)YMY%CnL-sasvhj2iYta+lyXoxLU)c<>)}?>o5v zEKDWnVi4?D@q3-jZE9NZQMdCkzLX{w2!GqqEU$yD2OzTvk@*;pu7p=nnx$O-;SBvQiO%%VD#$Qdh?u z(cRRH4 zqWq*Gd=Z!?sX3mzdR|s*BY$m)GR=ne!SvDnr*`mH|N6}J6o|!q5)-2!C*SDwOi4>y zo|9$tx z!Nb)qeaa~PRAwgLDw*E3dSHLQh^e)gSBK2(?5yv84SQpIsLbjLFo+~JHa5GhfVY*! zy7a5X>H;@Kqi0N~w5%)v4$c#4PSE0`Jk*4pY~Ky7zp2j&y#Rm2R>f;|NY(+Lm#egC zrK!G;&s#O&@+9!GOX7d-O#iDA^~Z4AWebSQ$V5d(-qLn>Kf4GC`Hd^7szO0RBErLq zh>1<6v(a#IJ)SOBD>ggLEiSGmKR!MlA0JPU!qKQy)Qt1SAT|Jd)`f+Yb6~0J>+2H} z6O)pXs;jFv?LIuTjJL0!hlWCD*nczBYP3+6kr@Xp*M|fL1B_*5qYuaT_V?Ydb|33s zO27|={DOmnolh4!y`P(!o0}^ttVWaRCbRjZBqYpjZJW0ndX^f@XVX|rt+1jA_}Ux~ zCx8|A;lXXSn@il$(b3hl8Gq=2hnu?s9Jd}=(IzG)uCK2vHJgE27v|@e?X7B{prGyn z%Z_&^%BS5f4Tyjmb{Q!t&)26$1V>}zuk(5+oH4aa)WzV3;}6$;PwW3-6tID4Hrp(V z*-BYu0@@nl5K~{Cv49nnod8(iwY9a%%F4icmMkSNAGa>b3soCsy{FUR78e(%ui9~U z1uX5}Ug7ext}X$+>%92Dz`$0=!M{yvc>Xb_zz1!Giq0>Z`N%jB*JbMQLOlFXU5W4tj|W0Xsow^?a!*x zGyagsWndMVyPc5RX}HMq{=5+ZkiG4tY~7cWm}n$`SdqOyn(}#l+Oc70$AG7IX(@Fb zixxuDz>~{%Y+%ALjFTbjd1#Jo(|Y#>6w>r* zy|u^&fMCm{1-2UmA<>JGmsiY-_XohW}3+YOdmOT`*Bg*86B=xf>Z;B{RCaa3JA6UKZCkS zD0^KD^!Gt4L~tc+4fB$k{Bk#hB62u&_u!b<~p0IEe!CDftC4Z@bZ~ zx)HT<#KSrYqlWv<8e#dP25*qjgAx0YVz)DKN&@&(0}8%MfuC;9c!^v=zJ&g${78G$ zj=b7L0=3bDT+xk$EG7?Wz2!&7=?}7(9}aohgUJaRMkSdGZlZ_eBg9_i20>Z_qG<=| z8ta4(AqPRn2%=a6#&d~a(=BmXhV1)mxTvo|5;h0?uff2<-T&+jYkeDY6JtjwdIuwu z@q}@k07m4%3*I2(i6ub>2nYwtkyeYGZnj`G2!`u))QxY^2`ci1WhXgvyH%f9HlrId z&h+tyBkD?elvoX^$VSA?8joqX+v!`su5zy|HPH~J<6l_>e9fV5bG4!7(oGJcwZtf7qQM=np+2} z-=xqP(nJ*JCm01IJrd{?fY&A~HNcX5BhS^7ceXR6*Et)I&#QMy6Fs@K5ei?lud~%z zbFKy4@SJ4kac=10JUei;Nt&pa$$b79hy%I*Jba^{{E59&-QXf(B{)%F`V@QEa80Nz zR{hI;4fkd<5TGC+0pP#g_j|PctD5~zguu*4TN@K|Q)eJs50FC1k(uEiWHgQp!sbra z`gV@M0Q`R?b^0y%>xlC=!gjWH&UQdDBj^7^IVW3ND?5D~W2^r|xnJx$&W;B94*!E3 z-rw2jU~B4N?D+p9`D-%rukQI}>HqwDeoe{PSCX$5Qi)TsI2@$}7%?RojcNWO6>C&(C@0-=HDVC#?JCNn*A5;q3Kq`e6 z>~9x}b`ABNyYlgLt(F%?Gn^CsX>F$;tQ`~lB*c4zNw_|kEw`?O92uKFk$9$X94FjD zxq%_Y>PgitBD%WPp8r zXxTNBhI}EBw$8TNGHYmlvTDL{W!gxTL}7)=C%R~)z8bV7gkjXgh*PzN;W2)=x$?%n@>DrIxV>`? z2h2ws^DDb$W7gbyncS%>Hn>@TZWBoX2 z>_rLK9e5dWHfX2U^sRX$wik8VpQYc!Mq*{-iO+Vf-Y^sHj^THR!W>_0CAhL1WODE5PLWD^)TQQBEE4wo(NX$(msXMsXxWO5nmcNja8QX;Hsmd=bYo zOJUr$ifTd_L0oniT%;sl^LE|qL^v%{-?0nxw+{6DOr*~JfqLbB_z5ER5x*kh2U|}K zi9{VuN^Y*y&nB@ivShN&=x5ars<%wq49SA^$|sZ=<-%Wha{GOZpP&%mvh%leMVB6nlF-4mwhQDlV6>P zLF<^v!oSqVk+&u?uN?sBuy#@?sc@ncsm&G{4q{f*4P<(RRT1PTbtbnAt4{l5lYypU zGq0{$i0^oS@k1yEJr9m=Rc$Ob2igxK56j+gQF^=`t20^whnWD`yT4EWQ}~OSA1tI+ zWH}ZoQ;W?IWjMDGY*HavgY6#d)XQS1 zDh{47@u0MBt%QZ7*ozTGabUyKZu}niL<#9JlQX5J<*&*P44=UXH^oh8Jy#u*wHYmq zCp0X|_AJeR0=I>NCD7RvKp;MN5!lvSxIS$)t& zcJe|aqfKl!t{B=b>%r5&DSd?46))b#n}y(6*DGxfs~u*HIFb_ofHbfn7>*otlbN%8D)g7G@gC|MQ?VZSG9gHEy=Rpo;l5<(9C>5cNyx=UCi%xE$tWG-les8t$1 zmseWlO0}@$ax|fe-s<=EmZ-;T+{=B;M;fOLD=>5zgG*WqkiinkER~7TQ&EXGS6LMk z&CU~-P?EV@Zp+oQK6zH$*7b9DLnznX-|l6!q?l--CMB4EZ|VjlbqM#zYH zZc?;xUbZY3ibeimmG^Vxw3EX8$SpgVz4llP?|4+f8Mq;L7JJB$(KqB2IHB}LO+Ge; z%wXcP&dVhow^x5U?do0D%Ozc>A43u4@20D3Mnb4`m-tr()daeDyHcH0L92Dmyuf4@ z`|~tB*Vda$mW4r^YAXl_lKO^NRy3YkOEoGjBLYWO)*j);il$H?ASv_i6qr}vJsT0! zjMIcm89lMdP^PV)Sb2iTxA|uUw5%SN?Tv`BR zd^Gg+aXHN!BfSlDH>nba#fW)l*BizN<@;A`)wThf|s?xZr02V}xG@%qRiBFYPCa zy31gP9xUDoygwr*J+r|V^}74BaPXj6+vHNqUah@E&v-7|Iu?EkVWV@uw->LK7akT= zvRpa;Fw)B-X`-TZ>18B(0*G)=$}9Wr+(ICzMnoG@#v7>RPqe~DOE-TcHHHanJgpjh z$aXRq*WI3h)&=t87*@gyamCjfp}0DM89)r{a_>(no{Wbdx=mYBQ(LzQ3;9Ph{!mrW zc)OSSr^C&>tQ*18RzNa>*TP21rzy8fzN1?|!;dZBEY7NXB52A!bU{|HbG2R_0v_9; zP3|^pHC@{@5-y@P0%pr`op4nxS2Q}Ged=5~%<_rvFKvL>!hTHUWQ}hWl@Q>9-Pg=p zC}KVPU3-WIlXyMdnZE_e*=yqH=2%S>sVu$_KF92k{LIkwhwSS3zG5vZCKqhOssjd2CuF%o0CE##x`D=CsC_uReX6EaJj%6^2x+G!E zO^}z_K8%U>@>;l7me@A87g|*T@Zf`11r^hKcPZZ@OAvH=E8nuRP_>+HjWuelkDPjB zgEcnHJ8pSf_i>VeEqnh<=B69~HN6u#;B%oZn5#StPY#La@ig1D;ut;G1P&Z~n2z<~ z1FlLx)AIN*0G-zA+YSWnN!u3ukHylN+AnrHWUH_P+`H<<9RWo_6=Nt#)Y{Ba451Sn zTm$#VJBvJRsfP(l2S%pQ?u0OFsa=psJt^v))x*V9IEn3 z5e=vJ%r@M3t-ze2it`BXYt>oqh$;fo+lyHAF@0Ypm?c`}-AK4NUt z4&P%>DDkdXaI%^9NP6-Go(ac_GGK8>nnyz8heC z8n;$3Ov{ww@?25@lu$pkaQ1(@r zIhNaxhL(*^(o4jmc9_l`W!%|g5eGGj3(fWQ^W$o* zYs>7CWy3zo5~nX@L4-;BCQ8H6$rDQky?eis8z;7V>dK?NE18})FlgX@jV@Bt=aFKV z<)Q|=5uR)2IvrV+J0(J)p=rc9LcIMqc?U}nIjFPDV;d;E#R zZFPAp_?44JRO$_VE;{ugfj1P_0TjbJKk6%TT~R+HVe8V${=@SEFU*WPgMB}%fUvuL zIe6#9Dibn?5BNmOg)qG2!+(GXh{7}=RY`v&KopPSQ*&>#~FHJV>xz;H*;;of)WOXx&{pg9rDJIAkZ0bjD zL|_t|jc5gSwRBi-?-~NQf44w3kWv6B@fI}TYbY6fpv8dl9@fHPgvw;x?Ia6*9kcg& zHmb;gLHoEc3K(61w6Mz9#U`Oc#|l7%Vi7TRi1bA|^3{5u^J#=tGIm+gF^17Gs@0X# zIZX9rk)!?%?3ce|dxbCQfIv?kkQrM}3KR?t7nxqY{55Y5avz{z>&f%l^uw`>&FJT^RmF;`k>S0dWY!Ka`HY1%D%1|GIAc zN03_Q->)M7*7Do%zXFZ_Y`B!^KSQnmD*0E8?Vlyp&47;j3oQ9t^0(!GECm7ig~9zv zspkJ3(D`qO+&`D{AL0MN!zt{8&XZw?y|3=dvgztZ=wEP=H@OQ2Jt@N*5H|!scz+4Sb=^s4sU*-PV1^w#S|0EQTf78v& VNkKsVx(pTgDg*WpexAS1{y!!Ck?{Zk diff --git a/rsc/inc/rscall.h b/rsc/inc/rscall.h deleted file mode 100644 index e141b50340f4..000000000000 --- a/rsc/inc/rscall.h +++ /dev/null @@ -1,91 +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_RSC_INC_RSCALL_H -#define INCLUDED_RSC_INC_RSCALL_H - -#include -#include -#include -#include -#include -#include - -/******************* T y p e s *******************************************/ -typedef char * CLASS_DATA; // Pointer to the data of a class - -/******************* C l a s s e s F o r w a r d s *********************/ -class RscCompiler; -class RscTop; -class RscTypCont; - -/******************* G l o b a l V a r i a b l e s *********************/ -extern OString* pStdParType; -extern OString* pStdPar1; -extern OString* pStdPar2; -extern sal_uInt32 nRefDeep; -extern sal_uInt32 nRsc_DELTALANG; -extern sal_uInt32 nRsc_DELTASYSTEM; -extern AtomContainer* pHS; - -/******************* D e f i n e s ***************************************/ - -enum class CommandFlags { - NONE = 0x0000, - Help = 0x0001, // show help - NoPrePro = 0x0002, // no preprocessor - NoSyntax = 0x0004, // no parsing - NoLink = 0x0008, // no linking - NoResFile = 0x0010, // do not create .res file - Define = 0x0020, // definitions stated - Include = 0x0040, // include path extended - Preload = 0x0200, // preload all resources - SrsDefault = 0x1000, // always wrote the default - NoSysResTest = 0x2000 // do not check the correctness of (bmp, ico, cur) -}; -namespace o3tl { - template<> struct typed_flags : is_typed_flags {}; -} - -/******************* S t r u c t s ***************************************/ -struct RSCINST -{ - RscTop * pClass; - CLASS_DATA pData; - - RSCINST(){ pClass = nullptr; pData = nullptr; } - RSCINST( RscTop * pCl, CLASS_DATA pClassData ) - { - pClass = pCl; - pData = pClassData; - } - bool IsInst() const { return( pData != nullptr ); } -}; - -/********************** S U B I N F O S T R U C T ************************/ -struct SUBINFO_STRUCT -{ - RscId aId; // resource identifier -}; - -/******************* F u n c t i o n *************************************/ -void InitRscCompiler(); - -#endif // INCLUDED_RSC_INC_RSCALL_H - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rscarray.hxx b/rsc/inc/rscarray.hxx deleted file mode 100644 index 01a5ddf8795e..000000000000 --- a/rsc/inc/rscarray.hxx +++ /dev/null @@ -1,102 +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_RSC_INC_RSCARRAY_HXX -#define INCLUDED_RSC_INC_RSCARRAY_HXX - -#include -#include -#include - -class RscEnum; - -class RscInstNode : public IdNode -{ - sal_uInt32 nTypeId; -protected: - using NameNode::Search; -public: - RSCINST aInst; - RscInstNode( sal_uInt32 nId ); - virtual ~RscInstNode() override; - virtual sal_uInt32 GetId() const override; - RscInstNode * Left() const { return static_cast(pLeft); }; - RscInstNode * Right() const{ return static_cast(pRight); }; - RscInstNode * Search( sal_uInt32 nId ) const - { - return static_cast(IdNode::Search( nId )); - } -}; - -struct RscArrayInst -{ - RscInstNode * pNode; -}; - -/* The tree is sorted against its enum value, not against its HashId */ -class RscArray : public RscTop -{ -protected: - RscEnum * pTypeClass; // type of entries - const sal_uInt32 nOffInstData;// Offset of self instance data - const sal_uInt32 nSize; // size of this class instance data with super class - void WriteSrcArray( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, const char * ); -public: - RscArray( Atom nId, RESOURCE_TYPE nTypId, - RscTop * pSuper, RscEnum * pTypeClass ); - virtual ~RscArray() override; - - virtual RscTop * GetTypeClass() const override; - RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool bOwnClass = false ) override; - void Destroy( const RSCINST & rInst ) override; - virtual ERRTYPE GetValueEle( const RSCINST & rInst, sal_Int32 lValue, - RscTop * pCreateClass, - RSCINST * pGetInst ) override; - virtual ERRTYPE GetArrayEle( const RSCINST & rInst, Atom nId, - RscTop * pCreateClass, - RSCINST * pGetInst ) override; - - // gives the size of the class in bytes - sal_uInt32 Size() const override { return nSize; } - - bool IsConsistent( const RSCINST & rInst ) override; - virtual void SetToDefault( const RSCINST & rInst ) override; - bool IsDefault( const RSCINST & rInst ) override; - bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) override; - - virtual void WriteSrcHeader( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, - const RscId & aId, const char * ) override; - void WriteSrc( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, const char * ) override; - ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32 ) override; -}; - -class RscLangArray : public RscArray -{ -public: - RscLangArray( Atom nId, RESOURCE_TYPE nTypId, - RscTop * pSuper, RscEnum * pTypeClass ); -}; - -#endif // INCLUDED_RSC_INC_RSCARRAY_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rscclass.hxx b/rsc/inc/rscclass.hxx deleted file mode 100644 index 382006c39c5d..000000000000 --- a/rsc/inc/rscclass.hxx +++ /dev/null @@ -1,104 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_RSC_INC_RSCCLASS_HXX -#define INCLUDED_RSC_INC_RSCCLASS_HXX - -#include -#include -#include -#include - -class RscClass : public RscTop -{ -protected: - struct RscClassInst - { - sal_uLong nVarDflt; - }; - struct VARTYPE_STRUCT - { - Atom nVarName; // variable name - RSCVAR nVarType; // variable type - sal_uInt32 nMask; // bit mask - sal_uInt32 nOffset; // start of instance data - RscTop * pClass; // class - CLASS_DATA pDefault; // pointer to default data - Atom nDataBaseName;//name of foreign data area - }; - sal_uInt32 nSuperSize; // size of super class instance data - sal_uInt32 nSize; // size of this class instance data - // with super class - sal_uInt32 nEntries; // entries in pVarTypeList - VARTYPE_STRUCT * pVarTypeList; // variable list - RSCINST GetInstData( CLASS_DATA pData, sal_uInt32 nEle, - bool bGetCopy = false ); - CLASS_DATA GetDfltData( sal_uInt32 nEle ); - bool IsDflt( CLASS_DATA pData, sal_uInt32 nEle ); - bool IsValueDflt( CLASS_DATA pData, sal_uInt32 nEle ); - void SetVarDflt( CLASS_DATA pData, sal_uInt32 nEle, - bool bSet ); -public: - RscClass( Atom nId, RESOURCE_TYPE nTypId, RscTop * pSuperCl ); - virtual ~RscClass() override; - - void Pre_dtor() override; - ERRTYPE SetVariable( Atom nVarName, RscTop * pClass, - RSCINST * pDflt = nullptr, - RSCVAR nVarType = RSCVAR::NONE, sal_uInt32 nMask = 0, - Atom nDataBaseName = InvalidAtom ) override; - RSCINST GetVariable( const RSCINST & rInst, Atom nVarName, - const RSCINST & rInitInst, - bool bInitDflt = false, - RscTop * pCreateClass = nullptr ) override; - RSCINST GetCopyVar( const RSCINST & rInst, Atom nVarName ) override; - - // gives the class size in bytes - sal_uInt32 Size() const override { return nSize; } - - bool IsConsistent( const RSCINST & rInst ) override; - void SetToDefault( const RSCINST & rInst ) override; - bool IsDefault( const RSCINST & rInst ) override; - bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) override; - void SetDefault( const RSCINST & rData, Atom nVarId ) override; - using RscTop::GetDefault; - RSCINST GetDefault( Atom nVarId ) override; - - RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool bOwnClass = false ) override; - void Destroy( const RSCINST & rInst ) override; - void WriteSrc( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, const char * ) override; - ERRTYPE WriteInstRc( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32 ); - ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32 ) override; -}; - -class RscTupel : public RscClass -{ -public: - RscTupel( Atom nId, RESOURCE_TYPE nTypId ); - RSCINST GetTupelVar( const RSCINST & rInst, sal_uInt32 nPos, - const RSCINST & rInitInst ) override; - void WriteSrc( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, const char * ) override; -}; - -#endif // INCLUDED_RSC_INC_RSCCLASS_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rscclobj.hxx b/rsc/inc/rscclobj.hxx deleted file mode 100644 index 61e350773d7d..000000000000 --- a/rsc/inc/rscclobj.hxx +++ /dev/null @@ -1,90 +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_RSC_INC_RSCCLOBJ_HXX -#define INCLUDED_RSC_INC_RSCCLOBJ_HXX - -#include -#include -#include - -/******************* O b j N o d e ***************************************/ -class ObjNode : public IdNode -{ - RscId aRscId; // resource ID - CLASS_DATA pRscObj; // pointer to a resourceobject - RscFileTab::Index lFileKey; -protected: - using NameNode::Search; - -public: - using NameNode::Insert; - - ObjNode( const RscId & rId, CLASS_DATA pData, RscFileTab::Index lKey ); - ObjNode * DelObjNode( RscTop * pClass, RscFileTab::Index lFileKey ); - sal_uInt32 GetId() const override; - const RscId& GetRscId() const { return aRscId; } - RscFileTab::Index GetFileKey() const { return lFileKey; }; - ObjNode* Search( const RscId &rName ) const //< search the index in the b-tree - { - return static_cast(IdNode::Search( rName.GetNumber() )); - } - bool Insert( ObjNode* pTN ) //< insert a new node in the b-tree - - { - return IdNode::Insert( static_cast(pTN) ); - } - CLASS_DATA GetRscObj() const//< get the Object from this Node - - { - return pRscObj; - } - bool IsConsistent(); -}; - -/******************* R e f N o d e ***************************************/ -class RefNode : public IdNode -{ - Atom nTypNameId; // index of a Name in a hashtabel -protected: - using NameNode::Search; - -public: - using NameNode::Insert; - - ObjNode* pObjBiTree; // pointer to object tree - RefNode( Atom nTyp ); - sal_uInt32 GetId() const override; - void Insert( RefNode* pTN ) //< insert a new node in the b-tree - { - IdNode::Insert( static_cast(pTN) ); - } - bool PutObjNode( ObjNode * pPutObject ); - - // insert new node in b-tree pObjBiTree - ObjNode * GetObjNode( const RscId &rRscId ); - - ObjNode * GetObjNode() const - { - return pObjBiTree; - } -}; - -#endif // INCLUDED_RSC_INC_RSCCLOBJ_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rscconst.hxx b/rsc/inc/rscconst.hxx deleted file mode 100644 index a9ce5040a168..000000000000 --- a/rsc/inc/rscconst.hxx +++ /dev/null @@ -1,93 +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_RSC_INC_RSCCONST_HXX -#define INCLUDED_RSC_INC_RSCCONST_HXX - -#include -#include -#include -#include -#include - -class RscEnum : public RscTop -{ - struct RscEnumInst - { - sal_uInt32 nValue; // constant position in the array - bool bDflt; // is default - }; - struct VarEle - { - Atom nId; // constant name - sal_Int32 lValue; // constant value - }; - VarEle * pVarArray; // pointer to the field with constant - sal_uInt32 nEntries; // number of entries in field -public: - RscEnum( Atom nId, RESOURCE_TYPE nTypId ); - virtual ~RscEnum() override; - // sets the allowed values - void SetConstant( Atom nVarName, sal_Int32 lValue ); - bool GetConstValue( Atom nConstId, sal_Int32 * pVal ) const; - bool GetValueConst( sal_Int32 nValue, Atom * pConstId ) const; - sal_uInt32 GetConstPos( Atom nConstId ); - - RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool bOwnClass = false ) override; - sal_uInt32 Size() const override { return ALIGNED_SIZE(sizeof(RscEnumInst)); } - - virtual void SetToDefault( const RSCINST & rInst ) override - { - reinterpret_cast(rInst.pData)->bDflt = true; - } - bool IsDefault( const RSCINST & rInst ) override - { - return reinterpret_cast(rInst.pData)->bDflt; - }; - // sets as default - bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) override; - - ERRTYPE SetConst( const RSCINST & rInst, Atom nValueId, - sal_Int32 nValue ) override; - ERRTYPE SetNumber( const RSCINST & rInst, sal_Int32 nValue ) override; - ERRTYPE GetConst( const RSCINST & rInst, Atom * ) override; - ERRTYPE GetNumber( const RSCINST & rInst, sal_Int32 * nValue ) override; - void WriteSrc( const RSCINST &rInst, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, const char * ) override; - ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32 ) override; -}; - -class RscNameTable; - -sal_uInt32 GetLangId( const OString& rLang); - -class RscLangEnum : public RscEnum -{ - long mnLangId; -public: - RscLangEnum(); - - void Init( RscNameTable& rNames ); - - Atom AddLanguage( const char* pLang, RscNameTable& rNames ); -}; - -#endif // INCLUDED_RSC_INC_RSCCONST_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rsccont.hxx b/rsc/inc/rsccont.hxx deleted file mode 100644 index c1cf83700a11..000000000000 --- a/rsc/inc/rsccont.hxx +++ /dev/null @@ -1,120 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_RSC_INC_RSCCONT_HXX -#define INCLUDED_RSC_INC_RSCCONT_HXX - -#include -#include -#include - -struct ENTRY_STRUCT -{ - RscId aName; - RSCINST aInst; - void Create(){ aName.Create(); aInst = RSCINST(); } - void Destroy(); -}; -struct RscBaseContInst -{ - sal_uInt32 nEntries; - ENTRY_STRUCT * pEntries; - bool bDflt; -}; - -class RscBaseCont : public RscTop -{ -protected: - RscTop * pTypeClass; // type of entries - bool bNoId; // whether there is no identifier - const sal_uInt32 nOffInstData;// offset of own instance data - const sal_uInt32 nSize; // size of this class and super classes instance data - static void DestroyElements( RscBaseContInst * pClassData ); - RSCINST SearchElePos( const RSCINST & rInst, const RscId & rEleName, - RscTop * pClass, sal_uInt32 nPos ); -protected: - void ContWriteSrc( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, const char * ); - ERRTYPE ContWriteRc( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32 ); -public: - RscBaseCont( Atom nId, RESOURCE_TYPE nTypId, - bool bNoId ); - virtual ~RscBaseCont() override; - void SetTypeClass( RscTop * pClass ) - { - pTypeClass = pClass; - } - RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool bOwnClass = false ) override; - void Destroy( const RSCINST & rInst ) override; - ERRTYPE GetElement( const RSCINST & rInst, const RscId & rEleName, - RscTop * pCreateClass, const RSCINST & rCreateInst, - RSCINST * pGetInst ) override; - RSCINST SearchEle( const RSCINST & rInst, const RscId & rEleName, - RscTop * pClass ) override; - sal_uInt32 GetCount( const RSCINST & rInst ) override; - RSCINST GetPosEle( const RSCINST & rInst, sal_uInt32 nPos ) override; - ERRTYPE MovePosEle( const RSCINST & rInst, sal_uInt32 nDestPos, - sal_uInt32 nSourcePos ) override; - virtual ERRTYPE SetPosRscId( const RSCINST & rInst, sal_uInt32 nPos, - const RscId & rRscId) override; - SUBINFO_STRUCT GetInfoEle( const RSCINST & rInst, sal_uInt32 nPos ) override; - ERRTYPE SetString( const RSCINST &, const char * pStr ) override; - ERRTYPE SetNumber( const RSCINST &, sal_Int32 lValue ) override; - ERRTYPE SetBool( const RSCINST & rInst, bool bValue ) override; - ERRTYPE SetConst( const RSCINST & rInst, Atom nValueId, - sal_Int32 nValue ) override; - ERRTYPE SetRef( const RSCINST & rInst, const RscId & rRefId ) override; - - // returns the class size in bytes - sal_uInt32 Size() const override { return nSize; } - - bool IsConsistent( const RSCINST & rInst ) override; - void SetToDefault( const RSCINST & rInst ) override; - bool IsDefault( const RSCINST & rInst ) override; - bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) override; - - void Delete( const RSCINST & rInst, RscTop * pClass, - const RscId & rId ) override; - void DeletePos( const RSCINST & rInst, sal_uInt32 nPos ) override; - - void WriteSrc( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, const char * ) override; - ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32 ) override; -}; - -class RscContWriteSrc : public RscBaseCont -{ -public: - RscContWriteSrc( Atom nId, RESOURCE_TYPE nTypId ); - void WriteSrc( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, const char * ) override; -}; - -class RscCont : public RscContWriteSrc -{ -public: - RscCont( Atom nId, RESOURCE_TYPE nTypId ); - ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32 ) override; -}; - -#endif // INCLUDED_RSC_INC_RSCCONT_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx deleted file mode 100644 index da235e8bc0e3..000000000000 --- a/rsc/inc/rscdb.hxx +++ /dev/null @@ -1,112 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_RSC_INC_RSCDB_HXX -#define INCLUDED_RSC_INC_RSCDB_HXX - -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -class RscError; -class RscTupel; -class RscCont; -class RscCmdLine; -enum class MenuItemBits : sal_Int16; -enum class MapUnit; - -struct WriteRcContext -{ - FILE * fOutput; - OString aOutputRc; - OString aOutputSysList; - RscCmdLine* pCmdLine; -}; - -class RscTypCont -{ - rtl_TextEncoding nSourceCharSet; - RSCBYTEORDER_TYPE nByteOrder; // Intel or - OString aLanguage; // output language - std::vector< sal_uInt32 > aLangFallbacks; // language fallback list (entry 0 is language itself) - sal_uLong nFilePos; // position in file (MTF) - sal_uInt32 nPMId; // unique id for PR-resource file - // must be greater that RSC_VERSIONCONTROL_ID - RscTop * pRoot; // pointer to the root of type tree - RSCINST aVersion; // version control instance - - ::std::vector< RscTop* > - aBaseLst; // list of simple resource class - - void Init(); // initializes classes and tables - void SETCONST( RscEnum *, const char *, sal_uInt32 ); - RscEnum * InitFieldUnitsType(); - RscTupel * InitStringLongTupel(); - static RscCont * InitStringLongTupelList( RscTupel * pStringLongTupel ); - RscArray * InitLangStringLongTupelList( RscCont * pStrLongTupelLst ); - - RscTop * InitClassMgr(); - RscTop * InitClassString( RscTop * pSuper ); - -public: - RscLongEnumRange aEnumLong; - RscString aString; - RscLangEnum aLangType; - RscLangArray aLangString; - - RscError* pEH; // error handler - RscNameTable aNmTb; // name table - RscFileTab aFileTab; // file name table - CommandFlags nFlags; - std::map aIdTranslator; // map resources types and ids to an id (under PM9 or to a file position (MTF) - - RscTypCont( RscError *, RSCBYTEORDER_TYPE, CommandFlags nFlags ); - ~RscTypCont(); - - Atom AddLanguage( const char* ); - bool IsSrsDefault() const - { return bool(nFlags & CommandFlags::SrsDefault); } - OString ChangeLanguage(const OString & rNewLang); - const std::vector< sal_uInt32 >& GetFallbacks() const - { return aLangFallbacks; } - - RSCBYTEORDER_TYPE GetByteOrder() const { return nByteOrder; } - rtl_TextEncoding GetSourceCharSet() const { return nSourceCharSet; } - void SetSourceCharSet( rtl_TextEncoding aCharSet ) - { - nSourceCharSet = aCharSet; - } - // deletes all resource objects of this file - void Delete( RscFileTab::Index lFileKey ); - ERRTYPE WriteRc( WriteRcContext& rContext ); - void WriteSrc( FILE * fOutput, RscFileTab::Index nFileIndex ); - void PutTranslatorKey( sal_uInt64 nKey ); - void IncFilePos( sal_uLong nOffset ){ nFilePos += nOffset; } -}; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rscdef.hxx b/rsc/inc/rscdef.hxx deleted file mode 100644 index 9ca0c8483fab..000000000000 --- a/rsc/inc/rscdef.hxx +++ /dev/null @@ -1,282 +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_RSC_INC_RSCDEF_HXX -#define INCLUDED_RSC_INC_RSCDEF_HXX - -#include - -#include -#include -#include -#include -#include - -/****************** C L A S S E S ****************************************/ -class RscExpression; -class RscFileTab; -class RscDefine; - -/*********** R s c E x p r e s s i o n ***********************************/ -#define RSCEXP_LONG 0 -#define RSCEXP_EXP 1 -#define RSCEXP_DEF 2 -#define RSCEXP_NOTHING 3 - -class RscExpType -{ -public: - union - { - RscExpression * pExp; - RscDefine * pDef; - struct - { - short nHi; - unsigned short nLo; - } aLong; - } aExp; - char cType; - bool cUnused; - bool IsNumber() const { return( RSCEXP_LONG == cType ); } - bool IsExpression()const { return( RSCEXP_EXP == cType ); } - bool IsDefinition()const { return( RSCEXP_DEF == cType ); } - bool IsNothing() const { return( RSCEXP_NOTHING == cType ); } - void SetLong( sal_Int32 lValue ) - { - aExp.aLong.nHi = (short)(lValue >> 16); - aExp.aLong.nLo = (unsigned short)lValue; - cType = RSCEXP_LONG; - } - sal_Int32 GetLong() const - { - return aExp.aLong.nLo | ((sal_uInt32)aExp.aLong.nHi << 16); - } - bool Evaluate( sal_Int32 * pValue ) const; - void AppendMacro( OStringBuffer & ) const; -}; - -/*********** R s c I d ***************************************************/ -class RscId -{ - static bool bNames;// if false, only count name operation -public: - RscExpType aExp; // number, define or expression - sal_Int32 GetNumber() const; - void Create( const RscExpType & rExpType ); - void Create(){ aExp.cType = RSCEXP_NOTHING; } - - RscId() { Create(); } - - RscId( RscDefine * pEle ); - RscId( sal_Int32 lNumber ) - { - aExp.cUnused = false; - aExp.SetLong( lNumber ); - } - - RscId( const RscExpType & rExpType ) - { Create( rExpType ); } - - void Destroy(); - - ~RscId() { Destroy(); } - - RscId( const RscId& rRscId ); - - RscId& operator = ( const RscId& rRscId ); - - static void SetNames( bool bSet = true ); - OString GetName() const; // returns the define - bool operator < ( const RscId& rRscId ) const; - bool operator > ( const RscId& rRscId ) const; - bool operator == ( const RscId& rRscId ) const; - bool operator <= ( const RscId& rRscId ) const - { return !(operator > ( rRscId )); } - bool operator >= ( const RscId& rRscId ) const - { return !(operator < ( rRscId )); } - bool IsId() const { return !aExp.IsNothing(); } -}; - -typedef ::std::vector< RscDefine* > RscSubDefList; - -/*********** R s c E x p r e s s i o n ***********************************/ -class RscExpression -{ -friend class RscFileTab; - char cOperation; - RscExpType aLeftExp; - RscExpType aRightExp; -public: - RscExpression( RscExpType aLE, char cOp, - RscExpType aRE ); - ~RscExpression(); - bool Evaluate( sal_Int32 * pValue ); - OString GetMacro(); -}; - -/********************** R S C F I L E ************************************/ -class RscDepend; - -typedef ::std::vector< RscDepend* > RscDependList; - -class RscDefTree -{ - RscDefine * pDefRoot; -public: - static bool Evaluate( RscDefine * pDef ); - RscDefTree(){ pDefRoot = nullptr; } - ~RscDefTree(); - void Remove(); - RscDefine * Search( const char * pName ); - void Insert( RscDefine * pDef ); - void Remove( RscDefine * pDef ); -}; - -class RscFile; - -class RscFileTab : public UniqueIndex -{ -public: - using UniqueIndex::Index; - using UniqueIndex::IndexNotFound; - -private: - RscDefTree aDefTree; - Index Find(const OString& rName); -public: - RscFileTab(); - ~RscFileTab(); - - RscDefine * FindDef( const char * ); - RscDefine * FindDef(const OString& rStr) - { - return FindDef(rStr.getStr()); - } - - bool Depend( Index lDepend, Index lFree ); - bool TestDef( Index lFileKey, size_t lPos, - const RscDefine * pDefDec ); - bool TestDef( Index lFileKey, size_t lPos, - const RscExpression * pExpDec ); - - RscDefine * NewDef( Index lKey, const OString& rDefName, - sal_Int32 lId ); - RscDefine * NewDef( Index lKey, const OString& rDefName, - RscExpression * ); - - // deletes all defines defined in this file - void DeleteFileContext( Index lKey ); - Index NewCodeFile(const OString& rName); - Index NewIncFile(const OString& rName, const OString& rPath); - RscFile * GetFile( Index lFileKey ){ return Get( lFileKey ); } -}; - -class RscDepend -{ - RscFileTab::Index lKey; -public: - RscDepend( RscFileTab::Index lIncKey ){ lKey = lIncKey; }; - RscFileTab::Index GetFileKey(){ return lKey; } -}; - -class RscDefineList -{ -friend class RscFile; -friend class RscFileTab; -private: - RscSubDefList maList; - // pExpression always belongs to the list - RscDefine * New( RscFileTab::Index lFileKey, const OString& rDefName, - sal_Int32 lDefId, size_t lPos ); - RscDefine * New( RscFileTab::Index lFileKey, const OString& rDefName, - RscExpression * pExpression, size_t lPos ); - bool Remove(); - size_t GetPos( RscDefine* item ) - { - for ( size_t i = 0, n = maList.size(); i < n; ++i ) - if ( maList[ i ] == item ) - return i; - return size_t(-1); - } -}; - -// table containing all file names -class RscFile -{ -friend class RscFileTab; - bool bIncFile; // whether it is an include file -public: - bool bLoaded; // whether the file is loaded - bool bScanned; // whether the file searches for include - OString aFileName; // file name - OString aPathName; // file path and name - RscDefineList aDefLst; // list of defines - RscDependList aDepLst; // list of depend - - RscFile(); - ~RscFile(); - void InsertDependFile( RscFileTab::Index lDepFile ); - bool Depend( RscFileTab::Index lDepend, RscFileTab::Index lFree ); - void SetIncFlag(){ bIncFile = true; }; - bool IsIncFile(){ return bIncFile; }; -}; - -/*********** R s c D e f i n e *******************************************/ -class RscDefine : public NameNode -{ -friend class RscFileTab; -friend class RscDefineList; -friend class RscDefTree; -friend class RscExpression; -friend class RscId; - - RscFileTab::Index lFileKey; // file the define belongs to - sal_uInt32 nRefCount; // reference count to this object - sal_Int32 lId; // identifier - RscExpression * pExp; // expression - OString m_aName; - - virtual COMPARE Compare( const NameNode * ) const override; - virtual COMPARE Compare( const void * ) const override; - -public: - RscDefine( RscFileTab::Index lFileKey, const OString& rDefName, - sal_Int32 lDefId ); - virtual ~RscDefine() override; - -protected: - RscDefine( RscFileTab::Index lFileKey, const OString& rDefName, - RscExpression * pExpression ); - - void IncRef() { nRefCount++; } - void DecRef(); - void DefineToNumber(); - -public: - RscFileTab::Index GetFileKey() const { return lFileKey; } - void Evaluate(); - sal_Int32 GetNumber() const { return lId; } - RscDefine* Search( const char * ) const; - const OString& GetName() const { return m_aName; } -}; - - -#endif // INCLUDED_RSC_INC_RSCDEF_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rscerror.h b/rsc/inc/rscerror.h deleted file mode 100644 index 11a498e96756..000000000000 --- a/rsc/inc/rscerror.h +++ /dev/null @@ -1,149 +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 - -#ifndef INCLUDED_RSC_INC_RSCERROR_H -#define INCLUDED_RSC_INC_RSCERROR_H - -// Return errors -#define ERR_OK 0xFFFFFFFF - -#define ERR_ERROR 0x0100 -#define ERR_UNKNOWN_METHOD 0x0101 // Return -#define ERR_OPENFILE 0x0102 // Return -#define ERR_NOCHAR 0x0103 // Return -#define ERR_NORSCINST 0x0104 // Return -#define ERR_USAGE 0x0105 -#define ERR_NOINPUT 0x0106 // Return -#define ERR_UNKNOWNSW 0x0107 -#define ERR_REFTODEEP 0x0108 // Return -#define ERR_FILEFORMAT 0x0109 // Return -#define ERR_FILESIZE 0x010A // Return -#define ERR_RENAMEFILE 0x010B // Return -#define ERR_NOIMAGE 0x010C // Return - -#define ERR_RSCRANGE 0x0200 // Return -#define ERR_RSCRANGE_OUTDEFSET (ERR_RSCRANGE +1 ) - -#define ERR_RSCENUM 0x0210 // Return -#define ERR_RSCFLAG 0x0220 // Return -#define ERR_RSCCONT 0x0240 // Return -#define ERR_CONT_INVALIDPOS (ERR_RSCCONT +1 ) // Return -#define ERR_CONT_INVALIDTYPE (ERR_RSCCONT +2 ) // Return - -#define ERR_RSCINST 0x0260 -#define ERR_RSCINST_NOVARNAME (ERR_RSCINST +1 ) // Return -#define ERR_RSCINST_RESERVEDNAME (ERR_RSCINST +2 ) // Return - -#define ERR_YACC 0x0280 -#define ERR_DOUBLEID (ERR_YACC +1 ) -#define ERR_FALSETYPE (ERR_YACC +2 ) -#define ERR_NOVARIABLENAME (ERR_YACC +3 ) -#define ERR_USHORTRANGE (ERR_YACC +4 ) -#define ERR_IDRANGE (ERR_YACC +5 ) -#define ERR_NOCOPYOBJ (ERR_YACC +6 ) -#define ERR_REFNOTALLOWED (ERR_YACC +7 ) // Return -#define ERR_DOUBLEDEFINE (ERR_YACC +8 ) -#define ERR_COPYNOTALLOWED (ERR_YACC +9 ) -#define ERR_IDEXPECTED (ERR_YACC +10) -#define ERR_ZERODIVISION (ERR_YACC +11) -#define ERR_PRAGMA (ERR_YACC +12) -#define ERR_DECLAREDEFINE (ERR_YACC +13) -#define ERR_NOTUPELNAME (ERR_YACC +14) -#define ERR_NOTYPE (ERR_YACC +15) - -#define ERR_RSCARRAY 0x02A0 // Return -#define ERR_ARRAY_INVALIDINDEX (ERR_RSCARRAY +1 ) // Return - -#define ERR_ERROREND 0x1000 - -#define ERR_WARNINGSTART 0x1001 -#define WRN_LOCALID (ERR_WARNINGSTART +1 ) -#define WRN_GLOBALID (ERR_WARNINGSTART +2 ) -#define WRN_SUBINMEMBER (ERR_WARNINGSTART +3 ) -#define WRN_CONT_NOID (ERR_WARNINGSTART +4 ) -#define WRN_STR_REFNOTFOUND (ERR_WARNINGSTART +5 ) -#define WRN_MGR_REFNOTFOUND (ERR_WARNINGSTART +6 ) -#define WRN_CONT_DOUBLEID (ERR_WARNINGSTART +7 ) - -#define ERR_WARNINGEND 0x2000 - -class ERRTYPE -{ - sal_uInt32 nError; -public: - ERRTYPE() { nError = ERR_OK; } - ERRTYPE( sal_uInt32 nErr ) { nError = nErr; } - ERRTYPE( const ERRTYPE & ) = default; - ERRTYPE& operator = ( const ERRTYPE & rError ); - sal_uInt32 GetError() const { return nError; } - bool IsError() const { return nError <= ERR_ERROREND; } - bool IsOk() const { return !IsError(); } - bool IsWarning() const { return nError >= ERR_WARNINGSTART && nError <= ERR_WARNINGEND;} - void Clear() { nError = ERR_OK; } -}; - -// Rsc Error -class RscId; -class RscTop; - -enum RscVerbosity -{ - RscVerbositySilent = 0, - RscVerbosityNormal = 1, - RscVerbosityVerbose = 2 -}; - -class RscError final -{ - FILE * fListing; - RscVerbosity m_verbosity; - - void WriteError( const ERRTYPE& rError, const char * pMessage ); - void StdLstOut( const char * pStr ); - void StdLstErr( const char * pStr ); - void ErrorFormat( const ERRTYPE& rError, RscTop * pClass, - const RscId & aId ); -public: - - sal_uInt32 nErrors; // Number of errors - RscError( RscVerbosity _verbosity ) - { - fListing = nullptr; - nErrors = 0; - m_verbosity = _verbosity; - } - void SetListFile( FILE * fList ){ fListing = fList; } - FILE * GetListFile(){ return fListing; } - RscVerbosity GetVerbosity() const { return m_verbosity; } - void StdOut( const char *, const RscVerbosity _verbosityLevel = RscVerbosityNormal ); - static void StdErr( const char * ); - void LstOut( const char * ); - void Error( const ERRTYPE& rError, RscTop* pClass, const RscId &aId, - const char * pMessage = nullptr ); - // The error should only happen in compile mode, - // the program will terminated with exit() - void FatalError( const ERRTYPE& rError, const RscId &aId, - const char * pMessage = nullptr ); -}; - -#endif // INCLUDED_RSC_INC_RSCERROR_H - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rschash.hxx b/rsc/inc/rschash.hxx deleted file mode 100644 index 898969e7c14c..000000000000 --- a/rsc/inc/rschash.hxx +++ /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 . - */ -#ifndef INCLUDED_RSC_INC_RSCHASH_HXX -#define INCLUDED_RSC_INC_RSCHASH_HXX - -#include -#include -#include - -typedef sal_uInt32 Atom; - -#define InvalidAtom Atom( ~0 ) - -class AtomContainer -{ - Atom m_nNextID; - std::unordered_map< OString, Atom, OStringHash > m_aStringToID; - std::unordered_map< Atom, OString > m_aIDToString; - - public: - AtomContainer(); - ~AtomContainer(); - - Atom getID( const OString& rStr, bool bOnlyIfExists = false ); - const OString& getString( Atom nAtom ); - -}; - -#endif // INCLUDED_RSC_INC_RSCHASH_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rsckey.hxx b/rsc/inc/rsckey.hxx deleted file mode 100644 index 4ca2812ff69d..000000000000 --- a/rsc/inc/rsckey.hxx +++ /dev/null @@ -1,54 +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_RSC_INC_RSCKEY_HXX -#define INCLUDED_RSC_INC_RSCKEY_HXX - -// class forwards -class RscTop; - -#include - -typedef struct -{ - Atom nName; - sal_uInt32 nTyp; - sal_IntPtr yylval; -} KEY_STRUCT; - -class RscNameTable -{ - bool bSort; // whether it must be sorted for each insertion - sal_uInt32 nEntries; // number of entries - KEY_STRUCT * pTable; -public: - RscNameTable(); - ~RscNameTable(); - void SetSort( bool bSorted = true ); - Atom Put( Atom nName, sal_uInt32 nTyp, sal_IntPtr nValue ); - Atom Put( const char * pName, sal_uInt32 nTyp, sal_IntPtr nValue ); - Atom Put( const char * pName, sal_uInt32 nTyp ); - void Put( Atom nName, sal_uInt32 nTyp, RscTop * pClass ); - - // if true, it was found - bool Get( Atom nName, KEY_STRUCT * pEle ); -}; - -#endif // INCLUDED_RSC_INC_RSCKEY_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rsclex.hxx b/rsc/inc/rsclex.hxx deleted file mode 100644 index 307e6bc8ea7f..000000000000 --- a/rsc/inc/rsclex.hxx +++ /dev/null @@ -1,115 +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_RSC_INC_RSCLEX_HXX -#define INCLUDED_RSC_INC_RSCLEX_HXX - -#include -#include -#include - -// a buffer for unique strings -class StringContainer -{ - std::unordered_set< OString, OStringHash > m_aStrings; -public: - StringContainer() {} - - const char* putString( const char* pString ); -}; - - -enum MODE_ENUM { MODE_MODELESS, MODE_APPLICATIONMODAL, MODE_SYSTEMMODAL }; - -enum JUSTIFY_ENUM { JUST_CENTER, JUST_RIGHT, JUST_LEFT }; - -enum SHOW_ENUM { SHOW_NORMAL, SHOW_MINIMIZED, SHOW_MAXIMIZED }; - -enum ENUMHEADER { HEADER_NAME, HEADER_NUMBER }; - -enum REF_ENUM { TYPE_NOTHING, TYPE_REF, TYPE_COPY }; - -struct RSCHEADER { - RscTop * pClass; - RscExpType nName1; - REF_ENUM nTyp; - RscTop * pRefClass; - RscExpType nName2; -}; - -/************** O b j e c t s t a c k ************************************/ -struct Node -{ - Node* pPrev; - RSCINST aInst; - Node() { pPrev = nullptr; } -}; - -class ObjectStack -{ - private: - Node* pRoot; - public: - - ObjectStack () { pRoot = nullptr; } - - const RSCINST & Top () { return pRoot->aInst; } - bool IsEmpty() { return( pRoot == nullptr ); } - void Push( RSCINST aInst ) - { - Node* pTmp; - - pTmp = pRoot; - pRoot = new Node; - pRoot->aInst = aInst; - pRoot->pPrev = pTmp; - } - void Pop() - { - Node* pTmp; - - pTmp = pRoot; - pRoot = pTmp->pPrev; - delete pTmp; - } -}; - -/****************** F o r w a r d s **************************************/ -#if defined(__sun) -extern "C" int yyparse(); // forward declaration for created function -extern "C" void yyerror( const char * ); -extern "C" int yylex(); -#else -int yyparse(); // forward declaration for created function -void yyerror( char * ); -int yylex(); -#endif - -class RscTypCont; -class RscFileInst; - -extern RscTypCont* pTC; -extern RscFileInst * pFI; -extern RscExpression * pExp; -extern ObjectStack S; -extern StringContainer* pStringContainer; - -#endif // INCLUDED_RSC_INC_RSCLEX_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rscmgr.hxx b/rsc/inc/rscmgr.hxx deleted file mode 100644 index 3bd159a901ec..000000000000 --- a/rsc/inc/rscmgr.hxx +++ /dev/null @@ -1,67 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_RSC_INC_RSCMGR_HXX -#define INCLUDED_RSC_INC_RSCMGR_HXX - -#include -#include -#include -#include -#include - -/******************* R s c M g r *****************************************/ -class RscMgr : public RscClass -{ - struct RscMgrInst - { - RscId aRefId; // nRefId = Referenz Identifier - bool bDflt; // default - void Create(){ aRefId.Create(); bDflt = true; } - void Destroy(){ aRefId.Destroy(); } - }; - ERRTYPE IsToDeep( const RSCINST & rInst ); -public: - RscMgr( Atom nId, RESOURCE_TYPE nTypId, RscTop * pSuperCl ); - - void SetToDefault( const RSCINST & rInst ) override; - bool IsDefault( const RSCINST & rInst ) override; - bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) override; - - RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool bOwnClass = false ) override; - void Destroy( const RSCINST & rInst ) override; - sal_uInt32 Size() const override; - void WriteSrcHeader( const RSCINST & aInst, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, - const RscId & rId, const char * ) override; - - void WriteSrc( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, const char * ) override; - ERRTYPE WriteRcHeader( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont * pTC, const RscId & rId, - sal_uInt32 ) override; - ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32 ) override; - bool IsConsistent( const RSCINST & rInst ) override; - ERRTYPE GetRef( const RSCINST & rInst, RscId * ) override; - ERRTYPE SetRef( const RSCINST & rInst, const RscId & rRefId ) override; -}; - -#endif // INCLUDED_RSC_INC_RSCMGR_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rscpar.hxx b/rsc/inc/rscpar.hxx deleted file mode 100644 index aea9a8740c35..000000000000 --- a/rsc/inc/rscpar.hxx +++ /dev/null @@ -1,77 +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_RSC_INC_RSCPAR_HXX -#define INCLUDED_RSC_INC_RSCPAR_HXX - -#include -#include -#include -#include - -class RscTypCont; - -#define READBUFFER_MAX 256 - -class RscFileInst -{ - ERRTYPE aFirstError; - sal_uInt32 nLineNo; // line in input file - RscFileTab::Index lFileIndex; // index input file - RscFileTab::Index lSrcIndex; // index base file - FILE * fInputFile; - char * pInput; // read buffer - static const sal_uInt32 nInputBufLen = READBUFFER_MAX; - sal_uInt32 nInputPos; - sal_uInt32 nInputEndPos; - char * pLine; - sal_uInt32 nLineBufLen; - sal_uInt32 nScanPos; // line position - int cLastChar; - bool bEof; - -public: - RscTypCont * pTypCont; - void Init(); // init ctor - RscFileInst( RscTypCont * pTC, RscFileTab::Index lIndexSrc, - RscFileTab::Index lFileIndex, FILE * fFile ); - ~RscFileInst(); - bool IsEof() const { return bEof; } - void SetFileIndex( RscFileTab::Index lFIndex ) { lFileIndex = lFIndex; } - RscFileTab::Index GetFileIndex() { return lFileIndex; } - void SetLineNo( sal_uInt32 nLine ) { nLineNo = nLine; } - sal_uInt32 GetLineNo() { return nLineNo; } - sal_uInt32 GetScanPos() { return nScanPos; } - char * GetLine() { return pLine; } - char GetChar(); - char GetFastChar() - { - return pLine[ nScanPos ] ? - pLine[ nScanPos++ ] : GetChar(); - } - void GetNewLine(); - // error handling - void SetError( ERRTYPE aError ); -}; - -void IncludeParser( RscFileInst * pFileInst ); -ERRTYPE parser( RscFileInst * pFileInst ); - -#endif // INCLUDED_RSC_INC_RSCPAR_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rscrange.hxx b/rsc/inc/rscrange.hxx deleted file mode 100644 index 202b86f98e08..000000000000 --- a/rsc/inc/rscrange.hxx +++ /dev/null @@ -1,75 +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_RSC_INC_RSCRANGE_HXX -#define INCLUDED_RSC_INC_RSCRANGE_HXX - -#include -#include -#include -#include - -class RscLongRange : public RscTop -{ -protected: - struct RscLongRangeInst - { - sal_Int32 nValue; // nValue = output value - nMin - bool bDflt; // is default - }; - sal_Int32 nMin; // range minimum value - sal_Int32 nMax; // range maximum value -public: - RscLongRange( Atom nId, RESOURCE_TYPE nTypId ); - RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool bOwnClass = false ) override; - // sets the allowed range - void SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum ); - // returns the class size in bytes - sal_uInt32 Size() const override { return ALIGNED_SIZE(sizeof(RscLongRangeInst)); } - // an assignment to a variable - virtual void SetToDefault( const RSCINST & rInst ) override - { - reinterpret_cast(rInst.pData)->bDflt = true; - } - bool IsDefault( const RSCINST & rInst) override - { - return reinterpret_cast(rInst.pData)->bDflt; - }; - // sets as default - bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) override; - ERRTYPE SetNumber( const RSCINST &, sal_Int32 ) override; - ERRTYPE GetNumber( const RSCINST &, sal_Int32 * ) override; - void WriteSrc( const RSCINST &, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, const char * ) override; - ERRTYPE WriteRc( const RSCINST &, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32 ) override; - -}; - -class RscLongEnumRange : public RscLongRange -{ -public: - RscLongEnumRange( Atom nId, RESOURCE_TYPE nTypId ); - - ERRTYPE SetConst( const RSCINST & rInst, Atom nValueId, - sal_Int32 nValue ) override; -}; - -#endif // INCLUDED_RSC_INC_RSCRANGE_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rscrsc.hxx b/rsc/inc/rscrsc.hxx deleted file mode 100644 index f09b42d6004d..000000000000 --- a/rsc/inc/rscrsc.hxx +++ /dev/null @@ -1,98 +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_RSC_INC_RSCRSC_HXX -#define INCLUDED_RSC_INC_RSCRSC_HXX - -#include -#include -#include - -#include - -class RscTypCont; - - -/****************** R s c C m d L i n e **********************************/ -class RscCmdLine -{ - void Init(); - -public: - - RscStrList aInputList; // source file list - OString aPath; // path list - RSCBYTEORDER_TYPE nByteOrder; - CommandFlags nCommands; // command bits - OString aOutputSrs; // Srs output file name - - struct OutputFile - { - OString aLangName; // language name - OString aOutputRc; // target file - OString aLangSearchPath; // language specific search path - ::std::list< OString > aSysSearchDirs; // paths to search for images - - OutputFile() {} - }; - - std::list m_aOutputFiles; - std::list< std::pair< OString, OString > > m_aReplacements; - - RscCmdLine( int argc, char ** argv, RscError * pEH ); - ~RscCmdLine(); - - OString substitutePaths( const OString& rIn ); -}; -/****************** R s c ************************************************/ - -struct WriteRcContext; - -class RscCompiler -{ -private: - static bool GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile, - const WriteRcContext& rContext, - const OString& rBaseFileName, - OString& rImagePath, - FILE* pSysListFile ); - void PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, - const WriteRcContext& rContext, - const OUString& rSrsInPath, - const OUString& rSrsOutPath ); - -public: - RscTypCont* pTC; // string and id manager - RscCmdLine* pCL; // command line - FILE * fExitFile; // when deconstructed, this file must be deleted - - RscCompiler( RscCmdLine *, RscTypCont * ); - ~RscCompiler(); - - ERRTYPE Start(); - - // read include statements - ERRTYPE IncludeParser( RscFileTab::Index lFileKey ); - ERRTYPE ParseOneFile( RscFileTab::Index lFileKey, const RscCmdLine::OutputFile* pOutputFile, const WriteRcContext* pContext ); - ERRTYPE Link(); - void EndCompile(); -}; - -#endif // INCLUDED_RSC_INC_RSCRSC_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rscstr.hxx b/rsc/inc/rscstr.hxx deleted file mode 100644 index 5ae1d17aa92d..000000000000 --- a/rsc/inc/rscstr.hxx +++ /dev/null @@ -1,66 +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_RSC_INC_RSCSTR_HXX -#define INCLUDED_RSC_INC_RSCSTR_HXX - -#include -#include -#include -#include - -class RscString : public RscTop -{ - RscTop * pRefClass; - struct RscStringInst - { - char * pStr; // pointer to string - bool bDflt; // is default - RscId aRefId; // reference name - }; -public: - RscString( Atom nId, RESOURCE_TYPE nTypId ); - - void SetRefClass( RscTop * pClass ) { pRefClass = pClass; } - RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool bOwnClass = false ) override; - // sets the allowed range - void Destroy( const RSCINST & rInst ) override; - sal_uInt32 Size() const override { return ALIGNED_SIZE(sizeof(RscStringInst)); } - void SetToDefault( const RSCINST & rInst ) override - { - reinterpret_cast(rInst.pData)->bDflt = true; - } - bool IsDefault( const RSCINST & rInst) override - { - return reinterpret_cast(rInst.pData)->bDflt; - } - // sets as default - bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) override; - ERRTYPE SetString( const RSCINST &, const char * pStr ) override; - ERRTYPE GetString( const RSCINST &, char ** ppStr ) override; - ERRTYPE GetRef( const RSCINST & rInst, RscId * ) override; - ERRTYPE SetRef( const RSCINST & rInst, const RscId & rRefId ) override; - void WriteSrc( const RSCINST &, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, const char * ) override; - ERRTYPE WriteRc( const RSCINST &, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32 ) override; -}; - -#endif // INCLUDED_RSC_INC_RSCSTR_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rsctools.hxx b/rsc/inc/rsctools.hxx deleted file mode 100644 index dcfade4adaf7..000000000000 --- a/rsc/inc/rsctools.hxx +++ /dev/null @@ -1,185 +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 . - */ -struct RSHEADER_TYPE; -class RscPtrPtr; - -#ifndef INCLUDED_RSC_INC_RSCTOOLS_HXX -#define INCLUDED_RSC_INC_RSCTOOLS_HXX - -#ifdef UNX -#include -#endif -#include -#include -#include -#include - -// character set -enum COMPARE { LESS = -1, EQUAL = 0, GREATER = 1 }; - -enum RSCBYTEORDER_TYPE { RSC_BIGENDIAN, RSC_LITTLEENDIAN, RSC_SYSTEMENDIAN }; - -#define ALIGNED_SIZE( nSize ) \ - (nSize + sizeof( void * ) -1) / sizeof( void * ) * sizeof( void * ) - -// Function Forwards -OString GetTmpFileName(); - -OString OutputFile(const OString &rInput, const char * ext); - -char * ResponseFile( RscPtrPtr * ppCmd, char ** ppArgv, - sal_uInt32 nArgc ); - -void RscExit( sal_uInt32 nExit ); - -int rsc_strnicmp( const char *string1, const char *string2, size_t count ); -int rsc_stricmp( const char *string1, const char *string2 ); -char* rsc_strdup( const char* ); - -typedef ::std::vector< OString* > RscStrList; - -class RscChar -{ -public: - static char * MakeUTF8( char * pStr, sal_uInt16 nTextEncoding ); -}; - -class RscPtrPtr -{ - sal_uInt32 nCount; - void ** pMem; -public: - RscPtrPtr(); - ~RscPtrPtr(); - void Reset(); - sal_uInt32 Append( void * ); - sal_uInt32 Append( char * pStr ) { return Append( static_cast(pStr) ); } - sal_uInt32 GetCount() { return nCount; } - void * GetEntry( sal_uInt32 nEle ); - void ** GetBlock() { return pMem; } -}; - -class RscWriteRc -{ - sal_uInt32 nLen; - bool bSwap; - char * pMem; - char * GetPointer( sal_uInt32 nSize ); -public: - RscWriteRc( RSCBYTEORDER_TYPE nOrder = RSC_SYSTEMENDIAN ); - ~RscWriteRc(); - sal_uInt32 IncSize( sal_uInt32 nSize ); // gives the previous size - void * GetBuffer() - { - return GetPointer( 0 ); - } - sal_uInt32 GetLong( sal_uInt32 nPos ) - { - sal_uInt32 nVal = 0; - char* pFrom = GetPointer(nPos); - char* pTo = reinterpret_cast(&nVal); - *pTo++ = *pFrom++; - *pTo++ = *pFrom++; - *pTo++ = *pFrom++; - *pTo++ = *pFrom++; - return bSwap ? OSL_SWAPDWORD( nVal ) : nVal; - } - sal_uInt32 Size(){ return nLen; } - void Put( sal_uInt64 lVal ) - { - union - { - sal_uInt64 lVal64; - sal_uInt32 aVal32[2]; - }; - lVal64 = lVal; - if( bSwap ) - { - Put( aVal32[1] ); - Put( aVal32[0] ); - } - else - { - Put( aVal32[0] ); - Put( aVal32[1] ); - } - } - void Put( sal_Int32 lVal ) - { - union - { - sal_uInt32 lVal32; - sal_uInt16 aVal16[2]; - }; - lVal32 = lVal; - - if( bSwap ) - { - Put( aVal16[1] ); - Put( aVal16[0] ); - } - else - { - Put( aVal16[0] ); - Put( aVal16[1] ); - } - } - void Put( sal_uInt32 nValue ) - { Put( (sal_Int32)nValue ); } - void Put( sal_uInt16 nValue ); - void PutUTF8( char * pData ); - - void PutAt( sal_uInt32 nPos, sal_Int32 lVal ) - { - union - { - sal_uInt32 lVal32; - sal_uInt16 aVal16[2]; - }; - lVal32 = lVal; - - if( bSwap ) - { - PutAt( nPos, aVal16[1] ); - PutAt( nPos + 2, aVal16[0] ); - } - else - { - PutAt( nPos, aVal16[0] ); - PutAt( nPos + 2, aVal16[1] ); - } - } - void PutAt( sal_uInt32 nPos, sal_uInt32 lVal ) - { - PutAt( nPos, (sal_Int32)lVal); - } - void PutAt( sal_uInt32 nPos, sal_uInt16 nVal ) - { - if( bSwap ) - nVal = OSL_SWAPWORD( nVal ); - char* pTo = GetPointer( nPos ); - char* pFrom = reinterpret_cast(&nVal); - *pTo++ = *pFrom++; - *pTo++ = *pFrom++; - } -}; - -#endif // INCLUDED_RSC_INC_RSCTOOLS_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rsctop.hxx b/rsc/inc/rsctop.hxx deleted file mode 100644 index 76c96844cb73..000000000000 --- a/rsc/inc/rsctop.hxx +++ /dev/null @@ -1,210 +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_RSC_INC_RSCTOP_HXX -#define INCLUDED_RSC_INC_RSCTOP_HXX - -#include -#include -#include -#include -#include -#include -#include - -enum class RSCVAR { - NONE = 0x0000, - Pointer = 0x0001, - Hidden = 0x0002, - NoDataInst = 0x0004, - NoRc = 0x0008, - SvDynamic = 0x0010, - NoEnum = 0x0020 -}; -namespace o3tl { - template<> struct typed_flags : is_typed_flags {}; -} - -class RscTop : public RefNode -{ - RscTop * pSuperClass; - RSCINST aDfltInst; - RESOURCE_TYPE nTypId; - RscTop * pRefClass; - -protected: - RscTop( Atom nId, RESOURCE_TYPE nTypIdent, - RscTop * pSuperCl = nullptr ); - -public: - OString aCallPar1; // class call without types until ResId - OString aCallPar2; // class call without types staring at ResId - OString aCallParType; // class call with types - - RscTop* GetSuperClass() const - { return pSuperClass; } - // returns the type identifier - RESOURCE_TYPE GetTypId() const - { return nTypId; }; - // returns the super class - bool InHierarchy( RscTop * pClass ); - void SetCallPar( const OString& rPar1, const OString& rPar2, - const OString& rParType ); - RscTop* GetRefClass() const { return pRefClass; } - RSCINST const & GetDefault(); - - // preparation fro the destructor call - // given that classes can have mutual dependencies, - // we cannot assume in destructor that all class pointer - // are still valid - virtual void Pre_dtor(); - - virtual RscTop* GetTypeClass() const; - - // returns the class size in bytes - virtual sal_uInt32 Size() const; - - // returns the reference - virtual ERRTYPE GetRef( const RSCINST & rInst, RscId * ); - - // sets the reference - virtual ERRTYPE SetRef( const RSCINST & rInst, const RscId & rRefId ); - - // sets the variable - virtual ERRTYPE SetVariable( Atom nVarName, RscTop * pClass, - RSCINST * pDflt = nullptr, - RSCVAR nVarType = RSCVAR::NONE, sal_uInt32 nMask = 0, - Atom nDataBaseName = InvalidAtom ); - - // returns variable instance - // returned pData, pClass may be NULL - virtual RSCINST GetVariable( const RSCINST & rInst, Atom nVarName, - const RSCINST & rInitInst, - bool bInitDflt = false, - RscTop * pCreateClass = nullptr ); - virtual RSCINST GetCopyVar( const RSCINST & rInst, Atom nVarName ); - - virtual RSCINST GetTupelVar( const RSCINST & rInst, sal_uInt32 nPos, - const RSCINST & rInitInst ); - - // returns instance from a field - // returned pGetInst may be NULL - virtual ERRTYPE GetElement( const RSCINST & rInst, const RscId & rEleName, - RscTop *pCreateClass, const RSCINST & rCreateInst, - RSCINST * pGetInst ); - - // returns instance from a value - // returned pGetInst may be NULL - virtual ERRTYPE GetValueEle( const RSCINST & rInst, sal_Int32 lValue, - RscTop * pCreateClass, - RSCINST * pGetInst ); - - // returns instance from an array - // returned pGetInst may be NULL - virtual ERRTYPE GetArrayEle( const RSCINST & rInst, Atom nId, - RscTop * pCreateClass, - RSCINST * pGetInst ); - - virtual RSCINST SearchEle( const RSCINST & rInst, const RscId & rEleName, - RscTop * pClass ); - - // returns instance at the position - virtual RSCINST GetPosEle( const RSCINST & rInst, sal_uInt32 nPos ); - - // move an instance - virtual ERRTYPE MovePosEle( const RSCINST & rInst, sal_uInt32 nDestPos, - sal_uInt32 nSourcePos ); - - // changes RscId at position - virtual ERRTYPE SetPosRscId( const RSCINST & rInst, sal_uInt32 nPos, - const RscId & rRscId); - - // returns instance information at position - virtual SUBINFO_STRUCT GetInfoEle( const RSCINST & rInst, sal_uInt32 nPos ); - - // number of entries - virtual sal_uInt32 GetCount( const RSCINST & rInst ); - - // an assignment to a variable - virtual ERRTYPE SetNumber( const RSCINST & rInst, sal_Int32 lValue ); - - // an assignment to a variable - virtual ERRTYPE SetBool( const RSCINST & rInst, bool bValue ); - - // an assignment to a variable - virtual ERRTYPE SetConst( const RSCINST & rInst, Atom nValueId, - sal_Int32 nValue ); - - // an assignment to a variable - ERRTYPE SetNotConst( const RSCINST & rInst, Atom nId ); - - virtual ERRTYPE SetString( const RSCINST & rInst, const char * pStr ); - - virtual ERRTYPE GetNumber( const RSCINST & rInst, sal_Int32 * pN ); - - ERRTYPE GetBool( const RSCINST & rInst, bool * pB ); - - virtual ERRTYPE GetConst( const RSCINST & rInst, Atom * pH ); - - virtual ERRTYPE GetString( const RSCINST & rInst, char ** ppStr ); - - virtual RSCINST Create( RSCINST * pInst, - const RSCINST & rDefInst, bool bOwnClass = false ); - - // destroys instance - virtual void Destroy( const RSCINST & rInst ); - - // checks consistency - virtual bool IsConsistent( const RSCINST & rInst ); - - // sets all default values - virtual void SetToDefault( const RSCINST & rInst ); - - // whether input is equal to default - virtual bool IsDefault( const RSCINST & rInst ); - - // sets value to default - virtual bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ); - - // sets intance to default - virtual void SetDefault( const RSCINST & rInst, Atom nVarId ); - - // returns a variable default - virtual RSCINST GetDefault( Atom nVarId ); - - virtual void Delete( const RSCINST & rInst, RscTop * pClass, - const RscId & rId ); - - virtual void DeletePos( const RSCINST & rInst, sal_uInt32 nPos ); - - // writes header and footer of a resource script file - virtual void WriteSrcHeader( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, - const RscId & aId, const char * ); - virtual void WriteSrc( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab,const char * ); - virtual ERRTYPE WriteRcHeader( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont * pTC, const RscId & aId, - sal_uInt32 nDeep ); - virtual ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32 nDeep ); -}; - -#endif // INCLUDED_RSC_INC_RSCTOP_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/inc/rsctree.hxx b/rsc/inc/rsctree.hxx deleted file mode 100644 index 47dffeb66a5a..000000000000 --- a/rsc/inc/rsctree.hxx +++ /dev/null @@ -1,76 +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_RSC_INC_RSCTREE_HXX -#define INCLUDED_RSC_INC_RSCTREE_HXX - -#include -#include - -class NameNode -{ - void SubOrderTree( NameNode * pOrderNode ); - -protected: - NameNode* pLeft; // left subtree - NameNode* pRight; // right subtree - - // pCmp is pointer to names - NameNode* Search( const void * pCmp ) const; - - // convert a double linked list into a binary tree - NameNode* ChangeDLListBTree( NameNode * pList ); - - NameNode(); - virtual ~NameNode(); - - // convert a binary tree in a double linked list - NameNode* ChangeBTreeDLList(); - -public: - void EnumNodes( Link aLink ) const; - NameNode* Left() const { return pLeft; } - NameNode* Right() const{ return pRight; } - NameNode* Search( const NameNode * pName ) const; - // insert a new node in the b-tree - bool Insert( NameNode * pTN, sal_uInt32 * nDepth ); - bool Insert( NameNode* pTN ); - virtual COMPARE Compare( const NameNode * ) const; - virtual COMPARE Compare( const void * ) const; - NameNode* SearchParent( const NameNode * ) const; - // returns the new root - NameNode* Remove( NameNode * ); - void OrderTree(); -}; - -class IdNode : public NameNode -{ - virtual COMPARE Compare( const NameNode * ) const override; - virtual COMPARE Compare( const void * ) const override; -protected: - using NameNode::Search; - -public: - - IdNode* Search( sal_uInt32 nTypName ) const; - virtual sal_uInt32 GetId() const; -}; - -#endif // INCLUDED_RSC_INC_RSCTREE_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/parser/erscerr.cxx b/rsc/source/parser/erscerr.cxx deleted file mode 100644 index a6dcb46cf227..000000000000 --- a/rsc/source/parser/erscerr.cxx +++ /dev/null @@ -1,403 +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 -#include - -#include -#include -#include -#include -#include -#include - -#include "rsclex.hxx" - -ERRTYPE& ERRTYPE::operator = ( const ERRTYPE & rError ) -{ - if( !IsError() ){ - if( rError.IsError() || !IsWarning() ) - nError = rError.nError; - } - return *this; -} - -void RscError::StdOut( const char * pStr, const RscVerbosity _verbosityLevel ) -{ - if ( m_verbosity >= _verbosityLevel ) - { - if( pStr ){ - printf( "%s", pStr ); - fflush( stdout ); - } - } -} - -void RscError::StdErr( const char * pStr ) -{ - if( pStr ) - fprintf( stderr, "%s", pStr ); -} - -void RscError::LstOut( const char * pStr ){ - if( fListing && pStr ) - fprintf( fListing, "%s", pStr ); -} - -void RscError::StdLstOut( const char * pStr ){ - StdOut( pStr ); - LstOut( pStr ); -} - -void RscError::StdLstErr( const char * pStr ){ - StdErr( pStr ); - LstOut( pStr ); -} - -void RscError::WriteError( const ERRTYPE& rError, const char * pMessage ) -{ - switch( rError.GetError() ) - { - case ERR_ERROR: { - StdLstErr( "!! " ); - if( 1 == nErrors ) - StdLstErr(OString::number(nErrors).getStr()); - else - StdLstErr(OString::number(nErrors -1).getStr()); - StdLstErr( " Error" ); - StdLstErr( " found!!" ); - } - break; - - case ERR_UNKNOWN_METHOD: - StdLstErr( "The used type is not allowed." ); - break; - - case ERR_OPENFILE: - StdLstErr( "This file <" ); - StdLstErr( pMessage ); - StdLstErr( "> cannot be opened." ); - break; - - case ERR_RENAMEFILE: - StdLstErr( "rename <" ); - StdLstErr( pMessage ); - StdLstErr( "> s not possible." ); - break; - - case ERR_FILESIZE: - StdLstErr( "Wrong file <" ); - StdLstErr( pMessage ); - StdLstErr( "> length." ); - break; - - case ERR_FILEFORMAT: - StdLstErr( "Wrong file type <" ); - StdLstErr( pMessage ); - StdLstErr( ">." ); - break; - - case ERR_NOCHAR: - StdLstErr( "Character: '\\xxx'; The value xxx is greater than 255."); - break; - - case ERR_NORSCINST: - StdLstErr( "Internal error, instance invalid."); - break; - - - case ERR_NOINPUT: - StdLstErr( "Input file was not specified.\n"); - SAL_FALLTHROUGH; - case ERR_USAGE: - StdLstOut( "Copyright (C) 2000 - 2012 LibreOffice contributors.\n" ); - { - char buf[40]; - - StdLstOut( "DataVersion: " ); - sprintf( buf, "%d.%d\n\n", - RSCVERSION_ID / 100, RSCVERSION_ID % 100 ); - StdLstOut( buf ); - } - - StdLstOut( "Command line: rsc [Switches] \n" ); - StdLstOut( "Command line: rsc @\n" ); - StdLstOut( "-h shows this help.\n" ); - StdLstOut( "-p No preprocessor.\n" ); - StdLstOut( "-s Syntax analysis, creates .srs file\n"); - StdLstOut( "-l Linker, links files created with rsc -s,\n" ); - StdLstOut( " creates .rc file and .res file.\n" ); - StdLstOut( "-r Prevents .res file.\n" ); - StdLstOut( "-d Symbol definitions for the Preprocessor.\n" ); - StdLstOut( "-i Include directives for the Preprocessor.\n" ); - StdLstOut( "-presponse Use response file for Preprocessor.\n" ); - StdLstOut( "-lg Use a different language.\n" ); - StdLstOut( "-fs= Name of the .res file.\n" ); - StdLstOut( "-lip= additional search path for system dependent files\n" ); - StdLstOut( "-fp= Renaming of the .srs file.\n" ); - StdLstOut( "-sub= replace by in image list files\n" ); - StdLstOut( "-BIGENDIAN Format of number values.\n" ); - StdLstOut( "-LITTLEENDIAN Format of number values.\n" ); - StdLstOut( "-SrsDefault Only write one language to srs file.\n" ); - StdLstOut( "\nwhen creating multiple .res files in one pass, please give these\n" ); - StdLstOut( "options in consecutive blocks:\n" ); - StdLstOut( "-lg -fs [-lip [-lip] ]\n" ); - StdLstOut( "a new block begins when either -lg or -fs is used again.\n" ); - break; - - case ERR_UNKNOWNSW: - StdLstErr( "Unknown switch <" ); - StdLstErr( pMessage ); - StdLstErr( ">." ); - break; - - case ERR_REFTODEEP: - StdLstErr( "Too many reference levels have been used (see Switch -RefDeep)." ); - break; - - case ERR_CONT_INVALIDPOS: - StdLstErr( "Internal error, Container class: invalid position." ); - break; - - case ERR_CONT_INVALIDTYPE: - StdLstErr( "Invalid type <" ); - StdLstErr( pMessage ); - StdLstErr( ">." ); - break; - - case ERR_ARRAY_INVALIDINDEX: - StdLstErr( "Internal error, Array class: invalid index." ); - break; - - case ERR_RSCINST_NOVARNAME: - StdLstErr( "Internal error, invalid name of variable." ); - break; - - case ERR_YACC: - StdLstErr( pMessage ); - break; - - case ERR_DOUBLEID: - StdLstErr( "Two global resources have the same identifier." ); - break; - - case ERR_FALSETYPE: - StdLstErr( "Wrong type <" ); - StdLstErr( pMessage ); - StdLstErr( ">." ); - break; - - case ERR_NOVARIABLENAME: - StdLstErr( "The variable <" ); - StdLstErr( pMessage ); - StdLstErr( "> must not be used here." ); - break; - - case ERR_RSCRANGE_OUTDEFSET: - StdLstErr( "The used value is not in the expected domain." ); - break; - - case ERR_USHORTRANGE: - StdLstErr( "Value is <" ); - StdLstErr( pMessage ); - StdLstErr( "> the allowed domain is from 0 up to 65535." ); - break; - - case ERR_IDRANGE: - StdLstErr( "Value is <" ); - StdLstErr( pMessage ); - StdLstErr( "> the allowed domain is from 1 up to 32767." ); - break; - - case ERR_NOCOPYOBJ: - StdLstErr( "Default resource <" ); - StdLstErr( pMessage ); - StdLstErr( "> not found." ); - break; - - case ERR_REFNOTALLOWED: - StdLstErr( "The use of a reference is not allowed." ); - break; - - case ERR_COPYNOTALLOWED: - StdLstErr( "The use of a default resource is not allowed." ); - break; - - case ERR_IDEXPECTED: - StdLstErr( "An identifier needs to be specified." ); - break; - - case ERR_DOUBLEDEFINE: - StdLstErr( "The symbol <" ); - StdLstErr( pMessage ); - StdLstErr( "> is defined twice." ); - break; - - case ERR_RSCINST_RESERVEDNAME: - StdLstErr( "The symbol <" ); - StdLstErr( pMessage ); - StdLstErr( "> is a reserved name." ); - break; - - case ERR_ZERODIVISION: - StdLstErr( "Attempt to divide by zero." ); - break; - - case ERR_PRAGMA: - StdLstErr( "Error in a #pragma statement." ); - break; - - case ERR_DECLAREDEFINE: - StdLstErr( "Error in the declaration part of the macro." ); - break; - - case ERR_NOTYPE: - StdLstErr( "type expected." ); - break; - - case ERR_NOIMAGE: - StdLstErr( "The image(s) <" ); - StdLstErr( pMessage ); - StdLstErr( "> could not be found." ); - break; - - case WRN_LOCALID: - StdLstErr( "Sub resources should have an identifier < 256." ); - break; - - case WRN_GLOBALID: - StdLstErr( "Global resources should have an identifier >= 256." ); - break; - - case WRN_SUBINMEMBER: - StdLstErr( "Sub resources are ignored." ); - break; - - case WRN_CONT_NOID: - StdLstErr( "Resources without name are ignored." ); - break; - - case WRN_CONT_DOUBLEID: - StdLstErr( "Two local resources have the same identifier." ); - break; - - case WRN_STR_REFNOTFOUND: - StdLstErr( "String reference <" ); - StdLstErr( pMessage ); - StdLstErr( " > could not be resolved." ); - break; - - case WRN_MGR_REFNOTFOUND: - StdLstErr( "Reference <" ); - StdLstErr( pMessage ); - StdLstErr( " > could not be resolved." ); - break; - - default: - if( pMessage ){ - StdLstErr( "\nMessage: " ); - StdLstErr( pMessage ); - }; - break; - } -} - -void RscError::ErrorFormat( const ERRTYPE& rError, RscTop * pClass, - const RscId & aId ){ - char buf[ 10 ]; - sal_uInt32 i; - - if( pFI ) - { - pFI->SetError( rError ); - StdErr( "\n" ); - StdErr( pFI->GetLine() ); - StdErr( "\n" ); - // Show location of error - for( i = 0; (i +1) < pFI->GetScanPos(); i++ ) - StdLstErr( " " ); - LstOut( " ^" ); // for the linenumber - StdErr( "^" ); - StdLstErr( "\n" ); - } - StdLstErr( "f" ); - sprintf( buf, "%u", (unsigned int)rError.GetError() ); - StdLstErr( buf ); - - if( pFI && pTC ){ - StdLstErr( ": \"" ); - StdLstErr( pTC->aFileTab.Get( pFI->GetFileIndex() )->aFileName.getStr() ); - StdLstErr( "\", line " ); - sprintf( buf, "%u", (unsigned int)pFI->GetLineNo() ); - StdLstErr( buf ); - } - - if( rError.IsError() ) - StdLstErr( ": Error" ); - else - StdLstErr( ": Warning" ); - - if( pClass || aId.IsId() ) - { - StdLstErr( " in the object (" ); - if( pClass ) - { - StdLstErr( "Type: " ); - StdLstErr( pHS->getString( pClass->GetId() ).getStr() ); - if( aId.IsId() ) - StdLstErr( ", " ); - } - if( aId.IsId() ) - StdLstErr( aId.GetName().getStr() ); - StdLstErr( "):\n" ); - } - else - StdLstErr( ": " ); -} - -void RscError::Error( const ERRTYPE& rError, RscTop * pClass, - const RscId & aId, const char * pMessage ) -{ - if( WRN_LOCALID == rError.GetError() ) // ignore warnings - return; - if( rError.IsError() ) - nErrors++; - if( rError.IsError() || rError.IsWarning() ){ - ErrorFormat( rError, pClass, aId ); - WriteError( rError, pMessage ); - StdLstErr( "\n" ); - } -} - -void RscError::FatalError( const ERRTYPE& rError, const RscId &aId, - const char * pMessage ) -{ - if( ERR_USAGE != rError.GetError() ){ - nErrors++; - ErrorFormat( rError, nullptr, aId ); - WriteError( rError, pMessage ); - StdLstErr( "\nTerminating compiler\n" ); - } - else - WriteError( rError, pMessage ); - - exit( 1 ); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx deleted file mode 100644 index cf6f73bbaba8..000000000000 --- a/rsc/source/parser/rscdb.cxx +++ /dev/null @@ -1,456 +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 -#include -#include - -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - - -RscTypCont::RscTypCont( RscError * pErrHdl, - RSCBYTEORDER_TYPE nOrder, - CommandFlags nFlagsP ) - : nSourceCharSet( RTL_TEXTENCODING_UTF8 ) - , nByteOrder( nOrder ) - , nFilePos( 0 ) - , nPMId(RSC_VERSIONCONTROL + RESOURCE_TYPE(1)) // at least one more - , aEnumLong( pHS->getID( "enum_long" ), RSC_NOTYPE ) - , aString( pHS->getID( "Chars" ), RSC_NOTYPE ) - , aLangType() - , aLangString( pHS->getID( "Lang_Chars" ), RSC_NOTYPE, &aString, &aLangType ) - , pEH(pErrHdl) - , nFlags( nFlagsP ) -{ - Init(); -} - -OString RscTypCont::ChangeLanguage(const OString& rNewLang) -{ - OString aRet = aLanguage; - aLanguage = rNewLang; - - ::std::vector< OUString > aFallbacks; - - if (rNewLang.isEmpty()) - aFallbacks.push_back( "" ); // do not resolve to SYSTEM (en-US) - else - aFallbacks = LanguageTag( OStringToOUString( rNewLang, RTL_TEXTENCODING_ASCII_US)).getFallbackStrings( true); - - bool bAppendEnUsFallback = ! (rNewLang.equalsIgnoreAsciiCase( "en-US" ) || - rNewLang.equalsIgnoreAsciiCase( "x-no-translate" ) ); - if (bAppendEnUsFallback) - aFallbacks.push_back( "en-US"); - -#if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "RscTypCont::ChangeLanguage: " ); -#endif - - aLangFallbacks.clear(); - - for (OUString& rItem : aFallbacks) - { - OString aLang(OUStringToOString(rItem, RTL_TEXTENCODING_ASCII_US)); - sal_uInt32 nID = GetLangId( aLang ); - bool bAdd = (nID == 0); - if ( bAdd ) - { - AddLanguage( aLang.getStr() ); - nID = GetLangId( aLang ); - } -#if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, " '%s' (0x%hx) (%s)", aLang.getStr(), (int)nID, (bAdd ? "added" : "exists") ); -#endif - aLangFallbacks.push_back( nID); - } - -#if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "\n" ); -#endif - - return aRet; -} - -Atom RscTypCont::AddLanguage( const char* pLang ) -{ - return aLangType.AddLanguage( pLang, aNmTb ); -} - - -void DestroyNode( RscTop * pRscTop, ObjNode * pObjNode ) -{ - if( pObjNode ) - { - DestroyNode( pRscTop, static_cast(pObjNode->Left()) ); - DestroyNode( pRscTop, static_cast(pObjNode->Right()) ); - - if( pObjNode->GetRscObj() ) - { - pRscTop->Destroy( RSCINST( pRscTop, pObjNode->GetRscObj() ) ); - rtl_freeMemory( pObjNode->GetRscObj() ); - } - delete pObjNode; - } -} - -void DestroySubTrees( RscTop * pRscTop ) -{ - if( pRscTop ) - { - DestroySubTrees( static_cast(pRscTop->Left()) ); - DestroyNode( pRscTop, pRscTop->GetObjNode() ); - DestroySubTrees( static_cast(pRscTop->Right()) ); - } -} - -void DestroyTree( RscTop * pRscTop ) -{ - if( pRscTop ) - { - DestroyTree( static_cast(pRscTop->Left()) ); - DestroyTree( static_cast(pRscTop->Right()) ); - - delete pRscTop; - } -} - -void Pre_dtorTree( RscTop * pRscTop ) -{ - if( pRscTop ) - { - Pre_dtorTree( static_cast(pRscTop->Left()) ); - Pre_dtorTree( static_cast(pRscTop->Right()) ); - - pRscTop->Pre_dtor(); - } -} - -RscTypCont::~RscTypCont() -{ - // delete all subtrees - aVersion.pClass->Destroy( aVersion ); - rtl_freeMemory( aVersion.pData ); - DestroySubTrees( pRoot ); - - // all classes are still valid, destroy each instance - // of base types - for (RscTop* pItem : aBaseLst) - pItem->Pre_dtor(); - - aString.Pre_dtor(); - aVersion.pClass->Pre_dtor(); - // sub-types - Pre_dtorTree( pRoot ); - - // destroy classes - delete aVersion.pClass; - DestroyTree( pRoot ); - - for (RscTop* pItem : aBaseLst) - delete pItem; -} - -class RscEnumerateObj -{ -friend class RscEnumerateRef; -private: - ERRTYPE aError; // contains the first field - RscTypCont* pTypCont; - FILE * fOutput; // output file - RscFileTab::Index lFileKey; // what source file - RscTop * pClass; - - RscEnumerateObj(RscTypCont* pTC, FILE* pOutputFile) - :pTypCont(pTC) - ,fOutput(pOutputFile) - ,lFileKey(0) - ,pClass(nullptr) - { - } - - DECL_LINK( CallBackWriteRc, const NameNode&, void ); - DECL_LINK( CallBackWriteSrc, const NameNode&, void ); - - void WriteRc( RscTop * pCl, ObjNode * pRoot ) - { - pClass = pCl; - if( pRoot ) - pRoot->EnumNodes( LINK( this, RscEnumerateObj, CallBackWriteRc ) ); - } - void WriteSrc( RscTop * pCl, ObjNode * pRoot ){ - pClass = pCl; - if( pRoot ) - pRoot->EnumNodes( LINK( this, RscEnumerateObj, CallBackWriteSrc ) ); - } -public: - void WriteRcFile( RscWriteRc & rMem, FILE * fOutput ); -}; - -IMPL_LINK( RscEnumerateObj, CallBackWriteRc, const NameNode&, rNode, void ) -{ - const ObjNode& rObjNode = static_cast(rNode); - RscWriteRc aMem( pTypCont->GetByteOrder() ); - - aError = pClass->WriteRcHeader( RSCINST( pClass, rObjNode.GetRscObj() ), - aMem, pTypCont, - rObjNode.GetRscId(), 0 ); - if( aError.IsError() || aError.IsWarning() ) - pTypCont->pEH->Error( aError, pClass, rObjNode.GetRscId() ); - - WriteRcFile( aMem, fOutput ); -} - -IMPL_LINK( RscEnumerateObj, CallBackWriteSrc, const NameNode&, rNode, void ) -{ - const ObjNode& rObjNode = static_cast(rNode); - if( rObjNode.GetFileKey() == lFileKey ) - { - pClass->WriteSrcHeader( RSCINST( pClass, rObjNode.GetRscObj() ), - fOutput, pTypCont, 0, - rObjNode.GetRscId(), "" ); - fprintf( fOutput, ";\n" ); - } -} - -void RscEnumerateObj::WriteRcFile( RscWriteRc & rMem, FILE * fOut ) -{ - // structure definition from which the resource is built - /* - struct RSHEADER_TYPE{ - sal_uInt32 nId; // resource identifier - RESOURCE_TYPE nRT; // resource type - sal_uInt32 nGlobOff; // global offset - sal_uInt32 nLocalOff; // local offset - } aHeader; - */ - - sal_uInt32 nId = rMem.GetLong( 0 ); - RESOURCE_TYPE nRT(rMem.GetLong( 4 )); - - // table is filled with nId and nRT - pTypCont->PutTranslatorKey( (sal_uInt64(sal_uInt32(nRT)) << 32) + sal_uInt64(nId) ); - - if( nRT == RSC_VERSIONCONTROL ) - { // always comes last - sal_Int32 nCount = pTypCont->aIdTranslator.size(); - // table size - sal_uInt32 nSize = (nCount * (sizeof(sal_uInt64)+sizeof(sal_Int32))) + sizeof(sal_Int32); - - rMem.Put( nCount ); // save the count - for (auto& rItem : pTypCont->aIdTranslator) - { - // save the key - rMem.Put( rItem.first ); - // save the object id or position - rMem.Put( static_cast(rItem.second) ); - } - rMem.Put( nSize ); // save the size next - } - - // reset the file offset - pTypCont->IncFilePos( rMem.Size() ); - - - // position was written previously in the table - bool bSuccess = (1 == fwrite( rMem.GetBuffer(), rMem.Size(), 1, fOut )); - SAL_WARN_IF(!bSuccess, "rsc", "short write"); -}; - -class RscEnumerateRef -{ -private: - RscTop * pRoot; - - DECL_LINK( CallBackWriteRc, const NameNode&, void ); - DECL_LINK( CallBackWriteSrc, const NameNode&, void ); -public: - RscEnumerateObj aEnumObj; - - RscEnumerateRef(RscTypCont* pTC, RscTop* pR, FILE* fOutput) - : pRoot(pR), aEnumObj(pTC, fOutput) - { - } - ERRTYPE const & WriteRc() - { - aEnumObj.aError.Clear(); - pRoot->EnumNodes( LINK( this, RscEnumerateRef, CallBackWriteRc ) ); - return aEnumObj.aError; - } - ERRTYPE const & WriteSrc( RscFileTab::Index lFileKey ) - { - aEnumObj.lFileKey = lFileKey; - - aEnumObj.aError.Clear(); - pRoot->EnumNodes( LINK( this, RscEnumerateRef, CallBackWriteSrc ) ); - return aEnumObj.aError; - } -}; - -IMPL_LINK( RscEnumerateRef, CallBackWriteRc, const NameNode&, rNode, void ) -{ - const RscTop& rRef = static_cast(rNode); - aEnumObj.WriteRc( const_cast(&rRef), rRef.GetObjNode() ); -} - -IMPL_LINK( RscEnumerateRef, CallBackWriteSrc, const NameNode&, rNode, void ) -{ - const RscTop& rRef = static_cast(rNode); - aEnumObj.WriteSrc( const_cast(&rRef), rRef.GetObjNode() ); -} - -ERRTYPE RscTypCont::WriteRc( WriteRcContext& rContext ) -{ - ERRTYPE aError; - RscEnumerateRef aEnumRef( this, pRoot, rContext.fOutput ); - - aIdTranslator.clear(); - nFilePos = 0; - nPMId = RSCVERSION_ID +1; // at least one more - - aError = aEnumRef.WriteRc(); - - // version control - RscWriteRc aMem( nByteOrder ); - aVersion.pClass->WriteRcHeader( aVersion, aMem, this, RscId( RSCVERSION_ID ), 0 ); - aEnumRef.aEnumObj.WriteRcFile( aMem, rContext.fOutput ); - - return aError; -} - -void RscTypCont::WriteSrc( FILE * fOutput, RscFileTab::Index nFileKey ) -{ - RscEnumerateRef aEnumRef( this, pRoot, fOutput ); - - unsigned char aUTF8BOM[3] = { 0xef, 0xbb, 0xbf }; - size_t nItems = SAL_N_ELEMENTS(aUTF8BOM); - bool bSuccess = (nItems == fwrite(aUTF8BOM, 1, nItems, fOutput)); - SAL_WARN_IF(!bSuccess, "rsc", "short write"); - RscId::SetNames( false ); - if( nFileKey == RscFileTab::IndexNotFound ) - { - RscFileTab::Index aIndex = aFileTab.FirstIndex(); - while( aIndex != RscFileTab::IndexNotFound ) - { - aEnumRef.WriteSrc( aIndex ); - aIndex = aFileTab.NextIndex( aIndex ); - }; - } - else - aEnumRef.WriteSrc( nFileKey ); - RscId::SetNames(); -} - -class RscDel -{ - RscFileTab::Index lFileKey; - DECL_LINK( Delete, const NameNode&, void ); -public: - RscDel( RscTop * pRoot, RscFileTab::Index lKey ); -}; - - -inline RscDel::RscDel( RscTop * pRoot, RscFileTab::Index lKey ) - : lFileKey(lKey) -{ - pRoot->EnumNodes( LINK( this, RscDel, Delete ) ); -} - -IMPL_LINK( RscDel, Delete, const NameNode&, r, void ) -{ - RscTop* pNode = const_cast(static_cast(&r)); - if( pNode->GetObjNode() ) - pNode->pObjBiTree = pNode->GetObjNode()->DelObjNode( pNode, lFileKey ); -} - -void RscTypCont::Delete( RscFileTab::Index lFileKey ) -{ - // delete resource instance - RscDel aDel( pRoot, lFileKey ); - // delete defines - aFileTab.DeleteFileContext( lFileKey ); -} - -bool IsInstConsistent( ObjNode * pObjNode, RscTop * pRscTop ) -{ - bool bRet = true; - - if( pObjNode ) - { - RSCINST aTmpI; - - if( ! IsInstConsistent( static_cast(pObjNode->Left()), pRscTop ) ) - bRet = false; - - aTmpI.pClass = pRscTop; - aTmpI.pData = pObjNode->GetRscObj(); - if( ! aTmpI.pClass->IsConsistent( aTmpI ) ) - bRet = false; - - if( ! IsInstConsistent( static_cast(pObjNode->Right()), pRscTop ) ) - bRet = false; - } - - return bRet; -} - -bool MakeConsistent( RscTop * pRscTop ) -{ - bool bRet = true; - - if( pRscTop ) - { - if( ! ::MakeConsistent( static_cast(pRscTop->Left()) ) ) - bRet = false; - - if( pRscTop->GetObjNode() ) - { - if( ! pRscTop->GetObjNode()->IsConsistent() ) - { - pRscTop->GetObjNode()->OrderTree(); - if( ! pRscTop->GetObjNode()->IsConsistent() ) - bRet = false; - } - if( ! IsInstConsistent( pRscTop->GetObjNode(), pRscTop ) ) - bRet = false; - } - - if( ! ::MakeConsistent( static_cast(pRscTop->Right()) ) ) - bRet = false; - } - - return bRet; -} - -void RscTypCont::PutTranslatorKey( sal_uInt64 nKey ) -{ - aIdTranslator[ nKey ] = nFilePos; - nPMId++; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx deleted file mode 100644 index 556563b76512..000000000000 --- a/rsc/source/parser/rscibas.cxx +++ /dev/null @@ -1,216 +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 -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include -#include -#include -#include - -#include - -void RscTypCont::SETCONST( RscEnum * pClass, const char * szString, sal_uInt32 nVal ) -{ -#if OSL_DEBUG_LEVEL > 2 - fprintf( stderr, "setconst : %s\n", szString ); -#endif - pClass->SetConstant( aNmTb.Put( szString, - CONSTNAME, nVal ), nVal ); -} - -typedef std::unordered_map< OString, sal_uInt32, OStringHash > langmap; -static langmap ULong_Iso_map; - -sal_uInt32 GetLangId(const OString &rLang) -{ - langmap::iterator pIter = ULong_Iso_map.find( rLang ); - if ( pIter != ULong_Iso_map.end()) - return pIter->second; - return 0; -} - -void RscLangEnum::Init( RscNameTable& rNames ) -{ - SetConstant( rNames.Put( "SYSTEM", CONSTNAME, (sal_uInt16)LANGUAGE_SYSTEM ), (sal_uInt16)LANGUAGE_SYSTEM ); - SetConstant( rNames.Put( "DONTKNOW", CONSTNAME, (sal_uInt16)LANGUAGE_DONTKNOW ), (sal_uInt16)LANGUAGE_DONTKNOW ); - - sal_Int32 nIndex = 0; - mnLangId = 0x400; // stay away from selfdefined... - - const ::std::vector< MsLangId::LanguagetagMapping > aList( MsLangId::getDefinedLanguagetags()); - for (::std::vector< MsLangId::LanguagetagMapping >::const_iterator iTag( aList.begin()); iTag != aList.end(); ++iTag) - { -#if OSL_DEBUG_LEVEL > 2 - fprintf( stderr, "ISO Language in : %d, 0x%04x, %s\n", - (int)nIndex, - (unsigned)(*iTag).mnLang, - OUStringToOString( (*iTag).maBcp47, RTL_TEXTENCODING_ASCII_US).getStr()); - fprintf( stderr, "ISO Language out:"); -#endif - LanguageTag aLanguageTag( (*iTag).maBcp47); - ::std::vector< OUString > aFallbacks( aLanguageTag.getFallbackStrings( true)); - for (::std::vector< OUString >::const_iterator it( aFallbacks.begin()); it != aFallbacks.end(); ++it) - { - OString aLang( OUStringToOString( *it, RTL_TEXTENCODING_ASCII_US)); - SetConstant( rNames.Put( aLang.getStr(), CONSTNAME, mnLangId ), mnLangId ); - bool bAdd = (GetLangId( aLang ) == 0); - if ( bAdd ) - ULong_Iso_map[ aLang ] = mnLangId; -#if OSL_DEBUG_LEVEL > 2 - fprintf( stderr, " %s 0x%lx (%s)", aLang.getStr(), mnLangId, (bAdd ? "added" : "exists") ); -#endif - mnLangId++; - } -#if OSL_DEBUG_LEVEL > 2 - fprintf( stderr, "\n"); -#endif - nIndex++; - } - // hack - survive "x-no-translate" - /* XXX: that ^^^ was the original comment, but we're adding "x-comment" - * here? Which is good anyway. */ - SetConstant( rNames.Put( "x-comment", CONSTNAME, mnLangId ), mnLangId ); - mnLangId++; - - OString aEnvIsoTokens = getenv( "RSC_LANG_ISO" ); - if ( !aEnvIsoTokens.isEmpty() ) - { - OString aIsoToken; - sal_uInt16 nTokenCounter = 0; - bool bOneMore = true; - while ( bOneMore ) - { - aIsoToken = aEnvIsoTokens.getToken(nTokenCounter, ' '); - if ( !aIsoToken.isEmpty() ) - { - SetConstant( rNames.Put( aIsoToken.getStr(), CONSTNAME, mnLangId ), mnLangId ); - bool bAdd = (GetLangId( aIsoToken ) == 0); - if ( bAdd ) - ULong_Iso_map[ aIsoToken ] = mnLangId; -#if OSL_DEBUG_LEVEL > 2 - fprintf( stderr, "Env ISO Language out: %s 0x%lx (%s)\n", - aIsoToken.getStr(), mnLangId, (bAdd ? "added" : "exists") ); -#endif - mnLangId++; - } - else - bOneMore = false; - - nTokenCounter++; - } - } -} - -Atom RscLangEnum::AddLanguage( const char* pLang, RscNameTable& rNames ) -{ - Atom nResult = 0; - KEY_STRUCT aStruct; - if( ! rNames.Get( nResult = pHS->getID( pLang ), &aStruct ) ) - { - SetConstant( nResult = rNames.Put( pLang, CONSTNAME, mnLangId ), mnLangId ); - // insert new lang to ULong_Iso_map - OString aLang( pLang ); - bool bAdd = (GetLangId( aLang ) == 0); - if ( bAdd ) - ULong_Iso_map[ aLang ] = mnLangId; - // increase id counter - mnLangId++; - } - return nResult; -} - -RscEnum * RscTypCont::InitFieldUnitsType() -{ - RscEnum * pFieldUnits; - pFieldUnits = new RscEnum( pHS->getID( "EnumFieldUnit" ), RSC_NOTYPE ); - - SETCONST( pFieldUnits, "FUNIT_NONE", FUNIT_NONE ); - SETCONST( pFieldUnits, "FUNIT_MM", FUNIT_MM ); - SETCONST( pFieldUnits, "FUNIT_CM", FUNIT_CM ); - SETCONST( pFieldUnits, "FUNIT_M", FUNIT_M ); - SETCONST( pFieldUnits, "FUNIT_KM", FUNIT_KM ); - SETCONST( pFieldUnits, "FUNIT_TWIP", FUNIT_TWIP ); - SETCONST( pFieldUnits, "FUNIT_POINT", FUNIT_POINT ); - SETCONST( pFieldUnits, "FUNIT_PICA", FUNIT_PICA ); - SETCONST( pFieldUnits, "FUNIT_INCH", FUNIT_INCH ); - SETCONST( pFieldUnits, "FUNIT_FOOT", FUNIT_FOOT ); - SETCONST( pFieldUnits, "FUNIT_MILE", FUNIT_MILE ); - SETCONST( pFieldUnits, "FUNIT_CUSTOM", FUNIT_CUSTOM ); - SETCONST( pFieldUnits, "FUNIT_CHAR", FUNIT_CHAR ); - SETCONST( pFieldUnits, "FUNIT_LINE", FUNIT_LINE ); - SETCONST( pFieldUnits, "FUNIT_PERCENT", FUNIT_PERCENT ); - SETCONST( pFieldUnits, "FUNIT_DEGREE", FUNIT_DEGREE); - SETCONST( pFieldUnits, "FUNIT_SECOND", FUNIT_SECOND); - SETCONST( pFieldUnits, "FUNIT_MILLISECOND", FUNIT_MILLISECOND); - SETCONST( pFieldUnits, "FUNIT_PIXEL", FUNIT_PIXEL ); - - return pFieldUnits; -} - -RscTupel * RscTypCont::InitStringLongTupel() -{ - RscTop * pTupel; - Atom nId; - - // insert client variables - pTupel = new RscTupel( pHS->getID( "CharsLongTupel" ), RSC_NOTYPE ); - nId = aNmTb.Put( "ItemText", VARNAME ); - pTupel->SetVariable( nId, &aString ); - nId = aNmTb.Put( "ItemId", VARNAME ); - pTupel->SetVariable( nId, &aEnumLong ); - - return static_cast(pTupel); -} - -RscCont * RscTypCont::InitStringLongTupelList( RscTupel * pStringLong ) -{ - RscCont * pCont; - - pCont = new RscCont( pHS->getID( "CharsLongTupel[]" ), RSC_NOTYPE ); - pCont->SetTypeClass( pStringLong ); - - return pCont; -} - -RscArray * RscTypCont::InitLangStringLongTupelList( RscCont * pStrLongTupelLst ) -{ - return new RscArray( pHS->getID( "Lang_CharsLongTupelList" ), - RSC_NOTYPE, pStrLongTupelLst, &aLangType ); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx deleted file mode 100644 index 46ab34a0fd97..000000000000 --- a/rsc/source/parser/rscicpx.cxx +++ /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 -#include - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -RscTop * RscTypCont::InitClassMgr() -{ - RscTop * pClassMgr; - RscBaseCont * pClass; - Atom nId; - - aBaseLst.push_back( pClass = new RscBaseCont( InvalidAtom, RSC_NOTYPE, false ) ); - - nId = pHS->getID( "Resource" ); - pClassMgr = new RscMgr( nId, RSC_RESOURCE, pClass ); - aNmTb.Put( nId, CLASSNAME, pClassMgr ); - pClassMgr->SetCallPar( *pStdPar1, *pStdPar2, *pStdParType ); - - // initialize variables - nId = aNmTb.Put( "Comment", VARNAME ); - pClassMgr->SetVariable( nId, &aString, nullptr, RSCVAR::NoRc ); - - pClass->SetTypeClass( pClassMgr ); - - return pClassMgr; -} - -RscTop * RscTypCont::InitClassString( RscTop * pSuper ) -{ - Atom nId; - RscTop * pClassString; - - nId = pHS->getID( "String" ); - pClassString = new RscClass( nId, RSC_STRING, pSuper ); - aNmTb.Put( nId, CLASSNAME, pClassString ); - pClassString->SetCallPar( *pStdPar1, *pStdPar2, *pStdParType ); - - // initialize variables - nId = aNmTb.Put( "Text", VARNAME ); - pClassString->SetVariable( nId, &aLangString ); - return pClassString; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx deleted file mode 100644 index 282b9cad33bf..000000000000 --- a/rsc/source/parser/rscinit.cxx +++ /dev/null @@ -1,106 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - - -#include -#include - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -void RscTypCont::Init() -{ - RscTupel * pStringLongTupel; - RscCont * pStringLongTupelList; - RscArray * pLangStringLongTupelList; - - RscTop * pClassMgr; - RscTop * pClassString; - RscTop * pClassStringArray; - - Atom nId; - - aNmTb.SetSort( false ); -{ - aNmTb.Put( "LINE", LINE, (sal_IntPtr)0 ); - aNmTb.Put( "NOT", NOT, (sal_IntPtr)0 ); - aNmTb.Put( "DEFINE", DEFINE, (sal_IntPtr)0 ); - aNmTb.Put( "INCLUDE", INCLUDE, (sal_IntPtr)0 ); - aNmTb.Put( "DEFAULT", DEFAULT, (sal_IntPtr)0 ); - aNmTb.Put( "class", CLASS, (sal_IntPtr)0 ); - aNmTb.Put( "extendable", EXTENDABLE, (sal_IntPtr)0 ); - aNmTb.Put( "writeifset", WRITEIFSET, (sal_IntPtr)0 ); - -/* values for integer types */ - aNmTb.Put( "TRUE", BOOLEAN, (sal_IntPtr)true ); - aNmTb.Put( "FALSE", BOOLEAN, (sal_IntPtr)false ); -} -{ - aEnumLong.SetRange( SAL_MIN_INT32, SAL_MAX_INT32 ); -} -{ - aLangType.Init( aNmTb ); - aBaseLst.push_back( InitFieldUnitsType() ); - - aBaseLst.push_back( pStringLongTupel = InitStringLongTupel() ); - aBaseLst.push_back( pStringLongTupelList = InitStringLongTupelList( pStringLongTupel ) ); - aBaseLst.push_back( pLangStringLongTupelList = InitLangStringLongTupelList( pStringLongTupelList ) ); -} -{ - pRoot = pClassMgr = InitClassMgr(); - - aVersion.pClass = new RscClass( pHS->getID( "VersionControl" ), - RSC_VERSIONCONTROL, pClassMgr ); - aVersion = aVersion.pClass->Create( nullptr, RSCINST() ); - - pClassString = InitClassString( pClassMgr ); - pRoot->Insert( pClassString ); - - // set String as reference class of the base strings - aString.SetRefClass( pClassString ); - - // initialize class - nId = pHS->getID( "StringArray" ); - pClassStringArray = new RscClass( nId, RSC_STRINGARRAY, pClassMgr ); - pClassStringArray->SetCallPar( *pStdPar1, *pStdPar2, *pStdParType ); - aNmTb.Put( nId, CLASSNAME, pClassStringArray ); - pRoot->Insert( pClassStringArray ); - - // initialize variables - nId = aNmTb.Put( "ItemList", VARNAME ); - pClassStringArray->SetVariable( nId, pLangStringLongTupelList ); -} - - aNmTb.SetSort(); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/parser/rsckey.cxx b/rsc/source/parser/rsckey.cxx deleted file mode 100644 index 843470f793b8..000000000000 --- a/rsc/source/parser/rsckey.cxx +++ /dev/null @@ -1,138 +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 -#include -#include -#include -#include -#include -#include - -extern "C" { - int SAL_CALL KeyCompare( const void * pFirst, const void * pSecond ); -} - -int SAL_CALL KeyCompare( const void * pFirst, const void * pSecond ) -{ - if( static_cast(pFirst)->nName > static_cast(pSecond)->nName ) - return 1; - else if( static_cast(pFirst)->nName < static_cast(pSecond)->nName ) - return -1; - else - return 0; -} - -RscNameTable::RscNameTable() -{ - bSort = true; - nEntries = 0; - pTable = nullptr; -}; - -RscNameTable::~RscNameTable() -{ - if( pTable ) - rtl_freeMemory( pTable ); -}; - - -void RscNameTable::SetSort( bool bSorted ) -{ - bSort = bSorted; - if( bSort && pTable) - { - // sort keyword field - qsort( static_cast(pTable), nEntries, - sizeof( KEY_STRUCT ), KeyCompare ); - } -}; - -Atom RscNameTable::Put( Atom nName, sal_uInt32 nTyp, sal_IntPtr nValue ) -{ - if( pTable ) - pTable = static_cast( - rtl_reallocateMemory( static_cast(pTable), - ((nEntries +1) * sizeof( KEY_STRUCT )) )); - else - pTable = static_cast( - rtl_allocateMemory( (nEntries + 1) * sizeof( KEY_STRUCT ) ) ); - - pTable[ nEntries ].nName = nName; - pTable[ nEntries ].nTyp = nTyp; - pTable[ nEntries ].yylval = nValue; - nEntries++; - if( bSort ) - SetSort(); - - return nName; -}; - -Atom RscNameTable::Put( const char * pName, sal_uInt32 nTyp, sal_IntPtr nValue ) -{ - return Put( pHS->getID( pName ), nTyp, nValue ); -}; - -Atom RscNameTable::Put( const char * pName, sal_uInt32 nTyp ) -{ - Atom nId; - - nId = pHS->getID( pName ); - return Put( nId, nTyp, (sal_IntPtr)nId ); -}; - -void RscNameTable::Put( Atom nName, sal_uInt32 nTyp, RscTop * pClass ) -{ - Put( nName, nTyp, reinterpret_cast(pClass) ); -}; - -bool RscNameTable::Get( Atom nName, KEY_STRUCT * pEle ) -{ - KEY_STRUCT * pKey = nullptr; - KEY_STRUCT aSearchName; - sal_uInt32 i; - - if( bSort ) - { - // search for the keyword - aSearchName.nName = nName; - pKey = static_cast(bsearch( - &aSearchName, pTable, - nEntries, sizeof( KEY_STRUCT ), KeyCompare )); - } - else - { - i = 0; - while( i < nEntries && !pKey ) - { - if( pTable[ i ].nName == nName ) - pKey = &pTable[ i ]; - i++; - } - } - - if( pKey ) - { - *pEle = *pKey; - return true; - } - return false; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx deleted file mode 100644 index c85ef55c96cc..000000000000 --- a/rsc/source/parser/rsclex.cxx +++ /dev/null @@ -1,432 +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 -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include -#include -#include - - -const char* StringContainer::putString( const char* pString ) -{ - OString aString( pString ); - std::pair< - std::unordered_set< OString, OStringHash >::iterator, - bool > aInsert = - m_aStrings.insert( aString ); - - return aInsert.first->getStr(); -} - -static char c; -static bool bLastInclude;// true, if last symbol was INCLUDE -RscFileInst* pFI; -RscTypCont* pTC; -RscExpression * pExp; -struct KeyVal -{ - int nKeyWord; - YYSTYPE aYYSType; -}; -static KeyVal aKeyVal[ 1 ]; -static bool bTargetDefined; - -StringContainer* pStringContainer = nullptr; - -static RscDefine RSC_GLOBAL_DEFINE(RscFileTab::Index(0), OString("__RSC"), 1); - -sal_uInt32 GetNumber() -{ - sal_uInt32 l = 0; - sal_uInt32 nLog = 10; - - if( '0' == c ) - { - c = pFI->GetFastChar(); - if( 'x' == c ) - { - nLog = 16; - c = pFI->GetFastChar(); - } - } - - if( nLog == 16 ) - { - while( rtl::isAsciiHexDigit( static_cast(c) ) ) - { - if( rtl::isAsciiDigit( static_cast(c) ) ) - l = l * nLog + (c - '0'); - else - l = l * nLog + (rtl::toAsciiUpperCase( static_cast(c) ) - 'A' + 10 ); - - c = pFI->GetFastChar(); - } - } - else - { - while( rtl::isAsciiDigit( static_cast(c) ) || 'x' == c ) - { - l = l * nLog + (c - '0'); - c = pFI->GetFastChar(); - } - } - - while( c=='U' || c=='u' || c=='l' || c=='L' ) // because of unsigned longs - c = pFI->GetFastChar(); - - if( l > 0x7fffffff ) // drop the most significant bit if needed; - l &= 0x7fffffff; - - return l; -} - -int MakeToken( YYSTYPE * pTokenVal ) -{ - int c1; - - while( true ) // ignore comments and space characters - { - while( rtl::isAsciiWhiteSpace( static_cast(c) ) ) - c = pFI->GetFastChar(); - - if( '/' == c ) - { - c1 = c; - c = pFI->GetFastChar(); - if( '/' == c ) - { - while( '\n' != c && !pFI->IsEof() ) - c = pFI->GetFastChar(); - - c = pFI->GetFastChar(); - } - else if( '*' == c ) - { - c = pFI->GetFastChar(); - do - { - while( '*' != c && !pFI->IsEof() ) - c = pFI->GetFastChar(); - - c = pFI->GetFastChar(); - } - while( '/' != c && !pFI->IsEof() ); - c = pFI->GetFastChar(); - } - else - return c1; - } - else - break; - } - - // FIXME: wtf is this supposed to do? - if( (c != 0) == pFI->IsEof() ) - { - return 0; - } - - if( bLastInclude ) - { - bLastInclude = false; // reset - if( '<' == c ) - { - OStringBuffer aBuf( 256 ); - c = pFI->GetFastChar(); - while( '>' != c && !pFI->IsEof() ) - { - aBuf.append( c ); - c = pFI->GetFastChar(); - } - c = pFI->GetFastChar(); - pTokenVal->string = const_cast(pStringContainer->putString( aBuf.getStr() )); - return INCLUDE_STRING; - } - } - - if( c == '"' ) - { - OStringBuffer aBuf( 256 ); - bool bDone = false; - while( !bDone && !pFI->IsEof() && c ) - { - c = pFI->GetFastChar(); - if( c == '"' ) - { - do - { - c = pFI->GetFastChar(); - } - while( c == ' ' || c == '\t' ); - - if( c == '"' ) - { - // this is a continued string - // note: multiline string continuations are handled by the parser - // see rscyacc.y - } - else - bDone = true; - } - else if( c == '\\' ) - { - aBuf.append( '\\' ); - c = pFI->GetFastChar(); - if( c ) - aBuf.append( c ); - } - else - aBuf.append( c ); - } - pTokenVal->string = const_cast(pStringContainer->putString( aBuf.getStr() )); - return STRING; - } - if (rtl::isAsciiDigit (static_cast(c))) - { - pTokenVal->value = GetNumber(); - return NUMBER; - } - - if( rtl::isAsciiAlpha (static_cast(c)) || (c == '_') ) - { - Atom nHashId; - OStringBuffer aBuf( 256 ); - - while( rtl::isAsciiAlphanumeric (static_cast(c)) - || (c == '_') || (c == '-') || (c == ':')) - { - aBuf.append( c ); - c = pFI->GetFastChar(); - } - - nHashId = pHS->getID( aBuf.getStr(), true ); - if( InvalidAtom != nHashId ) - { - KEY_STRUCT aKey; - - // search for keyword - if( pTC->aNmTb.Get( nHashId, &aKey ) ) - { - - // keyword found - switch( aKey.nTyp ) - { - case CLASSNAME: - pTokenVal->pClass = reinterpret_cast(aKey.yylval); - break; - case VARNAME: - pTokenVal->varid = aKey.nName; - break; - case CONSTNAME: - pTokenVal->constname.hashid = aKey.nName; - pTokenVal->constname.nValue = aKey.yylval; - break; - case BOOLEAN: - pTokenVal->svbool = (bool)aKey.yylval; - break; - case INCLUDE: - bLastInclude = true; - SAL_FALLTHROUGH; - default: - pTokenVal->value = aKey.yylval; - } - - return aKey.nTyp; - } - else - { - pTokenVal->string = const_cast(pStringContainer->putString( aBuf.getStr() )); - return SYMBOL; - } - } - else - { - // Symbol - RscDefine * pDef; - - // this #define symbol is used to indicate to various code that it is being processed with the RSC compiler - if (strcmp(aBuf.getStr(), "__RSC") == 0) - pDef = &RSC_GLOBAL_DEFINE; - else - pDef = pTC->aFileTab.FindDef( aBuf.getStr() ); - if( pDef ) - { - pTokenVal->defineele = pDef; - - return RSCDEFINE; - } - - pTokenVal->string = const_cast(pStringContainer->putString( aBuf.getStr() )); - return SYMBOL; - } - } - - if( c=='<' ) - { - c = pFI->GetFastChar(); - if( c=='<' ) - { - c = pFI->GetFastChar(); - return LEFTSHIFT; - } - else - return '<'; - } - - if( c=='>' ) - { - c = pFI->GetFastChar(); - if( c=='>' ) - { - c = pFI->GetFastChar(); - return RIGHTSHIFT; - } - else - return '>'; - } - - c1 = c; - c = pFI->GetFastChar(); - return c1; -} - -int yylex() -{ - if( bTargetDefined ) - bTargetDefined = false; - else - aKeyVal[ 0 ].nKeyWord = MakeToken( &aKeyVal[ 0 ].aYYSType ); - - yylval = aKeyVal[ 0 ].aYYSType; - return aKeyVal[ 0 ].nKeyWord; -} - -#if defined __sun -extern "C" void yyerror( const char* pMessage ) -#else -void yyerror( char* pMessage ) -#endif -{ - pTC->pEH->Error( ERR_YACC, nullptr, RscId(), pMessage ); -} - -void InitParser( RscFileInst * pFileInst ) -{ - pTC = pFileInst->pTypCont; // set file container - pFI = pFileInst; - pStringContainer = new StringContainer(); - pExp = nullptr; // for macro parser - bTargetDefined = false; - - // initialize first character - bLastInclude = false; - c = pFI->GetFastChar(); -} - -void EndParser() -{ - // empty stack - while( ! S.IsEmpty() ) - S.Pop(); - - // free string container - delete pStringContainer; - pStringContainer = nullptr; - - delete pExp; - pTC = nullptr; - pFI = nullptr; - pExp = nullptr; - -} - -void IncludeParser( RscFileInst * pFileInst ) -{ - int nToken; // token value - YYSTYPE aYYSType; // token data - RscFile * pFName; // file structure - RscFileTab::Index lKey; // file key - RscTypCont * pTypCon = pFileInst->pTypCont; - - pFName = pTypCon->aFileTab.Get( pFileInst->GetFileIndex() ); - InitParser( pFileInst ); - - nToken = MakeToken( &aYYSType ); - while( 0 != nToken && CLASSNAME != nToken ) - { - if( '#' == nToken ) - { - if( INCLUDE == (nToken = MakeToken( &aYYSType )) ) - { - if( STRING == (nToken = MakeToken( &aYYSType )) ) - { - lKey = pTypCon->aFileTab.NewIncFile( aYYSType.string, - aYYSType.string ); - pFName->InsertDependFile( lKey ); - } - else if( INCLUDE_STRING == nToken ) - { - lKey = pTypCon->aFileTab.NewIncFile( aYYSType.string, - OString() ); - pFName->InsertDependFile( lKey ); - } - } - } - nToken = MakeToken( &aYYSType ); - } - - EndParser(); -} - -ERRTYPE parser( RscFileInst * pFileInst ) -{ - ERRTYPE aError; - - InitParser( pFileInst ); - - aError = yyparse(); - - EndParser(); - - // yyparser returns 0 on success - if( 0 == aError.GetError() ) - aError.Clear(); - if( pFileInst->pTypCont->pEH->nErrors ) - aError = ERR_ERROR; - pFileInst->SetError( aError ); - return aError; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/parser/rscpar.cxx b/rsc/source/parser/rscpar.cxx deleted file mode 100644 index de4780aee143..000000000000 --- a/rsc/source/parser/rscpar.cxx +++ /dev/null @@ -1,160 +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 -#include -#include - -void RscFileInst::Init() -{ - nLineNo = 0; - nLineBufLen = 256; - pLine = static_cast(rtl_allocateMemory( nLineBufLen )); - *pLine = '\0'; - nScanPos = 0; - cLastChar = '\0'; - bEof = false; -} - -RscFileInst::RscFileInst( RscTypCont * pTC, RscFileTab::Index lIndexSrc, - RscFileTab::Index lFIndex, FILE * fFile ) -{ - pTypCont = pTC; - Init(); - - lFileIndex = lFIndex; - lSrcIndex = lIndexSrc; - fInputFile = fFile; - - // state: pointer at the end of the input buffer - nInputPos = nInputEndPos = READBUFFER_MAX; - pInput = static_cast(rtl_allocateMemory( nInputBufLen )); -} - -RscFileInst::~RscFileInst() -{ - if( pInput ) - rtl_freeMemory( pInput ); - if( pLine ) - rtl_freeMemory( pLine ); -} - -char RscFileInst::GetChar() -{ - if( pLine[ nScanPos ] ) - return pLine[ nScanPos++ ]; - else if( nInputPos >= nInputEndPos && nInputEndPos != nInputBufLen ) - { - // end of file - bEof = true; - return 0; - } - else - { - GetNewLine(); - return '\n'; - } -} - -void RscFileInst::GetNewLine() -{ - nLineNo++; - nScanPos = 0; - - // run until end of file - sal_uInt32 nLen = 0; - while( (nInputPos < nInputEndPos) || (nInputEndPos == nInputBufLen) ) - { - if( (nInputPos >= nInputEndPos) && fInputFile ) - { - nInputEndPos = fread( pInput, 1, nInputBufLen, fInputFile ); - nInputPos = 0; - } - - while( nInputPos < nInputEndPos ) - { - // always read one line - if( nLen >= nLineBufLen ) - { - nLineBufLen += 256; - // one more for '\0' - pLine = static_cast(rtl_reallocateMemory( pLine, nLineBufLen +1 )); - } - - // cr lf, lf cr, lf or cr become '\0' - if( pInput[ nInputPos ] == '\n' ) - { - nInputPos++; - if( cLastChar != '\r' ) - { - cLastChar = '\n'; - pLine[ nLen++ ] = '\0'; - goto END; - } - } - else if( pInput[ nInputPos ] == '\r' ) - { - nInputPos++; - if( cLastChar != '\n' ) - { - cLastChar = '\r'; - pLine[ nLen++ ] = '\0'; - goto END; - } - } - else - { - pLine[ nLen++ ] = pInput[ nInputPos++ ]; - if( nLen > 2 ) - { - if( (unsigned char)pLine[nLen-3] == 0xef && - (unsigned char)pLine[nLen-2] == 0xbb && - (unsigned char)pLine[nLen-1] == 0xbf ) - { - nLen -= 3; - } - } - } - } - } - - // stop on reaching EOF - pLine[ nLen ] = '\0'; - -END: - if( pTypCont->pEH->GetListFile() ) - { - char buf[ 10 ]; - - sprintf( buf, "%5d ", (int)GetLineNo() ); - pTypCont->pEH->LstOut( buf ); - pTypCont->pEH->LstOut( GetLine() ); - pTypCont->pEH->LstOut( "\n" ); - } -} - -void RscFileInst::SetError( ERRTYPE aError ) -{ - if( aError.IsOk() ) - { - aFirstError = aError; - } -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/parser/rscyacc.y b/rsc/source/parser/rscyacc.y deleted file mode 100644 index 45efad4891d7..000000000000 --- a/rsc/source/parser/rscyacc.y +++ /dev/null @@ -1,1153 +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 "sal/config.h" - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -ObjectStack S; - -RSCINST GetVarInst( const RSCINST & rInst, const char * pVarName ) -{ - RSCINST aInst; - - aInst = rInst.pClass->GetVariable( rInst, pHS->getID( pVarName ), - RSCINST() ); - - if( !aInst.pData ) - pTC->pEH->Error( ERR_NOVARIABLENAME, rInst.pClass, RscId() ); - - return aInst; -} - -void SetString( const RSCINST & rInst, const char * pVarName, const char * pStr ) -{ - RSCINST aInst; - - aInst = GetVarInst( rInst, pVarName ); - if( aInst.pData ){ - ERRTYPE aError; - aError = aInst.pClass->SetString( aInst, pStr ); - - if( aError.IsError() ) - pTC->pEH->Error( aError, aInst.pClass, RscId() ); - } -} - -RscId MakeRscId( RscExpType aExpType ) -{ - if( !aExpType.IsNothing() ) - { - sal_Int32 lValue(0); - - if( !aExpType.Evaluate( &lValue ) ) - pTC->pEH->Error( ERR_ZERODIVISION, nullptr, RscId() ); - if( lValue < 1 || lValue > (sal_Int32)0x7FFF ) - { - pTC->pEH->Error( ERR_IDRANGE, nullptr, RscId(), - rtl::OString::number(lValue).getStr() ); - } - - if( aExpType.IsDefinition() ) - return RscId( aExpType.aExp.pDef ); - else - return RscId( lValue ); - } - return RscId(); -} - -bool DoClassHeader( RSCHEADER * pHeader, bool bMember ) -{ - RSCINST aCopyInst; - RscId aName1 = MakeRscId( pHeader->nName1 ); - RscId aName2 = MakeRscId( pHeader->nName2 ); - - if( pHeader->pRefClass ) - aCopyInst.pClass = pHeader->pRefClass; - else - aCopyInst.pClass = pHeader->pClass; - - if( pHeader->nTyp == TYPE_COPY ) - { - ObjNode * pCopyObj = aCopyInst.pClass->GetObjNode( aName2 ); - - if( !pCopyObj ) - { - rtl::OStringBuffer aMsg( pHS->getString( aCopyInst.pClass->GetId() ) ); - aMsg.append(' '); - aMsg.append(aName2.GetName()); - pTC->pEH->Error( ERR_NOCOPYOBJ, pHeader->pClass, aName1, - aMsg.getStr() ); - } - else - aCopyInst.pData = pCopyObj->GetRscObj(); - } - - if( bMember ) - { - // specification of superclasses or derived classes is now allowed - if( S.Top().pClass->InHierarchy( pHeader->pClass ) || - pHeader->pClass->InHierarchy( S.Top().pClass) ) - { - if( aCopyInst.IsInst() ) - { - RSCINST aTmpI( S.Top() ); - aTmpI.pClass->Destroy( aTmpI ); - aTmpI.pClass->Create( &aTmpI, aCopyInst ); - } - } - else - pTC->pEH->Error( ERR_FALSETYPE, S.Top().pClass, aName1, - pHS->getString( pHeader->pClass->GetId() ).getStr() ); - } - else - { - if( S.IsEmpty() ) - { - if( aName1.GetNumber() < 256 ) - pTC->pEH->Error( WRN_GLOBALID, pHeader->pClass, aName1 ); - - if( aCopyInst.IsInst() ) - S.Push( pHeader->pClass->Create( nullptr, aCopyInst ) ); - else - S.Push( pHeader->pClass->Create( nullptr, RSCINST() ) ); - - pTC->pEH->StdOut( ".", RscVerbosityVerbose ); - - if( !aName1.IsId() ) - pTC->pEH->Error( ERR_IDEXPECTED, pHeader->pClass, aName1 ); - else - { - ObjNode * pNode = new ObjNode( aName1, S.Top().pData, - pFI->GetFileIndex() ); - if( !pHeader->pClass->PutObjNode( pNode ) ) - pTC->pEH->Error( ERR_DOUBLEID, pHeader->pClass, aName1 ); - } - } - else - { - RSCINST aTmpI; - ERRTYPE aError; - - if( aName1.GetNumber() >= 256 && aName1.IsId() ) - pTC->pEH->Error( WRN_LOCALID, pHeader->pClass, aName1 ); - - aError = S.Top().pClass->GetElement( S.Top(), aName1, - pHeader->pClass, aCopyInst, &aTmpI ); - - if( aError.IsWarning() ) - { - pTC->pEH->Error( aError, pHeader->pClass, aName1 ); - } - else if( aError.IsError() ) - { - if( aError.GetError() == ERR_CONT_INVALIDTYPE ) - pTC->pEH->Error( aError, S.Top().pClass, aName1, - pHS->getString( pHeader->pClass->GetId() ).getStr() ); - else - pTC->pEH->Error( aError, S.Top().pClass, aName1 ); - - S.Top().pClass->GetElement( S.Top(), RscId(), - pHeader->pClass, RSCINST(), &aTmpI ); - - if( !aTmpI.IsInst() ) - return false; - } - S.Push( aTmpI ); - } - } - if( pHeader->nTyp == TYPE_REF ) - { - ERRTYPE aError; - - aError = S.Top().pClass->SetRef( S.Top(), aName2 ); - pTC->pEH->Error( aError, S.Top().pClass, aName1 ); - } - - return true ; -} - -RSCINST GetFirstTupelEle( const RSCINST & rTop ) -{ // upward compatible, test Tupel - RSCINST aInst; - ERRTYPE aErr; - - aErr = rTop.pClass->GetElement( rTop, RscId(), nullptr, RSCINST(), &aInst ); - if( !aErr.IsError() ) - aInst = aInst.pClass->GetTupelVar( aInst, 0, RSCINST() ); - return aInst; -} - -//#define YYDEBUG 1 - -#ifdef UNX -#define YYMAXDEPTH 2000 -#else -#define YYMAXDEPTH 800 -#endif - -#if defined _MSC_VER -#pragma warning(push, 1) -#pragma warning(disable:4129 4273 4701 4702) -#endif -#ifdef __GNUC__ -#pragma GCC diagnostic ignored "-Wwrite-strings" -#endif -%} - -/* Compilerstack */ - -%union { - Atom varid; - struct { - Atom hashid; - sal_Int32 nValue; - } constname; - RscTop * pClass; - RSCHEADER header; - struct { - CLASS_DATA pData; - RscTop * pClass; - } instance; - sal_Int32 value; - sal_uInt16 ushort; - short exp_short; - char * string; - bool svbool; - REF_ENUM copyref; - RscDefine * defineele; - rtl_TextEncoding charset; - RscExpType macrostruct; -} - -/* Token */ -%token NUMBER -%token SYMBOL -%token RSCDEFINE -%token STRING -%token INCLUDE_STRING -%token CHARACTER -%token BOOLEAN - -%token LINE -%token AUTO_ID -%token NOT -%token DEFINE -%token INCLUDE -%token MACROTARGET -%token DEFAULT - - -%token CLASSNAME -%token VARNAME -%token CONSTNAME -%token CLASS -%token EXTENDABLE -%token WRITEIFSET - - -%type macro_expression -%type id_expression -%type string_multiline - -%type
class_header_body -%type
class_header -%type
var_header_class -%type copy_ref - - -%left '|' -%left '&' -%left LEFTSHIFT RIGHTSHIFT -%left '+' '-' -%left '*' '/' -%left UNARYMINUS -%left UNARYPLUS -%left ',' -%left '(' ')' - - -/* Grammatik */ - -%start resource_definitions - -%% - -resource_definitions - : - | resource_definitions resource_definition - | MACROTARGET macro_expression - { - RscExpType aExpType; - sal_Int32 lValue; - - aExpType.cUnused = false; - aExpType.cType = RSCEXP_NOTHING; - pExp = new RscExpression( aExpType, '+', $2 ); - if( !pExp->Evaluate( &lValue ) ) - { - pTC->pEH->Error( ERR_ZERODIVISION, nullptr, RscId() ); - } - delete pExp; - } -; - -resource_definition - : line_number - | '#' DEFINE SYMBOL macro_expression - { - bool bError = false; - - if( $4.IsNumber() ) - { - if( !pTC->aFileTab.NewDef( pFI->GetFileIndex(), - rtl::OString( $3 ), - $4.GetLong() ) ) - bError = true; - } - else if( $4.IsDefinition() ) - { - RscExpType aExpType; - RscExpression * pExpr; - - aExpType.cUnused = false; - aExpType.cType = RSCEXP_NOTHING; - aExpType.SetLong( 0 ); - aExpType.cType = RSCEXP_LONG; - pExpr = new RscExpression( aExpType, '+', $4 ); - - if( !pTC->aFileTab.NewDef( pFI->GetFileIndex(), - rtl::OString( $3 ), pExpr ) ) - { - bError =true; - } - } - else if( $4.IsExpression() ) - { - if( !pTC->aFileTab.NewDef( pFI->GetFileIndex(), - rtl::OString( $3 ), $4.aExp.pExp ) ) - { - bError = true; - } - } - - if( bError ) - { - pTC->pEH->Error( ERR_DECLAREDEFINE, nullptr, RscId(), $3 ); - } - } - | '#' DEFINE RSCDEFINE macro_expression - { - pTC->pEH->Error( - ERR_DOUBLEDEFINE, nullptr, RscId(), $3->GetName().getStr() ); - } - | '#' INCLUDE STRING - { - } - | '#' INCLUDE INCLUDE_STRING - { - } - | class_definition ';' - { -#ifdef D40 - void * pMem; - pMem = rtl_allocateMemory( 20000 ); - rtl_freeMemory( pMem ); -#endif - } - ; - -class_definition - : class_header class_body - { - if( $1.nTyp == TYPE_REF ) - { - pTC->pEH->Error( ERR_REFNOTALLOWED, S.Top().pClass, - RscId( $1.nName1 ) ); - } - S.Pop(); - } - | class_header - { - ERRTYPE aError; - RscId aRscId( $1.nName1 ); - - if( $1.nTyp == TYPE_NOTHING && aRscId.IsId() ) - aError = S.Top().pClass->SetRef( S.Top(), aRscId ); - else if( $1.nTyp == TYPE_COPY ) - aError = ERR_COPYNOTALLOWED; - if( aError.IsError() || aError.IsWarning() ) - pTC->pEH->Error( aError, S.Top().pClass, aRscId ); - S.Pop(); - } - ; - -class_header - : class_header_body - { - if( !DoClassHeader( &$1, false ) ) - return ERR_ERROR; - $$ = $1; - } - ; - -copy_ref - : '<' - { - $$ = TYPE_COPY; - } - | ',' - { - $$ = TYPE_REF; - } -; - -class_header_body - : CLASSNAME id_expression copy_ref CLASSNAME id_expression - { - $$.pClass = $1; - $$.nName1 = $2; - $$.nTyp = $3; - $$.pRefClass = $4; - $$.nName2 = $5; - } - | CLASSNAME id_expression copy_ref id_expression - { - $$.pClass = $1; - $$.nName1 = $2; - $$.nTyp = $3; - $$.pRefClass = nullptr; - $$.nName2 = $4; - } - | CLASSNAME id_expression - { - $$.pClass = $1; - $$.nName1 = $2; - $$.nTyp = TYPE_NOTHING; - $$.pRefClass = nullptr; - $$.nName2.cType = RSCEXP_NOTHING; - } - | CLASSNAME copy_ref id_expression - { - $$.pClass = $1; - $$.nName1.cType = RSCEXP_NOTHING; - $$.nTyp = $2; - $$.pRefClass = nullptr; - $$.nName2 = $3; - } - | CLASSNAME copy_ref CLASSNAME id_expression - { - $$.pClass = $1; - $$.nName1.cType = RSCEXP_NOTHING; - $$.nTyp = $2; - $$.pRefClass = $3; - $$.nName2 = $4; - } - | CLASSNAME - { - $$.pClass = $1; - $$.nName1.cType = RSCEXP_NOTHING; - $$.nTyp = TYPE_NOTHING; - $$.nName2.cType = RSCEXP_NOTHING; - } -; - -class_body - : '{' var_definitions '}' - | '{' '}' - | string_multiline - { - SetString( S.Top(), "TEXT", $1 ); - } -; - -var_definitions - : var_definition - | var_definitions var_definition - ; - -var_definition - : line_number - | var_header var_body ';' - { - S.Pop(); - } - | class_definition ';' - | var_header_class class_body ';' - { - if( $1.nTyp == TYPE_REF ) - pTC->pEH->Error( ERR_REFNOTALLOWED, S.Top().pClass, - RscId( $1.nName1 ) ); - - if( S.Top().pClass->GetCount( S.Top() ) ) - pTC->pEH->Error( WRN_SUBINMEMBER, S.Top().pClass, - RscId( $1.nName1 ) ); - - S.Pop(); - } - | var_header_class ';' - { - ERRTYPE aError; - RscId aRscId( $1.nName1 ); - - if( $1.nTyp == TYPE_NOTHING && aRscId.IsId() ) - aError = S.Top().pClass->SetRef( S.Top(), aRscId ); - else if( $1.nTyp == TYPE_COPY ) - aError = ERR_COPYNOTALLOWED; - if( S.Top().pClass->GetCount( S.Top() ) ) - aError = WRN_SUBINMEMBER; - if( aError.IsError() || aError.IsWarning() ) - pTC->pEH->Error( aError, S.Top().pClass, aRscId ); - - S.Pop(); - } -; - -var_header_class - : VARNAME '=' class_header_body - { - RSCINST aInst; - - aInst = S.Top().pClass->GetVariable( S.Top(), $1, RSCINST(), false, $3.pClass ); - - if( aInst.pData ) - S.Push( aInst ); - else - { - pTC->pEH->Error( ERR_NOVARIABLENAME, S.Top().pClass, RscId(), - pHS->getString( $1 ).getStr() ); - return ERR_ERROR; - } - - if( !DoClassHeader( &$3, true ) ) - return ERR_ERROR; - $$ = $3; - } - | VARNAME '[' CONSTNAME ']' '=' class_header_body - { - RSCINST aInst; - - aInst = S.Top().pClass->GetVariable( S.Top(), $1, RSCINST() ); - - if( aInst.pData ) - { - ERRTYPE aError; - RSCINST aIdxInst; - - aError = aInst.pClass->GetArrayEle( - aInst, $3.hashid, nullptr, &aIdxInst ); - if( aError.IsError() || aError.IsWarning() ) - pTC->pEH->Error( aError, S.Top().pClass, RscId() ); - if( aError.IsError() ) - return ERR_ERROR; - S.Push( aIdxInst ); - } - else - { - pTC->pEH->Error( ERR_NOVARIABLENAME, S.Top().pClass, RscId(), - pHS->getString( $1 ).getStr() ); - return ERR_ERROR; - } - if( !DoClassHeader( &$6, true ) ) - return ERR_ERROR; - $$ = $6; - } - | VARNAME '[' SYMBOL ']' '=' class_header_body - { - RSCINST aInst; - - aInst = S.Top().pClass->GetVariable( S.Top(), $1, RSCINST() ); - - if( aInst.pData ) - { - long nNewLang = pTC->AddLanguage( $3 ); - ERRTYPE aError; - RSCINST aIdxInst; - - aError = aInst.pClass->GetArrayEle( - aInst, nNewLang, nullptr, &aIdxInst ); - if( aError.IsError() || aError.IsWarning() ) - pTC->pEH->Error( aError, S.Top().pClass, RscId() ); - if( aError.IsError() ) - return ERR_ERROR; - S.Push( aIdxInst ); - } - else - { - pTC->pEH->Error( ERR_NOVARIABLENAME, S.Top().pClass, RscId(), - pHS->getString( $1 ).getStr() ); - return ERR_ERROR; - } - if( !DoClassHeader( &$6, true ) ) - return ERR_ERROR; - $$ = $6; - } -; - -var_header - : VARNAME '=' - { - RSCINST aInst; - - aInst = S.Top().pClass->GetVariable( S.Top(), $1, RSCINST() ); - - if( aInst.pData ) - S.Push( aInst ); - else - { - pTC->pEH->Error( ERR_NOVARIABLENAME, S.Top().pClass, RscId(), - pHS->getString( $1 ).getStr() ); - return ERR_ERROR; - } - } - | VARNAME '[' CONSTNAME ']' '=' - { - RSCINST aInst; - - aInst = S.Top().pClass->GetVariable( S.Top(), $1, RSCINST() ); - - if( aInst.pData ) - { - ERRTYPE aError; - RSCINST aIdxInst; - - aError = aInst.pClass->GetArrayEle( - aInst, $3.hashid, nullptr, &aIdxInst ); - if( aError.IsError() || aError.IsWarning() ) - pTC->pEH->Error( aError, S.Top().pClass, RscId() ); - if( aError.IsError() ) - return ERR_ERROR; - S.Push( aIdxInst ); - } - else - { - pTC->pEH->Error( ERR_NOVARIABLENAME, S.Top().pClass, RscId(), - pHS->getString( $1 ).getStr() ); - return ERR_ERROR; - } - } - | VARNAME '[' SYMBOL ']' '=' - { - RSCINST aInst; - - aInst = S.Top().pClass->GetVariable( S.Top(), $1, RSCINST() ); - - if( aInst.pData ) - { - long nNewLang = pTC->AddLanguage( $3 ); - ERRTYPE aError; - RSCINST aIdxInst; - - aError = aInst.pClass->GetArrayEle( - aInst, nNewLang, nullptr, &aIdxInst ); - if( aError.IsError() || aError.IsWarning() ) - pTC->pEH->Error( aError, S.Top().pClass, RscId() ); - if( aError.IsError() ) - return ERR_ERROR; - S.Push( aIdxInst ); - } - else - { - pTC->pEH->Error( ERR_NOVARIABLENAME, S.Top().pClass, RscId(), - pHS->getString( $1 ).getStr() ); - return ERR_ERROR; - } - } -; - -tupel_header0 - : - { - RSCINST aInst; - - aInst = S.Top().pClass->GetTupelVar( S.Top(), 0, RSCINST() ); - if( aInst.pData ) - S.Push( aInst ); - else - { - pTC->pEH->Error( ERR_NOTUPELNAME, S.Top().pClass, RscId() ); - return ERR_ERROR; - } - } -; - -tupel_header1 - : - { - RSCINST aInst; - - aInst = S.Top().pClass->GetTupelVar( S.Top(), 1, RSCINST() ); - if( aInst.pData ) - S.Push( aInst ); - else - { - pTC->pEH->Error( ERR_NOTUPELNAME, S.Top().pClass, RscId() ); - return ERR_ERROR; - } - } -; - -tupel_header2 - : - { - RSCINST aInst; - - aInst = S.Top().pClass->GetTupelVar( S.Top(), 2, RSCINST() ); - if( aInst.pData ) - S.Push( aInst ); - else - { - pTC->pEH->Error( ERR_NOTUPELNAME, S.Top().pClass, RscId() ); - return ERR_ERROR; - } - } -; - -tupel_header3 - : - { - RSCINST aInst; - - aInst = S.Top().pClass->GetTupelVar( S.Top(), 3, RSCINST() ); - if( !aInst.pData ) - { - pTC->pEH->Error( ERR_NOTUPELNAME, S.Top().pClass, RscId() ); - return ERR_ERROR; - } - S.Push( aInst ); - } -; - -tupel_body - : var_body - { - S.Pop(); - } -; - -var_list_header - : - { - ERRTYPE aError; - RSCINST aInst; - - aError = S.Top().pClass->GetElement( S.Top(), RscId(), - nullptr, RSCINST(), &aInst ); - if( aError.IsError() || aError.IsWarning() ) - pTC->pEH->Error( aError, S.Top().pClass, RscId() ); - if( aError.IsError() ) - { // implicit to get instance on the stack - aInst = S.Top().pClass->Create( nullptr, RSCINST() ); - } - S.Push( aInst ); - } -; - -list_body - : var_bodycomplex - { - S.Pop(); - } -; - -list_header - : - { - sal_uInt32 nCount = S.Top().pClass->GetCount( S.Top() ); - sal_uInt32 i; - - for( i = nCount; i > 0; i-- ) - S.Top().pClass->DeletePos( S.Top(), i -1 ); - } -; - -list - : list var_list_header list_body ';' - | list var_bodysimple ';' - | list class_definition ';' - | list line_number - | - ; - -var_bodysimple - : macro_expression - { - sal_Int32 l; - ERRTYPE aError; - - if( !$1.Evaluate( &l ) ) - pTC->pEH->Error( ERR_ZERODIVISION, nullptr, RscId() ); - else - { - aError = S.Top().pClass->SetRef( S.Top(), RscId( $1 ) ); - if( aError.IsError() ) - { - aError.Clear(); - aError = S.Top().pClass->SetNumber( S.Top(), l ); - } - if( aError.IsError() ) - { // upward compatible, test Tupel - RSCINST aInst = GetFirstTupelEle( S.Top() ); - if( aInst.pData ) - { - aError.Clear(); // reset error - aError = aInst.pClass->SetRef( aInst, RscId( $1 ) ); - if( aError.IsError() ) - { - aError.Clear(); - aError = aInst.pClass->SetNumber( aInst, l ); - } - } - } - } - - if( $1.IsExpression() ) - delete $1.aExp.pExp; - - if( aError.IsError() || aError.IsWarning() ) - pTC->pEH->Error( aError, S.Top().pClass, RscId() ); - } - | CONSTNAME - { - ERRTYPE aError; - aError = S.Top().pClass->SetConst( S.Top(), $1.hashid, $1.nValue ); - if( aError.IsError() ) - { // upward compatible, test Tupel - RSCINST aInst = GetFirstTupelEle( S.Top() ); - if( aInst.pData ) - { - aError.Clear(); // reset error - aError = aInst.pClass->SetConst( aInst, $1.hashid, $1.nValue ); - } - } - - if( aError.IsError() || aError.IsWarning() ) - pTC->pEH->Error( aError, S.Top().pClass, RscId() ); - } - | NOT CONSTNAME - { - ERRTYPE aError; - aError = S.Top().pClass->SetNotConst( S.Top(), $2.hashid ); - if( aError.IsError() ) - { // upward compatible, test Tupel - RSCINST aInst = GetFirstTupelEle( S.Top() ); - if( aInst.pData ) - { - aError.Clear(); // reset error - aError = aInst.pClass->SetNotConst( aInst, $2.hashid ); - } - } - - if( aError.IsError() || aError.IsWarning() ) - pTC->pEH->Error( aError, S.Top().pClass, RscId() ); - } - | BOOLEAN - { - ERRTYPE aError; - aError = S.Top().pClass->SetBool( S.Top(), $1 ); - if( aError.IsError() ) - { // upward compatible, test Tupel - RSCINST aInst = GetFirstTupelEle( S.Top() ); - if( aInst.pData ) - { - aError.Clear(); // reset error - aError = aInst.pClass->SetBool( aInst, $1 ); - } - } - - if( aError.IsError() || aError.IsWarning() ) - pTC->pEH->Error( aError, S.Top().pClass, RscId() ); - } - | string_multiline - { - ERRTYPE aError; - aError = S.Top().pClass->SetString( S.Top(), $1 ); - if( aError.IsError() ) - { // upward compatible, test Tupel - RSCINST aInst = GetFirstTupelEle( S.Top() ); - if( aInst.pData ) - { - aError.Clear(); // reset error - aError = aInst.pClass->SetString( aInst, $1 ); - } - } - - if( aError.IsError() || aError.IsWarning() ) - pTC->pEH->Error( aError, S.Top().pClass, RscId() ); - } - | DEFAULT - ; - -var_bodycomplex - : '{' list_header list '}' - | '<' tupel_header0 tupel_body ';' '>' - | '<' tupel_header0 tupel_body ';' tupel_header1 tupel_body ';' '>' - | '<' tupel_header0 tupel_body ';' tupel_header1 tupel_body ';' - tupel_header2 tupel_body ';' '>' - | '<' tupel_header0 tupel_body ';' tupel_header1 tupel_body ';' - tupel_header2 tupel_body ';' tupel_header3 tupel_body ';' '>' - ; - -var_body - : var_bodysimple - | var_bodycomplex - ; - -string_multiline - : STRING - { - $$ = $1; - } - | string_multiline STRING - { - rtl::OStringBuffer aBuf( 256 ); - aBuf.append( $1 ); - aBuf.append( $2 ); - $$ = const_cast(pStringContainer->putString( aBuf.getStr() )); - } -; - -macro_expression - : RSCDEFINE - { - $$.cType = RSCEXP_DEF; - $$.aExp.pDef = $1; - } - | NUMBER - { - $$.cType = RSCEXP_LONG; - $$.SetLong( $1 ); - } - | '-' macro_expression %prec UNARYMINUS - { - if( $2.IsNumber() ){ - $$.cType = $2.cType; - $$.SetLong( - $2.GetLong() ); - } - else - { - RscExpType aLeftExp; - - aLeftExp.cType = RSCEXP_NOTHING; - $$.cType = RSCEXP_EXP; - $$.aExp.pExp = new RscExpression( aLeftExp, '-', $2 ); - } - } - | '+' macro_expression %prec UNARYPLUS - { - $$ = $2; - } - | macro_expression '+' macro_expression - { - if( $1.IsNumber() && $3.IsNumber() ) - { - $$.cType = RSCEXP_LONG; - $$.SetLong( $1.GetLong() + $3.GetLong() ); - } - else - { - $$.cType = RSCEXP_EXP; - $$.aExp.pExp = new RscExpression( $1, '+', $3 ); - } - } - | macro_expression '-' macro_expression - { - if( $1.IsNumber() && $3.IsNumber() ) - { - $$.cType = RSCEXP_LONG; - $$.SetLong( $1.GetLong() - $3.GetLong() ); - } - else - { - $$.cType = RSCEXP_EXP; - $$.aExp.pExp = new RscExpression( $1, '-', $3 ); - } - } - | macro_expression '*' macro_expression - { - if( $1.IsNumber() && $3.IsNumber() ) - { - $$.cType = RSCEXP_LONG; - $$.SetLong( $1.GetLong() * $3.GetLong() ); - } - else - { - $$.cType = RSCEXP_EXP; - $$.aExp.pExp = new RscExpression( $1, '*', $3 ); - } - } - | macro_expression '/' macro_expression - { - if( $1.IsNumber() && $3.IsNumber() ) - { - if( $3.GetLong() == 0 ) - { - $$.cType = RSCEXP_EXP; - $$.aExp.pExp = new RscExpression( $1, '/', $3 ); - } - else - { - $$.cType = RSCEXP_LONG; - $$.SetLong( $1.GetLong() / $3.GetLong() ); - } - } - else - { - $$.cType = RSCEXP_EXP; - $$.aExp.pExp = new RscExpression( $1, '/', $3 ); - } - } - | macro_expression '&' macro_expression - { - if( $1.IsNumber() && $3.IsNumber() ) - { - $$.cType = RSCEXP_LONG; - $$.SetLong( $1.GetLong() & $3.GetLong() ); - } - else - { - $$.cType = RSCEXP_EXP; - $$.aExp.pExp = new RscExpression( $1, '&', $3 ); - } - } - | macro_expression '|' macro_expression - { - if( $1.IsNumber() && $3.IsNumber() ) - { - $$.cType = RSCEXP_LONG; - $$.SetLong( $1.GetLong() | $3.GetLong() ); - } - else - { - $$.cType = RSCEXP_EXP; - $$.aExp.pExp = new RscExpression( $1, '|', $3 ); - } - } - | '(' macro_expression ')' - { - $$ = $2; - } - | macro_expression LEFTSHIFT macro_expression - { - if( $1.IsNumber() && $3.IsNumber() ) - { - $$.cType = RSCEXP_LONG; - $$.SetLong( $1.GetLong() << $3.GetLong() ); - } - else - { - $$.cType = RSCEXP_EXP; - $$.aExp.pExp = new RscExpression( $1, 'l', $3 ); - } - } - | macro_expression RIGHTSHIFT macro_expression - { - if( $1.IsNumber() && $3.IsNumber() ) - { - $$.cType = RSCEXP_LONG; - $$.SetLong( $1.GetLong() >> $3.GetLong() ); - } - else - { - $$.cType = RSCEXP_EXP; - $$.aExp.pExp = new RscExpression( $1, 'r', $3 ); - } - } -; - -id_expression - : id_expression line_number - | macro_expression - { // evaluate pExpession and delete it - if( $1.cType == RSCEXP_EXP ) - { - sal_Int32 lValue; - - if( !$1.Evaluate( &lValue ) ) - pTC->pEH->Error( ERR_ZERODIVISION, nullptr, RscId() ); - delete $1.aExp.pExp; - $$.cType = RSCEXP_LONG; - $$.SetLong( lValue ); - } - else - { - $$ = $1; - } - } -; - -DUMMY_NUMBER - : NUMBER - { - } - | - { - } - ; - -line_number - : '#' LINE NUMBER STRING - { - RscFile * pFName; - - pFI->SetLineNo( $3 ); - pFI->SetFileIndex( pTC->aFileTab.NewCodeFile( rtl::OString( $4 ) ) ); - pFName = pTC->aFileTab.Get( pFI->GetFileIndex() ); - pFName->bLoaded = true; - pFName->bScanned = true; - } - | '#' NUMBER STRING DUMMY_NUMBER - { - RscFile * pFName; - - pFI->SetLineNo( $2 ); - pFI->SetFileIndex( pTC->aFileTab.NewCodeFile( rtl::OString( $3 ) ) ); - pFName = pTC->aFileTab.Get( pFI->GetFileIndex() ); - pFName->bLoaded = true; - pFName->bScanned = true; - } - | '#' NUMBER - { - pFI->SetLineNo( $2 ); - } -; - -%% -#if defined _MSC_VER -#pragma warning(pop) -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ - - diff --git a/rsc/source/prj/gui.cxx b/rsc/source/prj/gui.cxx deleted file mode 100644 index 323bc5728cc0..000000000000 --- a/rsc/source/prj/gui.cxx +++ /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 -#include -#include - -#include -#include -#include - -static RscVerbosity lcl_determineVerbosity( int argc, char ** argv ) -{ - for ( int i = 0; i < argc; ++i ) - { - if ( argv[i] == nullptr ) - continue; - if ( rsc_stricmp( argv[i], "-verbose" ) == 0 ) - return RscVerbosityVerbose; - if ( rsc_stricmp( argv[i], "-quiet" ) == 0 ) - return RscVerbositySilent; - } - return RscVerbosityNormal; -} - -int rsc2_main( int argc, char **argv ) -{ -#if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "debugging %s\n", argv[0] ); -#endif - - ERRTYPE aError; - - InitRscCompiler(); - std::unique_ptr pErrHdl(new RscError( lcl_determineVerbosity( argc, argv ) )); - std::unique_ptr pCmdLine(new RscCmdLine( argc, argv, pErrHdl.get() )); - std::unique_ptr pTypCont(new RscTypCont( pErrHdl.get(), - pCmdLine->nByteOrder, - pCmdLine->nCommands )); - - if( pErrHdl->nErrors ) - aError = ERR_ERROR; - else{ - std::unique_ptr pCompiler(new RscCompiler( pCmdLine.get(), pTypCont.get() )); - - aError = pCompiler->Start(); - } - - delete pHS; // is generated by InitRscCompiler - - if( aError.IsOk() ) - return 0; - else - return 1; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/prj/gui.hxx b/rsc/source/prj/gui.hxx deleted file mode 100644 index 7deab5b3b88e..000000000000 --- a/rsc/source/prj/gui.hxx +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_RSC_SOURCE_PRJ_GUI_HXX -#define INCLUDED_RSC_SOURCE_PRJ_GUI_HXX - -#include - -int rsc2_main(int, char**); - -// Entry point declaration for modules rscpp and rsc2 -extern "C" int rscpp_main(int, char**); - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx deleted file mode 100644 index c4ed4bf21f5a..000000000000 --- a/rsc/source/prj/start.cxx +++ /dev/null @@ -1,350 +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 -#include -#include -#include - -#ifdef UNX -#include -#include -#else // UNX - -#include -#include -#include - -#endif // UNX - -#include -#include -#include -#include -#include - - -static bool CallPrePro( const OString& rInput, - const OString& rOutput, RscPtrPtr * pCmdLine, - bool bResponse ) -{ - RscPtrPtr aNewCmdL; - RscPtrPtr aRespCmdL; - RscPtrPtr * pCmdL = &aNewCmdL; - int i, nRet; - FILE* fRspFile = nullptr; - OString aRspFileName; - - if( bResponse ) - { - aRspFileName = ::GetTmpFileName(); - fRspFile = fopen( aRspFileName.getStr(), "w" ); - } - - if( !fRspFile ) - aNewCmdL.Append( rsc_strdup( "rscpp" ) ); - - bool bVerbose = false; - for( i = 1; i < int(pCmdLine->GetCount() -1); i++ ) - { - if ( 0 == rsc_stricmp( static_cast(pCmdLine->GetEntry( i )), "-verbose" ) ) - { - bVerbose = true; - continue; - } - if (strcmp(static_cast(pCmdLine->GetEntry(i)), "-isystem") == 0) - { - // ignore "-isystem" and following arg - if (i < int(pCmdLine->GetCount()) - 1) - { - ++i; - } - continue; - } - if (strncmp( - static_cast(pCmdLine->GetEntry(i)), "-isystem", - strlen("-isystem")) - == 0) - { - // ignore args starting with "-isystem" - continue; - } - if ( !rsc_strnicmp( static_cast(pCmdLine->GetEntry( i )), "-u", 2 ) || - !rsc_strnicmp( static_cast(pCmdLine->GetEntry( i )), "-i", 2 ) || - !rsc_strnicmp( static_cast(pCmdLine->GetEntry( i )), "-d", 2 )) - { - aNewCmdL.Append( rsc_strdup( static_cast(pCmdLine->GetEntry( i )) ) ); - } - } - - aNewCmdL.Append( rsc_strdup( rInput.getStr() ) ); - aNewCmdL.Append( rsc_strdup( rOutput.getStr() ) ); - aNewCmdL.Append( static_cast(nullptr) ); - - if ( bVerbose ) - { - printf( "Preprocessor commandline: " ); - for( i = 0; i < (int)(pCmdL->GetCount() -1); i++ ) - { - printf( " " ); - printf( "%s", static_cast(pCmdL->GetEntry( i )) ); - } - printf( "\n" ); - } - - if( fRspFile ) - { - aRespCmdL.Append( rsc_strdup( "rscpp" ) ); - OStringBuffer aTmpStr; - aTmpStr.append('@').append(aRspFileName); - aRespCmdL.Append( rsc_strdup( aTmpStr.getStr() ) ); - aRespCmdL.Append( static_cast(nullptr) ); - - pCmdL = &aRespCmdL; - for( i = 0; i < (int)(aNewCmdL.GetCount() -1); i++ ) - { - fprintf( fRspFile, "%s ", static_cast(aNewCmdL.GetEntry( i )) ); - } - fclose( fRspFile ); - - if ( bVerbose ) - { - printf( "Preprocessor startline: " ); - for( i = 0; i < (int)(pCmdL->GetCount() -1); i++ ) - { - printf( " " ); - printf( "%s", static_cast(pCmdL->GetEntry( i )) ); - } - printf( "\n" ); - } - } - - nRet = rscpp_main( pCmdL->GetCount()-1, reinterpret_cast(pCmdL->GetBlock()) ); - - if ( fRspFile ) - { - #if OSL_DEBUG_LEVEL > 5 - fprintf( stderr, "leaving response file %s\n", aRspFileName.getStr() ); - #else - unlink( aRspFileName.getStr() ); - #endif - } - if ( nRet ) - return false; - - return true; -} - - -static bool CallRsc2( RscStrList * pInputList, - const OString &rSrsName, RscPtrPtr * pCmdLine ) -{ - int nRet; - RscVerbosity eVerbosity = RscVerbosityNormal; - - RscPtrPtr aNewCmdL; - aNewCmdL.Append( rsc_strdup( "rsc2" ) ); - - for (int i = 1; i < (int)(pCmdLine->GetCount() -1); ++i) - { - if ( !rsc_stricmp( static_cast(pCmdLine->GetEntry( i )), "-verbose" ) ) - { - eVerbosity = RscVerbosityVerbose; - continue; - } - if ( !rsc_stricmp( static_cast(pCmdLine->GetEntry( i )), "-quiet" ) ) - { - eVerbosity = RscVerbositySilent; - continue; - } - if( !rsc_strnicmp( static_cast(pCmdLine->GetEntry( i )), "-fp=", 4 ) || - !rsc_strnicmp( static_cast(pCmdLine->GetEntry( i )), "-fo=", 4 ) || - !rsc_strnicmp( static_cast(pCmdLine->GetEntry( i )), "-presponse", 10 ) || - !rsc_strnicmp( static_cast(pCmdLine->GetEntry( i )), "-rc", 3 ) || - !rsc_stricmp( static_cast(pCmdLine->GetEntry( i )), "-+" ) || - !rsc_stricmp( static_cast(pCmdLine->GetEntry( i )), "-br" ) || - !rsc_stricmp( static_cast(pCmdLine->GetEntry( i )), "-bz" ) || - !rsc_stricmp( static_cast(pCmdLine->GetEntry( i )), "-r" ) || - ( '-' != *static_cast(pCmdLine->GetEntry( i )) ) ) - { - } - else - { - aNewCmdL.Append( rsc_strdup( static_cast(pCmdLine->GetEntry( i )) ) ); - } - } - - aNewCmdL.Append( rsc_strdup( rSrsName.getStr() ) ); - - for ( size_t i = 0, n = pInputList->size(); i < n; ++i ) - { - OString* pString = (*pInputList)[ i ]; - aNewCmdL.Append( rsc_strdup( pString->getStr() ) ); - } - - if ( eVerbosity >= RscVerbosityVerbose ) - { - printf( "Rsc2 commandline: " ); - for( size_t i = 0; i < (unsigned int)(aNewCmdL.GetCount() -1); i++ ) - { - printf( " %s", static_cast(aNewCmdL.GetEntry( i )) ); - } - printf( "\n" ); - } - - nRet = rsc2_main( aNewCmdL.GetCount(), reinterpret_cast(aNewCmdL.GetBlock()) ); - - if( nRet ) - return false; - return true; -} - -SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) -{ - bool bPrePro = true; - bool bHelp = false; - bool bError = false; - bool bResponse = false; - OString aSrsName; - OString aResName; - RscStrList aInputList; - RscStrList aTmpList; - char * pStr; - char ** ppStr; - RscPtrPtr aCmdLine; - sal_uInt32 i; - - pStr = ::ResponseFile( &aCmdLine, argv, argc ); - if( pStr ) - { - printf( "Cannot open response file <%s>\n", pStr ); - return 1; - }; - - ppStr = reinterpret_cast(aCmdLine.GetBlock()); - ppStr++; - i = 1; - bool bSetSrs = false; - while( ppStr && i < (aCmdLine.GetCount() -1) ) - { - if (strcmp(*ppStr, "-isystem") == 0) - { - // ignore "-isystem" and following arg - if (i < aCmdLine.GetCount() - 1) - { - ++ppStr; - ++i; - } - } - else if (strncmp(*ppStr, "-isystem", strlen("-isystem")) == 0) - { - // ignore args starting with "-isystem" - } - else if( '-' == **ppStr ) - { - if( !rsc_stricmp( (*ppStr) + 1, "p" ) - || !rsc_stricmp( (*ppStr) + 1, "l" ) ) - { // no pre-processor - bPrePro = false; - } - else if( !rsc_stricmp( (*ppStr) + 1, "h" ) ) - { // print help - bHelp = true; - } - else if( !rsc_strnicmp( (*ppStr) + 1, "presponse", 9 ) ) - { // whether to use response file when parameterising preprocessor - bResponse = true; - } - else if( !rsc_strnicmp( (*ppStr) + 1, "fo=", 3 ) ) - { // another Name for .res-file - aResName = (*ppStr) + 4; - } - else if( !rsc_strnicmp( (*ppStr) + 1, "fp=", 3 ) ) - { // another Name for .srs-file - bSetSrs = true; - aSrsName = (*ppStr); - } - } - else - { - aInputList.push_back( new OString(*ppStr) ); - } - ppStr++; - i++; - } - - if( !aInputList.empty() ) - { - // build the output file names - if (!aResName.getLength()) - aResName = OutputFile( *aInputList[ 0 ], "res" ); - if( ! bSetSrs ) - { - aSrsName = OString("-fp=") + OutputFile(*aInputList[0], "srs"); - } - }; - - if( bHelp ) - bPrePro = false; - - if( bPrePro && !aInputList.empty() ) - { - OString aTmpName; - - for ( size_t k = 0, n = aInputList.size(); k < n; ++k ) - { - OString* pString = aInputList[ k ]; - aTmpName = ::GetTmpFileName(); - if( !CallPrePro( *pString, aTmpName, &aCmdLine, bResponse ) ) - { - printf( "Error starting preprocessor\n" ); - bError = true; - break; - } - aTmpList.push_back( new OString(aTmpName) ); - }; - }; - - if( !bError ) - { - if( !CallRsc2( bPrePro ? &aTmpList : &aInputList, aSrsName, &aCmdLine ) ) - { - if( !bHelp ) - { - printf( "Error starting rsc2 compiler\n" ); - bError = true; - } - }; - }; - - for ( size_t k = 0, n = aTmpList.size(); k < n; ++k ) - unlink( aTmpList[ k ]->getStr() ); - - return bError ? EXIT_FAILURE : EXIT_SUCCESS; -} - -void RscExit( sal_uInt32 nExit ) -{ - if( nExit ) - printf( "Program exit is %d\n", (int)nExit ); - exit( nExit ); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/res/rscall.cxx b/rsc/source/res/rscall.cxx deleted file mode 100644 index 84829c7e0ced..000000000000 --- a/rsc/source/res/rscall.cxx +++ /dev/null @@ -1,40 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - - -#include -#include - -#include -#include - -Atom nRsc_DELTALANG = InvalidAtom; -Atom nRsc_DELTASYSTEM = InvalidAtom; - -void InitRscCompiler() -{ - pStdParType = new OString("( const ResId & rResId, sal_Bool"); - pStdPar1 = new OString('('); - pStdPar2 = new OString('('); - - nRefDeep = 10; - pHS = new AtomContainer(); -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/res/rscarray.cxx b/rsc/source/res/rscarray.cxx deleted file mode 100644 index ba5f8fe16cbc..000000000000 --- a/rsc/source/res/rscarray.cxx +++ /dev/null @@ -1,426 +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 -#include -#include - -#include -#include -#include - -RscInstNode::RscInstNode(sal_uInt32 nId) : nTypeId(nId) -{ -} - -RscInstNode::~RscInstNode() -{ - if( aInst.IsInst() ) - { - aInst.pClass->Destroy( aInst ); - rtl_freeMemory( aInst.pData ); - } -} - -sal_uInt32 RscInstNode::GetId() const -{ - return nTypeId; -} - -RscArray::RscArray( Atom nId, RESOURCE_TYPE nTypeId, RscTop * pSuper, RscEnum * pTypeCl ) - : RscTop( nId, nTypeId, pSuper ) - , pTypeClass(pTypeCl) - , nOffInstData(RscTop::Size()) - , nSize(nOffInstData + ALIGNED_SIZE(sizeof(RscArrayInst))) -{ -} - -RscArray::~RscArray() -{ -} - -RscTop * RscArray::GetTypeClass() const -{ - return pTypeClass; -} - -static RscInstNode * Create( RscInstNode * pNode ) -{ - RscInstNode * pRetNode = nullptr; - - if( pNode ) - { - pRetNode = new RscInstNode( pNode->GetId() ); - pRetNode->aInst = pNode->aInst.pClass->Create( nullptr, pNode->aInst ); - RscInstNode * pTmpNode = Create(pNode->Left()); - if (pTmpNode) - pRetNode->Insert( pTmpNode ); - if( (pTmpNode = Create( pNode->Right() )) != nullptr ) - pRetNode->Insert( pTmpNode ); - } - - return pRetNode; -} - -RSCINST RscArray::Create( RSCINST * pInst, const RSCINST & rDflt, - bool bOwnClass ) -{ - RSCINST aInst; - RscArrayInst * pClassData; - - if( !pInst ) - { - aInst.pClass = this; - aInst.pData = static_cast(rtl_allocateMemory( Size() )); - } - else - aInst = *pInst; - - if( !bOwnClass && rDflt.IsInst() ) - bOwnClass = rDflt.pClass->InHierarchy( this ); - - RscTop::Create( &aInst, rDflt, bOwnClass ); - - pClassData = reinterpret_cast(aInst.pData + nOffInstData); - pClassData->pNode = nullptr; - if( bOwnClass ) - { - RscArrayInst * pDfltClassData; - - pDfltClassData = reinterpret_cast(rDflt.pData + nOffInstData); - - pClassData->pNode = ::Create( pDfltClassData->pNode ); - } - return aInst; -} - -static void Destroy( RscInstNode * pNode ) -{ - if( pNode ) - { - Destroy( pNode->Left() ); - Destroy( pNode->Right() ); - delete pNode; - } -} - -void RscArray::Destroy( const RSCINST & rInst ) -{ - RscArrayInst * pClassData; - - RscTop::Destroy( rInst ); - - pClassData = reinterpret_cast(rInst.pData + nOffInstData); - - // delete the tree recursively - ::Destroy( pClassData->pNode ); -} - -ERRTYPE RscArray::GetValueEle( const RSCINST & rInst, - sal_Int32 lValue, - RscTop * pCreateClass, - RSCINST * pGetInst) -{ - RscArrayInst * pClassData; - RscInstNode * pNode; - - pClassData = reinterpret_cast(rInst.pData + nOffInstData); - - ERRTYPE aError; - - Atom nId; - if( !pTypeClass->GetValueConst( sal_uInt32(lValue), &nId ) ) - { // not found - return ERR_ARRAY_INVALIDINDEX; - } - - if( pClassData->pNode ) - pNode = pClassData->pNode->Search( sal_uInt32(lValue) ); - else - pNode = nullptr; - - if( !pNode ) - { - pNode = new RscInstNode( sal_uInt32(lValue) ); - if( pCreateClass && GetSuperClass()->InHierarchy( pCreateClass ) ) - pNode->aInst = pCreateClass->Create( nullptr, rInst ); - else - pNode->aInst = GetSuperClass()->Create( nullptr, rInst ); - - pNode->aInst.pClass->SetToDefault( pNode->aInst ); - if( pClassData->pNode ) - pClassData->pNode->Insert( pNode ); - else - pClassData->pNode = pNode; - } - - *pGetInst = pNode->aInst; - return aError; -} - -ERRTYPE RscArray::GetArrayEle( const RSCINST & rInst, - Atom nId, - RscTop * pCreateClass, - RSCINST * pGetInst) -{ - sal_Int32 lValue; - if( !pTypeClass->GetConstValue( nId, &lValue ) ) - { // not found - return ERR_ARRAY_INVALIDINDEX; - } - - return GetValueEle( rInst, lValue, pCreateClass, pGetInst ); -} - -static bool IsConsistent( RscInstNode * pNode ) -{ - bool bRet = true; - - if( pNode ) - { - bRet = pNode->aInst.pClass->IsConsistent( pNode->aInst ); - if( !IsConsistent( pNode->Left() ) ) - bRet = false; - if( !IsConsistent( pNode->Right() ) ) - bRet = false; - } - return bRet; -} - -bool RscArray::IsConsistent( const RSCINST & rInst ) -{ - RscArrayInst * pClassData; - bool bRet; - - bRet = RscTop::IsConsistent( rInst ); - - pClassData = reinterpret_cast(rInst.pData + nOffInstData); - if( !::IsConsistent( pClassData->pNode ) ) - bRet = false; - - return bRet; -} - -static void SetToDefault( RscInstNode * pNode ) -{ - if( pNode ) - { - pNode->aInst.pClass->SetToDefault( pNode->aInst ); - SetToDefault( pNode->Left() ); - SetToDefault( pNode->Right() ); - } -} - -void RscArray::SetToDefault( const RSCINST & rInst ) -{ - RscArrayInst * pClassData; - - pClassData = reinterpret_cast(rInst.pData + nOffInstData); - - ::SetToDefault( pClassData->pNode ); - - RscTop::SetToDefault( rInst ); -} - -static bool IsDefault( RscInstNode * pNode ) -{ - bool bRet = true; - - if( pNode ) - { - bRet = pNode->aInst.pClass->IsDefault( pNode->aInst ); - if( bRet ) - bRet = IsDefault( pNode->Left() ); - if( bRet ) - bRet = IsDefault( pNode->Right() ); - } - return bRet; -} - -bool RscArray::IsDefault( const RSCINST & rInst ) -{ - RscArrayInst * pClassData; - - pClassData = reinterpret_cast(rInst.pData + nOffInstData); - - bool bRet = ::IsDefault( pClassData->pNode ); - - if( bRet ) - bRet = RscTop::IsDefault( rInst ); - return bRet; -} - -static bool IsValueDefault( RscInstNode * pNode, CLASS_DATA pDef ) -{ - bool bRet = true; - - if( pNode ) - { - bRet = pNode->aInst.pClass->IsValueDefault( pNode->aInst, pDef ); - if( bRet ) - bRet = IsValueDefault( pNode->Left(), pDef ); - if( bRet ) - bRet = IsValueDefault( pNode->Right(), pDef ); - } - return bRet; -} - -bool RscArray::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) -{ - bool bRet = RscTop::IsValueDefault( rInst, pDef ); - - if( bRet ) - { - RscArrayInst * pClassData = reinterpret_cast(rInst.pData + nOffInstData); - - bRet = ::IsValueDefault( pClassData->pNode, pDef ); - } - return bRet; -} - -void RscArray::WriteSrcHeader( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, - const RscId & aId, const char * pVarName ) -{ - RscArrayInst * pClassData; - - pClassData = reinterpret_cast(rInst.pData + nOffInstData); - - if( pTC->IsSrsDefault() ) - { // only write one value - RscInstNode * pNode = nullptr; - if( pClassData->pNode ) - { - std::vector< sal_uInt32 >::const_iterator it; - for( it = pTC->GetFallbacks().begin(); !pNode && it != pTC->GetFallbacks().end(); ++it ) - pNode = pClassData->pNode->Search( *it ); - } - - if( pNode ) - { - if( pNode->aInst.pClass->IsDefault( pNode->aInst ) ) - fprintf( fOutput, "Default" ); - else - pNode->aInst.pClass->WriteSrcHeader( - pNode->aInst, fOutput, - pTC, nTab, aId, pVarName ); - return; - } - } - - if( IsDefault( rInst ) ) - fprintf( fOutput, "Default" ); - else - { - RSCINST aSuper( GetSuperClass(), rInst.pData ); - aSuper.pClass->WriteSrcHeader( aSuper, fOutput, pTC, - nTab, aId, pVarName ); - } - if( !pTC->IsSrsDefault() ) - WriteSrc( rInst, fOutput, pTC, nTab, pVarName ); -} - -static void WriteSrc( RscInstNode * pNode, FILE * fOutput, RscTypCont * pTC, - sal_uInt32 nTab, const char * pVarName, - CLASS_DATA pDfltData, RscEnum * pTypeClass ) -{ - if( pNode ) - { - WriteSrc( pNode->Left(), fOutput, pTC, nTab, pVarName, - pDfltData, pTypeClass ); - if( !pNode->aInst.pClass->IsValueDefault( pNode->aInst, pDfltData ) ) - { - fprintf( fOutput, ";\n" ); - for( sal_uInt32 n = 0; n < nTab; n++ ) - fputc( '\t', fOutput ); - - Atom nIdxId; - pTypeClass->GetValueConst( pNode->GetId(), &nIdxId ); - fprintf( fOutput, "%s[ %s ] = ", pVarName, pHS->getString( nIdxId ).getStr() ); - pNode->aInst.pClass->WriteSrcHeader( pNode->aInst, fOutput, pTC, - nTab, RscId(), pVarName ); - } - WriteSrc( pNode->Right(), fOutput, pTC, nTab, pVarName, - pDfltData, pTypeClass ); - } -} - -void RscArray::WriteSrcArray( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, - const char * pVarName ) -{ - RscArrayInst * pClassData; - - pClassData = reinterpret_cast(rInst.pData + nOffInstData); - - ::WriteSrc( pClassData->pNode, fOutput, pTC, nTab, pVarName, - rInst.pData, pTypeClass ); -}; - -void RscArray::WriteSrc( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, - const char * pVarName ) -{ - WriteSrcArray( rInst, fOutput, pTC, nTab, pVarName ); -} - -ERRTYPE RscArray::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, - RscTypCont * pTC, sal_uInt32 nDeep ) -{ - ERRTYPE aError; - RscArrayInst * pClassData; - RscInstNode * pNode = nullptr; - - pClassData = reinterpret_cast(rInst.pData + nOffInstData); - - if( pClassData->pNode ) - { -#if OSL_DEBUG_LEVEL > 2 - fprintf( stderr, "RscArray::WriteRc: Fallback " ); -#endif - std::vector< sal_uInt32 >::const_iterator it; - for( it = pTC->GetFallbacks().begin(); !pNode && it != pTC->GetFallbacks().end(); ++it ) - { - pNode = pClassData->pNode->Search( *it ); -#if OSL_DEBUG_LEVEL > 2 - fprintf( stderr, " 0x%hx", *it ); -#endif - } -#if OSL_DEBUG_LEVEL > 2 - fprintf( stderr, "\n" ); -#endif - } - - if( pNode ) - aError = pNode->aInst.pClass->WriteRc( pNode->aInst, rMem, pTC, - nDeep ); - else - aError = RscTop::WriteRc( rInst, rMem, pTC, nDeep ); - - return aError; -} - -RscLangArray::RscLangArray( Atom nId, RESOURCE_TYPE nTypeId, RscTop * pSuper, - RscEnum * pTypeCl ) - : RscArray( nId, nTypeId, pSuper, pTypeCl ) -{ -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/res/rscclass.cxx b/rsc/source/res/rscclass.cxx deleted file mode 100644 index 386b34a2229a..000000000000 --- a/rsc/source/res/rscclass.cxx +++ /dev/null @@ -1,672 +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 -#include -#include - -#include -#include - -#include - -RscClass::RscClass( Atom nId, RESOURCE_TYPE nTypeId, RscTop * pSuperCl ) - : RscTop( nId, nTypeId, pSuperCl ) - , nSuperSize(RscTop::Size()) - , nSize(nSuperSize + ALIGNED_SIZE(sizeof(RscClassInst ))) - , nEntries(0), pVarTypeList(nullptr) -{ -} - -void RscClass::Pre_dtor() -{ - sal_uInt32 i; - - RscTop::Pre_dtor(); - - for( i = 0; i < nEntries; i++ ) - { - if( pVarTypeList[ i ].pDefault ) - { - pVarTypeList[ i ].pClass->Destroy( - RSCINST( pVarTypeList[ i ].pClass, - pVarTypeList[ i ].pDefault ) ); - rtl_freeMemory( pVarTypeList[ i ].pDefault ); - pVarTypeList[ i ].pDefault = nullptr; - } - } -} - -RscClass::~RscClass() -{ - if( pVarTypeList ) - rtl_freeMemory( static_cast(pVarTypeList) ); -} - -RSCINST RscClass::GetInstData -( - CLASS_DATA pData, - sal_uInt32 nEle, - bool bGetCopy -) -{ - RSCINST aInst; - - aInst.pClass = pVarTypeList[ nEle ].pClass; - if( pData ) - { - if( RSCVAR::NoDataInst & pVarTypeList[ nEle ].nVarType ) - { - RSCINST aTmpI; - - aTmpI.pClass = this; - aTmpI.pData = pData; - if( bGetCopy ) - aInst.pData = GetCopyVar( - aTmpI, - pVarTypeList[ nEle ].nDataBaseName - ).pData; - else - aInst.pData = GetVariable( - aTmpI, - pVarTypeList[ nEle ].nDataBaseName, - RSCINST() - ).pData; - } - else if( RSCVAR::Pointer & pVarTypeList[ nEle ].nVarType ) - { - aInst.pData = *reinterpret_cast(pData + pVarTypeList[ nEle ].nOffset); - } - else - aInst.pData = pData + pVarTypeList[ nEle ].nOffset; - } - return aInst; -} - -CLASS_DATA RscClass::GetDfltData( sal_uInt32 nEle ) -{ - if( pVarTypeList[ nEle ].pDefault ) - return pVarTypeList[ nEle ].pDefault; - - return pVarTypeList[ nEle ].pClass->GetDefault().pData; -} - -void RscClass::SetVarDflt( CLASS_DATA pData, sal_uInt32 nEle, bool bSet ) -{ - RscClassInst * pClass; - - pClass = reinterpret_cast(pData + nSuperSize ); - if( bSet ) - pClass->nVarDflt |= ((sal_uLong)1 << nEle); - else - pClass->nVarDflt &= ~((sal_uLong)1 << nEle); -} - -bool RscClass::IsDflt( CLASS_DATA pData, sal_uInt32 nEle ) -{ - RscClassInst * pClass; - - pClass = reinterpret_cast(pData + nSuperSize ); - return pClass->nVarDflt & ((sal_uLong)1 << nEle); -} - -RSCINST RscClass::Create( RSCINST * pInst, - const RSCINST & rDflt, - bool bOwnClass) -{ - sal_uInt32 i; - RSCINST aInst; - RSCINST aMemInst, aDfltI; - - if( !pInst ) - { - aInst.pClass = this; - aInst.pData = static_cast(rtl_allocateMemory( Size() )); - } - else - aInst = *pInst; - - if( !bOwnClass && rDflt.IsInst() ) - bOwnClass = rDflt.pClass->InHierarchy( this ); - - RscTop::Create( &aInst, rDflt, bOwnClass ); - - if( bOwnClass ) - reinterpret_cast(aInst.pData + nSuperSize)->nVarDflt = - reinterpret_cast(rDflt.pData + nSuperSize)->nVarDflt; - else - reinterpret_cast(aInst.pData + nSuperSize)->nVarDflt = ~((sal_uLong)0); - - for( i = 0; i < nEntries; i++ ) - { - aDfltI = GetInstData( bOwnClass ? rDflt.pData : nullptr, i, true ); - - if( (RSCVAR::Pointer & pVarTypeList[ i ].nVarType) && - !(RSCVAR::NoDataInst & pVarTypeList[ i ].nVarType) ) - { - CLASS_DATA * ppData = reinterpret_cast(aInst.pData + pVarTypeList[ i ].nOffset ); - *ppData = nullptr; - if( aDfltI.IsInst() ) - { - aMemInst = pVarTypeList[ i ].pClass->Create( nullptr, aDfltI ); - *ppData = aMemInst.pData; - } - } - else - { - aMemInst = GetInstData( aInst.pData, i, true ); - aMemInst = aMemInst.pClass->Create( &aMemInst, aDfltI ); - } - } - - return aInst; -} - -void RscClass::Destroy( const RSCINST & rInst ) -{ - sal_uInt32 i; - - RscTop::Destroy( rInst ); - - for( i = 0; i < nEntries; i++ ) - { - if( !(pVarTypeList[ i ].nVarType & RSCVAR::NoDataInst) ) - { - RSCINST aTmpI; - - aTmpI = GetInstData( rInst.pData, i, true ); - if( aTmpI.IsInst() ) - { - // destroy object - aTmpI.pClass->Destroy( aTmpI ); - if( pVarTypeList[ i ].nVarType & RSCVAR::Pointer ) - { - // free memory - rtl_freeMemory( aTmpI.pData ); - } - } - } - } -} - -ERRTYPE RscClass::SetVariable( Atom nVarName, - RscTop * pClass, - RSCINST * pDflt, - RSCVAR nVarType, - sal_uInt32 nMask, - Atom nDataBaseName) -{ - if( pVarTypeList ) - { - pVarTypeList = static_cast(rtl_reallocateMemory( static_cast(pVarTypeList), - ((nEntries +1) * sizeof( VARTYPE_STRUCT )) )); - } - else - { - pVarTypeList = static_cast(rtl_allocateMemory( (nEntries + 1) - * sizeof( VARTYPE_STRUCT ) )); - } - pVarTypeList[ nEntries ].nVarName = nVarName; - pVarTypeList[ nEntries ].nMask = nMask; - pVarTypeList[ nEntries ].pClass = pClass; - pVarTypeList[ nEntries ].nOffset = nSize; - pVarTypeList[ nEntries ].nDataBaseName = nDataBaseName; - if( pDflt ) - pVarTypeList[ nEntries ].pDefault = pDflt->pData; - else - pVarTypeList[ nEntries ].pDefault = nullptr; - - pVarTypeList[ nEntries ].nVarType = ~RSCVAR::Pointer & nVarType; - if( pClass->Size() > 10 ) - pVarTypeList[ nEntries ].nVarType |= RSCVAR::Pointer; - - if( !(pVarTypeList[ nEntries ].nVarType & RSCVAR::NoDataInst) ) - { - if( pVarTypeList[ nEntries ].nVarType & RSCVAR::Pointer ) - { - nSize += sizeof( CLASS_DATA ); - } - else - nSize += pClass->Size(); - } - - nEntries++; - if( nEntries > (sizeof( sal_uLong ) * 8) ) - { - // range for default is too small - RscExit( 16 ); - } - return ERR_OK; -} - -RSCINST RscClass::GetVariable( const RSCINST & rInst, - Atom nVarName, - const RSCINST & rInitInst, - bool bInitDflt, - RscTop * pCreateClass) -{ - sal_uInt32 i = 0; - RSCINST aTmpI; - - while( i < nEntries && pVarTypeList[ i ].nVarName != nVarName ) - i++; - - if( i < nEntries ) - { - if( RSCVAR::NoDataInst & pVarTypeList[ i ].nVarType ) - { - aTmpI = GetVariable( rInst, - pVarTypeList[ i ].nDataBaseName, - RSCINST() ); - aTmpI.pClass = pVarTypeList[ i ].pClass; - } - else - { - // generate default instance - RSCINST aDefInst = rInitInst; - if( !aDefInst.IsInst() && bInitDflt ) - { - // set to default variables - aDefInst.pData = pVarTypeList[ i ].pDefault; - aDefInst.pClass = pVarTypeList[ i ].pClass; - } - - aTmpI = GetInstData( rInst.pData, i ); - if( aTmpI.IsInst() ) - { - if( aDefInst.IsInst() ) - { - aTmpI.pClass->Destroy( aTmpI ); - aTmpI.pClass->Create( &aTmpI, aDefInst ); - } - } - else - { // is provided via pointer - CLASS_DATA * ppData - = reinterpret_cast(rInst.pData + pVarTypeList[ i ].nOffset); - aTmpI = aTmpI.pClass->Create( nullptr, aDefInst ); - *ppData = aTmpI.pData; - } - } - // set as non default - SetVarDflt( rInst.pData, i, false ); - return aTmpI; - } - - return RscTop::GetVariable( rInst, nVarName, rInitInst, - bInitDflt, pCreateClass ); -} - -RSCINST RscClass::GetCopyVar( const RSCINST & rInst, Atom nVarName) -{ - sal_uInt32 i = 0; - RSCINST aVarI; - - while( i < nEntries && pVarTypeList[ i ].nVarName != nVarName ) - i++; - - if( i < nEntries ) - { - if( RSCVAR::NoDataInst & pVarTypeList[ i ].nVarType ) - { - aVarI = GetCopyVar( rInst, pVarTypeList[ i ].nDataBaseName ); - aVarI.pClass = pVarTypeList[ i ].pClass; - } - else - { - if( IsDflt( rInst.pData, i ) ) - { - // initialize with default variables - aVarI = GetVariable( rInst, nVarName, RSCINST(), true ); - SetVarDflt( rInst.pData, i, true ); - } - else - aVarI = GetInstData( rInst.pData, i, true ); - - } - return aVarI ; - } - - return RscTop::GetCopyVar( rInst, nVarName ); -} - -bool RscClass::IsConsistent( const RSCINST & rInst ) -{ - sal_uInt32 i = 0; - RSCINST aTmpI; - bool bRet; - - bRet = RscTop::IsConsistent( rInst ); - - for( i = 0; i < nEntries; i++ ) - { - if( !(RSCVAR::NoDataInst & pVarTypeList[ i ].nVarType) ) - { - aTmpI = GetInstData( rInst.pData, i, true ); - - if( aTmpI.IsInst() ) - if( ! aTmpI.pClass->IsConsistent( aTmpI ) ) - bRet = false; - } - } - - return bRet; -} - -void RscClass::SetToDefault( const RSCINST & rInst ) -{ - sal_uInt32 i; - RSCINST aTmpI; - RscClassInst * pClass; - - pClass = reinterpret_cast(rInst.pData + nSuperSize ); - - for( i = 0; i < nEntries; i++ ) - { - // variables without own memory are set from "data server" to default - if( !(RSCVAR::NoDataInst & pVarTypeList[ i ].nVarType) ) - { - aTmpI = GetInstData( rInst.pData, i, true ); - if( aTmpI.IsInst() ) - aTmpI.pClass->SetToDefault( aTmpI ); - } - } - pClass->nVarDflt = ~((sal_uLong)0); // set everything to default - - RscTop::SetToDefault( rInst ); -} - -bool RscClass::IsDefault( const RSCINST & rInst ) -{ - sal_uInt32 i; - RSCINST aTmpI; - - for( i = 0; i < nEntries; i++ ) - { - // variables without own memory are looked for default in "data server" - if( !(RSCVAR::NoDataInst & pVarTypeList[ i ].nVarType) ) - if( !IsDflt( rInst.pData, i ) ) - return false; - } - - return RscTop::IsDefault( rInst ); -} - -RSCINST RscClass::GetDefault( Atom nVarId ) -{ - sal_uInt32 i; - - i = 0; - while( i < nEntries && pVarTypeList[ i ].nVarName != nVarId ) - i++; - - if( i < nEntries ) - { - RSCINST aTmpI; - - aTmpI.pClass = pVarTypeList[ i ].pClass; - aTmpI.pData = GetDfltData( i ); - return aTmpI; - } - - return RscTop::GetDefault( nVarId ); -} - -bool RscClass::IsValueDflt( CLASS_DATA pData, sal_uInt32 nEle ) -{ - RSCINST aTmpI; - - aTmpI = GetInstData( pData, nEle, true ); - - if( aTmpI.IsInst() ) - { - if( RSCVAR::SvDynamic & pVarTypeList[ nEle ].nVarType ) - return false; - - if( aTmpI.pClass == pVarTypeList[ nEle ].pClass ) - // they also have the same class - return aTmpI.pClass->IsValueDefault( aTmpI, GetDfltData( nEle ) ); - else - return false; - } - return true; -} - -bool RscClass::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) -{ - RSCINST aTmpI; - RSCINST aDfltI; - - if( !RscTop::IsValueDefault( rInst, pDef ) ) - return false; - - if( pDef ) - { - for( sal_uInt32 i = 0; i < nEntries; i++ ) - { - aTmpI = GetInstData( rInst.pData, i, true ); - if( aTmpI.IsInst() ) - { - if( aTmpI.pClass != pVarTypeList[ i ].pClass ) - // they don't have the same class - return false; - - aDfltI = GetInstData( pDef, i, true ); - if( !aDfltI.IsInst() ) - aDfltI.pData = GetDfltData( i ); - - if( !aTmpI.pClass->IsValueDefault( aTmpI, aDfltI.pData ) ) - return false; - } - } - } - else - return false; - - return true; -} - -void RscClass::SetDefault( const RSCINST & rInst, Atom nVarName ) -{ - sal_uInt32 i = 0; - RSCINST aTmpI; - - while( i < nEntries && pVarTypeList[ i ].nVarName != nVarName ) - i++; - - if( i < nEntries ) - { - aTmpI = GetInstData( rInst.pData, i, true ); - if( aTmpI.IsInst() ) - { - aTmpI.pClass->Destroy( aTmpI ); - aTmpI.pClass->Create( &aTmpI, RSCINST() ); - SetVarDflt( rInst.pData, i, true ); - } - } - else // look for variable in super class - RscTop::SetDefault( rInst, nVarName ); - -} - - -void RscClass::WriteSrc( const RSCINST & rInst, - FILE * fOutput, - RscTypCont * pTC, - sal_uInt32 nTab, - const char * pVarName) -{ - sal_uInt32 i = 0, n = 0; - RSCINST aTmpI; - - RscTop::WriteSrc( rInst, fOutput, pTC, nTab, pVarName ); - - for( i = 0; i < nEntries; i++ ) - { - if( !(RSCVAR::Hidden & pVarTypeList[ i ].nVarType) ) - { - if( !IsDflt( rInst.pData, i ) && !IsValueDflt( rInst.pData, i ) ) - { - aTmpI = GetInstData( rInst.pData, i, true ); - - if( aTmpI.IsInst() ) - { - const char * pName = pHS->getString( pVarTypeList[ i ].nVarName ).getStr(); - - for( n = 0; n < nTab; n++ ) - fputc( '\t', fOutput ); - - fprintf( fOutput, "%s", pName ); - fprintf( fOutput, " = " ); - aTmpI.pClass->WriteSrcHeader( - aTmpI, fOutput, pTC, nTab, RscId(), pName ); - fprintf( fOutput, ";\n" ); - } - } - } - } - - return; -} - -ERRTYPE RscClass::WriteInstRc( const RSCINST & rInst, - RscWriteRc & rMem, - RscTypCont * pTC, - sal_uInt32 nDeep ) -{ - sal_uInt32 i = 0; - ERRTYPE aError; - RSCINST aTmpI; - sal_uInt32 nMaskOff = 0;// offset to address mask field - - // when a variable is masked, then mask field - for( i = 0; i < nEntries; i++ ) - { - if( pVarTypeList[ i ].nMask ) - { - nMaskOff = rMem.Size(); - rMem.Put( sal_uInt32(0) ); - break; - } - } - - for( i = 0; i < nEntries && aError.IsOk(); i++ ) - { - if( !((RSCVAR::NoDataInst | RSCVAR::NoRc) & pVarTypeList[ i ].nVarType )) - { - if( pVarTypeList[ i ].nMask ) - { - if( !IsDflt( rInst.pData, i ) ) - { - aTmpI = GetInstData( rInst.pData, i, true ); - aError = aTmpI.pClass-> - WriteRcHeader(aTmpI, rMem, pTC, - RscId(), nDeep); - sal_uInt32 nMask = rMem.GetLong( nMaskOff ); - nMask |= pVarTypeList[ i ].nMask; - rMem.PutAt( nMaskOff, nMask ); - } - } - else - { - if( IsDflt( rInst.pData, i ) ) - { - aTmpI.pClass = pVarTypeList[ i ].pClass; - aTmpI.pData = GetDfltData( i ); - } - else - aTmpI = GetInstData( rInst.pData, i, true ); - - aError = aTmpI.pClass-> - WriteRcHeader( aTmpI, rMem, pTC, - RscId(), nDeep ); - } - } - } - - return aError; -} - -ERRTYPE RscClass::WriteRc( const RSCINST & rInst, - RscWriteRc & rMem, - RscTypCont * pTC, - sal_uInt32 nDeep ) -{ - ERRTYPE aError; - - aError = RscTop::WriteRc(rInst, rMem, pTC, nDeep); - if( aError.IsOk() ) - aError = WriteInstRc(rInst, rMem, pTC, nDeep); - - return aError; -} - -RscTupel::RscTupel( Atom nId, RESOURCE_TYPE nTypeId ) - : RscClass( nId, nTypeId, nullptr ) -{ -} - -RSCINST RscTupel::GetTupelVar( const RSCINST & rInst, sal_uInt32 nPos, - const RSCINST & rInitInst ) -{ - if( nPos >= nEntries ) - { - return RSCINST(); - } - else - return GetVariable( rInst, pVarTypeList[ nPos ].nVarName, rInitInst ); -} - -void RscTupel::WriteSrc( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, - const char * pVarName ) -{ - sal_uInt32 i = 0; - RSCINST aTmpI; - - RscTop::WriteSrc( rInst, fOutput, pTC, nTab, pVarName ); - - fprintf( fOutput, "< " ); - for( i = 0; i < nEntries; i++ ) - { - if( !(RSCVAR::Hidden & pVarTypeList[ i ].nVarType) ) - { - if( !IsDflt( rInst.pData, i ) - && !IsValueDflt( rInst.pData, i ) ) - { - aTmpI = GetInstData( rInst.pData, i, true ); - - if( aTmpI.IsInst() ) - aTmpI.pClass->WriteSrcHeader( - aTmpI, fOutput, pTC, nTab, RscId(), pVarName ); - else - fprintf( fOutput, "Default" ); - } - else - fprintf( fOutput, "Default" ); - fprintf( fOutput, "; " ); - } - } - fprintf( fOutput, ">" ); - - return; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/res/rscclobj.cxx b/rsc/source/res/rscclobj.cxx deleted file mode 100644 index 29184286cd8d..000000000000 --- a/rsc/source/res/rscclobj.cxx +++ /dev/null @@ -1,138 +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 -#include - - -RefNode::RefNode( Atom nTyp ) - : nTypNameId(nTyp), pObjBiTree(nullptr) -{ -} - -sal_uInt32 RefNode::GetId() const -{ - return nTypNameId; -} - -// insert a node in the b-tree pObjBiTree -// if the node with the same name is in pObjBiTree, -// return sal_False and no insert, - -bool RefNode::PutObjNode( ObjNode * pPutObject ) -{ - if( pObjBiTree ) - return pObjBiTree->Insert( pPutObject ); - - pObjBiTree = pPutObject; - return true; -} - -// insert a node in the b-tree pObjBiTree -// if the node with the same name is in pObjBiTree, -// return NULL and no insert, -// if not return the pointer to the Object -ObjNode * RefNode::GetObjNode( const RscId & rRscId ) -{ - if( pObjBiTree ) - return pObjBiTree->Search( rRscId ); - return nullptr; -} - -ObjNode::ObjNode( const RscId & rId, CLASS_DATA pData, RscFileTab::Index lKey ) - : aRscId(rId) - , pRscObj(pData) - , lFileKey(lKey) -{ -} - -ObjNode * ObjNode::DelObjNode( RscTop * pClass, RscFileTab::Index nFileKey ) -{ - ObjNode * pRetNode = this; - - if( Right() ) - pRight = static_cast(Right())->DelObjNode( pClass, nFileKey ); - if( Left() ) - pLeft = static_cast(Left())->DelObjNode( pClass, nFileKey ); - - if( GetFileKey() == nFileKey ) - { - if( GetRscObj() ) - { - pClass->Destroy( RSCINST( pClass, GetRscObj() ) ); - rtl_freeMemory( GetRscObj() ); - } - pRetNode = static_cast(Right()); - if( pRetNode ) - { - if( Left() ) - pRetNode->Insert( static_cast(Left()) ); - } - else - pRetNode = static_cast(Left()); - - delete this; - } - return pRetNode; -} - -sal_uInt32 ObjNode::GetId() const -{ - return aRscId.GetNumber(); -} - -bool ObjNode::IsConsistent() -{ - bool bRet = true; - - if( aRscId.GetNumber() > 0x7FFF || aRscId.GetNumber() < 1 ) - { - bRet = false; - } - else - { - if( Left() ) - { - if( !static_cast(Left())->IsConsistent() ) - { - bRet = false; - } - if( static_cast(Left())->aRscId >= aRscId ) - { - bRet = false; - } - } - if( Right() ) - { - if( static_cast(Right())->aRscId <= aRscId ) - { - bRet = false; - } - if( !static_cast(Right())->IsConsistent() ) - { - bRet = false; - } - } - } - - return bRet; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/res/rscconst.cxx b/rsc/source/res/rscconst.cxx deleted file mode 100644 index c0161106dbea..000000000000 --- a/rsc/source/res/rscconst.cxx +++ /dev/null @@ -1,186 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include -#include -#include - -#include -#include -#include -#include - -RscEnum::RscEnum( Atom nId, RESOURCE_TYPE nTypeId ) - : RscTop( nId, nTypeId ) - , pVarArray(nullptr), nEntries(0) -{ -} - -RscEnum::~RscEnum() -{ - if( pVarArray ) - rtl_freeMemory( static_cast(pVarArray) ); -} - -void RscEnum::SetConstant( Atom nVarName, sal_Int32 lValue ) -{ - if( pVarArray ) - pVarArray = static_cast(rtl_reallocateMemory( static_cast(pVarArray), - ((nEntries +1) * sizeof( VarEle )) )); - else - pVarArray = static_cast(rtl_allocateMemory( (nEntries +1) * sizeof( VarEle ) )); - pVarArray[ nEntries ].nId = nVarName; - pVarArray[ nEntries ].lValue = lValue; - nEntries++; -} - -bool RscEnum::GetConstValue( Atom nConst, sal_Int32 * pValue ) const -{ - sal_uInt32 i = 0; - - for( i = 0; i < nEntries; i++ ) - { - if( pVarArray[ i ].nId == nConst ) - { - *pValue = pVarArray[ i ].lValue; - return true; - } - } - return false; -} - -bool RscEnum::GetValueConst( sal_Int32 lValue, Atom * pConst ) const -{ - sal_uInt32 i = 0; - - for( i = 0; i < nEntries; i++ ) - { - if( pVarArray[ i ].lValue == lValue ) - { - *pConst = pVarArray[ i ].nId; - return true; - } - } - return false; -} - -sal_uInt32 RscEnum::GetConstPos( Atom nConst ) -{ - sal_uInt32 i = 0; - - for( i = 0; i < nEntries; i++ ) - { - if( pVarArray[ i ].nId == nConst ) - return i; - } - - return nEntries; -} - -ERRTYPE RscEnum::SetConst( const RSCINST & rInst, Atom nConst, sal_Int32 /*nVal*/ ) -{ - sal_uInt32 i = 0; - - if( nEntries != (i = GetConstPos( nConst )) ) - { - reinterpret_cast(rInst.pData)->nValue = i; - reinterpret_cast(rInst.pData)->bDflt = false; - return ERR_OK; - } - - return ERR_RSCENUM; -} - -ERRTYPE RscEnum::SetNumber( const RSCINST & rInst, sal_Int32 lValue ) -{ - sal_uInt32 i = 0; - - for( i = 0; i < nEntries; i++ ) - { - if( pVarArray[ i ].lValue == lValue ) - return SetConst( rInst, pVarArray[ i ].nId, lValue ); - } - - return ERR_RSCENUM; -} - -ERRTYPE RscEnum::GetConst( const RSCINST & rInst, Atom * pH ) -{ - *pH = pVarArray[ reinterpret_cast(rInst.pData)->nValue ].nId; - return ERR_OK; -} - -ERRTYPE RscEnum::GetNumber( const RSCINST & rInst, sal_Int32 * pNumber ){ - *pNumber = pVarArray[ reinterpret_cast(rInst.pData)->nValue ].lValue; - return ERR_OK; -} - -RSCINST RscEnum::Create( RSCINST * pInst, const RSCINST & rDflt, bool bOwnClass ) -{ - RSCINST aInst; - - if( !pInst ) - { - aInst.pClass = this; - aInst.pData = static_cast( - rtl_allocateMemory( sizeof( RscEnumInst ) )); - } - else - aInst = *pInst; - - if( !bOwnClass && rDflt.IsInst() ) - bOwnClass = rDflt.pClass->InHierarchy( this ); - - if( bOwnClass ) - memmove( aInst.pData, rDflt.pData, Size() ); - else - { - reinterpret_cast(aInst.pData)->nValue = 0; - reinterpret_cast(aInst.pData)->bDflt = true; - } - - return aInst; -} - -bool RscEnum::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) -{ - return pDef && (reinterpret_cast(rInst.pData)->nValue == reinterpret_cast(pDef)->nValue ); -} - -void RscEnum::WriteSrc( const RSCINST & rInst, FILE * fOutput, - RscTypCont *, sal_uInt32, const char * ) -{ - fprintf( fOutput, "%s", - pHS->getString( pVarArray[ reinterpret_cast(rInst.pData)->nValue ].nId ).getStr() ); -} - -ERRTYPE RscEnum::WriteRc( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont *, sal_uInt32 ) -{ - aMem.Put( pVarArray[ reinterpret_cast(rInst.pData)->nValue ].lValue ); - return ERR_OK; -} - -RscLangEnum::RscLangEnum() - : RscEnum( pHS->getID( "LangEnum" ), RSC_NOTYPE ), - mnLangId( 0x400 ) -{ -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/res/rsccont.cxx b/rsc/source/res/rsccont.cxx deleted file mode 100644 index 60e7064efe49..000000000000 --- a/rsc/source/res/rsccont.cxx +++ /dev/null @@ -1,755 +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 -#include -#include - -#include - -#include - -void ENTRY_STRUCT::Destroy() -{ - aName.Destroy(); - if( aInst.IsInst() ) - { - aInst.pClass->Destroy( aInst ); - rtl_freeMemory( aInst.pData ); - } -} - -RscBaseCont::RscBaseCont( Atom nId, RESOURCE_TYPE nTypeId, - bool bNoIdent ) - : RscTop(nId, nTypeId, nullptr) - , pTypeClass(nullptr) - , bNoId(bNoIdent), nOffInstData(RscTop::Size()) - , nSize(nOffInstData + ALIGNED_SIZE(sizeof(RscBaseContInst))) - -{ -} - -RscBaseCont::~RscBaseCont() -{ -} - -void RscBaseCont::DestroyElements( RscBaseContInst * pClassData ) -{ - if( pClassData->nEntries ) - { - for (sal_uInt32 i = 0; i < pClassData->nEntries; i++ ) - { - pClassData->pEntries[ i ].Destroy(); - } - rtl_freeMemory( pClassData->pEntries ); - pClassData->pEntries = nullptr; - pClassData->nEntries = 0; - } -} - -RSCINST RscBaseCont::Create( RSCINST * pInst, const RSCINST & rDflt, - bool bOwnClass ) -{ - RSCINST aInst; - RscBaseContInst * pClassData; - - if( !pInst ) - { - aInst.pClass = this; - aInst.pData = static_cast(rtl_allocateMemory( Size() )); - } - else - aInst = *pInst; - - if( !bOwnClass && rDflt.IsInst() ) - bOwnClass = rDflt.pClass->InHierarchy( this ); - - RscTop::Create( &aInst, rDflt, bOwnClass ); - - pClassData = reinterpret_cast(aInst.pData + nOffInstData); - pClassData->nEntries = 0; - pClassData->pEntries = nullptr; - pClassData->bDflt = true; - - if( bOwnClass ) - { - RscBaseContInst * pDfltClassData; - RSCINST aDfltI; - - pDfltClassData = reinterpret_cast(rDflt.pData + nOffInstData); - - if( 0 != pDfltClassData->nEntries ) - { - *pClassData = *pDfltClassData; - pClassData->pEntries = - static_cast(rtl_allocateMemory( sizeof( ENTRY_STRUCT ) - * pClassData->nEntries )); - for (sal_uInt32 i = 0; i < pClassData->nEntries; i++ ) - { - pClassData->pEntries[ i ].Create(); - pClassData->pEntries[ i ].aName = - pDfltClassData->pEntries[ i ].aName; - aDfltI = pDfltClassData->pEntries[ i ].aInst; - pClassData->pEntries[ i ].aInst = - aDfltI.pClass->Create( nullptr, aDfltI ); - } - } - } - - return aInst; -} - -void RscBaseCont::Destroy( const RSCINST & rInst ) -{ - RscBaseContInst * pClassData; - - RscTop::Destroy( rInst); - - pClassData = reinterpret_cast(rInst.pData + nOffInstData); - DestroyElements( pClassData ); -} - -RSCINST RscBaseCont::SearchElePos( const RSCINST & rInst, const RscId & rEleName, - RscTop * pClass, sal_uInt32 nPos ) -{ - RscBaseContInst * pClassData; - - pClassData = reinterpret_cast(rInst.pData + nOffInstData); - if( !pClass ) - pClass = pTypeClass; - - if( rEleName.IsId() ) - { - for (sal_uInt32 i = nPos; i < pClassData->nEntries; i++ ) - { - if( pClassData->pEntries[ i ].aName == rEleName && - pClassData->pEntries[ i ].aInst.pClass == pClass ) - { - return pClassData->pEntries[ i ].aInst; - } - } - } - return RSCINST(); -} - -RSCINST RscBaseCont::SearchEle( const RSCINST & rInst, const RscId & rEleName, - RscTop * pClass ) -{ - return SearchElePos( rInst, rEleName, pClass, 0 ); -} - -ERRTYPE RscBaseCont::GetElement( const RSCINST & rInst, const RscId & rEleName, - RscTop * pCreateClass, - const RSCINST & rCreateInst, RSCINST * pGetInst ) -{ - RscBaseContInst * pClassData; - RSCINST aTmpI; - ERRTYPE aError; - - if( !bNoId && !rEleName.IsId() ) - aError = WRN_CONT_NOID; - - pClassData = reinterpret_cast(rInst.pData + nOffInstData); - - if( pCreateClass ) - { - if( !pCreateClass->InHierarchy( pTypeClass ) ) - { - return ERR_CONT_INVALIDTYPE; - } - } - else - pCreateClass = pTypeClass; - - pClassData->bDflt = false; - - if( !bNoId ) - aTmpI = SearchEle( rInst, rEleName, pCreateClass ); - // entry found - if( aTmpI.IsInst() ) - { - aError = WRN_CONT_DOUBLEID; - if( rCreateInst.IsInst() ) - { - aTmpI.pClass->Destroy( aTmpI ); - aTmpI.pClass->Create( &aTmpI, rCreateInst ); - } - } - else - { - if( pClassData->pEntries ) - { - pClassData->pEntries = - static_cast(rtl_reallocateMemory( pClassData->pEntries, - sizeof( ENTRY_STRUCT ) * (pClassData->nEntries +1) )); - } - else - { - pClassData->pEntries = - static_cast(rtl_allocateMemory( sizeof( ENTRY_STRUCT ) - * (pClassData->nEntries +1) )); - } - - pClassData->pEntries[ pClassData->nEntries ].Create(); - pClassData->pEntries[ pClassData->nEntries ].aName = rEleName; - - if( rCreateInst.IsInst() ) - { - // initialize instance with CreateInst data - pClassData->pEntries[ pClassData->nEntries ].aInst = - pCreateClass->Create( nullptr, rCreateInst ); - } - else - { - pClassData->pEntries[ pClassData->nEntries ].aInst = - pCreateClass->Create( nullptr, RSCINST() ); - } - - pClassData->nEntries++; - aTmpI = pClassData->pEntries[ pClassData->nEntries -1 ].aInst; - } - - *pGetInst = aTmpI; - return aError; -} - -sal_uInt32 RscBaseCont::GetCount( const RSCINST & rInst ) -{ - RscBaseContInst * pClassData; - - pClassData = reinterpret_cast(rInst.pData + nOffInstData); - return pClassData->nEntries; -} - -RSCINST RscBaseCont::GetPosEle( const RSCINST & rInst, sal_uInt32 nPos ) -{ - RscBaseContInst * pClassData; - - pClassData = reinterpret_cast(rInst.pData + nOffInstData); - - if( nPos < pClassData->nEntries ) - return pClassData->pEntries[ nPos ].aInst; - return RSCINST(); -} - -ERRTYPE RscBaseCont::MovePosEle( const RSCINST & rInst, sal_uInt32 nDestPos, - sal_uInt32 nSourcePos ) -{ - ERRTYPE aError; - RscBaseContInst * pClassData; - - pClassData = reinterpret_cast(rInst.pData + nOffInstData); - - if( (nDestPos < pClassData->nEntries) && (nSourcePos < pClassData->nEntries) ) - { - ENTRY_STRUCT aEntry; - int nInc = 1; - sal_uInt32 i = 0; - - // mark source - aEntry = pClassData->pEntries[ nSourcePos ]; - // guess direction of the for-loop - if( nDestPos < nSourcePos ) - nInc = -1; - - for( i = nSourcePos; i != nDestPos; i += nInc ) - pClassData->pEntries[ i ] = pClassData->pEntries[ i + nInc ]; - - // assign source to target - pClassData->pEntries[ nDestPos ] = aEntry; - } - else - aError = ERR_RSCCONT; - - return aError; -} - -ERRTYPE RscBaseCont::SetPosRscId( const RSCINST & rInst, sal_uInt32 nPos, - const RscId & rId ) -{ - RscBaseContInst * pClassData; - RSCINST aTmpI; - ERRTYPE aError; - - pClassData = reinterpret_cast(rInst.pData + nOffInstData); - - if( nPos < pClassData->nEntries ) - { - if( ! (rId == pClassData->pEntries[ nPos ].aName) ) - aTmpI = SearchEle( rInst, rId, - pClassData->pEntries[ nPos ].aInst.pClass ); - if( !aTmpI.IsInst() ) - pClassData->pEntries[ nPos ].aName = rId; - else - aError = ERR_RSCCONT; - } - else - aError = ERR_RSCCONT; - - return aError; -} - -SUBINFO_STRUCT RscBaseCont::GetInfoEle( const RSCINST & rInst, sal_uInt32 nPos ) -{ - RscBaseContInst * pClassData; - SUBINFO_STRUCT aInfo; - - pClassData = reinterpret_cast(rInst.pData + nOffInstData); - - if( nPos < pClassData->nEntries ) - { - aInfo.aId = pClassData->pEntries[ nPos ].aName; - } - return aInfo; -} - -ERRTYPE RscBaseCont::SetString( const RSCINST & rInst, const char * pStr ) -{ - RscBaseContInst * pClassData; - RSCINST aTmpI; - ERRTYPE aError; - char *pTmpStr; - - pClassData = reinterpret_cast(rInst.pData + nOffInstData); - - // otherwise infinite recursion is possible - if( RSC_NOTYPE == pTypeClass->GetTypId() ) - { - aError = GetElement( rInst, RscId(), pTypeClass, RSCINST(), &aTmpI ); - aError = aTmpI.pClass->GetString( aTmpI, &pTmpStr ); - - if( aError.IsOk() ) - aError = aTmpI.pClass->SetString( aTmpI, pStr ); - else - { - aError.Clear(); - DeletePos( rInst, pClassData->nEntries -1 ); - aError = GetElement( rInst, RscId(), nullptr, RSCINST(), &aTmpI ); - aError = aTmpI.pClass->GetString( aTmpI, &pTmpStr ); - if( aError.IsOk() ) - aError = aTmpI.pClass->SetString( aTmpI, pStr ); - } - - if( aError.IsError() ) - DeletePos( rInst, pClassData->nEntries -1 ); - } - else - aError = ERR_UNKNOWN_METHOD; - - return aError; -} - -ERRTYPE RscBaseCont::SetNumber( const RSCINST & rInst, sal_Int32 lValue ) -{ - RscBaseContInst * pClassData; - RSCINST aTmpI; - ERRTYPE aError; - sal_Int32 lNumber; - - pClassData = reinterpret_cast(rInst.pData + nOffInstData); - - // otherwise infinite recursion is possible - if( RSC_NOTYPE == pTypeClass->GetTypId() ) - { - aError = GetElement( rInst, RscId(), pTypeClass, RSCINST(), &aTmpI ); - aError = aTmpI.pClass->GetNumber( aTmpI, &lNumber ); - - if( aError.IsOk() ) - aError = aTmpI.pClass->SetNumber( aTmpI, lValue ); - else - { - aError.Clear(); - DeletePos( rInst, pClassData->nEntries -1 ); - aError = GetElement( rInst, RscId(), nullptr, RSCINST(), &aTmpI ); - aError = aTmpI.pClass->GetNumber( aTmpI, &lNumber ); - if( aError.IsOk() ) - aError = aTmpI.pClass->SetNumber( aTmpI, lValue ); - } - if( aError.IsError() ) - DeletePos( rInst, pClassData->nEntries -1 ); - } - else - aError = ERR_UNKNOWN_METHOD; - - return aError; -} - -ERRTYPE RscBaseCont::SetBool( const RSCINST & rInst, - bool bValue) -{ - RscBaseContInst * pClassData; - RSCINST aTmpI; - ERRTYPE aError; - bool bBool; - - pClassData = reinterpret_cast(rInst.pData + nOffInstData); - - // otherwise infinite recursion is possible - if( RSC_NOTYPE == pTypeClass->GetTypId() ) - { - aError = GetElement( rInst, RscId(), pTypeClass, RSCINST(), &aTmpI ); - aError = aTmpI.pClass->GetBool( aTmpI, &bBool ); - - if( aError.IsOk() ) - aError = aTmpI.pClass->SetBool( aTmpI, bValue ); - else - { - aError.Clear(); - DeletePos( rInst, pClassData->nEntries -1 ); - aError = GetElement( rInst, RscId(), nullptr, RSCINST(), &aTmpI ); - aError = aTmpI.pClass->GetBool( aTmpI, &bBool ); - if( aError.IsOk() ) - aError = aTmpI.pClass->SetBool( aTmpI, bValue ); - } - - if( aError.IsError() ) - DeletePos( rInst, pClassData->nEntries -1 ); - } - else - aError = ERR_UNKNOWN_METHOD; - - return aError; -} - -ERRTYPE RscBaseCont::SetConst( const RSCINST & rInst, - Atom nValueId, - sal_Int32 lValue) -{ - RscBaseContInst * pClassData; - RSCINST aTmpI; - ERRTYPE aError; - Atom nConst; - - pClassData = reinterpret_cast(rInst.pData + nOffInstData); - - // otherwise infinite recursion is possible - if( RSC_NOTYPE == pTypeClass->GetTypId() ) - { - aError = GetElement( rInst, RscId(), pTypeClass, RSCINST(), &aTmpI ); - aError = aTmpI.pClass->GetConst( aTmpI, &nConst ); - - if( aError.IsOk() ) - aError = aTmpI.pClass->SetConst( aTmpI, nValueId, lValue ); - else - { - aError.Clear(); - DeletePos( rInst, pClassData->nEntries -1 ); - aError = GetElement( rInst, RscId(), nullptr, RSCINST(), &aTmpI ); - aError = aTmpI.pClass->GetConst( aTmpI, &nConst ); - if( aError.IsOk() ) - aError = aTmpI.pClass->SetConst( aTmpI, nValueId, lValue ); - } - - if( aError.IsError() ) - DeletePos( rInst, pClassData->nEntries -1 ); - } - else - aError = ERR_UNKNOWN_METHOD; - - return aError; -} - -ERRTYPE RscBaseCont::SetRef( const RSCINST & rInst, const RscId & rRefId ) -{ - RscBaseContInst * pClassData; - RSCINST aTmpI; - ERRTYPE aError; - RscId aId; - - pClassData = reinterpret_cast(rInst.pData + nOffInstData); - - // otherwise infinite recursion is possible - if( RSC_NOTYPE == pTypeClass->GetTypId() ) - { - aError = GetElement( rInst, RscId(), pTypeClass, RSCINST(), &aTmpI ); - aError = aTmpI.pClass->GetRef( aTmpI, &aId ); - - if( aError.IsOk() ) - aError = aTmpI.pClass->SetRef( aTmpI, rRefId ); - else - { - aError.Clear(); - DeletePos( rInst, pClassData->nEntries -1 ); - aError = GetElement( rInst, RscId(), nullptr, RSCINST(), &aTmpI ); - aError = aTmpI.pClass->GetRef( aTmpI, &aId ); - if( aError.IsOk() ) - aError = aTmpI.pClass->SetNumber( aTmpI, rRefId.GetNumber() ); - } - - if( aError.IsError() ) - DeletePos( rInst, pClassData->nEntries -1 ); - } - else - aError = ERR_UNKNOWN_METHOD; - - return aError; -} - -bool RscBaseCont::IsConsistent( const RSCINST & rInst ) -{ - sal_uInt32 i = 0; - RscBaseContInst * pClassData; - bool bRet; - - bRet = RscTop::IsConsistent( rInst ); - - pClassData = reinterpret_cast(rInst.pData + nOffInstData); - - // check for duplicate Id and keep order - // complexity = n^2 / 2 - for( i = 0; i < pClassData->nEntries; i++ ) - { - if( !bNoId ) - { - if( pClassData->pEntries[ i ].aName.GetNumber() > 0x7FFF || - pClassData->pEntries[ i ].aName.GetNumber() < 1 ) - { - bRet = false; - } - else if( SearchElePos( rInst, pClassData->pEntries[ i ].aName, - pClassData->pEntries[ i ].aInst.pClass, i +1 ).IsInst() ) - { - bRet = false; - } - } - if( ! pClassData->pEntries[ i ].aInst.pClass-> - IsConsistent( pClassData->pEntries[ i ].aInst ) ) - { - bRet = false; - } - } - - return bRet; -} - -void RscBaseCont::SetToDefault( const RSCINST & rInst ) -{ - sal_uInt32 i = 0; - RscBaseContInst * pClassData; - - pClassData = reinterpret_cast(rInst.pData + nOffInstData); - - for( i = 0; i < pClassData->nEntries; i++ ) - { - pClassData->pEntries[ i ].aInst.pClass-> - SetToDefault( pClassData->pEntries[ i ].aInst ); - } - - RscTop::SetToDefault( rInst ); -} - -bool RscBaseCont::IsDefault( const RSCINST & rInst ) -{ - sal_uInt32 i = 0; - RscBaseContInst * pClassData; - - pClassData = reinterpret_cast(rInst.pData + nOffInstData); - - if( !pClassData->bDflt ) - return false; - - for( i = 0; i < pClassData->nEntries; i++ ) - { - if( ! pClassData->pEntries[ i ].aInst.pClass-> - IsDefault( pClassData->pEntries[ i ].aInst ) ) - { - return false; - } - } - - return RscTop::IsDefault( rInst ); -} - -bool RscBaseCont::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) -{ - RscBaseContInst * pClassData; - - if( !RscTop::IsValueDefault( rInst, pDef ) ) - return false; - - pClassData = reinterpret_cast(rInst.pData + nOffInstData); - - if( pClassData->nEntries ) - return false; - else - return true; -} - -void RscBaseCont::Delete( const RSCINST & rInst, RscTop * pClass, - const RscId & rId ) -{ - sal_uInt32 i = 0; - RscBaseContInst * pClassData; - - pClassData = reinterpret_cast(rInst.pData + nOffInstData); - if( !pClass ) - pClass = pTypeClass; - - for( i = 0; i < pClassData->nEntries; i++ ) - { - if( pClassData->pEntries[ i ].aName == rId ) - { - if( pClassData->pEntries[ i ].aInst.pClass == pClass || !pClass ) - { - DeletePos( rInst, i ); - return; - } - } - } - -} - -void RscBaseCont::DeletePos( const RSCINST & rInst, sal_uInt32 nPos ) -{ - RscBaseContInst * pClassData; - - pClassData = reinterpret_cast(rInst.pData + nOffInstData); - - if( nPos < pClassData->nEntries ) - { - if( 1 == pClassData->nEntries ) - DestroyElements( pClassData ); - else - { - pClassData->pEntries[ nPos ].Destroy(); - pClassData->nEntries--; - - for (sal_uInt32 i = nPos; i < pClassData->nEntries; i++ ) - pClassData->pEntries[ i ] = pClassData->pEntries[ i + 1 ]; - - } - } -} - -void RscBaseCont::ContWriteSrc( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, - const char * pVarName ) -{ - sal_uInt32 i = 0, t = 0; - RscBaseContInst * pClassData; - - pClassData = reinterpret_cast(rInst.pData + nOffInstData); - - for( i = 0; i < pClassData->nEntries; i++ ) - { - for( t = 0; t < nTab; t++ ) - fputc( '\t', fOutput ); - - pClassData->pEntries[ i ].aInst.pClass-> - WriteSrcHeader( pClassData->pEntries[ i ].aInst, - fOutput, pTC, nTab, - pClassData->pEntries[ i ].aName, pVarName ); - fprintf( fOutput, ";\n" ); - } -} - -ERRTYPE RscBaseCont::ContWriteRc( const RSCINST & rInst, RscWriteRc & rMem, - RscTypCont * pTC, sal_uInt32 nDeep ) -{ - RscBaseContInst * pClassData; - ERRTYPE aError; - - if( bNoId ) - { - pClassData = reinterpret_cast(rInst.pData + nOffInstData); - - for (sal_uInt32 i = 0; i < pClassData->nEntries && aError.IsOk(); i++ ) - { - aError = pClassData->pEntries[ i ].aInst.pClass-> - WriteRcHeader( pClassData->pEntries[ i ].aInst, - rMem, pTC, - pClassData->pEntries[ i ].aName, - nDeep ); - } - } - - return aError ; -} - -void RscBaseCont::WriteSrc( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, - const char * pVarName ) -{ - RscTop::WriteSrc( rInst, fOutput, pTC, nTab, pVarName ); - ContWriteSrc( rInst, fOutput, pTC, nTab, pVarName ); -} - -ERRTYPE RscBaseCont::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, - RscTypCont * pTC, sal_uInt32 nDeep ) -{ - ERRTYPE aError; - - aError = RscTop::WriteRc( rInst, rMem, pTC, nDeep ); - if( aError.IsOk() ) - aError = ContWriteRc( rInst, rMem, pTC, nDeep ); - - return aError; -} - -RscContWriteSrc::RscContWriteSrc( Atom nId, RESOURCE_TYPE nTypeId ) - : RscBaseCont( nId, nTypeId, true ) -{ -} - -void RscContWriteSrc::WriteSrc( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, - const char * pVarName ) -{ - sal_uInt32 i; - - RscTop::WriteSrc( rInst, fOutput, pTC, nTab, pVarName ); - - fprintf( fOutput, "\n" ); - for( i = 0; i < nTab; i++ ) - fputc( '\t', fOutput ); - - fprintf( fOutput, "{\n" ); - - ContWriteSrc( rInst, fOutput, pTC, nTab +1, pVarName ); - - for( i = 0; i < nTab; i++ ) - fputc( '\t', fOutput ); - - fprintf( fOutput, "}" ); -} - -RscCont::RscCont( Atom nId, RESOURCE_TYPE nTypeId ) - : RscContWriteSrc( nId, nTypeId ) -{ -} - -ERRTYPE RscCont::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, - RscTypCont * pTC, sal_uInt32 nDeep ) -{ - RscBaseContInst * pClassData; - ERRTYPE aError; - - aError = RscTop::WriteRc( rInst, rMem, pTC, nDeep ); - - pClassData = reinterpret_cast(rInst.pData + nOffInstData); - - rMem.Put( pClassData->nEntries ); - - if( aError.IsOk() ) - aError = ContWriteRc( rInst, rMem, pTC, nDeep ); - - return aError; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/res/rscmgr.cxx b/rsc/source/res/rscmgr.cxx deleted file mode 100644 index 6c0b1441d042..000000000000 --- a/rsc/source/res/rscmgr.cxx +++ /dev/null @@ -1,346 +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 -#include -#include - -#include -#include - -RscMgr::RscMgr( Atom nId, RESOURCE_TYPE nTypeId, RscTop * pSuperCl ) - : RscClass( nId, nTypeId, pSuperCl ) -{ -} - -sal_uInt32 RscMgr::Size() const -{ - return RscClass::Size() + ALIGNED_SIZE( sizeof( RscMgrInst ) ); -} - -RSCINST RscMgr::Create( RSCINST * pInst, const RSCINST & rDflt, bool bOwnClass ) -{ - RSCINST aInst; - RscMgrInst * pClassData; - - if( !pInst ) - { - aInst.pClass = this; - aInst.pData = static_cast(rtl_allocateMemory( Size() )); - } - else - aInst = *pInst; - - if( !bOwnClass && rDflt.IsInst() ) - bOwnClass = rDflt.pClass->InHierarchy( this ); - - RscClass::Create( &aInst, rDflt, bOwnClass ); - - pClassData = reinterpret_cast(aInst.pData + RscClass::Size() ); - pClassData->Create(); - - if( bOwnClass ) - { - RscMgrInst * pDfltData = reinterpret_cast(rDflt.pData + RscClass::Size()); - *pClassData = *pDfltData; - } - - return aInst; -} - -void RscMgr::Destroy( const RSCINST & rInst ) -{ - RscMgrInst * pClassData; - - RscClass::Destroy( rInst ); - - pClassData = reinterpret_cast(rInst.pData + RscClass::Size()); - pClassData->Destroy(); -} - -void RscMgr::SetToDefault( const RSCINST & rInst ) -{ - RscMgrInst * pClassData; - - pClassData = reinterpret_cast(rInst.pData + RscClass::Size()); - pClassData->bDflt = true; - - RscClass::SetToDefault( rInst ); -} - -bool RscMgr::IsDefault( const RSCINST & rInst ) -{ - RscMgrInst * pClassData; - - pClassData = reinterpret_cast(rInst.pData + RscClass::Size()); - if( !pClassData->bDflt ) - return false; - - return RscClass::IsDefault( rInst ); -} - -bool RscMgr::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) -{ - if( !RscClass::IsValueDefault( rInst, pDef ) ) - return false; - - if( pDef ) - { - RscMgrInst * pClassData = reinterpret_cast(rInst.pData + RscClass::Size()); - RscMgrInst * pDfltData = reinterpret_cast(pDef + RscClass::Size()); - - if( !pClassData->aRefId.IsId() && !pDfltData->aRefId.IsId() ) - { - return true; - } - } - - return false; -} - - -void RscMgr::WriteSrcHeader( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, - const RscId & rId, const char * pVarName ) -{ - RscMgrInst * pClassData; - sal_uInt32 i; - - pClassData = reinterpret_cast(rInst.pData + RscClass::Size()); - - fprintf( fOutput, "%s %s", - pHS->getString( rInst.pClass->GetId() ).getStr(), - (rId.GetName()).getStr() ); - - if( pClassData->aRefId.IsId() ) - fprintf( fOutput, ",%s", pClassData->aRefId.GetName().getStr() ); - else - { - fprintf( fOutput, "\n" ); - for( i = 0; i < nTab; i++ ) - fputc( '\t', fOutput ); - - fprintf( fOutput, "{\n" ); - - rInst.pClass->WriteSrc( rInst, fOutput, pTC, nTab +1, pVarName ); - - RscClass::WriteSrc( rInst, fOutput, pTC, nTab +1, pVarName); - - for( i = 0; i < nTab; i++ ) - fputc( '\t', fOutput ); - - fprintf( fOutput, "}" ); - } -} - -void RscMgr::WriteSrc( const RSCINST &, FILE *, RscTypCont *, sal_uInt32, - const char * ) -{ -} - -ERRTYPE RscMgr::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem, - RscTypCont * pTC, const RscId &rId, - sal_uInt32 nDeep ) -{ - RscMgrInst * pClassData; - ERRTYPE aError; - ObjNode * pObjNode = nullptr; - - pClassData = reinterpret_cast(rInst.pData + RscClass::Size()); - - if( pClassData->aRefId.IsId() ) - { - // increment and test to avoid endless recursion - nDeep++; - if( nDeep > nRefDeep ) - aError = ERR_REFTODEEP; - else - pObjNode = rInst.pClass->GetRefClass()-> - GetObjNode( pClassData->aRefId ); - - if( !pObjNode && pTC ) - { - OStringBuffer aMsg(pHS->getString(rInst.pClass->GetId())); - aMsg.append(' ').append(pClassData->aRefId.GetName()); - aError = WRN_MGR_REFNOTFOUND; - pTC->pEH->Error(aError, rInst.pClass, rId, aMsg.getStr()); - } - } - - if( aError.IsOk() ) - { - if( pObjNode ) - { - RSCINST aRefI; - RscTop * pTmpRefClass = rInst.pClass->GetRefClass(); - - aRefI = RSCINST( rInst.pClass, pObjNode->GetRscObj() ); - if( pTmpRefClass == rInst.pClass ) - { - aError = aRefI.pClass->WriteRcHeader( aRefI, rMem, pTC, - rId, nDeep ); - } - else - { - RSCINST aRefInst = rInst.pClass->Create( nullptr, aRefI ); - aError = aRefI.pClass->WriteRcHeader( aRefInst, rMem, pTC, - rId, nDeep ); - pTmpRefClass->Destroy( aRefInst ); - } - } - else - { - sal_uInt32 nOldSize; - sal_uInt32 nLocalSize; - - nOldSize = rMem.IncSize( 16 /*sizeof( RSHEADER_TYPE )*/ ); - - aError = rInst.pClass->WriteRc( rInst, rMem, pTC, nDeep ); - if( aError.IsOk() ) - aError = WriteInstRc( rInst, rMem, pTC, nDeep ); - nLocalSize = rMem.Size(); - - if( aError.IsOk() ) - { - // RscClass is skipped - aError = RscTop::WriteRc( rInst, rMem, pTC, nDeep ); - } - - /* - // structure definition from which the resource is built - struct RSHEADER_TYPE{ - RESOURCE_TYPE nRT; // resource type - sal_uInt32 nRT; // resource type - sal_uInt32 nGlobOff; // global offset - sal_uInt32 nLocalOff; // local offset - }; - */ - sal_uInt32 nID = rId.GetNumber(); - rMem.PutAt( nOldSize, nID ); - rMem.PutAt( nOldSize +4, (sal_uInt32)rInst.pClass->GetTypId() ); - rMem.PutAt( nOldSize +8, (sal_uInt32)(rMem.Size() - nOldSize) ); - rMem.PutAt( nOldSize +12, (sal_uInt32)(nLocalSize - nOldSize) ); - } - } - - return aError; -} - -ERRTYPE RscMgr::WriteRc( const RSCINST &, RscWriteRc &, - RscTypCont *, sal_uInt32 ) - -{ - return ERR_OK; -} - -bool RscMgr::IsConsistent( const RSCINST & rInst ) -{ - bool bRet; - RscMgrInst * pClassData; - - bRet = RscClass::IsConsistent( rInst ); - - pClassData = reinterpret_cast(rInst.pData + RscClass::Size()); - if( pClassData->aRefId.IsId() && - ((pClassData->aRefId.GetNumber() < 1) || - (pClassData->aRefId.GetNumber() > 0x7FFF) || - IsToDeep( rInst ).IsError()) ) - { - bRet = false; - } - - return bRet; -} - -ERRTYPE RscMgr::GetRef( const RSCINST & rInst, RscId * pRscId ) -{ - RscMgrInst * pClassData; - - pClassData = reinterpret_cast(rInst.pData + RscClass::Size()); - *pRscId = pClassData->aRefId; - return ERR_OK; -} - -ERRTYPE RscMgr::IsToDeep( const RSCINST & rInst ) -{ - RscMgrInst * pClassData; - RscId aOldId, aId; - ERRTYPE aError; - RSCINST aTmpI = rInst; - ObjNode * pObjNode; - sal_uInt32 nDeep = 0; - - pClassData = reinterpret_cast(rInst.pData + RscClass::Size()); - - while( aTmpI.IsInst() && (nDeep < nRefDeep) && aError.IsOk() ) - { - // retrieve reference - aTmpI.pClass->GetRef( aTmpI, &aId ); - // retrieve referenced object - pObjNode = aTmpI.pClass->GetObjNode( aId ); - // was the referenced object found? - if( pObjNode ) - { - aTmpI.pData = pObjNode->GetRscObj(); - nDeep++; - } - else //aTmpI.IsInst() becomes false, end loop - aTmpI.pData = nullptr; - } - - if( nDeep >= nRefDeep ) - { - pClassData->aRefId = aOldId; - aError = ERR_REFTODEEP; - } - - return aError; -} - -ERRTYPE RscMgr::SetRef( const RSCINST & rInst, const RscId & rRefId ) -{ - RscMgrInst * pClassData; - RscId aOldId, aId; - ERRTYPE aError; - - if( rRefId.IsId() && - ((rRefId.GetNumber() < 1) || - (rRefId.GetNumber() > 0x7FFF)) ) - { - aError = ERR_IDRANGE; - } - else - { - pClassData = reinterpret_cast(rInst.pData + RscClass::Size()); - aOldId = pClassData->aRefId;// mark old value - pClassData->aRefId = rRefId;// previous entry to avoid failure when recursing - - - aError = IsToDeep( rInst ); - if( aError.IsOk() ) - pClassData->bDflt = false; - else - pClassData->aRefId = aOldId; - } - - return aError; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/res/rscrange.cxx b/rsc/source/res/rscrange.cxx deleted file mode 100644 index db7957d07644..000000000000 --- a/rsc/source/res/rscrange.cxx +++ /dev/null @@ -1,139 +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 -#include -#include - -#include - -RscLongRange::RscLongRange( Atom nId, RESOURCE_TYPE nTypeId ) - : RscTop( nId, nTypeId ) - , nMin(0), nMax(0) -{ -} - -void RscLongRange::SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum ) -{ - if( nMinimum > nMaximum ) - { - nMin = nMaximum; - nMax = nMinimum; - } - else - { - nMax = nMaximum; - nMin = nMinimum; - } -} - -bool RscLongRange::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) -{ - if( pDef ) - return 0 == memcmp( &reinterpret_cast(rInst.pData)->nValue, - &reinterpret_cast(pDef)->nValue, - sizeof( sal_Int32 ) ); - - return false; -} - -ERRTYPE RscLongRange::SetNumber( const RSCINST & rInst, sal_Int32 nValue ) -{ - if( nMax < nValue || nMin > nValue ) - return ERR_RSCRANGE_OUTDEFSET; - - void * pData = &reinterpret_cast(rInst.pData)->nValue; - memcpy( pData, &nValue, sizeof( sal_Int32 ) ); - reinterpret_cast(rInst.pData)->bDflt = false; - return ERR_OK; -} - -ERRTYPE RscLongRange::GetNumber( const RSCINST & rInst, sal_Int32 * pN ) -{ - memmove( pN, &reinterpret_cast(rInst.pData)->nValue, - sizeof( sal_Int32 ) ); - return ERR_OK; -} - -RSCINST RscLongRange::Create( RSCINST * pInst, const RSCINST & rDflt, - bool bOwnClass ) -{ - RSCINST aInst; - - if( !pInst ) - { - aInst.pClass = this; - aInst.pData = static_cast(rtl_allocateMemory( sizeof( RscLongRangeInst ) )); - } - else - aInst = *pInst; - - if( !bOwnClass && rDflt.IsInst() ) - bOwnClass = rDflt.pClass->InHierarchy( this ); - - if( bOwnClass ) - memmove( aInst.pData, rDflt.pData, sizeof( RscLongRangeInst ) ); - else - { - sal_Int32 lDflt; - if( 0 >= nMin && 0 <= nMax ) - lDflt = 0; - else - lDflt = nMin; - - void * pData = &reinterpret_cast(aInst.pData)->nValue; - memcpy( pData, &lDflt, sizeof( sal_Int32 ) ); - reinterpret_cast(aInst.pData)->bDflt = true; - } - - return aInst; -} - -void RscLongRange::WriteSrc( const RSCINST & rInst, FILE * fOutput, - RscTypCont *, sal_uInt32, const char * ) -{ - sal_Int32 lVal; - GetNumber( rInst, &lVal ); - fprintf( fOutput, "%d", static_cast(lVal) ); -} - -ERRTYPE RscLongRange::WriteRc( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont *, sal_uInt32 ) -{ - sal_Int32 lVal; - - GetNumber( rInst, &lVal ); - aMem.Put( lVal ); - - return ERR_OK; -} - -RscLongEnumRange::RscLongEnumRange( Atom nId, RESOURCE_TYPE nTypeId ) - : RscLongRange( nId, nTypeId ) -{ -} - -ERRTYPE RscLongEnumRange::SetConst( const RSCINST & rInst, Atom /*nConst*/, - sal_Int32 nValue ) -{ - return SetNumber( rInst, nValue ); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/res/rscstr.cxx b/rsc/source/res/rscstr.cxx deleted file mode 100644 index 918fb5ab1afb..000000000000 --- a/rsc/source/res/rscstr.cxx +++ /dev/null @@ -1,293 +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 -#include -#include - -#include -#include - -#include -#include - -RscString::RscString( Atom nId, RESOURCE_TYPE nTypeId ) - : RscTop( nId, nTypeId ) - , pRefClass(nullptr) -{ -} - -ERRTYPE RscString::SetString( const RSCINST & rInst, const char * pStr ) -{ - char * pTmp; - ERRTYPE aError; - - if( aError.IsOk() ) - { - reinterpret_cast(rInst.pData)->bDflt = false; - - pTmp = reinterpret_cast(rInst.pData)->pStr; - if( pTmp ) - { - rtl_freeMemory( pTmp ); - pTmp = nullptr; - } - - if( pStr ) - { - sal_uInt32 nLen = strlen( pStr ) +1; - pTmp = static_cast(rtl_allocateMemory( nLen )); - memcpy( pTmp, pStr, nLen ); - } - - reinterpret_cast(rInst.pData)->pStr = pTmp; - } - - return aError; -} - -ERRTYPE RscString::GetString( const RSCINST & rInst, char ** ppStr ) -{ - *ppStr = reinterpret_cast(rInst.pData)->pStr; - return ERR_OK; -} - -ERRTYPE RscString::GetRef( const RSCINST & rInst, RscId * pRscId ) -{ - *pRscId = reinterpret_cast(rInst.pData)->aRefId; - return ERR_OK; -} - -ERRTYPE RscString::SetRef( const RSCINST & rInst, const RscId & rRefId ) -{ - if( pRefClass ) - { - reinterpret_cast(rInst.pData)->aRefId = rRefId; - reinterpret_cast(rInst.pData)->bDflt = false; - } - else - return ERR_REFNOTALLOWED; - - return ERR_OK; -} - -RSCINST RscString::Create( RSCINST * pInst, const RSCINST & rDflt, - bool bOwnClass ) -{ - RSCINST aInst; - - if( !pInst ) - { - aInst.pClass = this; - aInst.pData = static_cast( - rtl_allocateMemory( sizeof( RscStringInst ) )); - } - else - aInst = *pInst; - - if( !bOwnClass && rDflt.IsInst() ) - bOwnClass = rDflt.pClass->InHierarchy( this ); - - reinterpret_cast(aInst.pData)->aRefId.Create(); - reinterpret_cast(aInst.pData)->pStr = nullptr; - reinterpret_cast(aInst.pData)->bDflt = true; - - if( bOwnClass ) - { - reinterpret_cast(aInst.pData)->aRefId = - reinterpret_cast(rDflt.pData)->aRefId; - SetString( aInst, reinterpret_cast(rDflt.pData)->pStr ); - reinterpret_cast(aInst.pData)->bDflt = - reinterpret_cast(rDflt.pData)->bDflt; - } - - return aInst; -} - -void RscString::Destroy( const RSCINST & rInst ) -{ - if( reinterpret_cast(rInst.pData)->pStr ) - rtl_freeMemory( reinterpret_cast(rInst.pData)->pStr ); - reinterpret_cast(rInst.pData)->aRefId.Destroy(); -} - -bool RscString::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) -{ - RscStringInst * pData = reinterpret_cast(rInst.pData); - RscStringInst * pDefData = reinterpret_cast(pDef); - - if( pDef ) - { - if( pData->aRefId.IsId() || pDefData->aRefId.IsId() ) - { - if( pData->aRefId.aExp.IsNumber() && - pDefData->aRefId.aExp.IsNumber() ) - { - // check whether reference identifiers are equal - if( pData->aRefId.GetNumber() == pDefData->aRefId.GetNumber() ) - { - return true; - } - } - } - else - { - bool bStrEmpty = false; - bool bDefStrEmpty = false; - - if( pData->pStr ) - { - bStrEmpty = ('\0' == *pData->pStr); - } - else - bStrEmpty = true; - - if( pDefData->pStr ) - { - bDefStrEmpty = ('\0' == *pDefData->pStr); - } - else - bDefStrEmpty = true; - - if( !bStrEmpty || !bDefStrEmpty ) - { - return false; - } - return true; - } - } - - return false; -} - -void RscString::WriteSrc( const RSCINST & rInst, FILE * fOutput, - RscTypCont *, sal_uInt32, const char * ) -{ - if ( reinterpret_cast(rInst.pData)->aRefId.IsId() ) - { - fprintf( fOutput, "%s", - reinterpret_cast(rInst.pData)->aRefId.GetName().getStr() ); - } - else - { - RscStringInst * pStrI = reinterpret_cast(rInst.pData); - if( pStrI->pStr ){ - //char * pChangeTab = RscChar::GetChangeTab(); - sal_uInt32 n = 0; - sal_uInt32 nPos, nSlashPos; - - do - { - fputc( '\"', fOutput ); - nSlashPos = nPos = 0; - - while( pStrI->pStr[ n ] && (nPos < 72 || nPos - nSlashPos <= 3) ) - { // after \ drop at least 3 characters \xa7 - fputc( pStrI->pStr[ n ], fOutput ); - if( pStrI->pStr[ n ] == '\\' ) - nSlashPos = nPos; - n++; - nPos++; - } - - fputc( '\"', fOutput ); - if( pStrI->pStr[ n ] ) // end not reached yet - { - fputc( '\n', fOutput ); - } - } - while( pStrI->pStr[ n ] ); - } - else - fprintf( fOutput, "\"\"" ); - } -} - -ERRTYPE RscString::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, - RscTypCont * pTC, sal_uInt32 nDeep ) -{ - ERRTYPE aError; - ObjNode * pObjNode = nullptr; - - - if( reinterpret_cast(rInst.pData)->aRefId.IsId() ) - { - RscId aId( reinterpret_cast(rInst.pData)->aRefId ); - RSCINST aTmpI; - - aTmpI.pClass = pRefClass; - - while( aError.IsOk() && aId.IsId() ) - { - // increment and test to avoid endless recursion - nDeep++; - if( nDeep > nRefDeep ) - aError = ERR_REFTODEEP; - else - { - pObjNode = pRefClass->GetObjNode( aId ); - if( pObjNode ) - { - aTmpI.pData = pObjNode->GetRscObj(); - aError = pRefClass->GetRef( aTmpI, &aId ); - } - else - { - if( pTC ) - { - OStringBuffer aMsg(pHS->getString( - pRefClass->GetId())); - aMsg.append(' ').append(aId.GetName()); - aError = WRN_STR_REFNOTFOUND; - pTC->pEH->Error( aError, rInst.pClass, - RscId(), aMsg.getStr() ); - } - break; - } - } - } - } - - if( aError.IsOk() ) - { - if( pObjNode ) - { - RSCINST aRefI; - - aRefI = RSCINST( pRefClass, pObjNode->GetRscObj() ); - aError = aRefI.pClass->WriteRc( aRefI, rMem, pTC, nDeep ); - } - else - { - if( reinterpret_cast(rInst.pData)->pStr && pTC ) - { - char * pStr = RscChar::MakeUTF8( reinterpret_cast(rInst.pData)->pStr, - pTC->GetSourceCharSet() ); - rMem.PutUTF8( pStr ); - rtl_freeMemory( pStr ); - } - else - rMem.PutUTF8( reinterpret_cast(rInst.pData)->pStr ); - } - } - return aError; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/res/rsctop.cxx b/rsc/source/res/rsctop.cxx deleted file mode 100644 index adc61de5a086..000000000000 --- a/rsc/source/res/rsctop.cxx +++ /dev/null @@ -1,410 +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 -#include -#include - -RscTop::RscTop( Atom nId, RESOURCE_TYPE nTypIdent, RscTop * pSuperCl ) - : RefNode( nId ) - , pSuperClass( pSuperCl ) - , nTypId( nTypIdent ) -{ - pRefClass = this; - if( pSuperClass ) - SetCallPar( pSuperClass->aCallPar1, pSuperClass->aCallPar2, - pSuperClass->aCallParType ); -} - -void RscTop::SetCallPar(const OString& rPar1, const OString& rPar2, - const OString& rParType) -{ - aCallPar1 = rPar1; - aCallPar2 = rPar2; - aCallParType = rParType; -} - -RSCINST const & RscTop::GetDefault() -{ - if( !aDfltInst.IsInst() ) - aDfltInst = this->Create( nullptr, RSCINST() ); - return aDfltInst; -} - -void RscTop::Pre_dtor() -{ - if( aDfltInst.IsInst() ) - { - aDfltInst.pClass->Destroy( aDfltInst ); - rtl_freeMemory( aDfltInst.pData ); - aDfltInst = RSCINST(); - }; -} - -RscTop * RscTop::GetTypeClass() const -{ - if( pSuperClass ) - return pSuperClass->GetTypeClass(); - else - return nullptr; -} - -sal_uInt32 RscTop::Size() const -{ - if( pSuperClass ) - return pSuperClass->Size(); - else - return 0; -} - -ERRTYPE RscTop::GetRef( const RSCINST & rInst, RscId * pRscId ) -{ - if( pSuperClass ) - return pSuperClass->GetRef( rInst, pRscId ); - else - return ERR_UNKNOWN_METHOD; -} - -bool RscTop::InHierarchy( RscTop * pClass ) -{ - if( this == pClass ) - return true; - if( pSuperClass ) - return pSuperClass->InHierarchy( pClass ); - return false; -} - -ERRTYPE RscTop::SetVariable( Atom nVarName, RscTop * pClass, - RSCINST * pDflt, RSCVAR nVarType, sal_uInt32 nMask, - Atom nDataBaseName ) -{ - if( pSuperClass ) - return pSuperClass->SetVariable( nVarName, pClass, pDflt, - nVarType, nMask, nDataBaseName ); - else - return ERR_UNKNOWN_METHOD; -} - -RSCINST RscTop::GetVariable( const RSCINST & rInst, - Atom nVarName, - const RSCINST & rInitInst, - bool bInitDflt, - RscTop * pCreateClass) -{ - if( pSuperClass ) - return pSuperClass->GetVariable( rInst, nVarName, rInitInst, bInitDflt, pCreateClass ); - else - return RSCINST(); -} - -RSCINST RscTop::GetCopyVar( const RSCINST & rInst, Atom nVarName ) -{ - if( pSuperClass ) - return pSuperClass->GetCopyVar( rInst, nVarName ); - else - return RSCINST(); -} - -RSCINST RscTop::GetTupelVar( const RSCINST & rInst, sal_uInt32 nPos, - const RSCINST & rInitInst ) -{ - if( pSuperClass ) - return pSuperClass->GetTupelVar( rInst, nPos, rInitInst ); - else - return RSCINST(); -} - -ERRTYPE RscTop::GetElement( const RSCINST & rInst, const RscId & rEleName, - RscTop *pCreateClass, const RSCINST & rCreateInst, - RSCINST * pGetInst ) -{ - if( pSuperClass ) - return pSuperClass-> GetElement( rInst, rEleName, - pCreateClass, rCreateInst, - pGetInst ); - else - return ERR_UNKNOWN_METHOD; -} - -ERRTYPE RscTop::GetArrayEle( const RSCINST & rInst, - Atom nId, - RscTop * pCreateClass, - RSCINST * pGetInst) -{ - if( pSuperClass ) - return pSuperClass->GetArrayEle( rInst, nId, pCreateClass, pGetInst ); - else - return ERR_UNKNOWN_METHOD; -} - -ERRTYPE RscTop::GetValueEle( const RSCINST & rInst, - sal_Int32 lValue, - RscTop * pCreateClass, - RSCINST * pGetInst) -{ - if( pSuperClass ) - return pSuperClass->GetValueEle( rInst, lValue, pCreateClass, pGetInst ); - else - return ERR_UNKNOWN_METHOD; -} - -RSCINST RscTop::SearchEle( const RSCINST & rInst, const RscId & rEleName, - RscTop * pClass ) -{ - if( pSuperClass ) - return pSuperClass->SearchEle( rInst, rEleName, pClass ); - else - return RSCINST(); -} - -RSCINST RscTop::GetPosEle( const RSCINST & rInst, sal_uInt32 nPos ) -{ - if( pSuperClass ) - return pSuperClass->GetPosEle( rInst, nPos ); - else - return RSCINST(); -} - -ERRTYPE RscTop::MovePosEle( const RSCINST & rInst, sal_uInt32 nDestPos, - sal_uInt32 nSourcePos ) -{ - if( pSuperClass ) - return pSuperClass->MovePosEle( rInst, nDestPos, nSourcePos ); - else - return ERR_UNKNOWN_METHOD; -} - -ERRTYPE RscTop::SetPosRscId( const RSCINST & rInst, sal_uInt32 nPos, - const RscId & rRscId ) -{ - if( pSuperClass ) - return pSuperClass->SetPosRscId( rInst, nPos, rRscId ); - else - return ERR_UNKNOWN_METHOD; -} - -SUBINFO_STRUCT RscTop::GetInfoEle( const RSCINST & rInst, sal_uInt32 nPos ) -{ - if( pSuperClass ) - return pSuperClass->GetInfoEle( rInst, nPos ); - else - return SUBINFO_STRUCT(); -} - -sal_uInt32 RscTop::GetCount( const RSCINST & rInst ) -{ - if( pSuperClass ) - return pSuperClass->GetCount( rInst ); - else - return 0; -} - -ERRTYPE RscTop::SetNumber( const RSCINST & rInst, sal_Int32 lValue ) -{ - if( pSuperClass ) - return pSuperClass->SetNumber( rInst, lValue ); - else - return ERR_UNKNOWN_METHOD; -} - -ERRTYPE RscTop::SetBool( const RSCINST & rInst, bool bValue ) -{ - if( pSuperClass ) - return pSuperClass->SetBool( rInst, bValue ); - else - return ERR_UNKNOWN_METHOD; -} - -ERRTYPE RscTop::SetConst( const RSCINST & rInst, Atom nId, sal_Int32 nVal ) -{ - if( pSuperClass ) - return pSuperClass->SetConst( rInst, nId, nVal ); - else - return ERR_UNKNOWN_METHOD; -} - -ERRTYPE RscTop::SetNotConst( const RSCINST & rInst, Atom nId ) -{ - if( pSuperClass ) - return pSuperClass->SetNotConst( rInst, nId ); - else - return ERR_UNKNOWN_METHOD; -} - -ERRTYPE RscTop::SetString( const RSCINST & rInst, const char * pStr ) -{ - if( pSuperClass ) - return pSuperClass->SetString( rInst, pStr ); - else - return ERR_UNKNOWN_METHOD; -} - -ERRTYPE RscTop::GetNumber( const RSCINST & rInst, sal_Int32 * pN ) -{ - if( pSuperClass ) - return pSuperClass->GetNumber( rInst, pN ); - else - return ERR_UNKNOWN_METHOD; -} - -ERRTYPE RscTop::GetBool( const RSCINST & rInst, bool * pB ) -{ - if( pSuperClass ) - return pSuperClass->GetBool( rInst, pB ); - else - return ERR_UNKNOWN_METHOD; -} - -ERRTYPE RscTop::GetConst( const RSCINST & rInst, Atom * pH ) -{ - if( pSuperClass ) - return pSuperClass->GetConst( rInst, pH ); - else - return ERR_UNKNOWN_METHOD; -} - -ERRTYPE RscTop::GetString( const RSCINST & rInst, char ** ppStr ) -{ - if( pSuperClass ) - return pSuperClass->GetString( rInst, ppStr ); - else - return ERR_UNKNOWN_METHOD; -} - -RSCINST RscTop::Create( RSCINST * pInst, const RSCINST & rDefInst, bool bOwnRange ) -{ - if( pSuperClass ) - return pSuperClass->Create( pInst, rDefInst, bOwnRange ); - else - { - if( pInst ) - return *pInst; - return RSCINST(); - } -} - -void RscTop::Destroy( const RSCINST & rInst ) -{ - if( pSuperClass ) - pSuperClass->Destroy( rInst ); -} - -bool RscTop::IsConsistent( const RSCINST & rInst ) -{ - if( pSuperClass ) - return pSuperClass->IsConsistent( rInst ); - else - return true; -} - -void RscTop::SetToDefault( const RSCINST & rInst ) -{ - if( pSuperClass ) - pSuperClass->SetToDefault( rInst ); -} - -bool RscTop::IsDefault( const RSCINST & rInst ) -{ - if( pSuperClass ) - return pSuperClass->IsDefault( rInst ); - else - return true; -} - -bool RscTop::IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) -{ - if( pSuperClass ) - return pSuperClass->IsValueDefault( rInst, pDef ); - else - return true; -} - -void RscTop::SetDefault( const RSCINST & rInst, Atom nVarId ) -{ - if( pSuperClass ) - pSuperClass->SetDefault( rInst, nVarId ); -} - -RSCINST RscTop::GetDefault( Atom nVarId ) -{ - if( pSuperClass ) - return pSuperClass->GetDefault( nVarId ); - else - return RSCINST(); -} - -void RscTop::Delete( const RSCINST & rInst, RscTop * pClass, - const RscId & rId ) -{ - if( pSuperClass ) - pSuperClass->Delete( rInst, pClass, rId ); -} - -void RscTop::DeletePos( const RSCINST & rInst, sal_uInt32 nPos ) -{ - if( pSuperClass ) - pSuperClass->DeletePos( rInst, nPos ); -} - -ERRTYPE RscTop::SetRef( const RSCINST & rInst, const RscId & rRefId ) -{ - if( pSuperClass ) - return pSuperClass->SetRef( rInst, rRefId ); - else - return ERR_UNKNOWN_METHOD; -} - -void RscTop::WriteSrcHeader( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, - const RscId & rId, const char * pVarName ) -{ - if( pSuperClass ) - pSuperClass->WriteSrcHeader( rInst, fOutput, pTC, nTab, rId, pVarName ); - else - rInst.pClass->WriteSrc( rInst, fOutput, pTC, nTab, pVarName ); -} - -void RscTop::WriteSrc( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, const char * pVarName ) -{ - if( pSuperClass ) - pSuperClass->WriteSrc( rInst, fOutput, pTC, nTab, pVarName ); -} - -ERRTYPE RscTop::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem, - RscTypCont * pTC, const RscId & rId, - sal_uInt32 nDeep ) -{ - if( pSuperClass ) - return pSuperClass->WriteRcHeader( rInst, rMem, pTC, rId, nDeep ); - else - return rInst.pClass->WriteRc( rInst, rMem, pTC, nDeep ); -} - -ERRTYPE RscTop::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, - RscTypCont * pTC, sal_uInt32 nDeep ) -{ - if( pSuperClass ) - return pSuperClass->WriteRc( rInst, rMem, pTC, nDeep ); - else - return ERR_OK; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx deleted file mode 100644 index 187a0b1a1e1c..000000000000 --- a/rsc/source/rsc/rsc.cxx +++ /dev/null @@ -1,843 +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 -#include -#include - -#ifdef UNX -#include -#include -#include -#else -#include -#include -#include -#endif - -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -using comphelper::string::getTokenCount; - -OString* pStdParType = nullptr; -OString* pStdPar1 = nullptr; -OString* pStdPar2 = nullptr; -sal_uInt32 nRefDeep = 10; -AtomContainer* pHS = nullptr; - - -void RscCmdLine::Init() -{ - nCommands = CommandFlags::NONE; - nByteOrder = RSC_BIGENDIAN; - - aPath = OString("."); - m_aOutputFiles.clear(); - m_aOutputFiles.push_back( OutputFile() ); -} - -RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH ) -{ - char * pStr; - char ** ppStr; - RscPtrPtr aCmdLine; - sal_uInt32 i; - bool bOutputSrsIsSet = false; - - Init(); - - pStr = ::ResponseFile( &aCmdLine, argv, argc ); - if( pStr ) - pEH->FatalError( ERR_OPENFILE, RscId(), pStr ); - - /* check the inputted switches */ - ppStr = reinterpret_cast(aCmdLine.GetBlock()); - ppStr++; - i = 1; - while( ppStr && i < (aCmdLine.GetCount() -1) ) - { -#if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "CmdLineArg: \"%s\"\n", *ppStr ); -#endif - if (strcmp(*ppStr, "-isystem") == 0) - { - // ignore "-isystem" and following arg - if (i < aCmdLine.GetCount() - 1) - { - ++ppStr; - ++i; - } - } - else if (strncmp(*ppStr, "-isystem", strlen("-isystem")) == 0) - { - // ignore args starting with "-isystem" - } - else if( '-' == **ppStr ) - { - if( !rsc_stricmp( (*ppStr) + 1, "h" ) - || !strcmp( (*ppStr) + 1, "?" ) ) - { // Write help to standard output - nCommands |= CommandFlags::Help; - } - else if( !rsc_stricmp( (*ppStr) + 1, "p" ) ) - { // No preprocessor - nCommands |= CommandFlags::NoPrePro; - } - else if( !rsc_stricmp( (*ppStr) + 1, "s" ) ) - { // Syntax analysis, creates .srs file - nCommands |= CommandFlags::NoLink; - } - else if( !rsc_stricmp( (*ppStr) + 1, "l" ) ) - { // links, no syntax and no preprocessing - nCommands |= CommandFlags::NoPrePro; - nCommands |= CommandFlags::NoSyntax; - } - else if( !rsc_stricmp( (*ppStr) + 1, "r" ) ) - { // generate no .res file - nCommands |= CommandFlags::NoResFile; - } - else if( !rsc_strnicmp( (*ppStr) + 1, "sub", 3 ) ) - { - const char* pEqual; - for( pEqual = (*ppStr)+4; *pEqual && *pEqual != '='; ++pEqual ) - ; - if( *pEqual ) - { - m_aReplacements.push_back( std::pair< OString, OString >( OString( (*ppStr)+4, pEqual - *ppStr - 4 ), - OString( pEqual + 1 ) ) ); - } - } - else if( !rsc_stricmp( (*ppStr) + 1, "PreLoad" ) ) - { // all resources with Preload - nCommands |= CommandFlags::Preload; - } - else if( !rsc_stricmp( (*ppStr) + 1, "LITTLEENDIAN" ) ) - { // endianness when writing - nByteOrder = RSC_LITTLEENDIAN; - } - else if( !rsc_stricmp( (*ppStr) + 1, "BIGENDIAN" ) ) - { // endianness when writing - nByteOrder = RSC_BIGENDIAN; - } - else if( !rsc_strnicmp( (*ppStr) + 1, "d", 1 ) ) - { // define symbols - nCommands |= CommandFlags::Define; - } - else if( !rsc_strnicmp( (*ppStr) + 1, "i", 1 ) ) - { // define include path - nCommands |= CommandFlags::Include; - OStringBuffer aBuffer(aPath); - if (!aBuffer.isEmpty()) - aBuffer.append(SAL_PATHSEPARATOR); - aBuffer.append((*ppStr) + 2); - aPath = aBuffer.makeStringAndClear(); - } - else if( !rsc_strnicmp( (*ppStr) + 1, "fs=", 3 ) ) - { // define name of .res file - if( m_aOutputFiles.back().aOutputRc.getLength() ) - m_aOutputFiles.push_back( OutputFile() ); - m_aOutputFiles.back().aOutputRc = (*ppStr) + 4; - } - else if( !rsc_strnicmp( (*ppStr) + 1, "lip=", 4 ) ) - { // additional language specific include for system dependent files - const OString aSysSearchDir( (*ppStr)+5 ); - - // ignore empty -lip= arguments that we get lots of these days - if (!aSysSearchDir.isEmpty()) - { - m_aOutputFiles.back().aSysSearchDirs.push_back(aSysSearchDir); - OString aLangSearchPath = m_aOutputFiles.back().aLangSearchPath; - if( !aLangSearchPath.isEmpty() ) - { - aLangSearchPath = aLangSearchPath + OString( SAL_PATHSEPARATOR ); - } - aLangSearchPath = aLangSearchPath + aSysSearchDir; - - m_aOutputFiles.back().aLangSearchPath = aLangSearchPath; - } - } - else if( !rsc_strnicmp( (*ppStr) + 1, "fp=", 3 ) ) - { // define name of .srs file - aOutputSrs = (*ppStr) + 4; - bOutputSrsIsSet = true; - } - else if( !rsc_stricmp( (*ppStr) + 1, "NoSysResTest" ) ) - { // don't check Bitmap, Pointers, Icons - nCommands |= CommandFlags::NoSysResTest; - } - else if( !rsc_stricmp( (*ppStr) + 1, "SrsDefault" ) ) - { // Only write one language to srs file - nCommands |= CommandFlags::SrsDefault; - } - else if( !rsc_stricmp( (*ppStr) + 1, "lg" ) ) - { - m_aOutputFiles.back().aLangName.clear(); - } - else if( !rsc_strnicmp( (*ppStr) + 1, "lg", 2 ) ) - { - if( !m_aOutputFiles.back().aLangName.isEmpty() ) - m_aOutputFiles.push_back( OutputFile() ); - m_aOutputFiles.back().aLangName = OString((*ppStr)+3); - } - else - pEH->FatalError( ERR_UNKNOWNSW, RscId(), *ppStr ); - } - else - { - // input file - aInputList.push_back( new OString(*ppStr) ); - } - ppStr++; - i++; - } - - if( nCommands & CommandFlags::Help ) - pEH->FatalError( ERR_USAGE, RscId() ); - // was an inputted file specified - else if( !aInputList.empty() ) - { - ::std::list::iterator it; - for( it = m_aOutputFiles.begin(); it != m_aOutputFiles.end(); ++it ) - { - if( it->aOutputRc.isEmpty() ) - it->aOutputRc = ::OutputFile( *aInputList.front(), "rc" ); - } - if( ! bOutputSrsIsSet ) - aOutputSrs = ::OutputFile( *aInputList.front(), "srs" ); - } - else - pEH->FatalError( ERR_NOINPUT, RscId() ); -} - -RscCmdLine::~RscCmdLine() -{ - for ( size_t i = 0, n = aInputList.size(); i < n; ++i ) - delete aInputList[ i ]; - aInputList.clear(); -} - -OString RscCmdLine::substitutePaths( const OString& rIn ) -{ - // prepare return value - OStringBuffer aRet( 256 ); - std::list< std::pair< OString, OString > >::const_iterator last_match = m_aReplacements.end(); - - // search for longest replacement match - for( std::list< std::pair< OString, OString > >::const_iterator repl = m_aReplacements.begin(); repl != m_aReplacements.end(); ++repl ) - { - if( rIn.startsWith( repl->second ) ) // path matches - { - if( last_match == m_aReplacements.end() || last_match->second.getLength() < repl->second.getLength() ) - last_match = repl; - } - } - - // copy replacement found and rest of rIn - sal_Int32 nIndex = 0; - if( last_match != m_aReplacements.end() ) - { - aRet.append( "%" ); - aRet.append( last_match->first ); - aRet.append( "%" ); - nIndex = last_match->second.getLength(); - } - - if( rIn.match( "/", nIndex ) ) - aRet.append( rIn.copy( nIndex ) ); - else - aRet.append( rIn.copy( nIndex - 1 ) ); - - return aRet.makeStringAndClear(); -} - -RscCompiler::RscCompiler( RscCmdLine * pLine, RscTypCont * pTypCont ) -{ - fExitFile = nullptr; - - //Set Command Line, set Type Container - pCL = pLine; - pTC = pTypCont; -} - -RscCompiler::~RscCompiler() -{ - pTC->pEH->SetListFile( nullptr ); - - if( fExitFile ) - fclose( fExitFile ); -} - -ERRTYPE RscCompiler::Start() -{ - ERRTYPE aError; - RscFile* pFName; - - if( pCL->aInputList.empty() ) - pTC->pEH->FatalError( ERR_NOINPUT, RscId() ); - - for( size_t i = 0, n = pCL->aInputList.size(); i < n; ++i ) - pTC->aFileTab.NewCodeFile( *pCL->aInputList[ i ] ); - - if( !(pCL->nCommands & CommandFlags::NoSyntax) ) - { - if( pCL->nCommands & CommandFlags::NoPrePro ) - { - - pTC->pEH->SetListFile( nullptr ); - - RscFileTab::Index aIndex = pTC->aFileTab.FirstIndex(); - while( aIndex != RscFileTab::IndexNotFound && aError.IsOk() ) - { - pFName = pTC->aFileTab.Get( aIndex ); - if( !pFName->bScanned && !pFName->IsIncFile() ) - { - aError = IncludeParser( aIndex ); - // set current pointer correctly - aIndex = pTC->aFileTab.GetIndexOf( pFName ); - } - aIndex = pTC->aFileTab.NextIndex( aIndex ); - } - - pTC->pEH->SetListFile( nullptr ); - } - } - - if ( pTC->pEH->GetVerbosity() >= RscVerbosityVerbose ) - { - pTC->pEH->StdOut( "Files: " ); - RscFileTab::Index aIndex = pTC->aFileTab.FirstIndex(); - while( aIndex != RscFileTab::IndexNotFound ) - { - pFName = pTC->aFileTab.Get( aIndex ); - pTC->pEH->StdOut( pFName->aFileName.getStr() ); - pTC->pEH->StdOut( " " ); - aIndex = pTC->aFileTab.NextIndex( aIndex ); - } - pTC->pEH->StdOut( "\n" ); - } - - if( aError.IsOk() ) - aError = Link(); - - if( aError.IsOk() ) - EndCompile(); - - if( aError.IsError() ) - pTC->pEH->Error( ERR_ERROR, nullptr, RscId() ); - - return aError; -} - -void RscCompiler::EndCompile() -{ - if( !pCL->aOutputSrs.isEmpty() && (pCL->nCommands & CommandFlags::NoLink) ) - { - pTC->pEH->StdOut( "Writing file ", RscVerbosityVerbose ); - pTC->pEH->StdOut( pCL->aOutputSrs.getStr(), RscVerbosityVerbose ); - pTC->pEH->StdOut( ".\n", RscVerbosityVerbose ); - - // copy from TMP to real names - unlink( pCL->aOutputSrs.getStr() ); // delete target file - if( !(pCL->nCommands & CommandFlags::NoSyntax) ) - { - FILE * foutput; - - if( nullptr == (foutput = fopen( pCL->aOutputSrs.getStr(), "w" )) ) - pTC->pEH->FatalError( ERR_OPENFILE, RscId(), pCL->aOutputSrs.getStr() ); - else - { - // write file - RscFileTab::Index aIndex = pTC->aFileTab.FirstIndex(); - while( aIndex != RscFileTab::IndexNotFound ) - { - RscFile* pFN = pTC->aFileTab.Get( aIndex ); - if( !pFN->IsIncFile() ) - { - pTC->WriteSrc( foutput, RscFileTab::IndexNotFound ); - break; // ?T 281091MM only one source file - } - } - - fclose( foutput ); - } - } - } -} - -ERRTYPE RscCompiler::IncludeParser( RscFileTab::Index lFileKey ) -{ - FILE * finput; - RscFile * pFName; - ERRTYPE aError; - - pFName = pTC->aFileTab.Get( lFileKey ); - if( !pFName ) - aError = ERR_ERROR; - else if( !pFName->bScanned ) - { - finput = fopen( pFName->aPathName.getStr(), "r" ); - if( !finput ) - { - aError = ERR_OPENFILE; - pTC->pEH->Error( aError, nullptr, RscId(), - pFName->aPathName.getStr() ); - } - else - { - RscFileInst aFileInst( pTC, lFileKey, lFileKey, finput ); - - pFName->bScanned = true; - ::IncludeParser( &aFileInst ); - fclose( finput ); - - // look into include path - for ( size_t i = 0, n = pFName->aDepLst.size(); i < n; ++i ) - { - RscDepend * pDep = pFName->aDepLst[ i ]; - RscFile * pFNTmp = pTC->aFileTab.GetFile( pDep->GetFileKey() ); - // no path and include file - if( pFNTmp && !pFNTmp->bLoaded ) - { - pFNTmp->aPathName = pFNTmp->aFileName; - } - }; - }; - }; - - return aError; -} - -ERRTYPE RscCompiler::ParseOneFile( RscFileTab::Index lFileKey, - const RscCmdLine::OutputFile* pOutputFile, - const WriteRcContext* pContext ) -{ - FILE * finput = nullptr; - ERRTYPE aError; - RscFile * pFName; - - pFName = pTC->aFileTab.Get( lFileKey ); - if( !pFName ) - aError = ERR_ERROR; - else if( !pFName->bLoaded ) - { - - // first read include file - pFName->bLoaded = true; // avoid endless recursion - - for ( size_t i = 0; i < pFName->aDepLst.size() && aError.IsOk(); ++i ) - { - RscDepend* pDep = pFName->aDepLst[ i ]; - aError = ParseOneFile( pDep->GetFileKey(), pOutputFile, pContext ); - } - - if( aError.IsError() ) - pFName->bLoaded = false; // not loaded upon error - else - { - OUString aTmpPath; - OUString aSrsPath = OStringToOUString( pFName->aPathName, RTL_TEXTENCODING_ASCII_US ); - - osl::FileBase::createTempFile( nullptr, nullptr, &aTmpPath ); - osl::FileBase::getFileURLFromSystemPath( aSrsPath, aSrsPath ); - - if( pContext && pOutputFile ) - PreprocessSrsFile( *pOutputFile, *pContext, aSrsPath, aTmpPath ); - else - osl::File::copy( aSrsPath, aTmpPath ); - - OUString aParseFile; - osl::FileBase::getSystemPathFromFileURL( aTmpPath, aParseFile ); - finput = fopen(OUStringToOString(aParseFile, RTL_TEXTENCODING_ASCII_US).getStr(), "r"); - - if( !finput ) - { - pTC->pEH->Error( ERR_OPENFILE, nullptr, RscId(), pFName->aPathName.getStr() ); - aError = ERR_OPENFILE; - } - else - { - RscFileInst aFileInst( pTC, lFileKey, lFileKey, finput ); - - pTC->pEH->StdOut( "reading file ", RscVerbosityVerbose ); - pTC->pEH->StdOut( OUStringToOString(aParseFile, RTL_TEXTENCODING_ASCII_US).getStr(), RscVerbosityVerbose ); - pTC->pEH->StdOut( " ", RscVerbosityVerbose ); - - aError = ::parser( &aFileInst ); - if( aError.IsError() ) - pTC->Delete( lFileKey );// delete resource objects - pTC->pEH->StdOut( "\n", RscVerbosityVerbose ); - fclose( finput ); - }; - - osl::File::remove( aTmpPath ); - }; - }; - - return aError; -} - -namespace -{ - using namespace ::osl; - class RscIoError { }; - - inline OUString lcl_getAbsoluteUrl(const OUString& i_sBaseUrl, const OString& i_sPath) - { - OUString sRelUrl, sAbsUrl; - if(FileBase::getFileURLFromSystemPath(OStringToOUString(i_sPath, RTL_TEXTENCODING_MS_1252), sRelUrl) != FileBase::E_None) - throw RscIoError(); - if(FileBase::getAbsoluteFileURL(i_sBaseUrl, sRelUrl, sAbsUrl) != FileBase::E_None) - throw RscIoError(); - return sAbsUrl; - }; - - inline OString lcl_getSystemPath(const OUString& i_sUrl) - { - OUString sSys; - if(FileBase::getSystemPathFromFileURL(i_sUrl, sSys) != FileBase::E_None) - throw RscIoError(); - return OUStringToOString(sSys, RTL_TEXTENCODING_MS_1252); - }; - - inline OString lcl_getTempFile(OUString& sTempDirUrl) - { - // get a temp file name for the rc file - OUString sTempUrl; - if(FileBase::createTempFile(&sTempDirUrl, nullptr, &sTempUrl) != FileBase::E_None) - throw RscIoError(); - return lcl_getSystemPath(sTempUrl); - }; -} - -ERRTYPE RscCompiler::Link() -{ - FILE * foutput; - ERRTYPE aError; - RscFile* pFName; - - if( !(pCL->nCommands & CommandFlags::NoLink) ) - { - ::std::list::const_iterator it; - - for( it = pCL->m_aOutputFiles.begin(); it != pCL->m_aOutputFiles.end(); ++it ) - { - // cleanup nodes - for( RscFileTab::Index aIndex = pTC->aFileTab.FirstIndex(); - aIndex != RscFileTab::IndexNotFound && aError.IsOk(); - aIndex = pTC->aFileTab.NextIndex( aIndex ) ) - { - pFName = pTC->aFileTab.Get( aIndex ); - if( !pFName->IsIncFile() ) - { - pTC->Delete( aIndex ); - aIndex = pTC->aFileTab.GetIndexOf( pFName ); - pFName->bLoaded = false; - } - } - - - // get two temp file urls - OString aRcTmp, aSysListTmp, aSysList; - try - { - OUString sPwdUrl; - osl_getProcessWorkingDir( &sPwdUrl.pData ); - OUString sRcUrl = lcl_getAbsoluteUrl(sPwdUrl, it->aOutputRc); - // TempDir is either the directory where the rc file is located or pwd - OUString sTempDirUrl = sRcUrl.copy(0,sRcUrl.lastIndexOf('/')); - - aRcTmp = lcl_getTempFile(sTempDirUrl); - - OUString sOilDirUrl = sTempDirUrl; - - aSysListTmp = lcl_getTempFile(sOilDirUrl); - - OUString sIlstUrl; - sIlstUrl = sRcUrl.copy(sRcUrl.lastIndexOf('/')+1); - sIlstUrl = sIlstUrl.copy(0,sIlstUrl.lastIndexOf('.')); - sIlstUrl += ".ilst"; - sIlstUrl = lcl_getAbsoluteUrl(sOilDirUrl, OUStringToOString(sIlstUrl, RTL_TEXTENCODING_UTF8)); - - aSysList = lcl_getSystemPath(sIlstUrl); - } - catch (RscIoError&) - { - OString sMsg = "Error with paths:\n" - "temporary rc file: " + aRcTmp + "\n" - "temporary ilst file: " + aSysListTmp + "\n" - "ilst file: " + aSysList + "\n"; - pTC->pEH->FatalError(ERR_OPENFILE, RscId(), sMsg.getStr()); - } - if ( nullptr == (fExitFile = foutput = fopen( aRcTmp.getStr(), "wb" )) ) - pTC->pEH->FatalError( ERR_OPENFILE, RscId(), aRcTmp.getStr() ); - - // write file - pTC->ChangeLanguage( it->aLangName ); - pTC->SetSourceCharSet( RTL_TEXTENCODING_UTF8 ); - - WriteRcContext aContext; - - aContext.fOutput = foutput; - aContext.aOutputRc = it->aOutputRc; - aContext.aOutputSysList = aSysListTmp; - aContext.pCmdLine = pCL; - - // create empty sys list - if( !aContext.aOutputSysList.isEmpty() ) - { - FILE* pSysListFile = fopen( aContext.aOutputSysList.getStr(), "wb" ); - - if( !pSysListFile ) - pTC->pEH->FatalError( ERR_OPENFILE, RscId(), aContext.aOutputSysList.getStr() ); - else - fclose( pSysListFile ); - } - - // parse files for specific language - for( RscFileTab::Index aIndex = pTC->aFileTab.FirstIndex(); - aIndex != RscFileTab::IndexNotFound && aError.IsOk(); - aIndex = pTC->aFileTab.NextIndex( aIndex ) ) - { - pFName = pTC->aFileTab.Get( aIndex ); - if( !pFName->IsIncFile() ) - { - aError = ParseOneFile( aIndex, &*it, &aContext ); - aIndex = pTC->aFileTab.GetIndexOf( pFName ); - } - }; - - aError = pTC->WriteRc( aContext ); - - fclose( foutput ); - fExitFile = nullptr; - unlink( it->aOutputRc.getStr() ); - if( rename( aRcTmp.getStr(), it->aOutputRc.getStr() ) ) - { - OStringBuffer aBuf; - aBuf.append( aRcTmp ); - aBuf.append( " -> " ); - aBuf.append( it->aOutputRc ); - pTC->pEH->FatalError( ERR_RENAMEFILE, RscId(), aBuf.getStr() ); - } - else - { -#ifdef UNX - (void)chmod( it->aOutputRc.getStr(), S_IRWXU | S_IRWXG | S_IROTH ); -#endif - } - - unlink( aSysList.getStr() ); - if( rename( aSysListTmp.getStr(), aSysList.getStr() ) ) - { - OStringBuffer aBuf; - aBuf.append( aSysListTmp ); - aBuf.append( " -> " ); - aBuf.append( aSysList ); - pTC->pEH->FatalError( ERR_RENAMEFILE, RscId(), aBuf.getStr() ); - } - else - { -#ifdef UNX - (void)chmod( aSysList.getStr(), S_IRWXU | S_IRWXG | S_IROTH ); -#endif - } - } - } - else - { - // parse files - for( RscFileTab::Index aIndex = pTC->aFileTab.FirstIndex(); - aIndex != RscFileTab::IndexNotFound && aError.IsOk(); - aIndex = pTC->aFileTab.NextIndex( aIndex ) ) - { - pFName = pTC->aFileTab.Get( aIndex ); - if( !pFName->IsIncFile() ) - { - aError = ParseOneFile( aIndex, nullptr, nullptr ); - aIndex = pTC->aFileTab.GetIndexOf( pFName ); - } - }; - } - - return aError; -} - -bool RscCompiler::GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile, - const WriteRcContext& rContext, - const OString& rBaseFileName, - OString& rImagePath, - FILE* pSysListFile ) -{ - ::std::list< OString > aFileNames; - bool bFound = false; - - aFileNames.push_back( rBaseFileName + OString(".png") ); - aFileNames.push_back( rBaseFileName + OString(".bmp") ); - - ::std::list< OString >::iterator aFileIter( aFileNames.begin() ); - - while( ( aFileIter != aFileNames.end() ) && !bFound ) - { - ::std::list< OString >::const_iterator aDirIter( rOutputFile.aSysSearchDirs.begin() ); - - while( ( aDirIter != rOutputFile.aSysSearchDirs.end() ) && !bFound ) - { - const OString aSysPath = *aDirIter + "/" + *aFileIter; - OUString aAbsPath = OStringToOUString( aSysPath, RTL_TEXTENCODING_ASCII_US ); - - - osl::FileBase::getFileURLFromSystemPath( aAbsPath, aAbsPath ); - osl::DirectoryItem aDirectoryItem; - bool bFile = false; - if (osl::DirectoryItem::E_None == osl::DirectoryItem::get( aAbsPath, aDirectoryItem )) - { - osl::FileStatus aFS(osl_FileStatus_Mask_Type); - if (osl::DirectoryItem::E_None == aDirectoryItem.getFileStatus( aFS )) - bFile = aFS.isRegular(); - } - -#if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "Searching image: %s\n", aSysPath.getStr() ); -#endif - - if( bFile ) - { - std::list< std::pair< OString, OString > >::const_iterator aReplIter( rContext.pCmdLine->m_aReplacements.begin() ); - OString aRelPathStr( aSysPath ); - - while( ( aReplIter != rContext.pCmdLine->m_aReplacements.end() ) && !bFound ) - { - OString aSearch(aReplIter->second.toAsciiLowerCase()); - OString aSearchIn(aRelPathStr.toAsciiLowerCase()); - if( aSearchIn.startsWith(aSearch) ) - { - sal_Int32 nCopyPos = aReplIter->second.getLength(), nLength = aRelPathStr.getLength(); - const sal_Char* pChars = aRelPathStr.getStr(); - - while( ( nCopyPos < nLength ) && ( pChars[ nCopyPos ] == '/' || pChars[ nCopyPos ] == '\\' || pChars[ nCopyPos ] == ':' ) ) - { - ++nCopyPos; - } - - if( nCopyPos < nLength ) - rImagePath = aRelPathStr.copy( nCopyPos ).replace( '\\', '/' ); - - bFound = true; - } - - ++aReplIter; - } - - if( bFound && pSysListFile ) - { - fprintf( pSysListFile, "%s\n", rContext.pCmdLine->substitutePaths( aSysPath ).getStr() ); - } - -#if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "ImagePath to add: %s\n", rImagePath.getStr() ); -#endif - } - - ++aDirIter; - } - - ++aFileIter; - } - - return bFound; -} - -void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, - const WriteRcContext& rContext, - const OUString& rSrsInPath, - const OUString& rSrsOutPath ) -{ - SvFileStream aIStm( rSrsInPath, StreamMode::READ ); - SvFileStream aOStm( rSrsOutPath, StreamMode::WRITE | StreamMode::TRUNC ); - ::std::vector< OString > aMissingImages; - FILE* pSysListFile = rContext.aOutputSysList.isEmpty() ? nullptr : fopen( rContext.aOutputSysList.getStr(), "ab" ); - - if( !aIStm.GetError() && !aOStm.GetError() ) - { - OString aLine; - OString aFilePath; - - while( aIStm.ReadLine( aLine ) ) - { - if( ( getTokenCount(aLine, '=') == 2 ) && - ( aLine.getToken(0, '=').indexOf("File") != -1 ) ) - { - OString aBaseFileName( aLine.getToken(1, '"').getToken(0, '.') ); - - if( GetImageFilePath( rOutputFile, rContext, aBaseFileName, aFilePath, pSysListFile ) ) - { - aLine = OStringBuffer("File = \""). - append(aFilePath).append("\";"). - makeStringAndClear(); - } - else - aMissingImages.push_back( aBaseFileName ); - - aOStm.WriteLine(aLine); - } - else - aOStm.WriteLine(aLine); - } - } - - if( aMissingImages.size() > 0 ) - { - OStringBuffer aImagesStr; - - for( size_t i = 0; i < aMissingImages.size(); ++i ) - { - if( i ) - aImagesStr.append(' '); - - aImagesStr.append(aMissingImages[i]); - } - - pTC->pEH->FatalError( ERR_NOIMAGE, RscId(), aImagesStr.getStr() ); - } - - if( pSysListFile ) - fclose( pSysListFile ); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/rscpp/cpp.h b/rsc/source/rscpp/cpp.h deleted file mode 100644 index 4dcf1c89abd9..000000000000 --- a/rsc/source/rscpp/cpp.h +++ /dev/null @@ -1,340 +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_RSC_SOURCE_RSCPP_CPP_H -#define INCLUDED_RSC_SOURCE_RSCPP_CPP_H - -#ifndef TRUE -#define TRUE 1 -#define FALSE 0 -#endif - -/* in cpp1.c: file-pointer on stdout file file */ -extern FILE* pCppOut; /* BP */ -#define PUTCHAR( d ) fprintf( pCppOut, "%c", (d) ) /* BP */ -#if OSL_DEBUG_LEVEL > 1 -extern FILE* pDefOut; /* ER */ -#ifdef EVALDEFS -#define NEVALBUF 2048 -#endif -#endif - -/* limit for reading commandfiles */ -#define PARALIMIT 100 - -#define EOS '\0' /* End of string */ -#define EOF_CHAR 0 /* Returned by get() on eof */ -#define NULLST ((char *) NULL) /* Pointer to nowhere (linked) */ -#define DEF_NOARGS (-1) /* #define foo vs #define foo() */ - -/* - * The following may need to change if the host system doesn't use ASCII. - */ -#define DEF_MAGIC 0x1D /* Magic for #defines */ -#define TOK_SEP 0x1E /* Token concatenation delim. */ -#define COM_SEP 0x1F /* Magic comment separator */ - -#define HT 0x09 /* horizontal tab */ -#define NL 0x0A /* new line */ -#define CR 0x0D /* carriage return */ -#define DEL 0x7F - - - -#ifdef SOLAR -#define MAC_PARM 0x01 /* Macro formals start here */ -#else -/* - * Note -- in Ascii, the following will map macro formals onto DEL + the - * C1 control character region (decimal 128 .. (128 + PAR_MAC)) which will - * be ok as long as PAR_MAC is less than 33). Note that the last PAR_MAC - * value is reserved for string substitution. - */ - -#define MAC_PARM DEL /* Macro formals start here */ -#if PAR_MAC >= 33 - assertion fails -- PAR_MAC is not less than 33 -#endif -#endif -#define LASTPARM (PAR_MAC - 1) - -/* - * Character type codes. - */ - -#define INV 0 /* Invalid, must be zero */ -#define OP_EOE INV /* End of expression */ -#define DIG 1 /* Digit */ -#define LET 2 /* Identifier start */ -#define FIRST_BINOP OP_ADD -#define OP_ADD 3 -#define OP_SUB 4 -#define OP_MUL 5 -#define OP_DIV 6 -#define OP_MOD 7 -#define OP_ASL 8 -#define OP_ASR 9 -#define OP_AND 10 /* &, not && */ -#define OP_OR 11 /* |, not || */ -#define OP_XOR 12 -#define OP_EQ 13 -#define OP_NE 14 -#define OP_LT 15 -#define OP_LE 16 -#define OP_GE 17 -#define OP_GT 18 -#define OP_ANA 19 /* && */ -#define OP_ORO 20 /* || */ -#define OP_QUE 21 /* ? */ -#define OP_COL 22 /* : */ -#define OP_CMA 23 /* , (relevant?) */ -#define LAST_BINOP OP_CMA /* Last binary operand */ -/* - * The following are unary. - */ -#define OP_PLU 24 /* + (draft ANSI standard) */ -#define OP_NEG 25 /* - */ -#define OP_COM 26 /* ~ */ -#define OP_NOT 27 /* ! */ -#define OP_LPA 28 /* ( */ -#define OP_RPA 29 /* ) */ -#define OP_END 30 /* End of expression marker */ -#define OP_MAX (OP_END + 1) /* Number of operators */ -#define OP_FAIL (OP_END + 1) /* For error returns */ - -/* - * The following are for lexical scanning only. - */ - -#define QUO 65 /* Both flavors of quotation */ -#define DOT 66 /* . might start a number */ -#define SPA 67 /* Space and tab */ -#define BSH 68 /* Just a backslash */ -#define END 69 /* EOF */ - -/* - * These bits are set in ifstack[] - */ -#define WAS_COMPILING 1 /* TRUE if compile set at entry */ -#define ELSE_SEEN 2 /* TRUE when #else processed */ -#define TRUE_SEEN 4 /* TRUE when #if TRUE processed */ - -/* - * Define bits for the basic types and their adjectives - */ - -#define T_CHAR 1 -#define T_INT 2 -#define T_FLOAT 4 -#define T_DOUBLE 8 -#define T_SHORT 16 -#define T_LONG 32 -#define T_SIGNED 64 -#define T_UNSIGNED 128 -#define T_PTR 256 /* Pointer */ -#define T_FPTR 512 /* Pointer to functions */ - -/* - * The DEFBUF structure stores information about #defined - * macros. Note that the defbuf->repl information is always - * in malloc storage. - */ - -typedef struct defbuf -{ - struct defbuf* link; /* Next define in chain */ - char* repl; /* -> replacement */ - int hash; /* Symbol table hash */ - int nargs; /* For define(args) */ - char name[]; /* #define name */ -} DEFBUF; - -/* - * The FILEINFO structure stores information about open files - * and macros being expanded. - */ - -typedef struct fileinfo -{ - char* bptr; /* Buffer pointer */ - int line; /* for include or macro */ - FILE* fp; /* File if non-null */ - struct fileinfo* parent; /* Link to includer */ - char* filename; /* File/macro name */ - char* progname; /* From #line statement */ - unsigned int unrecur; /* For macro recursion */ - char buffer[1]; /* current input line */ -} FILEINFO; - -/* - * The SIZES structure is used to store the values for #if sizeof - */ - -typedef struct sizes -{ - short bits; /* If this bit is set, */ - int size; /* this is the datum size value */ - int psize; /* this is the pointer size */ -} SIZES; - -#define cput(c) { if (c != TOK_SEP) PUTCHAR(c); } -#define streq(s1, s2) (strcmp(s1, s2) == 0) - -/* - * Error codes. - */ -#define IO_NORMAL 0 -#define IO_ERROR 1 - -/* - * Externs - */ - -extern int line; /* Current line number */ -extern int wrongline; /* Force #line to cc pass 1 */ -extern char type[]; /* Character classifier */ -extern char token[IDMAX + 1]; /* Current input token */ -extern int instring; /* TRUE if scanning string */ -extern int inmacro; /* TRUE if scanning #define */ -extern int errors; /* Error counter */ -extern int recursion; /* Macro depth counter */ -extern char ifstack[BLK_NEST]; /* #if information */ -#define compiling ifstack[0] -extern char* ifptr; /* -> current ifstack item */ -extern char* incdir[NINCLUDE]; /* -i directories */ -extern char** incend; /* -> active end of incdir */ -extern int cflag; /* -C option (keep comments) */ -extern int eflag; /* -E option (ignore errors) */ -extern int nflag; /* -N option (no pre-defines) */ -extern int rec_recover; /* unwind recursive macros */ -extern char* preset[]; /* Standard predefined symbols */ -extern char* magic[]; /* Magic predefined symbols */ -extern FILEINFO* infile; /* Current input file */ -extern char work[NWORK + 1]; /* #define scratch */ -extern char* workp; /* Free space in work */ -#if OSL_DEBUG_LEVEL > 1 -extern int debug; /* Debug level */ -/* ER dump & evaluate #define's */ -extern int bDumpDefs; /* TRUE if #define's dump req. */ -extern int bIsInEval; /* TRUE if #define dumping now */ -#ifdef EVALDEFS -extern char EvalBuf[NEVALBUF + 1]; /* evaluation buffer */ -extern int nEvalOff; /* offset to free buffer pos */ -#endif -#endif -extern int keepcomments; /* Don't remove comments if set */ -extern SIZES size_table[]; /* For #if sizeof sizes */ - -#ifdef NOMAIN /* BP */ -#ifndef _NO_PROTO -int rscpp_main( int argc, char **argv ); -#endif -#define MAIN rscpp_main /* main() needs to be changed for the cpp.lib */ -#else -#ifdef _WIN32 -#define MAIN __cdecl main -#else -#define MAIN main -#endif -#endif - - -void InitCpp1( void ); -void InitCpp4( void ); -void InitCpp6( void ); - -#define HELLO() fprintf( stderr, "[Hello at %s, %d] ", __FILE__, __LINE__ ) - -#include -#include -#include - -/* cpp1.c */ -void output( int c ); -void sharp( void ); -void cppmain( void ); -#if OSL_DEBUG_LEVEL > 1 -#ifdef EVALDEFS -int outputEval( int c ); -#endif -#endif - - -/* cpp2.c */ -int control( int counter ); -void dodefine( void ); -int openfile( char* ); - -/* cpp3.c */ -void addfile( FILE* fp, char* filename ); -void setincdirs( void ); -int AddInclude( char* pIncStr ); - -void initdefines( void ); -int dooptions( int argc, char* argv[] ); -int readoptions( char* filename, char*** pfargv ); - -/* cpp4.c */ -void checkparm( int c, DEFBUF* dp ); - -void stparmscan( int delim ); -#if OSL_DEBUG_LEVEL > 1 -void dumpparm( char* why ); -#endif - -void doundef( void ); -void textput( char* text ); -void charput( int c ); -void expand( DEFBUF* tokenp ); - -/* cpp5.c */ -int eval( void ); - -/* cpp6.c */ - -void skipnl( void ); -int skipws( void ); -void scanid( int c ); -int macroid( int c ); -int catenate(void); -int scanstring( int c, void (*outfun)( int c ) ); -void scannumber( int c, void (*outfun)( int c ) ); -void save( int c ); -char* savestring( char* text ); -FILEINFO* getfile( size_t bufsize, char* name ); -char *getmem( size_t size ); -DEFBUF* lookid( int c ); -DEFBUF* defendel( char* name, int delete ); -int get( void ); -int cget( void ); -void unget( void ); -void ungetstring( char* text ); -void cerror( char* format, char* sarg ); -void cwarn( char* format, char* sarg ); -void cfatal( char* format, char* sarg ); -void cierror( char* format, int n ); -void ciwarn( char* format, int n ); -#if OSL_DEBUG_LEVEL > 1 -void dumpdef( char* why ); -void dumpadef( char* why, DEFBUF *dp ); -#endif - -#endif // INCLUDED_RSC_SOURCE_RSCPP_CPP_H - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/rscpp/cpp1.c b/rsc/source/rscpp/cpp1.c deleted file mode 100644 index 13518a264187..000000000000 --- a/rsc/source/rscpp/cpp1.c +++ /dev/null @@ -1,574 +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 . - */ - -#define NOMAIN - -#include -#include "cppdef.h" -#include "cpp.h" - -FILE* pCppOut = NULL; -static FILE* pCppIn = NULL; - -#if OSL_DEBUG_LEVEL > 1 -FILE* pDefOut = NULL; /* ER possible #define's dump */ -#endif - -#ifdef B200 -/* only possibility under BC to set stack and head */ -extern unsigned _stklen = 24000; -extern unsigned _heaplen = 30000; -#endif - - - -/* - * Commonly used global variables: - * line is the current input line number. - * wrongline is set in many places when the actual output - * line is out of sync with the numbering, e.g, - * when expanding a macro with an embedded newline. - * - * token holds the last identifier scanned (which might - * be a candidate for macro expansion). - * errors is the running cpp error counter. - * infile is the head of a linked list of input files (extended by - * #include and macros being expanded). infile always points - * to the current file/macro. infile->parent to the includer, - * etc. infile->fd is NULL if this input stream is a macro. - */ -int line; /* Current line number */ -int wrongline; /* Force #line to compiler */ -char token[IDMAX + 1]; /* Current input token */ -int errors; /* cpp error counter */ -FILEINFO* infile = NULL; /* Current input file */ -#if OSL_DEBUG_LEVEL > 1 -int debug; /* TRUE if debugging now */ -int bDumpDefs; /* TRUE if #define's dump req. */ -#ifdef EVALDEFS -int bIsInEval; /* TRUE if #define eval now */ -char EvalBuf[NEVALBUF + 1]; /* evaluation buffer */ -int nEvalOff = 0; /* offset to free buffer pos */ -#endif -#endif -/* - * This counter is incremented when a macro expansion is initiated. - * If it exceeds a built-in value, the expansion stops -- this tests - * for a runaway condition: - * #define X Y - * #define Y X - * X - * This can be disabled by falsifying rec_recover. (Nothing does this - * currently: it is a hook for an eventual invocation flag.) - */ -int recursion; /* Infinite recursion counter */ -int rec_recover = TRUE; /* Unwind recursive macros */ - -/* - * instring is set TRUE when a string is scanned. It modifies the - * behavior of the "get next character" routine, causing all characters - * to be passed to the caller (except ). Note especially that - * comments and \ are not removed from the source. (This - * prevents cpp output lines from being arbitrarily long). - * - * inmacro is set by #define -- it absorbs comments and converts - * form-feed and vertical-tab to space, but returns \ - * to the caller. Strictly speaking, this is a bug as \ - * shouldn't delimit tokens, but we'll worry about that some other - * time -- it is more important to prevent infinitly long output lines. - * - * instring and inmacro are parameters to the get() routine which - * were made global for speed. - */ -int instring = FALSE; /* TRUE if scanning string */ -int inmacro = FALSE; /* TRUE if #defining a macro */ - -/* - * work[] and workp are used to store one piece of text in a temporary - * buffer. To initialize storage, set workp = work. To store one - * character, call save(c); (This will fatally exit if there isn't - * room.) To terminate the string, call save(EOS). Note that - * the work buffer is used by several subroutines -- be sure your - * data won't be overwritten. The extra byte in the allocation is - * needed for string formal replacement. - */ -char work[NWORK + 1]; /* Work buffer */ -char* workp; /* Work buffer pointer */ - -/* - * keepcomments is set TRUE by the -C option. If TRUE, comments - * are written directly to the output stream. This is needed if - * the output from cpp is to be passed to lint (which uses commands - * embedded in comments). cflag contains the permanent state of the - * -C flag. keepcomments is always falsified when processing #control - * commands and when compilation is suppressed by a false #if - * - * If eflag is set, CPP returns "success" even if non-fatal errors - * were detected. - * - * If nflag is non-zero, no symbols are predefined except __LINE__. - * __FILE__, and __DATE__. If nflag > 1, absolutely no symbols - * are predefined. - */ -int keepcomments = FALSE; /* Write out comments flag */ -int cflag = FALSE; /* -C option (keep comments) */ -int eflag = FALSE; /* -E option (never fail) */ -int nflag = 0; /* -N option (no predefines) */ - -/* - * ifstack[] holds information about nested #if's. It is always - * accessed via *ifptr. The information is as follows: - * WAS_COMPILING state of compiling flag at outer level. - * ELSE_SEEN set TRUE when #else seen to prevent 2nd #else. - * TRUE_SEEN set TRUE when #if or #elif succeeds - * ifstack[0] holds the compiling flag. It is TRUE if compilation - * is currently enabled. Note that this must be initialized TRUE. - */ -char ifstack[BLK_NEST] = { TRUE }; /* #if information */ -char* ifptr = ifstack; /* -> current ifstack[] */ - -/* - * incdir[] stores the -i directories (and the system-specific - * #include <...> directories. - */ -char* incdir[NINCLUDE]; /* -i directories */ -char** incend = incdir; /* -> free space in incdir[] */ - -/* - * This is the table used to predefine target machine and operating - * system designators. It may need hacking for specific circumstances. - * Note: it is not clear that this is part of the Ansi Standard. - * The -N option suppresses preset definitions. - */ -char* preset[] = -{ /* names defined at cpp start */ -#ifdef MACHINE - MACHINE, -#endif -#ifdef SYSTEM - SYSTEM, -#endif -#ifdef COMPILER - COMPILER, -#endif -#if OSL_DEBUG_LEVEL > 1 - "decus_cpp", /* Ourselves! */ -#endif - NULL /* Must be last */ -}; - -/* - * The value of these predefined symbols must be recomputed whenever - * they are evaluated. The order must not be changed. - */ -char* magic[] = -{ /* Note: order is important */ - "__LINE__", - "__FILE__", - NULL /* Must be last */ -}; - -static char* sharpfilename = NULL; - -static int nRunde = 0; - -void InitCpp1() -{ - int i; - /* in LIB-Version all variables must be initialized */ - - line = wrongline = errors = recursion = 0; - for( i = 0; i < IDMAX; i++ ) - token[ i ] = 0; - - for( i = 0; i < NWORK; i++ ) - work[ i ] = 0; - - for( i = 0; i < NINCLUDE; i++ ) - incdir[ i ] = NULL; - - workp = NULL; - for( i = 0; i < BLK_NEST; i++ ) - ifstack[ i ] = TRUE; - ifptr = ifstack; - - pCppOut = stdout; - pCppIn = stdin; -#if OSL_DEBUG_LEVEL > 1 - debug = 0; - bDumpDefs = 0; - pDefOut = stdout; -#ifdef EVALDEFS - bIsInEval = 0; - for( i = 0; i < NEVALBUF; i++ ) - EvalBuf[ i ] = 0; - nEvalOff = 0; -#endif -#endif - rec_recover = TRUE; - infile = NULL; - instring = inmacro = keepcomments = cflag = eflag = FALSE; - nflag = 0; - incend = incdir; - sharpfilename = NULL; -} - -int MAIN(int argc, char** argv) -{ - int i; - char** useargv = NULL; - char** pfargv = NULL; - - if( nRunde == 0 ) - { - pCppIn = stdin; - pCppOut = stdout; - } - - nRunde++; - InitCpp1(); - InitCpp4(); - InitCpp6(); - - initdefines(); /* O.S. specific def's */ - if ( argv[argc-1][0] == '@' ) - { - i = readoptions( argv[1], &pfargv ); /* Command file */ - useargv=pfargv; - } - else - { - i = dooptions(argc, argv); /* Command line -flags */ - useargv=argv; - } - switch (i) - { -#if OSL_DEBUG_LEVEL > 1 - case 4: - if ( bDumpDefs ) - { - /* - * Get defBase file, "-" means use stdout. - */ - if (!streq(useargv[3], "-")) - { - pDefOut = fopen( useargv[3], "w" ); - if( pDefOut == NULL ) - { - perror(useargv[3]); - cerror("Can't open output file \"%s\"", useargv[3]); - exit(IO_ERROR); - } - } /* Continue by opening output */ - } - /* fall through */ -#endif - case 3: - /* - * Get output file, "-" means use stdout. - */ - if (!streq(useargv[2], "-")) - { - pCppOut = fopen( useargv[2], "w" ); - if( pCppOut == NULL ) - { - perror(useargv[2]); - cerror("Can't open output file \"%s\"", useargv[2]); - exit(IO_ERROR); - } - } /* Continue by opening input */ - /* fall through */ - case 2: /* One file -> stdin */ - /* - * Open input file, "-" means use stdin. - */ - if (!streq(useargv[1], "-")) - { - pCppIn = fopen( useargv[1], "r" ); - if( pCppIn == NULL) - { - perror(useargv[1]); - cerror("Can't open input file \"%s\"", useargv[1]); - exit(IO_ERROR); - } - strncpy(work, useargv[1], NWORK); /* Remember input filename */ - break; - } /* Else, just get stdin */ - /* fall through */ - case 0: /* No args? */ - case 1: /* No files, stdin -> stdout */ - work[0] = EOS; /* Unix can't find stdin name */ - break; - - default: - exit(IO_ERROR); /* Can't happen */ - } - - setincdirs(); /* Setup -I include directories */ - addfile( pCppIn, work); /* "open" main input file */ -#if OSL_DEBUG_LEVEL > 1 - if (debug > 0 || bDumpDefs) - dumpdef("preset #define symbols"); -#endif - if( pCppIn != stdin ) - rewind( pCppIn ); - - cppmain(); /* Process main file */ - - if ((i = (ifptr - &ifstack[0])) != 0) - { - cierror("Inside #ifdef block at end of input, depth = %d", i); - } -#if OSL_DEBUG_LEVEL > 1 - if( pDefOut != stdout && pDefOut != stderr ) - fclose( pDefOut ); -#endif - if( pCppOut != stdout && pCppOut != stderr ) - fclose( pCppOut ); - - if (errors > 0) - { - fprintf(stderr, (errors == 1) - ? "%d error in preprocessor\n" - : "%d errors in preprocessor\n", errors); - if (!eflag) - exit(IO_ERROR); - } - if( pfargv ) - free(pfargv); - return IO_NORMAL; - -} - -/* - * Main process for cpp -- copies tokens from the current input - * stream (main file, include file, or a macro) to the output - * file. - */ -void cppmain() -{ - int c; /* Current character */ - int counter; /* newlines and spaces */ - - /* - * Explicitly output a #line at the start of cpp output so - * that lint (etc.) knows the name of the original source - * file. If we don't do this explicitly, we may get - * the name of the first #include file instead. - * We also seem to need a blank line following that first #line. - */ -#ifdef EVALDEFS - if ( !bIsInEval ) -#endif - { - sharp(); - PUTCHAR('\n'); - } - /* - * This loop is started "from the top" at the beginning of each line - * wrongline is set TRUE in many places if it is necessary to write - * a #line record. (But we don't write them when expanding macros.) - * - * The counter variable has two different uses: at - * the start of a line, it counts the number of blank lines that - * have been skipped over. These are then either output via - * #line records or by outputting explicit blank lines. - * When expanding tokens within a line, the counter remembers - * whether a blank/tab has been output. These are dropped - * at the end of the line, and replaced by a single blank - * within lines. - */ - for (;;) - { - counter = 0; /* Count empty lines */ - for (;;) - { /* For each line, ... */ - while (type[(c = get())] == SPA) /* Skip leading blanks */ - ; /* in this line. */ - if (c == '\n') /* If line's all blank, */ - ++counter; /* Do nothing now */ - else if (c == '#') - { /* Is 1st non-space '#' */ - keepcomments = FALSE; /* Don't pass comments */ - counter = control(counter); /* Yes, do a #command */ - keepcomments = (cflag && compiling); - } - else if (c == EOF_CHAR) /* At end of file? */ - { - break; - } - else if (!compiling) - { /* #ifdef false? */ - skipnl(); /* Skip to newline */ - counter++; /* Count it, too. */ - } - else - { - break; /* Actual token */ - } - } - if (c == EOF_CHAR) /* Exit process at */ - break; /* End of file */ - /* - * If the loop didn't terminate because of end of file, we - * know there is a token to compile. First, clean up after - * absorbing newlines. counter has the number we skipped. - */ - if ((wrongline && infile->fp != NULL) || counter > 4) - sharp(); /* Output # line number */ - else - { /* If just a few, stuff */ - while (--counter >= 0) /* them out ourselves */ - PUTCHAR('\n'); - } - /* - * Process each token on this line. - */ - unget(); /* Reread the char. */ - for (;;) - { /* For the whole line, */ - do - { /* Token concat. loop */ - for (counter = 0; type[(c = get())] == SPA;) - { - counter++; /* Skip over blanks */ - - } - if (c == EOF_CHAR || c == '\n') - goto end_line; /* Exit line loop */ - else if (counter > 0) /* If we got any spaces */ - PUTCHAR(' '); /* Output one space */ - c = macroid(c); /* Grab the token */ - } - while (type[c] == LET && catenate()); - - if (c == EOF_CHAR || c == '\n') /* From macro exp error */ - goto end_line; /* Exit line loop */ - - switch (type[c]) - { - case LET: - fputs(token, pCppOut); /* Quite ordinary token */ -#ifdef EVALDEFS - { - int len; - if ( bIsInEval - && nEvalOff + (len=strlen(token)) < NEVALBUF ) - { - strcpy( &EvalBuf[nEvalOff], token ); - nEvalOff += len; - } - } -#endif - break; - - - case DIG: /* Output a number */ - case DOT: /* Dot may begin floats */ -#ifdef EVALDEFS - if ( bIsInEval ) - scannumber(c, outputEval); - else - scannumber(c, output); -#else - scannumber(c, output); -#endif - break; - - case QUO: /* char or string const */ - scanstring(c, output); /* Copy it to output */ - break; - - default: /* Some other character */ - cput(c); /* Just output it */ -#ifdef EVALDEFS - if ( bIsInEval && nEvalOff < NEVALBUF ) - EvalBuf[nEvalOff++] = c; -#endif - break; - } /* Switch ends */ - } /* Line for loop */ - end_line: - if (c == '\n') - { /* Compiling at EOL? */ - PUTCHAR('\n'); /* Output newline, if */ - if (infile->fp == NULL) /* Expanding a macro, */ - wrongline = TRUE; /* Output # line later */ - } - } /* Continue until EOF */ -#ifdef EVALDEFS - if ( bIsInEval ) - EvalBuf[nEvalOff++] = '\0'; -#endif -} - -/* - * Output one character to stdout -- output() is passed as an - * argument to scanstring() - */ -void output(int c) -{ - if (c != TOK_SEP) - PUTCHAR(c); -} - -#ifdef EVALDEFS -/* - * Output one character to stdout -- output() is passed as an - * argument to scanstring() - */ -int outputEval(int c) -{ - if (c != TOK_SEP) - { - PUTCHAR(c); - if ( bIsInEval && nEvalOff < NEVALBUF ) - EvalBuf[nEvalOff++] = c; - } -} -#endif - - -/* - * Output a line number line. - */ -void sharp() -{ - char* name; - - if (keepcomments) /* Make sure # comes on */ - PUTCHAR('\n'); /* a fresh, new line. */ - - fprintf( pCppOut, "#%s %d", LINE_PREFIX, line); - if (infile->fp != NULL) - { - name = (infile->progname != NULL) ? infile->progname : infile->filename; - if (sharpfilename == NULL || (!streq(name, sharpfilename))) - { - if (sharpfilename != NULL) - free(sharpfilename); - sharpfilename = savestring(name); - fprintf( pCppOut, " \"%s\"", name); - } - } - PUTCHAR('\n'); - wrongline = FALSE; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/rscpp/cpp2.c b/rsc/source/rscpp/cpp2.c deleted file mode 100644 index e55dc384018f..000000000000 --- a/rsc/source/rscpp/cpp2.c +++ /dev/null @@ -1,552 +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 -#include -#include "cppdef.h" -#include "cpp.h" - -static void doinclude( void ); -static void doif( int hash ); -static int openinclude( char*, int ); -static int hasdirectory( char*, char*, int ); - -/* - * Generate (by hand-inspection) a set of unique values for each control - * operator. Note that this is not guaranteed to work for non-Ascii - * machines. CPP won't compile if there are hash conflicts. - */ - -#define L_assert ('a' + ('s' << 1)) -#define L_define ('d' + ('f' << 1)) -#define L_elif ('e' + ('i' << 1)) -#define L_else ('e' + ('s' << 1)) -#define L_endif ('e' + ('d' << 1)) -#define L_if ('i' + (EOS << 1)) -#define L_ifdef ('i' + ('d' << 1)) -#define L_ifndef ('i' + ('n' << 1)) -#define L_include ('i' + ('c' << 1)) -#define L_line ('l' + ('n' << 1)) -#define L_nogood (EOS + (EOS << 1)) /* To catch #i */ -#define L_pragma ('p' + ('a' << 1)) -#define L_undef ('u' + ('d' << 1)) -#define L_error ('e' + ('r' << 1)) /* BP 5.3.92, #error */ -#if OSL_DEBUG_LEVEL > 1 -#define L_debug ('d' + ('b' << 1)) /* #debug */ -#define L_nodebug ('n' + ('d' << 1)) /* #nodebug */ -#endif - - -/* - * Process #control lines. Simple commands are processed inline, - * while complex commands have their own subroutines. - * - * The counter is used to force out a newline before #line, and - * #pragma commands. This prevents these commands from ending up at - * the end of the previous line if cpp is invoked with the -C option. - */ -int control(int counter) -{ - int c; - char* tp; - int hash; - char* ep; - - c = skipws(); - if (c == '\n' || c == EOF_CHAR) - return counter + 1; - if (!isdigit(c)) - scanid(c); /* Get #word to token[] */ - else - { - unget(); /* Hack -- allow #123 as a */ - strcpy(token, "line"); /* synonym for #line 123 */ - } - hash = (token[1] == EOS) ? L_nogood : (token[0] + (token[2] << 1)); - switch (hash) - { - case L_assert: tp = "assert"; break; - case L_define: tp = "define"; break; - case L_elif: tp = "elif"; break; - case L_else: tp = "else"; break; - case L_endif: tp = "endif"; break; - case L_if: tp = "if"; break; - case L_ifdef: tp = "ifdef"; break; - case L_ifndef: tp = "ifndef"; break; - case L_include: tp = "include"; break; - case L_line: tp = "line"; break; - case L_pragma: tp = "pragma"; break; - case L_undef: tp = "undef"; break; - case L_error: tp = "error"; break; -#if OSL_DEBUG_LEVEL > 1 - case L_debug: tp = "debug"; break; - case L_nodebug: tp = "nodebug"; break; -#endif - default: hash = L_nogood; - /*fall-through*/ - case L_nogood: tp = ""; break; - } - if (!streq(tp, token)) - hash = L_nogood; - /* - * hash is set to a unique value corresponding to the - * control keyword (or L_nogood if we think it's nonsense). - */ - if (infile->fp == NULL) - cwarn("Control line \"%s\" within macro expansion", token); - if (!compiling) - { /* Not compiling now */ - switch (hash) - { - case L_if: /* These can't turn */ - case L_ifdef: /* compilation on, but */ - case L_ifndef: /* we must nest #if's */ - if (++ifptr >= &ifstack[BLK_NEST]) - goto if_nest_err; - *ifptr = 0; /* !WAS_COMPILING */ - /* fall through */ - case L_line: /* Many */ - /* - * Are pragma's always processed? - */ - case L_pragma: /* options */ - case L_include: /* are uninteresting */ - case L_define: /* if we */ - case L_undef: /* aren't */ - case L_assert: /* compiling. */ - case L_error: /* BP 5.3.92, #error */ - dump_line: skipnl(); /* Ignore rest of line */ - return counter + 1; - } - } - /* - * Make sure that #line and #pragma are output on a fresh line. - */ - if (counter > 0 && (hash == L_line || hash == L_pragma)) - { - PUTCHAR('\n'); - counter--; - } - - switch (hash) - { - case L_line: - /* - * Parse the line to update the line number and "progname" - * field and line number for the next input line. - * Set wrongline to force it out later. - */ - c = skipws(); - workp = work; /* Save name in work */ - while (c != '\n' && c != EOF_CHAR) - { - save(c); - c = get(); - } - unget(); - save(EOS); - /* - * Split #line argument into and - * We subtract 1 as we want the number of the next line. - */ - line = atoi(work) - 1; /* Reset line number */ - for (tp = work; isdigit((unsigned char)*tp) || type[(int)*tp] == SPA; tp++) - ; /* Skip over digits */ - if (*tp != EOS) /* Got a filename, so: */ - { - if (*tp == '"' && (ep = strrchr(tp + 1, '"')) != NULL) - { - tp++; /* Skip over left quote */ - *ep = EOS; /* And ignore right one */ - } - if (infile->progname != NULL) /* Give up the old name */ - free(infile->progname); /* if it's allocated. */ - infile->progname = savestring(tp); - } - wrongline = TRUE; /* Force output later */ - break; - - case L_include: - doinclude(); - break; - - case L_define: - dodefine(); - break; - - case L_undef: - doundef(); - break; - - case L_else: - if (ifptr == &ifstack[0]) - goto nest_err; - else if ((*ifptr & ELSE_SEEN) != 0) - goto else_seen_err; - *ifptr |= ELSE_SEEN; - if ((*ifptr & WAS_COMPILING) != 0) - { - if (compiling || (*ifptr & TRUE_SEEN) != 0) - compiling = FALSE; - else - { - compiling = TRUE; - } - } - break; - - case L_elif: - if (ifptr == &ifstack[0]) - goto nest_err; - else if ((*ifptr & ELSE_SEEN) != 0) - { - else_seen_err: cerror("#%s may not follow #else", token); - goto dump_line; - } - if ((*ifptr & (WAS_COMPILING | TRUE_SEEN)) != WAS_COMPILING) - { - compiling = FALSE; /* Done compiling stuff */ - goto dump_line; /* Skip this clause */ - } - doif(L_if); - break; - - case L_if: - case L_ifdef: - case L_ifndef: - if (++ifptr >= &ifstack[BLK_NEST]) - if_nest_err: cfatal("Too many nested #%s statements", token); - *ifptr = WAS_COMPILING; - doif(hash); - break; - - case L_endif: - if (ifptr == &ifstack[0]) - { - nest_err: cerror("#%s must be in an #if", token); - goto dump_line; - } - if (!compiling && (*ifptr & WAS_COMPILING) != 0) - wrongline = TRUE; - compiling = ((*ifptr & WAS_COMPILING) != 0); - --ifptr; - break; - - case L_assert: - if (eval() == 0) - cerror("Preprocessor assertion failure", NULLST); - break; - - case L_pragma: - /* - * #pragma is provided to pass "options" to later - * passes of the compiler. cpp doesn't have any yet. - */ - fprintf( pCppOut, "#pragma "); - while ((c = get()) != '\n' && c != EOF_CHAR) - cput(c); - unget(); - break; - -#if OSL_DEBUG_LEVEL > 1 - case L_debug: - if (debug == 0) - dumpdef("debug set on"); - debug++; - break; - - case L_nodebug: - debug--; - break; -#endif - case L_error: /* BP 5.3.92, #error */ - fprintf( pCppOut, "cpp: line %d, Error directive: ", line ); - while ((c = get()) != '\n' && c != EOF_CHAR) - cput(c); - fprintf( pCppOut, "\n" ); - exit( 1 ); - - default: - /* - * Undefined #control keyword. - * Note: the correct behavior may be to warn and - * pass the line to a subsequent compiler pass. - * This would allow #asm or similar extensions. - */ - cerror("Illegal # command \"%s\"", token); - break; - } - if (hash != L_include) - { - if (skipws() != '\n') - { - cwarn("Unexpected text in #control line ignored", NULLST); - skipnl(); - } - } - return counter + 1; -} - -/* - * Process an #if, #ifdef, or #ifndef. The latter two are straightforward, - * while #if needs a subroutine of its own to evaluate the expression. - * - * doif() is called only if compiling is TRUE. If false, compilation - * is always suppressed, so we don't need to evaluate anything. This - * suppresses unnecessary warnings. - */ -static void doif(int hash) -{ - int c; - int found; - - if ((c = skipws()) == '\n' || c == EOF_CHAR) - { - unget(); - goto badif; - } - if (hash == L_if) - { - unget(); - found = (eval() != 0); /* Evaluate expr, != 0 is TRUE */ - hash = L_ifdef; /* #if is now like #ifdef */ - } - else - { - if (type[c] != LET) /* Next non-blank isn't letter */ - goto badif; /* ... is an error */ - found = (lookid(c) != NULL); /* Look for it in symbol table */ - } - if (found == (hash == L_ifdef)) - { - compiling = TRUE; - *ifptr |= TRUE_SEEN; - } - else - { - compiling = FALSE; - } - return; - - badif: cerror("#if, #ifdef, or #ifndef without an argument", NULLST); - skipnl(); /* Prevent an extra */ - unget(); /* Error message */ - return; -} - -/* - * Process the #include control line. - * There are three variations: - * #include "file" search somewhere relative to the - * current source file, if not found, - * treat as #include . - * #include Search in an implementation-dependent - * list of places. - * #include token Expand the token, it must be one of - * "file" or , process as such. - * - * Note: the November 12 draft forbids '>' in the #include format. - * This restriction is unnecessary and not implemented. - */ -static void doinclude() -{ - int c; - int delim; - - delim = macroid(skipws()); - if (delim != '<' && delim != '"') - goto incerr; - if (delim == '<') - delim = '>'; - workp = work; - instring = TRUE; /* Accept all characters */ -#ifdef CONTROL_COMMENTS_NOT_ALLOWED - while ((c = get()) != '\n' && c != EOF_CHAR) - save(c); /* Put it away. */ - unget(); /* Force nl after include */ - /* - * The draft is unclear if the following should be done. - */ - while (--workp >= work && *workp == ' ') - ; /* Trim blanks from filename */ - if (*workp != delim) - goto incerr; -#else - while ((c = get()) != delim && c != EOF_CHAR) - save(c); -#endif - *workp = EOS; /* Terminate filename */ - instring = FALSE; - if (openinclude(work, (delim == '"'))) - return; - /* - * No sense continuing if #include file isn't there. - */ - cfatal("Cannot open include file \"%s\"", work); - - incerr: cerror("#include syntax error", NULLST); - return; -} - -/* - * Actually open an include file. This routine is only called from - * doinclude() above, but was written as a separate subroutine for - * programmer convenience. It searches the list of directories - * and actually opens the file, linking it into the list of - * active files. Returns TRUE if the file was opened, FALSE - * if openinclude() fails. No error message is printed. - */ -static int openinclude(char* filename, int searchlocal) -{ - char** incptr; - char tmpname[NFWORK]; /* Filename work area */ - - if (searchlocal) - { - /* - * Look in local directory first - */ -#if HOST == SYS_UNIX - /* - * Try to open filename relative to the directory of the current - * source file (as opposed to the current directory). (ARF, SCK). - */ - if (filename[0] != '/' && - hasdirectory(infile->filename, tmpname, NFWORK)) - { - int len = strlen(tmpname); - int len2 = strlen(filename); - if(len + len2 < NFWORK) - { - memcpy(tmpname + len, filename, len2); - tmpname[len + len2] = 0; - } - else - { - cfatal("Filename work buffer overflow", NULLST); - } - } - else - { - int len = strlen(filename); - if(len < NFWORK) - { - memcpy(tmpname, filename, len); - tmpname[len] = 0; - } - else - { - cfatal("Filename work buffer overflow", NULLST); - } - } -#else - if (!hasdirectory(filename, tmpname, NFWORK) && - hasdirectory(infile->filename, tmpname, NFWORK)) - { - strcat(tmpname, filename); - } - else - { - strcpy(tmpname, filename); - } -#endif - if (openfile(tmpname)) - return TRUE; - } - /* - * Look in any directories specified by -I command line - * arguments, then in the builtin search list. - */ - for (incptr = incdir; incptr < incend; incptr++) - { - if (strlen(*incptr) + strlen(filename) >= (NFWORK - 1)) - cfatal("Filename work buffer overflow", NULLST); - else - { -#if HOST == SYS_UNIX - if (filename[0] == '/') - strcpy(tmpname, filename); - else - sprintf(tmpname, "%s/%s", *incptr, filename); - -#elif HOST == SYS_UNKNOWN - if (filename[0] == '\\') - strcpy(tmpname, filename); - else - sprintf(tmpname, "%s\\%s", *incptr, filename); -#else - if (!hasdirectory(filename, tmpname, NFWORK)) - sprintf(tmpname, "%s%s", *incptr, filename); -#endif - if (openfile(tmpname)) - return TRUE; - } - } - return FALSE; -} - -/* - * If a device or directory is found in the source filename string, the - * node/device/directory part of the string is copied to result and - * hasdirectory returns TRUE. Else, nothing is copied and it returns FALSE. - */ -static int hasdirectory(char* source, char* result, int max) -{ -#if HOST == SYS_UNIX - char* tp; - - if ((tp = strrchr(source, '/')) == NULL) - return FALSE; - else - { - int len = (int)(tp - source); - if(len < max) - { - memcpy(result, source, len); - result[len] = 0; - } - else - { - cfatal("Filename work buffer overflow", NULLST); - } - return TRUE; - } -#else - /* - * Random DEC operating system (RSTS/E) - */ - char* tp; - - (void)max; - - if ((tp = strrchr(source, ']')) == NULL && - (tp = strrchr(source, ':')) == NULL) - { - return FALSE; - } - else - { - strncpy(result, source, tp - source + 1); - result[tp - source + 1] = EOS; - return TRUE; - } -#endif -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/rscpp/cpp3.c b/rsc/source/rscpp/cpp3.c deleted file mode 100644 index c26ef0b665b4..000000000000 --- a/rsc/source/rscpp/cpp3.c +++ /dev/null @@ -1,428 +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 -#ifdef UNX -#include -#endif -#include -#include "cppdef.h" -#include "cpp.h" - -#include "time.h" /* BP */ - -#include - -#if (OSL_DEBUG_LEVEL > 1) && (HOST == SYS_UNIX) -#include -#endif - -/* - * Open a file, add it to the linked list of open files. - * This is called only from openfile() above. - */ -int openfile(char* filename) -{ - FILE* fp; - - if ((fp = fopen(filename, "r")) == NULL) - { -#if OSL_DEBUG_LEVEL > 1 - if ( debug || !bDumpDefs ) - perror(filename); -#endif - return (FALSE); - } -#if OSL_DEBUG_LEVEL > 1 - if (debug) - fprintf(stderr, "Reading from \"%s\"\n", filename); -#endif - addfile(fp, filename); - return (TRUE); -} - -/* - * Initialize tables for this open file. This is called from openfile() - * above (for #include files), and from the entry to cpp to open the main - * input file. It calls a common routine, getfile() to build the FILEINFO - * structure which is used to read characters. (getfile() is also called - * to setup a macro replacement.) - */ -void addfile(FILE* fp, char* filename) -{ - FILEINFO* file; - - file = getfile(NBUFF, filename); - file->fp = fp; /* Better remember FILE * */ - file->buffer[0] = EOS; /* Initialize for first read */ - line = 1; /* Working on line 1 now */ - wrongline = TRUE; /* Force out initial #line */ -} - -/* - * Append system-specific directories to the include directory list. - * Called only when cpp is started. - */ -void setincdirs() -{ - -#ifdef CPP_INCLUDE - *incend++ = CPP_INCLUDE; -#define IS_INCLUDE 1 -#else -#define IS_INCLUDE 0 -#endif - -#if HOST == SYS_UNIX - *incend++ = "/usr/include"; -#define MAXINCLUDE (NINCLUDE - 1 - IS_INCLUDE) -#endif - - -#if HOST == SYS_UNKNOWN -/* - * Context: GenMake - * Under DOS also the environment variable INCLUDE is used. - * To make it difficult all entries separated by ';' have to be - * included in the list and this is done with strtok(). - * Be careful using malloc() !!! - * In savestring() as a matter of fact getmem() is used and probably these - * two functions are getting in the way of each other. - * When I used malloc() instead of savestring() an error occurred in strcpy(). - */ - -#if !defined(_WIN32) && !defined(UNX) - extern char* getenv( char *pStr ); /* BP */ -#endif - char* pIncGetEnv = NULL; /* Pointer to INCLUDE */ - - if ( ( pIncGetEnv = getenv("INCLUDE") ) != NULL ) - AddInclude( pIncGetEnv ); - -#define MAXINCLUDE (NINCLUDE - 3 - IS_INCLUDE) -#endif - -} - - -/* Context: Extension of the INCLUDE service - * So far the cpp couldn't use include statements in the command line - * where the directories are separated with ';'. - * This totally understandable because this cpp is fitted to UNIX - * systems and under UNIX ';' is used to terminate commandos. - */ - -int AddInclude( char* pIncStr ) -{ - char* pIncEnv = NULL; /* copy of INCLUDE */ - char* pIncPos; /* goes to the next */ - - pIncEnv = savestring( pIncStr ); - pIncPos = strtok( pIncEnv, ";" ); - - while( pIncPos != NULL ) - { - if (incend >= &incdir[MAXINCLUDE]) - cfatal("Too many include directories", NULLST); - *incend++ = pIncPos; - pIncPos = strtok( NULL, ";" ); - } - /* coverity[leaked_storage] - we know this leaks, but it doesn't matter in this short lived utility */ - return 1; -} - -/* - * dooptions is called to process command line arguments (-Detc). - * It is called only at cpp startup. - */ -int dooptions(int argc, char** argv) -{ - char* ap; - DEFBUF* dp; - int c; - int i, j; - char* arg; - SIZES* sizp; /* For -S */ - int size; /* For -S */ - int isdatum; /* FALSE for -S* */ - int endtest; /* For -S */ - - for (i = j = 1; i < argc; i++) - { - arg = ap = argv[i]; - - if (*ap++ != '-' || *ap == EOS) - { - argv[j++] = argv[i]; - } - else - { - c = *ap++; /* Option byte */ - if (islower((unsigned char)c)) /* Normalize case */ - c = toupper(c); - switch (c) /* Command character */ - { - case 'C': /* Keep comments */ - cflag = TRUE; - keepcomments = TRUE; - break; - - case 'D': /* Define symbol */ - /* - * If the option is just "-Dfoo", make it -Dfoo=1 - */ - while (*ap != EOS && *ap != '=') - ap++; - if (*ap == EOS) - ap = "1"; - else - *ap++ = EOS; - /* - * Now, save the word and its definition. - */ - dp = defendel(argv[i] + 2, FALSE); - dp->repl = savestring(ap); - dp->nargs = DEF_NOARGS; - break; - - case 'E': /* Ignore non-fatal */ - eflag = TRUE; /* errors. */ - break; - - case 'I': /* Include directory */ - AddInclude( ap ); /* BP, 11.09.91 */ - break; - - case 'N': /* No predefined */ - nflag++; /* Repeat to undefine */ - break; /* __LINE__, etc. */ - - case 'S': - sizp = size_table; - if (0 != (isdatum = (*ap != '*'))) /* If it's just -S, */ - endtest = T_FPTR; /* Stop here */ - else /* But if it's -S* */ - { - ap++; /* Step over '*' */ - endtest = 0; /* Stop at end marker */ - } - while (sizp->bits != endtest && *ap != EOS) - { - if (!isdigit((unsigned char)*ap)) /* Skip to next digit */ - { - ap++; - continue; - } - size = 0; /* Compile the value */ - while (isdigit((unsigned char)*ap)) - { - size *= 10; - size += (*ap++ - '0'); - } - if (isdatum) - sizp->size = size; /* Datum size */ - else - sizp->psize = size; /* Pointer size */ - sizp++; - } - if (sizp->bits != endtest) - cwarn("-S, too few values specified in %s", argv[i]); - else if (*ap != EOS) - cwarn("-S, too many values, \"%s\" unused", ap); - break; - - case 'U': /* Undefine symbol */ - if (defendel(ap, TRUE) == NULL) - cwarn("\"%s\" wasn't defined", ap); - break; - -#if OSL_DEBUG_LEVEL > 1 - case 'X': /* Debug */ - debug = (isdigit((unsigned char)*ap)) ? atoi(ap) : 1; -#if (HOST == SYS_UNIX) - signal(SIGINT, (void (*)(int)) abort); /* Trap "interrupt" */ -#endif - fprintf(stderr, "Debug set to %d\n", debug); - break; -#endif - -#if OSL_DEBUG_LEVEL > 1 - case 'P': /* #define's dump */ - bDumpDefs = 1; - fprintf(stderr, "Dump #define's is on\n"); - break; -#endif - - default: /* What is this one? */ - cwarn("Unknown option \"%s\"", arg); - fprintf(stderr, "The following options are valid:\n\ - -C\t\t\tWrite source file comments to output\n\ - -Dsymbol=value\tDefine a symbol with the given (optional) value\n\ - -Idirectory\t\tAdd a directory to the #include search list\n\ - -N\t\t\tDon't predefine target-specific names\n\ - -Stext\t\tSpecify sizes for #if sizeof\n\ - -Usymbol\t\tUndefine symbol\n"); -#if OSL_DEBUG_LEVEL > 1 - fprintf(stderr, " -Xvalue\t\tSet internal debug flag\n"); - fprintf(stderr, " -P\t\t\tdump #define's\n"); -#endif - break; - } /* Switch on all options */ - } /* If it's a -option */ - } /* For all arguments */ -#if OSL_DEBUG_LEVEL > 1 - if ( (bDumpDefs ? j > 4 : j > 3) ) -#else - if (j > 3) -#endif - { - cerror( "Too many file arguments. Usage: cpp [input [output]]", - NULLST); - } - return j; /* Return new argc */ -} - -int readoptions(char* filename, char*** pfargv) -{ - FILE* fp; - int c; - int bInQuotes = 0; - char optbuff[1024]; - char* poptbuff; - int fargc=0; - int back; - char* fargv[PARALIMIT]; - char** pfa; - - pfa = *pfargv = malloc(sizeof(fargv)); - - poptbuff = &optbuff[0]; - filename++; - if ((fp = fopen(filename, "r")) == NULL) - { -#if OSL_DEBUG_LEVEL > 1 - if ( debug || !bDumpDefs ) - perror(filename); -#endif - return (FALSE); - } - do - { - /* - * #i27914# double ticks '"' now have a duplicate function: - * 1. they define a string ( e.g. -DFOO="baz" ) - * 2. a string can contain spaces, so -DFOO="baz zum" defines one - * argument no two ! - */ - c = fgetc(fp); - if ( c != ' ' && c != CR && c != NL && c != HT && c != EOF) - { - *poptbuff++ = (char)c; - if( c == '"' ) - bInQuotes = ~bInQuotes; - } - else - { - if( c != EOF && bInQuotes ) - *poptbuff++ = (char)c; - else - { - *poptbuff = EOS; - if (optbuff[0] != '\0') - { - pfa[fargc + 1] = strdup(optbuff); - fargc++; - pfa[fargc + 1] = NULL; - poptbuff = &optbuff[0]; - } - } - } - } - while ( c != EOF ); - - fclose(fp); - back=dooptions(fargc+1,pfa); - - return back; -} - -/* - * Initialize the built-in #define's. There are two flavors: - * #define decus 1 (static definitions) - * #define __FILE__ ?? (dynamic, evaluated by magic) - * Called only on cpp startup. - * - * Note: the built-in static definitions are suppressed by the -N option. - * __LINE__, __FILE__, and __DATE__ are always present. - */ -void initdefines() -{ - char** pp; - char* tp; - DEFBUF* dp; - int i; - time_t tvec; - - /* - * Predefine the built-in symbols. Allow the - * implementor to pre-define a symbol as "" to - * eliminate it. - */ - if (nflag == 0) - { - for (pp = preset; *pp != NULL; pp++) - { - if (*pp[0] != EOS) - { - dp = defendel(*pp, FALSE); - dp->repl = savestring("1"); - dp->nargs = DEF_NOARGS; - } - } - } - /* - * The magic pre-defines (__FILE__ and __LINE__ are - * initialized with negative argument counts. expand() - * notices this and calls the appropriate routine. - * DEF_NOARGS is one greater than the first "magic" definition. - */ - if (nflag < 2) - { - for (pp = magic, i = DEF_NOARGS; *pp != NULL; pp++) - { - dp = defendel(*pp, FALSE); - dp->nargs = --i; - } -#if OK_DATE - /* - * Define __DATE__ as today's date. - */ - dp = defendel("__DATE__", FALSE); - dp->repl = tp = getmem(27); - dp->nargs = DEF_NOARGS; - time( &tvec); - *tp++ = '"'; - strcpy(tp, ctime(&tvec)); - tp[24] = '"'; /* Overwrite newline */ -#endif - } -} - - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/rscpp/cpp4.c b/rsc/source/rscpp/cpp4.c deleted file mode 100644 index 6e1811164e62..000000000000 --- a/rsc/source/rscpp/cpp4.c +++ /dev/null @@ -1,630 +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 -#include -#include "cppdef.h" -#include "cpp.h" - -/* - * parm[], parmp, and parlist[] are used to store #define() argument - * lists. nargs contains the actual number of parameters stored. - */ -static char parm[NPARMWORK + 1]; /* define param work buffer */ -static char* parmp; /* Free space in parm */ -static char* parlist[LASTPARM]; /* -> start of each parameter */ -static int nargs; /* Parameters for this macro */ - -static int expcollect( void ); -static void expstuff( DEFBUF* dp ); - -void InitCpp4() -{ - int i; - for( i = 0; i < NPARMWORK; i++ ) - parm[ i ] = 0; - for( i = 0; i < LASTPARM; i++ ) - parlist[ i ] = NULL; - - nargs = 0; -} - - -/* - * Called from control when a #define is scanned. This module - * parses formal parameters and the replacement string. When - * the formal parameter name is encountered in the replacement - * string, it is replaced by a character in the range 128 to - * 128+NPARAM (this allows up to 32 parameters within the - * Dec Multinational range). - * - * There is some special case code to distinguish - * #define foo bar - * from #define foo() bar - * - * Also, we make sure that - * #define foo foo - * expands to "foo" but doesn't put cpp into an infinite loop. - * - * A warning message is printed if you redefine a symbol to a - * different text. I.e, - * #define foo 123 - * #define foo 123 - * is ok, but - * #define foo 123 - * #define foo +123 - * is not. - * - * The following subroutines are called from define(): - * checkparm called when a token is scanned. It checks through the - * array of formal parameters. If a match is found, the - * token is replaced by a control byte which will be used - * to locate the parameter when the macro is expanded. - * textput puts a string in the macro work area (parm[]), updating - * parmp to point to the first free byte in parm[]. - * textput() tests for work buffer overflow. - * charput puts a single character in the macro work area (parm[]) - * in a manner analogous to textput(). - */ -void dodefine() -{ - int c; - DEFBUF* dp; /* -> new definition */ - int isredefine; /* TRUE if redefined */ - char* old = NULL; /* Remember redefined */ - - if (type[(c = skipws())] != LET) - goto bad_define; - isredefine = FALSE; /* Set if redefining */ - if ((dp = lookid(c)) == NULL) /* If not known now */ - dp = defendel(token, FALSE); /* Save the name */ - else /* It's known: */ - { - isredefine = TRUE; /* Remember this fact */ - old = dp->repl; /* Remember replacement */ - dp->repl = NULL; /* No replacement now */ - } - parlist[0] = parmp = parm; /* Setup parm buffer */ - if ((c = get()) == '(') /* With arguments? */ - { - nargs = 0; /* Init formals counter */ - do /* Collect formal parms */ - { - if (nargs >= LASTPARM) - cfatal("Too many arguments for macro", NULLST); - else if ((c = skipws()) == ')') - break; /* Got them all */ - else if (type[c] != LET) /* Bad formal syntax */ - goto bad_define; - scanid(c); /* Get the formal param */ - parlist[nargs++] = parmp; /* Save its start */ - textput(token); /* Save text in parm[] */ - } - while ((c = skipws()) == ','); /* Get another argument */ - if (c != ')') /* Must end at ) */ - goto bad_define; - c = ' '; /* Will skip to body */ - } - else - { - /* - * DEF_NOARGS is needed to distinguish between - * "#define foo" and "#define foo()". - */ - nargs = DEF_NOARGS; /* No () parameters */ - } - if (type[c] == SPA) /* At whitespace? */ - c = skipws(); /* Not any more. */ - workp = work; /* Replacement put here */ - inmacro = TRUE; /* Keep \ now */ - while (c != EOF_CHAR && c != '\n') /* Compile macro body */ - { - if (c == '#') /* Token concatenation? */ - { - while (workp > work && type[(int)workp[-1]] == SPA) - --workp; /* Erase leading spaces */ - save(TOK_SEP); /* Stuff a delimiter */ - c = skipws(); /* Eat whitespace */ - if (type[c] == LET) /* Another token here? */ - ; /* Stuff it normally */ - else if (type[c] == DIG) /* Digit string after? */ - { - while (type[c] == DIG) /* Stuff the digits */ - { - save(c); - c = get(); - } - save(TOK_SEP); /* Delimit 2nd token */ - } - else - { - ciwarn("Strange character after # (%d.)", c); - } - continue; - } - switch (type[c]) - { - case LET: - checkparm(c, dp); /* Might be a formal */ - break; - - case DIG: /* Number in mac. body */ - case DOT: /* Maybe a float number */ - scannumber(c, save); /* Scan it off */ - break; - - case QUO: /* String in mac. body */ - stparmscan(c); - break; - - case BSH: /* Backslash */ - save('\\'); - if ((c = get()) == '\n') - wrongline = TRUE; - save(c); - break; - - case SPA: /* Absorb whitespace */ - /* - * Note: the "end of comment" marker is passed on - * to allow comments to separate tokens. - */ - if (workp[-1] == ' ') /* Absorb multiple */ - break; /* spaces */ - else if (c == '\t') - c = ' '; /* Normalize tabs */ - /* fall through *//* to store character */ - default: /* Other character */ - save(c); - break; - } - c = get(); - } - inmacro = FALSE; /* Stop newline hack */ - unget(); /* For control check */ - if (workp > work && workp[-1] == ' ') /* Drop trailing blank */ - workp--; - *workp = EOS; /* Terminate work */ - dp->repl = savestring(work); /* Save the string */ - dp->nargs = nargs; /* Save arg count */ -#if OSL_DEBUG_LEVEL > 1 - if (debug) - dumpadef("macro definition", dp); - else if (bDumpDefs) - dumpadef(NULL, dp); -#endif - if (isredefine) /* Error if redefined */ - { - if ((old != NULL && dp->repl != NULL && !streq(old, dp->repl)) || - (old == NULL && dp->repl != NULL) || - (old != NULL && dp->repl == NULL)) - { -#ifdef STRICT_UNDEF - cerror("Redefining defined variable \"%s\"", dp->name); -#else - cwarn("Redefining defined variable \"%s\"", dp->name); -#endif - } - if (old != NULL) /* We don't need the */ - free(old); /* old definition now. */ - } - return; - - bad_define: - cerror("#define syntax error", NULLST); - inmacro = FALSE; /* Stop hack */ -} - -/* - * Replace this param if it's defined. Note that the macro name is a - * possible replacement token. We stuff DEF_MAGIC in front of the token - * which is treated as a LETTER by the token scanner and eaten by - * the output routine. This prevents the macro expander from - * looping if someone writes "#define foo foo". - */ -void checkparm(int c, DEFBUF* dp) -{ - int i; - char* cp; - - scanid(c); /* Get parm to token[] */ - for (i = 0; i < nargs; i++) /* For each argument */ - { - if (streq(parlist[i], token)) /* If it's known */ - { -#ifdef SOLAR - save(DEL); -#endif - save(i + MAC_PARM); /* Save a magic cookie */ - return; /* And exit the search */ - } - } - if (streq(dp->name, token)) /* Macro name in body? */ - save(DEF_MAGIC); /* Save magic marker */ - for (cp = token; *cp != EOS;) /* And save */ - save(*cp++); /* The token itself */ -} - -/* - * Normal string parameter scan. - */ -void stparmscan(int delim) -{ - char* wp; - int i; - - wp = workp; /* Here's where it starts */ - if (!scanstring(delim, save)) - return; /* Exit on scanstring error */ - workp[-1] = EOS; /* Erase trailing quote */ - wp++; /* -> first string content byte */ - for (i = 0; i < nargs; i++) - { - if (streq(parlist[i], wp)) - { -#ifdef SOLAR - *wp++ = DEL; -#if defined __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wconstant-conversion" -#endif - *wp++ = MAC_PARM + PAR_MAC; /* Stuff a magic marker */ -#if defined __clang__ -#pragma clang diagnostic pop -#endif - *wp++ = (char)(i + MAC_PARM); /* Make a formal marker */ - *wp = wp[-4]; /* Add on closing quote */ - workp = wp + 1; /* Reset string end */ -#else - *wp++ = MAC_PARM + PAR_MAC; /* Stuff a magic marker */ - *wp++ = (i + MAC_PARM); /* Make a formal marker */ - *wp = wp[-3]; /* Add on closing quote */ - workp = wp + 1; /* Reset string end */ -#endif - return; - } - } - workp[-1] = wp[-1]; /* Nope, reset end quote. */ -} - -/* - * Remove the symbol from the defined list. - * Called from the #control processor. - */ -void doundef() -{ - int c; - - if (type[(c = skipws())] != LET) - cerror("Illegal #undef argument", NULLST); - else - { - scanid(c); /* Get name to token[] */ - if (defendel(token, TRUE) == NULL) - { -#ifdef STRICT_UNDEF - cwarn("Symbol \"%s\" not defined in #undef", token); -#endif - } - } -} - -/* - * Put the string in the parm[] buffer. - */ -void textput(char* text) -{ - size_t size; - - size = strlen(text) + 1; - if ((parmp + size) >= &parm[NPARMWORK]) - cfatal("Macro work area overflow", NULLST); - else - { - strcpy(parmp, text); - parmp += size; - } -} - -/* - * Put the byte in the parm[] buffer. - */ -void charput(int c) -{ - if (parmp >= &parm[NPARMWORK]) - cfatal("Macro work area overflow", NULLST); - else - { - *parmp++ = (char)c; - } -} - -/* - * M a c r o E x p a n s i o n - */ - -static DEFBUF* macro; /* Catches start of infinite macro */ - -/* - * Expand a macro. Called from the cpp mainline routine (via subroutine - * macroid()) when a token is found in the symbol table. It calls - * expcollect() to parse actual parameters, checking for the correct number. - * It then creates a "file" containing a single line containing the - * macro with actual parameters inserted appropriately. This is - * "pushed back" onto the input stream. (When the get() routine runs - * off the end of the macro line, it will dismiss the macro itself.) - */ -void expand(DEFBUF* tokenp) -{ - int c; - FILEINFO* file; - -#if OSL_DEBUG_LEVEL > 1 - if (debug) - dumpadef("expand entry", tokenp); -#endif - /* - * If no macro is pending, save the name of this macro - * for an eventual error message. - */ - if (recursion++ == 0) - macro = tokenp; - else if (recursion == RECURSION_LIMIT) - { - cerror("Recursive macro definition of \"%s\"", tokenp->name); - fprintf(stderr, "(Defined by \"%s\")\n", macro->name); - if (rec_recover) - { - do - { - c = get(); - } - while (infile != NULL && infile->fp == NULL); - unget(); - recursion = 0; - return; - } - } - /* - * Here's a macro to expand. - */ - nargs = 0; /* Formals counter */ - parmp = parm; /* Setup parm buffer */ - switch (tokenp->nargs) - { - case (-2): /* __LINE__ */ - sprintf(work, "%d", line); - ungetstring(work); - break; - - case (-3): /* __FILE__ */ - for (file = infile; file != NULL; file = file->parent) - { - if (file->fp != NULL) - { - sprintf(work, "\"%s\"", (file->progname != NULL) - ? file->progname : file->filename); - ungetstring(work); - break; - } - } - break; - - default: - /* - * Nothing funny about this macro. - */ - if (tokenp->nargs < 0) - cfatal("Bug: Illegal __ macro \"%s\"", tokenp->name); - while ((c = skipws()) == '\n') /* Look for (, skipping */ - wrongline = TRUE; /* spaces and newlines */ - if (c != '(') - { - /* - * If the programmer writes - * #define foo() ... - * ... - * foo [no ()] - * just write foo to the output stream. - */ - unget(); - cwarn("Macro \"%s\" needs arguments", tokenp->name); - fputs(tokenp->name, pCppOut ); - return; - } - else if (expcollect()) /* Collect arguments */ - { - if (tokenp->nargs != nargs) /* Should be an error? */ - { - cwarn("Wrong number of macro arguments for \"%s\"", - tokenp->name); - } -#if OSL_DEBUG_LEVEL > 1 - if (debug) - dumpparm("expand"); -#endif - } /* Collect arguments */ - /* fall through */ - case DEF_NOARGS: /* No parameters just stuffs */ - expstuff(tokenp); /* Do actual parameters */ - } /* nargs switch */ -} - -/* - * Collect the actual parameters for this macro. TRUE if ok. - */ -static int expcollect() -{ - int c; - int paren; /* For embedded ()'s */ - for (;;) - { - paren = 0; /* Collect next arg. */ - while ((c = skipws()) == '\n') /* Skip over whitespace */ - wrongline = TRUE; /* and newlines. */ - if (c == ')') /* At end of all args? */ - { - /* - * Note that there is a guard byte in parm[] - * so we don't have to check for overflow here. - */ - *parmp = EOS; /* Make sure terminated */ - break; /* Exit collection loop */ - } - else if (nargs >= LASTPARM) - cfatal("Too many arguments in macro expansion", NULLST); - parlist[nargs++] = parmp; /* At start of new arg */ - for (;; c = cget()) /* Collect arg's bytes */ - { - if (c == EOF_CHAR) - { - cerror("end of file within macro argument", NULLST); - return FALSE; /* Sorry. */ - } - else if (c == '\\') /* Quote next character */ - { - charput(c); /* Save the \ for later */ - charput(cget()); /* Save the next char. */ - continue; /* And go get another */ - } - else if (type[c] == QUO) /* Start of string? */ - { - scanstring(c, charput); /* Scan it off */ - continue; /* Go get next char */ - } - else if (c == '(') /* Worry about balance */ - paren++; /* To know about commas */ - else if (c == ')') /* Other side too */ - { - if (paren == 0) /* At the end? */ - { - unget(); /* Look at it later */ - break; /* Exit arg getter. */ - } - paren--; /* More to come. */ - } - else if (c == ',' && paren == 0) /* Comma delimits args */ - break; - else if (c == '\n') /* Newline inside arg? */ - wrongline = TRUE; /* We'll need a #line */ - charput(c); /* Store this one */ - } /* Collect an argument */ - charput(EOS); /* Terminate argument */ -#if OSL_DEBUG_LEVEL > 1 - if (debug) - fprintf( pCppOut, "parm[%d] = \"%s\"\n", nargs, parlist[nargs - 1]); -#endif - } /* Collect all args. */ - return TRUE; /* Normal return */ -} - -/* - * Stuff the macro body, replacing formal parameters by actual parameters. - */ -static void expstuff(DEFBUF* tokenp) -{ - int c; /* Current character */ - char* inp; /* -> repl string */ - char* defp; /* -> macro output buff */ - size_t size; /* Actual parm. size */ - char* defend; /* -> output buff end */ - int string_magic; /* String formal hack */ - FILEINFO* file; /* Funny #include */ - - file = getfile(NBUFF, tokenp->name); - inp = tokenp->repl; /* -> macro replacement */ - defp = file->buffer; /* -> output buffer */ - defend = defp + (NBUFF - 1); /* Note its end */ - if (inp != NULL) - { - while ((c = (*inp++ & 0xFF)) != EOS) - { -#ifdef SOLAR - if (c == DEL) - { - c = (*inp++ & 0xFF); -#else - if (c >= MAC_PARM && c <= (MAC_PARM + PAR_MAC)) - { -#endif - string_magic = (c == (MAC_PARM + PAR_MAC)); - if (string_magic) - c = (*inp++ & 0xFF); - /* - * Replace formal parameter by actual parameter string. - */ - if ((c -= MAC_PARM) < nargs) - { - size = strlen(parlist[c]); - if ((defp + size) >= defend) - goto nospace; - /* - * Erase the extra set of quotes. - */ - if (string_magic && defp[-1] == parlist[c][0]) - { - strcpy(defp-1, parlist[c]); - defp += (size - 2); - } - else - { - strcpy(defp, parlist[c]); - defp += size; - } - } - } - else if (defp >= defend) - { - nospace: - cfatal("Out of space in macro \"%s\" arg expansion", - tokenp->name); - } - else - { - *defp++ = (char)c; - } - } - } - *defp = EOS; -#if OSL_DEBUG_LEVEL > 1 - if (debug > 1) - fprintf( pCppOut, "macroline: \"%s\"\n", file->buffer); -#endif - } - -#if OSL_DEBUG_LEVEL > 1 - - /* - * Dump parameter list. - */ - void dumpparm(char* why) - { - int i; - - fprintf( pCppOut, "dump of %d parameters (%" SAL_PRI_SIZET "u bytes total) %s\n", - nargs, parmp - parm, why); - for (i = 0; i < nargs; i++) - { - fprintf( pCppOut, "parm[%d] (%d) = \"%s\"\n", - i + 1, (int)strlen(parlist[i]), parlist[i]); - } - } -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/rscpp/cpp5.c b/rsc/source/rscpp/cpp5.c deleted file mode 100644 index e64a3e01327d..000000000000 --- a/rsc/source/rscpp/cpp5.c +++ /dev/null @@ -1,949 +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 -#include -#include "cppdef.h" -#include "cpp.h" - -static int evallex(int skip); -static int dosizeof(void); -static int bittest(int value); -static int evalnum(int c); -static int evalchar(int skip); -static int *evaleval(int* valp, int op, int skip); - -/* - * Evaluate an #if expression. - */ - -static char* opname[] = { /* For debug and error messages */ -"end of expression", "val", "id", - "+", "-", "*", "/", "%", - "<<", ">>", "&", "|", "^", - "==", "!=", "<", "<=", ">=", ">", - "&&", "||", "?", ":", ",", - "unary +", "unary -", "~", "!", "(", ")", "(none)", -}; - -/* - * opdope[] has the operator precedence: - * Bits - * 7 Unused (so the value is always positive) - * 6-2 Precedence (000x .. 017x) - * 1-0 Binary op. flags: - * 01 The binop flag should be set/cleared when this op is seen. - * 10 The new value of the binop flag. - * Note: Expected, New binop - * constant 0 1 Binop, end, or ) should follow constants - * End of line 1 0 End may not be preceded by an operator - * binary 1 0 Binary op follows a value, value follows. - * unary 0 0 Unary op doesn't follow a value, value follows - * ( 0 0 Doesn't follow value, value or unop follows - * ) 1 1 Follows value. Op follows. - */ - -static char opdope[OP_MAX] = { - 0001, /* End of expression */ - 0002, /* Digit */ - 0000, /* Letter (identifier) */ - 0141, 0141, 0151, 0151, 0151, /* ADD, SUB, MUL, DIV, MOD */ - 0131, 0131, 0101, 0071, 0071, /* ASL, ASR, AND, OR, XOR */ - 0111, 0111, 0121, 0121, 0121, 0121, /* EQ, NE, LT, LE, GE, GT */ - 0061, 0051, 0041, 0041, 0031, /* ANA, ORO, QUE, COL, CMA */ -/* - * Unary op's follow - */ - 0160, 0160, 0160, 0160, /* NEG, PLU, COM, NOT */ - 0170, 0013, 0023, /* LPA, RPA, END */ -}; -/* - * OP_QUE and OP_RPA have alternate precedences: - */ -#define OP_RPA_PREC 0013 -#define OP_QUE_PREC 0034 - -/* - * S_ANDOR and S_QUEST signal "short-circuit" boolean evaluation, so that - * #if FOO != 0 && 10 / FOO ... - * doesn't generate an error message. They are stored in optab.skip. - */ -#define S_ANDOR 2 -#define S_QUEST 1 - -typedef struct optab -{ - char op; /* Operator */ - char prec; /* Its precedence */ - char skip; /* Short-circuit: TRUE to skip */ -} OPTAB; -static int evalue; /* Current value from evallex() */ - -#define isbinary(op) (op >= FIRST_BINOP && op <= LAST_BINOP) - -/* - * The following definitions are used to specify basic variable sizes. - */ - -#ifndef S_CHAR -#define S_CHAR (sizeof (char)) -#endif -#ifndef S_SINT -#define S_SINT (sizeof (short int)) -#endif -#ifndef S_INT -#define S_INT (sizeof (int)) -#endif -#ifndef S_LINT -#define S_LINT (sizeof (long int)) -#endif -#ifndef S_FLOAT -#define S_FLOAT (sizeof (float)) -#endif -#ifndef S_DOUBLE -#define S_DOUBLE (sizeof (double)) -#endif -#ifndef S_PCHAR -#define S_PCHAR (sizeof (char *)) -#endif -#ifndef S_PSINT -#define S_PSINT (sizeof (short int *)) -#endif -#ifndef S_PINT -#define S_PINT (sizeof (int *)) -#endif -#ifndef S_PLINT -#define S_PLINT (sizeof (long int *)) -#endif -#ifndef S_PFLOAT -#define S_PFLOAT (sizeof (float *)) -#endif -#ifndef S_PDOUBLE -#define S_PDOUBLE (sizeof (double *)) -#endif -#ifndef S_PFPTR -#define S_PFPTR (sizeof (int (*)(void))) -#endif - -typedef struct types -{ - short type; /* This is the bit if */ - char *name; /* this is the token word */ -} TYPES; - -static TYPES basic_types[] = { - { T_CHAR, "char", }, - { T_INT, "int", }, - { T_FLOAT, "float", }, - { T_DOUBLE, "double", }, - { T_SHORT, "short", }, - { T_LONG, "long", }, - { T_SIGNED, "signed", }, - { T_UNSIGNED, "unsigned", }, - { 0, NULL, }, /* Signal end */ -}; - -/* - * Test_table[] is used to test for illegal combinations. - */ -static short test_table[] = { - T_FLOAT | T_DOUBLE | T_LONG | T_SHORT, - T_FLOAT | T_DOUBLE | T_CHAR | T_INT, - T_FLOAT | T_DOUBLE | T_SIGNED | T_UNSIGNED, - T_LONG | T_SHORT | T_CHAR, - 0 /* end marker */ -}; - -/* - * The order of this table is important -- it is also referenced by - * the command line processor to allow run-time overriding of the - * built-in size values. The order must not be changed: - * char, short, int, long, float, double (func pointer) - */ -SIZES size_table[] = { - { T_CHAR, S_CHAR, S_PCHAR }, /* char */ - { T_SHORT, S_SINT, S_PSINT }, /* short int */ - { T_INT, S_INT, S_PINT }, /* int */ - { T_LONG, S_LINT, S_PLINT }, /* long */ - { T_FLOAT, S_FLOAT, S_PFLOAT }, /* float */ - { T_DOUBLE, S_DOUBLE, S_PDOUBLE }, /* double */ - { T_FPTR, 0, S_PFPTR }, /* int (*()) */ - { 0, 0, 0 }, /* End of table */ -}; - -/* - * Evaluate an expression. Straight-forward operator precedence. - * This is called from control() on encountering an #if statement. - * It calls the following routines: - * evallex Lexical analyser -- returns the type and value of - * the next input token. - * evaleval Evaluate the current operator, given the values on - * the value stack. Returns a pointer to the (new) - * value stack. - * For compatibility with older cpp's, this return returns 1 (TRUE) - * if a syntax error is detected. - */ -int eval() -{ - int op; /* Current operator */ - int* valp; /* -> value vector */ - OPTAB* opp; /* Operator stack */ - int prec; /* Op precedence */ - int binop; /* Set if binary op. needed */ - int op1; /* Operand from stack */ - int skip; /* For short-circuit testing */ - int value[NEXP]; /* Value stack */ - OPTAB opstack[NEXP]; /* Operand stack */ - - valp = value; - opp = opstack; - opp->op = OP_END; /* Mark bottom of stack */ - opp->prec = opdope[OP_END]; /* And its precedence */ - opp->skip = 0; /* Not skipping now */ - binop = 0; - -again: -#ifdef DEBUG_EVAL - fprintf( pCppOut, "In #if at again: skip = %d, binop = %d, line is: %s", - opp->skip, binop, infile->bptr); -#endif - if ((op = evallex(opp->skip)) == OP_SUB && binop == 0) - op = OP_NEG; /* Unary minus */ - else if (op == OP_ADD && binop == 0) - op = OP_PLU; /* Unary plus */ - else if (op == OP_FAIL) - return 1; /* Error in evallex */ -#ifdef DEBUG_EVAL - fprintf( pCppOut, "op = %s, opdope = %03o, binop = %d, skip = %d\n", - opname[op], opdope[op], binop, opp->skip); -#endif - if (op == DIG) /* Value? */ - { - if (binop != 0) - { - cerror("misplaced constant in #if", NULLST); - return 1; - } - else if (valp >= &value[NEXP-1]) - { - cerror("#if value stack overflow", NULLST); - return 1; - } - else - { -#ifdef DEBUG_EVAL - fprintf( pCppOut, "pushing %d onto value stack[%td]\n", - evalue, valp - value); -#endif - *valp++ = evalue; - binop = 1; - } - goto again; - } - else if (op > OP_END) - { - cerror("Illegal #if line", NULLST); - return 1; - } - prec = opdope[op]; - if (binop != (prec & 1)) - { - cerror("Operator %s in incorrect context", opname[op]); - return 1; - } - binop = (prec & 2) >> 1; - for (;;) - { -#ifdef DEBUG_EVAL - fprintf( pCppOut, "op %s, prec %d., stacked op %s, prec %d, skip %d\n", - opname[op], prec, opname[opp->op], opp->prec, opp->skip); -#endif - if (prec > opp->prec) - { - if (op == OP_LPA) - prec = OP_RPA_PREC; - else if (op == OP_QUE) - prec = OP_QUE_PREC; - op1 = opp->skip; /* Save skip for test */ - /* - * Push operator onto op. stack. - */ - opp++; - if (opp >= &opstack[NEXP]) - { - cerror("expression stack overflow at op \"%s\"", - opname[op]); - return 1; - } - opp->op = (char)op; - opp->prec = (char)prec; - /* - * Do the short-circuit stuff here. Short-circuiting - * stops automagically when operators are evaluated. - */ - if ((op == OP_ANA && valp[-1] == 0) || - (op == OP_ORO && valp[-1] != 0)) - { - opp->skip = S_ANDOR; /* And/or skip starts */ - } - else if (op == OP_QUE) /* Start of ?: operator */ - opp->skip = (char)((op1 & S_ANDOR) | ((valp[-1] == 0) ? S_QUEST : 0)); - else if (op == OP_COL) /* : inverts S_QUEST */ - { - opp->skip = (char)((op1 & S_ANDOR) - | (((op1 & S_QUEST) != 0) ? 0 : S_QUEST)); - } - else /* Other ops leave */ - { - opp->skip = (char)op1; /* skipping unchanged. */ - } -#ifdef DEBUG_EVAL - fprintf( pCppOut, "stacking %s, valp[-1] == %d at %s", - opname[op], valp[-1], infile->bptr); - dumpstack(opstack, opp, value, valp); -#endif - goto again; - } - /* - * Pop operator from op. stack and evaluate it. - * End of stack and '(' are specials. - */ - skip = opp->skip; /* Remember skip value */ - switch ((op1 = opp->op)) /* Look at stacked op */ - { - case OP_END: /* Stack end marker */ - if (op == OP_EOE) - return valp[-1]; /* Finished ok. */ - goto again; /* Read another op. */ - - case OP_LPA: /* ( on stack */ - if (op != OP_RPA) /* Matches ) on input */ - { - cerror("unbalanced paren's, op is \"%s\"", opname[op]); - return 1; - } - opp--; /* Unstack it */ - /* goto again; -- Fall through */ - - case OP_QUE: - goto again; /* Evaluate true expr. */ - - case OP_COL: /* : on stack. */ - opp--; /* Unstack : */ - if (opp->op != OP_QUE) /* Matches ? on stack? */ - { - cerror("Misplaced '?' or ':', previous operator is %s", - opname[(int)opp->op]); - return 1; - } - /* fall through */ - /* - * Evaluate op1. - */ - default: /* Others: */ - opp--; /* Unstack the operator */ -#ifdef DEBUG_EVAL - fprintf( pCppOut, "Stack before evaluation of %s\n", opname[op1]); - dumpstack(opstack, opp, value, valp); -#endif - valp = evaleval(valp, op1, skip); -#ifdef DEBUG_EVAL - fprintf( pCppOut, "Stack after evaluation\n"); - dumpstack(opstack, opp, value, valp); -#endif - } /* op1 switch end */ - } /* Stack unwind loop */ -} - -/* - * Return next eval operator or value. Called from eval(). It - * calls a special-purpose routines for 'char' strings and - * numeric values: - * evalchar called to evaluate 'x' - * evalnum called to evaluate numbers. - */ -static int evallex(int skip) -{ - int c; - int c1; - int t; - -again: - do /* Collect the token */ - { - c = skipws(); - if ((c = macroid(c)) == EOF_CHAR || c == '\n') - { - unget(); - return OP_EOE; /* End of expression */ - } - } - while ((t = type[c]) == LET && catenate()); - if (t == INV) /* Total nonsense */ - { - if (!skip) - { - if (isascii(c) && isprint(c)) - cierror("illegal character '%c' in #if", c); - else - cierror("illegal character (%d decimal) in #if", c); - } - return OP_FAIL; - } - else if (t == QUO) /* ' or " */ - { - if (c == '\'') /* Character constant */ - { - evalue = evalchar(skip); /* Somewhat messy */ -#ifdef DEBUG_EVAL - fprintf( pCppOut, "evalchar returns %d.\n", evalue); -#endif - return DIG; /* Return a value */ - } - cerror("Can't use a string in an #if", NULLST); - return OP_FAIL; - } - else if (t == LET) /* ID must be a macro */ - { - if (streq(token, "defined")) /* Or defined name */ - { - c1 = c = skipws(); - if (c == '(') /* Allow defined(name) */ - c = skipws(); - if (type[c] == LET) - { - evalue = (lookid(c) != NULL); - if (c1 != '(' || /* Need to balance */ - skipws() == ')') /* Did we balance? */ - { - return DIG; /* Parsed ok */ - } - } - cerror("Bad #if ... defined() syntax", NULLST); - return OP_FAIL; - } - else if (streq(token, "sizeof")) /* New sizeof hackery */ - return dosizeof(); /* Gets own routine */ - /* - * The Draft ANSI C Standard says that an undefined symbol - * in an #if has the value zero. We are a bit pickier, - * warning except where the programmer was careful to write - * #if defined(foo) ? foo : 0 - */ -#ifdef STRICT_UNDEF - if (!skip) - cwarn("undefined symbol \"%s\" in #if, 0 used", token); -#endif - evalue = 0; - return DIG; - } - else if (t == DIG) /* Numbers are harder */ - { - evalue = evalnum(c); -#ifdef DEBUG_EVAL - fprintf( pCppOut, "evalnum returns %d.\n", evalue); -#endif - } - else if (strchr("!=<>&|\\", c) != NULL) - { - /* - * Process a possible multi-byte lexeme. - */ - c1 = cget(); /* Peek at next char */ - switch (c) - { - case '!': - if (c1 == '=') - return OP_NE; - break; - - case '=': - if (c1 != '=') /* Can't say a=b in #if */ - { - unget(); - cerror("= not allowed in #if", NULLST); - return OP_FAIL; - } - return OP_EQ; - - case '>': - case '<': - if (c1 == c) - return ((c == '<') ? OP_ASL : OP_ASR); - else if (c1 == '=') - return ((c == '<') ? OP_LE : OP_GE); - break; - - case '|': - case '&': - if (c1 == c) - return ((c == '|') ? OP_ORO : OP_ANA); - break; - - case '\\': - if (c1 == '\n') /* Multi-line if */ - goto again; - cerror("Unexpected \\ in #if", NULLST); - return OP_FAIL; - } - unget(); - } - return t; -} - -/* - * Process the sizeof (basic type) operation in an #if string. - * Sets evalue to the size and returns - * DIG success - * OP_FAIL bad parse or something. - */ -static int dosizeof(void) -{ - int c; - TYPES* tp; - SIZES* sizp; - short* testp; - short typecode; - - if ((c = skipws()) != '(') - goto nogood; - /* - * Scan off the tokens. - */ - typecode = 0; - while (0 != (c = skipws())) - { - if ((c = macroid(c)) == EOF_CHAR || c == '\n') - goto nogood; /* End of line is a bug */ - else if (c == '(') /* thing (*)() func ptr */ - { - if (skipws() == '*' && skipws() == ')') - { /* We found (*) */ - if (skipws() != '(') /* Let () be optional */ - unget(); - else if (skipws() != ')') - goto nogood; - typecode |= T_FPTR; /* Function pointer */ - } - else /* Junk is a bug */ - goto nogood; - } - else if (type[c] != LET) /* Exit if not a type */ - break; - else if (!catenate()) /* Maybe combine tokens */ - { - /* - * Look for this unexpandable token in basic_types. - * The code accepts "int long" as well as "long int" - * which is a minor bug as bugs go (and one shared with - * a lot of C compilers). - */ - for (tp = basic_types; tp->name != NULLST; tp++) - { - if (streq(token, tp->name)) - break; - } - if (tp->name == NULLST) - { - cerror("#if sizeof, unknown type \"%s\"", token); - return OP_FAIL; - } - typecode |= tp->type; /* Or in the type bit */ - } - } - /* - * We are at the end of the type scan. Chew off '*' if necessary. - */ - if (c == '*') - { - typecode |= T_PTR; - c = skipws(); - } - if (c == ')') /* Last syntax check */ - { - for (testp = test_table; *testp != 0; testp++) - { - if (!bittest(typecode & *testp)) - { - cerror("#if ... sizeof: illegal type combination", NULLST); - return OP_FAIL; - } - } - /* - * We assume that all function pointers are the same size: - * sizeof (int (*)()) == sizeof (float (*)()) - * We assume that signed and unsigned don't change the size: - * sizeof (signed int) == (sizeof unsigned int) - */ - if ((typecode & T_FPTR) != 0) /* Function pointer */ - typecode = T_FPTR | T_PTR; - else /* Var or var * datum */ - { - typecode &= ~(T_SIGNED | T_UNSIGNED); - if ((typecode & (T_SHORT | T_LONG)) != 0) - typecode &= ~T_INT; - } - if ((typecode & ~T_PTR) == 0) - { - cerror("#if sizeof() error, no type specified", NULLST); - return OP_FAIL; - } - /* - * Exactly one bit (and possibly T_PTR) may be set. - */ - for (sizp = size_table; sizp->bits != 0; sizp++) - { - if ((typecode & ~T_PTR) == sizp->bits) - { - evalue = ((typecode & T_PTR) != 0) - ? sizp->psize : sizp->size; - return DIG; - } - } /* We shouldn't fail */ - cierror("#if ... sizeof: bug, unknown type code 0x%x", typecode); - return OP_FAIL; - } - - nogood: - unget(); - cerror("#if ... sizeof() syntax error", NULLST); - return OP_FAIL; -} - -/* - * TRUE if value is zero or exactly one bit is set in value. - */ -static int bittest(int value) -{ -/* whoaa!! really worried about non 2's complement machines... - * but not at all about cross-compiling ? - */ -#if (4096 & ~(-4096)) == 0 - return ((value & ~(-value)) == 0); -#else - /* - * Do it the hard way (for non 2's complement machines) - */ - return (value == 0 || value ^ (value - 1) == (value * 2 - 1)); -#endif -} - -/* - * Expand number for #if lexical analysis. Note: evalnum recognizes - * the unsigned suffix, but only returns a signed int value. - */ -static int evalnum(int c) -{ - int value; - int base; - int c1; - - if (c != '0') - base = 10; - else if ((c = cget()) == 'x' || c == 'X') - { - base = 16; - c = cget(); - } - else base = 8; - value = 0; - for (;;) - { - c1 = c; - if (isascii(c) && isupper(c1)) - c1 = tolower(c1); - if (c1 >= 'a') - c1 -= ('a' - 10); - else - c1 -= '0'; - if (c1 < 0 || c1 >= base) - break; - value *= base; - value += c1; - c = cget(); - } - if (c == 'u' || c == 'U') /* Unsigned nonsense */ - cget(); - unget(); - return value; -} - -/* - * Get a character constant - */ -static int evalchar(int skip) -{ - int c; - int value; - int count; - - instring = TRUE; - if ((c = cget()) == '\\') - { - switch ((c = cget())) - { - case 'a': /* New in Standard */ -#if ('a' == '\a' || '\a' == ALERT) - value = ALERT; /* Use predefined value */ -#else - value = '\a'; /* Use compiler's value */ -#endif - break; - - case 'b': - value = '\b'; - break; - - case 'f': - value = '\f'; - break; - - case 'n': - value = '\n'; - break; - - case 'r': - value = '\r'; - break; - - case 't': - value = '\t'; - break; - - case 'v': /* New in Standard */ -#if ('v' == '\v' || '\v' == VT) - value = VT; /* Use predefined value */ -#else - value = '\v'; /* Use compiler's value */ -#endif - break; - - case 'x': /* '\xFF' */ - count = 3; - value = 0; - while ((((c = get()) >= '0' && c <= '9') || - (c >= 'a' && c <= 'f') || - (c >= 'A' && c <= 'F')) && - (--count >= 0)) - { - value *= 16; - value += (c - '0'); - } - unget(); - break; - - default: - if (c >= '0' && c <= '7') - { - count = 3; - value = 0; - while (c >= '0' && c <= '7' && --count >= 0) - { - value *= 8; - value += (c - '0'); - c = get(); - } - unget(); - } - else value = c; - break; - } - } - else if (c == '\'') - value = 0; - else - value = c; - /* - * We warn on multi-byte constants and try to hack - * (big|little)endian machines. - */ - while ((c = get()) != '\'' && c != EOF_CHAR && c != '\n') - { - if (!skip) - ciwarn("multi-byte constant '%c' isn't portable", c); - value <<= BITS_CHAR; - value += c; - } - instring = FALSE; - return value; -} - -/* - * Apply the argument operator to the data on the value stack. - * One or two values are popped from the value stack and the result - * is pushed onto the value stack. - * - * OP_COL is a special case. - * - * evaleval() returns the new pointer to the top of the value stack. - */ -static int * evaleval(int* valp, int op, int skip) -{ - int v1; - int v2 = 0; - - if (isbinary(op)) - v2 = *--valp; - v1 = *--valp; -#ifdef DEBUG_EVAL - fprintf( pCppOut, "%s op %s", (isbinary(op)) ? "binary" : "unary", - opname[op]); - if (isbinary(op)) - fprintf( pCppOut, ", v2 = %d.", v2); - fprintf( pCppOut, ", v1 = %d.\n", v1); -#endif - switch (op) - { - case OP_EOE: - break; - - case OP_ADD: - v1 += v2; - break; - - case OP_SUB: - v1 -= v2; - break; - - case OP_MUL: - v1 *= v2; - break; - - case OP_DIV: - case OP_MOD: - if (v2 == 0) - { - if (!skip) - { - cwarn("%s by zero in #if, zero result assumed", - (op == OP_DIV) ? "divide" : "mod"); - } - v1 = 0; - } - else if (op == OP_DIV) - v1 /= v2; - else - v1 %= v2; - break; - - case OP_ASL: - v1 <<= v2; - break; - - case OP_ASR: - v1 >>= v2; - break; - - case OP_AND: - v1 &= v2; - break; - - case OP_OR: - v1 |= v2; - break; - - case OP_XOR: - v1 ^= v2; - break; - - case OP_EQ: - v1 = (v1 == v2); - break; - - case OP_NE: - v1 = (v1 != v2); - break; - - case OP_LT: - v1 = (v1 < v2); - break; - - case OP_LE: - v1 = (v1 <= v2); - break; - - case OP_GE: - v1 = (v1 >= v2); - break; - - case OP_GT: - v1 = (v1 > v2); - break; - - case OP_ANA: - v1 = (v1 && v2); - break; - - case OP_ORO: - v1 = (v1 || v2); - break; - - case OP_COL: - /* - * v1 has the "true" value, v2 the "false" value. - * The top of the value stack has the test. - */ - v1 = (*--valp) ? v1 : v2; - break; - - case OP_NEG: - v1 = (-v1); - break; - - case OP_PLU: - break; - - case OP_COM: - v1 = ~v1; - break; - - case OP_NOT: - v1 = !v1; - break; - - default: - cierror("#if bug, operand = %d.", op); - v1 = 0; - } - *valp++ = v1; - return valp; -} - -#ifdef DEBUG_EVAL -dumpstack(opstack, opp, value, valp) -OPTAB opstack[NEXP]; /* Operand stack */ -OPTAB *opp; /* Operator stack */ -int value[NEXP]; /* Value stack */ -int *valp; /* -> value vector */ -{ - fprintf( pCppOut, "index op prec skip name -- op stack at %s", infile->bptr); - while (opp > opstack) - { - fprintf( pCppOut, " [%2d] %2d %03o %d %s\n", opp - opstack, - opp->op, opp->prec, opp->skip, opname[opp->op]); - opp--; - } - while (--valp >= value) - { - fprintf( pCppOut, "value[%d] = %d\n", (valp - value), *valp); - } -} -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/rscpp/cpp6.c b/rsc/source/rscpp/cpp6.c deleted file mode 100644 index 1f6bd68a44d3..000000000000 --- a/rsc/source/rscpp/cpp6.c +++ /dev/null @@ -1,1135 +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 -#include -#include -#include -#include "cppdef.h" -#include "cpp.h" - -/*ER evaluate macros to pDefOut */ - -/* - * skipnl() skips over input text to the end of the line. - * skipws() skips over "whitespace" (spaces or tabs), but - * not skip over the end of the line. It skips over - * TOK_SEP, however (though that shouldn't happen). - * scanid() reads the next token (C identifier) into token[]. - * The caller has already read the first character of - * the identifier. Unlike macroid(), the token is - * never expanded. - * macroid() reads the next token (C identifier) into token[]. - * If it is a #defined macro, it is expanded, and - * macroid() returns TRUE, otherwise, FALSE. - * catenate() Does the dirty work of token concatenation, TRUE if it did. - * scanstring() Reads a string from the input stream, calling - * a user-supplied function for each character. - * This function may be output() to write the - * string to the output file, or save() to save - * the string in the work buffer. - * scannumber() Reads a C numeric constant from the input stream, - * calling the user-supplied function for each - * character. (output() or save() as noted above.) - * save() Save one character in the work[] buffer. - * savestring() Saves a string in malloc() memory. - * getfile() Initialize a new FILEINFO structure, called when - * #include opens a new file, or a macro is to be - * expanded. - * getmem() Get a specified number of bytes from malloc memory. - * output() Write one character to stdout (calling PUTCHAR) -- - * implemented as a function so its address may be - * passed to scanstring() and scannumber(). - * lookid() Scans the next token (identifier) from the input - * stream. Looks for it in the #defined symbol table. - * Returns a pointer to the definition, if found, or NULL - * if not present. The identifier is stored in token[]. - * defnedel() Define enter/delete subroutine. Updates the - * symbol table. - * get() Read the next byte from the current input stream, - * handling end of (macro/file) input and embedded - * comments appropriately. Note that the global - * instring is -- essentially -- a parameter to get(). - * cget() Like get(), but skip over TOK_SEP. - * unget() Push last gotten character back on the input stream. - * cerror(), cwarn(), cfatal(), cierror(), ciwarn() - * These routines format an print messages to the user. - * cerror & cwarn take a format and a single string argument. - * cierror & ciwarn take a format and a single int (char) argument. - * cfatal takes a format and a single string argument. - */ - -/* - * This table must be rewritten for a non-Ascii machine. - * - * Note that several "non-visible" characters have special meaning: - * Hex 1D DEF_MAGIC -- a flag to prevent #define recursion. - * Hex 1E TOK_SEP -- a delimiter for token concatenation - * Hex 1F COM_SEP -- a zero-width whitespace for comment concatenation - */ -#if TOK_SEP != 0x1E || COM_SEP != 0x1F || DEF_MAGIC != 0x1D - << error type table is not correct >> -#endif - -#define DOL LET - - -char type[256] = { /* Character type codes Hex */ - END, 000, 000, 000, 000, 000, 000, 000, /* 00 */ - 000, SPA, 000, 000, 000, 000, 000, 000, /* 08 */ - 000, 000, 000, 000, 000, 000, 000, 000, /* 10 */ - 000, 000, 000, 000, 000, LET, 000, SPA, /* 18 */ - SPA,OP_NOT, QUO, 000, DOL,OP_MOD,OP_AND, QUO, /* 20 !"#$%&' */ -OP_LPA,OP_RPA,OP_MUL,OP_ADD, 000,OP_SUB, DOT,OP_DIV, /* 28 ()*+,-./ */ - DIG, DIG, DIG, DIG, DIG, DIG, DIG, DIG, /* 30 01234567 */ - DIG, DIG,OP_COL, 000, OP_LT, OP_EQ, OP_GT,OP_QUE, /* 38 89:;<=>? */ - 000, LET, LET, LET, LET, LET, LET, LET, /* 40 @ABCDEFG */ - LET, LET, LET, LET, LET, LET, LET, LET, /* 48 HIJKLMNO */ - LET, LET, LET, LET, LET, LET, LET, LET, /* 50 PQRSTUVW */ - LET, LET, LET, 000, BSH, 000,OP_XOR, LET, /* 58 XYZ[\]^_ */ - 000, LET, LET, LET, LET, LET, LET, LET, /* 60 `abcdefg */ - LET, LET, LET, LET, LET, LET, LET, LET, /* 68 hijklmno */ - LET, LET, LET, LET, LET, LET, LET, LET, /* 70 pqrstuvw */ - LET, LET, LET, 000, OP_OR, 000,OP_NOT, 000, /* 78 xyz{|}~ */ - 000, 000, 000, 000, 000, 000, 000, 000, /* 80 .. FF */ - 000, 000, 000, 000, 000, 000, 000, 000, /* 80 .. FF */ - 000, 000, 000, 000, 000, 000, 000, 000, /* 80 .. FF */ - 000, 000, 000, 000, 000, 000, 000, 000, /* 80 .. FF */ - 000, 000, 000, 000, 000, 000, 000, 000, /* 80 .. FF */ - 000, 000, 000, 000, 000, 000, 000, 000, /* 80 .. FF */ - 000, 000, 000, 000, 000, 000, 000, 000, /* 80 .. FF */ - 000, 000, 000, 000, 000, 000, 000, 000, /* 80 .. FF */ -}; - - -/* - * C P P S y m b o l T a b l e s - */ - -/* - * SBSIZE defines the number of hash-table slots for the symbol table. - * It must be a power of 2. - */ -#ifndef SBSIZE -#define SBSIZE 64 -#endif -#define SBMASK (SBSIZE - 1) -#if (SBSIZE ^ SBMASK) != ((SBSIZE * 2) - 1) - << error, SBSIZE must be a power of 2 >> -#endif - - -static DEFBUF *symtab[SBSIZE]; /* Symbol table queue headers */ - -void InitCpp6() -{ - int i; - for( i = 0; i < SBSIZE; i++ ) - symtab[ i ] = NULL; -} - - - -/* - * Skip to the end of the current input line. - */ -void skipnl() -{ - int c; - - do - { /* Skip to newline */ - c = get(); - } - while (c != '\n' && c != EOF_CHAR); -} - -/* - * Skip over whitespace - */ -int skipws() -{ - int c; - - do { /* Skip whitespace */ - c = get(); - } while (type[c] == SPA); - return c; -} - -/* - * Get the next token (an id) into the token buffer. - * Note: this code is duplicated in lookid(). - * Change one, change both. - */ -void scanid(int c) -{ - char* bp; - - if (c == DEF_MAGIC) /* Eat the magic token */ - c = get(); /* undefiner. */ - bp = token; - do - { - if (bp < &token[IDMAX]) /* token dim is IDMAX+1 */ - *bp++ = (char)c; - c = get(); - } - while (type[c] == LET || type[c] == DIG); - unget(); - *bp = EOS; -} - -/* - * If c is a letter, scan the id. if it's #defined, expand it and scan - * the next character and try again. - * - * Else, return the character. If type[c] is a LET, the token is in token. - */ -int macroid(int c) -{ - DEFBUF* dp; - - if (infile != NULL && infile->fp != NULL) - recursion = 0; - while (type[c] == LET && (dp = lookid(c)) != NULL) - { - expand(dp); - c = get(); - } - return c; -} - -/* - * A token was just read (via macroid). - * If the next character is TOK_SEP, concatenate the next token - * return TRUE -- which should recall macroid after refreshing - * macroid's argument. If it is not TOK_SEP, unget() the character - * and return FALSE. - */ -int catenate() -{ - int c; - char* token1; - - if (get() != TOK_SEP) /* Token concatenation */ - { - unget(); - return FALSE; - } - else - { - token1 = savestring(token); /* Save first token */ - c = macroid(get()); /* Scan next token */ - switch(type[c]) /* What was it? */ - { - case LET: /* An identifier, ... */ - if (strlen(token1) + strlen(token) >= NWORK) - cfatal("work buffer overflow doing %s #", token1); - sprintf(work, "%s%s", token1, token); - break; - - case DIG: /* A digit string */ - strcpy(work, token1); - workp = work + strlen(work); - do - { - save(c); - } - while ((c = get()) != TOK_SEP); - /* - * The trailing TOK_SEP is no longer needed. - */ - save(EOS); - break; - - default: /* An error, ... */ - if (isprint(c)) - cierror("Strange character '%c' after #", c); - else - cierror("Strange character (%d.) after #", c); - strcpy(work, token1); - unget(); - break; - } - /* - * work has the concatenated token and token1 has - * the first token (no longer needed). Unget the - * new (concatenated) token after freeing token1. - * Finally, setup to read the new token. - */ - free(token1); /* Free up memory */ - ungetstring(work); /* Unget the new thing, */ - return TRUE; - } -} - -/* - * Scan off a string. Warning if terminated by newline or EOF. - * outfun() outputs the character -- to a buffer if in a macro. - * TRUE if ok, FALSE if error. - */ -int scanstring(int delim, -#ifndef _NO_PROTO - void (*outfun)( int ) /* BP */ /* Output function */ -#else - void (*outfun)() /* BP */ -#endif - ) -{ - int c; - - instring = TRUE; /* Don't strip comments */ - (*outfun)(delim); - while ((c = get()) != delim && - c != '\n' && - c != EOF_CHAR) - { - if (c != DEF_MAGIC) - (*outfun)(c); - if (c == '\\') - (*outfun)(get()); - } - instring = FALSE; - if (c == delim) - { - (*outfun)(c); - return TRUE; - } - else - { - cerror("Unterminated string", NULLST); - unget(); - return FALSE; - } -} - -/* - * Process a number. We know that c is from 0 to 9 or dot. - * Algorithm from Dave Conroy's Decus C. - */ -void scannumber(int c, -#ifndef _NO_PROTO - void (*outfun)( int ) /* BP */ /* Output/store func */ -#else - void (*outfun)() /* BP */ -#endif - ) -{ - int radix; /* 8, 10, or 16 */ - int expseen; /* 'e' seen in floater */ - int signseen; /* '+' or '-' seen */ - int octal89; /* For bad octal test */ - int dotflag; /* TRUE if '.' was seen */ - - expseen = FALSE; /* No exponent seen yet */ - signseen = TRUE; /* No +/- allowed yet */ - octal89 = FALSE; /* No bad octal yet */ - radix = 10; /* Assume decimal */ - if ((dotflag = (c == '.')) != FALSE) /* . something? */ - { - (*outfun)('.'); /* Always out the dot */ - if (type[(c = get())] != DIG) /* If not a float numb, */ - { - unget(); /* Rescan strange char */ - return; /* All done for now */ - } - } /* End of float test */ - else if (c == '0') /* Octal or hex? */ - { - (*outfun)(c); /* Stuff initial zero */ - radix = 8; /* Assume it's octal */ - c = get(); /* Look for an 'x' */ - if (c == 'x' || c == 'X') /* Did we get one? */ - { - radix = 16; /* Remember new radix */ - (*outfun)(c); /* Stuff the 'x' */ - c = get(); /* Get next character */ - } - } - for (;;) /* Process curr. char. */ - { - /* - * Note that this algorithm accepts "012e4" and "03.4" - * as legitimate floating-point numbers. - */ - if (radix != 16 && (c == 'e' || c == 'E')) - { - if (expseen) /* Already saw 'E'? */ - break; /* Exit loop, bad nbr. */ - expseen = TRUE; /* Set exponent seen */ - signseen = FALSE; /* We can read '+' now */ - radix = 10; /* Decimal exponent */ - } - else if (radix != 16 && c == '.') - { - if (dotflag) /* Saw dot already? */ - break; /* Exit loop, two dots */ - dotflag = TRUE; /* Remember the dot */ - radix = 10; /* Decimal fraction */ - } - else if (c == '+' || c == '-') /* 1.0e+10 */ - { - if (signseen) /* Sign in wrong place? */ - break; /* Exit loop, not nbr. */ - /* signseen = TRUE; */ /* Remember we saw it */ - } - else /* Check the digit */ - { - switch (c) - { - case '8': case '9': /* Sometimes wrong */ - octal89 = TRUE; /* Do check later */ - case '0': case '1': case '2': case '3': - case '4': case '5': case '6': case '7': - break; /* Always ok */ - - case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': - case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': - if (radix == 16) /* Alpha's are ok only */ - break; /* if reading hex. */ - default: /* At number end */ - goto done; /* Break from for loop */ - } /* End of switch */ - } /* End general case */ - (*outfun)(c); /* Accept the character */ - signseen = TRUE; /* Don't read sign now */ - c = get(); /* Read another char */ - } /* End of scan loop */ - /* - * When we break out of the scan loop, c contains the first - * character (maybe) not in the number. If the number is an - * integer, allow a trailing 'L' for long and/or a trailing 'U' - * for unsigned. If not those, push the trailing character back - * on the input stream. Floating point numbers accept a trailing - * 'L' for "long double". - */ - done: - if (dotflag || expseen) /* Floating point? */ - { - if (c == 'l' || c == 'L') - { - (*outfun)(c); - get(); /* Ungotten later */ - } - } - else /* Else it's an integer */ - { - /* - * We know that dotflag and expseen are both zero, now: - * dotflag signals "saw 'L'", and - * expseen signals "saw 'U'". - */ - for (;;) - { - switch (c) - { - case 'l': - case 'L': - if (dotflag) - goto nomore; - dotflag = TRUE; - break; - - case 'u': - case 'U': - if (expseen) - goto nomore; - expseen = TRUE; - break; - - default: - goto nomore; - } - (*outfun)(c); /* Got 'L' or 'U'. */ - c = get(); /* Look at next, too. */ - } - } - nomore: - unget(); /* Not part of a number */ - if (octal89 && radix == 8) - cwarn("Illegal digit in octal number", NULLST); -} - -void save(int c) -{ - if (workp >= &work[NWORK]) - { - work[NWORK-1] = '\0'; - cfatal("Work buffer overflow: %s", work); - } - else - *workp++ = (char)c; -} - -/* - * Store a string into free memory. - */ -char* savestring(char* text) -{ - char* result; - - size_t size = strlen(text) + 1; - result = getmem(size); - strcpy(result, text); - return result; -} - -/* - * Common FILEINFO buffer initialization for a new file or macro. - */ -FILEINFO* getfile(size_t bufsize, char* name) -{ - FILEINFO* file; - size_t size; - - size = strlen(name); /* File/macro name */ - file = (FILEINFO*) getmem(sizeof (FILEINFO) + bufsize + size); - file->parent = infile; /* Chain files together */ - file->fp = NULL; /* No file yet */ - file->filename = savestring(name); /* Save file/macro name */ - file->progname = NULL; /* No #line seen yet */ - file->unrecur = 0; /* No macro fixup */ - file->bptr = file->buffer; /* Initialize line ptr */ - file->buffer[0] = EOS; /* Force first read */ - file->line = 0; /* (Not used just yet) */ - if (infile != NULL) /* If #include file */ - infile->line = line; /* Save current line */ - infile = file; /* New current file */ - line = 1; /* Note first line */ - return file; /* All done. */ -} - -/* - * Get a block of free memory. - */ -char* getmem(size_t size) -{ - char* result; - - if ((result = malloc((unsigned) size)) == NULL) - cfatal("Out of memory", NULLST); - return result; -} - -/* - * Look for the next token in the symbol table. Returns token in "token". - * If found, returns the table pointer; Else returns NULL. - */ -DEFBUF* lookid(int c) -{ - int nhash; - DEFBUF* dp; - char* np; - int temp = 0; - int isrecurse; /* For #define foo foo */ - - np = token; - nhash = 0; - if (0 != (isrecurse = (c == DEF_MAGIC)))/* If recursive macro */ - c = get(); /* hack, skip DEF_MAGIC */ - do - { - if (np < &token[IDMAX]) /* token dim is IDMAX+1 */ - { - *np++ = (char)c; /* Store token byte */ - nhash += c; /* Update hash value */ - } - c = get(); /* And get another byte */ - } - while (type[c] == LET || type[c] == DIG); - unget(); /* Rescan terminator */ - *np = EOS; /* Terminate token */ - if (isrecurse) /* Recursive definition */ - return NULL; /* undefined just now */ - nhash += (np - token); /* Fix hash value */ - dp = symtab[nhash & SBMASK]; /* Starting bucket */ - while (dp != (DEFBUF*) NULL) /* Search symbol table */ - { - if (dp->hash == nhash && /* Fast precheck */ - (temp = strcmp(dp->name, token)) >= 0) - { - break; - } - dp = dp->link; /* Nope, try next one */ - } - return ((temp == 0) ? dp : NULL); -} - -/* - * Enter this name in the lookup table (delete = FALSE) - * or delete this name (delete = TRUE). - * Returns a pointer to the define block (delete = FALSE) - * Returns NULL if the symbol wasn't defined (delete = TRUE). - */ -DEFBUF* defendel(char* name, int delete) -{ - DEFBUF* dp; - DEFBUF** prevp; - char* np; - int nhash; - int temp=0; - int size; - - for (nhash = 0, np = name; *np != EOS;) - nhash += *np++; - size = (np - name); - nhash += size; - prevp = &symtab[nhash & SBMASK]; - while ((dp = *prevp) != (DEFBUF*) NULL) - { - if (dp->hash == nhash && - (temp = strcmp(dp->name, name)) >= 0) - { - if (temp > 0) - dp = NULL; /* Not found */ - else - { - *prevp = dp->link; /* Found, unlink and */ - if (dp->repl != NULL) /* Free the replacement */ - free(dp->repl); /* if any, and then */ - free((char*) dp); /* Free the symbol */ - dp = NULL; - } - break; - } - prevp = &dp->link; - } - if (!delete) - { - dp = (DEFBUF*) getmem(sizeof (DEFBUF) + size + 1); - dp->link = *prevp; - *prevp = dp; - dp->hash = nhash; - dp->repl = NULL; - dp->nargs = 0; - strcpy(dp->name, name); - } - return dp; -} - -#if OSL_DEBUG_LEVEL > 1 - -void dumpdef(char* why) -{ - DEFBUF* dp; - DEFBUF** syp; - FILE* pRememberOut = NULL; - - if ( bDumpDefs ) /*ER */ - { - pRememberOut = pCppOut; - pCppOut = pDefOut; - } - fprintf( pCppOut, "CPP symbol table dump %s\n", why); - for (syp = symtab; syp < &symtab[SBSIZE]; syp++) - { - if ((dp = *syp) != (DEFBUF*) NULL) - { - fprintf( pCppOut, "symtab[%" SAL_PRI_PTRDIFFT "d]\n", (syp - symtab)); - do - { - dumpadef((char*) NULL, dp); - } - while ((dp = dp->link) != (DEFBUF*) NULL); - } - } - if ( bDumpDefs ) - { - fprintf( pCppOut, "\n"); - pCppOut = pRememberOut; - } -} - -void dumpadef(char* why, DEFBUF* dp) -{ - char* cp; - int c; - FILE* pRememberOut = NULL; - -/*ER dump #define's to pDefOut */ - if ( bDumpDefs ) - { - pRememberOut = pCppOut; - pCppOut = pDefOut; - } - fprintf( pCppOut, " \"%s\" [%d]", dp->name, dp->nargs); - if (why != NULL) - fprintf( pCppOut, " (%s)", why); - if (dp->repl != NULL) - { - fprintf( pCppOut, " => "); - for (cp = dp->repl; (c = *cp++ & 0xFF) != EOS;) - { -#ifdef SOLAR - if (c == DEL) - { - c = *cp++ & 0xFF; - if( c == EOS ) break; - fprintf( pCppOut, "<%%%d>", c - MAC_PARM); - } -#else - if (c >= MAC_PARM && c <= (MAC_PARM + PAR_MAC)) - fprintf( pCppOut, "<%%%d>", c - MAC_PARM); -#endif - else if (isprint(c) || c == '\n' || c == '\t') - PUTCHAR(c); - else if (c < ' ') - fprintf( pCppOut, "<^%c>", c + '@'); - else - fprintf( pCppOut, "<\\0%o>", c); - } -/*ER evaluate macros to pDefOut */ -#ifdef EVALDEFS - if ( bDumpDefs && !bIsInEval && dp->nargs <= 0 ) - { - FILEINFO* infileSave = infile; - char* tokenSave = savestring( token ); - char* workSave = savestring( work ); - int lineSave = line; - int wronglineSave = wrongline; - int recursionSave = recursion; - FILEINFO* file; - EVALTYPE valEval; - - bIsInEval = 1; - infile = NULL; /* start from scrap */ - line = 0; - wrongline = 0; - *token = EOS; - *work = EOS; - recursion = 0; - file = getfile( strlen( dp->repl ), dp->name ); - strcpy( file->buffer, dp->repl ); - fprintf( pCppOut, " ===> "); - nEvalOff = 0; - cppmain(); /* get() frees also *file */ - valEval = 0; - if ( 0 == evaluate( EvalBuf, &valEval ) ) - { -#ifdef EVALFLOATS - if ( valEval != (EVALTYPE)((long)valEval ) ) - fprintf( pCppOut, " ==eval=> %f", valEval ); - else -#endif - fprintf( pCppOut, " ==eval=> %ld", (long)valEval ); - } - recursion = recursionSave; - wrongline = wronglineSave; - line = lineSave; - strcpy( work, workSave ); - free( workSave ); - strcpy( token, tokenSave ); - free( tokenSave ); - infile = infileSave; - bIsInEval = 0; - } -#endif - } - else - { - fprintf( pCppOut, ", no replacement."); - } - PUTCHAR('\n'); - if ( bDumpDefs ) - pCppOut = pRememberOut; -} -#endif - -/* - * G E T - */ - -/* - * Return the next character from a macro or the current file. - * Handle end of file from #include files. - */ -int get() -{ - int c; - FILEINFO* file; - int popped; /* Recursion fixup */ - - popped = 0; - get_from_file: - if ((file = infile) == NULL) - return EOF_CHAR; - newline: - - /* - * Read a character from the current input line or macro. - * At EOS, either finish the current macro (freeing temp. - * storage) or read another line from the current input file. - * At EOF, exit the current file (#include) or, at EOF from - * the cpp input file, return EOF_CHAR to finish processing. - */ - if ((c = *file->bptr++ & 0xFF) == EOS) - { - /* - * Nothing in current line or macro. Get next line (if - * input from a file), or do end of file/macro processing. - * In the latter case, jump back to restart from the top. - */ - if (file->fp == NULL) /* NULL if macro */ - { - popped++; - recursion -= file->unrecur; - if (recursion < 0) - recursion = 0; - infile = file->parent; /* Unwind file chain */ - } - else /* Else get from a file */ - { - if ((file->bptr = fgets(file->buffer, NBUFF, file->fp)) != NULL) - { -#if OSL_DEBUG_LEVEL > 1 - if (debug > 1) /* Dump it to stdout */ - { - fprintf( pCppOut, "\n#line %d (%s), %s", - line, file->filename, file->buffer); - } -#endif - goto newline; /* process the line */ - } - else - { - if( file->fp != stdin ) - fclose(file->fp); /* Close finished file */ - if ((infile = file->parent) != NULL) - { - /* - * There is an "ungotten" newline in the current - * infile buffer (set there by doinclude() in - * cpp1.c). Thus, we know that the mainline code - * is skipping over blank lines and will do a - * #line at its convenience. - */ - wrongline = TRUE; /* Need a #line now */ - } - } - } - /* - * Free up space used by the (finished) file or macro and - * restart input from the parent file/macro, if any. - */ - free(file->filename); /* Free name and */ - if (file->progname != NULL) /* if a #line was seen, */ - free(file->progname); /* free it, too. */ - free((char*) file); /* Free file space */ - if (infile == NULL) /* If at end of file */ - return EOF_CHAR; /* Return end of file */ - line = infile->line; /* Reset line number */ - goto get_from_file; /* Get from the top. */ - } - /* - * Common processing for the new character. - */ - if (c == DEF_MAGIC && file->fp != NULL) /* Don't allow delete */ - goto newline; /* from a file */ - if (file->parent != NULL) /* Macro or #include */ - { - if (popped != 0) - file->parent->unrecur += popped; - else - { - recursion -= file->parent->unrecur; - if (recursion < 0) - recursion = 0; - file->parent->unrecur = 0; - } - } -#if (HOST == SYS_UNIX) - if (c == '\r') - return get(); /* DOS fuck */ -#endif - if (c == '\n') /* Maintain current */ - ++line; /* line counter */ - if (instring) /* Strings just return */ - return c; /* the character. */ - else if (c == '/') /* Comment? */ - { - instring = TRUE; /* So get() won't loop */ - - c = get(); - if ((c != '*') && (c != '/')) /* Next byte '*'? */ - { - instring = FALSE; /* Nope, no comment */ - unget(); /* Push the char. back */ - return '/'; /* Return the slash */ - } - if (keepcomments) /* If writing comments */ - { - PUTCHAR('/'); /* Write out the */ - /* initializer */ - if( '*' == c ) - PUTCHAR('*'); - else - PUTCHAR('/'); - } - if( '*' == c ) - { - for (;;) /* Eat a comment */ - { - c = get(); - test: - if (keepcomments && c != EOF_CHAR) - cput(c); - switch (c) - { - case EOF_CHAR: - cerror("EOF in comment", NULLST); - return EOF_CHAR; - - case '/': - if ((c = get()) != '*') /* Don't let comments */ - goto test; /* Nest. */ -#ifdef STRICT_COMMENTS - cwarn("Nested comments", NULLST); -#endif - /* fall through *//* into * stuff */ - case '*': - if ((c = get()) != '/') /* If comment doesn't */ - goto test; /* end, look at next */ - instring = FALSE; /* End of comment, */ - if (keepcomments) /* Put out the comment */ - { - cput(c); /* terminator, too */ - } - /* - * A comment is syntactically "whitespace" -- - * however, there are certain strange sequences - * such as - * #define foo(x) (something) - * foo|* comment *|(123) - * these are '/' ^ ^ - * where just returning space (or COM_SEP) will cause - * problems. This can be "fixed" by overwriting the - * '/' in the input line buffer with ' ' (or COM_SEP) - * but that may mess up an error message. - * So, we peek ahead -- if the next character is - * "whitespace" we just get another character, if not, - * we modify the buffer. All in the name of purity. - */ - if (*file->bptr == '\n' || type[*file->bptr & 0xFF] == SPA) - goto newline; - return (file->bptr[-1] = ' '); - - case '\n': /* we'll need a #line */ - if (!keepcomments) - wrongline = TRUE; /* later... */ - default: /* Anything else is */ - break; /* Just a character */ - } /* End switch */ - } /* End comment loop */ - } - else /* c++ comment */ - { - for (;;) /* Eat a comment */ - { - c = get(); - if (keepcomments && c != EOF_CHAR) - cput(c); - if( EOF_CHAR == c ) - return EOF_CHAR; - else if( '\n' == c ) - { - instring = FALSE; /* End of comment, */ - return c; - } - } - } - } /* End if in comment */ - else if (!inmacro && c == '\\') /* If backslash, peek */ - { - if ((c = get()) == '\n') /* for a . If so, */ - { - wrongline = TRUE; - goto newline; - } - else /* Backslash anything */ - { - unget(); /* Get it later */ - return '\\'; /* Return the backslash */ - } - } - else if (c == '\f' || c == VT) /* Form Feed, Vertical */ - { - c = ' '; /* Tab are whitespace */ - } - else if (c == 0xef) /* eat up UTF-8 BOM */ - { - if((c = get()) == 0xbb) - { - if((c = get()) == 0xbf) - { - c = get(); - return c; - } - else - { - unget(); - unget(); - return 0xef; - } - } - else - { - unget(); - return 0xef; - } - } - return c; /* Just return the char */ -} - -/* - * Backup the pointer to reread the last character. Fatal error - * (code bug) if we backup too far. unget() may be called, - * without problems, at end of file. Only one character may - * be ungotten. If you need to unget more, call ungetstring(). - */ -void unget() -{ - FILEINFO* file; - - if ((file = infile) == NULL) - return; /* Unget after EOF */ - if (--file->bptr < file->buffer) - cfatal("Too much pushback", NULLST); - if (*file->bptr == '\n') /* Ungetting a newline? */ - --line; /* Unget the line number, too */ -} - -/* - * Push a string back on the input stream. This is done by treating - * the text as if it were a macro. - */ -void ungetstring(char* text) -{ - FILEINFO* file; - file = getfile(strlen(text) + 1, ""); - strcpy(file->buffer, text); -} - -/* - * Get one character, absorb "funny space" after comments or - * token concatenation - */ -int cget() -{ - int c; - - do - { - c = get(); - } - while (c == TOK_SEP); - return c; -} - -/* - * Error messages and other hacks. The first byte of severity - * is 'S' for string arguments and 'I' for int arguments. This - * is needed for portability with machines that have int's that - * are shorter than char *'s. - */ - -/* - * Print filenames, macro names, and line numbers for error messages. - */ -static void domsg(char* severity, char* format, void* arg) -{ - char* tp; - FILEINFO* file; - - fprintf(stderr, "%sline %d, %s: ", MSG_PREFIX, line, &severity[1]); - if (*severity == 'S') - fprintf(stderr, format, (char*)arg); - else - fprintf(stderr, format, *((int*)arg) ); - putc('\n', stderr); - if ((file = infile) == NULL) - return; /* At end of file */ - if (file->fp != NULL) - { - tp = file->buffer; /* Print current file */ - fprintf(stderr, "%s", tp); /* name, making sure */ - if (tp[strlen(tp) - 1] != '\n') /* there's a newline */ - putc('\n', stderr); - } - while ((file = file->parent) != NULL) /* Print #includes, too */ - { - if (file->fp == NULL) - fprintf(stderr, "from macro %s\n", file->filename); - else - { - tp = file->buffer; - fprintf(stderr, "from file %s, line %d:\n%s", - (file->progname != NULL) - ? file->progname : file->filename, - file->line, tp); - if (tp[strlen(tp) - 1] != '\n') - putc('\n', stderr); - } - } -} - -/* - * Print a normal error message, string argument. - */ -void cerror(char* format, char* sarg) -{ - domsg("SError", format, sarg); - errors++; -} - -/* - * Print a normal error message, numeric argument. - */ -void cierror(char* format, int narg) -{ - domsg("IError", format, &narg); - errors++; -} - -/* - * A real disaster - */ -void cfatal(char* format, char* sarg) -{ - domsg("SFatal error", format, sarg); - exit(IO_ERROR); -} - -/* - * A non-fatal error, string argument. - */ -void cwarn(char* format, char* sarg) -{ - domsg("SWarning", format, sarg); -} - -/* - * A non-fatal error, numeric argument. - */ -void ciwarn(char* format, int narg) -{ - domsg("IWarning", format, &narg); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/rscpp/cppdef.h b/rsc/source/rscpp/cppdef.h deleted file mode 100644 index 32d35a87d252..000000000000 --- a/rsc/source/rscpp/cppdef.h +++ /dev/null @@ -1,178 +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_RSC_SOURCE_RSCPP_CPPDEF_H -#define INCLUDED_RSC_SOURCE_RSCPP_CPPDEF_H - -/* - * This redundant definition of TRUE and FALSE works around - * a limitation of Decus C. - */ -#ifndef TRUE -#define TRUE 1 -#define FALSE 0 -#endif - -/* - * Define the HOST operating system. This is needed so that - * cpp can use appropriate filename conventions. - */ -#define SYS_UNKNOWN 0 -#define SYS_UNIX 1 - -#ifndef HOST -#ifdef unix -#define HOST SYS_UNIX -#else -#endif -#endif - -#ifndef HOST -#define HOST SYS_UNKNOWN -#endif - -/* - * We assume that the target is the same as the host system - */ -#ifndef TARGET -#define TARGET HOST -#endif - -/* - * In order to predefine machine-dependent constants, - * several strings are defined here: - * - * MACHINE defines the target cpu (by name) - * SYSTEM defines the target operating system - * COMPILER defines the target compiler - * - * The above may be #defined as "" if they are not wanted. - * They should not be #defined as NULL. - * - * LINE_PREFIX defines the # output line prefix, if not "line" - * This should be defined as "" if cpp is to replace - * the "standard" C pre-processor. - * - * OK_DATE Predefines the compilation date if set TRUE. - * Not permitted by the Nov. 12, 1984 Draft Standard. - * - * S_CHAR etc. Define the sizeof the basic TARGET machine word types. - * By default, sizes are set to the values for the HOST - * computer. If this is inappropriate, see the code in - * cpp3.c for details on what to change. Also, if you - * have a machine where sizeof (signed int) differs from - * sizeof (unsigned int), you will have to edit code and - * tables in cpp3.c (and extend the -S option definition.) - * - * CPP_LIBRARY May be defined if you have a site-specific include directory - * which is to be searched *before* the operating-system - * specific directories. - */ - -#if TARGET == SYS_UNIX -#define SYSTEM "unix" -#endif - -/* - * defaults - */ - -#ifndef MSG_PREFIX -#define MSG_PREFIX "cpp: " -#endif - -#ifndef LINE_PREFIX -#define LINE_PREFIX "" -#endif - -/* - * RECURSION_LIMIT may be set to -1 to disable the macro recursion test. - */ -#ifndef RECURSION_LIMIT -#define RECURSION_LIMIT 1000 -#endif - -/* - * BITS_CHAR may be defined to set the number of bits per character. - * it is needed only for multi-byte character constants. - */ -#ifndef BITS_CHAR -#define BITS_CHAR 8 -#endif - -/* - * OK_DATE may be enabled to predefine today's date as a string - * at the start of each compilation. This is apparently not permitted - * by the Draft Ansi Standard. - */ -#ifndef OK_DATE -#define OK_DATE TRUE -#endif - -/* - * The following definitions are used to allocate memory for - * work buffers. In general, they should not be modified - * by implementors. - * - * PAR_MAC The maximum number of #define parameters (31 per Standard) - * Note: we need another one for strings. - * IDMAX The longest identifier, 31 per Ansi Standard - * NBUFF Input buffer size - * NWORK Work buffer size -- the longest macro - * must fit here after expansion. - * NEXP The nesting depth of #if expressions - * NINCLUDE The number of directories that may be specified - * on a per-system basis, or by the -I option. - * BLK_NEST The number of nested #if's permitted. - * NFWORK FileNameWorkBuffer (added by erAck, was NWORK) - */ - -#ifndef IDMAX -#define IDMAX 127 -#endif -#ifdef SOLAR -#define PAR_MAC (253 + 1) -#else -#define PAR_MAC (31 + 1) -#endif -/* - * NWORK increased due to large macros in *.src, - * added a proper bunch right away, because we are soon going to have 10 languages. - */ -#define NWORK 128000 -#define NBUFF NWORK -#define NFWORK 1024 -#define NEXP 128 -#define NINCLUDE 100 -#define NPARMWORK (NWORK * 2) -#define BLK_NEST 32 - - -#ifndef ALERT -#define ALERT '\007' /* '\a' is "Bell" */ -#endif - -#ifndef VT -#define VT '\013' /* Vertical Tab CTRL/K */ -#endif - - -#endif // INCLUDED_RSC_SOURCE_RSCPP_CPPDEF_H - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/tools/rscchar.cxx b/rsc/source/tools/rscchar.cxx deleted file mode 100644 index f081773344cc..000000000000 --- a/rsc/source/tools/rscchar.cxx +++ /dev/null @@ -1,172 +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 -#include - -#include - -#include -#include -#include -#include - -char * RscChar::MakeUTF8( char * pStr, sal_uInt16 nTextEncoding ) -{ - std::size_t nMaxUniCodeBuf = strlen( pStr ) + 1; - if( nMaxUniCodeBuf * 6 > 0x0FFFFF ) - RscExit( 10 ); - - char * pOrgStr = new char[ nMaxUniCodeBuf ]; - sal_uInt32 nOrgLen = 0; - - char cOld = '1'; - while( cOld != 0 ) - { - char c; - - if( *pStr == '\\' ) - { - ++pStr; - switch( *pStr ) - { - case 'a': - c = '\a'; - break; - case 'b': - c = '\b'; - break; - case 'f': - c = '\f'; - break; - case 'n': - c = '\n'; - break; - case 'r': - c = '\r'; - break; - case 't': - c = '\t'; - break; - case 'v': - c = '\v'; - break; - case '\\': - c = '\\'; - break; - case '?': - c = '\?'; - break; - case '\'': - c = '\''; - break; - case '\"': - c = '\"'; - break; - default: - { - if( '0' <= *pStr && '7' >= *pStr ) - { - sal_uInt16 nChar = 0; - int i = 0; - while( '0' <= *pStr && '7' >= *pStr && i != 3 ) - { - nChar = nChar * 8 + (sal_uInt8)*pStr - (sal_uInt8)'0'; - ++pStr; - i++; - } - if( nChar > 255 ) - { - // value is too big, or more than 3 digits - delete [] pOrgStr; - return nullptr; - } - c = (char)nChar; - pStr--; - } - else if( 'x' == *pStr ) - { - sal_uInt16 nChar = 0; - int i = 0; - ++pStr; - while( rtl::isAsciiHexDigit( static_cast(*pStr) ) && i != 2 ) - { - if( rtl::isAsciiDigit( static_cast(*pStr) ) ) - nChar = nChar * 16 + (sal_uInt8)*pStr - (sal_uInt8)'0'; - else if( rtl::isAsciiUpperCase( static_cast(*pStr) ) ) - nChar = nChar * 16 + (sal_uInt8)*pStr - (sal_uInt8)'A' +10; - else - nChar = nChar * 16 + (sal_uInt8)*pStr - (sal_uInt8)'a' +10; - ++pStr; - i++; - } - c = (char)nChar; - pStr--; - } - else - c = *pStr; - }; - } - } - else - c = *pStr; - pOrgStr[ nOrgLen++ ] = c; - cOld = *pStr; - pStr++; - } - - sal_Unicode * pUniCode = new sal_Unicode[ nMaxUniCodeBuf ]; - rtl_TextToUnicodeConverter hConv = rtl_createTextToUnicodeConverter( nTextEncoding ); - - sal_uInt32 nInfo; - sal_Size nSrcCvtBytes; - sal_Size nUniSize = rtl_convertTextToUnicode( hConv, nullptr, - pOrgStr, nOrgLen, - pUniCode, nMaxUniCodeBuf, - RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_DEFAULT - | RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_DEFAULT - | RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT - | RTL_TEXTTOUNICODE_FLAGS_FLUSH, - &nInfo, - &nSrcCvtBytes ); - - rtl_destroyTextToUnicodeConverter( hConv ); - delete[] pOrgStr; - pOrgStr = nullptr; - - hConv = rtl_createUnicodeToTextConverter( RTL_TEXTENCODING_UTF8 ); - // factor of 6 is the maximum size of an UNICODE character as utf8 - char * pUtf8 = static_cast(rtl_allocateMemory( nUniSize * 6 )); - rtl_convertUnicodeToText( hConv, nullptr, - pUniCode, nUniSize, - pUtf8, nUniSize * 6, - RTL_UNICODETOTEXT_FLAGS_UNDEFINED_DEFAULT - | RTL_UNICODETOTEXT_FLAGS_INVALID_DEFAULT - | RTL_UNICODETOTEXT_FLAGS_FLUSH, - &nInfo, - &nSrcCvtBytes ); - - rtl_destroyTextToUnicodeConverter( hConv ); - delete[] pUniCode; - pUniCode = nullptr; - - return pUtf8; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/tools/rscdef.cxx b/rsc/source/tools/rscdef.cxx deleted file mode 100644 index f721e925fb5d..000000000000 --- a/rsc/source/tools/rscdef.cxx +++ /dev/null @@ -1,664 +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 . - */ - - -// overall program includes -#include - -#include - -bool RscId::bNames = true; - -void RscId::SetNames( bool bSet ) -{ - bNames = bSet; -} - -sal_Int32 RscId::GetNumber() const -{ - sal_Int32 lVal; - aExp.Evaluate( &lVal ); - return lVal; -} - -void RscId::Create( const RscExpType & rExpType ) -{ - aExp = rExpType; - if( aExp.IsDefinition() ) - aExp.aExp.pDef->IncRef(); - else if( aExp.IsExpression() ) - { - sal_Int32 lValue; - - aExp.Evaluate( &lValue ); - aExp.SetLong( lValue ); - } -} - -void RscId::Destroy() -{ - if( aExp.IsDefinition() ) - aExp.aExp.pDef->DecRef(); - aExp.cType = RSCEXP_NOTHING; -} - -RscId::RscId( const RscId& rRscId ) -{ - aExp = rRscId.aExp; - if( aExp.IsDefinition() ) - aExp.aExp.pDef->IncRef(); -} - -RscId::RscId( RscDefine * pDef ) -{ - RscExpType aExpType; - - aExpType.aExp.pDef = pDef; - aExpType.cType = RSCEXP_DEF; - aExpType.cUnused = false; - Create( aExpType ); -} - -RscId& RscId::operator = ( const RscId& rRscId ) -{ - if( rRscId.aExp.IsDefinition() ) - rRscId.aExp.aExp.pDef->IncRef(); - Destroy(); - aExp = rRscId.aExp; - return *this; -} - -bool RscId::operator == ( const RscId& rRscId ) const -{ - return GetNumber() == rRscId.GetNumber(); -} - -bool RscId::operator < ( const RscId& rRscId ) const -{ - return GetNumber() < rRscId.GetNumber(); -} - -bool RscId::operator > ( const RscId& rRscId ) const -{ - return GetNumber() > rRscId.GetNumber(); -} - -OString RscId::GetName() const -{ - OStringBuffer aStr; - - if ( !aExp.IsNothing() ) - { - if( bNames ) - aExp.AppendMacro(aStr); - else - aStr.append(GetNumber()); - } - - return aStr.makeStringAndClear(); -} - -RscDefine::RscDefine( RscFileTab::Index lKey, const OString& rDefName, sal_Int32 lDefId ) - : m_aName( rDefName ) -{ - nRefCount = 0; - lFileKey = lKey; - lId = lDefId; - pExp = nullptr; -} - -RscDefine::RscDefine( RscFileTab::Index lKey, const OString& rDefName, - RscExpression * pExpression ) - : lId(0), m_aName( rDefName ) -{ - nRefCount = 0; - lFileKey = lKey; - pExpression->Evaluate( &lId ); - pExp = pExpression; -} - -RscDefine::~RscDefine() -{ - delete pExp; - if( nRefCount ) - RscExit( 14 ); -} - -void RscDefine::DecRef() -{ - nRefCount--; - if( 0 == nRefCount ) - { - delete this; - } -} - -void RscDefine::DefineToNumber() -{ - delete pExp; - pExp = nullptr; - m_aName = OString::number(lId); -} - -void RscDefine::Evaluate() -{ - if( pExp ) - pExp->Evaluate( &lId ); -} - -RscDefine * RscDefine::Search( const char * pSearch ) const -{ - return static_cast(NameNode::Search( static_cast(pSearch) )); -} - -COMPARE RscDefine::Compare( const NameNode * pSearch ) const -{ - int nCmp = m_aName.compareTo( static_cast(pSearch)->m_aName ); - if( nCmp < 0 ) - return LESS; - else if( nCmp > 0 ) - return GREATER; - else - return EQUAL; -} - -// pSearch is a pointer to const char * -COMPARE RscDefine::Compare( const void * pSearch ) const -{ - int nCmp = m_aName.compareTo( static_cast(pSearch) ); - - if( nCmp < 0 ) - return LESS; - else if( nCmp > 0 ) - return GREATER; - else - return EQUAL; -} - -RscDefine * RscDefineList::New( RscFileTab::Index lFileKey, const OString& rDefName, - sal_Int32 lDefId, size_t lPos ) -{ - RscDefine * pDef; - - pDef = new RscDefine( lFileKey, rDefName, lDefId ); - pDef->IncRef(); - if ( lPos < maList.size() ) - { - RscSubDefList::iterator it = maList.begin(); - ::std::advance( it, lPos ); - maList.insert( it, pDef ); - } - else - { - maList.push_back( pDef ); - } - return pDef; -} - -RscDefine * RscDefineList::New( RscFileTab::Index lFileKey, const OString& rDefName, - RscExpression * pExpression, size_t lPos ) -{ - RscDefine * pDef; - - pDef = new RscDefine( lFileKey, rDefName, pExpression ); - pDef->IncRef(); - if ( lPos < maList.size() ) - { - RscSubDefList::iterator it = maList.begin(); - ::std::advance( it, lPos ); - maList.insert( it, pDef ); - } - else - { - maList.push_back( pDef ); - } - return pDef; -} - -bool RscDefineList::Remove() -{ - if ( maList.empty() ) - return false; - - maList[ 0 ]->DefineToNumber(); - maList[ 0 ]->DecRef(); - maList.erase( maList.begin() ); - return true; -} - -bool RscExpType::Evaluate( sal_Int32 * plValue ) const -{ - if( IsDefinition() ) - { - aExp.pDef->Evaluate(); - // ignore potential errors - *plValue = aExp.pDef->GetNumber(); - } - else if( IsExpression() ) - return aExp.pExp->Evaluate( plValue ); - else if( IsNothing() ) - *plValue = 0; - else - *plValue = GetLong(); - - return true; -} - -void RscExpType::AppendMacro(OStringBuffer& rStr) const -{ - if( IsDefinition() ) - rStr.append(aExp.pDef->GetName()); - else if( IsExpression() ) - rStr.append(aExp.pExp->GetMacro()); - else if( IsNumber() ) - rStr.append(GetLong()); -} - - -RscExpression::RscExpression( RscExpType aLE, char cOp, RscExpType aRE ) -{ - aLeftExp = aLE; - cOperation = cOp; - aRightExp = aRE; - if( aLeftExp.IsDefinition() ) - aLeftExp.aExp.pDef->IncRef(); - if( aRightExp.IsDefinition() ) - aRightExp.aExp.pDef->IncRef(); -} - -RscExpression::~RscExpression() -{ - if( aLeftExp.IsDefinition() ) - aLeftExp.aExp.pDef->DecRef(); - else if( aLeftExp.IsExpression() ) - delete aLeftExp.aExp.pExp; - - if( aRightExp.IsDefinition() ) - aRightExp.aExp.pDef->DecRef(); - else if( aRightExp.IsExpression() ) - delete aRightExp.aExp.pExp; -} - -bool RscExpression::Evaluate( sal_Int32 * plValue ) -{ - sal_Int32 lLeft; - sal_Int32 lRight; - - // interpret left and right branches - if( aLeftExp.Evaluate( &lLeft ) && aRightExp.Evaluate( &lRight ) ) - { - if( cOperation == '&' ) - *plValue = lLeft & lRight; - else if( cOperation == '|' ) - *plValue = lLeft | lRight; - else if( cOperation == '+' ) - *plValue = lLeft + lRight; - else if( cOperation == '-' ) - *plValue = lLeft - lRight; - else if( cOperation == '*' ) - *plValue = lLeft * lRight; - else if( cOperation == 'r' ) - *plValue = lLeft >> lRight; - else if( cOperation == 'l' ) - *plValue = lLeft << lRight; - else - { - if( 0 == lRight ) - return false; - *plValue = lLeft / lRight; - } - return true; - } - return false; -} - -OString RscExpression::GetMacro() -{ - OStringBuffer aLeft; - - // output optimization - if( aLeftExp.IsNothing() ) - { - if ( '-' == cOperation ) - { - aLeft.append('('); - aLeft.append('-'); - } - aRightExp.AppendMacro(aLeft); - if( '-' == cOperation ) - { - aLeft.append(')'); - } - } - else if( aRightExp.IsNothing() ) - aLeftExp.AppendMacro(aLeft); - else - { - aLeft.append('('); - // interpret left branch - aLeftExp.AppendMacro(aLeft); - - aLeft.append(cOperation); - - aLeft.append('('); - // interpret right branch - aRightExp.AppendMacro(aLeft); - aLeft.append(')'); - - aLeft.append(')'); - } - - return aLeft.makeStringAndClear(); -} - -RscFile::RscFile() -{ - bLoaded = false; - bIncFile = false; - bScanned = false; -} - -RscFile::~RscFile() -{ - for ( size_t i = 0, n = aDepLst.size(); i < n; ++i ) - delete aDepLst[ i ]; - aDepLst.clear(); - - // from back to front is better because of dependencies - // objects are destroyed when reference counter is NULL - while( aDefLst.Remove() ) ; -} - -bool RscFile::Depend( RscFileTab::Index lDepend, RscFileTab::Index lFree ) -{ - for ( size_t i = aDepLst.size(); i > 0; ) - { - RscDepend * pDep = aDepLst[ --i ]; - if( pDep->GetFileKey() == lDepend ) - { - for ( size_t j = i ? --i : 0; j > 0; ) - { - pDep = aDepLst[ --j ]; - if( pDep->GetFileKey() == lFree ) - return true; - } - return false; - } - } - return true; -} - -void RscFile::InsertDependFile( RscFileTab::Index lIncFile ) -{ - for ( size_t i = 0, n = aDepLst.size(); i < n; ++i ) - { - RscDepend* pDep = aDepLst[ i ]; - if( pDep->GetFileKey() == lIncFile ) - return; - } - - aDepLst.push_back( new RscDepend( lIncFile ) ); -} - -RscDefTree::~RscDefTree() -{ - Remove(); -} - -void RscDefTree::Remove() -{ - while( pDefRoot ) - { - RscDefine * pDef = pDefRoot; - pDefRoot = static_cast(pDefRoot->Remove( pDefRoot )); - pDef->DecRef(); - } -} - -RscDefine * RscDefTree::Search( const char * pName ) -{ - if( pDefRoot ) - return pDefRoot->Search( pName ); - return nullptr; -} - -void RscDefTree::Insert( RscDefine * pDef ) -{ - if( pDefRoot ) - pDefRoot->Insert( pDef ); - else - pDefRoot = pDef; - pDef->IncRef(); -} - -void RscDefTree::Remove( RscDefine * pDef ) -{ - if( pDefRoot ) - { - // in case pDef == pDefRoot - pDefRoot = static_cast(pDefRoot->Remove( pDef )); - } - pDef->DecRef(); -} - -bool RscDefTree::Evaluate( RscDefine * pDef ) -{ - if( pDef ) - { - if( !Evaluate( static_cast(pDef->Left()) ) ) - return false; - if( !Evaluate( static_cast(pDef->Right()) ) ) - return false; - } - return true; -} - -RscFileTab::RscFileTab() -{ -} - -RscFileTab::~RscFileTab() -{ - - aDefTree.Remove(); - - Index aIndex = LastIndex(); - while( aIndex != IndexNotFound ) - { - delete Remove( aIndex ); - aIndex = LastIndex(); - }; -} - -RscFileTab::Index RscFileTab::Find( const OString& rName ) -{ - Index aIndex = FirstIndex(); - while( aIndex != IndexNotFound && (Get(aIndex)->aFileName != rName) ) - aIndex = NextIndex(aIndex); - - return aIndex; -} - -RscDefine * RscFileTab::FindDef( const char * pName ) -{ - return aDefTree.Search( pName ); -} - -/* This method gives back true when lDepend - exists and is behind lFree, or when lDepend does not exist. */ -bool RscFileTab::Depend( Index lDepend, Index lFree ) -{ - if( lDepend == lFree ) - return true; - - Index aIndex = FirstIndex(); - while( aIndex != IndexNotFound ) - { - RscFile * pFile = Get(aIndex); - if( !pFile->IsIncFile() ) - { - if( !pFile->Depend( lDepend, lFree ) ) - return false; - } - aIndex = NextIndex(aIndex); - } - - return true; -} - -bool RscFileTab::TestDef( Index lFileKey, size_t lPos, - const RscDefine * pDefDec ) -{ - if( lFileKey == pDefDec->GetFileKey() ) - { - RscFile * pFile = GetFile( pDefDec->GetFileKey() ); - if( pFile && (lPos <= pFile->aDefLst.GetPos( const_cast(pDefDec) )) - && (lPos != ULONG_MAX ) ) - { - return false; - } - } - else if( !Depend( lFileKey, pDefDec->GetFileKey() ) ) - return false; - - return TestDef( lFileKey, lPos, pDefDec->pExp ); -} - -bool RscFileTab::TestDef( Index lFileKey, size_t lPos, - const RscExpression * pExpDec ) -{ - if( !pExpDec ) - return true; - - if( pExpDec->aLeftExp.IsExpression() ) - if( !TestDef( lFileKey, lPos, pExpDec->aLeftExp.aExp.pExp ) ) - return false; - - if( pExpDec->aLeftExp.IsDefinition() ) - if( !TestDef( lFileKey, lPos, pExpDec->aLeftExp.aExp.pDef ) ) - return false; - - if( pExpDec->aRightExp.IsExpression() ) - if( !TestDef( lFileKey, lPos, pExpDec->aRightExp.aExp.pExp ) ) - return false; - - if( pExpDec->aRightExp.IsDefinition() ) - if( !TestDef( lFileKey, lPos, pExpDec->aRightExp.aExp.pDef ) ) - return false; - - return true; -} - -RscDefine * RscFileTab::NewDef( Index lFileKey, const OString& rDefName, - sal_Int32 lId ) -{ - RscDefine * pDef = FindDef( rDefName ); - - if( !pDef ) - { - RscFile * pFile = GetFile( lFileKey ); - - if( pFile ) - { - pDef = pFile->aDefLst.New( lFileKey, rDefName, lId, ULONG_MAX ); - aDefTree.Insert( pDef ); - } - } - else - pDef = nullptr; - - return pDef; -} - -RscDefine * RscFileTab::NewDef( Index lFileKey, const OString& rDefName, - RscExpression * pExp ) -{ - RscDefine * pDef = FindDef( rDefName ); - - if( !pDef ) - { - // are macros in expressions defined? - if( TestDef( lFileKey, ULONG_MAX, pExp ) ) - { - RscFile * pFile = GetFile( lFileKey ); - - if( pFile ) - { - pDef = pFile->aDefLst.New( lFileKey, rDefName, pExp, ULONG_MAX ); - aDefTree.Insert( pDef ); - } - } - } - else - pDef = nullptr; - - if( !pDef ) - { - // pExp is always owned and must be deleted after used - delete pExp; - } - return pDef; -} - -void RscFileTab::DeleteFileContext( Index lFileKey ) -{ - RscFile* pFName = GetFile( lFileKey ); - if( pFName ) - { - for ( size_t i = 0, n = pFName->aDefLst.maList.size(); i < n; ++i ) - { - RscDefine * pDef = pFName->aDefLst.maList[ i ]; - aDefTree.Remove( pDef ); - }; - - while( pFName->aDefLst.Remove() ) ; - } -} - -RscFileTab::Index RscFileTab::NewCodeFile( const OString& rName ) -{ - Index lKey = Find( rName ); - if( lKey == IndexNotFound ) - { - RscFile * pFName = new RscFile(); - pFName->aFileName = rName; - pFName->aPathName = rName; - lKey = Insert( pFName ); - pFName->InsertDependFile( lKey ); - } - return lKey; -} - -RscFileTab::Index RscFileTab::NewIncFile(const OString& rName, - const OString& rPath) -{ - Index lKey = Find( rName ); - if( lKey == IndexNotFound ) - { - RscFile * pFName = new RscFile(); - pFName->aFileName = rName; - pFName->aPathName = rPath; - pFName->SetIncFlag(); - lKey = Insert( pFName ); - pFName->InsertDependFile( lKey ); - } - return lKey; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/tools/rschash.cxx b/rsc/source/tools/rschash.cxx deleted file mode 100644 index 65388ec91ca2..000000000000 --- a/rsc/source/tools/rschash.cxx +++ /dev/null @@ -1,59 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include - - -AtomContainer::AtomContainer() -{ - m_aStringToID[ OString() ] = 0; - m_aIDToString[ 0 ].clear(); - m_nNextID = 1; -} - -AtomContainer::~AtomContainer() -{ -} - -Atom AtomContainer::getID( const OString& rStr, bool bOnlyIfExists ) -{ - OString aKey = rStr.toAsciiLowerCase(); - std::unordered_map< OString, Atom, OStringHash >::const_iterator it = - m_aStringToID.find( aKey ); - if( it != m_aStringToID.end() ) - return it->second; - - if( bOnlyIfExists ) - return InvalidAtom; - - Atom aRet = m_nNextID; - m_aStringToID[ aKey ] = m_nNextID; - m_aIDToString[ m_nNextID ] = rStr; - m_nNextID++; - return aRet; -} - -const OString& AtomContainer::getString( Atom nAtom ) -{ - std::unordered_map< Atom, OString >::const_iterator it = - m_aIDToString.find( nAtom ); - return (it != m_aIDToString.end()) ? it->second : m_aIDToString[0]; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/tools/rsctools.cxx b/rsc/source/tools/rsctools.cxx deleted file mode 100644 index e65874a10b0e..000000000000 --- a/rsc/source/tools/rsctools.cxx +++ /dev/null @@ -1,255 +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 -#include -#if defined(_WIN32) -#include -#endif -#include - -#include -#include - -#include -#include -#include -#include - -/* case insensitive compare of two strings up to a given length */ -int rsc_strnicmp( const char *string1, const char *string2, size_t count ) -{ - return rtl_str_shortenedCompareIgnoreAsciiCase_WithLength( - string1, strlen (string1), string2, strlen (string2), count); -} - -/* case insensitive compare of two strings */ -int rsc_stricmp( const char *string1, const char *string2 ) -{ - return rtl_str_compareIgnoreAsciiCase( string1, string2 ); -} - -char* rsc_strdup( const char* pStr ) -{ - int nLen = strlen( pStr ); - char* pBuffer = static_cast(rtl_allocateMemory( nLen+1 )); - memcpy( pBuffer, pStr, nLen+1 ); - return pBuffer; -} - -OString GetTmpFileName() -{ - OUString aTmpURL, aTmpFile; - osl_createTempFile( nullptr, nullptr, &aTmpURL.pData ); - osl_getSystemPathFromFileURL( aTmpURL.pData, &aTmpFile.pData ); - return OUStringToOString( aTmpFile, RTL_TEXTENCODING_MS_1252 ); -} - -/* replaces extension of a file name */ -OString OutputFile(const OString &rInput, const char * pExt) -{ - sal_Int32 nSepInd = rInput.lastIndexOf('.'); - - if( nSepInd != -1 ) - { - return rInput.copy(0, nSepInd + 1).concat(OString(pExt)); - } - - return rInput.concat(OString(".")).concat(OString(pExt)); -} - -char * ResponseFile( RscPtrPtr * ppCmd, char ** ppArgv, sal_uInt32 nArgc ) -{ - FILE *fFile; - int nItems; - char szBuffer[4096]; // file buffer - sal_uInt32 i; - bool bInQuotes = false; - - // program name - ppCmd->Append( rsc_strdup( *ppArgv ) ); - for( i = 1; i < nArgc; i++ ) - { - if( '@' == **(ppArgv +i) ){ // when @, then response file - if( nullptr == (fFile = fopen( (*(ppArgv +i)) +1, "r" )) ) - return *(ppArgv +i); - nItems = fread( &szBuffer[ 0 ], 1, sizeof( char ), fFile ); - while( nItems ) - { - if( !rtl::isAsciiWhiteSpace( - static_cast(szBuffer[ 0 ]) ) ) - { - /* - * #i27914# double ticks '"' now have a duplicate function: - * 1. they define a string ( e.g. -DFOO="baz" ) - * 2. a string can contain spaces, so -DFOO="baz zum" defines one - * argument no two ! - */ - unsigned int n = 0; - while( nItems && - (!rtl::isAsciiWhiteSpace( - static_cast(szBuffer[ n ]) ) || - bInQuotes) && - n +1 < sizeof( szBuffer ) ) - { - n++; - nItems = fread( &szBuffer[ n ], 1, - sizeof( char ), fFile ); - if( szBuffer[n] == '"' ) - bInQuotes = !bInQuotes; - } - szBuffer[ n ] = '\0'; - ppCmd->Append( rsc_strdup( szBuffer ) ); - } - nItems = fread( &szBuffer[ 0 ], 1, sizeof( char ), fFile ); - } - - fclose( fFile ); - } - else - ppCmd->Append( rsc_strdup( *(ppArgv +i) ) ); - } - ppCmd->Append( static_cast(nullptr) ); - return nullptr; -} - - -RscPtrPtr::RscPtrPtr() -{ - nCount = 0; - pMem = nullptr; -} - -RscPtrPtr::~RscPtrPtr() -{ - Reset(); -} - -void RscPtrPtr::Reset() -{ - sal_uInt32 i; - - if( pMem ) - { - for( i = 0; i < nCount; i++ ) - { - if( pMem[ i ] ) - rtl_freeMemory( pMem[ i ] ); - } - rtl_freeMemory( static_cast(pMem) ); - }; - nCount = 0; - pMem = nullptr; -} - -sal_uInt32 RscPtrPtr::Append( void * pBuffer ) -{ - if( !pMem ) - pMem = static_cast(rtl_allocateMemory( (nCount +1) * sizeof( void * ) )); - else - pMem = static_cast(rtl_reallocateMemory( static_cast(pMem), - ((nCount +1) * sizeof( void * ) - ) )); - pMem[ nCount ] = pBuffer; - return nCount++; -} - -void * RscPtrPtr::GetEntry( sal_uInt32 nEntry ) -{ - if( nEntry < nCount ) - return pMem[ nEntry ]; - return nullptr; -} - -RscWriteRc::RscWriteRc( RSCBYTEORDER_TYPE nOrder ) -{ - bSwap = false; - if( nOrder != RSC_SYSTEMENDIAN ) - { - RSCBYTEORDER_TYPE nMachineOrder; -#if defined OSL_LITENDIAN - nMachineOrder = RSC_LITTLEENDIAN; -#else - nMachineOrder = RSC_BIGENDIAN; -#endif - bSwap = nOrder != nMachineOrder; - } - nLen = 0; - pMem = nullptr; -} - -RscWriteRc::~RscWriteRc() -{ - if( pMem ) - rtl_freeMemory( pMem ); -} - -sal_uInt32 RscWriteRc::IncSize( sal_uInt32 nSize ) -{ - sal_uInt32 nOrigPos = nLen; - nLen += nSize; - if( pMem ) - pMem = static_cast(rtl_reallocateMemory( pMem, nLen )); - if( pMem ) - memset( pMem + nOrigPos, 0, nSize ); - return nOrigPos; -} - -char * RscWriteRc::GetPointer( sal_uInt32 nSize ) -{ - if( !pMem ) - { - pMem = static_cast(rtl_allocateMemory( nLen )); - memset( pMem, 0, nLen ); - } - return pMem + nSize; -} - - -void RscWriteRc::Put( sal_uInt16 nVal ) -{ - sal_uInt32 nOldLen; - - nOldLen = IncSize( sizeof( nVal ) ); - PutAt( nOldLen, nVal ); -} - -void RscWriteRc::PutUTF8( char * pStr ) -{ - sal_uInt32 nStrLen = 0; - if( pStr ) - nStrLen = strlen( pStr ); - - sal_uInt32 n = nStrLen +1; - if( n % 2 ) - // align to 2 - n++; - - sal_uInt32 nOldLen = IncSize( n ); - char * p = GetPointer( nOldLen ); - if (nStrLen != 0) - { - memcpy( p, pStr, nStrLen ); - } - // 0 terminated - pMem[ nOldLen + nStrLen ] = '\0'; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/tools/rsctree.cxx b/rsc/source/tools/rsctree.cxx deleted file mode 100644 index 6add08277267..000000000000 --- a/rsc/source/tools/rsctree.cxx +++ /dev/null @@ -1,359 +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 -#include -#include - -#include -#include - - -NameNode::NameNode() -{ - pLeft = pRight = nullptr; -} - -NameNode::~NameNode() -{ -} - -void NameNode::EnumNodes( Link aLink ) const -{ - if( Left() ) - Left()->EnumNodes( aLink ); - aLink.Call( *this ); - if( Right() ) - Right()->EnumNodes( aLink ); -} - -NameNode * NameNode::ChangeDLListBTree( NameNode * pList ) -{ - NameNode * pMiddle; - NameNode * pTmp; - sal_uInt32 nEle, i; - - if( pList ) - { - while( pList->Left() ) - pList = pList->Left(); - pTmp = pList; - - for( nEle = 0; pTmp->Right(); nEle++ ) - pTmp = pTmp->Right(); - - pMiddle = pList; - if( nEle / 2 ) - { - for( i = 0; i < (nEle / 2); i++ ) - { - pMiddle = pMiddle->Right(); - } - } - else - { - pList = nullptr; - } - if( nullptr != (pTmp = pMiddle->Left()) ) // set right pointer to NULL - pTmp->pRight = nullptr; - - // set left pointer to NULL - NameNode * pRightNode = pMiddle->Right(); - if (pRightNode) - pRightNode->pLeft = nullptr; - - pMiddle->pLeft = ChangeDLListBTree( pList ); - pMiddle->pRight = ChangeDLListBTree( pRightNode ); - - return pMiddle; - } - return pList; -} - -NameNode * NameNode::ChangeBTreeDLList() -{ - NameNode * pList; - NameNode * pLL_RN; // right node of left list - - if( Right() ) - { - pList = Right()->ChangeBTreeDLList(); - pRight = pList; - pList->pLeft = this; - } - pList = this; - if( Left() ) - { - pLL_RN = pList = Left()->ChangeBTreeDLList(); - - while( pLL_RN->Right() ) - pLL_RN = pLL_RN->Right(); - - pLeft = pLL_RN; - pLL_RN->pRight = this; - } - return pList; -} - -NameNode * NameNode::Remove( NameNode * pRemove ) -{ - NameNode * pRoot = this; - NameNode * pParent = SearchParent( pRemove ); - - if( pParent ) - { - if( pParent->Left() && - (EQUAL == pRemove->Compare( pParent->Left() ) ) ) - { - pParent->pLeft = pRemove->Left(); - if( pRemove->Right() ) - pParent->Insert( pRemove->Right() ); - } - else if( pParent->Right() && - (EQUAL == pRemove->Compare( pParent->Right() ) ) ) - { - pParent->pRight = pRemove->Right(); - if( pRemove->Left() ) - pParent->Insert( pRemove->Left() ); - } - } - else if( EQUAL == this->Compare( pRemove ) ) - { - if( Right() ) - { - pRoot = Right(); - if( Left() ) - Right()->Insert( Left() ); - } - else - { - pRoot = Left(); - } - } - pRemove->pLeft = pRemove->pRight = nullptr; - - return pRoot; -} - - -COMPARE NameNode::Compare( const NameNode * pCompare ) const -{ - if( reinterpret_cast(this) < reinterpret_cast(pCompare) ) - return LESS; - else if( reinterpret_cast(this) > reinterpret_cast(pCompare) ) - return GREATER; - else - return EQUAL; -} - -COMPARE NameNode::Compare( const void * pCompare ) const -{ - if( reinterpret_cast(this) < reinterpret_cast(pCompare) ) - return LESS; - else if( reinterpret_cast(this) > reinterpret_cast(pCompare) ) - return GREATER; - else - return EQUAL; -} - -// search for a parent node. -// return a pointer to the parent node if found. -// otherwise return 0. -NameNode* NameNode::SearchParent( const NameNode * pSearch ) const -{ - int nCmp = Compare( pSearch ); - - if( nCmp == GREATER ) - { - if( Left() ) - { - if( Left()->Compare( pSearch ) == EQUAL ) - return const_cast(this); - return Left()->SearchParent( pSearch ); - } - } - else if( nCmp == LESS ) - { - if( Right() ) - { - if( Right()->Compare( pSearch ) == EQUAL ) - return const_cast(this); - return Right()->SearchParent( pSearch ); - } - } - return nullptr; -} - -// search for a node. -// return a pointer to the node if found. -// otherwise return 0. -NameNode* NameNode::Search( const NameNode * pSearch ) const -{ - int nCmp = Compare( pSearch ); - - if( nCmp == GREATER ) - { - if( Left() ) - return Left()->Search( pSearch ); - } - else if( nCmp == LESS ) - { - if( Right() ) - return Right()->Search( pSearch ); - } - else - return const_cast(this); - - return nullptr; -} - -// search for a node. -// return a pointer to the node if found. -// otherwise return 0. -NameNode* NameNode::Search( const void * pSearch ) const -{ - int nCmp = Compare( pSearch ); - - if( nCmp == GREATER ) - { - if( Left() ) - return Left()->Search( pSearch ); - } - else if( nCmp == LESS ) - { - if( Right() ) - return Right()->Search( pSearch ); - } - else - return const_cast(this); - - return nullptr; -} - -// A node is inserted into the tree -// If a node with the same name already exists, then returns false -// otherwise, returns true, In any case, the node will be inserted -bool NameNode::Insert( NameNode * pTN, sal_uInt32* pnDepth ) -{ - bool bRet = true; - int nCmp = Compare( pTN ); - - *pnDepth += 1; - if( nCmp == GREATER ) - { - if( Left() ) - bRet = Left()->Insert( pTN, pnDepth ); - else - pLeft = pTN; - } - else - { - if( Right() ) - bRet = Right()->Insert( pTN, pnDepth ); - else - pRight = pTN; - - if( nCmp == EQUAL ) - bRet = false; - } - return bRet; -} - -// insert a node in the tree. -// if the node with the same name is in, return false and no insert. -// if not return true. -bool NameNode::Insert( NameNode * pTN ) -{ - sal_uInt32 nDepth = 0; - bool bRet; - - bRet = Insert( pTN, &nDepth ); - if( bRet ) - { - if( nDepth > 20 ) - { - if( Left() ) - pLeft = ChangeDLListBTree( Left()->ChangeBTreeDLList() ); - if( Right() ) - pRight = ChangeDLListBTree( Right()->ChangeBTreeDLList() ); - } - } - - return bRet; -} - -void NameNode::OrderTree() -{ - NameNode * pTmpLeft = Left(); - NameNode * pTmpRight = Right(); - - pLeft = nullptr; - pRight = nullptr; - SubOrderTree( pTmpLeft ); - SubOrderTree( pTmpRight ); -} - -void NameNode::SubOrderTree( NameNode * pOrderNode ) -{ - if( pOrderNode ) - { - NameNode * pTmpLeft = pOrderNode->Left(); - NameNode * pTmpRight = pOrderNode->Right(); - pOrderNode->pLeft = nullptr; - pOrderNode->pRight = nullptr; - Insert( pOrderNode ); - SubOrderTree( pTmpLeft ); - SubOrderTree( pTmpRight ); - } -} - -IdNode * IdNode::Search( sal_uInt32 nTypeName ) const -{ - return static_cast(NameNode::Search( static_cast(&nTypeName) )); -} - -COMPARE IdNode::Compare( const NameNode * pSearch ) const -{ - if( GetId() < static_cast(pSearch)->GetId() ) - return LESS; - else if( GetId() > static_cast(pSearch)->GetId() ) - return GREATER; - else - return EQUAL; -} - -// pSearch is a pointer to sal_uInt32 -COMPARE IdNode::Compare( const void * pSearch ) const -{ - if( GetId() < *static_cast(pSearch) ) - return LESS; - else if( GetId() > *static_cast(pSearch) ) - return GREATER; - else - return EQUAL; -} - -sal_uInt32 IdNode::GetId() const -{ - return 0xFFFFFFFF; -} - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx index 172a5a3e6952..1b66dbab5c78 100644 --- a/sal/rtl/bootstrap.cxx +++ b/sal/rtl/bootstrap.cxx @@ -375,7 +375,7 @@ Bootstrap_Impl::Bootstrap_Impl( OUString const & rIniName ) } else { - SAL_WARN( "sal.bootstrap", "couldn't open file: " << _iniName ); + SAL_INFO( "sal.bootstrap", "couldn't open file: " << _iniName ); } } diff --git a/sc/AllLangMoTarget_sc.mk b/sc/AllLangMoTarget_sc.mk new file mode 100644 index 000000000000..c00e627ac9ee --- /dev/null +++ b/sc/AllLangMoTarget_sc.mk @@ -0,0 +1,11 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# 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/. + +$(eval $(call gb_AllLangMoTarget_AllLangMoTarget,sc)) + +# vim: set noet sw=4 ts=4: diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk deleted file mode 100644 index 05e0d4550341..000000000000 --- a/sc/AllLangResTarget_sc.mk +++ /dev/null @@ -1,47 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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/. -# - - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,sc)) - -$(eval $(call gb_AllLangResTarget_add_srs,sc,\ - sc/res \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,sc/res)) - -$(eval $(call gb_SrsTarget_set_include,sc/res,\ - $$(INCLUDE) \ - -I$(SRCDIR)/sc/inc \ - -I$(SRCDIR)/sc/source/ui/inc \ - -I$(SRCDIR)/sc/source/ui/navipi \ - -I$(SRCDIR)/sc/source/ui/docshell \ - -I$(SRCDIR)/sc/source/ui/dbgui \ - -I$(SRCDIR)/sc/source/ui/formdlg \ -)) - -$(eval $(call gb_SrsTarget_add_files,sc/res,\ - sc/source/ui/src/globstr.src \ - sc/source/ui/src/toolbox.src \ - sc/source/ui/src/scfuncs.src \ - sc/source/ui/src/sc.src \ - sc/source/ui/src/scerrors.src \ - sc/source/ui/src/scstring.src \ - sc/source/ui/cctrl/checklistmenu.src \ - sc/source/ui/navipi/navipi.src \ - sc/source/ui/styleui/scstyles.src \ - sc/source/ui/dbgui/pvfundlg.src \ - sc/source/ui/miscdlgs/retypepassdlg.src \ - sc/source/ui/miscdlgs/conflictsdlg.src \ - sc/source/ui/miscdlgs/acredlin.src \ - sc/source/ui/StatisticsDialogs/StatisticsDialogs.src \ - sc/source/core/src/compiler.src \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_screenshots.mk b/sc/CppunitTest_sc_screenshots.mk index fde5d149cdb3..5d1575440a73 100644 --- a/sc/CppunitTest_sc_screenshots.mk +++ b/sc/CppunitTest_sc_screenshots.mk @@ -62,6 +62,4 @@ $(eval $(call gb_CppunitTest_use_uiconfigs,sc_screenshots,\ modules/scalc \ )) -$(call gb_CppunitTest_get_target,sc_screenshots) : $(call gb_AllLangResTarget_get_target,sc) - # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_tiledrendering.mk b/sc/CppunitTest_sc_tiledrendering.mk index 3926e5fdcd23..c02453891c3f 100644 --- a/sc/CppunitTest_sc_tiledrendering.mk +++ b/sc/CppunitTest_sc_tiledrendering.mk @@ -54,6 +54,4 @@ $(eval $(call gb_CppunitTest_use_rdb,sc_tiledrendering,services)) $(eval $(call gb_CppunitTest_use_configuration,sc_tiledrendering)) -$(call gb_CppunitTest_get_target,sc_tiledrendering) : $(call gb_AllLangResTarget_get_target,sc) - # vim: set noet sw=4 ts=4: diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index c9f54638e62e..87bd70ada626 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -713,7 +713,4 @@ $(eval $(call gb_SdiTarget_set_include,sc/sdi/scslots,\ $$(INCLUDE) \ )) -# Runtime dependency for unit-tests -$(eval $(call gb_Library_use_restarget,sc,sc)) - # vim: set noet sw=4 ts=4: diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index edb72275e6a9..338ad5cdf609 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -17,11 +17,11 @@ $(eval $(call gb_Module_add_targets,sc,\ $(call gb_Helper_optional,DESKTOP,Library_scui) \ $(call gb_Helper_optional,OPENCL,Package_opencl) \ Package_res_xml \ + UIConfig_scalc \ )) $(eval $(call gb_Module_add_l10n_targets,sc,\ - AllLangResTarget_sc \ - UIConfig_scalc \ + AllLangMoTarget_sc \ )) ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),) diff --git a/sc/inc/compiler.hrc b/sc/inc/compiler.hrc new file mode 100644 index 000000000000..1df61083bbf9 --- /dev/null +++ b/sc/inc/compiler.hrc @@ -0,0 +1,42 @@ +/* -*- 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_SC_INC_COMPILER_HRC +#define INCLUDED_SC_INC_COMPILER_HRC + +#define NC_(Context, String) (Context "\004" u8##String) + +const char* RID_FUNCTION_CATEGORIES[] = +{ + NC_("RID_FUNCTION_CATEGORIES", "Database"), + NC_("RID_FUNCTION_CATEGORIES", "Date&Time"), + NC_("RID_FUNCTION_CATEGORIES", "Financial"), + NC_("RID_FUNCTION_CATEGORIES", "Information"), + NC_("RID_FUNCTION_CATEGORIES", "Logical"), + NC_("RID_FUNCTION_CATEGORIES", "Mathematical"), + NC_("RID_FUNCTION_CATEGORIES", "Array"), + NC_("RID_FUNCTION_CATEGORIES", "Statistical"), + NC_("RID_FUNCTION_CATEGORIES", "Spreadsheet"), + NC_("RID_FUNCTION_CATEGORIES", "Text"), + NC_("RID_FUNCTION_CATEGORIES", "Add-in") +}; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index e258720daef6..3623d0715f59 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -363,7 +363,7 @@ public: ScDPCollection(const ScDPCollection& r); ~ScDPCollection(); - sal_uLong ReloadCache(ScDPObject* pDPObj, std::set& rRefs); + const char* ReloadCache(ScDPObject* pDPObj, std::set& rRefs); bool ReloadGroupsInCache(ScDPObject* pDPObj, std::set& rRefs); SC_DLLPUBLIC bool GetReferenceGroups(const ScDPObject& rDPObj, const ScDPDimensionSaveData** pGroups) const; diff --git a/sc/inc/dpshttab.hxx b/sc/inc/dpshttab.hxx index c69cd479fc49..388522b8a213 100644 --- a/sc/inc/dpshttab.hxx +++ b/sc/inc/dpshttab.hxx @@ -73,10 +73,10 @@ public: /** * Check the sanity of the data source range. * - * @return 0 if the source range is sane, otherwise an error message ID is + * @return nullptr if the source range is sane, otherwise an error message ID is * returned. */ - sal_uLong CheckSourceRange() const; + const char* CheckSourceRange() const; private: mutable ScRange maSourceRange; diff --git a/sc/inc/funcdesc.hxx b/sc/inc/funcdesc.hxx index 377f82ea8489..bb0361def4eb 100644 --- a/sc/inc/funcdesc.hxx +++ b/sc/inc/funcdesc.hxx @@ -22,7 +22,7 @@ /* Function descriptions for function wizard / autopilot */ -#include "scfuncs.hrc" +#include "scfuncs.hxx" #include #include diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index 7219b9bd2a04..97cd14bba08f 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -28,6 +28,7 @@ #include "scdllapi.h" #include +#include #include class Bitmap; @@ -508,7 +509,7 @@ class ScGlobal static LegacyFuncCollection* pLegacyFuncCollection; static ScUnoAddInCollection* pAddInCollection; static ScUserList* pUserList; - static OUString** ppRscString; + static std::map* pRscString; static OUString* pStrScDoc; static OUString* pEmptyOUString; static OUString* pStrClipDocName; @@ -568,7 +569,7 @@ public: SC_DLLPUBLIC static ScUnoAddInCollection* GetAddInCollection(); SC_DLLPUBLIC static ScUserList* GetUserList(); static void SetUserList( const ScUserList* pNewList ); - SC_DLLPUBLIC static const OUString& GetRscString( sal_uInt16 nIndex ); + SC_DLLPUBLIC static const OUString& GetRscString(const char* pResId); /// Open the specified URL. static void OpenURL(const OUString& rURL, const OUString& rTarget); SC_DLLPUBLIC static OUString GetAbsDocName( const OUString& rFileName, diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc index b8e6e81991d1..af7c749baaee 100644 --- a/sc/inc/globstr.hrc +++ b/sc/inc/globstr.hrc @@ -20,654 +20,504 @@ #ifndef SC_GLOBSTR_HRC #define SC_GLOBSTR_HRC +#define NC_(Context, String) (Context "\004" u8##String) + /* * This file is reserved for string IDs of permanently loaded resident string * resources for faster access in core and filter code (and some UI like * Undo/Redo or strings displayed in the status bar), they reside in resource * RID_GLOBSTR and are meant to be accessed via ScGlobal::GetRscString(). All * other string IDs of strings used in message boxes and elsewhere go into - * sc/inc/sc.hrc if they need to be global, or if restricted to UI dialogs into - * a proper sc/source/ui/xxx/yyy.hrc and corresponding .src PLEASE! - * - * When inserting or removing defines the entire file can be renumbered using - * sc/util/number-defines-consecutively.awk - * Hint: when inserting a define use some arbitrary large enough number such as - * 9999 and then renumber the file, which you HAVE TO then since otherwise the - * number would be greater than the count of resident strings. + * sc/inc/strings.hrc */ -#define STR_UNDO_DELETECELLS 1 -#define STR_UNDO_CUT 2 -#define STR_UNDO_PASTE 3 -#define STR_UNDO_MOVE 4 -#define STR_UNDO_COPY 5 -#define STR_UNDO_DELETECONTENTS 6 -#define STR_UNDO_SELATTR 7 -#define STR_UNDO_SELATTRLINES 8 -#define STR_UNDO_COLWIDTH 9 -#define STR_UNDO_OPTCOLWIDTH 10 -#define STR_UNDO_ROWHEIGHT 11 -#define STR_UNDO_OPTROWHEIGHT 12 -#define STR_UNDO_AUTOFILL 13 -#define STR_UNDO_MERGE 14 -#define STR_UNDO_REMERGE 15 -#define STR_UNDO_AUTOFORMAT 16 -#define STR_UNDO_REPLACE 17 -#define STR_UNDO_CURSORATTR 18 -#define STR_UNDO_ENTERDATA 19 -#define STR_UNDO_INSCOLBREAK 20 -#define STR_UNDO_DELCOLBREAK 21 -#define STR_UNDO_INSROWBREAK 22 -#define STR_UNDO_DELROWBREAK 23 -#define STR_UNDO_DOOUTLINE 24 -#define STR_UNDO_REDOOUTLINE 25 -#define STR_UNDO_MAKEOUTLINE 26 -#define STR_UNDO_REMAKEOUTLINE 27 -#define STR_UNDO_OUTLINELEVEL 28 -#define STR_UNDO_DOOUTLINEBLK 29 -#define STR_UNDO_REDOOUTLINEBLK 30 -#define STR_UNDO_REMOVEALLOTLNS 31 -#define STR_UNDO_AUTOOUTLINE 32 -#define STR_UNDO_SUBTOTALS 33 -#define STR_UNDO_SORT 34 -#define STR_UNDO_QUERY 35 -#define STR_UNDO_DBDATA 36 -#define STR_UNDO_IMPORTDATA 37 -#define STR_UNDO_REPEATDB 38 - -#define STR_MSSG_DOSUBTOTALS_0 39 -#define STR_MSSG_DOSUBTOTALS_1 40 -#define STR_MSSG_DOSUBTOTALS_2 41 -#define STR_MSSG_REPEATDB_0 42 -#define STR_MSSG_MAKEAUTOFILTER_0 43 -#define STR_MSSG_IMPORTDATA_0 44 -#define STR_MSSG_MAKEOUTLINE_0 45 -#define STR_MSSG_REMOVEOUTLINE_0 46 -#define STR_MSSG_PASTEFROMCLIP_0 47 -#define STR_MSSG_MOVEBLOCKTO_0 48 -#define STR_MSSG_INSERTCELLS_0 49 -#define STR_MSSG_DELETECELLS_0 50 -#define STR_MSSG_MERGECELLS_0 51 -#define STR_MSSG_SOLVE_0 52 -#define STR_MSSG_SOLVE_1 53 -#define STR_MSSG_SOLVE_2 54 -#define STR_MSSG_SOLVE_3 55 -#define STR_MSSG_SOLVE_4 56 - -#define STR_TABLE_GESAMTERGEBNIS 57 -#define STR_TABLE_ERGEBNIS 58 -#define STR_UNDO_SPELLING 59 -#define STR_TABLE_UND 60 -#define STR_TABLE_ODER 61 -#define STR_UNDO_INSERTCELLS 62 -#define STR_TABLE_DEF 63 -#define STR_MOVE_TO_END 64 -#define STR_NO_REF_TABLE 65 - -#define STR_PIVOT_TOTAL 66 -#define STR_PIVOT_DATA 67 - -#define STR_COLUMN 68 -#define STR_ROW 69 -#define STR_LOAD_DOC 70 -#define STR_SAVE_DOC 71 - -#define STR_AREA_ALREADY_INSERTED 72 -#define STR_INVALID_TABREF 73 -#define STR_INVALID_QUERYAREA 74 - -#define STR_REIMPORT_EMPTY 75 -#define STR_NOMULTISELECT 76 -#define STR_FILL_SERIES_PROGRESS 77 // documen3.cxx - -#define STR_COND_AND 78 - -#define STR_UNDO_PRINTRANGES 79 - -#define STR_UNDO_DEC_INDENT 80 -#define STR_UNDO_INC_INDENT 81 -#define STR_UNDO_THESAURUS 82 - -#define STR_FILL_TAB 83 -#define STR_NO_VALUE 84 /* moved to compiler.src, keep define! */ -#define STR_UPDATE_SCENARIO 85 -#define STR_ERR_NEWSCENARIO 86 -#define STR_SCENARIO 87 -#define STR_PIVOT_TABLE 88 -#define STR_NEWTABNAMENOTUNIQUE 89 - -#define STR_FUN_TEXT_SUM 90 -#define STR_FUN_TEXT_COUNT 91 -#define STR_FUN_TEXT_AVG 92 -#define STR_FUN_TEXT_MEDIAN 93 -#define STR_FUN_TEXT_MAX 94 -#define STR_FUN_TEXT_MIN 95 -#define STR_FUN_TEXT_PRODUCT 96 -#define STR_FUN_TEXT_STDDEV 97 -#define STR_FUN_TEXT_VAR 98 -#define STR_DOC_STAT 99 - -#define STR_DBNAME_IMPORT 100 - -#define STR_NOCHARTATCURSOR 101 -#define STR_NOAREASELECTED 102 -#define STR_INVALIDTABNAME 103 - -#define STR_PIVOT_NOTFOUND 104 -#define STR_ERROR_STR 105 -#define STR_NV_STR 106 /* moved to compiler.src, keep define! */ -#define STR_EMPTYDATA 107 -#define STR_PIVOT_NODATA 108 -#define STR_PIVOT_MOVENOTALLOWED 109 - -#define STR_PRINT_INVALID_AREA 110 - -#define STR_PAGESTYLE 111 -#define STR_HEADER 112 -#define STR_FOOTER 113 - -#define STR_TEXTATTRS 114 - -#define STR_HFCMD_DELIMITER 115 -#define STR_HFCMD_PAGE 116 -#define STR_HFCMD_PAGES 117 -#define STR_HFCMD_DATE 118 -#define STR_HFCMD_TIME 119 -#define STR_HFCMD_FILE 120 -#define STR_HFCMD_TABLE 121 - -#define STR_PROTECTIONERR 122 - -#define STR_PAGEHEADER 123 -#define STR_PAGEFOOTER 124 -#define STR_PAGE 125 -#define STR_LONG_ERR_ILL_ARG 126 -#define STR_LONG_ERR_ILL_PAR 127 -#define STR_LONG_ERR_ILL_FPO 128 -#define STR_LONG_ERR_ILL_CHAR 129 -// empty -#define STR_LONG_ERR_PAIR 130 -#define STR_LONG_ERR_OP_EXP 131 -#define STR_LONG_ERR_VAR_EXP 132 -#define STR_LONG_ERR_CODE_OVF 133 -#define STR_LONG_ERR_STR_OVF 134 -#define STR_LONG_ERR_STACK_OVF 135 -#define STR_LONG_ERR_MATRIX_SIZE 136 -#define STR_LONG_ERR_SYNTAX 137 -#define STR_LONG_ERR_CIRC_REF 138 -#define STR_LONG_ERR_NO_NAME 139 -#define STR_LONG_ERR_NO_REF 140 -#define STR_LONG_ERR_NO_CONV 141 -#define STR_LONG_ERR_NO_VALUE 142 -#define STR_LONG_ERR_NV 143 - -#define STR_GRIDCOLOR 144 -#define STR_CELL_FILTER 145 - -#define STR_TARGETNOTFOUND 146 - -#define STR_INVALID_EPS 147 -#define STR_UNDO_TABOP 148 - -#define STR_INVALID_AFNAME 149 - -#define STR_AREA 150 -#define STR_YES 151 -#define STR_NO 152 -#define STR_PROTECTION 153 -#define STR_FORMULAS 154 -#define STR_HIDE 155 -#define STR_PRINT 156 - -#define STR_INVALID_AFAREA 157 - -#define STR_OPTIONAL 158 -#define STR_REQUIRED 159 - -#define STR_NOTES 160 -#define STR_QUERY_DELTAB 161 - -#define STR_UNDO_DETREFRESH 162 - -#define STR_UNDO_SHOWNOTE 163 -#define STR_UNDO_HIDENOTE 164 -#define STR_UNDO_DRAGDROP 165 -#define STR_UNDO_SHOWALLNOTES 166 -#define STR_UNDO_HIDEALLNOTES 167 - -#define STR_IMPORT_LOTUS 168 -#define STR_IMPORT_DBF 169 -#define STR_EXPORT_ASCII 170 - -#define STR_STYLENAME_STANDARD 171 -#define STR_STYLENAME_RESULT 172 -#define STR_STYLENAME_RESULT1 173 -#define STR_STYLENAME_HEADLINE 174 -#define STR_STYLENAME_HEADLINE1 175 -#define STR_STYLENAME_REPORT 176 - -#define STR_PIVOT_ERROR 177 -#define STR_SPELLING_STOP_OK 178 -#define STR_THESAURUS_NO_STRING 179 -#define STR_SPELLING_BEGIN_TAB 180 -#define STR_SPELLING_NO_LANG 181 // can be removed later - -// empty - -#define STR_UNDO_INSERT_TAB 182 -#define STR_UNDO_DELETE_TAB 183 -#define STR_UNDO_RENAME_TAB 184 -#define STR_UNDO_MOVE_TAB 185 -#define STR_UNDO_COPY_TAB 186 -#define STR_UNDO_APPEND_TAB 187 - -#define STR_ABSREFLOST 188 -#define STR_NAMECONFLICT 189 - -#define STR_ERR_AUTOFILTER 190 - -#define STR_CREATENAME_REPLACE 191 -#define STR_CREATENAME_MARKERR 192 - -#define STR_UNDO_LISTNAMES 193 -#define STR_UNDO_PIVOT_NEW 194 -#define STR_UNDO_PIVOT_MODIFY 195 -#define STR_UNDO_PIVOT_DELETE 196 -#define STR_UNDO_CONSOLIDATE 197 -#define STR_UNDO_USESCENARIO 198 -#define STR_UNDO_MAKESCENARIO 199 - -#define STR_CONSOLIDATE_ERR1 200 -#define STR_SCENARIO_NOTFOUND 201 - -#define STR_UNDO_APPLYCELLSTYLE 202 - -#define STR_UNDO_DETADDPRED 203 -#define STR_UNDO_DETDELPRED 204 -#define STR_UNDO_DETADDSUCC 205 -#define STR_UNDO_DETDELSUCC 206 -#define STR_UNDO_DETADDERROR 207 -#define STR_UNDO_DETDELALL 208 - -#define STR_QUERY_DELENTRY 209 - -#define STR_VOBJ_OBJECT 210 -#define STR_VOBJ_CHART 211 -#define STR_VOBJ_DRAWINGS 212 -#define STR_VOBJ_MODE_SHOW 213 -#define STR_VOBJ_MODE_HIDE 214 - -#define STR_SCATTR_PAGE_TOPDOWN 215 -#define STR_SCATTR_PAGE_LEFTRIGHT 216 -#define STR_SCATTR_PAGE_NOTES 217 -#define STR_SCATTR_PAGE_GRID 218 -#define STR_SCATTR_PAGE_HEADERS 219 -#define STR_SCATTR_PAGE_FORMULAS 220 -#define STR_SCATTR_PAGE_NULLVALS 221 -#define STR_SCATTR_PAGE_PRINTDIR 222 -#define STR_SCATTR_PAGE_FIRSTPAGENO 223 -#define STR_SCATTR_PAGE_SCALE 224 -#define STR_SCATTR_PAGE_SCALETOPAGES 225 - -#define STR_NOREF_STR 226 /* moved to compiler.src, keep define! */ - -#define STR_UNDO_CHARTDATA 227 -#define STR_UNDO_ORIGINALSIZE 228 - -#define STR_LINKERROR 229 -#define STR_LINKERRORFILE 230 -#define STR_LINKERRORTAB 231 -#define STR_UNDO_UPDATELINK 232 - -#define STR_IMPORT_REPLACE 233 - -#define STR_UNDO_REMOVELINK 234 - -#define STR_OVERVIEW 235 -#define STR_DOC_INFO 236 -#define STR_DOC_PRINTED 237 -#define STR_BY 238 -#define STR_ON 239 - -#define STR_RELOAD_TABLES 240 - -#define STR_UNDO_ENTERMATRIX 241 - -#define STR_INSERT_FULL 242 -#define STR_TABINSERT_ERROR 243 -#define STR_PASTE_ERROR 244 -#define STR_PASTE_FULL 245 - -#define STR_ERR_INVALID_AREA 246 - -#define STR_IMPORT_DIF 247 -#define STR_EXPORT_DIF 248 - -#define STR_ERR_NOREF 249 -#define STR_FUN_TEXT_COUNT2 250 -#define STR_NO_NAME_REF 251 /* moved to compiler.src, keep define! */ - -#define STR_MATRIXFRAGMENTERR 252 - -#define STR_UNDO_SHOWTAB 253 -#define STR_UNDO_HIDETAB 254 -#define STR_UNDO_INSERTAREALINK 255 - -#define STR_REIMPORT_AFTER_LOAD 256 - -#define STR_DETINVALID_OVERFLOW 257 -#define STR_GRAPHICNAME 258 -#define STR_INVALIDNAME 259 - -#define STR_VALID_MACRONOTFOUND 260 -#define STR_VALID_DEFERROR 261 - -#define STR_UNDO_DETINVALID 262 - -#define STR_PROGRESS_CALCULATING 263 -#define STR_PROGRESS_SORTING 264 -#define STR_PROGRESS_HEIGHTING 265 - -#define STR_QUICKHELP_DELETE 266 - -#define STR_FUNCTIONLIST_MORE 267 - -#define STR_PIVOT_STYLE_INNER 268 -#define STR_PIVOT_STYLE_RESULT 269 -#define STR_PIVOT_STYLE_CATEGORY 270 -#define STR_PIVOT_STYLE_TITLE 271 -#define STR_PIVOT_STYLE_FIELDNAME 272 -#define STR_PIVOT_STYLE_TOP 273 - -#define STR_OPERATION_FILTER 274 -#define STR_OPERATION_SORT 275 -#define STR_OPERATION_SUBTOTAL 276 -#define STR_OPERATION_NONE 277 - -#define STR_UNDO_PROTECT_TAB 278 -#define STR_UNDO_UNPROTECT_TAB 279 -#define STR_UNDO_PROTECT_DOC 280 -#define STR_UNDO_UNPROTECT_DOC 281 - -#define STR_PROGRESS_IMPORT 282 - -#define STR_SORT_ERR_MERGED 283 - -#define STR_TIP_WIDTH 284 -#define STR_TIP_HEIGHT 285 -#define STR_TIP_HIDE 286 - -#define STR_UNDO_REMOVEBREAKS 287 -#define STR_UNDO_PRINTSCALE 288 -#define STR_UNDO_DRAG_BREAK 289 - -#define STR_QUICKHELP_REF 290 - -#define STR_PIVOT_NOTEMPTY 291 -#define STR_PIVOT_REMOVE_PIVOTCHART 292 - -#define STR_PROGRESS_COMPARING 293 - -#define STR_CHANGED_BLANK 294 -#define STR_CHANGED_CELL 295 -#define STR_CHANGED_INSERT 296 -#define STR_CHANGED_DELETE 297 -#define STR_CHANGED_MOVE 298 - -#define STR_QUERY_DELSCENARIO 299 -#define STR_UNDO_EDITSCENARIO 300 - -#define STR_END_REDLINING 301 - -#define STR_UNDO_EDITNOTE 302 -#define STR_TABREMOVE_ERROR 303 -#define STR_CLOSE_ERROR_LINK 304 -#define STR_UNDO_RANGENAMES 305 - -#define STR_UNDO_RESIZEMATRIX 306 -#define STR_TIP_RESIZEMATRIX 307 - -#define STR_READONLYERR 308 - -#define STR_PASTE_BIGGER 309 - -#define STR_EXPORT_DBF 310 - -#define STR_UNDO_APPLYPAGESTYLE 311 -#define STR_UNDO_EDITCELLSTYLE 312 -#define STR_UNDO_EDITPAGESTYLE 313 - -#define STR_DATAPILOT_SUBTOTAL 314 - -#define STR_UNDO_TRANSLITERATE 315 - -#define STR_NO_ADDIN 316 -#define STR_LONG_ERR_NO_ADDIN 317 -#define STR_NO_MACRO 318 -#define STR_LONG_ERR_NO_MACRO 319 - -#define STR_SCATTR_PAGE_SCALETO 320 -#define STR_SCATTR_PAGE_SCALE_WIDTH 321 -#define STR_SCATTR_PAGE_SCALE_HEIGHT 322 -#define STR_SCATTR_PAGE_SCALE_PAGES 323 -#define STR_SCATTR_PAGE_SCALE_AUTO 324 - -#define STR_UNDO_TAB_RTL 325 -#define STR_UNDO_HANGULHANJA 326 -#define STR_UNDO_CHINESE_TRANSLATION 327 - -#define STR_NAME_INPUT_CELL 328 -#define STR_NAME_INPUT_RANGE 329 -#define STR_NAME_INPUT_DBRANGE 330 -#define STR_NAME_INPUT_ROW 331 -#define STR_NAME_INPUT_SHEET 332 -#define STR_NAME_INPUT_DEFINE 333 -#define STR_NAME_ERROR_SELECTION 334 -#define STR_NAME_ERROR_NAME 335 - -#define STR_CHANGED_MOVE_REJECTION_WARNING 336 -#define STR_CHANGED_DELETE_REJECTION_WARNING 337 - -#define STR_ERR_DATAPILOT_INPUT 338 - -#define STR_DIV_ZERO 339 /* moved to compiler.src, keep define! */ -#define STR_LONG_ERR_DIV_ZERO 340 -#define STR_NUM_ERROR 341 /* moved to compiler.src, keep define! */ -#define STR_NULL_ERROR 342 /* moved to compiler.src, keep define! */ - -#define STR_RECALC_MANUAL 343 -#define STR_RECALC_AUTO 344 - -#define STR_ERR_LONG_NESTED_ARRAY 345 -#define STR_UNDO_TEXTTOCOLUMNS 346 - -#define STR_DOC_UPDATED 347 -#define STR_DOC_WILLBESAVED 348 -#define STR_DOC_WILLNOTBESAVED 349 -#define STR_DOC_DISABLESHARED 350 -#define STR_DOC_NOLONGERSHARED 351 -#define STR_SHARED_DOC_WARNING 352 -#define STR_FILE_LOCKED_TRY_LATER 353 -#define STR_FILE_LOCKED_SAVE_LATER 354 -#define STR_UNKNOWN_USER 355 - -#define STR_UNDO_INSERTNOTE 356 -#define STR_UNDO_DELETENOTE 357 -#define STR_STYLE_FAMILY_CELL 358 -#define STR_STYLE_FAMILY_PAGE 359 - -#define STR_ERR_DATAPILOTSOURCE 360 - -#define STR_UNDO_SET_TAB_BG_COLOR 361 -#define STR_UNDO_SET_MULTI_TAB_BG_COLOR 362 -#define STR_UNDO_INSERT_CURRENT_DATE 363 -#define STR_UNDO_INSERT_CURRENT_TIME 364 - -#define STR_OPTIONS_WARN_SEPARATORS 365 -#define STR_SHAPE_AUTOSHAPE 366 -#define STR_SHAPE_RECTANGLE 367 -#define STR_SHAPE_LINE 368 -#define STR_SHAPE_OVAL 369 - -#define STR_FORM_BUTTON 370 -#define STR_FORM_CHECKBOX 371 -#define STR_FORM_OPTIONBUTTON 372 -#define STR_FORM_LABEL 373 -#define STR_FORM_LISTBOX 374 -#define STR_FORM_GROUPBOX 375 -#define STR_FORM_DROPDOWN 376 -#define STR_FORM_SPINNER 377 -#define STR_FORM_SCROLLBAR 378 - -#define STR_PGNUM 379 - -#define STR_MANAGE_NAMES 380 - -#define STR_HEADER_NAME 381 -#define STR_HEADER_RANGE_OR_EXPR 382 -#define STR_HEADER_SCOPE 383 -#define STR_GLOBAL_SCOPE 384 -#define STR_ERR_NAME_EXISTS 385 -#define STR_ERR_NAME_INVALID 386 -#define STR_ERR_NAME_INVALID_CELL_REF 387 - -#define STR_UNSAVED_EXT_REF 388 -#define STR_CLOSE_WITH_UNSAVED_REFS 389 -#define STR_PIVOT_GROUP 390 -#define STR_HEADER_RANGE 391 -#define STR_HEADER_COND 392 - -#define STR_COND_CONDITION 393 -#define STR_COND_COLORSCALE 394 -#define STR_COND_DATABAR 395 -#define STR_COND_ICONSET 396 -#define STR_COND_FORMULA 397 -#define STR_COND_BETWEEN 398 -#define STR_COND_NOTBETWEEN 399 -#define STR_COND_UNIQUE 400 -#define STR_COND_DUPLICATE 401 -#define STR_COND_TOP10 402 -#define STR_COND_BOTTOM10 403 -#define STR_COND_TOP_PERCENT 404 -#define STR_COND_BOTTOM_PERCENT 405 -#define STR_COND_ABOVE_AVERAGE 406 -#define STR_COND_BELOW_AVERAGE 407 -#define STR_COND_ERROR 408 -#define STR_COND_NOERROR 409 -#define STR_COND_BEGINS_WITH 410 -#define STR_COND_ENDS_WITH 411 -#define STR_COND_CONTAINS 412 -#define STR_COND_NOT_CONTAINS 413 -#define STR_COND_DATE 414 -/* Values from STR_COND_TODAY to STR_COND_NEXTYEAR must be in sequence for - * sc/source/ui/condformat/condformathelper.cxx getDateString() */ -#define STR_COND_TODAY 415 -#define STR_COND_YESTERDAY 416 -#define STR_COND_TOMORROW 417 -#define STR_COND_LAST7DAYS 418 -#define STR_COND_THISWEEK 419 -#define STR_COND_LASTWEEK 420 -#define STR_COND_NEXTWEEK 421 -#define STR_COND_THISMONTH 422 -#define STR_COND_LASTMONTH 423 -#define STR_COND_NEXTMONTH 424 -#define STR_COND_THISYEAR 425 -#define STR_COND_LASTYEAR 426 -#define STR_COND_NEXTYEAR 427 - -#define STR_ERR_CONDFORMAT_PROTECTED 428 -#define STR_EDIT_EXISTING_COND_FORMATS 429 - -#define STR_QUERY_FORMULA_RECALC_ONLOAD_ODS 430 -#define STR_QUERY_FORMULA_RECALC_ONLOAD_XLS 431 -#define STR_ALWAYS_PERFORM_SELECTED 432 - -#define STR_NO_INSERT_DELETE_OVER_PIVOT_TABLE 433 - -#define STR_CHG_INSERT_COLS 434 -#define STR_CHG_INSERT_ROWS 435 -#define STR_CHG_INSERT_TABS 436 -#define STR_CHG_DELETE_COLS 437 -#define STR_CHG_DELETE_ROWS 438 -#define STR_CHG_DELETE_TABS 439 -#define STR_CHG_MOVE 440 -#define STR_CHG_CONTENT 441 -#define STR_CHG_REJECT 442 -#define STR_CHG_ACCEPTED 443 -#define STR_CHG_REJECTED 444 -#define STR_CHG_NO_ENTRY 445 -#define STR_CHG_CONTENT_WITH_CHILD 446 -#define STR_CHG_CHILD_CONTENT 447 -#define STR_CHG_CHILD_ORGCONTENT 448 -#define STR_CHG_EMPTY 449 - -#define STR_UNDO_HIDETABS 450 -#define STR_UNDO_SHOWTABS 451 - -#define STR_DPFIELD_GROUP_BY_SECONDS 452 -#define STR_DPFIELD_GROUP_BY_MINUTES 453 -#define STR_DPFIELD_GROUP_BY_HOURS 454 -#define STR_DPFIELD_GROUP_BY_DAYS 455 -#define STR_DPFIELD_GROUP_BY_MONTHS 456 -#define STR_DPFIELD_GROUP_BY_QUARTERS 457 -#define STR_DPFIELD_GROUP_BY_YEARS 458 - -#define STR_COND_ABOVE_EQUAL_AVERAGE 459 -#define STR_COND_BELOW_EQUAL_AVERAGE 460 - -#define STR_MULTI_SELECT 461 - -#define STR_INVALIDVAL 462 -#define STR_INVALIDVAR 463 -#define STR_INVALIDFORM 464 -#define STR_NOFORMULA 465 - -#define STR_INVALIDINPUT 466 -#define STR_INVALIDCONDITION 467 - -#define STR_FUN_TEXT_SELECTION_COUNT 468 - -#define STR_QUERYREMOVE 469 -#define STR_COPYLIST 470 -#define STR_COPYFROM 471 -#define STR_COPYERR 472 - -#define STR_CTRLCLICKHYPERLINK 473 -#define STR_CLICKHYPERLINK 474 - -#define STR_ROWCOL_SELCOUNT 475 - -#define STR_PRINT_PREVIEW_NODATA 476 -#define STR_PRINT_PREVIEW_EMPTY_RANGE 477 - -#define STR_UNDO_CONDFORMAT 478 -#define STR_UNDO_FORMULA_TO_VALUE 479 - -#define STR_UNQUOTED_STRING 480 -#define STR_ENTER_VALUE 481 - -#define STR_TABLE_COUNT 482 - -#define STR_FUNCTIONS_FOUND 483 - -#define STR_FILTER_SELCOUNT 484 - -#define STR_GENERAL 485 -#define STR_NUMBER 486 -#define STR_PERCENT 487 -#define STR_CURRENCY 488 -#define STR_DATE 489 -#define STR_TIME 490 -#define STR_SCIENTIFIC 491 -#define STR_FRACTION 492 -#define STR_BOOLEAN_VALUE 493 -#define STR_TEXT 494 - -#define STR_QUERY_PIVOTTABLE_DELTAB 495 - -#define STR_UNDO_CONDFORMAT_LIST 496 - -#define SC_GLOBSTR_STR_COUNT 497 /**< the count of permanently resident strings */ +#define STR_UNDO_INSERTCELLS NC_("STR_UNDO_INSERTCELLS", "Insert") +#define STR_UNDO_DELETECELLS NC_("STR_UNDO_DELETECELLS", "Delete") +#define STR_UNDO_CUT NC_("STR_UNDO_CUT", "Cut") +#define STR_UNDO_PASTE NC_("STR_UNDO_PASTE", "Insert") +#define STR_UNDO_DRAGDROP NC_("STR_UNDO_DRAGDROP", "Drag and Drop") +#define STR_UNDO_MOVE NC_("STR_UNDO_MOVE", "Move") +#define STR_UNDO_COPY NC_("STR_UNDO_COPY", "Copy") +#define STR_UNDO_DELETECONTENTS NC_("STR_UNDO_DELETECONTENTS", "Delete") +#define STR_UNDO_SELATTR NC_("STR_UNDO_SELATTR", "Attributes") +#define STR_UNDO_SELATTRLINES NC_("STR_UNDO_SELATTRLINES", "Attributes/Lines") +#define STR_UNDO_COLWIDTH NC_("STR_UNDO_COLWIDTH", "Column Width") +#define STR_UNDO_OPTCOLWIDTH NC_("STR_UNDO_OPTCOLWIDTH", "Optimal Column Width") +#define STR_UNDO_ROWHEIGHT NC_("STR_UNDO_ROWHEIGHT", "Row height") +#define STR_UNDO_OPTROWHEIGHT NC_("STR_UNDO_OPTROWHEIGHT", "Optimal Row Height") +#define STR_UNDO_AUTOFILL NC_("STR_UNDO_AUTOFILL", "Fill") +#define STR_UNDO_MERGE NC_("STR_UNDO_MERGE", "Merge") +#define STR_UNDO_REMERGE NC_("STR_UNDO_REMERGE", "Split") +#define STR_UNDO_AUTOFORMAT NC_("STR_UNDO_AUTOFORMAT", "AutoFormat") +#define STR_UNDO_REPLACE NC_("STR_UNDO_REPLACE", "Replace") +#define STR_UNDO_CURSORATTR NC_("STR_UNDO_CURSORATTR", "Attributes") +#define STR_UNDO_ENTERDATA NC_("STR_UNDO_ENTERDATA", "Input") +#define STR_UNDO_INSCOLBREAK NC_("STR_UNDO_INSCOLBREAK", "Insert Column Break") +#define STR_UNDO_DELCOLBREAK NC_("STR_UNDO_DELCOLBREAK", "Delete column break") +#define STR_UNDO_INSROWBREAK NC_("STR_UNDO_INSROWBREAK", "Insert Row Break") +#define STR_UNDO_DELROWBREAK NC_("STR_UNDO_DELROWBREAK", "Delete row break") +#define STR_UNDO_DOOUTLINE NC_("STR_UNDO_DOOUTLINE", "View Details") +#define STR_UNDO_REDOOUTLINE NC_("STR_UNDO_REDOOUTLINE", "Hide details") +#define STR_UNDO_MAKEOUTLINE NC_("STR_UNDO_MAKEOUTLINE", "Group") +#define STR_UNDO_REMAKEOUTLINE NC_("STR_UNDO_REMAKEOUTLINE", "Ungroup") +#define STR_UNDO_OUTLINELEVEL NC_("STR_UNDO_OUTLINELEVEL", "Select outline level") +#define STR_UNDO_DOOUTLINEBLK NC_("STR_UNDO_DOOUTLINEBLK", "View Details") +#define STR_UNDO_REDOOUTLINEBLK NC_("STR_UNDO_REDOOUTLINEBLK", "Hide details") +#define STR_UNDO_REMOVEALLOTLNS NC_("STR_UNDO_REMOVEALLOTLNS", "Clear Outline") +#define STR_UNDO_AUTOOUTLINE NC_("STR_UNDO_AUTOOUTLINE", "AutoOutline") +#define STR_UNDO_SUBTOTALS NC_("STR_UNDO_SUBTOTALS", "Subtotals") +#define STR_UNDO_SORT NC_("STR_UNDO_SORT", "Sort") +#define STR_UNDO_QUERY NC_("STR_UNDO_QUERY", "Filter") +#define STR_UNDO_DBDATA NC_("STR_UNDO_DBDATA", "Change Database Range") +#define STR_UNDO_IMPORTDATA NC_("STR_UNDO_IMPORTDATA", "Importing") +#define STR_UNDO_REPEATDB NC_("STR_UNDO_REPEATDB", "Refresh range") +#define STR_UNDO_LISTNAMES NC_("STR_UNDO_LISTNAMES", "List names") +#define STR_UNDO_PIVOT_NEW NC_("STR_UNDO_PIVOT_NEW", "Create pivot table") +#define STR_UNDO_PIVOT_MODIFY NC_("STR_UNDO_PIVOT_MODIFY", "Edit pivot table") +#define STR_UNDO_PIVOT_DELETE NC_("STR_UNDO_PIVOT_DELETE", "Delete pivot table") +#define STR_UNDO_CONSOLIDATE NC_("STR_UNDO_CONSOLIDATE", "Consolidate") +#define STR_UNDO_USESCENARIO NC_("STR_UNDO_USESCENARIO", "Use scenario") +#define STR_UNDO_MAKESCENARIO NC_("STR_UNDO_MAKESCENARIO", "Create scenario") +#define STR_UNDO_EDITSCENARIO NC_("STR_UNDO_EDITSCENARIO", "Edit scenario") +#define STR_UNDO_APPLYCELLSTYLE NC_("STR_UNDO_APPLYCELLSTYLE", "Apply Cell Style") +#define STR_UNDO_EDITCELLSTYLE NC_("STR_UNDO_EDITCELLSTYLE", "Edit Cell Style") +#define STR_UNDO_APPLYPAGESTYLE NC_("STR_UNDO_APPLYPAGESTYLE", "Apply Page Style") +#define STR_UNDO_EDITPAGESTYLE NC_("STR_UNDO_EDITPAGESTYLE", "Edit Page Style") +#define STR_UNDO_DETADDPRED NC_("STR_UNDO_DETADDPRED", "Trace Precedents") +#define STR_UNDO_DETDELPRED NC_("STR_UNDO_DETDELPRED", "Remove Precedent") +#define STR_UNDO_DETADDSUCC NC_("STR_UNDO_DETADDSUCC", "Trace Dependents") +#define STR_UNDO_DETDELSUCC NC_("STR_UNDO_DETDELSUCC", "Remove Dependent") +#define STR_UNDO_DETADDERROR NC_("STR_UNDO_DETADDERROR", "Trace Error") +#define STR_UNDO_DETDELALL NC_("STR_UNDO_DETDELALL", "Remove all Traces") +#define STR_UNDO_DETINVALID NC_("STR_UNDO_DETINVALID", "Mark invalid data") +#define STR_UNDO_DETREFRESH NC_("STR_UNDO_DETREFRESH", "Refresh Traces") +#define STR_UNDO_CHARTDATA NC_("STR_UNDO_CHARTDATA", "Modify chart data range") +#define STR_UNDO_ORIGINALSIZE NC_("STR_UNDO_ORIGINALSIZE", "Original Size") +#define STR_UNDO_UPDATELINK NC_("STR_UNDO_UPDATELINK", "Update Link") +#define STR_UNDO_REMOVELINK NC_("STR_UNDO_REMOVELINK", "Unlink") +#define STR_UNDO_INSERTAREALINK NC_("STR_UNDO_INSERTAREALINK", "Insert Link") +#define STR_UNDO_ENTERMATRIX NC_("STR_UNDO_ENTERMATRIX", "Insert Array Formula") +#define STR_UNDO_INSERTNOTE NC_("STR_UNDO_INSERTNOTE", "Insert Comment") +#define STR_UNDO_DELETENOTE NC_("STR_UNDO_DELETENOTE", "Delete Comment") +#define STR_UNDO_SHOWNOTE NC_("STR_UNDO_SHOWNOTE", "Show Comment") +#define STR_UNDO_HIDENOTE NC_("STR_UNDO_HIDENOTE", "Hide Comment") +#define STR_UNDO_SHOWALLNOTES NC_("STR_UNDO_SHOWALLNOTES", "Show All Comments") +#define STR_UNDO_HIDEALLNOTES NC_("STR_UNDO_HIDEALLNOTES", "Hide All Comments") +#define STR_UNDO_EDITNOTE NC_("STR_UNDO_EDITNOTE", "Edit Comment") +#define STR_UNDO_DEC_INDENT NC_("STR_UNDO_DEC_INDENT", "Decrease Indent") +#define STR_UNDO_INC_INDENT NC_("STR_UNDO_INC_INDENT", "Increase Indent") +#define STR_UNDO_PROTECT_TAB NC_("STR_UNDO_PROTECT_TAB", "Protect sheet") +#define STR_UNDO_UNPROTECT_TAB NC_("STR_UNDO_UNPROTECT_TAB", "Unprotect sheet") +#define STR_UNDO_PROTECT_DOC NC_("STR_UNDO_PROTECT_DOC", "Protect document") +#define STR_UNDO_UNPROTECT_DOC NC_("STR_UNDO_UNPROTECT_DOC", "Unprotect document") +#define STR_UNDO_PRINTRANGES NC_("STR_UNDO_PRINTRANGES", "Print range") +#define STR_UNDO_REMOVEBREAKS NC_("STR_UNDO_REMOVEBREAKS", "Delete Page Breaks") +#define STR_UNDO_PRINTSCALE NC_("STR_UNDO_PRINTSCALE", "Change Scale") +#define STR_UNDO_DRAG_BREAK NC_("STR_UNDO_DRAG_BREAK", "Move Page Break") +#define STR_UNDO_RANGENAMES NC_("STR_UNDO_RANGENAMES", "Edit range names") +#define STR_UNDO_TRANSLITERATE NC_("STR_UNDO_TRANSLITERATE", "Change Case") +#define STR_DBNAME_IMPORT NC_("STR_DBNAME_IMPORT", "Import") +#define STR_MSSG_DOSUBTOTALS_0 NC_("STR_MSSG_DOSUBTOTALS_0", "%PRODUCTNAME Calc") +#define STR_MSSG_DOSUBTOTALS_1 NC_("STR_MSSG_DOSUBTOTALS_1", "Delete data?") +#define STR_MSSG_DOSUBTOTALS_2 NC_("STR_MSSG_DOSUBTOTALS_2", "Unable to insert rows") +#define STR_MSSG_REPEATDB_0 NC_("STR_MSSG_REPEATDB_0", "No operations to execute") +#define STR_MSSG_MAKEAUTOFILTER_0 NC_("STR_MSSG_MAKEAUTOFILTER_0", "The range does not contain column headers.\nDo you want the first line to be used as column header?") +#define STR_MSSG_IMPORTDATA_0 NC_("STR_MSSG_IMPORTDATA_0", "Error while importing data!") +#define STR_PROGRESS_IMPORT NC_("STR_PROGRESS_IMPORT", "# records imported...") +#define STR_MSSG_MAKEOUTLINE_0 NC_("STR_MSSG_MAKEOUTLINE_0", "Grouping not possible") +#define STR_MSSG_REMOVEOUTLINE_0 NC_("STR_MSSG_REMOVEOUTLINE_0", "Ungrouping not possible") +#define STR_MSSG_PASTEFROMCLIP_0 NC_("STR_MSSG_PASTEFROMCLIP_0", "Insert into multiple selection not possible") +#define STR_MSSG_MOVEBLOCKTO_0 NC_("STR_MSSG_MOVEBLOCKTO_0", "Cell merge not possible if cells already merged!") +#define STR_MSSG_INSERTCELLS_0 NC_("STR_MSSG_INSERTCELLS_0", "Inserting into merged ranges not possible") +#define STR_MSSG_DELETECELLS_0 NC_("STR_MSSG_DELETECELLS_0", "Deleting in merged ranges not possible") +#define STR_MSSG_MERGECELLS_0 NC_("STR_MSSG_MERGECELLS_0", "Cell merge not possible if cells already merged") +#define STR_SORT_ERR_MERGED NC_("STR_SORT_ERR_MERGED", "Ranges containing merged cells can only be sorted without formats.") +#define STR_MSSG_SOLVE_0 NC_("STR_MSSG_SOLVE_0", "Goal Seek succeeded. Result: ") +#define STR_MSSG_SOLVE_1 NC_("STR_MSSG_SOLVE_1", "\n\nInsert the result into the variable cell?") +#define STR_MSSG_SOLVE_2 NC_("STR_MSSG_SOLVE_2", "Goal Seek failed.\n\n") +#define STR_MSSG_SOLVE_3 NC_("STR_MSSG_SOLVE_3", "Insert the closest value (") +#define STR_MSSG_SOLVE_4 NC_("STR_MSSG_SOLVE_4", ") into the variable cell anyway?") +#define STR_TABLE_GESAMTERGEBNIS NC_("STR_TABLE_GESAMTERGEBNIS", "Grand Total") +#define STR_TABLE_ERGEBNIS NC_("STR_TABLE_ERGEBNIS", "Result") +#define STR_UNDO_SPELLING NC_("STR_UNDO_SPELLING", "Spellcheck") +#define STR_TABLE_UND NC_("STR_TABLE_UND", "AND") +#define STR_TABLE_ODER NC_("STR_TABLE_ODER", "OR") +#define STR_TABLE_DEF NC_("STR_TABLE_DEF", "Sheet") +#define STR_MOVE_TO_END NC_("STR_MOVE_TO_END", "- move to end position -") +#define STR_NO_REF_TABLE NC_("STR_NO_REF_TABLE", "#REF!") +#define STR_PIVOT_NODATA NC_("STR_PIVOT_NODATA", "The pivot table must contain at least one entry.") +#define STR_PIVOT_MOVENOTALLOWED NC_("STR_PIVOT_MOVENOTALLOWED", "The data range can not be deleted.") +#define STR_PIVOT_ERROR NC_("STR_PIVOT_ERROR", "Error creating the pivot table.") +#define STR_PIVOT_NOTEMPTY NC_("STR_PIVOT_NOTEMPTY", "The destination range is not empty. Overwrite existing contents?") +#define STR_PIVOT_REMOVE_PIVOTCHART NC_("STR_PIVOT_REMOVE_PIVOTCHART", "There is at least one pivot chart associated with this pivot table. Should remove all or abort?") +#define STR_DATAPILOT_SUBTOTAL NC_("STR_DATAPILOT_SUBTOTAL", "The source range contains subtotals which may distort the results. Use it anyway?") +#define STR_PIVOT_TOTAL NC_("STR_PIVOT_TOTAL", "Total") +#define STR_PIVOT_DATA NC_("STR_PIVOT_DATA", "Data") +#define STR_PIVOT_GROUP NC_("STR_PIVOT_GROUP", "Group") +#define STR_ROWCOL_SELCOUNT NC_("STR_ROWCOL_SELCOUNT", "$1 rows, $2 columns selected") +#define STR_FILTER_SELCOUNT NC_("STR_FILTER_SELCOUNT", "$1 of $2 records found") +#define STR_COLUMN NC_("STR_COLUMN", "Column") +#define STR_ROW NC_("STR_ROW", "Row") +#define STR_PAGE NC_("STR_PAGE", "Page") +#define STR_PGNUM NC_("STR_PGNUM", "Page %1") +#define STR_LOAD_DOC NC_("STR_LOAD_DOC", "Load document") +#define STR_SAVE_DOC NC_("STR_SAVE_DOC", "Save document") +#define STR_AREA_ALREADY_INSERTED NC_("STR_AREA_ALREADY_INSERTED", "This range has already been inserted.") +#define STR_INVALID_TABREF NC_("STR_INVALID_TABREF", "Invalid sheet reference.") +#define STR_INVALID_QUERYAREA NC_("STR_INVALID_QUERYAREA", "This range does not contain a valid query.") +#define STR_REIMPORT_EMPTY NC_("STR_REIMPORT_EMPTY", "This range does not contain imported data.") +#define STR_NOMULTISELECT NC_("STR_NOMULTISELECT", "This function cannot be used with multiple selections.") +#define STR_FILL_SERIES_PROGRESS NC_("STR_FILL_SERIES_PROGRESS", "Fill Row...") +#define STR_UNDO_THESAURUS NC_("STR_UNDO_THESAURUS", "Thesaurus") +#define STR_FILL_TAB NC_("STR_FILL_TAB", "Fill Sheets") +#define STR_UPDATE_SCENARIO NC_("STR_UPDATE_SCENARIO", "Add selected ranges to current scenario?") +#define STR_ERR_NEWSCENARIO NC_("STR_ERR_NEWSCENARIO", "The scenario ranges must be selected in order to be able to create a new scenario.") +#define STR_NOAREASELECTED NC_("STR_NOAREASELECTED", "A range has not been selected.") +#define STR_NEWTABNAMENOTUNIQUE NC_("STR_NEWTABNAMENOTUNIQUE", "This name already exists.") +#define STR_INVALIDTABNAME NC_("STR_INVALIDTABNAME", "Invalid sheet name.\nThe sheet name must not be a duplicate of an existing name \nand may not contain the characters [ ] * ? : / \\") +#define STR_SCENARIO NC_("STR_SCENARIO", "Scenario") +#define STR_PIVOT_TABLE NC_("STR_PIVOT_TABLE", "Pivot Table") + // Text strings for captions of subtotal functions. +#define STR_FUN_TEXT_SUM NC_("STR_FUN_TEXT_SUM", "Sum") +#define STR_FUN_TEXT_SELECTION_COUNT NC_("STR_FUN_TEXT_SELECTION_COUNT", "Selection count") +#define STR_FUN_TEXT_COUNT NC_("STR_FUN_TEXT_COUNT", "Count") +#define STR_FUN_TEXT_COUNT2 NC_("STR_FUN_TEXT_COUNT2", "CountA") +#define STR_FUN_TEXT_AVG NC_("STR_FUN_TEXT_AVG", "Average") +#define STR_FUN_TEXT_MEDIAN NC_("STR_FUN_TEXT_MEDIAN", "Median") +#define STR_FUN_TEXT_MAX NC_("STR_FUN_TEXT_MAX", "Max") +#define STR_FUN_TEXT_MIN NC_("STR_FUN_TEXT_MIN", "Min") +#define STR_FUN_TEXT_PRODUCT NC_("STR_FUN_TEXT_PRODUCT", "Product") +#define STR_FUN_TEXT_STDDEV NC_("STR_FUN_TEXT_STDDEV", "StDev") +#define STR_FUN_TEXT_VAR NC_("STR_FUN_TEXT_VAR", "Var") +#define STR_NOCHARTATCURSOR NC_("STR_NOCHARTATCURSOR", "No chart found at this position.") +#define STR_PIVOT_NOTFOUND NC_("STR_PIVOT_NOTFOUND", "No pivot table found at this position.") +#define STR_EMPTYDATA NC_("STR_EMPTYDATA", "(empty)") +#define STR_PRINT_INVALID_AREA NC_("STR_PRINT_INVALID_AREA", "Invalid print range") +#define STR_PAGESTYLE NC_("STR_PAGESTYLE", "Page Style") +#define STR_HEADER NC_("STR_HEADER", "Header") +#define STR_FOOTER NC_("STR_FOOTER", "Footer") +#define STR_TEXTATTRS NC_("STR_TEXTATTRS", "Text Attributes") +#define STR_HFCMD_DELIMITER NC_("STR_HFCMD_DELIMITER", "\\") +#define STR_HFCMD_PAGE NC_("STR_HFCMD_PAGE", "PAGE") +#define STR_HFCMD_PAGES NC_("STR_HFCMD_PAGES", "PAGES") +#define STR_HFCMD_DATE NC_("STR_HFCMD_DATE", "DATE") +#define STR_HFCMD_TIME NC_("STR_HFCMD_TIME", "TIME") +#define STR_HFCMD_FILE NC_("STR_HFCMD_FILE", "FILE") +#define STR_HFCMD_TABLE NC_("STR_HFCMD_TABLE", "SHEET") +#define STR_PROTECTIONERR NC_("STR_PROTECTIONERR", "Protected cells can not be modified.") +#define STR_READONLYERR NC_("STR_READONLYERR", "Document opened in read-only mode.") +#define STR_MATRIXFRAGMENTERR NC_("STR_MATRIXFRAGMENTERR", "You cannot change only part of an array.") +#define STR_PAGEHEADER NC_("STR_PAGEHEADER", "Header") +#define STR_PAGEFOOTER NC_("STR_PAGEFOOTER", "Footer") + +/* BEGIN error constants and error strings. */ +#define STR_ERROR_STR NC_("STR_ERROR_STR", "Err:") +/* BEGIN defined ERROR.TYPE() values. */ +/* ERROR.TYPE( #DIV/0! ) == 2 */ +#define STR_LONG_ERR_DIV_ZERO NC_("STR_LONG_ERR_DIV_ZERO", "Error: Division by zero") +/* ERROR.TYPE( #VALUE! ) == 3 */ +#define STR_LONG_ERR_NO_VALUE NC_("STR_LONG_ERR_NO_VALUE", "Error: Wrong data type") +/* ERROR.TYPE( #REF! ) == 4 */ +#define STR_LONG_ERR_NO_REF NC_("STR_LONG_ERR_NO_REF", "Error: Not a valid reference") +/* ERROR.TYPE( #NAME! ) == 5 */ +#define STR_LONG_ERR_NO_NAME NC_("STR_LONG_ERR_NO_NAME", "Error: Invalid name") +/* ERROR.TYPE( #NUM! ) == 6 */ +#define STR_LONG_ERR_ILL_FPO NC_("STR_LONG_ERR_ILL_FPO", "Error: Invalid numeric value") +/* ERROR.TYPE( #N/A ) == 7 */ +#define STR_LONG_ERR_NV NC_("STR_LONG_ERR_NV", "Error: Value not available") +/* END defined ERROR.TYPE() values. */ +#define STR_NO_ADDIN NC_("STR_NO_ADDIN", "#ADDIN?") +#define STR_LONG_ERR_NO_ADDIN NC_("STR_LONG_ERR_NO_ADDIN", "Error: Add-in not found") +#define STR_NO_MACRO NC_("STR_NO_MACRO", "#MACRO?") +#define STR_LONG_ERR_NO_MACRO NC_("STR_LONG_ERR_NO_MACRO", "Error: Macro not found") +#define STR_LONG_ERR_SYNTAX NC_("STR_LONG_ERR_SYNTAX", "Internal syntactical error") +#define STR_LONG_ERR_ILL_ARG NC_("STR_LONG_ERR_ILL_ARG", "Error: Invalid argument") +#define STR_LONG_ERR_ILL_PAR NC_("STR_LONG_ERR_ILL_PAR", "Error in parameter list") +#define STR_LONG_ERR_ILL_CHAR NC_("STR_LONG_ERR_ILL_CHAR", "Error: Invalid character") +#define STR_LONG_ERR_PAIR NC_("STR_LONG_ERR_PAIR", "Error: in bracketing") +#define STR_LONG_ERR_OP_EXP NC_("STR_LONG_ERR_OP_EXP", "Error: Operator missing") +#define STR_LONG_ERR_VAR_EXP NC_("STR_LONG_ERR_VAR_EXP", "Error: Variable missing") +#define STR_LONG_ERR_CODE_OVF NC_("STR_LONG_ERR_CODE_OVF", "Error: Formula overflow") +#define STR_LONG_ERR_STR_OVF NC_("STR_LONG_ERR_STR_OVF", "Error: String overflow") +#define STR_LONG_ERR_STACK_OVF NC_("STR_LONG_ERR_STACK_OVF", "Error: Internal overflow") +#define STR_LONG_ERR_MATRIX_SIZE NC_("STR_LONG_ERR_MATRIX_SIZE", "Error: Array or matrix size") +#define STR_LONG_ERR_CIRC_REF NC_("STR_LONG_ERR_CIRC_REF", "Error: Circular reference") +#define STR_LONG_ERR_NO_CONV NC_("STR_LONG_ERR_NO_CONV", "Error: Calculation does not converge") +/* END error constants and error strings. */ + +#define STR_GRIDCOLOR NC_("STR_GRIDCOLOR", "Grid color") +#define STR_CELL_FILTER NC_("STR_CELL_FILTER", "Filter") +#define STR_TARGETNOTFOUND NC_("STR_TARGETNOTFOUND", "The target database range does not exist.") +#define STR_INVALID_EPS NC_("STR_INVALID_EPS", "Invalid increment") +#define STR_UNDO_TABOP NC_("STR_UNDO_TABOP", "Multiple operations") +#define STR_INVALID_AFNAME NC_("STR_INVALID_AFNAME", "You have entered an invalid name.\nAutoFormat could not be created. \nTry again using a different name.") +#define STR_AREA NC_("STR_AREA", "Range") +#define STR_YES NC_("STR_YES", "Yes") +#define STR_NO NC_("STR_NO", "No") +#define STR_PROTECTION NC_("STR_PROTECTION", "Protection") +#define STR_FORMULAS NC_("STR_FORMULAS", "Formulas") +#define STR_HIDE NC_("STR_HIDE", "Hide") +#define STR_PRINT NC_("STR_PRINT", "Print") +#define STR_INVALID_AFAREA NC_("STR_INVALID_AFAREA", "To apply an AutoFormat,\na table range of at least\n3x3 cells must be selected.") +#define STR_OPTIONAL NC_("STR_OPTIONAL", "(optional)") +#define STR_REQUIRED NC_("STR_REQUIRED", "(required)") +#define STR_NOTES NC_("STR_NOTES", "Comments") +#define STR_QUERY_DELTAB NC_("STR_QUERY_DELTAB", "Are you sure you want to delete the selected sheet(s)?") +#define STR_QUERY_DELSCENARIO NC_("STR_QUERY_DELSCENARIO", "Are you sure you want to delete the selected scenario?") +#define STR_EXPORT_ASCII NC_("STR_EXPORT_ASCII", "Export Text File") +#define STR_IMPORT_LOTUS NC_("STR_IMPORT_LOTUS", "Import Lotus files") +#define STR_IMPORT_DBF NC_("STR_IMPORT_DBF", "Import DBase files") +#define STR_EXPORT_DBF NC_("STR_EXPORT_DBF", "DBase export") +#define STR_EXPORT_DIF NC_("STR_EXPORT_DIF", "Dif Export") +#define STR_IMPORT_DIF NC_("STR_IMPORT_DIF", "Dif Import") +#define STR_STYLENAME_STANDARD NC_("STR_STYLENAME_STANDARD", "Default") +#define STR_STYLENAME_RESULT NC_("STR_STYLENAME_RESULT", "Result") +#define STR_STYLENAME_RESULT1 NC_("STR_STYLENAME_RESULT1", "Result2") +#define STR_STYLENAME_HEADLINE NC_("STR_STYLENAME_HEADLINE", "Heading") +#define STR_STYLENAME_HEADLINE1 NC_("STR_STYLENAME_HEADLINE1", "Heading1") +#define STR_STYLENAME_REPORT NC_("STR_STYLENAME_REPORT", "Report") +#define STR_THESAURUS_NO_STRING NC_("STR_THESAURUS_NO_STRING", "Thesaurus can only be used in text cells!") +#define STR_SPELLING_BEGIN_TAB NC_("STR_SPELLING_BEGIN_TAB", "Should the spellcheck be continued at the beginning of the current sheet?") +#define STR_SPELLING_NO_LANG NC_("STR_SPELLING_NO_LANG", "is not available for the thesaurus.\nPlease check your installation and install \nthe desired language if necessary") +#define STR_SPELLING_STOP_OK NC_("STR_SPELLING_STOP_OK", "The spellcheck of this sheet has been completed.") +#define STR_UNDO_INSERT_TAB NC_("STR_UNDO_INSERT_TAB", "Insert Sheet") +#define STR_UNDO_DELETE_TAB NC_("STR_UNDO_DELETE_TAB", "Delete Sheets") +#define STR_UNDO_RENAME_TAB NC_("STR_UNDO_RENAME_TAB", "Rename Sheet") +#define STR_UNDO_SET_TAB_BG_COLOR NC_("STR_UNDO_SET_TAB_BG_COLOR", "Color Tab") +#define STR_UNDO_SET_MULTI_TAB_BG_COLOR NC_("STR_UNDO_SET_MULTI_TAB_BG_COLOR", "Color Tabs") +#define STR_UNDO_MOVE_TAB NC_("STR_UNDO_MOVE_TAB", "Move Sheets") +#define STR_UNDO_COPY_TAB NC_("STR_UNDO_COPY_TAB", "Copy Sheet") +#define STR_UNDO_APPEND_TAB NC_("STR_UNDO_APPEND_TAB", "Append sheet") +#define STR_UNDO_SHOWTAB NC_("STR_UNDO_SHOWTAB", "Show Sheet") +#define STR_UNDO_SHOWTABS NC_("STR_UNDO_SHOWTABS", "Show Sheets") +#define STR_UNDO_HIDETAB NC_("STR_UNDO_HIDETAB", "Hide sheet") +#define STR_UNDO_HIDETABS NC_("STR_UNDO_HIDETABS", "Hide sheets") +#define STR_UNDO_TAB_RTL NC_("STR_UNDO_TAB_RTL", "Flip sheet") +#define STR_ABSREFLOST NC_("STR_ABSREFLOST", "The new table contains absolute references to other tables which may be incorrect!") +#define STR_NAMECONFLICT NC_("STR_NAMECONFLICT", "Due to identical names, an existing range name in the destination document has been altered!") +#define STR_ERR_AUTOFILTER NC_("STR_ERR_AUTOFILTER", "AutoFilter not possible") +#define STR_CREATENAME_REPLACE NC_("STR_CREATENAME_REPLACE", "Replace existing definition of #?") +#define STR_CREATENAME_MARKERR NC_("STR_CREATENAME_MARKERR", "Invalid selection for range names") +#define STR_CONSOLIDATE_ERR1 NC_("STR_CONSOLIDATE_ERR1", "References can not be inserted above the source data.") +#define STR_SCENARIO_NOTFOUND NC_("STR_SCENARIO_NOTFOUND", "Scenario not found") +#define STR_QUERY_DELENTRY NC_("STR_QUERY_DELENTRY", "Do you really want to delete the entry #?") +#define STR_VOBJ_OBJECT NC_("STR_VOBJ_OBJECT", "Objects/Images") +#define STR_VOBJ_CHART NC_("STR_VOBJ_CHART", "Charts") +#define STR_VOBJ_DRAWINGS NC_("STR_VOBJ_DRAWINGS", "Drawing Objects") +#define STR_VOBJ_MODE_SHOW NC_("STR_VOBJ_MODE_SHOW", "Show") +#define STR_VOBJ_MODE_HIDE NC_("STR_VOBJ_MODE_HIDE", "Hide") +#define STR_SCATTR_PAGE_TOPDOWN NC_("STR_SCATTR_PAGE_TOPDOWN", "Top to bottom") +#define STR_SCATTR_PAGE_LEFTRIGHT NC_("STR_SCATTR_PAGE_LEFTRIGHT", "Left-to-right") +#define STR_SCATTR_PAGE_NOTES NC_("STR_SCATTR_PAGE_NOTES", "Comments") +#define STR_SCATTR_PAGE_GRID NC_("STR_SCATTR_PAGE_GRID", "Grid") +#define STR_SCATTR_PAGE_HEADERS NC_("STR_SCATTR_PAGE_HEADERS", "Row & Column Headers") +#define STR_SCATTR_PAGE_FORMULAS NC_("STR_SCATTR_PAGE_FORMULAS", "Formulas") +#define STR_SCATTR_PAGE_NULLVALS NC_("STR_SCATTR_PAGE_NULLVALS", "Zero Values") +#define STR_SCATTR_PAGE_PRINTDIR NC_("STR_SCATTR_PAGE_PRINTDIR", "Print direction") +#define STR_SCATTR_PAGE_FIRSTPAGENO NC_("STR_SCATTR_PAGE_FIRSTPAGENO", "First page number") +#define STR_SCATTR_PAGE_SCALE NC_("STR_SCATTR_PAGE_SCALE", "Reduce/enlarge printout") +#define STR_SCATTR_PAGE_SCALETOPAGES NC_("STR_SCATTR_PAGE_SCALETOPAGES", "Fit print range(s) on number of pages") +#define STR_SCATTR_PAGE_SCALETO NC_("STR_SCATTR_PAGE_SCALETO", "Fit print range(s) to width/height") +#define STR_SCATTR_PAGE_SCALE_WIDTH NC_("STR_SCATTR_PAGE_SCALE_WIDTH", "Width") +#define STR_SCATTR_PAGE_SCALE_HEIGHT NC_("STR_SCATTR_PAGE_SCALE_HEIGHT", "Height") +#define STR_SCATTR_PAGE_SCALE_PAGES NC_("STR_SCATTR_PAGE_SCALE_PAGES", "%1 page(s)") +#define STR_SCATTR_PAGE_SCALE_AUTO NC_("STR_SCATTR_PAGE_SCALE_AUTO", "automatic") +#define STR_DOC_STAT NC_("STR_DOC_STAT", "Statistics") +#define STR_LINKERROR NC_("STR_LINKERROR", "The link could not be updated.") +#define STR_LINKERRORFILE NC_("STR_LINKERRORFILE", "File:") +#define STR_LINKERRORTAB NC_("STR_LINKERRORTAB", "Sheet:") +#define STR_OVERVIEW NC_("STR_OVERVIEW", "Overview") +#define STR_DOC_INFO NC_("STR_DOC_INFO", "Doc.Information") +#define STR_DOC_PRINTED NC_("STR_DOC_PRINTED", "Printed") +#define STR_BY NC_("STR_BY", "by") +#define STR_ON NC_("STR_ON", "on") +#define STR_RELOAD_TABLES NC_("STR_RELOAD_TABLES", "This file contains links to other files.\nShould they be updated?") +#define STR_REIMPORT_AFTER_LOAD NC_("STR_REIMPORT_AFTER_LOAD", "This file contains queries. The results of these queries were not saved.\nDo you want these queries to be repeated?") +#define STR_INSERT_FULL NC_("STR_INSERT_FULL", "Filled cells cannot be shifted\nbeyond the sheet.") +#define STR_TABINSERT_ERROR NC_("STR_TABINSERT_ERROR", "The table could not be inserted.") +#define STR_TABREMOVE_ERROR NC_("STR_TABREMOVE_ERROR", "The sheets could not be deleted.") +#define STR_PASTE_ERROR NC_("STR_PASTE_ERROR", "The contents of the clipboard could not be pasted.") +#define STR_PASTE_FULL NC_("STR_PASTE_FULL", "There is not enough space on the sheet to insert here.") +#define STR_PASTE_BIGGER NC_("STR_PASTE_BIGGER", "The content of the clipboard is bigger than the range selected.\nDo you want to insert it anyway?") +#define STR_ERR_NOREF NC_("STR_ERR_NOREF", "No cell references are found in the selected cells.") +#define STR_GRAPHICNAME NC_("STR_GRAPHICNAME", "Image") +#define STR_INVALIDNAME NC_("STR_INVALIDNAME", "Invalid name.") +#define STR_VALID_MACRONOTFOUND NC_("STR_VALID_MACRONOTFOUND", "Selected macro not found.") +#define STR_VALID_DEFERROR NC_("STR_VALID_DEFERROR", "Invalid value.") +#define STR_PROGRESS_CALCULATING NC_("STR_PROGRESS_CALCULATING", "calculating") +#define STR_PROGRESS_SORTING NC_("STR_PROGRESS_SORTING", "sorting") +#define STR_PROGRESS_HEIGHTING NC_("STR_PROGRESS_HEIGHTING", "Adapt row height") +#define STR_PROGRESS_COMPARING NC_("STR_PROGRESS_COMPARING", "Compare #") +#define STR_DETINVALID_OVERFLOW NC_("STR_DETINVALID_OVERFLOW", "The maximum number of invalid cells has been exceeded.\nNot all invalid cells have been marked.") +#define STR_QUICKHELP_DELETE NC_("STR_QUICKHELP_DELETE", "Delete contents") +#define STR_QUICKHELP_REF NC_("STR_QUICKHELP_REF", "%1 R x %2 C") +#define STR_FUNCTIONLIST_MORE NC_("STR_FUNCTIONLIST_MORE", "More...") +#define STR_ERR_INVALID_AREA NC_("STR_ERR_INVALID_AREA", "Invalid range") +// Templates for data pilot tables. +#define STR_PIVOT_STYLE_INNER NC_("STR_PIVOT_STYLE_INNER", "Pivot Table Value") +#define STR_PIVOT_STYLE_RESULT NC_("STR_PIVOT_STYLE_RESULT", "Pivot Table Result") +#define STR_PIVOT_STYLE_CATEGORY NC_("STR_PIVOT_STYLE_CATEGORY", "Pivot Table Category") +#define STR_PIVOT_STYLE_TITLE NC_("STR_PIVOT_STYLE_TITLE", "Pivot Table Title") +#define STR_PIVOT_STYLE_FIELDNAME NC_("STR_PIVOT_STYLE_FIELDNAME", "Pivot Table Field") +#define STR_PIVOT_STYLE_TOP NC_("STR_PIVOT_STYLE_TOP", "Pivot Table Corner") +#define STR_OPERATION_FILTER NC_("STR_OPERATION_FILTER", "Filter") +#define STR_OPERATION_SORT NC_("STR_OPERATION_SORT", "Sort") +#define STR_OPERATION_SUBTOTAL NC_("STR_OPERATION_SUBTOTAL", "Subtotals") +#define STR_OPERATION_NONE NC_("STR_OPERATION_NONE", "None") +#define STR_IMPORT_REPLACE NC_("STR_IMPORT_REPLACE", "Do you want to replace the contents of #?") +#define STR_TIP_WIDTH NC_("STR_TIP_WIDTH", "Width:") +#define STR_TIP_HEIGHT NC_("STR_TIP_HEIGHT", "Height:") +#define STR_TIP_HIDE NC_("STR_TIP_HIDE", "Hide") +#define STR_CHANGED_BLANK NC_("STR_CHANGED_BLANK", "") +#define STR_CHANGED_CELL NC_("STR_CHANGED_CELL", "Cell #1 changed from '#2' to '#3'") +#define STR_CHANGED_INSERT NC_("STR_CHANGED_INSERT", "#1 inserted") +#define STR_CHANGED_DELETE NC_("STR_CHANGED_DELETE", "#1 deleted") +#define STR_CHANGED_MOVE NC_("STR_CHANGED_MOVE", "Range moved from #1 to #2") +#define STR_END_REDLINING NC_("STR_END_REDLINING", "This action will exit the change recording mode.\nAny information about changes will be lost.\n\nExit change recording mode?\n\n") +#define STR_CLOSE_ERROR_LINK NC_("STR_CLOSE_ERROR_LINK", "The document can not be closed while a link is being updated.") +#define STR_UNDO_RESIZEMATRIX NC_("STR_UNDO_RESIZEMATRIX", "Adapt array area") +#define STR_TIP_RESIZEMATRIX NC_("STR_TIP_RESIZEMATRIX", "Array formula %1 R x %2 C") +#define STR_UNDO_HANGULHANJA NC_("STR_UNDO_HANGULHANJA", "Hangul/Hanja Conversion") +#define STR_NAME_INPUT_CELL NC_("STR_NAME_INPUT_CELL", "Select Cell") +#define STR_NAME_INPUT_RANGE NC_("STR_NAME_INPUT_RANGE", "Select Range") +#define STR_NAME_INPUT_DBRANGE NC_("STR_NAME_INPUT_DBRANGE", "Select Database Range") +#define STR_NAME_INPUT_ROW NC_("STR_NAME_INPUT_ROW", "Go To Row") +#define STR_NAME_INPUT_SHEET NC_("STR_NAME_INPUT_SHEET", "Go To Sheet") +#define STR_NAME_INPUT_DEFINE NC_("STR_NAME_INPUT_DEFINE", "Define Name for Range") +#define STR_NAME_ERROR_SELECTION NC_("STR_NAME_ERROR_SELECTION", "The selection needs to be rectangular in order to name it.") +#define STR_NAME_ERROR_NAME NC_("STR_NAME_ERROR_NAME", "You must enter a valid reference or type a valid name for the selected range.") +#define STR_CHANGED_MOVE_REJECTION_WARNING NC_("STR_CHANGED_MOVE_REJECTION_WARNING", "WARNING: This action may have resulted in unintended changes to cell references in formulas.") +#define STR_CHANGED_DELETE_REJECTION_WARNING NC_("STR_CHANGED_DELETE_REJECTION_WARNING", "WARNING: This action may have resulted in references to the deleted area not being restored.") +#define STR_UNDO_CHINESE_TRANSLATION NC_("STR_UNDO_CHINESE_TRANSLATION", "Chinese conversion") +#define STR_ERR_DATAPILOT_INPUT NC_("STR_ERR_DATAPILOT_INPUT", "You cannot change this part of the pivot table.") +#define STR_RECALC_MANUAL NC_("STR_RECALC_MANUAL", "Manual") +#define STR_RECALC_AUTO NC_("STR_RECALC_AUTO", "Automatic") +#define STR_ERR_LONG_NESTED_ARRAY NC_("STR_ERR_LONG_NESTED_ARRAY", "Nested arrays are not supported.") +#define STR_UNDO_TEXTTOCOLUMNS NC_("STR_UNDO_TEXTTOCOLUMNS", "Text to Columns") +#define STR_DOC_UPDATED NC_("STR_DOC_UPDATED", "Your spreadsheet has been updated with changes saved by other users.") +#define STR_DOC_WILLBESAVED NC_("STR_DOC_WILLBESAVED", "The spreadsheet must be saved now to activate sharing mode.\n\nDo you want to continue?") +#define STR_DOC_WILLNOTBESAVED NC_("STR_DOC_WILLNOTBESAVED", "Already resolved merge conflicts will be lost and your changes to the shared spreadsheet will not be saved.\n\nDo you want to continue?") +#define STR_DOC_DISABLESHARED NC_("STR_DOC_DISABLESHARED", "Disabling shared mode of a spreadsheet hinders all other users of the shared spreadsheet to merge back their work.\n\nDo you want to continue?") +#define STR_DOC_NOLONGERSHARED NC_("STR_DOC_NOLONGERSHARED", "This spreadsheet is no longer in shared mode.\n\nSave your spreadsheet to a separate file and merge your changes to the shared spreadsheet manually.") +#define STR_SHARED_DOC_WARNING NC_("STR_SHARED_DOC_WARNING", "The spreadsheet is in shared mode. This allows multiple users to access and edit the spreadsheet at the same time.\n\nChanges to formatting attributes like fonts, colors, and number formats will not be saved and some functionalities like editing charts and drawing objects are not available in shared mode. Turn off shared mode to get exclusive access needed for those changes and functionalities.") +#define STR_FILE_LOCKED_TRY_LATER NC_("STR_FILE_LOCKED_TRY_LATER", "The shared spreadsheet file is locked due to a merge in progress by user: '%1'\n\nSharing mode of a locked file cannot be disabled. Try again later.") +#define STR_FILE_LOCKED_SAVE_LATER NC_("STR_FILE_LOCKED_SAVE_LATER", "The shared spreadsheet file is locked due to a merge in progress by user: '%1'\n\nTry again later to save your changes.") +#define STR_UNKNOWN_USER NC_("STR_UNKNOWN_USER", "Unknown User") +#define STR_SHAPE_AUTOSHAPE NC_("STR_SHAPE_AUTOSHAPE", "AutoShape") +#define STR_SHAPE_RECTANGLE NC_("STR_SHAPE_RECTANGLE", "Rectangle") +#define STR_SHAPE_LINE NC_("STR_SHAPE_LINE", "Line") +#define STR_SHAPE_OVAL NC_("STR_SHAPE_OVAL", "Oval") +#define STR_FORM_BUTTON NC_("STR_FORM_BUTTON", "Button") +#define STR_FORM_CHECKBOX NC_("STR_FORM_CHECKBOX", "Check Box") +#define STR_FORM_OPTIONBUTTON NC_("STR_FORM_OPTIONBUTTON", "Option Button") +#define STR_FORM_LABEL NC_("STR_FORM_LABEL", "Label") +#define STR_FORM_LISTBOX NC_("STR_FORM_LISTBOX", "List Box") +#define STR_FORM_GROUPBOX NC_("STR_FORM_GROUPBOX", "Group Box") +#define STR_FORM_DROPDOWN NC_("STR_FORM_DROPDOWN", "Drop Down") +#define STR_FORM_SPINNER NC_("STR_FORM_SPINNER", "Spinner") +#define STR_FORM_SCROLLBAR NC_("STR_FORM_SCROLLBAR", "Scroll Bar") +#define STR_STYLE_FAMILY_CELL NC_("STR_STYLE_FAMILY_CELL", "Cell Styles") +#define STR_STYLE_FAMILY_PAGE NC_("STR_STYLE_FAMILY_PAGE", "Page Styles") +#define STR_ERR_DATAPILOTSOURCE NC_("STR_ERR_DATAPILOTSOURCE", "Pivot table source data is invalid.") +#define STR_OPTIONS_WARN_SEPARATORS NC_("STR_OPTIONS_WARN_SEPARATORS", "Because the current formula separator settings conflict with the locale, the formula separators have been reset to their default values.") +#define STR_UNDO_INSERT_CURRENT_DATE NC_("STR_UNDO_INSERT_CURRENT_DATE", "Insert Current Date") +#define STR_UNDO_INSERT_CURRENT_TIME NC_("STR_UNDO_INSERT_CURRENT_TIME", "Insert Current Time") +#define STR_MANAGE_NAMES NC_("STR_MANAGE_NAMES", "Manage Names...") +#define STR_HEADER_NAME NC_("STR_HEADER_NAME", "Name") +#define STR_HEADER_RANGE_OR_EXPR NC_("STR_HEADER_RANGE_OR_EXPR", "Range or formula expression") +#define STR_HEADER_SCOPE NC_("STR_HEADER_SCOPE", "Scope") +#define STR_MULTI_SELECT NC_("STR_MULTI_SELECT", "(multiple)") +#define STR_GLOBAL_SCOPE NC_("STR_GLOBAL_SCOPE", "Document (Global)") +#define STR_ERR_NAME_EXISTS NC_("STR_ERR_NAME_EXISTS", "Invalid name. Already in use for the selected scope.") +#define STR_ERR_NAME_INVALID NC_("STR_ERR_NAME_INVALID", "Invalid name. Only use letters, numbers and underscore.") +#define STR_UNSAVED_EXT_REF NC_("STR_UNSAVED_EXT_REF", "This Document contains external references to unsaved documents.\n\nDo you want to continue?") +#define STR_CLOSE_WITH_UNSAVED_REFS NC_("STR_CLOSE_WITH_UNSAVED_REFS", "This Document is referenced by another document and not yet saved. Closing it without saving will result in data loss.") +#define STR_HEADER_RANGE NC_("STR_HEADER_RANGE", "Range") +#define STR_HEADER_COND NC_("STR_HEADER_COND", "First Condition") +#define STR_COND_CONDITION NC_("STR_COND_CONDITION", "Cell value is") +#define STR_COND_COLORSCALE NC_("STR_COND_COLORSCALE", "ColorScale") +#define STR_COND_DATABAR NC_("STR_COND_DATABAR", "DataBar") +#define STR_COND_ICONSET NC_("STR_COND_ICONSET", "IconSet") +#define STR_COND_BETWEEN NC_("STR_COND_BETWEEN", "between") +#define STR_COND_NOTBETWEEN NC_("STR_COND_NOTBETWEEN", "not between") +#define STR_COND_UNIQUE NC_("STR_COND_UNIQUE", "unique") +#define STR_COND_DUPLICATE NC_("STR_COND_DUPLICATE", "duplicate") +#define STR_COND_FORMULA NC_("STR_COND_FORMULA", "Formula is") +#define STR_COND_TOP10 NC_("STR_COND_TOP10", "Top Elements") +#define STR_COND_BOTTOM10 NC_("STR_COND_BOTTOM10", "Bottom Elements") +#define STR_COND_TOP_PERCENT NC_("STR_COND_TOP_PERCENT", "Top Percent") +#define STR_COND_DATE NC_("STR_COND_DATE", "Date is") +#define STR_COND_BOTTOM_PERCENT NC_("STR_COND_BOTTOM_PERCENT", "Bottom Percent") +#define STR_COND_ABOVE_AVERAGE NC_("STR_COND_ABOVE_AVERAGE", "Above Average") +#define STR_COND_BELOW_AVERAGE NC_("STR_COND_BELOW_AVERAGE", "Below Average") +#define STR_COND_ABOVE_EQUAL_AVERAGE NC_("STR_COND_ABOVE_EQUAL_AVERAGE", "Above or equal Average") +#define STR_COND_BELOW_EQUAL_AVERAGE NC_("STR_COND_BELOW_EQUAL_AVERAGE", "Below or equal Average") +#define STR_COND_ERROR NC_("STR_COND_ERROR", "an Error code") +#define STR_COND_NOERROR NC_("STR_COND_NOERROR", "not an Error code") +#define STR_COND_BEGINS_WITH NC_("STR_COND_BEGINS_WITH", "Begins with") +#define STR_COND_ENDS_WITH NC_("STR_COND_ENDS_WITH", "Ends with") +#define STR_COND_CONTAINS NC_("STR_COND_CONTAINS", "Contains") +#define STR_COND_NOT_CONTAINS NC_("STR_COND_NOT_CONTAINS", "Not Contains") +#define STR_COND_TODAY NC_("STR_COND_TODAY", "today") +#define STR_COND_YESTERDAY NC_("STR_COND_YESTERDAY", "yesterday") +#define STR_COND_TOMORROW NC_("STR_COND_TOMORROW", "tomorrow") +#define STR_COND_LAST7DAYS NC_("STR_COND_LAST7DAYS", "in the last 7 days") +#define STR_COND_THISWEEK NC_("STR_COND_THISWEEK", "this week") +#define STR_COND_LASTWEEK NC_("STR_COND_LASTWEEK", "last week") +#define STR_COND_NEXTWEEK NC_("STR_COND_NEXTWEEK", "next week") +#define STR_COND_THISMONTH NC_("STR_COND_THISMONTH", "this month") +#define STR_COND_LASTMONTH NC_("STR_COND_LASTMONTH", "last month") +#define STR_COND_NEXTMONTH NC_("STR_COND_NEXTMONTH", "next month") +#define STR_COND_THISYEAR NC_("STR_COND_THISYEAR", "this year") +#define STR_COND_LASTYEAR NC_("STR_COND_LASTYEAR", "last year") +#define STR_COND_NEXTYEAR NC_("STR_COND_NEXTYEAR", "next year") +#define STR_COND_AND NC_("STR_COND_AND", "and") +#define STR_ERR_CONDFORMAT_PROTECTED NC_("STR_ERR_CONDFORMAT_PROTECTED", "Conditional Formats can not be created, deleted or changed in protected sheets!") +#define STR_EDIT_EXISTING_COND_FORMATS NC_("STR_EDIT_EXISTING_COND_FORMATS", "The selected cell already contains conditional formatting. You can either edit the existing conditional format or you define a new overlapping conditional format.\n\n Do you want to edit the existing conditional format?") +#define STR_QUERY_FORMULA_RECALC_ONLOAD_ODS NC_("STR_QUERY_FORMULA_RECALC_ONLOAD_ODS", "This document was last saved by an application other than %PRODUCTNAME. Some formula cells may produce different results when recalculated.\n\nDo you want to recalculate all formula cells in this document now?") +#define STR_QUERY_FORMULA_RECALC_ONLOAD_XLS NC_("STR_QUERY_FORMULA_RECALC_ONLOAD_XLS", "This document was last saved by Excel. Some formula cells may produce different results when recalculated.\n\nDo you want to recalculate all formula cells now?") +#define STR_ALWAYS_PERFORM_SELECTED NC_("STR_ALWAYS_PERFORM_SELECTED", "Always perform this without prompt in the future.") +#define STR_NO_INSERT_DELETE_OVER_PIVOT_TABLE NC_("STR_NO_INSERT_DELETE_OVER_PIVOT_TABLE", "You cannot insert or delete cells when the affected range intersects with pivot table.") +#define STR_DPFIELD_GROUP_BY_SECONDS NC_("STR_DPFIELD_GROUP_BY_SECONDS", "Seconds") +#define STR_DPFIELD_GROUP_BY_MINUTES NC_("STR_DPFIELD_GROUP_BY_MINUTES", "Minutes") +#define STR_DPFIELD_GROUP_BY_HOURS NC_("STR_DPFIELD_GROUP_BY_HOURS", "Hours") +#define STR_DPFIELD_GROUP_BY_DAYS NC_("STR_DPFIELD_GROUP_BY_DAYS", "Days") +#define STR_DPFIELD_GROUP_BY_MONTHS NC_("STR_DPFIELD_GROUP_BY_MONTHS", "Months") +#define STR_DPFIELD_GROUP_BY_QUARTERS NC_("STR_DPFIELD_GROUP_BY_QUARTERS", "Quarters") +#define STR_DPFIELD_GROUP_BY_YEARS NC_("STR_DPFIELD_GROUP_BY_YEARS", "Years") +#define STR_INVALIDVAL NC_("STR_INVALIDVAL", "Invalid target value.") +#define STR_INVALIDVAR NC_("STR_INVALIDVAR", "Undefined name for variable cell.") +#define STR_INVALIDFORM NC_("STR_INVALIDFORM", "Undefined name as formula cell.") +#define STR_NOFORMULA NC_("STR_NOFORMULA", "Formula cell must contain a formula.") +#define STR_INVALIDINPUT NC_("STR_INVALIDINPUT", "Invalid input.") +#define STR_INVALIDCONDITION NC_("STR_INVALIDCONDITION", "Invalid condition.") +#define STR_QUERYREMOVE NC_("STR_QUERYREMOVE", "Should the entry\n#\nbe deleted?") +#define STR_COPYLIST NC_("STR_COPYLIST", "Copy List") +#define STR_COPYFROM NC_("STR_COPYFROM", "List from") +#define STR_COPYERR NC_("STR_COPYERR", "Cells without text have been ignored.") +#define STR_CTRLCLICKHYPERLINK NC_("STR_CTRLCLICKHYPERLINK", "%s-click to follow hyperlink:") +#define STR_CLICKHYPERLINK NC_("STR_CLICKHYPERLINK", "click to open hyperlink:") +#define STR_PRINT_PREVIEW_NODATA NC_("STR_PRINT_PREVIEW_NODATA", "No Data") +#define STR_PRINT_PREVIEW_EMPTY_RANGE NC_("STR_PRINT_PREVIEW_EMPTY_RANGE", "Print Range Empty") +#define STR_UNDO_CONDFORMAT NC_("STR_UNDO_CONDFORMAT", "Conditional Format") +#define STR_UNDO_CONDFORMAT_LIST NC_("STR_UNDO_CONDFORMAT_LIST", "Conditional Formats") +#define STR_UNDO_FORMULA_TO_VALUE NC_("STR_UNDO_FORMULA_TO_VALUE", "Convert Formula To Value") +#define STR_UNQUOTED_STRING NC_("STR_UNQUOTED_STRING", "Strings without quotes are interpreted as column/row labels.") +#define STR_ENTER_VALUE NC_("STR_ENTER_VALUE", "Enter a value!") +#define STR_TABLE_COUNT NC_("STR_TABLE_COUNT", "Sheet %1 of %2") +#define STR_FUNCTIONS_FOUND NC_("STR_FUNCTIONS_FOUND", "%1 and %2 more") +#define STR_GENERAL NC_("STR_GENERAL", "General") +#define STR_NUMBER NC_("STR_NUMBER", "Number") +#define STR_PERCENT NC_("STR_PERCENT", "Percent") +#define STR_CURRENCY NC_("STR_CURRENCY", "Currency") +#define STR_DATE NC_("STR_DATE", "Date") +#define STR_TIME NC_("STR_TIME", "Time") +#define STR_SCIENTIFIC NC_("STR_SCIENTIFIC", "Scientific") +#define STR_FRACTION NC_("STR_FRACTION", "Fraction") +#define STR_BOOLEAN_VALUE NC_("STR_BOOLEAN_VALUE", "Boolean Value") +#define STR_TEXT NC_("STR_TEXT", "Text") +#define STR_QUERY_PIVOTTABLE_DELTAB NC_("STR_QUERY_PIVOTTABLE_DELTAB", "The selected sheet(s) contain source data of related pivot tables that will be lost. Are you sure you want to delete the selected sheet(s)?") +#define STR_ERR_NAME_INVALID_CELL_REF NC_("STR_ERR_NAME_INVALID_CELL_REF", "Invalid name. Reference to a cell, or a range of cells not allowed.") #endif diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx index a4c1c77d3fe3..869df6bbc266 100644 --- a/sc/inc/pch/precompiled_sc.hxx +++ b/sc/inc/pch/precompiled_sc.hxx @@ -408,8 +408,6 @@ #include #include #include -#include -#include #include #include #include @@ -564,7 +562,6 @@ #include #include #include -#include #include #include #include diff --git a/sc/inc/pch/precompiled_scfilt.hxx b/sc/inc/pch/precompiled_scfilt.hxx index 4430b8f68e95..da96e05ed651 100644 --- a/sc/inc/pch/precompiled_scfilt.hxx +++ b/sc/inc/pch/precompiled_scfilt.hxx @@ -220,7 +220,6 @@ #include #include #include -#include #include #include #include diff --git a/sc/inc/pch/precompiled_scui.hxx b/sc/inc/pch/precompiled_scui.hxx index b85b551e1e4e..7dee266ad3e9 100644 --- a/sc/inc/pch/precompiled_scui.hxx +++ b/sc/inc/pch/precompiled_scui.hxx @@ -158,8 +158,6 @@ #include #include #include -#include -#include #include #include #include diff --git a/sc/inc/pvfundlg.hrc b/sc/inc/pvfundlg.hrc new file mode 100644 index 000000000000..5759cb3656fb --- /dev/null +++ b/sc/inc/pvfundlg.hrc @@ -0,0 +1,43 @@ +/* -*- 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_SC_INC_PVFUNDLG_HRC +#define INCLUDED_SC_INC_PVFUNDLG_HRC + +#define NC_(Context, String) (Context "\004" u8##String) + +const char* SCSTR_DPFUNCLISTBOX[] = +{ + NC_("SCSTR_DPFUNCLISTBOX", "Sum"), + NC_("SCSTR_DPFUNCLISTBOX", "Count"), + NC_("SCSTR_DPFUNCLISTBOX", "Average"), + NC_("SCSTR_DPFUNCLISTBOX", "Median"), + NC_("SCSTR_DPFUNCLISTBOX", "Max"), + NC_("SCSTR_DPFUNCLISTBOX", "Min"), + NC_("SCSTR_DPFUNCLISTBOX", "Product"), + NC_("SCSTR_DPFUNCLISTBOX", "Count (Numbers only)"), + NC_("SCSTR_DPFUNCLISTBOX", "StDev (Sample)"), + NC_("SCSTR_DPFUNCLISTBOX", "StDevP (Population)"), + NC_("SCSTR_DPFUNCLISTBOX", "Var (Sample)"), + NC_("SCSTR_DPFUNCLISTBOX", "VarP (Population)") +}; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 23e4094193ea..9b5925b5e4ff 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -21,7 +21,7 @@ #define SC_SC_HRC #include -#include +#include #include "svx/svxcommands.h" #include "helpids.h" @@ -650,8 +650,6 @@ #define SID_INSERT_CURRENT_TIME (SC_RESOURCE_START+17) #define FID_TAB_TOGGLE_GRID (SC_RESOURCE_START+18) // toggle sheet grid #define WID_SIMPLE_REF (SC_RESOURCE_START+20) -#define RID_ERRHDLSC (SC_RESOURCE_START+23) -#define RID_FUNCTION_CATEGORIES (SC_RESOURCE_START+62) #endif diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index 96d154991f4e..fa613e0c5a13 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -24,7 +24,7 @@ #include #include #include -#include "scres.hrc" +#include "sc.hrc" #include "global.hxx" #include "pivot.hxx" #include diff --git a/sc/inc/scerrors.hrc b/sc/inc/scerrors.hrc new file mode 100644 index 000000000000..9e8b89d4d6f2 --- /dev/null +++ b/sc/inc/scerrors.hrc @@ -0,0 +1,111 @@ +/* -*- 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_SC_INC_SCERRORS_HRC +#define INCLUDED_SC_INC_SCERRORS_HRC + +#define NC_(Context, String) (Context "\004" u8##String) + +#include "scerrors.hxx" + +const ErrMsgCode RID_ERRHDLSC[] = +{ + // ERRORS ----------------------------------------------------- + { NC_("RID_ERRHDLSC", "Impossible to connect to the file.") , + ErrCode(sal_uInt32(SCERR_IMPORT_CONNECT) & ERRCODE_RES_MASK) }, + { NC_("RID_ERRHDLSC", "File could not be opened.") , + ErrCode(sal_uInt32(SCERR_IMPORT_OPEN) & ERRCODE_RES_MASK) }, + { NC_("RID_ERRHDLSC", "An unknown error has occurred.") , + ErrCode(sal_uInt32(SCERR_IMPORT_UNKNOWN) & ERRCODE_RES_MASK) }, + { NC_("RID_ERRHDLSC", "Not enough memory while importing.") , + ErrCode(sal_uInt32(SCERR_IMPORT_OUTOFMEM) & ERRCODE_RES_MASK) }, + { NC_("RID_ERRHDLSC", "Unknown Lotus1-2-3 file format.") , + ErrCode(sal_uInt32(SCERR_IMPORT_UNKNOWN_WK) & ERRCODE_RES_MASK) }, + { NC_("RID_ERRHDLSC", "Error in file structure while importing.") , + ErrCode(sal_uInt32(SCERR_IMPORT_FORMAT) & ERRCODE_RES_MASK) }, + { NC_("RID_ERRHDLSC", "There is no filter available for this file type.") , + ErrCode(sal_uInt32(SCERR_IMPORT_NI) & ERRCODE_RES_MASK) }, + { NC_("RID_ERRHDLSC", "Unknown or unsupported Excel file format.") , + ErrCode(sal_uInt32(SCERR_IMPORT_UNKNOWN_BIFF) & ERRCODE_RES_MASK) }, + { NC_("RID_ERRHDLSC", "Excel file format not yet implemented.") , + ErrCode(sal_uInt32(SCERR_IMPORT_NI_BIFF) & ERRCODE_RES_MASK) }, + { NC_("RID_ERRHDLSC", "This file is password-protected.") , + ErrCode(sal_uInt32(SCERR_IMPORT_FILEPASSWD) & ERRCODE_RES_MASK) }, + { NC_("RID_ERRHDLSC", "Internal import error.") , + ErrCode(sal_uInt32(SCERR_IMPORT_INTERNAL) & ERRCODE_RES_MASK) }, + { NC_("RID_ERRHDLSC", "The file contains data after row 8192 and therefore can not be read.") , + ErrCode(sal_uInt32(SCERR_IMPORT_8K_LIMIT) & ERRCODE_RES_MASK) }, + { NC_("RID_ERRHDLSC", "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(row,col)."), + ErrCode(sal_uInt32(SCERR_IMPORT_FILE_ROWCOL) & ERRCODE_RES_MASK) }, + { NC_("RID_ERRHDLSC", "File format error found at $(ARG1)(row,col).") , + ErrCode(sal_uInt32(SCERR_IMPORT_FORMAT_ROWCOL) & ERRCODE_RES_MASK) }, + + // Export ---------------------------------------------------- + { NC_("RID_ERRHDLSC", "Connection to the file could not be established.") , + ErrCode(sal_uInt32(SCERR_EXPORT_CONNECT) & ERRCODE_RES_MASK) }, + { NC_("RID_ERRHDLSC", "Data could not be written.") , + ErrCode(sal_uInt32(SCERR_EXPORT_DATA) & ERRCODE_RES_MASK) }, + { NC_("RID_ERRHDLSC", "$(ARG1)") , + ErrCode(sal_uInt32(SCERR_EXPORT_SQLEXCEPTION) & ERRCODE_RES_MASK) }, + { NC_("RID_ERRHDLSC", "Cell $(ARG1) contains characters that are not representable in the selected target character set \"$(ARG2)\".") , + ErrCode(sal_uInt32(SCERR_EXPORT_ENCODING) & ERRCODE_RES_MASK) }, + { NC_("RID_ERRHDLSC", "Cell $(ARG1) contains a string that is longer in the selected target character set \"$(ARG2)\" than the given field width.") , + ErrCode(sal_uInt32(SCERR_EXPORT_FIELDWIDTH) & ERRCODE_RES_MASK) }, + + // WARNINGS --------------------------------------------------- + { NC_("RID_ERRHDLSC", "Only the active sheet was saved.") , + ErrCode(sal_uInt32(SCWARN_EXPORT_ASCII) & ERRCODE_RES_MASK) }, + { NC_("RID_ERRHDLSC", "The maximum number of rows has been exceeded. Excess rows were not imported!") , + ErrCode(sal_uInt32(SCWARN_IMPORT_RANGE_OVERFLOW) & ERRCODE_RES_MASK) }, + { NC_("RID_ERRHDLSC", "The data could not be loaded completely because the maximum number of rows per sheet was exceeded.") , + ErrCode(sal_uInt32(SCWARN_IMPORT_ROW_OVERFLOW) & ERRCODE_RES_MASK) }, + { NC_("RID_ERRHDLSC", "The data could not be loaded completely because the maximum number of columns per sheet was exceeded.") , + ErrCode(sal_uInt32(SCWARN_IMPORT_COLUMN_OVERFLOW) & ERRCODE_RES_MASK) }, + { NC_("RID_ERRHDLSC", "Not all sheets have been loaded because the maximum number of sheets was exceeded.\n\nPlease be warned that re-saving this document will permanently delete those sheets that have not been loaded!") , + ErrCode(sal_uInt32(SCWARN_IMPORT_SHEET_OVERFLOW) & ERRCODE_RES_MASK) }, + { NC_("RID_ERRHDLSC", "The data could not be loaded completely because the maximum number of characters per cell was exceeded.") , + ErrCode(sal_uInt32(SCWARN_IMPORT_CELL_OVERFLOW) & ERRCODE_RES_MASK) }, + { NC_("RID_ERRHDLSC", "Corresponding FM3-File could not be opened.") , + ErrCode(sal_uInt32(SCWARN_IMPORT_OPEN_FM3) & ERRCODE_RES_MASK) }, + { NC_("RID_ERRHDLSC", "Error in file structure of corresponding FM3-File.") , + ErrCode(sal_uInt32(SCWARN_IMPORT_WRONG_FM3) & ERRCODE_RES_MASK) }, + { NC_("RID_ERRHDLSC", "Document too complex for automatic calculation. Press F9 to recalculate.") , + ErrCode(sal_uInt32(SCWARN_CORE_HARD_RECALC) & ERRCODE_RES_MASK) }, + { NC_("RID_ERRHDLSC", "The document contains more rows than supported in the selected format.\nAdditional rows were not saved.") , + ErrCode(sal_uInt32(SCWARN_EXPORT_MAXROW) & ERRCODE_RES_MASK) }, + { NC_("RID_ERRHDLSC", "The document contains more columns than supported in the selected format.\nAdditional columns were not saved.") , + ErrCode(sal_uInt32(SCWARN_EXPORT_MAXCOL) & ERRCODE_RES_MASK) }, + { NC_("RID_ERRHDLSC", "The document contains more sheets than supported in the selected format.\nAdditional sheets were not saved.") , + ErrCode(sal_uInt32(SCWARN_EXPORT_MAXTAB) & ERRCODE_RES_MASK) }, + { NC_("RID_ERRHDLSC", "The document contains information not recognized by this program version.\nResaving the document will delete this information!") , + ErrCode(sal_uInt32(SCWARN_IMPORT_INFOLOST) & ERRCODE_RES_MASK) }, + { NC_("RID_ERRHDLSC", "Not all cell contents could be saved in the specified format.") , + ErrCode(sal_uInt32(SCWARN_EXPORT_DATALOST) & ERRCODE_RES_MASK) }, + { NC_("RID_ERRHDLSC", "The following characters could not be converted to the selected character set\nand were written as Ӓ surrogates:\n\n$(ARG1)"), + ErrCode(sal_uInt32(SCWARN_EXPORT_NONCONVERTIBLE_CHARS) & ERRCODE_RES_MASK) }, + { NC_("RID_ERRHDLSC", "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(row,col)."), + ErrCode(sal_uInt32(SCWARN_IMPORT_FILE_ROWCOL) & ERRCODE_RES_MASK) }, + { NC_("RID_ERRHDLSC", "Not all attributes could be read.") , + ErrCode(sal_uInt32(SCWARN_IMPORT_FEATURES_LOST) & ERRCODE_RES_MASK) }, + { nullptr, ERRCODE_NONE } +}; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/scfuncs.hrc b/sc/inc/scfuncs.hrc index 5a4f016e6c7a..37e78ffc401e 100644 --- a/sc/inc/scfuncs.hrc +++ b/sc/inc/scfuncs.hrc @@ -16,18 +16,4070 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "scres.hrc" +#ifndef INCLUDED_SC_INC_SCFUNCS_HRC +#define INCLUDED_SC_INC_SCFUNCS_HRC -#define ID_FUNCTION_GRP_DATABASE 1 -#define ID_FUNCTION_GRP_DATETIME 2 -#define ID_FUNCTION_GRP_FINANZ 3 -#define ID_FUNCTION_GRP_INFO 4 -#define ID_FUNCTION_GRP_LOGIC 5 -#define ID_FUNCTION_GRP_MATH 6 -#define ID_FUNCTION_GRP_MATRIX 7 -#define ID_FUNCTION_GRP_STATISTIC 8 -#define ID_FUNCTION_GRP_TABLE 9 -#define ID_FUNCTION_GRP_TEXT 10 -#define ID_FUNCTION_GRP_ADDINS 11 +#define NC_(Context, String) (Context "\004" u8##String) + +/* Resource file for the function wizard / autopilot. + * + * For every function there is a StringArray with a resource id (offset by + * RID_SC_FUNC_DESCRIPTIONS_START) with the OpCode of the function + * + * In this stringarray, the description of the function is given as the first + * entry, followed by two entries for each parameter, first the type or name + * of the parameter, second a description of the parameter. + */ + +// -=*# Resource for function DCOUNT #*=- +const char* SC_OPCODE_DB_COUNT_ARY[] = +{ + NC_("SC_OPCODE_DB_COUNT", "Counts the cells of a data range whose contents match the search criteria."), + NC_("SC_OPCODE_DB_COUNT", "Database"), + NC_("SC_OPCODE_DB_COUNT", "The range of cells containing data."), + NC_("SC_OPCODE_DB_COUNT", "Database field"), + NC_("SC_OPCODE_DB_COUNT", "Indicates which database field (column) is to be used for the search criteria."), + NC_("SC_OPCODE_DB_COUNT", "Search criteria"), + NC_("SC_OPCODE_DB_COUNT", "Defines the cell range containing the search criteria.") +}; + +// -=*# Resource for function DCOUNTA #*=- +const char* SC_OPCODE_DB_COUNT_2_ARY[] = +{ + NC_("SC_OPCODE_DB_COUNT_2", "Counts all non-blank cells of a data range where the content corresponds to the search criteria."), + NC_("SC_OPCODE_DB_COUNT_2", "Database"), + NC_("SC_OPCODE_DB_COUNT_2", "The range of cells containing data."), + NC_("SC_OPCODE_DB_COUNT_2", "Database field"), + NC_("SC_OPCODE_DB_COUNT_2", "Indicates which database field (column) is to be used for the search criteria."), + NC_("SC_OPCODE_DB_COUNT_2", "Search criteria"), + NC_("SC_OPCODE_DB_COUNT_2", "Defines the cell range containing the search criteria.") +}; + +// -=*# Resource for function DAVERAGE #*=- +const char* SC_OPCODE_DB_AVERAGE_ARY[] = +{ + NC_("SC_OPCODE_DB_AVERAGE", "Returns the average value of all the cells of a data range whose contents match the search criteria."), + NC_("SC_OPCODE_DB_AVERAGE", "Database"), + NC_("SC_OPCODE_DB_AVERAGE", "The range of cells containing data."), + NC_("SC_OPCODE_DB_AVERAGE", "Database field"), + NC_("SC_OPCODE_DB_AVERAGE", "Indicates which database field (column) is to be used for the search criteria."), + NC_("SC_OPCODE_DB_AVERAGE", "Search criteria"), + NC_("SC_OPCODE_DB_AVERAGE", "Defines the cell range containing the search criteria.") +}; + +// -=*# Resource for function DGET #*=- +const char* SC_OPCODE_DB_GET_ARY[] = +{ + NC_("SC_OPCODE_DB_GET", "Defines the contents of the cell of a data range which matches the search criteria."), + NC_("SC_OPCODE_DB_GET", "Database"), + NC_("SC_OPCODE_DB_GET", "The range of cells containing data."), + NC_("SC_OPCODE_DB_GET", "Database field"), + NC_("SC_OPCODE_DB_GET", "Indicates which database field (column) is to be used for the search criteria."), + NC_("SC_OPCODE_DB_GET", "Search criteria"), + NC_("SC_OPCODE_DB_GET", "Defines the cell range containing the search criteria.") +}; + +// -=*# Resource for function DMAX #*=- +const char* SC_OPCODE_DB_MAX_ARY[] = +{ + NC_("SC_OPCODE_DB_MAX", "Returns the maximum value from all of the cells of a data range which correspond to the search criteria."), + NC_("SC_OPCODE_DB_MAX", "Database"), + NC_("SC_OPCODE_DB_MAX", "The range of cells containing data."), + NC_("SC_OPCODE_DB_MAX", "Database field"), + NC_("SC_OPCODE_DB_MAX", "Indicates which database field (column) is to be used for the search criteria."), + NC_("SC_OPCODE_DB_MAX", "Search criteria"), + NC_("SC_OPCODE_DB_MAX", "Defines the cell range containing the search criteria.") +}; + +// -=*# Resource for function DMIN #*=- +const char* SC_OPCODE_DB_MIN_ARY[] = +{ + NC_("SC_OPCODE_DB_MIN", "Returns the minimum of all cells of a data range where the contents correspond to the search criteria."), + NC_("SC_OPCODE_DB_MIN", "Database"), + NC_("SC_OPCODE_DB_MIN", "The range of cells containing data."), + NC_("SC_OPCODE_DB_MIN", "Database field"), + NC_("SC_OPCODE_DB_MIN", "Indicates which database field (column) is to be used for the search criteria."), + NC_("SC_OPCODE_DB_MIN", "Search criteria"), + NC_("SC_OPCODE_DB_MIN", "Defines the cell range containing the search criteria.") +}; + +// -=*# Resource for function DPRODUCT #*=- +const char* SC_OPCODE_DB_PRODUCT_ARY[] = +{ + NC_("SC_OPCODE_DB_PRODUCT", "Multiplies all cells of a data range where the contents match the search criteria."), + NC_("SC_OPCODE_DB_PRODUCT", "Database"), + NC_("SC_OPCODE_DB_PRODUCT", "The range of cells containing data."), + NC_("SC_OPCODE_DB_PRODUCT", "Database field"), + NC_("SC_OPCODE_DB_PRODUCT", "Indicates which database field (column) is to be used for the search criteria."), + NC_("SC_OPCODE_DB_PRODUCT", "Search criteria"), + NC_("SC_OPCODE_DB_PRODUCT", "Defines the cell range containing the search criteria.") +}; + +// -=*# Resource for function DSTDEV #*=- +const char* SC_OPCODE_DB_STD_DEV_ARY[] = +{ + NC_("SC_OPCODE_DB_STD_DEV", "Calculates the standard deviation of all cells in a data range whose contents match the search criteria."), + NC_("SC_OPCODE_DB_STD_DEV", "Database"), + NC_("SC_OPCODE_DB_STD_DEV", "The range of cells containing data."), + NC_("SC_OPCODE_DB_STD_DEV", "Database field"), + NC_("SC_OPCODE_DB_STD_DEV", "Indicates which database field (column) is to be used for the search criteria."), + NC_("SC_OPCODE_DB_STD_DEV", "Search criteria"), + NC_("SC_OPCODE_DB_STD_DEV", "Defines the cell range containing the search criteria.") +}; + +// -=*# Resource for function DSTDEVP #*=- +const char* SC_OPCODE_DB_STD_DEV_P_ARY[] = +{ + NC_("SC_OPCODE_DB_STD_DEV_P", "Returns the standard deviation with regards to the population of all cells of a data range matching the search criteria."), + NC_("SC_OPCODE_DB_STD_DEV_P", "Database"), + NC_("SC_OPCODE_DB_STD_DEV_P", "The range of cells containing data."), + NC_("SC_OPCODE_DB_STD_DEV_P", "Database field"), + NC_("SC_OPCODE_DB_STD_DEV_P", "Indicates which database field (column) is to be used for the search criteria."), + NC_("SC_OPCODE_DB_STD_DEV_P", "Search criteria"), + NC_("SC_OPCODE_DB_STD_DEV_P", "Defines the cell range containing the search criteria.") +}; + +// -=*# Resource for function DSUM #*=- +const char* SC_OPCODE_DB_SUM_ARY[] = +{ + NC_("SC_OPCODE_DB_SUM", "Adds all the cells of a data range where the contents match the search criteria."), + NC_("SC_OPCODE_DB_SUM", "Database"), + NC_("SC_OPCODE_DB_SUM", "The range of cells containing data."), + NC_("SC_OPCODE_DB_SUM", "Database field"), + NC_("SC_OPCODE_DB_SUM", "Indicates which database field (column) is to be used for the search criteria."), + NC_("SC_OPCODE_DB_SUM", "Search criteria"), + NC_("SC_OPCODE_DB_SUM", "Defines the cell range containing the search criteria.") +}; + +// -=*# Resource for function DVAR #*=- +const char* SC_OPCODE_DB_VAR_ARY[] = +{ + NC_("SC_OPCODE_DB_VAR", "Determines the variance of all the cells in a data range where the contents match the search criteria."), + NC_("SC_OPCODE_DB_VAR", "Database"), + NC_("SC_OPCODE_DB_VAR", "The range of cells containing data."), + NC_("SC_OPCODE_DB_VAR", "Database field"), + NC_("SC_OPCODE_DB_VAR", "Indicates which database field (column) is to be used for the search criteria."), + NC_("SC_OPCODE_DB_VAR", "Search criteria"), + NC_("SC_OPCODE_DB_VAR", "Defines the cell range containing the search criteria.") +}; + +// -=*# Resource for function DVARP #*=- +const char* SC_OPCODE_DB_VAR_P_ARY[] = +{ + NC_("SC_OPCODE_DB_VAR_P", "Determines variance of a population based on all cells in a data range where contents match the search criteria."), + NC_("SC_OPCODE_DB_VAR_P", "Database"), + NC_("SC_OPCODE_DB_VAR_P", "The range of cells containing data."), + NC_("SC_OPCODE_DB_VAR_P", "Database field"), + NC_("SC_OPCODE_DB_VAR_P", "Indicates which database field (column) is to be used for the search criteria."), + NC_("SC_OPCODE_DB_VAR_P", "Search criteria"), + NC_("SC_OPCODE_DB_VAR_P", "Defines the cell range containing the search criteria.") +}; + +// -=*# Resource for function DATE #*=- +const char* SC_OPCODE_GET_DATE_ARY[] = +{ + NC_("SC_OPCODE_GET_DATE", "Provides an internal number for the date given."), + NC_("SC_OPCODE_GET_DATE", "year"), + NC_("SC_OPCODE_GET_DATE", "An integer between 1583 and 9956 or 0 and 99 (19xx or 20xx depending on the defined option)."), + NC_("SC_OPCODE_GET_DATE", "month"), + NC_("SC_OPCODE_GET_DATE", "An integer between 1 and 12 representing the month."), + NC_("SC_OPCODE_GET_DATE", "day"), + NC_("SC_OPCODE_GET_DATE", "An integer between 1 and 31 representing the day of the month.") +}; + +// -=*# Resource for function DATE_VALUE #*=- +const char* SC_OPCODE_GET_DATE_VALUE_ARY[] = +{ + NC_("SC_OPCODE_GET_DATE_VALUE", "Returns an internal number for a text having a possible date format."), + NC_("SC_OPCODE_GET_DATE_VALUE", "text"), + NC_("SC_OPCODE_GET_DATE_VALUE", "A text enclosed in quotation marks which returns a date in a %PRODUCTNAME date format.") +}; + +// -=*# Resource for function DAY #*=- +const char* SC_OPCODE_GET_DAY_ARY[] = +{ + NC_("SC_OPCODE_GET_DAY", "Returns the sequential date of the month as an integer (1-31) in relation to the date value."), + NC_("SC_OPCODE_GET_DAY", "Number"), + NC_("SC_OPCODE_GET_DAY", "The internal number for the date.") +}; + +// -=*# Resource for function DAYS360 #*=- +const char* SC_OPCODE_GET_DIFF_DATE_360_ARY[] = +{ + NC_("SC_OPCODE_GET_DIFF_DATE_360", "Calculates the number of days between two dates based on a 360-day year."), + NC_("SC_OPCODE_GET_DIFF_DATE_360", "Date_1"), + NC_("SC_OPCODE_GET_DIFF_DATE_360", "The start date for calculating the difference in days."), + NC_("SC_OPCODE_GET_DIFF_DATE_360", "Date_2"), + NC_("SC_OPCODE_GET_DIFF_DATE_360", "The end date for calculating the difference in days."), + NC_("SC_OPCODE_GET_DIFF_DATE_360", "Type"), + NC_("SC_OPCODE_GET_DIFF_DATE_360", "Method used to form differences: Type = 0 denotes US method (NASD), Type = 1 denotes the European method.") +}; + +// -=*# Resource for function NETWORKDAYS #*=- +const char* SC_OPCODE_NETWORKDAYS_ARY[] = +{ + NC_("SC_OPCODE_NETWORKDAYS", "Returns the number of workdays between two dates using arguments to indicate weekenddays and holidays."), + NC_("SC_OPCODE_NETWORKDAYS", "Start Date"), + NC_("SC_OPCODE_NETWORKDAYS", "Start date for calculation."), + NC_("SC_OPCODE_NETWORKDAYS", "End Date"), + NC_("SC_OPCODE_NETWORKDAYS", "End date for calculation."), + NC_("SC_OPCODE_NETWORKDAYS", "list of dates"), + NC_("SC_OPCODE_NETWORKDAYS", "Optional set of one or more dates to be considered as holiday."), + NC_("SC_OPCODE_NETWORKDAYS", "array"), + NC_("SC_OPCODE_NETWORKDAYS", "Optional list of numbers to indicate working (0) and weekend (non-zero) days. When omitted, weekend is Saturday and Sunday.") +}; + +// -=*# Resource for function NETWORKDAYS.INTL #*=- +const char* SC_OPCODE_NETWORKDAYS_MS_ARY[] = +{ + NC_("SC_OPCODE_NETWORKDAYS_MS", "Returns the number of workdays between two dates using arguments to indicate weekend days and holidays."), + NC_("SC_OPCODE_NETWORKDAYS_MS", "Start Date"), + NC_("SC_OPCODE_NETWORKDAYS_MS", "Start date for calculation."), + NC_("SC_OPCODE_NETWORKDAYS_MS", "End Date"), + NC_("SC_OPCODE_NETWORKDAYS_MS", "End date for calculation."), + NC_("SC_OPCODE_NETWORKDAYS_MS", "number or string"), + NC_("SC_OPCODE_NETWORKDAYS_MS", "Optional number or string to indicate when weekends occur. When omitted, weekend is Saturday and Sunday."), + NC_("SC_OPCODE_NETWORKDAYS_MS", "array"), + NC_("SC_OPCODE_NETWORKDAYS_MS", "Optional set of one or more dates to be considered as holiday.") +}; + +// -=*# Resource for function WORKDAY.INTL #*=- +const char* SC_OPCODE_WORKDAY_MS_ARY[] = +{ + NC_("SC_OPCODE_WORKDAY_MS", "Returns the serial number of the date before or after a number of workdays using arguments to indicate weekend days and holidays."), + NC_("SC_OPCODE_WORKDAY_MS", "Start Date"), + NC_("SC_OPCODE_WORKDAY_MS", "Start date for calculation."), + NC_("SC_OPCODE_WORKDAY_MS", "Days"), + NC_("SC_OPCODE_WORKDAY_MS", "The number of workdays before or after start date."), + NC_("SC_OPCODE_WORKDAY_MS", "number or string"), + NC_("SC_OPCODE_WORKDAY_MS", "Optional number or string to indicate when weekends occur. When omitted, weekend is Saturday and Sunday."), + NC_("SC_OPCODE_WORKDAY_MS", "array"), + NC_("SC_OPCODE_WORKDAY_MS", "Optional set of one or more dates to be considered as holiday.") +}; + +// -=*# Resource for function HOUR #*=- +const char* SC_OPCODE_GET_HOUR_ARY[] = +{ + NC_("SC_OPCODE_GET_HOUR", "Determines the sequential number of the hour of the day (0-23) for the time value."), + NC_("SC_OPCODE_GET_HOUR", "Number"), + NC_("SC_OPCODE_GET_HOUR", "Internal time value") +}; + +// -=*# Resource for function MINUTE #*=- +const char* SC_OPCODE_GET_MIN_ARY[] = +{ + NC_("SC_OPCODE_GET_MIN", "Determines the sequential number for the minute of the hour (0-59) for the time value."), + NC_("SC_OPCODE_GET_MIN", "Number"), + NC_("SC_OPCODE_GET_MIN", "Internal time value.") +}; + +// -=*# Resource for function MONTH #*=- +const char* SC_OPCODE_GET_MONTH_ARY[] = +{ + NC_("SC_OPCODE_GET_MONTH", "Determines the sequential number of a month of the year (1-12) for the date value."), + NC_("SC_OPCODE_GET_MONTH", "Number"), + NC_("SC_OPCODE_GET_MONTH", "The internal number of the date.") +}; + +// -=*# Resource for function NOW #*=- +const char* SC_OPCODE_GET_ACT_TIME_ARY[] = +{ + NC_("SC_OPCODE_GET_ACT_TIME", "Determines the current time of the computer.") +}; + +// -=*# Resource for function SECOND #*=- +const char*SC_OPCODE_GET_SEC_ARY[] = +{ + NC_("SC_OPCODE_GET_SEC", "Determines the sequential number of the second of a minute (0-59) for the time value."), + NC_("SC_OPCODE_GET_SEC", "Number"), + NC_("SC_OPCODE_GET_SEC", "The internal time value.") +}; + +// -=*# Resource for function TIME #*=- +const char* SC_OPCODE_GET_TIME_ARY[] = +{ + NC_("SC_OPCODE_GET_TIME", "Determines a time value from the details for hour, minute and second."), + NC_("SC_OPCODE_GET_TIME", "hour"), + NC_("SC_OPCODE_GET_TIME", "The integer for the hour."), + NC_("SC_OPCODE_GET_TIME", "minute"), + NC_("SC_OPCODE_GET_TIME", "The integer for the minute."), + NC_("SC_OPCODE_GET_TIME", "second"), + NC_("SC_OPCODE_GET_TIME", "The integer for the second.") +}; + +// -=*# Resource for function TIMEVALUE #*=- +const char* SC_OPCODE_GET_TIME_VALUE_ARY[] = +{ + NC_("SC_OPCODE_GET_TIME_VALUE", "Returns a sequential number for a text shown in a possible time entry format."), + NC_("SC_OPCODE_GET_TIME_VALUE", "text"), + NC_("SC_OPCODE_GET_TIME_VALUE", "A text enclosed in quotation marks which returns a time in a %PRODUCTNAME time format.") +}; + +// -=*# Resource for function TODAY #*=- +const char* SC_OPCODE_GET_ACT_DATE_ARY[] = +{ + NC_("SC_OPCODE_GET_ACT_DATE", "Determines the current date of the computer.") +}; + +// -=*# Resource for function WEEKDAY #*=- +const char* SC_OPCODE_GET_DAY_OF_WEEK_ARY[] = +{ + NC_("SC_OPCODE_GET_DAY_OF_WEEK", "Returns the day of the week for the date value as an integer."), + NC_("SC_OPCODE_GET_DAY_OF_WEEK", "Number"), + NC_("SC_OPCODE_GET_DAY_OF_WEEK", "The internal number for the date."), + NC_("SC_OPCODE_GET_DAY_OF_WEEK", "Type"), + NC_("SC_OPCODE_GET_DAY_OF_WEEK", "Fixes the beginning of the week and the type of calculation to be used.") +}; + +// -=*# Resource for function YEAR #*=- +const char* SC_OPCODE_GET_YEAR_ARY[] = +{ + NC_("SC_OPCODE_GET_YEAR", "Returns the year of a date value as an integer."), + NC_("SC_OPCODE_GET_YEAR", "Number"), + NC_("SC_OPCODE_GET_YEAR", "Internal number of the date.") +}; + +// -=*# Resource for function DAYS #*=- +const char* SC_OPCODE_GET_DIFF_DATE_ARY[] = +{ + NC_("SC_OPCODE_GET_DIFF_DATE", "Calculates the number of days between two dates."), + NC_("SC_OPCODE_GET_DIFF_DATE", "Date_2"), + NC_("SC_OPCODE_GET_DIFF_DATE", "The end date for calculating the difference in days."), + NC_("SC_OPCODE_GET_DIFF_DATE", "Date_1"), + NC_("SC_OPCODE_GET_DIFF_DATE", "The start date for calculating the difference in days.") +}; + +// -=*# Resource for function DATEDIF #*=- +const char* SC_OPCODE_GET_DATEDIF_ARY[] = +{ + NC_("SC_OPCODE_GET_DATEDIF", "Returns the number of whole days, months or years between 'start date' and 'end date'."), + NC_("SC_OPCODE_GET_DATEDIF", "Start date"), + NC_("SC_OPCODE_GET_DATEDIF", "The start date."), + NC_("SC_OPCODE_GET_DATEDIF", "End date"), + NC_("SC_OPCODE_GET_DATEDIF", "The end date."), + NC_("SC_OPCODE_GET_DATEDIF", "Interval"), + NC_("SC_OPCODE_GET_DATEDIF", "Interval to be calculated. Can be \"d\", \"m\", \"y\", \"ym\", \"md\" or \"yd\".") +}; + +// -=*# Resource for function WEEKNUM #*=- +const char* SC_OPCODE_WEEK_ARY[] = +{ + NC_("SC_OPCODE_WEEK", "Calculates the calendar week corresponding to the given date."), + NC_("SC_OPCODE_WEEK", "Number"), + NC_("SC_OPCODE_WEEK", "The internal number of the date."), + NC_("SC_OPCODE_WEEK", "mode"), + NC_("SC_OPCODE_WEEK", "Indicates the first day of the week and when week 1 starts.") +}; + +// -=*# Resource for function ISOWEEKNUM #*=- +const char* SC_OPCODE_ISOWEEKNUM_ARY[] = +{ + NC_("SC_OPCODE_ISOWEEKNUM", "Calculates the ISO 8601 calendar week for the given date."), + NC_("SC_OPCODE_ISOWEEKNUM", "Number"), + NC_("SC_OPCODE_ISOWEEKNUM", "The internal number of the date.") +}; + +const char* SC_OPCODE_WEEKNUM_OOO_ARY[] = +{ + NC_("SC_OPCODE_WEEKNUM_OOO", "Calculates the calendar week corresponding to the given date.\nThis function only provides interoperability with %PRODUCTNAME 5.0 and earlier and OpenOffice.org."), + NC_("SC_OPCODE_WEEKNUM_OOO", "Number"), + NC_("SC_OPCODE_WEEKNUM_OOO", "The internal number of the date."), + NC_("SC_OPCODE_WEEKNUM_OOO", "mode"), + NC_("SC_OPCODE_WEEKNUM_OOO", "Indicates the first day of the week (1 = Sunday, other values = Monday).") +}; + +// -=*# Resource for function EASTERSUNDAY #*=- +const char* SC_OPCODE_EASTERSUNDAY_ARY[] = +{ + NC_("SC_OPCODE_EASTERSUNDAY", "Calculates the date of Easter Sunday in a given year."), + NC_("SC_OPCODE_EASTERSUNDAY", "year"), + NC_("SC_OPCODE_EASTERSUNDAY", "An integer between 1583 and 9956, or 0 and 99 (19xx or 20xx depending on the option set).") +}; + +// -=*# Resource for function PV #*=- +const char* SC_OPCODE_PV_ARY[] = +{ + NC_("SC_OPCODE_PV", "Present value. Calculates the present value of an investment."), + NC_("SC_OPCODE_PV", "Rate"), + NC_("SC_OPCODE_PV", "The rate of interest for the period given."), + NC_("SC_OPCODE_PV", "NPER"), + NC_("SC_OPCODE_PV", "The payment period. The total number of periods in which the annuity is paid."), + NC_("SC_OPCODE_PV", "PMT"), + NC_("SC_OPCODE_PV", "Regular payments. The constant amount of annuity that is paid in each period."), + NC_("SC_OPCODE_PV", "FV"), + NC_("SC_OPCODE_PV", "Future value. The value (final value) to be attained after the last payment."), + NC_("SC_OPCODE_PV", "Type"), + NC_("SC_OPCODE_PV", "Type = 1 denotes due at the beginning of the period, = 0 at the end.") +}; + +// -=*# Resource for function FV #*=- +const char* SC_OPCODE_FV_ARY[] = +{ + NC_("SC_OPCODE_FV", "Future value. Returns the future value of an investment based on regular payments and a constant interest rate."), + NC_("SC_OPCODE_FV", "Rate"), + NC_("SC_OPCODE_FV", "The rate of interest per period."), + NC_("SC_OPCODE_FV", "NPER"), + NC_("SC_OPCODE_FV", "Payment period. The total number of periods in which the annuity (pension) is paid."), + NC_("SC_OPCODE_FV", "PMT"), + NC_("SC_OPCODE_FV", "Regular payments. The constant annuity to be paid in each period."), + NC_("SC_OPCODE_FV", "PV"), + NC_("SC_OPCODE_FV", "Present value. The current value of a series of payments"), + NC_("SC_OPCODE_FV", "Type"), + NC_("SC_OPCODE_FV", "Type = 1 denotes due at the beginning of the period, = 0 at the end.") +}; + +// -=*# Resource for function NPER #*=- +const char* SC_OPCODE_NPER_ARY[] = +{ + NC_("SC_OPCODE_NPER", "Payment period. Calculates the number of payment periods for an investment based on regular payments and a constant interest rate."), + NC_("SC_OPCODE_NPER", "Rate"), + NC_("SC_OPCODE_NPER", "The rate of interest per period."), + NC_("SC_OPCODE_NPER", "PMT"), + NC_("SC_OPCODE_NPER", "Regular payments. The constant annuity to be paid in each period."), + NC_("SC_OPCODE_NPER", "PV"), + NC_("SC_OPCODE_NPER", "Present value. The current value of a series of payments"), + NC_("SC_OPCODE_NPER", "FV"), + NC_("SC_OPCODE_NPER", "Future value. The value (end value) to be attained after the final payment."), + NC_("SC_OPCODE_NPER", "Type"), + NC_("SC_OPCODE_NPER", "Type = 1 denotes due at the beginning of the period, = 0 at the end.") +}; + +// -=*# Resource for function PMT #*=- +const char* SC_OPCODE_PMT_ARY[] = +{ + NC_("SC_OPCODE_PMT", "Regular payments. Returns the periodic payment of an annuity, based on regular payments and a fixed periodic interest rate."), + NC_("SC_OPCODE_PMT", "Rate"), + NC_("SC_OPCODE_PMT", "The rate of interest per period."), + NC_("SC_OPCODE_PMT", "NPER"), + NC_("SC_OPCODE_PMT", "Payment period. The total number of periods in which the annuity (pension) is paid."), + NC_("SC_OPCODE_PMT", "PV"), + NC_("SC_OPCODE_PMT", "Present value. The current value of a series of payments"), + NC_("SC_OPCODE_PMT", "FV"), + NC_("SC_OPCODE_PMT", "Future value. The value (end value) to be attained after the final payment."), + NC_("SC_OPCODE_PMT", "Type"), + NC_("SC_OPCODE_PMT", "Type = 1 denotes due at the beginning of the period, = 0 at the end.") +}; + +// -=*# Resource for function RATE #*=- +const char* SC_OPCODE_RATE_ARY[] = +{ + NC_("SC_OPCODE_RATE", "Calculates the constant interest rate of an investment with regular payments."), + NC_("SC_OPCODE_RATE", "NPER"), + NC_("SC_OPCODE_RATE", "Payment period. The total number of periods in which the annuity (pension) is paid."), + NC_("SC_OPCODE_RATE", "PMT"), + NC_("SC_OPCODE_RATE", "Regular payments. The constant annuity to be paid in each period."), + NC_("SC_OPCODE_RATE", "PV"), + NC_("SC_OPCODE_RATE", "Present value. The current value of a series of payments"), + NC_("SC_OPCODE_RATE", "FV"), + NC_("SC_OPCODE_RATE", "Future value. The value (end value) to be attained after the final payment."), + NC_("SC_OPCODE_RATE", "Type"), + NC_("SC_OPCODE_RATE", "Type = 1 denotes due at the beginning of the period, = 0 at the end."), + NC_("SC_OPCODE_RATE", "Guess"), + NC_("SC_OPCODE_RATE", "Guess. The estimate of the interest rate for the iterative calculating method.") +}; + +// -=*# Resource for function IPMT #*=- +const char* SC_OPCODE_IPMT_ARY[] = +{ + NC_("SC_OPCODE_IPMT", "Compounded interest. Calculates the interest payment on the principal for an investment with regular payments and a constant interest rate for a given period."), + NC_("SC_OPCODE_IPMT", "Rate"), + NC_("SC_OPCODE_IPMT", "The rate of interest per period."), + NC_("SC_OPCODE_IPMT", "Period"), + NC_("SC_OPCODE_IPMT", "Periods. The periods for which the compounded interest is to be calculated. P = 1 denotes for the first period, P = NPER for the last one."), + NC_("SC_OPCODE_IPMT", "NPER"), + NC_("SC_OPCODE_IPMT", "Payment period. The total number of periods in which the annuity (pension) is paid."), + NC_("SC_OPCODE_IPMT", "pv"), + NC_("SC_OPCODE_IPMT", "Present value. The current value of a series of payments"), + NC_("SC_OPCODE_IPMT", "FV"), + NC_("SC_OPCODE_IPMT", "Future value. The value (end value) to be attained after the final payment."), + NC_("SC_OPCODE_IPMT", "Type"), + NC_("SC_OPCODE_IPMT", "Type = 1 denotes due at the beginning of the period, = 0 at the end.") +}; + +// -=*# Resource for function PPMT #*=- +const char* SC_OPCODE_PPMT_ARY[] = +{ + NC_("SC_OPCODE_PPMT", "Repayment. Calculates the repayment amount for a period for an investment whereby the payments are at regular intervals and the interest rate constant."), + NC_("SC_OPCODE_PPMT", "Rate"), + NC_("SC_OPCODE_PPMT", "The interest rate per period."), + NC_("SC_OPCODE_PPMT", "Period"), + NC_("SC_OPCODE_PPMT", "Period. The period for which the repayments are to be calculated. Per = 1 denotes for the first period, P = NPER for the last"), + NC_("SC_OPCODE_PPMT", "NPER"), + NC_("SC_OPCODE_PPMT", "The payment period. The total number of periods in which the annuity (pension) is paid."), + NC_("SC_OPCODE_PPMT", "PV"), + NC_("SC_OPCODE_PPMT", "The present value. The present value or the amount the annuity is currently worth."), + NC_("SC_OPCODE_PPMT", "FV"), + NC_("SC_OPCODE_PPMT", "Future value. The value (end value) attained after the last payment has been made."), + NC_("SC_OPCODE_PPMT", "Type"), + NC_("SC_OPCODE_PPMT", "Type = 1 denotes due at the beginning of the period, = 0 at the end.") +}; + +// -=*# Resource for function CUMPRINC #*=- +const char* SC_OPCODE_CUM_PRINC_ARY[] = +{ + NC_("SC_OPCODE_CUM_PRINC", "Cumulative Capital. Calculates the total amount of the repayment share in a period for an investment with constant interest rate."), + NC_("SC_OPCODE_CUM_PRINC", "Rate"), + NC_("SC_OPCODE_CUM_PRINC", "The rate of interest per period."), + NC_("SC_OPCODE_CUM_PRINC", "NPER"), + NC_("SC_OPCODE_CUM_PRINC", "Payment period. The total number of periods in which the annuity (pension) is paid."), + NC_("SC_OPCODE_CUM_PRINC", "PV"), + NC_("SC_OPCODE_CUM_PRINC", "The present value. The present value or the amount the annuity is currently worth."), + NC_("SC_OPCODE_CUM_PRINC", "S"), + NC_("SC_OPCODE_CUM_PRINC", "The start period. The first period to be taken into account. S = 1 denotes the very first period."), + NC_("SC_OPCODE_CUM_PRINC", "E"), + NC_("SC_OPCODE_CUM_PRINC", "End period. The last period to be taken into account."), + NC_("SC_OPCODE_CUM_PRINC", "Type"), + NC_("SC_OPCODE_CUM_PRINC", "Type = 1 denotes due at the beginning of the period, = 0 at the end.") +}; + +// -=*# Resource for function CUMIPMT #*=- +const char* SC_OPCODE_CUM_IPMT_ARY[] = +{ + NC_("SC_OPCODE_CUM_IPMT", "Cumulative compounded interest. Calculates the total amount of the interest share in a period for an investment with a constant interest rate."), + NC_("SC_OPCODE_CUM_IPMT", "Rate"), + NC_("SC_OPCODE_CUM_IPMT", "The rate of interest per period."), + NC_("SC_OPCODE_CUM_IPMT", "NPER"), + NC_("SC_OPCODE_CUM_IPMT", "Payment period. The total number of periods in which the annuity (pension) is paid."), + NC_("SC_OPCODE_CUM_IPMT", "pv"), + NC_("SC_OPCODE_CUM_IPMT", "The present value. The present value or the amount the annuity is currently worth."), + NC_("SC_OPCODE_CUM_IPMT", "S"), + NC_("SC_OPCODE_CUM_IPMT", "The start period. The first period to be taken into account. S = 1 denotes the very first period."), + NC_("SC_OPCODE_CUM_IPMT", "E"), + NC_("SC_OPCODE_CUM_IPMT", "The end period. The last period to be taken into account."), + NC_("SC_OPCODE_CUM_IPMT", "Type"), + NC_("SC_OPCODE_CUM_IPMT", "Type = 1 denotes due at the beginning of the period, = 0 at the end.") +}; + +// -=*# Resource for function SYD #*=- +const char* SC_OPCODE_SYD_ARY[] = +{ + NC_("SC_OPCODE_SYD", "Calculates the arithmetically declining value of an asset (depreciation) for a specified period."), + NC_("SC_OPCODE_SYD", "Cost"), + NC_("SC_OPCODE_SYD", "Acquisition costs. The initial cost of the asset."), + NC_("SC_OPCODE_SYD", "Salvage"), + NC_("SC_OPCODE_SYD", "Salvage: The remaining value of the asset at the end of its life."), + NC_("SC_OPCODE_SYD", "Life"), + NC_("SC_OPCODE_SYD", "Useful life. The number of periods in the useful life of the asset."), + NC_("SC_OPCODE_SYD", "Period"), + NC_("SC_OPCODE_SYD", "Period. The depreciation period which must have the same time unit as average useful life.") +}; + +// -=*# Resource for function SLN #*=- +const char* SC_OPCODE_SLN_ARY[] = +{ + NC_("SC_OPCODE_SLN", "Calculates the linear depreciation per period."), + NC_("SC_OPCODE_SLN", "Cost"), + NC_("SC_OPCODE_SLN", "Acquisition cost. The initial cost of an asset."), + NC_("SC_OPCODE_SLN", "Salvage"), + NC_("SC_OPCODE_SLN", "Salvage: The remaining value of the asset at the end of its life."), + NC_("SC_OPCODE_SLN", "Life"), + NC_("SC_OPCODE_SLN", "Useful life. The number of periods in the useful life of the asset.") +}; + +// -=*# Resource for function DDB #*=- +const char* SC_OPCODE_DDB_ARY[] = +{ + NC_("SC_OPCODE_DDB", "Calculates the depreciation of an asset for a specific period using the double-declining balance method or declining balance factor."), + NC_("SC_OPCODE_DDB", "Cost"), + NC_("SC_OPCODE_DDB", "Acquisition costs. The initial cost of the asset."), + NC_("SC_OPCODE_DDB", "Salvage"), + NC_("SC_OPCODE_DDB", "Salvage: The remaining value of the asset at the end of its life."), + NC_("SC_OPCODE_DDB", "Life"), + NC_("SC_OPCODE_DDB", "Useful life. The number of periods in the useful life of the asset."), + NC_("SC_OPCODE_DDB", "Period"), + NC_("SC_OPCODE_DDB", "Period. The depreciation period in the same time unit as the average useful life entry."), + NC_("SC_OPCODE_DDB", "Factor"), + NC_("SC_OPCODE_DDB", "Factor. The factor for balance decline. F = 2 means a double declining balance factor") +}; + +// -=*# Resource for function DB #*=- +const char* SC_OPCODE_DB_ARY[] = +{ + NC_("SC_OPCODE_DB", "Returns the real depreciation of an asset for a specified period using the fixed-declining balance method."), + NC_("SC_OPCODE_DB", "Cost"), + NC_("SC_OPCODE_DB", "Acquisition costs: The initial cost of the asset."), + NC_("SC_OPCODE_DB", "Salvage"), + NC_("SC_OPCODE_DB", "Salvage: The remaining value of the asset at the end of its life."), + NC_("SC_OPCODE_DB", "Life"), + NC_("SC_OPCODE_DB", "Useful life. The number of periods in the useful life of the asset."), + NC_("SC_OPCODE_DB", "Period"), + NC_("SC_OPCODE_DB", "Periods: The period for which the depreciation is calculated. The time unit used for period must be the same as that for the useful life."), + NC_("SC_OPCODE_DB", "month"), + NC_("SC_OPCODE_DB", "Months: The number of months in the first year of depreciation.") +}; + +// -=*# Resource for function VDB #*=- +const char* SC_OPCODE_VBD_ARY[] = +{ + NC_("SC_OPCODE_VBD", "Variable declining balance. Returns the declining balance depreciation for a particular period."), + NC_("SC_OPCODE_VBD", "Cost"), + NC_("SC_OPCODE_VBD", "Cost. The initial cost of the asset."), + NC_("SC_OPCODE_VBD", "Salvage"), + NC_("SC_OPCODE_VBD", "Salvage. The salvage value of an asset at the end of its useful life."), + NC_("SC_OPCODE_VBD", "Life"), + NC_("SC_OPCODE_VBD", "Useful life. The number of periods in the useful life of the asset."), + NC_("SC_OPCODE_VBD", "S"), + NC_("SC_OPCODE_VBD", "Start. The first period for depreciation in the same time unit as the useful life."), + NC_("SC_OPCODE_VBD", "end"), + NC_("SC_OPCODE_VBD", "End. The last period of the depreciation using the same time unit as for the useful life."), + NC_("SC_OPCODE_VBD", "Factor"), + NC_("SC_OPCODE_VBD", "Factor. The factor for the reduction of the depreciation. F = 2 denotes double rate depreciation."), + NC_("SC_OPCODE_VBD", "Type"), + NC_("SC_OPCODE_VBD", "Do not alter. Type = 1 denotes switch to linear depreciation, type = 0 do not switch.") +}; + +// -=*# Resource for function EFFECT #*=- +const char* SC_OPCODE_EFFECT_ARY[] = +{ + NC_("SC_OPCODE_EFFECT", "Calculates the annual net interest rate for a nominal interest rate."), + NC_("SC_OPCODE_EFFECT", "NOM"), + NC_("SC_OPCODE_EFFECT", "Nominal Interest"), + NC_("SC_OPCODE_EFFECT", "P"), + NC_("SC_OPCODE_EFFECT", "Periods. The number of interest payments per year.") +}; + +// -=*# Resource for function NOMINAL #*=- +const char* SC_OPCODE_NOMINAL_ARY[] = +{ + NC_("SC_OPCODE_NOMINAL", "Calculates the yearly nominal interest rate as an effective interest rate."), + NC_("SC_OPCODE_NOMINAL", "effect_rate"), + NC_("SC_OPCODE_NOMINAL", "The effective interest rate"), + NC_("SC_OPCODE_NOMINAL", "npery"), + NC_("SC_OPCODE_NOMINAL", "Periods. The number of interest payment per year.") +}; + +// -=*# Resource for function NPV #*=- +const char* SC_OPCODE_NPV_ARY[] = +{ + NC_("SC_OPCODE_NPV", "Net present value. Calculates the net present value of an investment based on a series of periodic payments and a discount rate."), + NC_("SC_OPCODE_NPV", "RATE"), + NC_("SC_OPCODE_NPV", "The rate of discount for one period."), + NC_("SC_OPCODE_NPV", "value "), + NC_("SC_OPCODE_NPV", "Value 1, value 2,... are arguments representing payments and income.") +}; + +// -=*# Resource for function IRR #*=- +const char* SC_OPCODE_IRR_ARY[] = +{ + NC_("SC_OPCODE_IRR", "Returns the actuarial rate of interest of an investment excluding costs or profits."), + NC_("SC_OPCODE_IRR", "Values"), + NC_("SC_OPCODE_IRR", "An array or reference to cells whose contents correspond to the payments."), + NC_("SC_OPCODE_IRR", "Guess"), + NC_("SC_OPCODE_IRR", "Guess. An estimated value of the rate of return to be used for the iteration calculation.") +}; + +// -=*# Resource for function MIRR #*=- +const char* SC_OPCODE_MIRR_ARY[] = +{ + NC_("SC_OPCODE_MIRR", "Returns the modified internal rate of return for a series of investments."), + NC_("SC_OPCODE_MIRR", "Values"), + NC_("SC_OPCODE_MIRR", "An array or reference to cells whose contents correspond to the payments."), + NC_("SC_OPCODE_MIRR", "investment"), + NC_("SC_OPCODE_MIRR", "Interest rate for investments (the negative values in the array)."), + NC_("SC_OPCODE_MIRR", "reinvest_rate"), + NC_("SC_OPCODE_MIRR", "interest rate for reinvestments (the positive values in the array).") +}; + +// -=*# Resource for function ISPMT #*=- +const char* SC_OPCODE_ISPMT_ARY[] = +{ + NC_("SC_OPCODE_ISPMT", "Returns the amount of interest for constant amortization rates."), + NC_("SC_OPCODE_ISPMT", "rate"), + NC_("SC_OPCODE_ISPMT", "Interest rate for a single amortization rate."), + NC_("SC_OPCODE_ISPMT", "Period"), + NC_("SC_OPCODE_ISPMT", "Number of amortization periods for the calculation of the interest."), + NC_("SC_OPCODE_ISPMT", "total_periods"), + NC_("SC_OPCODE_ISPMT", "Sum total of amortization periods."), + NC_("SC_OPCODE_ISPMT", "invest"), + NC_("SC_OPCODE_ISPMT", "Amount of the investment.") +}; + +// -=*# Resource for function PDURATION #*=- +const char* SC_OPCODE_PDURATION_ARY[] = +{ + NC_("SC_OPCODE_PDURATION", "Duration. Calculates the number of periods required by an investment to attain the desired value."), + NC_("SC_OPCODE_PDURATION", "RATE"), + NC_("SC_OPCODE_PDURATION", "The constant rate of interest."), + NC_("SC_OPCODE_PDURATION", "pv"), + NC_("SC_OPCODE_PDURATION", "The present value. The current value of the investment."), + NC_("SC_OPCODE_PDURATION", "FV"), + NC_("SC_OPCODE_PDURATION", "The future value of the investment.") +}; + +// -=*# Resource for function RRI #*=- +const char* SC_OPCODE_RRI_ARY[] = +{ + NC_("SC_OPCODE_RRI", "Interest. Calculates the interest rate which represents the rate of return from an investment."), + NC_("SC_OPCODE_RRI", "P"), + NC_("SC_OPCODE_RRI", "The number of periods used in the calculation."), + NC_("SC_OPCODE_RRI", "pv"), + NC_("SC_OPCODE_RRI", "Present value. The current value of the investment."), + NC_("SC_OPCODE_RRI", "FV"), + NC_("SC_OPCODE_RRI", "The future value of the investment.") +}; + +// -=*# Resource for function ISREF #*=- +const char* SC_OPCODE_IS_REF_ARY[] = +{ + NC_("SC_OPCODE_IS_REF", "Returns TRUE if value is a reference."), + NC_("SC_OPCODE_IS_REF", "value"), + NC_("SC_OPCODE_IS_REF", "The value to be tested.") +}; + +// -=*# Resource for function ISERR #*=- +const char* SC_OPCODE_IS_ERR_ARY[] = +{ + NC_("SC_OPCODE_IS_ERR", "Returns TRUE if the value is an error value not equal to #N/A."), + NC_("SC_OPCODE_IS_ERR", "value"), + NC_("SC_OPCODE_IS_ERR", "The value to be tested.") +}; + +// -=*# Resource for function ISERROR #*=- +const char* SC_OPCODE_IS_ERROR_ARY[] = +{ + NC_("SC_OPCODE_IS_ERROR", "Returns TRUE if the value is an error value."), + NC_("SC_OPCODE_IS_ERROR", "value"), + NC_("SC_OPCODE_IS_ERROR", "The value to be tested.") +}; + +// -=*# Resource for function ISBLANK #*=- +const char* SC_OPCODE_IS_EMPTY_ARY[] = +{ + NC_("SC_OPCODE_IS_EMPTY", "Returns TRUE if value refers to an empty cell."), + NC_("SC_OPCODE_IS_EMPTY", "value"), + NC_("SC_OPCODE_IS_EMPTY", "The value to be tested.") +}; + +// -=*# Resource for function ISLOGICAL #*=- +const char* SC_OPCODE_IS_LOGICAL_ARY[] = +{ + NC_("SC_OPCODE_IS_LOGICAL", "Returns TRUE if the value carries a logical number format."), + NC_("SC_OPCODE_IS_LOGICAL", "value"), + NC_("SC_OPCODE_IS_LOGICAL", "The value to be tested.") +}; + +// -=*# Resource for function ISNA #*=- +const char* SC_OPCODE_IS_NV_ARY[] = +{ + NC_("SC_OPCODE_IS_NV", "Returns TRUE if value equals #N/A."), + NC_("SC_OPCODE_IS_NV", "value"), + NC_("SC_OPCODE_IS_NV", "The value to be tested.") +}; + +// -=*# Resource for function ISNONTEXT #*=- +const char* SC_OPCODE_IS_NON_STRING_ARY[] = +{ + NC_("SC_OPCODE_IS_NON_STRING", "Returns TRUE if the value is not text."), + NC_("SC_OPCODE_IS_NON_STRING", "value"), + NC_("SC_OPCODE_IS_NON_STRING", "The value to be tested.") +}; + +// -=*# Resource for function ISTEXT #*=- +const char* SC_OPCODE_IS_STRING_ARY[] = +{ + NC_("SC_OPCODE_IS_STRING", "Returns TRUE if value is text."), + NC_("SC_OPCODE_IS_STRING", "value"), + NC_("SC_OPCODE_IS_STRING", "The value to be tested.") +}; + +// -=*# Resource for function ISNUMBER #*=- +const char* SC_OPCODE_IS_VALUE_ARY[] = +{ + NC_("SC_OPCODE_IS_VALUE", "Returns TRUE if value is a number."), + NC_("SC_OPCODE_IS_VALUE", "value"), + NC_("SC_OPCODE_IS_VALUE", "The value to be tested.") +}; + +// -=*# Resource for function ISFORMULA #*=- +const char* SC_OPCODE_IS_FORMULA_ARY[] = +{ + NC_("SC_OPCODE_IS_FORMULA", "Returns TRUE if the cell is a formula cell."), + NC_("SC_OPCODE_IS_FORMULA", "reference"), + NC_("SC_OPCODE_IS_FORMULA", "The cell to be checked.") +}; + +// -=*# Resource for function FORMULA #*=- +const char* SC_OPCODE_FORMULA_ARY[] = +{ + NC_("SC_OPCODE_FORMULA", "Returns the formula of a formula cell."), + NC_("SC_OPCODE_FORMULA", "Reference"), + NC_("SC_OPCODE_FORMULA", "The formula cell.") +}; + +// -=*# Resource for function N #*=- +const char* SC_OPCODE_N_ARY[] = +{ + NC_("SC_OPCODE_N", "Converts a value to a number."), + NC_("SC_OPCODE_N", "value"), + NC_("SC_OPCODE_N", "The value to be interpreted as a number.") +}; + +// -=*# Resource for function NA #*=- +const char* SC_OPCODE_NO_VALUE_ARY[] = +{ + NC_("SC_OPCODE_NO_VALUE", "Not available. Returns the error value #N/A.") +}; + +// -=*# Resource for function TYPE #*=- +const char* SC_OPCODE_TYPE_ARY[] = +{ + NC_("SC_OPCODE_TYPE", "Returns the data type of a value (1 = number, 2 = text, 4 = Boolean value, 8 = formula, 16 = error value, 64 = array)."), + NC_("SC_OPCODE_TYPE", "value"), + NC_("SC_OPCODE_TYPE", "The value for which the data type is to be determined.") +}; + +// -=*# Resource for function CELL #*=- +const char* SC_OPCODE_CELL_ARY[] = +{ + NC_("SC_OPCODE_CELL", "Determines information about address, formatting or contents of a cell."), + NC_("SC_OPCODE_CELL", "info_type"), + NC_("SC_OPCODE_CELL", "String that specifies the type of information."), + NC_("SC_OPCODE_CELL", "Reference"), + NC_("SC_OPCODE_CELL", "The position of the cell you want to examine.") +}; + +// -=*# Resource for function CURRENT #*=- +const char* SC_OPCODE_CURRENT_ARY[] = +{ + NC_("SC_OPCODE_CURRENT", "Calculates the current value of the formula at the present location.") +}; + +// -=*# Resource for function FALSE #*=- +const char* SC_OPCODE_FALSE_ARY[] = +{ + NC_("SC_OPCODE_FALSE", "Defines the logical value as FALSE.") +}; + +// -=*# Resource for function NOT #*=- +const char* SC_OPCODE_NOT_ARY[] = +{ + NC_("SC_OPCODE_NOT", "Reverses the value of the argument."), + NC_("SC_OPCODE_NOT", "Logical value"), + NC_("SC_OPCODE_NOT", "An expression that can be either TRUE or FALSE.") +}; + +// -=*# Resource for function TRUE #*=- +const char* SC_OPCODE_TRUE_ARY[] = +{ + NC_("SC_OPCODE_TRUE", "Returns the logical value TRUE.") +}; + +// -=*# Resource for function IF #*=- +const char* SC_OPCODE_IF_ARY[] = +{ + NC_("SC_OPCODE_IF", "Specifies a logical test to be performed."), + NC_("SC_OPCODE_IF", "Test"), + NC_("SC_OPCODE_IF", "Any value or expression which can be either TRUE or FALSE."), + NC_("SC_OPCODE_IF", "Then_value"), + NC_("SC_OPCODE_IF", "The result of the function if the logical test returns a TRUE."), + NC_("SC_OPCODE_IF", "Otherwise_value"), + NC_("SC_OPCODE_IF", "The result of the function if the logical test returns FALSE.") +}; + +// -=*# Resource for function IFERROR #*=- +const char* SC_OPCODE_IF_ERROR_ARY[] = +{ + NC_("SC_OPCODE_IF_ERROR", "Returns value if not an error value, else alternative."), + NC_("SC_OPCODE_IF_ERROR", "value"), + NC_("SC_OPCODE_IF_ERROR", "The value to be calculated."), + NC_("SC_OPCODE_IF_ERROR", "alternative value"), + NC_("SC_OPCODE_IF_ERROR", "The alternative to be returned, should value be an error value.") +}; + +// -=*# Resource for function IFNA #*=- +const char* SC_OPCODE_IF_NA_ARY[] = +{ + NC_("SC_OPCODE_IF_NA", "Returns value if not a #N/A error, else alternative."), + NC_("SC_OPCODE_IF_NA", "value"), + NC_("SC_OPCODE_IF_NA", "The value to be calculated."), + NC_("SC_OPCODE_IF_NA", "alternative value"), + NC_("SC_OPCODE_IF_NA", "The alternative to be returned, should value be a #N/A error.") +}; + +// -=*# Resource for function OR #*=- +const char* SC_OPCODE_OR_ARY[] = +{ + NC_("SC_OPCODE_OR", "Returns TRUE if an argument is TRUE."), + NC_("SC_OPCODE_OR", "Logical value "), + NC_("SC_OPCODE_OR", "Logical value 1, logical value 2,... are conditions to be tested and which return either TRUE or FALSE.") +}; + +// -=*# Resource for function XOR #*=- +const char* SC_OPCODE_XOR_ARY[] = +{ + NC_("SC_OPCODE_XOR", "Returns TRUE if an odd number of arguments evaluates to TRUE."), + NC_("SC_OPCODE_XOR", "Logical value "), + NC_("SC_OPCODE_XOR", "Logical value 1, logical value 2, ... are conditions to be tested and which return either TRUE or FALSE.") +}; + +// -=*# Resource for function AND #*=- +const char* SC_OPCODE_AND_ARY[] = +{ + NC_("SC_OPCODE_AND", "Returns TRUE if all arguments are TRUE."), + NC_("SC_OPCODE_AND", "Logical value "), + NC_("SC_OPCODE_AND", "Logical value 1, logical value 2;...are conditions to be tested and each returns either TRUE or FALSE.") +}; + +// -=*# Resource for function ABS #*=- +const char* SC_OPCODE_ABS_ARY[] = +{ + NC_("SC_OPCODE_ABS", "Absolute value of a number."), + NC_("SC_OPCODE_ABS", "Number"), + NC_("SC_OPCODE_ABS", "The number whose absolute value is to be returned.") +}; + +// -=*# Resource for function POWER #*=- +const char* SC_OPCODE_POWER_ARY[] = +{ + NC_("SC_OPCODE_POWER", "Returns a^b, base a raised to the power of exponent b."), + NC_("SC_OPCODE_POWER", "Base"), + NC_("SC_OPCODE_POWER", "The base a of the power a^b."), + NC_("SC_OPCODE_POWER", "Exponent"), + NC_("SC_OPCODE_POWER", "The exponent b of the power a^b.") +}; + +// -=*# Resource for function COUNTBLANK #*=- +const char* SC_OPCODE_COUNT_EMPTY_CELLS_ARY[] = +{ + NC_("SC_OPCODE_COUNT_EMPTY_CELLS", "Counts the blank cells in a specified range."), + NC_("SC_OPCODE_COUNT_EMPTY_CELLS", "range"), + NC_("SC_OPCODE_COUNT_EMPTY_CELLS", "The range in which empty cells are to be counted.") +}; + +// -=*# Resource for function PI #*=- +const char* SC_OPCODE_PI_ARY[] = +{ + NC_("SC_OPCODE_PI", "Returns the value of the number Pi.") +}; + +// -=*# Resource for function SUM #*=- +const char* SC_OPCODE_SUM_ARY[] = +{ + NC_("SC_OPCODE_SUM", "Returns the sum of all arguments."), + NC_("SC_OPCODE_SUM", "number "), + NC_("SC_OPCODE_SUM", "Number 1, number 2, ... are arguments whose total is to be calculated.") +}; + +// -=*# Resource for function SUMSQ #*=- +const char* SC_OPCODE_SUM_SQ_ARY[] = +{ + NC_("SC_OPCODE_SUM_SQ", "Returns the sum of the squares of the arguments."), + NC_("SC_OPCODE_SUM_SQ", "number "), + NC_("SC_OPCODE_SUM_SQ", "Number 1, number 2,... are arguments for which the sum of the squares is to be calculated.") +}; + +// -=*# Resource for function PRODUCT #*=- +const char* SC_OPCODE_PRODUCT_ARY[] = +{ + NC_("SC_OPCODE_PRODUCT", "Multiplies the arguments."), + NC_("SC_OPCODE_PRODUCT", "Number "), + NC_("SC_OPCODE_PRODUCT", "Number 1, number 2, ... are arguments to be multiplied and a result returned.") +}; + +// -=*# Resource for function SUMIF #*=- +const char* SC_OPCODE_SUM_IF_ARY[] = +{ + NC_("SC_OPCODE_SUM_IF", "Totals the arguments that meet the condition."), + NC_("SC_OPCODE_SUM_IF", "range"), + NC_("SC_OPCODE_SUM_IF", "The range to be evaluated by the criteria given."), + NC_("SC_OPCODE_SUM_IF", "criteria"), + NC_("SC_OPCODE_SUM_IF", "The criteria to be applied to the range."), + NC_("SC_OPCODE_SUM_IF", "sum_range"), + NC_("SC_OPCODE_SUM_IF", "The range from which the values are to be totalled.") +}; + +// -=*# Resource for function AVERAGEIF #*=- +const char* SC_OPCODE_AVERAGE_IF_ARY[] = +{ + NC_("SC_OPCODE_AVERAGE_IF", "Averages the arguments that meet the conditions."), + NC_("SC_OPCODE_AVERAGE_IF", "range"), + NC_("SC_OPCODE_AVERAGE_IF", "The range to be evaluated by the criteria given."), + NC_("SC_OPCODE_AVERAGE_IF", "criteria"), + NC_("SC_OPCODE_AVERAGE_IF", "The criteria to be applied to the range."), + NC_("SC_OPCODE_AVERAGE_IF", "average_range"), + NC_("SC_OPCODE_AVERAGE_IF", "The range from which the values are to be averaged.") +}; + +const char* SC_OPCODE_SUM_IFS_ARY[] = +{ + NC_("SC_OPCODE_SUM_IFS", "Totals the values of cells in a range that meet multiple criteria in multiple ranges."), + NC_("SC_OPCODE_SUM_IFS", "sum_range"), + NC_("SC_OPCODE_SUM_IFS", "The range from which the values are to be totalled."), + NC_("SC_OPCODE_SUM_IFS", "range "), + NC_("SC_OPCODE_SUM_IFS", "Range 1, range 2,... are the ranges to be evaluated by the criteria given."), + NC_("SC_OPCODE_SUM_IFS", "criteria "), + NC_("SC_OPCODE_SUM_IFS", "Criteria 1, criteria 2,... are the criteria to be applied to the ranges given.") +}; + +// -=*# Resource for function AVERAGEIFS #*=- +const char* SC_OPCODE_AVERAGE_IFS_ARY[] = +{ + NC_("SC_OPCODE_AVERAGE_IFS", "Averages the value of the cells that meet multiple criteria in multiple ranges."), + NC_("SC_OPCODE_AVERAGE_IFS", "average_range"), + NC_("SC_OPCODE_AVERAGE_IFS", "The range from which the values are to be averaged."), + NC_("SC_OPCODE_AVERAGE_IFS", "range "), + NC_("SC_OPCODE_AVERAGE_IFS", "Range 1, range 2,... are the ranges to be evaluated by the criteria given."), + NC_("SC_OPCODE_AVERAGE_IFS", "criteria "), + NC_("SC_OPCODE_AVERAGE_IFS", "Criteria 1, criteria 2,... are the criteria to be applied to the ranges given.") +}; + +// -=*# Resource for function COUNTIFS #*=- +const char* SC_OPCODE_COUNT_IFS_ARY[] = +{ + NC_("SC_OPCODE_COUNT_IFS", "Counts the cells that meet multiple criteria in multiple ranges."), + NC_("SC_OPCODE_COUNT_IFS", "range "), + NC_("SC_OPCODE_COUNT_IFS", "Range 1, range 2,... are the ranges to be evaluated by the criteria given."), + NC_("SC_OPCODE_COUNT_IFS", "criteria "), + NC_("SC_OPCODE_COUNT_IFS", "Criteria 1, criteria 2,... are the criteria to be applied to the ranges given.") +}; + +// -=*# Resource for function COUNTIF #*=- +const char* SC_OPCODE_COUNT_IF_ARY[] = +{ + NC_("SC_OPCODE_COUNT_IF", "Counts the arguments which meet the set conditions."), + NC_("SC_OPCODE_COUNT_IF", "range"), + NC_("SC_OPCODE_COUNT_IF", "The range of cells to be evaluated by the criteria given."), + NC_("SC_OPCODE_COUNT_IF", "criteria"), + NC_("SC_OPCODE_COUNT_IF", "The criteria to be applied to the range.") +}; + +// -=*# Resource for function SQRT #*=- +const char* SC_OPCODE_SQRT_ARY[] = +{ + NC_("SC_OPCODE_SQRT", "Returns the square root of a number."), + NC_("SC_OPCODE_SQRT", "number"), + NC_("SC_OPCODE_SQRT", "A positive value for which the square root is to be calculated.") +}; + +// -=*# Resource for function RAND #*=- +const char* SC_OPCODE_RANDOM_ARY[] = +{ + NC_("SC_OPCODE_RANDOM", "Returns a random number between 0 and 1.") +}; + +// -=*# Resource for function ISEVEN #*=- +const char* SC_OPCODE_IS_EVEN_ARY[] = +{ + NC_("SC_OPCODE_IS_EVEN", "Returns TRUE if value is an even integer."), + NC_("SC_OPCODE_IS_EVEN", "value"), + NC_("SC_OPCODE_IS_EVEN", "The value to be tested.") +}; + +// -=*# Resource for function ISODD #*=- +const char* SC_OPCODE_IS_ODD_ARY[] = +{ + NC_("SC_OPCODE_IS_ODD", "Returns TRUE if value is an odd integer."), + NC_("SC_OPCODE_IS_ODD", "value"), + NC_("SC_OPCODE_IS_ODD", "The value to be tested.") +}; + +// -=*# Resource for function COMBIN #*=- +const char* SC_OPCODE_COMBIN_ARY[] = +{ + NC_("SC_OPCODE_COMBIN", "Calculates the number of combinations for elements without repetition."), + NC_("SC_OPCODE_COMBIN", "number_1"), + NC_("SC_OPCODE_COMBIN", "The total number of elements."), + NC_("SC_OPCODE_COMBIN", "number_2"), + NC_("SC_OPCODE_COMBIN", "The number of elements selected.") +}; + +// -=*# Resource for function COMBINA #*=- +const char* SC_OPCODE_COMBIN_A_ARY[] = +{ + NC_("SC_OPCODE_COMBIN_A", "Calculates the number of combinations of elements including repetition."), + NC_("SC_OPCODE_COMBIN_A", "number_1"), + NC_("SC_OPCODE_COMBIN_A", "The total number of elements."), + NC_("SC_OPCODE_COMBIN_A", "number_2"), + NC_("SC_OPCODE_COMBIN_A", "The number of elements selected.") +}; + +// -=*# Resource for function ARCCOS #*=- +const char* SC_OPCODE_ARC_COS_ARY[] = +{ + NC_("SC_OPCODE_ARC_COS", "Returns the arccosine of a number."), + NC_("SC_OPCODE_ARC_COS", "Number"), + NC_("SC_OPCODE_ARC_COS", "A value between -1 and 1 for which the arccosine is to be returned.") +}; + +// -=*# Resource for function ARCSIN #*=- +const char* SC_OPCODE_ARC_SIN_ARY[] = +{ + NC_("SC_OPCODE_ARC_SIN", "Returns the arcsine of a number."), + NC_("SC_OPCODE_ARC_SIN", "Number"), + NC_("SC_OPCODE_ARC_SIN", "A value between -1 and 1 for which the arcsine is to be returned.") +}; + +// -=*# Resource for function ARCCOSHYP #*=- +const char* SC_OPCODE_ARC_COS_HYP_ARY[] = +{ + NC_("SC_OPCODE_ARC_COS_HYP", "Returns the inverse hyperbolic cosine of a number."), + NC_("SC_OPCODE_ARC_COS_HYP", "Number"), + NC_("SC_OPCODE_ARC_COS_HYP", "A value greater than or equal to 1 for which the inverse hyperbolic cosine is to be returned.") +}; + +// -=*# Resource for function ARCSINHYP #*=- +const char* SC_OPCODE_ARC_SIN_HYP_ARY[] = +{ + NC_("SC_OPCODE_ARC_SIN_HYP", "Returns the inverse hyperbolic sine of a number."), + NC_("SC_OPCODE_ARC_SIN_HYP", "Number"), + NC_("SC_OPCODE_ARC_SIN_HYP", "The value for which the inverse hyperbolic sine is to be returned.") +}; + +// -=*# Resource for function ARCCOT #*=- +const char* SC_OPCODE_ARC_COT_ARY[] = +{ + NC_("SC_OPCODE_ARC_COT", "Returns the inverse cotangent of a number."), + NC_("SC_OPCODE_ARC_COT", "Number"), + NC_("SC_OPCODE_ARC_COT", "The value for which the inverse cotangent is to be returned.") +}; + +// -=*# Resource for function ARCTAN #*=- +const char* SC_OPCODE_ARC_TAN_ARY[] = +{ + NC_("SC_OPCODE_ARC_TAN", "Returns the arctangent of a number."), + NC_("SC_OPCODE_ARC_TAN", "Number"), + NC_("SC_OPCODE_ARC_TAN", "The value for which the arctangent is to be returned.") +}; + +// -=*# Resource for function ARCCOTHYP #*=- +const char* SC_OPCODE_ARC_COT_HYP_ARY[] = +{ + NC_("SC_OPCODE_ARC_COT_HYP", "Returns the inverse hyperbolic cotangent of a number."), + NC_("SC_OPCODE_ARC_COT_HYP", "Number"), + NC_("SC_OPCODE_ARC_COT_HYP", "A value smaller than -1 or greater than 1 for which the inverse hyperbolic cotangent is to be returned.") +}; + +// -=*# Resource for function ARCTANHYP #*=- +const char* SC_OPCODE_ARC_TAN_HYP_ARY[] = +{ + NC_("SC_OPCODE_ARC_TAN_HYP", "Returns the inverse hyperbolic tangent of a number."), + NC_("SC_OPCODE_ARC_TAN_HYP", "Number"), + NC_("SC_OPCODE_ARC_TAN_HYP", "A value between -1 and 1 for which the inverse hyperbolic tangent is to be returned.") +}; + +// -=*# Resource for function COS #*=- +const char* SC_OPCODE_COS_ARY[] = +{ + NC_("SC_OPCODE_COS", "Returns the cosine of a number."), + NC_("SC_OPCODE_COS", "Number"), + NC_("SC_OPCODE_COS", "The angle in the radians for which the cosine is to be returned.") +}; + +// -=*# Resource for function SIN #*=- +const char* SC_OPCODE_SIN_ARY[] = +{ + NC_("SC_OPCODE_SIN", "Returns the sine of a number."), + NC_("SC_OPCODE_SIN", "number"), + NC_("SC_OPCODE_SIN", "The angle in radians for which the sine is to be calculated.") +}; + +// -=*# Resource for function COT #*=- +const char* SC_OPCODE_COT_ARY[] = +{ + NC_("SC_OPCODE_COT", "Returns the cotangent of a number."), + NC_("SC_OPCODE_COT", "Number"), + NC_("SC_OPCODE_COT", "The angle in radians whose cotangent value is to be returned.") +}; + +// -=*# Resource for function TAN #*=- +const char* SC_OPCODE_TAN_ARY[] = +{ + NC_("SC_OPCODE_TAN", "Returns the tangent of a number."), + NC_("SC_OPCODE_TAN", "number"), + NC_("SC_OPCODE_TAN", "The angle in radians for which the tangent is to be calculated.") +}; + +// -=*# Resource for function COSHYP #*=- +const char* SC_OPCODE_COS_HYP_ARY[] = +{ + NC_("SC_OPCODE_COS_HYP", "Returns the hyperbolic cosine of a number."), + NC_("SC_OPCODE_COS_HYP", "Number"), + NC_("SC_OPCODE_COS_HYP", "The value for which the hyperbolic cosine is to be returned.") +}; + +// -=*# Resource for function SINHYP #*=- +const char* SC_OPCODE_SIN_HYP_ARY[] = +{ + NC_("SC_OPCODE_SIN_HYP", "Returns the hyperbolic sine of a number."), + NC_("SC_OPCODE_SIN_HYP", "number"), + NC_("SC_OPCODE_SIN_HYP", "The value for which the hyperbolic sine is to be calculated.") +}; + +// -=*# Resource for function COTHYP #*=- +const char* SC_OPCODE_COT_HYP_ARY[] = +{ + NC_("SC_OPCODE_COT_HYP", "Returns the hyperbolic cotangent of a number."), + NC_("SC_OPCODE_COT_HYP", "Number"), + NC_("SC_OPCODE_COT_HYP", "A value not equal to 0 for which the hyperbolic cotangent is to be returned.") +}; + +// -=*# Resource for function TANHYP #*=- +const char* SC_OPCODE_TAN_HYP_ARY[] = +{ + NC_("SC_OPCODE_TAN_HYP", "Returns the hyperbolic tangent of a number."), + NC_("SC_OPCODE_TAN_HYP", "number"), + NC_("SC_OPCODE_TAN_HYP", "The value for which the hyperbolic tangent is to be calculated.") +}; + +// -=*# Resource for function ARCTAN2 #*=- +const char* SC_OPCODE_ARC_TAN_2_ARY[] = +{ + NC_("SC_OPCODE_ARC_TAN_2", "Returns the arctangent for the specified coordinates."), + NC_("SC_OPCODE_ARC_TAN_2", "number_x"), + NC_("SC_OPCODE_ARC_TAN_2", "The value for the x coordinate."), + NC_("SC_OPCODE_ARC_TAN_2", "number_y"), + NC_("SC_OPCODE_ARC_TAN_2", "The value for the y coordinate.") +}; + +// -=*# Resource for function CSC #*=- +const char* SC_OPCODE_COSECANT_ARY[] = +{ + NC_("SC_OPCODE_COSECANT", "Return the cosecant of an angle. CSC(x)=1/SIN(x)"), + NC_("SC_OPCODE_COSECANT", "Angle"), + NC_("SC_OPCODE_COSECANT", "The angle in radians for which the cosecant is to be calculated.") +}; + +// -=*# Resource for function SEC #*=- +const char* SC_OPCODE_SECANT_ARY[] = +{ + NC_("SC_OPCODE_SECANT", "Return the secant of an angle. SEC(x)=1/COS(x)"), + NC_("SC_OPCODE_SECANT", "Angle"), + NC_("SC_OPCODE_SECANT", "The angle in radians for which the secant is to be calculated.") +}; + +// -=*# Resource for function CSCH #*=- +const char* SC_OPCODE_COSECANT_HYP_ARY[] = +{ + NC_("SC_OPCODE_COSECANT_HYP", "Return the hyperbolic cosecant of a hyperbolic angle. CSCH(x)=1/SINH(x)"), + NC_("SC_OPCODE_COSECANT_HYP", "Angle"), + NC_("SC_OPCODE_COSECANT_HYP", "The hyperbolic angle in radians for which the hyperbolic cosecant is to be calculated.") +}; + +// -=*# Resource for function SECH #*=- +const char* SC_OPCODE_SECANT_HYP_ARY[] = +{ + NC_("SC_OPCODE_SECANT_HYP", "Return the hyperbolic secant of a hyperbolic angle. SECH(x)=1/COSH(x)"), + NC_("SC_OPCODE_SECANT_HYP", "Angle"), + NC_("SC_OPCODE_SECANT_HYP", "The hyperbolic angle in radians for which the hyperbolic secant is to be calculated.") +}; + +// -=*# Resource for function DEG #*=- +const char* SC_OPCODE_DEG_ARY[] = +{ + NC_("SC_OPCODE_DEG", "Converts a radian to degrees"), + NC_("SC_OPCODE_DEG", "Number"), + NC_("SC_OPCODE_DEG", "The angle in a radian") +}; + +// -=*# Resource for function RAD #*=- +const char* SC_OPCODE_RAD_ARY[] = +{ + NC_("SC_OPCODE_RAD", "Converts degrees to radians"), + NC_("SC_OPCODE_RAD", "Number"), + NC_("SC_OPCODE_RAD", "The angle in degrees.") +}; + +// -=*# Resource for function EXP #*=- +const char* SC_OPCODE_EXP_ARY[] = +{ + NC_("SC_OPCODE_EXP", "Calculates the exponent for basis e."), + NC_("SC_OPCODE_EXP", "Number"), + NC_("SC_OPCODE_EXP", "The exponent applied to base e.") +}; + +// -=*# Resource for function LOG #*=- +const char* SC_OPCODE_LOG_ARY[] = +{ + NC_("SC_OPCODE_LOG", "Calculates the logarithm to any specified base."), + NC_("SC_OPCODE_LOG", "Number"), + NC_("SC_OPCODE_LOG", "A value greater than 0 for which the logarithm is to be calculated."), + NC_("SC_OPCODE_LOG", "Base"), + NC_("SC_OPCODE_LOG", "The base of the logarithm. If omitted, the base is regarded as 10.") +}; + +// -=*# Resource for function LN #*=- +const char* SC_OPCODE_LN_ARY[] = +{ + NC_("SC_OPCODE_LN", "Calculates the natural logarithm of a number."), + NC_("SC_OPCODE_LN", "Number"), + NC_("SC_OPCODE_LN", "A value greater than 0 for which the natural logarithm is to be calculated.") +}; + +// -=*# Resource for function LOG10 #*=- +const char* SC_OPCODE_LOG10_ARY[] = +{ + NC_("SC_OPCODE_LOG10", "Calculates the base-10 logarithm of a number."), + NC_("SC_OPCODE_LOG10", "Number"), + NC_("SC_OPCODE_LOG10", "A value greater than 0 for which the logarithm is to be calculated.") +}; + +// -=*# Resource for function FACT #*=- +const char* SC_OPCODE_FACT_ARY[] = +{ + NC_("SC_OPCODE_FACT", "Calculates the factorial of a number."), + NC_("SC_OPCODE_FACT", "Number"), + NC_("SC_OPCODE_FACT", "The number for which the factorial is to be calculated.") +}; + +// -=*# Resource for function MOD #*=- +const char* SC_OPCODE_MOD_ARY[] = +{ + NC_("SC_OPCODE_MOD", "Calculates the remainder of a division."), + NC_("SC_OPCODE_MOD", "Dividend"), + NC_("SC_OPCODE_MOD", "The number to be divided."), + NC_("SC_OPCODE_MOD", "Divisor"), + NC_("SC_OPCODE_MOD", "The number by which the dividend is divided.") +}; + +// -=*# Resource for function SIGN #*=- +const char* SC_OPCODE_PLUS_MINUS_ARY[] = +{ + NC_("SC_OPCODE_PLUS_MINUS", "Returns the algebraic sign of a number."), + NC_("SC_OPCODE_PLUS_MINUS", "Number"), + NC_("SC_OPCODE_PLUS_MINUS", "The number for which the algebraic sign is to be determined.") +}; + +// -=*# Resource for function SUBTOTAL #*=- +const char* SC_OPCODE_SUB_TOTAL_ARY[] = +{ + NC_("SC_OPCODE_SUB_TOTAL", "Calculates subtotals in a spreadsheet."), + NC_("SC_OPCODE_SUB_TOTAL", "Function"), + NC_("SC_OPCODE_SUB_TOTAL", "Function index. Is an index of the possible functions Total, Max, ..."), + NC_("SC_OPCODE_SUB_TOTAL", "range"), + NC_("SC_OPCODE_SUB_TOTAL", "The cells of the range which are to be taken into account.") +}; + +// -=*# Resource for function AGGREGATE #*=- +const char* SC_OPCODE_AGGREGATE_ARY[] = +{ + NC_("SC_OPCODE_AGGREGATE", "Calculates an aggregate in a spreadsheet."), + NC_("SC_OPCODE_AGGREGATE", "Function"), + NC_("SC_OPCODE_AGGREGATE", "Function index. Is an index of the possible functions Total, Max, ..."), + NC_("SC_OPCODE_AGGREGATE", "Options"), + NC_("SC_OPCODE_AGGREGATE", "Option index. Is an index of the possible ignore options."), + NC_("SC_OPCODE_AGGREGATE", "Ref1 or array "), + NC_("SC_OPCODE_AGGREGATE", "The cell(s) of the range which are to be taken into account."), + NC_("SC_OPCODE_AGGREGATE", "Ref2..n or k "), + NC_("SC_OPCODE_AGGREGATE", "The cells of the range which are to be taken into account or mandatory 2nd argument for certain functions.") +}; + +// -=*# Resource for function INT #*=- +const char* SC_OPCODE_INT_ARY[] = +{ + NC_("SC_OPCODE_INT", "Rounds a number down to the nearest integer."), + NC_("SC_OPCODE_INT", "Number"), + NC_("SC_OPCODE_INT", "The number to be rounded down.") +}; + +// -=*# Resource for function TRUNC #*=- +const char* SC_OPCODE_TRUNC_ARY[] = +{ + NC_("SC_OPCODE_TRUNC", "Truncates the decimal places of a number."), + NC_("SC_OPCODE_TRUNC", "number"), + NC_("SC_OPCODE_TRUNC", "The number to be truncated."), + NC_("SC_OPCODE_TRUNC", "count"), + NC_("SC_OPCODE_TRUNC", "The number of places after the decimal point that are not to be truncated.") +}; + +// -=*# Resource for function ROUND #*=- +const char* SC_OPCODE_ROUND_ARY[] = +{ + NC_("SC_OPCODE_ROUND", "Rounds a number to a predefined accuracy."), + NC_("SC_OPCODE_ROUND", "number"), + NC_("SC_OPCODE_ROUND", "The number to be rounded."), + NC_("SC_OPCODE_ROUND", "count"), + NC_("SC_OPCODE_ROUND", "The number of places to which a number is to be rounded.") +}; + +// -=*# Resource for function ROUNDUP #*=- +const char* SC_OPCODE_ROUND_UP_ARY[] = +{ + NC_("SC_OPCODE_ROUND_UP", "Rounds a number up to the predefined accuracy."), + NC_("SC_OPCODE_ROUND_UP", "number"), + NC_("SC_OPCODE_ROUND_UP", "The number to be rounded up."), + NC_("SC_OPCODE_ROUND_UP", "count"), + NC_("SC_OPCODE_ROUND_UP", "The number of places to which a number is to be rounded.") +}; + +// -=*# Resource for function ROUNDDOWN #*=- +const char* SC_OPCODE_ROUND_DOWN_ARY[] = +{ + NC_("SC_OPCODE_ROUND_DOWN", "Rounds a number down to a predefined accuracy."), + NC_("SC_OPCODE_ROUND_DOWN", "number"), + NC_("SC_OPCODE_ROUND_DOWN", "The number to be rounded down."), + NC_("SC_OPCODE_ROUND_DOWN", "count"), + NC_("SC_OPCODE_ROUND_DOWN", "The number of places down to which a number is to be rounded.") +}; + +// -=*# Resource for function EVEN #*=- +const char* SC_OPCODE_EVEN_ARY[] = +{ + NC_("SC_OPCODE_EVEN", "Rounds a positive number up and negative number down to the nearest even integer."), + NC_("SC_OPCODE_EVEN", "Number"), + NC_("SC_OPCODE_EVEN", "The number to be rounded up.") +}; + +// -=*# Resource for function ODD #*=- +const char* SC_OPCODE_ODD_ARY[] = +{ + NC_("SC_OPCODE_ODD", "Rounds a positive number up and negative number down to the nearest odd integer."), + NC_("SC_OPCODE_ODD", "Number"), + NC_("SC_OPCODE_ODD", "The number to be rounded up.") +}; + +// -=*# Resource for function CEILING.XCL #*=- +const char* SC_OPCODE_CEIL_MS_ARY[] = +{ + NC_("SC_OPCODE_CEIL_MS", "Rounds a number away from zero to the nearest multiple of significance.\nThis function exists for interoperability with Microsoft Excel 2007 or older versions."), + NC_("SC_OPCODE_CEIL_MS", "Number"), + NC_("SC_OPCODE_CEIL_MS", "The number to be rounded up."), + NC_("SC_OPCODE_CEIL_MS", "Significance"), + NC_("SC_OPCODE_CEIL_MS", "The number to whose multiple the value is rounded.") +}; + +// -=*# Resource for function CEILING.PRECISE #*=- +const char* SC_OPCODE_CEIL_PRECISE_ARY[] = +{ + NC_("SC_OPCODE_CEIL_PRECISE", "Rounds a number up to the nearest multiple of significance, regardless of sign of significance."), + NC_("SC_OPCODE_CEIL_PRECISE", "Number"), + NC_("SC_OPCODE_CEIL_PRECISE", "The number to be rounded up."), + NC_("SC_OPCODE_CEIL_PRECISE", "Significance"), + NC_("SC_OPCODE_CEIL_PRECISE", "The number to whose multiple the value is rounded.") +}; + +// -=*# Resource for function ISO.CEILING #*=- +const char* SC_OPCODE_CEIL_ISO_ARY[] = +{ + NC_("SC_OPCODE_CEIL_ISO", "Rounds a number up to the nearest multiple of significance, regardless of sign of significance."), + NC_("SC_OPCODE_CEIL_ISO", "Number"), + NC_("SC_OPCODE_CEIL_ISO", "The number to be rounded up."), + NC_("SC_OPCODE_CEIL_ISO", "Significance"), + NC_("SC_OPCODE_CEIL_ISO", "The number to whose multiple the value is rounded.") +}; + +// -=*# Resource for function CEILING #*=- +const char* SC_OPCODE_CEIL_ARY[] = +{ + NC_("SC_OPCODE_CEIL", "Rounds a number up to the nearest multiple of significance."), + NC_("SC_OPCODE_CEIL", "Number"), + NC_("SC_OPCODE_CEIL", "The number to be rounded up."), + NC_("SC_OPCODE_CEIL", "Significance"), + NC_("SC_OPCODE_CEIL", "If given the number to whose multiple the value is rounded, else -1 or 1 depending on sign of Number."), + NC_("SC_OPCODE_CEIL", "Mode"), + NC_("SC_OPCODE_CEIL", "If given and not equal to zero then rounded up according to amount when a negative number and significance.") +}; + +// -=*# Resource for function CEILING.MATH #*=- +const char* SC_OPCODE_CEIL_MATH_ARY[] = +{ + NC_("SC_OPCODE_CEIL_MATH", "Rounds a number up to the nearest multiple of significance."), + NC_("SC_OPCODE_CEIL_MATH", "Number"), + NC_("SC_OPCODE_CEIL_MATH", "The number to be rounded up."), + NC_("SC_OPCODE_CEIL_MATH", "Significance"), + NC_("SC_OPCODE_CEIL_MATH", "If given the number to whose multiple the value is rounded, else 1."), + NC_("SC_OPCODE_CEIL_MATH", "Mode"), + NC_("SC_OPCODE_CEIL_MATH", "For negative numbers; if given and not equal to zero then rounds away from zero, else rounds towards zero.") +}; + +// -=*# Resource for function FLOOR #*=- +const char* SC_OPCODE_FLOOR_ARY[] = +{ + NC_("SC_OPCODE_FLOOR", "Rounds number down to the nearest multiple of significance."), + NC_("SC_OPCODE_FLOOR", "Number"), + NC_("SC_OPCODE_FLOOR", "The number to be rounded down."), + NC_("SC_OPCODE_FLOOR", "Significance"), + NC_("SC_OPCODE_FLOOR", "The number to whose multiple the value is to be rounded down."), + NC_("SC_OPCODE_FLOOR", "Mode"), + NC_("SC_OPCODE_FLOOR", "If given and not equal to zero then rounded towards zero with negative number and significance.") +}; + +// -=*# Resource for function FLOOR.XCL #*=- +const char* SC_OPCODE_FLOOR_MS_ARY[] = +{ + NC_("SC_OPCODE_FLOOR_MS", "Rounds number towards zero to the nearest multiple of absolute value of significance.\nThis function exists for interoperability with Microsoft Excel 2007 or older versions."), + NC_("SC_OPCODE_FLOOR_MS", "Number"), + NC_("SC_OPCODE_FLOOR_MS", "The number to be rounded down."), + NC_("SC_OPCODE_FLOOR_MS", "Significance"), + NC_("SC_OPCODE_FLOOR_MS", "The number to whose multiple the value is to be rounded down.") +}; + +// -=*# Resource for function FLOOR.MATH #*=- +const char* SC_OPCODE_FLOOR_MATH_ARY[] = +{ + NC_("SC_OPCODE_FLOOR_MATH", "Rounds number down to the nearest multiple of significance, regardless of sign of significance."), + NC_("SC_OPCODE_FLOOR_MATH", "Number"), + NC_("SC_OPCODE_FLOOR_MATH", "The number to be rounded down."), + NC_("SC_OPCODE_FLOOR_MATH", "Significance"), + NC_("SC_OPCODE_FLOOR_MATH", "The number to whose multiple the value is to be rounded down."), + NC_("SC_OPCODE_FLOOR_MATH", "Mode"), + NC_("SC_OPCODE_FLOOR_MATH", "For negative numbers; if given and not equal to or less than zero rounds towards zero.") +}; + +// -=*# Resource for function FLOOR.PRECISE #*=- +const char* SC_OPCODE_FLOOR_PRECISE_ARY[] = +{ + NC_("SC_OPCODE_FLOOR_PRECISE", "Rounds number down (towards -∞) to the nearest multiple of significance."), + NC_("SC_OPCODE_FLOOR_PRECISE", "Number"), + NC_("SC_OPCODE_FLOOR_PRECISE", "The number to be rounded down."), + NC_("SC_OPCODE_FLOOR_PRECISE", "Significance"), + NC_("SC_OPCODE_FLOOR_PRECISE", "The number to whose multiple the value is to be rounded down. Sign has no meaning.") +}; + +// -=*# Resource for function GCD #*=- +const char* SC_OPCODE_GCD_ARY[] = +{ + NC_("SC_OPCODE_GCD", "Greatest Common Divisor"), + NC_("SC_OPCODE_GCD", "Integer "), + NC_("SC_OPCODE_GCD", "Integer 1; integer 2,... are integers for which the greatest common divisor is to be calculated.") +}; + +// -=*# Resource for function LCM #*=- +const char* SC_OPCODE_LCM_ARY[] = +{ + NC_("SC_OPCODE_LCM", "Lowest common multiple"), + NC_("SC_OPCODE_LCM", "Integer "), + NC_("SC_OPCODE_LCM", "Integer 1; integer 2,... are integers whose smallest common multiple is to be calculated.") +}; + +// -=*# Resource for function TRANSPOSE #*=- +const char* SC_OPCODE_MAT_TRANS_ARY[] = +{ + NC_("SC_OPCODE_MAT_TRANS", "Array transposition. Exchanges the rows and columns of an array."), + NC_("SC_OPCODE_MAT_TRANS", "array"), + NC_("SC_OPCODE_MAT_TRANS", "The array in which the rows and columns have been transposed.") +}; + +// -=*# Resource for function MMULT #*=- +const char* SC_OPCODE_MAT_MULT_ARY[] = +{ + NC_("SC_OPCODE_MAT_MULT", "Array multiplication. Returns the product of two arrays."), + NC_("SC_OPCODE_MAT_MULT", "array_1"), + NC_("SC_OPCODE_MAT_MULT", "The first array for the array product."), + NC_("SC_OPCODE_MAT_MULT", "array_2"), + NC_("SC_OPCODE_MAT_MULT", "The second array having the same number of rows as the first array has columns.") +}; + +// -=*# Resource for function MDETERM #*=- +const char* SC_OPCODE_MAT_DET_ARY[] = +{ + NC_("SC_OPCODE_MAT_DET", "Returns the array determinant."), + NC_("SC_OPCODE_MAT_DET", "array"), + NC_("SC_OPCODE_MAT_DET", "The array for which the determinant is to be determined.") +}; + +// -=*# Resource for function MINVERSE #*=- +const char* SC_OPCODE_MAT_INV_ARY[] = +{ + NC_("SC_OPCODE_MAT_INV", "Returns the inverse of an array."), + NC_("SC_OPCODE_MAT_INV", "array"), + NC_("SC_OPCODE_MAT_INV", "The array to be inverted.") +}; + +// -=*# Resource for function MUNIT #*=- +const char* SC_OPCODE_MATRIX_UNIT_ARY[] = +{ + NC_("SC_OPCODE_MATRIX_UNIT", "Returns the unitary square array of a certain size."), + NC_("SC_OPCODE_MATRIX_UNIT", "Dimensions"), + NC_("SC_OPCODE_MATRIX_UNIT", "The size of the unitary array.") +}; + +// -=*# Resource for function SUMPRODUCT #*=- +const char* SC_OPCODE_SUM_PRODUCT_ARY[] = +{ + NC_("SC_OPCODE_SUM_PRODUCT", "(Inner products) Returns the sum of the products of array arguments."), + NC_("SC_OPCODE_SUM_PRODUCT", "Array "), + NC_("SC_OPCODE_SUM_PRODUCT", "Array 1, array 2, ... are arrays whose arguments are to be multiplied.") +}; + +// -=*# Resource for function SUMX2MY2 #*=- +const char* SC_OPCODE_SUM_X2MY2_ARY[] = +{ + NC_("SC_OPCODE_SUM_X2MY2", "Returns the sum of the difference of squares of two arrays."), + NC_("SC_OPCODE_SUM_X2MY2", "array_x"), + NC_("SC_OPCODE_SUM_X2MY2", "First array where the square of the arguments are totalled."), + NC_("SC_OPCODE_SUM_X2MY2", "array_y"), + NC_("SC_OPCODE_SUM_X2MY2", "Second array where the square of the arguments is to be subtracted.") +}; + +// -=*# Resource for function SUMX2PY2 #*=- +const char* SC_OPCODE_SUM_X2DY2_ARY[] = +{ + NC_("SC_OPCODE_SUM_X2DY2", "Returns the total of the square sum of two arrays."), + NC_("SC_OPCODE_SUM_X2DY2", "array_x"), + NC_("SC_OPCODE_SUM_X2DY2", "First array where the square of the arguments are totalled."), + NC_("SC_OPCODE_SUM_X2DY2", "array_y"), + NC_("SC_OPCODE_SUM_X2DY2", "Second array where the square of the arguments is to be totalled.") +}; + +// -=*# Resource for function SUMXMY2 #*=- +const char* SC_OPCODE_SUM_XMY2_ARY[] = +{ + NC_("SC_OPCODE_SUM_XMY2", "Returns the sum of squares of differences of two arrays."), + NC_("SC_OPCODE_SUM_XMY2", "array_x"), + NC_("SC_OPCODE_SUM_XMY2", "First array for forming argument differences."), + NC_("SC_OPCODE_SUM_XMY2", "array_y"), + NC_("SC_OPCODE_SUM_XMY2", "Second array for forming the argument differences.") +}; + +// -=*# Resource for function FREQUENCY #*=- +const char* SC_OPCODE_FREQUENCY_ARY[] = +{ + NC_("SC_OPCODE_FREQUENCY", "Returns a frequency distribution as a vertical array."), + NC_("SC_OPCODE_FREQUENCY", "data"), + NC_("SC_OPCODE_FREQUENCY", "The array of the data."), + NC_("SC_OPCODE_FREQUENCY", "classes"), + NC_("SC_OPCODE_FREQUENCY", "The array for forming classes.") +}; + +// -=*# Resource for function LINEST #*=- +const char* SC_OPCODE_LINEST_ARY[] = +{ + NC_("SC_OPCODE_LINEST", "Calculates parameters of the linear regression as an array."), + NC_("SC_OPCODE_LINEST", "data_Y"), + NC_("SC_OPCODE_LINEST", "The Y data array."), + NC_("SC_OPCODE_LINEST", "data_X"), + NC_("SC_OPCODE_LINEST", "The X data array."), + NC_("SC_OPCODE_LINEST", "Linear_type"), + NC_("SC_OPCODE_LINEST", "If type = 0 the linears will be calculated through the zero point, or else moved linears."), + NC_("SC_OPCODE_LINEST", "stats"), + NC_("SC_OPCODE_LINEST", "If parameter = 0 then only the regression coefficient will be calculated, otherwise other values as well.") +}; + +// -=*# Resource for function LOGEST #*=- +const char* SC_OPCODE_LOGEST_ARY[] = +{ + NC_("SC_OPCODE_LOGEST", "Calculates the parameters of the exponential regression curve as an array."), + NC_("SC_OPCODE_LOGEST", "data_Y"), + NC_("SC_OPCODE_LOGEST", "The Y data array."), + NC_("SC_OPCODE_LOGEST", "data_X"), + NC_("SC_OPCODE_LOGEST", "The X data array."), + NC_("SC_OPCODE_LOGEST", "Function_type"), + NC_("SC_OPCODE_LOGEST", "If type = 0 then the functions will be calculated in the form of y=m^x, or also functions y=b*m^x."), + NC_("SC_OPCODE_LOGEST", "stats"), + NC_("SC_OPCODE_LOGEST", "If parameter = 0 then only the regression coefficient will be calculated, otherwise other values as well.") +}; + +// -=*# Resource for function TREND #*=- +const char* SC_OPCODE_TREND_ARY[] = +{ + NC_("SC_OPCODE_TREND", "Calculates points along a regression line."), + NC_("SC_OPCODE_TREND", "data_Y"), + NC_("SC_OPCODE_TREND", "The Y data array."), + NC_("SC_OPCODE_TREND", "data_X"), + NC_("SC_OPCODE_TREND", "The X data array as the basis for the regression."), + NC_("SC_OPCODE_TREND", "new data_X"), + NC_("SC_OPCODE_TREND", "The array of X data for recalculating the values."), + NC_("SC_OPCODE_TREND", "Linear_type"), + NC_("SC_OPCODE_TREND", "If type = 0 the linears will be calculated through the zero point, or else moved linears.") +}; + +// -=*# Resource for function GROWTH #*=- +const char* SC_OPCODE_GROWTH_ARY[] = +{ + NC_("SC_OPCODE_GROWTH", "Calculates points on the exponential regression function."), + NC_("SC_OPCODE_GROWTH", "data_Y"), + NC_("SC_OPCODE_GROWTH", "The Y data array."), + NC_("SC_OPCODE_GROWTH", "data_X"), + NC_("SC_OPCODE_GROWTH", "The X data array as the basis for the regression."), + NC_("SC_OPCODE_GROWTH", "new_data_X"), + NC_("SC_OPCODE_GROWTH", "The array of X data for recalculating the values."), + NC_("SC_OPCODE_GROWTH", "Function_type"), + NC_("SC_OPCODE_GROWTH", "If type = 0 then the functions will be calculated in the form of y=m^x, or also functions y=b*m^x.") +}; + +// -=*# Resource for function COUNT #*=- +const char* SC_OPCODE_COUNT_ARY[] = +{ + NC_("SC_OPCODE_COUNT", "Counts how many numbers are in the list of arguments."), + NC_("SC_OPCODE_COUNT", "value "), + NC_("SC_OPCODE_COUNT", "Value 1, value 2, ... are arguments containing different data types but where only numbers are counted.") +}; + +// -=*# Resource for function COUNTA #*=- +const char* SC_OPCODE_COUNT_2_ARY[] = +{ + NC_("SC_OPCODE_COUNT_2", "Counts how many values are in the list of arguments."), + NC_("SC_OPCODE_COUNT_2", "value "), + NC_("SC_OPCODE_COUNT_2", "Value 1, value 2, ... are arguments representing the values to be counted.") +}; + +// -=*# Resource for function MAX #*=- +const char* SC_OPCODE_MAX_ARY[] = +{ + NC_("SC_OPCODE_MAX", "Returns the maximum value in a list of arguments."), + NC_("SC_OPCODE_MAX", "number "), + NC_("SC_OPCODE_MAX", "Number 1, number 2, ... are numerical arguments for which the largest number is to be determined.") +}; + +// -=*# Resource for function MAXA #*=- +const char* SC_OPCODE_MAX_A_ARY[] = +{ + NC_("SC_OPCODE_MAX_A", "Returns the maximum value in a list of arguments. Text is evaluated as Zero."), + NC_("SC_OPCODE_MAX_A", "value "), + NC_("SC_OPCODE_MAX_A", "Value 1, value 2, are arguments whose largest value is to be determined.") +}; + +// -=*# Resource for function MIN #*=- +const char* SC_OPCODE_MIN_ARY[] = +{ + NC_("SC_OPCODE_MIN", "Returns the minimum value in a list of arguments."), + NC_("SC_OPCODE_MIN", "number "), + NC_("SC_OPCODE_MIN", "Number 1, number 2, ... are numerical arguments for which the smallest number is to be determined.") +}; + +// -=*# Resource for function MINA #*=- +const char* SC_OPCODE_MIN_A_ARY[] = +{ + NC_("SC_OPCODE_MIN_A", "Returns the smallest value in a list of arguments. Text is evaluated as zero."), + NC_("SC_OPCODE_MIN_A", "value "), + NC_("SC_OPCODE_MIN_A", "Value 1; value 2;... are arguments whose smallest number is to be determined.") +}; + +// -=*# Resource for function VAR #*=- +const char* SC_OPCODE_VAR_ARY[] = +{ + NC_("SC_OPCODE_VAR", "Calculates the variance based on a sample."), + NC_("SC_OPCODE_VAR", "number "), + NC_("SC_OPCODE_VAR", "Number 1, number 2, ... are numerical arguments which portray a sample of a population.") +}; + +// -=*# Resource for function VAR.S #*=- +const char* SC_OPCODE_VAR_S_ARY[] = +{ + NC_("SC_OPCODE_VAR_S", "Calculates the variance based on a sample."), + NC_("SC_OPCODE_VAR_S", "number "), + NC_("SC_OPCODE_VAR_S", "Number 1, number 2, ... are numerical arguments which portray a sample of a population.") +}; + +// -=*# Resource for function VARA #*=- +const char* SC_OPCODE_VAR_A_ARY[] = +{ + NC_("SC_OPCODE_VAR_A", "Returns the variance based on a sample. Text is evaluated as zero."), + NC_("SC_OPCODE_VAR_A", "value "), + NC_("SC_OPCODE_VAR_A", "Value 1; value 2; ... are arguments representing a sample taken from a basic total population.") +}; + +// -=*# Resource for function VARP #*=- +const char* SC_OPCODE_VAR_P_ARY[] = +{ + NC_("SC_OPCODE_VAR_P", "Calculates variance based on the entire population."), + NC_("SC_OPCODE_VAR_P", "number "), + NC_("SC_OPCODE_VAR_P", "Number 1, number 2, ... are numerical arguments which represent a population.") +}; + +// -=*# Resource for function VAR.P #*=- +const char* SC_OPCODE_VAR_P_MS_ARY[] = +{ + NC_("SC_OPCODE_VAR_P_MS", "Calculates variance based on the entire population."), + NC_("SC_OPCODE_VAR_P_MS", "number "), + NC_("SC_OPCODE_VAR_P_MS", "Number 1, number 2, ... are numerical arguments which represent a population.") +}; + +// -=*# Resource for function VARPA #*=- +const char* SC_OPCODE_VAR_P_A_ARY[] = +{ + NC_("SC_OPCODE_VAR_P_A", "Returns the variance based on the entire population. Text is evaluated as zero."), + NC_("SC_OPCODE_VAR_P_A", "value "), + NC_("SC_OPCODE_VAR_P_A", "Value 1; value 2;... are arguments representing a population.") +}; + +// -=*# Resource for function STDEV #*=- +const char* SC_OPCODE_ST_DEV_ARY[] = +{ + NC_("SC_OPCODE_ST_DEV", "Calculates the standard deviation based on a sample."), + NC_("SC_OPCODE_ST_DEV", "number "), + NC_("SC_OPCODE_ST_DEV", "Number 1, number 2, ... are numerical arguments which portray a sample of a population.") +}; + +// -=*# Resource for function STDEV.S #*=- +const char* SC_OPCODE_ST_DEV_S_ARY[] = +{ + NC_("SC_OPCODE_ST_DEV_S", "Calculates the standard deviation based on a sample."), + NC_("SC_OPCODE_ST_DEV_S", "number "), + NC_("SC_OPCODE_ST_DEV_S", "Number 1, number 2, ... are numerical arguments which portray a sample of a population.") +}; + +// -=*# Resource for function STDEVA #*=- +const char* SC_OPCODE_ST_DEV_A_ARY[] = +{ + NC_("SC_OPCODE_ST_DEV_A", "Returns the standard deviation based on a sample. Text is evaluated as zero."), + NC_("SC_OPCODE_ST_DEV_A", "value "), + NC_("SC_OPCODE_ST_DEV_A", "Value 1; value 2; ... are arguments representing a sample taken from a basic total population.") +}; + +// -=*# Resource for function STDEVP #*=- +const char* SC_OPCODE_ST_DEV_P_ARY[] = +{ + NC_("SC_OPCODE_ST_DEV_P", "Calculates the standard deviation based on the entire population."), + NC_("SC_OPCODE_ST_DEV_P", "number "), + NC_("SC_OPCODE_ST_DEV_P", "Number 1, number 2, ... are numerical arguments which portray a population.") +}; + +// -=*# Resource for function STDEV.P #*=- +const char* SC_OPCODE_ST_DEV_P_MS_ARY[] = +{ + NC_("SC_OPCODE_ST_DEV_P_MS", "Calculates the standard deviation based on the entire population."), + NC_("SC_OPCODE_ST_DEV_P_MS", "number "), + NC_("SC_OPCODE_ST_DEV_P_MS", "Number 1, number 2, ... are numerical arguments which portray a population.") +}; + +// -=*# Resource for function STDEVPA #*=- +const char* SC_OPCODE_ST_DEV_P_A_ARY[] = +{ + NC_("SC_OPCODE_ST_DEV_P_A", "Returns the standard deviation based on the entire population. Text is evaluated as zero."), + NC_("SC_OPCODE_ST_DEV_P_A", "value "), + NC_("SC_OPCODE_ST_DEV_P_A", "Value 1; value 2;... are arguments corresponding to a population.") +}; + +// -=*# Resource for function AVERAGE #*=- +const char* SC_OPCODE_AVERAGE_ARY[] = +{ + NC_("SC_OPCODE_AVERAGE", "Returns the average of a sample."), + NC_("SC_OPCODE_AVERAGE", "number "), + NC_("SC_OPCODE_AVERAGE", "Number 1, number 2;...are numeric arguments representing a population sample.") +}; + +// -=*# Resource for function AVERAGEA #*=- +const char* SC_OPCODE_AVERAGE_A_ARY[] = +{ + NC_("SC_OPCODE_AVERAGE_A", "Returns the average value for a sample. Text is evaluated as zero."), + NC_("SC_OPCODE_AVERAGE_A", "value "), + NC_("SC_OPCODE_AVERAGE_A", "Value 1; value 2; ... are arguments representing a sample taken from a basic total population.") +}; + +// -=*# Resource for function DEVSQ #*=- +const char* SC_OPCODE_DEV_SQ_ARY[] = +{ + NC_("SC_OPCODE_DEV_SQ", "Returns the sum of squares of deviations from the sample mean value"), + NC_("SC_OPCODE_DEV_SQ", "number "), + NC_("SC_OPCODE_DEV_SQ", "Number 1, number 2, ... are numerical arguments which portray a sample.") +}; + +// -=*# Resource for function AVEDEV #*=- +const char* SC_OPCODE_AVE_DEV_ARY[] = +{ + NC_("SC_OPCODE_AVE_DEV", "Returns the average of the absolute deviations of a sample from the mean."), + NC_("SC_OPCODE_AVE_DEV", "number "), + NC_("SC_OPCODE_AVE_DEV", "Number 1, number 2;...are numerical arguments representing a sample.") +}; + +// -=*# Resource for function SKEW #*=- +const char* SC_OPCODE_SKEW_ARY[] = +{ + NC_("SC_OPCODE_SKEW", "Returns the skewness of a distribution."), + NC_("SC_OPCODE_SKEW", "number "), + NC_("SC_OPCODE_SKEW", "Number 1, number 2, ... are numerical arguments portraying a sample of the distribution.") +}; + +// -=*# Resource for function SKEWP #*=- +const char* SC_OPCODE_SKEWP_ARY[] = +{ + NC_("SC_OPCODE_SKEWP", "Returns the skewness of a distribution using the population of a random variable."), + NC_("SC_OPCODE_SKEWP", "number "), + NC_("SC_OPCODE_SKEWP", "Number 1, number 2, ... are numerical arguments portraying the population.") +}; + +// -=*# Resource for function KURT #*=- +const char* SC_OPCODE_KURT_ARY[] = +{ + NC_("SC_OPCODE_KURT", "Returns the kurtosis of a distribution."), + NC_("SC_OPCODE_KURT", "number "), + NC_("SC_OPCODE_KURT", "Number 1, number 2, ... are numerical arguments, representing a sample of the distribution.") +}; + +// -=*# Resource for function GEOMEAN #*=- +const char* SC_OPCODE_GEO_MEAN_ARY[] = +{ + NC_("SC_OPCODE_GEO_MEAN", "Returns the geometric mean of a sample."), + NC_("SC_OPCODE_GEO_MEAN", "number "), + NC_("SC_OPCODE_GEO_MEAN", "Number 1, number 2, ... are numerical arguments which portray a sample.") +}; + +// -=*# Resource for function HARMEAN #*=- +const char* SC_OPCODE_HAR_MEAN_ARY[] = +{ + NC_("SC_OPCODE_HAR_MEAN", "Returns the harmonic mean of a sample."), + NC_("SC_OPCODE_HAR_MEAN", "number "), + NC_("SC_OPCODE_HAR_MEAN", "Number 1, number 2, ... are numerical arguments which portray a sample.") +}; + +// -=*# Resource for function MODE #*=- +const char* SC_OPCODE_MODAL_VALUE_ARY[] = +{ + NC_("SC_OPCODE_MODAL_VALUE", "Returns the most common value in a sample."), + NC_("SC_OPCODE_MODAL_VALUE", "number "), + NC_("SC_OPCODE_MODAL_VALUE", "Number 1, number 2, ... are numerical arguments which portray a sample.") +}; + +// -=*# Resource for function MODE.SNGL #*=- +const char* SC_OPCODE_MODAL_VALUE_MS_ARY[] = +{ + NC_("SC_OPCODE_MODAL_VALUE_MS", "Returns the most common value in a sample."), + NC_("SC_OPCODE_MODAL_VALUE_MS", "number "), + NC_("SC_OPCODE_MODAL_VALUE_MS", "Number 1, number 2, ... are numerical arguments which portray a sample.") +}; + +// -=*# Resource for function MODE.MULT #*=- +const char* SC_OPCODE_MODAL_VALUE_MULTI_ARY[] = +{ + NC_("SC_OPCODE_MODAL_VALUE_MULTI", "Returns the most common value in a sample."), + NC_("SC_OPCODE_MODAL_VALUE_MULTI", "number "), + NC_("SC_OPCODE_MODAL_VALUE_MULTI", "Number 1, number 2, ... are 1 to 254 numerical arguments which portray a sample.") +}; + +// -=*# Resource for function MEDIAN #*=- +const char* SC_OPCODE_MEDIAN_ARY[] = +{ + NC_("SC_OPCODE_MEDIAN", "Returns the median of a given sample."), + NC_("SC_OPCODE_MEDIAN", "number "), + NC_("SC_OPCODE_MEDIAN", "Number 1, number 2, ... are numerical arguments which portray a sample.") +}; + +// -=*# Resource for function PERCENTILE #*=- +const char* SC_OPCODE_PERCENTILE_ARY[] = +{ + NC_("SC_OPCODE_PERCENTILE", "Returns the alpha quantile of a sample."), + NC_("SC_OPCODE_PERCENTILE", "data"), + NC_("SC_OPCODE_PERCENTILE", "The array of the data in the sample."), + NC_("SC_OPCODE_PERCENTILE", "Alpha"), + NC_("SC_OPCODE_PERCENTILE", "The percentage rate of the quantile between 0 and 1.") +}; + +// -=*# Resource for function PERCENTILE.EXC #*=- +const char* SC_OPCODE_PERCENTILE_EXC_ARY[] = +{ + NC_("SC_OPCODE_PERCENTILE_EXC", "Returns the alpha percentile of a sample."), + NC_("SC_OPCODE_PERCENTILE_EXC", "data"), + NC_("SC_OPCODE_PERCENTILE_EXC", "The array of the data in the sample."), + NC_("SC_OPCODE_PERCENTILE_EXC", "Alpha"), + NC_("SC_OPCODE_PERCENTILE_EXC", "The percentile value, range 0...1, exclusive.") +}; + +// -=*# Resource for function PERCENTILE.INC #*=- +const char* SC_OPCODE_PERCENTILE_INC_ARY[] = +{ + NC_("SC_OPCODE_PERCENTILE_INC", "Returns the alpha percentile of a sample."), + NC_("SC_OPCODE_PERCENTILE_INC", "data"), + NC_("SC_OPCODE_PERCENTILE_INC", "The array of the data in the sample."), + NC_("SC_OPCODE_PERCENTILE_INC", "Alpha"), + NC_("SC_OPCODE_PERCENTILE_INC", "The percentile value, range 0...1, inclusive.") +}; + +// -=*# Resource for function QUARTILE #*=- +const char* SC_OPCODE_QUARTILE_ARY[] = +{ + NC_("SC_OPCODE_QUARTILE", "Returns the quartile of a sample."), + NC_("SC_OPCODE_QUARTILE", "data"), + NC_("SC_OPCODE_QUARTILE", "The array of the data in the sample."), + NC_("SC_OPCODE_QUARTILE", "Type"), + NC_("SC_OPCODE_QUARTILE", "The type of the quartile (0 = MIN, 1 = 25%, 2 = 50%, 3 = 75%, 4 = MAX).") +}; + +// -=*# Resource for function QUARTILE.EXC #*=- +const char* SC_OPCODE_QUARTILE_EXC_ARY[] = +{ + NC_("SC_OPCODE_QUARTILE_EXC", "Returns the quartile of a sample."), + NC_("SC_OPCODE_QUARTILE_EXC", "data"), + NC_("SC_OPCODE_QUARTILE_EXC", "The array of the data in the sample."), + NC_("SC_OPCODE_QUARTILE_EXC", "Type"), + NC_("SC_OPCODE_QUARTILE_EXC", "The type of the quartile (1 = 25%, 2 = 50%, 3 = 75%).") +}; + +// -=*# Resource for function QUARTILE.INC #*=- +const char* SC_OPCODE_QUARTILE_INC_ARY[] = +{ + NC_("SC_OPCODE_QUARTILE_INC", "Returns the quartile of a sample."), + NC_("SC_OPCODE_QUARTILE_INC", "data"), + NC_("SC_OPCODE_QUARTILE_INC", "The array of the data in the sample."), + NC_("SC_OPCODE_QUARTILE_INC", "Type"), + NC_("SC_OPCODE_QUARTILE_INC", "The type of the quartile (0 = MIN, 1 = 25%, 2 = 50%, 3 = 75%, 4 = MAX).") +}; + +// -=*# Resource for function LARGE #*=- +const char* SC_OPCODE_LARGE_ARY[] = +{ + NC_("SC_OPCODE_LARGE", "Returns the k-th largest value of a sample."), + NC_("SC_OPCODE_LARGE", "data"), + NC_("SC_OPCODE_LARGE", "The array of the data in the sample."), + NC_("SC_OPCODE_LARGE", "Rank_c"), + NC_("SC_OPCODE_LARGE", "The ranking of the value.") +}; + +// -=*# Resource for function SMALL #*=- +const char* SC_OPCODE_SMALL_ARY[] = +{ + NC_("SC_OPCODE_SMALL", "Returns the k-th smallest value of a sample."), + NC_("SC_OPCODE_SMALL", "data"), + NC_("SC_OPCODE_SMALL", "The array of the data in the sample."), + NC_("SC_OPCODE_SMALL", "Rank_c"), + NC_("SC_OPCODE_SMALL", "The ranking of the value.") +}; + +// -=*# Resource for function PERCENTRANK #*=- +const char* SC_OPCODE_PERCENT_RANK_ARY[] = +{ + NC_("SC_OPCODE_PERCENT_RANK", "Returns the percentage rank of a value in a sample."), + NC_("SC_OPCODE_PERCENT_RANK", "data"), + NC_("SC_OPCODE_PERCENT_RANK", "The array of the data in the sample."), + NC_("SC_OPCODE_PERCENT_RANK", "value"), + NC_("SC_OPCODE_PERCENT_RANK", "The value for which percentage ranking is to be determined."), + NC_("SC_OPCODE_PERCENT_RANK", "significance"), + NC_("SC_OPCODE_PERCENT_RANK", "The number of significant digits for the returned percentage: if omitted, a value of 3 is used.") +}; + +// -=*# Resource for function PERCENTRANK.EXC #*=- +const char* SC_OPCODE_PERCENT_RANK_EXC_ARY[] = +{ + NC_("SC_OPCODE_PERCENT_RANK_EXC", "Returns the percentage rank (0..1, exclusive) of a value in a sample."), + NC_("SC_OPCODE_PERCENT_RANK_EXC", "data"), + NC_("SC_OPCODE_PERCENT_RANK_EXC", "The array of the data in the sample."), + NC_("SC_OPCODE_PERCENT_RANK_EXC", "value"), + NC_("SC_OPCODE_PERCENT_RANK_EXC", "The value for which percentage ranking is to be determined."), + NC_("SC_OPCODE_PERCENT_RANK_EXC", "significance"), + NC_("SC_OPCODE_PERCENT_RANK_EXC", "The number of significant digits for the returned percentage: if omitted, a value of 3 is used.") +}; + +// -=*# Resource for function PERCENTRANK.INC #*=- +const char* SC_OPCODE_PERCENT_RANK_INC_ARY[] = +{ + NC_("SC_OPCODE_PERCENT_RANK_INC", "Returns the percentage rank (0..1, inclusive) of a value in a sample."), + NC_("SC_OPCODE_PERCENT_RANK_INC", "data"), + NC_("SC_OPCODE_PERCENT_RANK_INC", "The array of the data in the sample."), + NC_("SC_OPCODE_PERCENT_RANK_INC", "value"), + NC_("SC_OPCODE_PERCENT_RANK_INC", "The value for which percentage ranking is to be determined."), + NC_("SC_OPCODE_PERCENT_RANK_INC", "significance"), + NC_("SC_OPCODE_PERCENT_RANK_INC", "The number of significant digits for the returned percentage: if omitted, a value of 3 is used.") +}; + +// -=*# Resource for function RANK #*=- +const char* SC_OPCODE_RANK_ARY[] = +{ + NC_("SC_OPCODE_RANK", "Returns the ranking of a value in a sample."), + NC_("SC_OPCODE_RANK", "value"), + NC_("SC_OPCODE_RANK", "The value for which the rank is to be determined."), + NC_("SC_OPCODE_RANK", "Data"), + NC_("SC_OPCODE_RANK", "The array of the data in the sample."), + NC_("SC_OPCODE_RANK", "Type"), + NC_("SC_OPCODE_RANK", "Sequence order: 0 or omitted means descending, any other value than 0 means ascending.") +}; + +// -=*# Resource for function RANK.EQ #*=- +const char* SC_OPCODE_RANK_EQ_ARY[] = +{ + NC_("SC_OPCODE_RANK_EQ", "Returns the ranking of a value in a sample; if more than one value has the same rank, the top rank of that set of values is returned."), + NC_("SC_OPCODE_RANK_EQ", "value"), + NC_("SC_OPCODE_RANK_EQ", "The value for which the rank is to be determined."), + NC_("SC_OPCODE_RANK_EQ", "Data"), + NC_("SC_OPCODE_RANK_EQ", "The array of the data in the sample."), + NC_("SC_OPCODE_RANK_EQ", "Type"), + NC_("SC_OPCODE_RANK_EQ", "Sequence order: 0 or omitted means descending, any other value than 0 means ascending.") +}; + +// -=*# Resource for function RANK.AVG #*=- +const char* SC_OPCODE_RANK_AVG_ARY[] = +{ + NC_("SC_OPCODE_RANK_AVG", "Returns the ranking of a value in a sample; if more than one value has the same rank, the average rank is returned."), + NC_("SC_OPCODE_RANK_AVG", "value"), + NC_("SC_OPCODE_RANK_AVG", "The value for which the rank is to be determined."), + NC_("SC_OPCODE_RANK_AVG", "Data"), + NC_("SC_OPCODE_RANK_AVG", "The array of the data in the sample."), + NC_("SC_OPCODE_RANK_AVG", "Type"), + NC_("SC_OPCODE_RANK_AVG", "Sequence order: 0 or omitted means descending, any other value than 0 means ascending.") +}; + +// -=*# Resource for function TRIMMEAN #*=- +const char* SC_OPCODE_TRIM_MEAN_ARY[] = +{ + NC_("SC_OPCODE_TRIM_MEAN", "Returns the mean of a sample without including the marginal values."), + NC_("SC_OPCODE_TRIM_MEAN", "data"), + NC_("SC_OPCODE_TRIM_MEAN", "The array of the data in the sample."), + NC_("SC_OPCODE_TRIM_MEAN", "Alpha"), + NC_("SC_OPCODE_TRIM_MEAN", "The percentage of marginal data that is not to be taken into account.") +}; + +// -=*# Resource for function PROB #*=- +const char* SC_OPCODE_PROB_ARY[] = +{ + NC_("SC_OPCODE_PROB", "Returns the discrete probability of an interval."), + NC_("SC_OPCODE_PROB", "data"), + NC_("SC_OPCODE_PROB", "The sample data array."), + NC_("SC_OPCODE_PROB", "probability"), + NC_("SC_OPCODE_PROB", "The array of the associated probabilities."), + NC_("SC_OPCODE_PROB", "Start"), + NC_("SC_OPCODE_PROB", "The start of the value interval whose probabilities is to be totalled."), + NC_("SC_OPCODE_PROB", "End"), + NC_("SC_OPCODE_PROB", "The end of the value interval where the probabilities are to be totalled.") +}; + +// -=*# Resource for function B #*=- +const char* SC_OPCODE_B_ARY[] = +{ + NC_("SC_OPCODE_B", "Returns the probability of a trial result using binomial distribution."), + NC_("SC_OPCODE_B", "trials"), + NC_("SC_OPCODE_B", "The number of trials."), + NC_("SC_OPCODE_B", "SP"), + NC_("SC_OPCODE_B", "The individual probability of a trial result."), + NC_("SC_OPCODE_B", "T_1"), + NC_("SC_OPCODE_B", "Lower limit for the number of trials."), + NC_("SC_OPCODE_B", "T_2"), + NC_("SC_OPCODE_B", "Upper limit for the number of trials.") +}; + +// -=*# Resource for function PHI #*=- +const char* SC_OPCODE_PHI_ARY[] = +{ + NC_("SC_OPCODE_PHI", "Values of the distribution function for a standard normal distribution."), + NC_("SC_OPCODE_PHI", "number"), + NC_("SC_OPCODE_PHI", "The value for which the standard normal distribution is to be calculated.") +}; + +// -=*# Resource for function GAUSS #*=- +const char* SC_OPCODE_GAUSS_ARY[] = +{ + NC_("SC_OPCODE_GAUSS", "Returns the integral values of the standard normal cumulative distribution."), + NC_("SC_OPCODE_GAUSS", "Number"), + NC_("SC_OPCODE_GAUSS", "The value for which the integral value of the standard normal distribution is to be calculated.") +}; + +// -=*# Resource for function FISHER #*=- +const char* SC_OPCODE_FISHER_ARY[] = +{ + NC_("SC_OPCODE_FISHER", "Returns the Fisher transformation."), + NC_("SC_OPCODE_FISHER", "Number"), + NC_("SC_OPCODE_FISHER", "The value to be transformed (-1 < VALUE < 1).") +}; + +// -=*# Resource for function FISHERINV #*=- +const char* SC_OPCODE_FISHER_INV_ARY[] = +{ + NC_("SC_OPCODE_FISHER_INV", "Returns the inverse of the Fisher transformation."), + NC_("SC_OPCODE_FISHER_INV", "Number"), + NC_("SC_OPCODE_FISHER_INV", "The value that is to be transformed back.") +}; + +// -=*# Resource for function BINOMDIST #*=- +const char* SC_OPCODE_BINOM_DIST_ARY[] = +{ + NC_("SC_OPCODE_BINOM_DIST", "Values of the binomial distribution."), + NC_("SC_OPCODE_BINOM_DIST", "X"), + NC_("SC_OPCODE_BINOM_DIST", "The number of successes in a series of trials."), + NC_("SC_OPCODE_BINOM_DIST", "trials"), + NC_("SC_OPCODE_BINOM_DIST", "The total number of trials."), + NC_("SC_OPCODE_BINOM_DIST", "SP"), + NC_("SC_OPCODE_BINOM_DIST", "The success probability of a trial."), + NC_("SC_OPCODE_BINOM_DIST", "C"), + NC_("SC_OPCODE_BINOM_DIST", "Cumulated. C=0 calculates the individual probability, C=1 the cumulated probability.") +}; + +// -=*# Resource for function BINOM.DIST #*=- +const char* SC_OPCODE_BINOM_DIST_MS_ARY[] = +{ + NC_("SC_OPCODE_BINOM_DIST_MS", "Values of the binomial distribution."), + NC_("SC_OPCODE_BINOM_DIST_MS", "X"), + NC_("SC_OPCODE_BINOM_DIST_MS", "The number of successes in a series of trials."), + NC_("SC_OPCODE_BINOM_DIST_MS", "trials"), + NC_("SC_OPCODE_BINOM_DIST_MS", "The total number of trials."), + NC_("SC_OPCODE_BINOM_DIST_MS", "SP"), + NC_("SC_OPCODE_BINOM_DIST_MS", "The success probability of a trial."), + NC_("SC_OPCODE_BINOM_DIST_MS", "C"), + NC_("SC_OPCODE_BINOM_DIST_MS", "Cumulated. C=0 calculates the individual probability, C=1 the cumulated probability.") +}; + +// -=*# Resource for function NEGBINOMDIST #*=- +const char* SC_OPCODE_NEG_BINOM_VERT_ARY[] = +{ + NC_("SC_OPCODE_NEG_BINOM_VERT", "Values of the negative binomial distribution."), + NC_("SC_OPCODE_NEG_BINOM_VERT", "X"), + NC_("SC_OPCODE_NEG_BINOM_VERT", "The number of failures in the trial range."), + NC_("SC_OPCODE_NEG_BINOM_VERT", "R"), + NC_("SC_OPCODE_NEG_BINOM_VERT", "The number of successes in the trial sequence."), + NC_("SC_OPCODE_NEG_BINOM_VERT", "SP"), + NC_("SC_OPCODE_NEG_BINOM_VERT", "The success probability of a trial.") +}; + +// -=*# Resource for function NEGBINOM.DIST #*=- +const char* SC_OPCODE_NEG_BINOM_DIST_MS_ARY[] = +{ + NC_("SC_OPCODE_NEG_BINOM_DIST_MS", "Values of the negative binomial distribution."), + NC_("SC_OPCODE_NEG_BINOM_DIST_MS", "X"), + NC_("SC_OPCODE_NEG_BINOM_DIST_MS", "The number of failures in the trial range."), + NC_("SC_OPCODE_NEG_BINOM_DIST_MS", "R"), + NC_("SC_OPCODE_NEG_BINOM_DIST_MS", "The number of successes in the trial sequence."), + NC_("SC_OPCODE_NEG_BINOM_DIST_MS", "SP"), + NC_("SC_OPCODE_NEG_BINOM_DIST_MS", "The success probability of a trial."), + NC_("SC_OPCODE_NEG_BINOM_DIST_MS", "Cumulative"), + NC_("SC_OPCODE_NEG_BINOM_DIST_MS", "0 or FALSE calculates the probability density function. Any other value or TRUE calculates the cumulative distribution function.") +}; + +// -=*# Resource for function CRITBINOM #*=- +const char* SC_OPCODE_CRIT_BINOM_ARY[] = +{ + NC_("SC_OPCODE_CRIT_BINOM", "Returns the smallest value for which the cumulative binomial distribution is greater than or equal to a criterion value."), + NC_("SC_OPCODE_CRIT_BINOM", "trials"), + NC_("SC_OPCODE_CRIT_BINOM", "The total number of trials."), + NC_("SC_OPCODE_CRIT_BINOM", "SP"), + NC_("SC_OPCODE_CRIT_BINOM", "The success probability of a trial."), + NC_("SC_OPCODE_CRIT_BINOM", "alpha"), + NC_("SC_OPCODE_CRIT_BINOM", "The border probability that is attained or exceeded.") +}; + +// -=*# Resource for function BINOM.INV #*=- +const char* SC_OPCODE_BINOM_INV_ARY[] = +{ + NC_("SC_OPCODE_BINOM_INV", "Returns the smallest value for which the cumulative binomial distribution is greater than or equal to a criterion value."), + NC_("SC_OPCODE_BINOM_INV", "trials"), + NC_("SC_OPCODE_BINOM_INV", "The total number of trials."), + NC_("SC_OPCODE_BINOM_INV", "SP"), + NC_("SC_OPCODE_BINOM_INV", "The success probability of a trial."), + NC_("SC_OPCODE_BINOM_INV", "alpha"), + NC_("SC_OPCODE_BINOM_INV", "The border probability that is attained or exceeded.") +}; + +// -=*# Resource for function POISSON #*=- +const char* SC_OPCODE_POISSON_DIST_ARY[] = +{ + NC_("SC_OPCODE_POISSON_DIST", "Returns the Poisson distribution."), + NC_("SC_OPCODE_POISSON_DIST", "Number"), + NC_("SC_OPCODE_POISSON_DIST", "The value for which the Poisson distribution is to be calculated."), + NC_("SC_OPCODE_POISSON_DIST", "mean"), + NC_("SC_OPCODE_POISSON_DIST", "Mean. The mean value of the Poisson distribution."), + NC_("SC_OPCODE_POISSON_DIST", "Cumulative"), + NC_("SC_OPCODE_POISSON_DIST", "0 or FALSE calculates the probability density function. Any other value or TRUE or omitted calculates the cumulative distribution function.") +}; + +// -=*# Resource for function POISSON.DIST #*=- +const char* SC_OPCODE_POISSON_DIST_MS_ARY[] = +{ + NC_("SC_OPCODE_POISSON_DIST_MS", "Returns the Poisson distribution."), + NC_("SC_OPCODE_POISSON_DIST_MS", "Number"), + NC_("SC_OPCODE_POISSON_DIST_MS", "The value for which the Poisson distribution is to be calculated."), + NC_("SC_OPCODE_POISSON_DIST_MS", "mean"), + NC_("SC_OPCODE_POISSON_DIST_MS", "Mean. The mean value of the Poisson distribution."), + NC_("SC_OPCODE_POISSON_DIST_MS", "Cumulative"), + NC_("SC_OPCODE_POISSON_DIST_MS", "0 or FALSE calculates the probability density function. Any other value or TRUE or omitted calculates the cumulative distribution function.") +}; + +// -=*# Resource for function NORMDIST #*=- +const char* SC_OPCODE_NORM_DIST_ARY[] = +{ + NC_("SC_OPCODE_NORM_DIST", "Values of the normal distribution."), + NC_("SC_OPCODE_NORM_DIST", "Number"), + NC_("SC_OPCODE_NORM_DIST", "The value for which the normal distribution is to be calculated."), + NC_("SC_OPCODE_NORM_DIST", "Mean"), + NC_("SC_OPCODE_NORM_DIST", "The mean value. The mean value of the normal distribution."), + NC_("SC_OPCODE_NORM_DIST", "STDEV"), + NC_("SC_OPCODE_NORM_DIST", "Standard deviation. The standard deviation of the normal distribution."), + NC_("SC_OPCODE_NORM_DIST", "C"), + NC_("SC_OPCODE_NORM_DIST", "0 or FALSE calculates the probability density function. Any other value or TRUE or omitted calculates the cumulative distribution function.") +}; + +// -=*# Resource for function NORM.DIST #*=- +const char* SC_OPCODE_NORM_DIST_MS_ARY[] = +{ + NC_("SC_OPCODE_NORM_DIST_MS", "Values of the normal distribution."), + NC_("SC_OPCODE_NORM_DIST_MS", "Number"), + NC_("SC_OPCODE_NORM_DIST_MS", "The value for which the normal distribution is to be calculated."), + NC_("SC_OPCODE_NORM_DIST_MS", "Mean"), + NC_("SC_OPCODE_NORM_DIST_MS", "The mean value. The mean value of the normal distribution."), + NC_("SC_OPCODE_NORM_DIST_MS", "STDEV"), + NC_("SC_OPCODE_NORM_DIST_MS", "Standard deviation. The standard deviation of the normal distribution."), + NC_("SC_OPCODE_NORM_DIST_MS", "C"), + NC_("SC_OPCODE_NORM_DIST_MS", "0 or FALSE calculates the probability density function. Any other value or TRUE calculates the cumulative distribution function.") +}; + +// -=*# Resource for function NORMINV #*=- +const char* SC_OPCODE_NORM_INV_ARY[] = +{ + NC_("SC_OPCODE_NORM_INV", "Values of the inverse normal distribution."), + NC_("SC_OPCODE_NORM_INV", "number"), + NC_("SC_OPCODE_NORM_INV", "The probability value for which the inverse normal distribution is to be calculated."), + NC_("SC_OPCODE_NORM_INV", "mean"), + NC_("SC_OPCODE_NORM_INV", "The mean value. The mean value of the normal distribution."), + NC_("SC_OPCODE_NORM_INV", "STDEV"), + NC_("SC_OPCODE_NORM_INV", "Standard deviation. The standard deviation of the normal distribution.") +}; + +// -=*# Resource for function NORM.INV #*=- +const char* SC_OPCODE_NORM_INV_MS_ARY[] = +{ + NC_("SC_OPCODE_NORM_INV_MS", "Values of the inverse normal distribution."), + NC_("SC_OPCODE_NORM_INV_MS", "number"), + NC_("SC_OPCODE_NORM_INV_MS", "The probability value for which the inverse normal distribution is to be calculated."), + NC_("SC_OPCODE_NORM_INV_MS", "mean"), + NC_("SC_OPCODE_NORM_INV_MS", "The mean value. The mean value of the normal distribution."), + NC_("SC_OPCODE_NORM_INV_MS", "STDEV"), + NC_("SC_OPCODE_NORM_INV_MS", "Standard deviation. The standard deviation of the normal distribution.") +}; + +// -=*# Resource for function NORMSDIST #*=- +const char* SC_OPCODE_STD_NORM_DIST_ARY[] = +{ + NC_("SC_OPCODE_STD_NORM_DIST", "The values of the standard normal cumulative distribution."), + NC_("SC_OPCODE_STD_NORM_DIST", "Number"), + NC_("SC_OPCODE_STD_NORM_DIST", "The value for which the standard normal distribution is to be calculated.") +}; + +// -=*# Resource for function NORM.S.DIST #*=- +const char* SC_OPCODE_STD_NORM_DIST_MS_ARY[] = +{ + NC_("SC_OPCODE_STD_NORM_DIST_MS", "The values of the standard normal distribution."), + NC_("SC_OPCODE_STD_NORM_DIST_MS", "Number"), + NC_("SC_OPCODE_STD_NORM_DIST_MS", "The value for which the standard normal distribution is to be calculated."), + NC_("SC_OPCODE_STD_NORM_DIST_MS", "Cumulative"), + NC_("SC_OPCODE_STD_NORM_DIST_MS", "0 or FALSE calculates the probability density function. Any other value or TRUE calculates the cumulative distribution function.") +}; + +// -=*# Resource for function NORMSINV #*=- +const char* SC_OPCODE_S_NORM_INV_ARY[] = +{ + NC_("SC_OPCODE_S_NORM_INV", "Values of the inverse standard normal distribution."), + NC_("SC_OPCODE_S_NORM_INV", "number"), + NC_("SC_OPCODE_S_NORM_INV", "The probability value for which the inverse standard normal distribution is to be calculated.") +}; + +// -=*# Resource for function NORM.S.INV #*=- +const char* SC_OPCODE_S_NORM_INV_MS_ARY[] = +{ + NC_("SC_OPCODE_S_NORM_INV_MS", "Values of the inverse standard normal distribution."), + NC_("SC_OPCODE_S_NORM_INV_MS", "number"), + NC_("SC_OPCODE_S_NORM_INV_MS", "The probability value for which the inverse standard normal distribution is to be calculated.") +}; + +// -=*# Resource for function LOGNORMDIST #*=- +const char* SC_OPCODE_LOG_NORM_DIST_ARY[] = +{ + NC_("SC_OPCODE_LOG_NORM_DIST", "Values of the log normal distribution."), + NC_("SC_OPCODE_LOG_NORM_DIST", "Number"), + NC_("SC_OPCODE_LOG_NORM_DIST", "The value for which the log normal distribution is to be calculated."), + NC_("SC_OPCODE_LOG_NORM_DIST", "mean"), + NC_("SC_OPCODE_LOG_NORM_DIST", "The mean value of the log normal distribution. It is set to 0 if omitted."), + NC_("SC_OPCODE_LOG_NORM_DIST", "STDEV"), + NC_("SC_OPCODE_LOG_NORM_DIST", "The standard deviation of the log normal distribution. It is set to 1 if omitted."), + NC_("SC_OPCODE_LOG_NORM_DIST", "Cumulative"), + NC_("SC_OPCODE_LOG_NORM_DIST", "0 or FALSE calculates the probability density function. Any other value or TRUE or omitted calculates the cumulative distribution function.") +}; + +// -=*# Resource for function LOGNORM.DIST #*=- +const char* SC_OPCODE_LOG_NORM_DIST_MS_ARY[] = +{ + NC_("SC_OPCODE_LOG_NORM_DIST_MS", "Values of the log normal distribution."), + NC_("SC_OPCODE_LOG_NORM_DIST_MS", "Number"), + NC_("SC_OPCODE_LOG_NORM_DIST_MS", "The value for which the log normal distribution is to be calculated."), + NC_("SC_OPCODE_LOG_NORM_DIST_MS", "mean"), + NC_("SC_OPCODE_LOG_NORM_DIST_MS", "The mean value of the log normal distribution."), + NC_("SC_OPCODE_LOG_NORM_DIST_MS", "STDEV"), + NC_("SC_OPCODE_LOG_NORM_DIST_MS", "The standard deviation of the log normal distribution."), + NC_("SC_OPCODE_LOG_NORM_DIST_MS", "Cumulative"), + NC_("SC_OPCODE_LOG_NORM_DIST_MS", "0 or FALSE calculates the probability density function. Any other value or TRUE calculates the cumulative distribution function.") +}; + +// -=*# Resource for function LOGINV #*=- +const char* SC_OPCODE_LOG_INV_ARY[] = +{ + NC_("SC_OPCODE_LOG_INV", "Values of the inverse of the lognormal distribution."), + NC_("SC_OPCODE_LOG_INV", "number"), + NC_("SC_OPCODE_LOG_INV", "The probability value for which the inverse log normal distribution is to be calculated."), + NC_("SC_OPCODE_LOG_INV", "mean"), + NC_("SC_OPCODE_LOG_INV", "Mean value. The mean value of the log normal distribution."), + NC_("SC_OPCODE_LOG_INV", "STDEV"), + NC_("SC_OPCODE_LOG_INV", "Standard deviation. The standard deviation of the log normal distribution.") +}; + +// -=*# Resource for function LOGNORM.INV #*=- +const char* SC_OPCODE_LOG_INV_MS_ARY[] = +{ + NC_("SC_OPCODE_LOG_INV_MS", "Values of the inverse of the lognormal distribution."), + NC_("SC_OPCODE_LOG_INV_MS", "number"), + NC_("SC_OPCODE_LOG_INV_MS", "The probability value for which the inverse log normal distribution is to be calculated."), + NC_("SC_OPCODE_LOG_INV_MS", "mean"), + NC_("SC_OPCODE_LOG_INV_MS", "Mean value. The mean value of the log normal distribution."), + NC_("SC_OPCODE_LOG_INV_MS", "STDEV"), + NC_("SC_OPCODE_LOG_INV_MS", "Standard deviation. The standard deviation of the log normal distribution.") +}; + +// -=*# Resource for function EXPONDIST #*=- +const char* SC_OPCODE_EXP_DIST_ARY[] = +{ + NC_("SC_OPCODE_EXP_DIST", "Values of the exponential distribution."), + NC_("SC_OPCODE_EXP_DIST", "Number"), + NC_("SC_OPCODE_EXP_DIST", "The value to which the exponential distribution is to be calculated."), + NC_("SC_OPCODE_EXP_DIST", "lambda"), + NC_("SC_OPCODE_EXP_DIST", "The parameters of the exponential distribution."), + NC_("SC_OPCODE_EXP_DIST", "C"), + NC_("SC_OPCODE_EXP_DIST", "Cumulated. C=0 calculates the density function, C=1 the distribution.") +}; + +// -=*# Resource for function EXPON.DIST #*=- +const char* SC_OPCODE_EXP_DIST_MS_ARY[] = +{ + NC_("SC_OPCODE_EXP_DIST_MS", "Values of the exponential distribution."), + NC_("SC_OPCODE_EXP_DIST_MS", "Number"), + NC_("SC_OPCODE_EXP_DIST_MS", "The value to which the exponential distribution is to be calculated."), + NC_("SC_OPCODE_EXP_DIST_MS", "lambda"), + NC_("SC_OPCODE_EXP_DIST_MS", "The parameters of the exponential distribution."), + NC_("SC_OPCODE_EXP_DIST_MS", "C"), + NC_("SC_OPCODE_EXP_DIST_MS", "Cumulated. C=0 calculates the density function, C=1 the distribution.") +}; + +// -=*# Resource for function GAMMADIST #*=- +const char* SC_OPCODE_GAMMA_DIST_ARY[] = +{ + NC_("SC_OPCODE_GAMMA_DIST", "Returns the value of the probability density function or the cumulative distribution function for the Gamma distribution."), + NC_("SC_OPCODE_GAMMA_DIST", "Number"), + NC_("SC_OPCODE_GAMMA_DIST", "The value for which the gamma distribution is to be calculated."), + NC_("SC_OPCODE_GAMMA_DIST", "alpha"), + NC_("SC_OPCODE_GAMMA_DIST", "The Alpha parameter of the Gamma distribution."), + NC_("SC_OPCODE_GAMMA_DIST", "beta"), + NC_("SC_OPCODE_GAMMA_DIST", "The Beta parameter of the Gamma distribution."), + NC_("SC_OPCODE_GAMMA_DIST", "Cumulative"), + NC_("SC_OPCODE_GAMMA_DIST", "0 or FALSE calculates the probability density function. Any other value or TRUE or omitted calculates the cumulative distribution function.") +}; + +// -=*# Resource for function GAMMA.DIST #*=- +const char* SC_OPCODE_GAMMA_DIST_MS_ARY[] = +{ + NC_("SC_OPCODE_GAMMA_DIST_MS", "Returns the value of the probability density function or the cumulative distribution function for the Gamma distribution."), + NC_("SC_OPCODE_GAMMA_DIST_MS", "Number"), + NC_("SC_OPCODE_GAMMA_DIST_MS", "The value for which the gamma distribution is to be calculated."), + NC_("SC_OPCODE_GAMMA_DIST_MS", "alpha"), + NC_("SC_OPCODE_GAMMA_DIST_MS", "The Alpha parameter of the Gamma distribution."), + NC_("SC_OPCODE_GAMMA_DIST_MS", "beta"), + NC_("SC_OPCODE_GAMMA_DIST_MS", "The Beta parameter of the Gamma distribution."), + NC_("SC_OPCODE_GAMMA_DIST_MS", "Cumulative"), + NC_("SC_OPCODE_GAMMA_DIST_MS", "0 or FALSE calculates the probability density function. Any other value or TRUE calculates the cumulative distribution function.") +}; + +// -=*# Resource for function GAMMAINV #*=- +const char* SC_OPCODE_GAMMA_INV_ARY[] = +{ + NC_("SC_OPCODE_GAMMA_INV", "Values of the inverse gamma distribution."), + NC_("SC_OPCODE_GAMMA_INV", "Number"), + NC_("SC_OPCODE_GAMMA_INV", "The probability value for which the inverse gamma distribution is to be calculated."), + NC_("SC_OPCODE_GAMMA_INV", "alpha"), + NC_("SC_OPCODE_GAMMA_INV", "The Alpha (shape) parameter of the Gamma distribution."), + NC_("SC_OPCODE_GAMMA_INV", "beta"), + NC_("SC_OPCODE_GAMMA_INV", "The Beta (scale) parameter of the Gamma distribution.") +}; + +// -=*# Resource for function GAMMA.INV #*=- +const char* SC_OPCODE_GAMMA_INV_MS_ARY[] = +{ + NC_("SC_OPCODE_GAMMA_INV_MS", "Values of the inverse gamma distribution."), + NC_("SC_OPCODE_GAMMA_INV_MS", "Number"), + NC_("SC_OPCODE_GAMMA_INV_MS", "The probability value for which the inverse gamma distribution is to be calculated."), + NC_("SC_OPCODE_GAMMA_INV_MS", "alpha"), + NC_("SC_OPCODE_GAMMA_INV_MS", "The Alpha (shape) parameter of the Gamma distribution."), + NC_("SC_OPCODE_GAMMA_INV_MS", "beta"), + NC_("SC_OPCODE_GAMMA_INV_MS", "The Beta (scale) parameter of the Gamma distribution.") +}; + +// -=*# Resource for function GAMMALN #*=- +const char* SC_OPCODE_GAMMA_LN_ARY[] = +{ + NC_("SC_OPCODE_GAMMA_LN", "Returns the natural logarithm of the gamma function."), + NC_("SC_OPCODE_GAMMA_LN", "Number"), + NC_("SC_OPCODE_GAMMA_LN", "The value for which the natural logarithm of the gamma function is to be calculated.") +}; + +// -=*# Resource for function GAMMALN.PRECISE #*=- +const char* SC_OPCODE_GAMMA_LN_MS_ARY[] = +{ + NC_("SC_OPCODE_GAMMA_LN_MS", "Returns the natural logarithm of the gamma function."), + NC_("SC_OPCODE_GAMMA_LN_MS", "Number"), + NC_("SC_OPCODE_GAMMA_LN_MS", "The value for which the natural logarithm of the gamma function is to be calculated.") +}; + + +// -=*# Resource for function GAMMA #*=- +const char* SC_OPCODE_GAMMA_ARY[] = +{ + NC_("SC_OPCODE_GAMMA", "Returns the value of the Gamma function."), + NC_("SC_OPCODE_GAMMA", "Number"), + NC_("SC_OPCODE_GAMMA", "The value for which the Gamma function is to be calculated.") +}; + + +// -=*# Resource for function BETADIST #*=- +const char* SC_OPCODE_BETA_DIST_ARY[] = +{ + NC_("SC_OPCODE_BETA_DIST", "Values of the beta distribution."), + NC_("SC_OPCODE_BETA_DIST", "number"), + NC_("SC_OPCODE_BETA_DIST", "The value for which the beta distribution is to be calculated."), + NC_("SC_OPCODE_BETA_DIST", "alpha"), + NC_("SC_OPCODE_BETA_DIST", "The Alpha parameter of the Beta distribution."), + NC_("SC_OPCODE_BETA_DIST", "beta"), + NC_("SC_OPCODE_BETA_DIST", "The Beta parameter of the Beta distribution."), + NC_("SC_OPCODE_BETA_DIST", "Start"), + NC_("SC_OPCODE_BETA_DIST", "The starting value for the value interval of the distribution."), + NC_("SC_OPCODE_BETA_DIST", "End"), + NC_("SC_OPCODE_BETA_DIST", "The final value for the value interval of the distribution."), + NC_("SC_OPCODE_BETA_DIST", "Cumulative"), + NC_("SC_OPCODE_BETA_DIST", "0 or FALSE for probability density function, any other value or TRUE or omitted for cumulative distribution function.") +}; + +// -=*# Resource for function BETAINV #*=- +const char* SC_OPCODE_BETA_INV_ARY[] = +{ + NC_("SC_OPCODE_BETA_INV", "Values of the inverse beta distribution."), + NC_("SC_OPCODE_BETA_INV", "number"), + NC_("SC_OPCODE_BETA_INV", "The probability value for which the inverse beta distribution is to be calculated."), + NC_("SC_OPCODE_BETA_INV", "alpha"), + NC_("SC_OPCODE_BETA_INV", "The Alpha parameter of the Beta distribution."), + NC_("SC_OPCODE_BETA_INV", "beta"), + NC_("SC_OPCODE_BETA_INV", "The Beta parameter of the Beta distribution."), + NC_("SC_OPCODE_BETA_INV", "Start"), + NC_("SC_OPCODE_BETA_INV", "The starting value for the value interval of the distribution."), + NC_("SC_OPCODE_BETA_INV", "End"), + NC_("SC_OPCODE_BETA_INV", "The final value for the value interval of the distribution.") +}; + +// -=*# Resource for function BETA.DIST #*=- +const char* SC_OPCODE_BETA_DIST_MS_ARY[] = +{ + NC_("SC_OPCODE_BETA_DIST_MS", "Values of the beta distribution."), + NC_("SC_OPCODE_BETA_DIST_MS", "number"), + NC_("SC_OPCODE_BETA_DIST_MS", "The value for which the beta distribution is to be calculated."), + NC_("SC_OPCODE_BETA_DIST_MS", "alpha"), + NC_("SC_OPCODE_BETA_DIST_MS", "The Alpha parameter of the Beta distribution."), + NC_("SC_OPCODE_BETA_DIST_MS", "beta"), + NC_("SC_OPCODE_BETA_DIST_MS", "The Beta parameter of the Beta distribution."), + NC_("SC_OPCODE_BETA_DIST_MS", "Cumulative"), + NC_("SC_OPCODE_BETA_DIST_MS", "0 or FALSE for probability density function, any other value or TRUE or omitted for cumulative distribution function."), + NC_("SC_OPCODE_BETA_DIST_MS", "Start"), + NC_("SC_OPCODE_BETA_DIST_MS", "The starting value for the value interval of the distribution."), + NC_("SC_OPCODE_BETA_DIST_MS", "End"), + NC_("SC_OPCODE_BETA_DIST_MS", "The final value for the value interval of the distribution.") +}; + +// -=*# Resource for function BETA.INV #*=- +const char* SC_OPCODE_BETA_INV_MS_ARY[] = +{ + NC_("SC_OPCODE_BETA_INV_MS", "Values of the inverse beta distribution."), + NC_("SC_OPCODE_BETA_INV_MS", "number"), + NC_("SC_OPCODE_BETA_INV_MS", "The probability value for which the inverse beta distribution is to be calculated."), + NC_("SC_OPCODE_BETA_INV_MS", "alpha"), + NC_("SC_OPCODE_BETA_INV_MS", "The Alpha parameter of the Beta distribution."), + NC_("SC_OPCODE_BETA_INV_MS", "beta"), + NC_("SC_OPCODE_BETA_INV_MS", "The Beta parameter of the Beta distribution."), + NC_("SC_OPCODE_BETA_INV_MS", "Start"), + NC_("SC_OPCODE_BETA_INV_MS", "The starting value for the value interval of the distribution."), + NC_("SC_OPCODE_BETA_INV_MS", "End"), + NC_("SC_OPCODE_BETA_INV_MS", "The final value for the value interval of the distribution.") +}; + +// -=*# Resource for function WEIBULL #*=- +const char* SC_OPCODE_WEIBULL_ARY[] = +{ + NC_("SC_OPCODE_WEIBULL", "Returns the values of the Weibull distribution."), + NC_("SC_OPCODE_WEIBULL", "Number"), + NC_("SC_OPCODE_WEIBULL", "The value for which the Weibull distribution is to be calculated."), + NC_("SC_OPCODE_WEIBULL", "Alpha"), + NC_("SC_OPCODE_WEIBULL", "The Alpha parameter of the Weibull distribution."), + NC_("SC_OPCODE_WEIBULL", "beta"), + NC_("SC_OPCODE_WEIBULL", "The Beta parameter of the Weibull distribution."), + NC_("SC_OPCODE_WEIBULL", "C"), + NC_("SC_OPCODE_WEIBULL", "Cumulated. C=0 calculates the density function, C=1 the distribution.") +}; + +// -=*# Resource for function WEIBULL.DIST #*=- +const char* SC_OPCODE_WEIBULL_MS_ARY[] = +{ + NC_("SC_OPCODE_WEIBULL_MS", "Returns the values of the Weibull distribution."), + NC_("SC_OPCODE_WEIBULL_MS", "Number"), + NC_("SC_OPCODE_WEIBULL_MS", "The value for which the Weibull distribution is to be calculated."), + NC_("SC_OPCODE_WEIBULL_MS", "Alpha"), + NC_("SC_OPCODE_WEIBULL_MS", "The Alpha parameter of the Weibull distribution."), + NC_("SC_OPCODE_WEIBULL_MS", "beta"), + NC_("SC_OPCODE_WEIBULL_MS", "The Beta parameter of the Weibull distribution."), + NC_("SC_OPCODE_WEIBULL_MS", "C"), + NC_("SC_OPCODE_WEIBULL_MS", "Cumulated. C=0 calculates the density function, C=1 the distribution.") +}; + +// -=*# Resource for function HYPGEOMDIST #*=- +const char* SC_OPCODE_HYP_GEOM_DIST_ARY[] = +{ + NC_("SC_OPCODE_HYP_GEOM_DIST", "Values of the hypergeometric distribution."), + NC_("SC_OPCODE_HYP_GEOM_DIST", "X"), + NC_("SC_OPCODE_HYP_GEOM_DIST", "The number of successes in the sample."), + NC_("SC_OPCODE_HYP_GEOM_DIST", "n_sample"), + NC_("SC_OPCODE_HYP_GEOM_DIST", "The size of the sample."), + NC_("SC_OPCODE_HYP_GEOM_DIST", "successes"), + NC_("SC_OPCODE_HYP_GEOM_DIST", "The number of successes in the population."), + NC_("SC_OPCODE_HYP_GEOM_DIST", "n_population"), + NC_("SC_OPCODE_HYP_GEOM_DIST", "The population size."), + NC_("SC_OPCODE_HYP_GEOM_DIST", "Cumulative"), + NC_("SC_OPCODE_HYP_GEOM_DIST", "Cumulated. TRUE calculates the cumulative distribution function, FALSE the probability mass function.") +}; + +// -=*# Resource for function HYPGEOM.DIST #*=- +const char* SC_OPCODE_HYP_GEOM_DIST_MS_ARY[] = +{ + NC_("SC_OPCODE_HYP_GEOM_DIST_MS", "Values of the hypergeometric distribution."), + NC_("SC_OPCODE_HYP_GEOM_DIST_MS", "X"), + NC_("SC_OPCODE_HYP_GEOM_DIST_MS", "The number of successes in the sample."), + NC_("SC_OPCODE_HYP_GEOM_DIST_MS", "n_sample"), + NC_("SC_OPCODE_HYP_GEOM_DIST_MS", "The size of the sample."), + NC_("SC_OPCODE_HYP_GEOM_DIST_MS", "successes"), + NC_("SC_OPCODE_HYP_GEOM_DIST_MS", "The number of successes in the population."), + NC_("SC_OPCODE_HYP_GEOM_DIST_MS", "n_population"), + NC_("SC_OPCODE_HYP_GEOM_DIST_MS", "The population size."), + NC_("SC_OPCODE_HYP_GEOM_DIST_MS", "Cumulative"), + NC_("SC_OPCODE_HYP_GEOM_DIST_MS", "Cumulated. TRUE calculates the cumulative distribution function, FALSE the probability mass function.") +}; + +// -=*# Resource for function TDIST #*=- +const char* SC_OPCODE_T_DIST_ARY[] = +{ + NC_("SC_OPCODE_T_DIST", "Returns the t-distribution."), + NC_("SC_OPCODE_T_DIST", "Number"), + NC_("SC_OPCODE_T_DIST", "The value for which the T distribution is to be calculated."), + NC_("SC_OPCODE_T_DIST", "degrees_freedom"), + NC_("SC_OPCODE_T_DIST", "The degrees of freedom of the T distribution."), + NC_("SC_OPCODE_T_DIST", "mode"), + NC_("SC_OPCODE_T_DIST", "Mode = 1 calculates the one-tailed test, 2 = two-tailed distribution.") +}; + +// -=*# Resource for function T.DIST.2T #*=- +const char* SC_OPCODE_T_DIST_2T_ARY[] = +{ + NC_("SC_OPCODE_T_DIST_2T", "Returns the two-tailed t-distribution."), + NC_("SC_OPCODE_T_DIST_2T", "Number"), + NC_("SC_OPCODE_T_DIST_2T", "The value for which the T distribution is to be calculated."), + NC_("SC_OPCODE_T_DIST_2T", "degrees_freedom"), + NC_("SC_OPCODE_T_DIST_2T", "The degrees of freedom of the T distribution.") +}; + +// -=*# Resource for function T.DIST #*=- +const char* SC_OPCODE_T_DIST_MS_ARY[] = +{ + NC_("SC_OPCODE_T_DIST_MS", "Returns the t-distribution."), + NC_("SC_OPCODE_T_DIST_MS", "Number"), + NC_("SC_OPCODE_T_DIST_MS", "The value for which the T distribution is to be calculated."), + NC_("SC_OPCODE_T_DIST_MS", "degrees_freedom"), + NC_("SC_OPCODE_T_DIST_MS", "The degrees of freedom of the T distribution."), + NC_("SC_OPCODE_T_DIST_MS", "cumulative"), + NC_("SC_OPCODE_T_DIST_MS", "True calculates the cumulative distribution function, false the probability density function.") +}; + +// -=*# Resource for function T.DIST.RT #*=- +const char* SC_OPCODE_T_DIST_RT_ARY[] = +{ + NC_("SC_OPCODE_T_DIST_RT", "Returns the right-tailed t-distribution."), + NC_("SC_OPCODE_T_DIST_RT", "Number"), + NC_("SC_OPCODE_T_DIST_RT", "The value for which the T distribution is to be calculated."), + NC_("SC_OPCODE_T_DIST_RT", "degrees_freedom"), + NC_("SC_OPCODE_T_DIST_RT", "The degrees of freedom of the T distribution.") +}; + +// -=*# Resource for function TINV #*=- +const char* SC_OPCODE_T_INV_ARY[] = +{ + NC_("SC_OPCODE_T_INV", "Values of the inverse t-distribution."), + NC_("SC_OPCODE_T_INV", "number"), + NC_("SC_OPCODE_T_INV", "The probability value for which the inverse T distribution is to be calculated."), + NC_("SC_OPCODE_T_INV", "degrees_freedom"), + NC_("SC_OPCODE_T_INV", "The degrees of freedom of the T distribution.") +}; + +// -=*# Resource for function T.INV #*=- +const char* SC_OPCODE_T_INV_MS_ARY[] = +{ + NC_("SC_OPCODE_T_INV_MS", "Values of the left-tailed inverse t-distribution."), + NC_("SC_OPCODE_T_INV_MS", "number"), + NC_("SC_OPCODE_T_INV_MS", "The probability value for which the inverse T distribution is to be calculated."), + NC_("SC_OPCODE_T_INV_MS", "degrees_freedom"), + NC_("SC_OPCODE_T_INV_MS", "The degrees of freedom of the T distribution.") +}; + +// -=*# Resource for function T.INV.2T #*=- +const char* SC_OPCODE_T_INV_2T_ARY[] = +{ + NC_("SC_OPCODE_T_INV_2T", "Values of the two-tailed inverse t-distribution."), + NC_("SC_OPCODE_T_INV_2T", "number"), + NC_("SC_OPCODE_T_INV_2T", "The probability value for which the inverse T distribution is to be calculated."), + NC_("SC_OPCODE_T_INV_2T", "degrees_freedom"), + NC_("SC_OPCODE_T_INV_2T", "The degrees of freedom of the T distribution.") +}; + +// -=*# Resource for function FDIST #*=- +const char* SC_OPCODE_F_DIST_ARY[] = +{ + NC_("SC_OPCODE_F_DIST", "Values of the F probability distribution."), + NC_("SC_OPCODE_F_DIST", "Number"), + NC_("SC_OPCODE_F_DIST", "The value for which the F distribution is to be calculated."), + NC_("SC_OPCODE_F_DIST", "degrees_freedom_1"), + NC_("SC_OPCODE_F_DIST", "The degrees of freedom in the numerator of the F distribution."), + NC_("SC_OPCODE_F_DIST", "degrees_freedom_2"), + NC_("SC_OPCODE_F_DIST", "The degrees of freedom in the denominator of the F distribution.") +}; + +// -=*# Resource for function F.DIST #*=- +const char* SC_OPCODE_F_DIST_LT_ARY[] = +{ + NC_("SC_OPCODE_F_DIST_LT", "Values of the left tail F probability distribution."), + NC_("SC_OPCODE_F_DIST_LT", "Number"), + NC_("SC_OPCODE_F_DIST_LT", "The value for which the F distribution is to be calculated."), + NC_("SC_OPCODE_F_DIST_LT", "degrees_freedom_1"), + NC_("SC_OPCODE_F_DIST_LT", "The degrees of freedom in the numerator of the F distribution."), + NC_("SC_OPCODE_F_DIST_LT", "degrees_freedom_2"), + NC_("SC_OPCODE_F_DIST_LT", "The degrees of freedom in the denominator of the F distribution."), + NC_("SC_OPCODE_F_DIST_LT", "cumulative"), + NC_("SC_OPCODE_F_DIST_LT", "Cumulative distribution function (TRUE) or probability density function (FALSE).") +}; + +// -=*# Resource for function F.DIST.RT #*=- +const char* SC_OPCODE_F_DIST_RT_ARY[] = +{ + NC_("SC_OPCODE_F_DIST_RT", "Values of the right tail F probability distribution."), + NC_("SC_OPCODE_F_DIST_RT", "Number"), + NC_("SC_OPCODE_F_DIST_RT", "The value for which the F distribution is to be calculated."), + NC_("SC_OPCODE_F_DIST_RT", "degrees_freedom_1"), + NC_("SC_OPCODE_F_DIST_RT", "The degrees of freedom in the numerator of the F distribution."), + NC_("SC_OPCODE_F_DIST_RT", "degrees_freedom_2"), + NC_("SC_OPCODE_F_DIST_RT", "The degrees of freedom in the denominator of the F distribution.") +}; + +// -=*# Resource for function FINV #*=- +const char* SC_OPCODE_F_INV_ARY[] = +{ + NC_("SC_OPCODE_F_INV", "Values of the inverse F distribution."), + NC_("SC_OPCODE_F_INV", "number"), + NC_("SC_OPCODE_F_INV", "The probability value for which the inverse F distribution is to be calculated."), + NC_("SC_OPCODE_F_INV", "degrees_freedom_1"), + NC_("SC_OPCODE_F_INV", "The degrees of freedom in the numerator of the F distribution."), + NC_("SC_OPCODE_F_INV", "degrees_freedom_2"), + NC_("SC_OPCODE_F_INV", "The degrees of freedom in the denominator of the F distribution.") +}; + +// -=*# Resource for function F.INV #*=- +const char* SC_OPCODE_F_INV_LT_ARY[] = +{ + NC_("SC_OPCODE_F_INV_LT", "Values of the inverse left tail F distribution."), + NC_("SC_OPCODE_F_INV_LT", "number"), + NC_("SC_OPCODE_F_INV_LT", "The probability value for which the inverse F distribution is to be calculated."), + NC_("SC_OPCODE_F_INV_LT", "degrees_freedom_1"), + NC_("SC_OPCODE_F_INV_LT", "The degrees of freedom in the numerator of the F distribution."), + NC_("SC_OPCODE_F_INV_LT", "degrees_freedom_2"), + NC_("SC_OPCODE_F_INV_LT", "The degrees of freedom in the denominator of the F distribution.") +}; + +// -=*# Resource for function F.INV.RT #*=- +const char* SC_OPCODE_F_INV_RT_ARY[] = +{ + NC_("SC_OPCODE_F_INV_RT", "Values of the inverse right tail F distribution."), + NC_("SC_OPCODE_F_INV_RT", "number"), + NC_("SC_OPCODE_F_INV_RT", "The probability value for which the inverse F distribution is to be calculated."), + NC_("SC_OPCODE_F_INV_RT", "degrees_freedom_1"), + NC_("SC_OPCODE_F_INV_RT", "The degrees of freedom in the numerator of the F distribution."), + NC_("SC_OPCODE_F_INV_RT", "degrees_freedom_2"), + NC_("SC_OPCODE_F_INV_RT", "The degrees of freedom in the denominator of the F distribution.") +}; + +// -=*# Resource for function CHIDIST #*=- +const char* SC_OPCODE_CHI_DIST_ARY[] = +{ + NC_("SC_OPCODE_CHI_DIST", "Returns the right-tail probability of the chi-square distribution."), + NC_("SC_OPCODE_CHI_DIST", "Number"), + NC_("SC_OPCODE_CHI_DIST", "The value for which the chi square distribution is to be calculated."), + NC_("SC_OPCODE_CHI_DIST", "degrees_freedom"), + NC_("SC_OPCODE_CHI_DIST", "The degrees of freedom of the chi square distribution.") +}; + +// -=*# Resource for function CHISQ.DIST.RT #*=- +const char* SC_OPCODE_CHI_DIST_MS_ARY[] = +{ + NC_("SC_OPCODE_CHI_DIST_MS", "Returns the right-tail probability of the chi-square distribution."), + NC_("SC_OPCODE_CHI_DIST_MS", "Number"), + NC_("SC_OPCODE_CHI_DIST_MS", "The value for which the chi square distribution is to be calculated."), + NC_("SC_OPCODE_CHI_DIST_MS", "degrees_freedom"), + NC_("SC_OPCODE_CHI_DIST_MS", "The degrees of freedom of the chi square distribution.") +}; + + +// -=*# Resource for function CHISQDIST #*=- +const char* SC_OPCODE_CHISQ_DIST_ARY[] = +{ + NC_("SC_OPCODE_CHISQ_DIST", "Returns left-tail probability of the cumulative distribution function or values of the probability density function of the chi-square distribution."), + NC_("SC_OPCODE_CHISQ_DIST", "Number"), + NC_("SC_OPCODE_CHISQ_DIST", "The value for which the probability density function or cumulative distribution function is to be calculated."), + NC_("SC_OPCODE_CHISQ_DIST", "Degrees of Freedom"), + NC_("SC_OPCODE_CHISQ_DIST", "The degrees of freedom of the chi-square distribution."), + NC_("SC_OPCODE_CHISQ_DIST", "Cumulative"), + NC_("SC_OPCODE_CHISQ_DIST", "0 or FALSE calculates the probability density function. Any other value or TRUE or omitted calculates the cumulative distribution function.") +}; + + +// -=*# Resource for function CHISQ.DIST #*=- +const char* SC_OPCODE_CHISQ_DIST_MS_ARY[] = +{ + NC_("SC_OPCODE_CHISQ_DIST_MS", "Returns left-tail probability of the cumulative distribution function or values of the probability density function of the chi-square distribution."), + NC_("SC_OPCODE_CHISQ_DIST_MS", "Number"), + NC_("SC_OPCODE_CHISQ_DIST_MS", "The value for which the probability density function or cumulative distribution function is to be calculated."), + NC_("SC_OPCODE_CHISQ_DIST_MS", "Degrees of Freedom"), + NC_("SC_OPCODE_CHISQ_DIST_MS", "The degrees of freedom of the chi-square distribution."), + NC_("SC_OPCODE_CHISQ_DIST_MS", "Cumulative"), + NC_("SC_OPCODE_CHISQ_DIST_MS", "0 or FALSE calculates the probability density function. Any other value or TRUE calculates the cumulative distribution function.") +}; + + +// -=*# Resource for function CHIINV #*=- +const char* SC_OPCODE_CHI_INV_ARY[] = +{ + NC_("SC_OPCODE_CHI_INV", "Values of the inverse of CHIDIST(x; DegreesOfFreedom)."), + NC_("SC_OPCODE_CHI_INV", "number"), + NC_("SC_OPCODE_CHI_INV", "The probability value for which the inverse chi square distribution is to be calculated."), + NC_("SC_OPCODE_CHI_INV", "degrees_freedom"), + NC_("SC_OPCODE_CHI_INV", "The degrees of freedom of the chi square distribution.") +}; + + +// -=*# Resource for function CHISQ.INV.RT #*=- +const char* SC_OPCODE_CHI_INV_MS_ARY[] = +{ + NC_("SC_OPCODE_CHI_INV_MS", "Values of the inverse of CHIDIST(x; DegreesOfFreedom)."), + NC_("SC_OPCODE_CHI_INV_MS", "number"), + NC_("SC_OPCODE_CHI_INV_MS", "The probability value for which the inverse chi square distribution is to be calculated."), + NC_("SC_OPCODE_CHI_INV_MS", "degrees_freedom"), + NC_("SC_OPCODE_CHI_INV_MS", "The degrees of freedom of the chi square distribution.") +}; + + +// -=*# Resource for function CHISQINV #*=- +const char* SC_OPCODE_CHISQ_INV_ARY[] = +{ + NC_("SC_OPCODE_CHISQ_INV", "Values of the inverse of CHISQDIST(x;DegreesOfFreedom;TRUE())."), + NC_("SC_OPCODE_CHISQ_INV", "Probability"), + NC_("SC_OPCODE_CHISQ_INV", "The probability value for which the inverse of the chi square distribution is to be calculated."), + NC_("SC_OPCODE_CHISQ_INV", "Degrees of Freedom"), + NC_("SC_OPCODE_CHISQ_INV", "The degrees of freedom of the chi square distribution.") +}; + + +// -=*# Resource for function CHISQ.INV #*=- +const char* SC_OPCODE_CHISQ_INV_MS_ARY[] = +{ + NC_("SC_OPCODE_CHISQ_INV_MS", "Values of the inverse of CHISQ.DIST(x;DegreesOfFreedom;TRUE())."), + NC_("SC_OPCODE_CHISQ_INV_MS", "Probability"), + NC_("SC_OPCODE_CHISQ_INV_MS", "The probability value for which the inverse of the chi square distribution is to be calculated."), + NC_("SC_OPCODE_CHISQ_INV_MS", "Degrees of Freedom"), + NC_("SC_OPCODE_CHISQ_INV_MS", "The degrees of freedom of the chi square distribution.") +}; + + +// -=*# Resource for function STANDARDIZE #*=- +const char* SC_OPCODE_STANDARD_ARY[] = +{ + NC_("SC_OPCODE_STANDARD", "Converts a random variable to a normalized value."), + NC_("SC_OPCODE_STANDARD", "Number"), + NC_("SC_OPCODE_STANDARD", "The value to be standardized."), + NC_("SC_OPCODE_STANDARD", "mean"), + NC_("SC_OPCODE_STANDARD", "The mean value used for moving."), + NC_("SC_OPCODE_STANDARD", "STDEV"), + NC_("SC_OPCODE_STANDARD", "The standard deviation used for scaling.") +}; + +// -=*# Resource for function PERMUT #*=- +const char* SC_OPCODE_PERMUT_ARY[] = +{ + NC_("SC_OPCODE_PERMUT", "Returns the number of permutations for a given number of elements without repetition."), + NC_("SC_OPCODE_PERMUT", "Count_1"), + NC_("SC_OPCODE_PERMUT", "The total number of elements."), + NC_("SC_OPCODE_PERMUT", "Count_2"), + NC_("SC_OPCODE_PERMUT", "The selection number taken from the elements.") +}; + +// -=*# Resource for function PERMUTATIONA #*=- +const char* SC_OPCODE_PERMUTATION_A_ARY[] = +{ + NC_("SC_OPCODE_PERMUTATION_A", "Returns the number of permutations for a given number of objects (repetition allowed)."), + NC_("SC_OPCODE_PERMUTATION_A", "Count_1"), + NC_("SC_OPCODE_PERMUTATION_A", "The total number of elements."), + NC_("SC_OPCODE_PERMUTATION_A", "Count_2"), + NC_("SC_OPCODE_PERMUTATION_A", "The selection number taken from the elements.") +}; + +// -=*# Resource for function CONFIDENCE #*=- +const char* SC_OPCODE_CONFIDENCE_ARY[] = +{ + NC_("SC_OPCODE_CONFIDENCE", "Returns a (1-alpha) confidence interval for a normal distribution."), + NC_("SC_OPCODE_CONFIDENCE", "alpha"), + NC_("SC_OPCODE_CONFIDENCE", "The level of the confidence interval."), + NC_("SC_OPCODE_CONFIDENCE", "STDEV"), + NC_("SC_OPCODE_CONFIDENCE", "The standard deviation of the population."), + NC_("SC_OPCODE_CONFIDENCE", "size"), + NC_("SC_OPCODE_CONFIDENCE", "The size of the population.") +}; + +// -=*# Resource for function CONFIDENCE.NORM #*=- +const char* SC_OPCODE_CONFIDENCE_N_ARY[] = +{ + NC_("SC_OPCODE_CONFIDENCE_N", "Returns a (1-alpha) confidence interval for a normal distribution."), + NC_("SC_OPCODE_CONFIDENCE_N", "alpha"), + NC_("SC_OPCODE_CONFIDENCE_N", "The level of the confidence interval."), + NC_("SC_OPCODE_CONFIDENCE_N", "STDEV"), + NC_("SC_OPCODE_CONFIDENCE_N", "The standard deviation of the population."), + NC_("SC_OPCODE_CONFIDENCE_N", "size"), + NC_("SC_OPCODE_CONFIDENCE_N", "The size of the population.") +}; + +// -=*# Resource for function CONFIDENCE.T #*=- +const char* SC_OPCODE_CONFIDENCE_T_ARY[] = +{ + NC_("SC_OPCODE_CONFIDENCE_T", "Returns a (1-alpha) confidence interval for a Student's t distribution."), + NC_("SC_OPCODE_CONFIDENCE_T", "alpha"), + NC_("SC_OPCODE_CONFIDENCE_T", "The level of the confidence interval."), + NC_("SC_OPCODE_CONFIDENCE_T", "STDEV"), + NC_("SC_OPCODE_CONFIDENCE_T", "The standard deviation of the population."), + NC_("SC_OPCODE_CONFIDENCE_T", "size"), + NC_("SC_OPCODE_CONFIDENCE_T", "The size of the population.") +}; + +// -=*# Resource for function ZTEST #*=- +const char* SC_OPCODE_Z_TEST_ARY[] = +{ + NC_("SC_OPCODE_Z_TEST", "Calculates the probability of observing a z-statistic greater than the one computed based on a sample."), + NC_("SC_OPCODE_Z_TEST", "data"), + NC_("SC_OPCODE_Z_TEST", "The given sample, drawn from a normally distributed population."), + NC_("SC_OPCODE_Z_TEST", "mu"), + NC_("SC_OPCODE_Z_TEST", "The known mean of the population."), + NC_("SC_OPCODE_Z_TEST", "sigma"), + NC_("SC_OPCODE_Z_TEST", "The known standard deviation of the population. If omitted, the standard deviation of the given sample is used.") +}; + +// -=*# Resource for function Z.TEST #*=- +const char* SC_OPCODE_Z_TEST_MS_ARY[] = +{ + NC_("SC_OPCODE_Z_TEST_MS", "Calculates the probability of observing a z-statistic greater than the one computed based on a sample."), + NC_("SC_OPCODE_Z_TEST_MS", "data"), + NC_("SC_OPCODE_Z_TEST_MS", "The given sample, drawn from a normally distributed population."), + NC_("SC_OPCODE_Z_TEST_MS", "mu"), + NC_("SC_OPCODE_Z_TEST_MS", "The known mean of the population."), + NC_("SC_OPCODE_Z_TEST_MS", "sigma"), + NC_("SC_OPCODE_Z_TEST_MS", "The known standard deviation of the population. If omitted, the standard deviation of the given sample is used.") +}; + +// -=*# Resource for function CHITEST #*=- +const char* SC_OPCODE_CHI_TEST_ARY[] = +{ + NC_("SC_OPCODE_CHI_TEST", "Returns the chi square independence test."), + NC_("SC_OPCODE_CHI_TEST", "Data_B"), + NC_("SC_OPCODE_CHI_TEST", "The observed data array."), + NC_("SC_OPCODE_CHI_TEST", "data_E"), + NC_("SC_OPCODE_CHI_TEST", "The expected data array.") +}; + +// -=*# Resource for function CHISQ.TEST #*=- +const char* SC_OPCODE_CHI_TEST_MS_ARY[] = +{ + NC_("SC_OPCODE_CHI_TEST_MS", "Returns the chi square independence test."), + NC_("SC_OPCODE_CHI_TEST_MS", "Data_B"), + NC_("SC_OPCODE_CHI_TEST_MS", "The observed data array."), + NC_("SC_OPCODE_CHI_TEST_MS", "data_E"), + NC_("SC_OPCODE_CHI_TEST_MS", "The expected data array.") +}; + +// -=*# Resource for function FTEST #*=- +const char* SC_OPCODE_F_TEST_ARY[] = +{ + NC_("SC_OPCODE_F_TEST", "Calculates the F test."), + NC_("SC_OPCODE_F_TEST", "data_1"), + NC_("SC_OPCODE_F_TEST", "The first record array."), + NC_("SC_OPCODE_F_TEST", "data_2"), + NC_("SC_OPCODE_F_TEST", "The second record array.") +}; + +// -=*# Resource for function F.TEST #*=- +const char* SC_OPCODE_F_TEST_MS_ARY[] = +{ + NC_("SC_OPCODE_F_TEST_MS", "Calculates the F test."), + NC_("SC_OPCODE_F_TEST_MS", "data_1"), + NC_("SC_OPCODE_F_TEST_MS", "The first record array."), + NC_("SC_OPCODE_F_TEST_MS", "data_2"), + NC_("SC_OPCODE_F_TEST_MS", "The second record array.") +}; + +// -=*# Resource for function TTEST #*=- +const char* SC_OPCODE_T_TEST_ARY[] = +{ + NC_("SC_OPCODE_T_TEST", "Calculates the T test."), + NC_("SC_OPCODE_T_TEST", "data_1"), + NC_("SC_OPCODE_T_TEST", "The first record array."), + NC_("SC_OPCODE_T_TEST", "data_2"), + NC_("SC_OPCODE_T_TEST", "The second record array."), + NC_("SC_OPCODE_T_TEST", "mode"), + NC_("SC_OPCODE_T_TEST", "Mode specifies the number of distribution tails to return. 1= one-tailed, 2 = two-tailed distribution"), + NC_("SC_OPCODE_T_TEST", "Type"), + NC_("SC_OPCODE_T_TEST", "The type of the T test.") +}; + +// -=*# Resource for function T.TEST #*=- +const char* SC_OPCODE_T_TEST_MS_ARY[] = +{ + NC_("SC_OPCODE_T_TEST_MS", "Calculates the T test."), + NC_("SC_OPCODE_T_TEST_MS", "data_1"), + NC_("SC_OPCODE_T_TEST_MS", "The first record array."), + NC_("SC_OPCODE_T_TEST_MS", "data_2"), + NC_("SC_OPCODE_T_TEST_MS", "The second record array."), + NC_("SC_OPCODE_T_TEST_MS", "mode"), + NC_("SC_OPCODE_T_TEST_MS", "Mode specifies the number of distribution tails to return. 1= one-tailed, 2 = two-tailed distribution"), + NC_("SC_OPCODE_T_TEST_MS", "Type"), + NC_("SC_OPCODE_T_TEST_MS", "The type of the T test.") +}; + +// -=*# Resource for function RSQ #*=- +const char* SC_OPCODE_RSQ_ARY[] = +{ + NC_("SC_OPCODE_RSQ", "Returns the square of the Pearson product moment correlation coefficient."), + NC_("SC_OPCODE_RSQ", "data_Y"), + NC_("SC_OPCODE_RSQ", "The Y data array."), + NC_("SC_OPCODE_RSQ", "data_X"), + NC_("SC_OPCODE_RSQ", "The X data array.") +}; + +// -=*# Resource for function INTERCEPT #*=- +const char* SC_OPCODE_INTERCEPT_ARY[] = +{ + NC_("SC_OPCODE_INTERCEPT", "Returns the intercept of the linear regression line and the Y axis."), + NC_("SC_OPCODE_INTERCEPT", "data_Y"), + NC_("SC_OPCODE_INTERCEPT", "The Y data array."), + NC_("SC_OPCODE_INTERCEPT", "data_X"), + NC_("SC_OPCODE_INTERCEPT", "The X data array.") +}; + +// -=*# Resource for function SLOPE #*=- +const char* SC_OPCODE_SLOPE_ARY[] = +{ + NC_("SC_OPCODE_SLOPE", "Returns the slope of the linear regression line."), + NC_("SC_OPCODE_SLOPE", "data_Y"), + NC_("SC_OPCODE_SLOPE", "The Y data array."), + NC_("SC_OPCODE_SLOPE", "data_X"), + NC_("SC_OPCODE_SLOPE", "The X data array.") +}; + +// -=*# Resource for function STEYX #*=- +const char* SC_OPCODE_STEYX_ARY[] = +{ + NC_("SC_OPCODE_STEYX", "Returns the standard error of the linear regression."), + NC_("SC_OPCODE_STEYX", "data_Y"), + NC_("SC_OPCODE_STEYX", "The Y data array."), + NC_("SC_OPCODE_STEYX", "data_X"), + NC_("SC_OPCODE_STEYX", "The X data array.") +}; + +// -=*# Resource for function PEARSON #*=- +const char* SC_OPCODE_PEARSON_ARY[] = +{ + NC_("SC_OPCODE_PEARSON", "Returns the Pearson product moment correlation coefficient."), + NC_("SC_OPCODE_PEARSON", "Data_1"), + NC_("SC_OPCODE_PEARSON", "The first record array."), + NC_("SC_OPCODE_PEARSON", "Data_2"), + NC_("SC_OPCODE_PEARSON", "The second record array.") +}; + +// -=*# Resource for function CORREL #*=- +const char* SC_OPCODE_CORREL_ARY[] = +{ + NC_("SC_OPCODE_CORREL", "Returns the correlation coefficient."), + NC_("SC_OPCODE_CORREL", "Data_1"), + NC_("SC_OPCODE_CORREL", "The first record array."), + NC_("SC_OPCODE_CORREL", "Data_2"), + NC_("SC_OPCODE_CORREL", "The second record array.") +}; + +// -=*# Resource for function COVAR #*=- +const char* SC_OPCODE_COVAR_ARY[] = +{ + NC_("SC_OPCODE_COVAR", "Calculates the population covariance."), + NC_("SC_OPCODE_COVAR", "Data_1"), + NC_("SC_OPCODE_COVAR", "The first record array."), + NC_("SC_OPCODE_COVAR", "Data_2"), + NC_("SC_OPCODE_COVAR", "The second record array.") +}; + +// -=*# Resource for function COVARIANCE.P #*=- +const char* SC_OPCODE_COVARIANCE_P_ARY[] = +{ + NC_("SC_OPCODE_COVARIANCE_P", "Calculates the population covariance."), + NC_("SC_OPCODE_COVARIANCE_P", "Data_1"), + NC_("SC_OPCODE_COVARIANCE_P", "The first record array."), + NC_("SC_OPCODE_COVARIANCE_P", "Data_2"), + NC_("SC_OPCODE_COVARIANCE_P", "The second record array.") +}; + +// -=*# Resource for function COVARIANCE.S #*=- +const char* SC_OPCODE_COVARIANCE_S_ARY[] = +{ + NC_("SC_OPCODE_COVARIANCE_S", "Calculates the sample covariance."), + NC_("SC_OPCODE_COVARIANCE_S", "Data_1"), + NC_("SC_OPCODE_COVARIANCE_S", "The first record array."), + NC_("SC_OPCODE_COVARIANCE_S", "Data_2"), + NC_("SC_OPCODE_COVARIANCE_S", "The second record array.") +}; + +// -=*# Resource for function FORECAST #*=- +const char* SC_OPCODE_FORECAST_ARY[] = +{ + NC_("SC_OPCODE_FORECAST", "Returns a value along a linear regression"), + NC_("SC_OPCODE_FORECAST", "value"), + NC_("SC_OPCODE_FORECAST", "The X value for which the Y value on the regression linear is to be calculated."), + NC_("SC_OPCODE_FORECAST", "data_Y"), + NC_("SC_OPCODE_FORECAST", "The Y data array."), + NC_("SC_OPCODE_FORECAST", "data_X"), + NC_("SC_OPCODE_FORECAST", "The X data array.") +}; + +// -=*# Resource for function FORECAST.ETS #*=- +const char* SC_OPCODE_FORECAST_ETS_ADD_ARY[] = +{ + NC_("SC_OPCODE_FORECAST_ETS_ADD", "Calculates future value(s) using additive Exponential Smoothing algorithm."), + NC_("SC_OPCODE_FORECAST_ETS_ADD", "target"), + NC_("SC_OPCODE_FORECAST_ETS_ADD", "The date (array) for which you want to predict a value."), + NC_("SC_OPCODE_FORECAST_ETS_ADD", "values"), + NC_("SC_OPCODE_FORECAST_ETS_ADD", "The data array from which you want to forecast."), + NC_("SC_OPCODE_FORECAST_ETS_ADD", "timeline"), + NC_("SC_OPCODE_FORECAST_ETS_ADD", "The date or numeric array; a consistent step between values is needed."), + NC_("SC_OPCODE_FORECAST_ETS_ADD", "period length"), + NC_("SC_OPCODE_FORECAST_ETS_ADD", "Number of Samples in Period (default 1); length of the seasonal pattern."), + NC_("SC_OPCODE_FORECAST_ETS_ADD", "data completion"), + NC_("SC_OPCODE_FORECAST_ETS_ADD", "Data completion (default 1); 0 treats missing points as zero, 1 interpolates."), + NC_("SC_OPCODE_FORECAST_ETS_ADD", "aggregation"), + NC_("SC_OPCODE_FORECAST_ETS_ADD", "Aggregation (default 1 = AVERAGE); method to be used to aggregate identical (time) values.") +}; + +// -=*# Resource for function FORECAST.ETS.MULT #*=- +const char* SC_OPCODE_FORECAST_ETS_MUL_ARY[] = +{ + NC_("SC_OPCODE_FORECAST_ETS_MUL", "Calculates future value(s) using multiplicative Exponential Smoothing algorithm."), + NC_("SC_OPCODE_FORECAST_ETS_MUL", "target"), + NC_("SC_OPCODE_FORECAST_ETS_MUL", "The date (array) for which you want to predict a value."), + NC_("SC_OPCODE_FORECAST_ETS_MUL", "values"), + NC_("SC_OPCODE_FORECAST_ETS_MUL", "The data array from which you want to forecast."), + NC_("SC_OPCODE_FORECAST_ETS_MUL", "timeline"), + NC_("SC_OPCODE_FORECAST_ETS_MUL", "The date or numeric array; a consistent step between values is needed."), + NC_("SC_OPCODE_FORECAST_ETS_MUL", "period length"), + NC_("SC_OPCODE_FORECAST_ETS_MUL", "Number of Samples in Period (default 1); length of the seasonal pattern."), + NC_("SC_OPCODE_FORECAST_ETS_MUL", "data completion"), + NC_("SC_OPCODE_FORECAST_ETS_MUL", "Data completion (default 1); 0 treats missing points as zero, 1 interpolates."), + NC_("SC_OPCODE_FORECAST_ETS_MUL", "aggregation"), + NC_("SC_OPCODE_FORECAST_ETS_MUL", "Aggregation (default 1 = AVERAGE); method to be used to aggregate identical (time) values.") +}; + +// -=*# Resource for function FORECAST.ETS.CONFINT #*=- +const char* SC_OPCODE_FORECAST_ETS_PIA_ARY[] = +{ + NC_("SC_OPCODE_FORECAST_ETS_PIA", "Returns a prediction interval at the specified target value(s) for additive Exponential Smoothing method"), + NC_("SC_OPCODE_FORECAST_ETS_PIA", "target"), + NC_("SC_OPCODE_FORECAST_ETS_PIA", "The date (array) for which you want to predict a value."), + NC_("SC_OPCODE_FORECAST_ETS_PIA", "values"), + NC_("SC_OPCODE_FORECAST_ETS_PIA", "The data array from which you want to forecast."), + NC_("SC_OPCODE_FORECAST_ETS_PIA", "timeline"), + NC_("SC_OPCODE_FORECAST_ETS_PIA", "The date or numeric array; a consistent step between values is needed."), + NC_("SC_OPCODE_FORECAST_ETS_PIA", "confidence level"), + NC_("SC_OPCODE_FORECAST_ETS_PIA", "Confidence level (default 0.95); value 0 to 1 (exclusive) for 0 to 100% calculated prediction interval."), + NC_("SC_OPCODE_FORECAST_ETS_PIA", "period length"), + NC_("SC_OPCODE_FORECAST_ETS_PIA", "Number of Samples in Period (default 1); length of the seasonal pattern."), + NC_("SC_OPCODE_FORECAST_ETS_PIA", "data completion"), + NC_("SC_OPCODE_FORECAST_ETS_PIA", "Data completion (default 1); 0 treats missing points as zero, 1 interpolates."), + NC_("SC_OPCODE_FORECAST_ETS_PIA", "aggregation"), + NC_("SC_OPCODE_FORECAST_ETS_PIA", "Aggregation (default 1 = AVERAGE); method to be used to aggregate identical (time) values.") +}; + +// -=*# Resource for function FORECAST.ETS.PI.MULT #*=- +const char* SC_OPCODE_FORECAST_ETS_PIM_ARY[] = +{ + NC_("SC_OPCODE_FORECAST_ETS_PIM", "Returns a prediction interval at the specified target value(s) for multiplicative Exponential Smoothing method"), + NC_("SC_OPCODE_FORECAST_ETS_PIM", "target"), + NC_("SC_OPCODE_FORECAST_ETS_PIM", "The date (array) for which you want to predict a value."), + NC_("SC_OPCODE_FORECAST_ETS_PIM", "values"), + NC_("SC_OPCODE_FORECAST_ETS_PIM", "The data array from which you want to forecast."), + NC_("SC_OPCODE_FORECAST_ETS_PIM", "timeline"), + NC_("SC_OPCODE_FORECAST_ETS_PIM", "The date or numeric array; a consistent step between values is needed."), + NC_("SC_OPCODE_FORECAST_ETS_PIM", "confidence level"), + NC_("SC_OPCODE_FORECAST_ETS_PIM", "Confidence level (default 0.95); value 0 to 1 (exclusive) for 0 to 100% calculated prediction interval."), + NC_("SC_OPCODE_FORECAST_ETS_PIM", "period length"), + NC_("SC_OPCODE_FORECAST_ETS_PIM", "Number of Samples in Period (default 1); length of the seasonal pattern."), + NC_("SC_OPCODE_FORECAST_ETS_PIM", "data completion"), + NC_("SC_OPCODE_FORECAST_ETS_PIM", "Data completion (default 1); 0 treats missing points as zero, 1 interpolates."), + NC_("SC_OPCODE_FORECAST_ETS_PIM", "aggregation"), + NC_("SC_OPCODE_FORECAST_ETS_PIM", "Aggregation (default 1 = AVERAGE); method to be used to aggregate identical (time) values.") +}; + +// -=*# Resource for function FORECAST.ETS.SEASONALITY #*=- +const char* SC_OPCODE_FORECAST_ETS_SEA_ARY[] = +{ + NC_("SC_OPCODE_FORECAST_ETS_SEA", "Calculates the number of samples in period (season) using additive Exponential Triple Smoothing algorithm."), + NC_("SC_OPCODE_FORECAST_ETS_SEA", "values"), + NC_("SC_OPCODE_FORECAST_ETS_SEA", "The data array from which you want to forecast."), + NC_("SC_OPCODE_FORECAST_ETS_SEA", "timeline"), + NC_("SC_OPCODE_FORECAST_ETS_SEA", "The date or numeric array; a consistent step between values is needed."), + NC_("SC_OPCODE_FORECAST_ETS_SEA", "data completion"), + NC_("SC_OPCODE_FORECAST_ETS_SEA", "Data completion (default 1); 0 treats missing points as zero, 1 interpolates."), + NC_("SC_OPCODE_FORECAST_ETS_SEA", "aggregation"), + NC_("SC_OPCODE_FORECAST_ETS_SEA", "Aggregation (default 1 = AVERAGE); method to be used to aggregate identical (time) values.") +}; + +// -=*# Resource for function FORECAST.ETS.STAT #*=- +const char* SC_OPCODE_FORECAST_ETS_STA_ARY[] = +{ + NC_("SC_OPCODE_FORECAST_ETS_STA", "Returns statistical value(s) using additive Exponential Smoothing algorithm."), + NC_("SC_OPCODE_FORECAST_ETS_STA", "values"), + NC_("SC_OPCODE_FORECAST_ETS_STA", "The data array from which you want to forecast."), + NC_("SC_OPCODE_FORECAST_ETS_STA", "timeline"), + NC_("SC_OPCODE_FORECAST_ETS_STA", "The date or numeric array; a consistent step between values is needed."), + NC_("SC_OPCODE_FORECAST_ETS_STA", "statistic type"), + NC_("SC_OPCODE_FORECAST_ETS_STA", "Value (1-9) or array of values, indicating which statistic will be returned for the calculated forecast"), + NC_("SC_OPCODE_FORECAST_ETS_STA", "period length"), + NC_("SC_OPCODE_FORECAST_ETS_STA", "Number of Samples in Period (default 1); length of the seasonal pattern."), + NC_("SC_OPCODE_FORECAST_ETS_STA", "data completion"), + NC_("SC_OPCODE_FORECAST_ETS_STA", "Data completion (default 1); 0 treats missing points as zero, 1 interpolates."), + NC_("SC_OPCODE_FORECAST_ETS_STA", "aggregation"), + NC_("SC_OPCODE_FORECAST_ETS_STA", "Aggregation (default 1 = AVERAGE); method to be used to aggregate identical (time) values.") +}; + +// -=*# Resource for function FORECAST.ETS.STAT.MULT #*=- +const char* SC_OPCODE_FORECAST_ETS_STM_ARY[] = +{ + NC_("SC_OPCODE_FORECAST_ETS_STM", "Returns statistical value(s) using multiplicative Exponential Smoothing algorithm."), + NC_("SC_OPCODE_FORECAST_ETS_STM", "values"), + NC_("SC_OPCODE_FORECAST_ETS_STM", "The data array from which you want to forecast."), + NC_("SC_OPCODE_FORECAST_ETS_STM", "timeline"), + NC_("SC_OPCODE_FORECAST_ETS_STM", "The date or numeric array; a consistent step between values is needed."), + NC_("SC_OPCODE_FORECAST_ETS_STM", "statistic type"), + NC_("SC_OPCODE_FORECAST_ETS_STM", "Value (1-9) or array of values, indicating which statistic will be returned for the calculated forecast"), + NC_("SC_OPCODE_FORECAST_ETS_STM", "period length"), + NC_("SC_OPCODE_FORECAST_ETS_STM", "Number Of Samples in Period (default 1); length of the seasonal pattern."), + NC_("SC_OPCODE_FORECAST_ETS_STM", "data completion"), + NC_("SC_OPCODE_FORECAST_ETS_STM", "Data completion (default 1); 0 treats missing points as zero, 1 interpolates."), + NC_("SC_OPCODE_FORECAST_ETS_STM", "aggregation"), + NC_("SC_OPCODE_FORECAST_ETS_STM", "Aggregation (default 1 = AVERAGE); method to be used to aggregate identical (time) values.") +}; + +// -=*# Resource for function FORECAST.LINEAR #*=- +const char* SC_OPCODE_FORECAST_LIN_ARY[] = +{ + NC_("SC_OPCODE_FORECAST_LIN", "Returns a value along a linear regression"), + NC_("SC_OPCODE_FORECAST_LIN", "value"), + NC_("SC_OPCODE_FORECAST_LIN", "The X value for which the Y value on the regression linear is to be calculated."), + NC_("SC_OPCODE_FORECAST_LIN", "data_Y"), + NC_("SC_OPCODE_FORECAST_LIN", "The Y data array."), + NC_("SC_OPCODE_FORECAST_LIN", "data_X"), + NC_("SC_OPCODE_FORECAST_LIN", "The X data array.") +}; + +// -=*# Resource for function ADDRESS #*=- +const char* SC_OPCODE_ADDRESS_ARY[] = +{ + NC_("SC_OPCODE_ADDRESS", "Returns the reference to a cell as text."), + NC_("SC_OPCODE_ADDRESS", "row"), + NC_("SC_OPCODE_ADDRESS", "The row number of the cell."), + NC_("SC_OPCODE_ADDRESS", "column"), + NC_("SC_OPCODE_ADDRESS", "The column number of the cell."), + NC_("SC_OPCODE_ADDRESS", "ABS"), + NC_("SC_OPCODE_ADDRESS", "Specifies whether absolute or relative referencing is to be used."), + NC_("SC_OPCODE_ADDRESS", "A1"), + NC_("SC_OPCODE_ADDRESS", "The reference style: 0 or FALSE means R1C1 style, any other value or omitted means A1 style."), + NC_("SC_OPCODE_ADDRESS", "sheet"), + NC_("SC_OPCODE_ADDRESS", "The spreadsheet name of the cell reference.") +}; + +// -=*# Resource for function AREAS #*=- +const char* SC_OPCODE_AREAS_ARY[] = +{ + NC_("SC_OPCODE_AREAS", "Returns the number of individual ranges that belong to a (multiple) range."), + NC_("SC_OPCODE_AREAS", "reference"), + NC_("SC_OPCODE_AREAS", "The reference to a (multiple) range.") +}; + +// -=*# Resource for function CHOOSE #*=- +const char* SC_OPCODE_CHOOSE_ARY[] = +{ + NC_("SC_OPCODE_CHOOSE", "Selects a value from a list of up to 30 value arguments."), + NC_("SC_OPCODE_CHOOSE", "Index"), + NC_("SC_OPCODE_CHOOSE", "The index of the value (1..30) selected."), + NC_("SC_OPCODE_CHOOSE", "value "), + NC_("SC_OPCODE_CHOOSE", "Value 1, value 2,... The list of arguments from which a value is chosen.") +}; + +// -=*# Resource for function COLUMNS #*=- +const char* SC_OPCODE_COLUMN_ARY[] = +{ + NC_("SC_OPCODE_COLUMN", "Returns the internal column number of a reference."), + NC_("SC_OPCODE_COLUMN", "reference"), + NC_("SC_OPCODE_COLUMN", "The reference to a cell or a range.") +}; + +// -=*# Resource for function ROW #*=- +const char* SC_OPCODE_ROW_ARY[] = +{ + NC_("SC_OPCODE_ROW", "Defines the internal row number of a reference."), + NC_("SC_OPCODE_ROW", "reference"), + NC_("SC_OPCODE_ROW", "The reference to a cell or a range.") +}; + +// -=*# Resource for function SHEET #*=- +const char* SC_OPCODE_SHEET_ARY[] = +{ + NC_("SC_OPCODE_SHEET", "Returns the internal sheet number of a reference or a string."), + NC_("SC_OPCODE_SHEET", "reference"), + NC_("SC_OPCODE_SHEET", "The reference to a cell or a range or the character string of a sheet name.") +}; + +// -=*# Resource for function COLUMNS #*=- +const char* SC_OPCODE_COLUMNS_ARY[] = +{ + NC_("SC_OPCODE_COLUMNS", "Returns the number of columns in an array or reference."), + NC_("SC_OPCODE_COLUMNS", "array"), + NC_("SC_OPCODE_COLUMNS", "The array (reference) for which the number of columns is to be determined.") +}; + +// -=*# Resource for function ROWS #*=- +const char* SC_OPCODE_ROWS_ARY[] = +{ + NC_("SC_OPCODE_ROWS", "Returns the number of rows in a reference or array."), + NC_("SC_OPCODE_ROWS", "array"), + NC_("SC_OPCODE_ROWS", "The array (reference) for which the number of rows is to be determined.") +}; + +// -=*# Resource for function SHEETS #*=- +const char* SC_OPCODE_SHEETS_ARY[] = +{ + NC_("SC_OPCODE_SHEETS", "Returns the number of sheets of a given reference. If no parameter has been entered, the total number of sheets in the document is returned."), + NC_("SC_OPCODE_SHEETS", "reference"), + NC_("SC_OPCODE_SHEETS", "The reference to a cell or a range.") +}; + +// -=*# Resource for function HLOOKUP #*=- +const char* SC_OPCODE_H_LOOKUP_ARY[] = +{ + NC_("SC_OPCODE_H_LOOKUP", "Horizontal search and reference to the cells located below."), + NC_("SC_OPCODE_H_LOOKUP", "search_criteria"), + NC_("SC_OPCODE_H_LOOKUP", "The value to be found in the first row."), + NC_("SC_OPCODE_H_LOOKUP", "array"), + NC_("SC_OPCODE_H_LOOKUP", "The array or the range for the reference."), + NC_("SC_OPCODE_H_LOOKUP", "Index"), + NC_("SC_OPCODE_H_LOOKUP", "The row index in the array."), + NC_("SC_OPCODE_H_LOOKUP", "sorted"), + NC_("SC_OPCODE_H_LOOKUP", "If the value is TRUE or not given, the search row of the array must be sorted in ascending order.") +}; + +// -=*# Resource for function VLOOKUP #*=- +const char* SC_OPCODE_V_LOOKUP_ARY[] = +{ + NC_("SC_OPCODE_V_LOOKUP", "Vertical search and reference to indicated cells."), + NC_("SC_OPCODE_V_LOOKUP", "Search criterion"), + NC_("SC_OPCODE_V_LOOKUP", "The value to be found in the first column."), + NC_("SC_OPCODE_V_LOOKUP", "array"), + NC_("SC_OPCODE_V_LOOKUP", "The array or range for referencing."), + NC_("SC_OPCODE_V_LOOKUP", "Index"), + NC_("SC_OPCODE_V_LOOKUP", "Column index number in the array."), + NC_("SC_OPCODE_V_LOOKUP", "sort order"), + NC_("SC_OPCODE_V_LOOKUP", "If the value is TRUE or not given, the search column of the array must be sorted in ascending order.") +}; + +// -=*# Resource for function INDEX #*=- +const char* SC_OPCODE_INDEX_ARY[] = +{ + NC_("SC_OPCODE_INDEX", "Returns a reference to a cell from a defined range."), + NC_("SC_OPCODE_INDEX", "reference"), + NC_("SC_OPCODE_INDEX", "The reference to a (multiple) range."), + NC_("SC_OPCODE_INDEX", "row"), + NC_("SC_OPCODE_INDEX", "The row in the range."), + NC_("SC_OPCODE_INDEX", "column"), + NC_("SC_OPCODE_INDEX", "The column in the range."), + NC_("SC_OPCODE_INDEX", "range"), + NC_("SC_OPCODE_INDEX", "The index of the subrange if referring to a multiple range.") +}; + +// -=*# Resource for function INDIRECT #*=- +const char* SC_OPCODE_INDIRECT_ARY[] = +{ + NC_("SC_OPCODE_INDIRECT", "Returns the contents of a cell that is referenced in text form."), + NC_("SC_OPCODE_INDIRECT", "ref"), + NC_("SC_OPCODE_INDIRECT", "The cell whose contents are to be evaluated is to be referenced in text form (e.g. \"A1\")."), + NC_("SC_OPCODE_INDIRECT", "A1"), + NC_("SC_OPCODE_INDIRECT", "The reference style: 0 or FALSE means R1C1 style, any other value or omitted means A1 style.") +}; + +// -=*# Resource for function LOOKUP #*=- +const char* SC_OPCODE_LOOKUP_ARY[] = +{ + NC_("SC_OPCODE_LOOKUP", "Determines a value in a vector by comparison to values in another vector."), + NC_("SC_OPCODE_LOOKUP", "Search criterion"), + NC_("SC_OPCODE_LOOKUP", "The value to be used for comparison."), + NC_("SC_OPCODE_LOOKUP", "Search vector"), + NC_("SC_OPCODE_LOOKUP", "The vector (row or column) in which to search."), + NC_("SC_OPCODE_LOOKUP", "result_vector"), + NC_("SC_OPCODE_LOOKUP", "The vector (row or range) from which the value is to be determined.") +}; + +// -=*# Resource for function MATCH #*=- +const char* SC_OPCODE_MATCH_ARY[] = +{ + NC_("SC_OPCODE_MATCH", "Defines a position in a array after comparing values."), + NC_("SC_OPCODE_MATCH", "Search criterion"), + NC_("SC_OPCODE_MATCH", "The value to be used for comparison."), + NC_("SC_OPCODE_MATCH", "lookup_array"), + NC_("SC_OPCODE_MATCH", "The array (range) in which the search is made."), + NC_("SC_OPCODE_MATCH", "Type"), + NC_("SC_OPCODE_MATCH", "Type can take the value 1, 0 or -1 and determines the criteria are to be used for comparison purposes.") +}; + +// -=*# Resource for function OFFSET #*=- +const char* SC_OPCODE_OFFSET_ARY[] = +{ + NC_("SC_OPCODE_OFFSET", "Returns a reference which has been moved in relation to the starting point."), + NC_("SC_OPCODE_OFFSET", "reference"), + NC_("SC_OPCODE_OFFSET", "The reference (cell) from which to base the movement."), + NC_("SC_OPCODE_OFFSET", "rows"), + NC_("SC_OPCODE_OFFSET", "The number of rows to be moved either up or down."), + NC_("SC_OPCODE_OFFSET", "columns"), + NC_("SC_OPCODE_OFFSET", "The number of columns that are to be moved to the left or to the right."), + NC_("SC_OPCODE_OFFSET", "height"), + NC_("SC_OPCODE_OFFSET", "The number of rows of the moved reference."), + NC_("SC_OPCODE_OFFSET", "width"), + NC_("SC_OPCODE_OFFSET", "The number of columns in the moved reference.") +}; + +// -=*# Resource for function ERRORTYPE #*=- +const char* SC_OPCODE_ERROR_TYPE_ARY[] = +{ + NC_("SC_OPCODE_ERROR_TYPE", "Returns a number corresponding to an error type"), + NC_("SC_OPCODE_ERROR_TYPE", "reference"), + NC_("SC_OPCODE_ERROR_TYPE", "The reference (cell) in which the error occurred.") +}; + +// -=*# Resource for function ERROR.TYPE #*=- +const char* SC_OPCODE_ERROR_TYPE_ODF_ARY[] = +{ + NC_("SC_OPCODE_ERROR_TYPE_ODF", "Returns a number corresponding to one of the error values or #N/A if no error exists"), + NC_("SC_OPCODE_ERROR_TYPE_ODF", "expression"), + NC_("SC_OPCODE_ERROR_TYPE_ODF", "The error value whose identifying number you want to find. Can be the actual error value or a reference to a cell that you want to test.") +}; + +// -=*# Resource for function STYLE #*=- +const char* SC_OPCODE_STYLE_ARY[] = +{ + NC_("SC_OPCODE_STYLE", "Applies a Style to the formula cell."), + NC_("SC_OPCODE_STYLE", "Style"), + NC_("SC_OPCODE_STYLE", "The name of the Style to be applied."), + NC_("SC_OPCODE_STYLE", "Time"), + NC_("SC_OPCODE_STYLE", "The time (in seconds) that the Style is to remain valid."), + NC_("SC_OPCODE_STYLE", "Style2"), + NC_("SC_OPCODE_STYLE", "The Style to be applied after time expires.") +}; + +// -=*# Resource for function DDE #*=- +const char* SC_OPCODE_DDE_ARY[] = +{ + NC_("SC_OPCODE_DDE", "Result of a DDE link."), + NC_("SC_OPCODE_DDE", "server"), + NC_("SC_OPCODE_DDE", "The name of the server application."), + NC_("SC_OPCODE_DDE", "File"), + NC_("SC_OPCODE_DDE", "The name of the file."), + NC_("SC_OPCODE_DDE", "range"), + NC_("SC_OPCODE_DDE", "The range from which data is to be taken."), + NC_("SC_OPCODE_DDE", "mode"), + NC_("SC_OPCODE_DDE", "Defines how data is to be converted to numbers.") +}; + +// -=*# Resource for function HYPERLINK #*=- +const char* SC_OPCODE_HYPERLINK_ARY[] = +{ + NC_("SC_OPCODE_HYPERLINK", "Hyperlink."), + NC_("SC_OPCODE_HYPERLINK", "URL"), + NC_("SC_OPCODE_HYPERLINK", "URL"), + NC_("SC_OPCODE_HYPERLINK", "CellText"), + NC_("SC_OPCODE_HYPERLINK", "Cell Text") +}; + +// -=*# Resource for function GETPIVOTDATA #*=- +const char* SC_OPCODE_GET_PIVOT_DATA_ARY[] = +{ + NC_("SC_OPCODE_GET_PIVOT_DATA", "Extracts value(s) from a pivot table."), + NC_("SC_OPCODE_GET_PIVOT_DATA", "Data Field"), + NC_("SC_OPCODE_GET_PIVOT_DATA", "The name of the pivot table field to extract."), + NC_("SC_OPCODE_GET_PIVOT_DATA", "Pivot Table"), + NC_("SC_OPCODE_GET_PIVOT_DATA", "A reference to a cell or range in the pivot table."), + NC_("SC_OPCODE_GET_PIVOT_DATA", "Field Name / Item"), + NC_("SC_OPCODE_GET_PIVOT_DATA", "Field name/value pair to filter the target data.") +}; + +// -=*# Resource for function BAHTTEXT #*=- +const char* SC_OPCODE_BAHTTEXT_ARY[] = +{ + NC_("SC_OPCODE_BAHTTEXT", "Converts a number to text (Baht)."), + NC_("SC_OPCODE_BAHTTEXT", "Number"), + NC_("SC_OPCODE_BAHTTEXT", "The number to convert.") +}; + +// -=*# Resource for function JIS #*=- +const char* SC_OPCODE_JIS_ARY[] = +{ + NC_("SC_OPCODE_JIS", "Converts half-width ASCII and katakana characters to full-width."), + NC_("SC_OPCODE_JIS", "text"), + NC_("SC_OPCODE_JIS", "The text to convert.") +}; + +// -=*# Resource for function ASC #*=- +const char* SC_OPCODE_ASC_ARY[] = +{ + NC_("SC_OPCODE_ASC", "Converts full-width ASCII and katakana characters to half-width."), + NC_("SC_OPCODE_ASC", "text"), + NC_("SC_OPCODE_ASC", "The text to convert.") +}; + +// -=*# Resource for function CODE #*=- +const char* SC_OPCODE_CODE_ARY[] = +{ + NC_("SC_OPCODE_CODE", "Returns a numeric code for the first character in a text string."), + NC_("SC_OPCODE_CODE", "text"), + NC_("SC_OPCODE_CODE", "This is the text for which the code of the first character is to be found.") +}; + +// -=*# Resource for function DOLLAR #*=- +const char* SC_OPCODE_CURRENCY_ARY[] = +{ + NC_("SC_OPCODE_CURRENCY", "Converts a number to text in currency format."), + NC_("SC_OPCODE_CURRENCY", "value"), + NC_("SC_OPCODE_CURRENCY", "Value is a number, a reference to a cell containing a number or a formula that results in a number."), + NC_("SC_OPCODE_CURRENCY", "decimals"), + NC_("SC_OPCODE_CURRENCY", "Decimal places. Denotes the number of digits to the right of the decimal point.") +}; + +// -=*# Resource for function CHAR #*=- +const char* SC_OPCODE_CHAR_ARY[] = +{ + NC_("SC_OPCODE_CHAR", "Converts a code number into a character or letter."), + NC_("SC_OPCODE_CHAR", "number"), + NC_("SC_OPCODE_CHAR", "The code value for the character.") +}; + +// -=*# Resource for function CLEAN #*=- +const char* SC_OPCODE_CLEAN_ARY[] = +{ + NC_("SC_OPCODE_CLEAN", "Removes all nonprintable characters from text."), + NC_("SC_OPCODE_CLEAN", "text"), + NC_("SC_OPCODE_CLEAN", "The text from which nonprintable characters are to be removed.") +}; + +// -=*# Resource for function CONCATENATE #*=- +const char* SC_OPCODE_CONCAT_ARY[] = +{ + NC_("SC_OPCODE_CONCAT", "Combines several text items into one."), + NC_("SC_OPCODE_CONCAT", "text"), + NC_("SC_OPCODE_CONCAT", "Text for the concatenation.") +}; + +// -=*# Resource for function CONCAT #*=- +const char* SC_OPCODE_CONCAT_MS_ARY[] = +{ + NC_("SC_OPCODE_CONCAT_MS", "Combines several text items into one, accepts cell ranges as arguments."), + NC_("SC_OPCODE_CONCAT_MS", "text"), + NC_("SC_OPCODE_CONCAT_MS", "Text and/or cell ranges for the concatenation.") +}; + +// -=*# Resource for function TEXTJOIN #*=- +const char* SC_OPCODE_TEXTJOIN_MS_ARY[] = +{ + NC_("SC_OPCODE_TEXTJOIN_MS", "Combines several text items into one, accepts cell ranges as arguments. Uses delimiter between items."), + NC_("SC_OPCODE_TEXTJOIN_MS", "delimiter"), + NC_("SC_OPCODE_TEXTJOIN_MS", "Text string to be used as delimiter."), + NC_("SC_OPCODE_TEXTJOIN_MS", "skip empty cells"), + NC_("SC_OPCODE_TEXTJOIN_MS", "If TRUE, empty cells will be ignored."), + NC_("SC_OPCODE_TEXTJOIN_MS", "text"), + NC_("SC_OPCODE_TEXTJOIN_MS", "Text and/or cell ranges for the concatenation.") +}; + +// -=*# Resource for function IFS #*=- +const char* SC_OPCODE_IFS_MS_ARY[] = +{ + NC_("SC_OPCODE_IFS_MS", "Checks 1 or more conditions and returns a value corresponding to the first true condition."), + NC_("SC_OPCODE_IFS_MS", "test"), + NC_("SC_OPCODE_IFS_MS", "Any value or expression which can be either TRUE or FALSE."), + NC_("SC_OPCODE_IFS_MS", "result"), + NC_("SC_OPCODE_IFS_MS", "The result of the function if test is TRUE.") +}; + +// -=*# Resource for function SWITCH #*=- +const char* SC_OPCODE_SWITCH_MS_ARY[] = +{ + NC_("SC_OPCODE_SWITCH_MS", "Checks 1 or more values and returns a result corresponding to the first value equal to the given expression."), + NC_("SC_OPCODE_SWITCH_MS", "expression"), + NC_("SC_OPCODE_SWITCH_MS", "Value that will be compared against value1-valueN."), + NC_("SC_OPCODE_SWITCH_MS", "value"), + NC_("SC_OPCODE_SWITCH_MS", "Value that will be compared against expression."), + NC_("SC_OPCODE_SWITCH_MS", "result"), + NC_("SC_OPCODE_SWITCH_MS", "Value to return when corresponding value argument matches expression.") +}; + +const char* SC_OPCODE_MINIFS_MS_ARY[] = +{ + NC_("SC_OPCODE_MINIFS_MS", "Returns the minimum value in a range that meet multiple criteria in multiple ranges."), + NC_("SC_OPCODE_MINIFS_MS", "min_range"), + NC_("SC_OPCODE_MINIFS_MS", "The range from which the minimum will be determined."), + NC_("SC_OPCODE_MINIFS_MS", "range"), + NC_("SC_OPCODE_MINIFS_MS", "Range 1, range 2,... are the ranges to be evaluated by the criteria given."), + NC_("SC_OPCODE_MINIFS_MS", "criteria"), + NC_("SC_OPCODE_MINIFS_MS", "Criteria 1, criteria 2,... are the criteria to be applied to the ranges given.") +}; + +const char* SC_OPCODE_MAXIFS_MS_ARY[] = +{ + NC_("SC_OPCODE_MAXIFS_MS", "Returns the maximum value in a range that meet multiple criteria in multiple ranges."), + NC_("SC_OPCODE_MAXIFS_MS", "max_range"), + NC_("SC_OPCODE_MAXIFS_MS", "The range from which the maximum will be determined."), + NC_("SC_OPCODE_MAXIFS_MS", "range"), + NC_("SC_OPCODE_MAXIFS_MS", "Range 1, range 2,... are the ranges to be evaluated by the criteria given."), + NC_("SC_OPCODE_MAXIFS_MS", "criteria"), + NC_("SC_OPCODE_MAXIFS_MS", "Criteria 1, criteria 2,... are the criteria to be applied to the ranges given.") +}; + +// -=*# Resource for function EXACT #*=- +const char* SC_OPCODE_EXACT_ARY[] = +{ + NC_("SC_OPCODE_EXACT", "Specifies whether two texts are identical."), + NC_("SC_OPCODE_EXACT", "text_1"), + NC_("SC_OPCODE_EXACT", "The first text to be used for comparing texts."), + NC_("SC_OPCODE_EXACT", "text_2"), + NC_("SC_OPCODE_EXACT", "The second text for comparing texts.") +}; + +// -=*# Resource for function FIND #*=- +const char* SC_OPCODE_FIND_ARY[] = +{ + NC_("SC_OPCODE_FIND", "Looks for a string of text within another (case sensitive)"), + NC_("SC_OPCODE_FIND", "find_text"), + NC_("SC_OPCODE_FIND", "The text to be found."), + NC_("SC_OPCODE_FIND", "text"), + NC_("SC_OPCODE_FIND", "The text in which a search is to be made."), + NC_("SC_OPCODE_FIND", "position"), + NC_("SC_OPCODE_FIND", "The position in the text from which the search starts.") +}; + +// -=*# Resource for function SEARCH #*=- +const char* SC_OPCODE_SEARCH_ARY[] = +{ + NC_("SC_OPCODE_SEARCH", "Looks for one text value within another (not case-sensitive)."), + NC_("SC_OPCODE_SEARCH", "find_text"), + NC_("SC_OPCODE_SEARCH", "The text to be found."), + NC_("SC_OPCODE_SEARCH", "text"), + NC_("SC_OPCODE_SEARCH", "The text in which a search is to be made."), + NC_("SC_OPCODE_SEARCH", "position"), + NC_("SC_OPCODE_SEARCH", "The position in the text where the search is started.") +}; + +// -=*# Resource for function TRIM #*=- +const char* SC_OPCODE_TRIM_ARY[] = +{ + NC_("SC_OPCODE_TRIM", "Removes extra spaces from text."), + NC_("SC_OPCODE_TRIM", "text"), + NC_("SC_OPCODE_TRIM", "The text in which extra spaces between words are to be deleted.") +}; + +// -=*# Resource for function PROPER #*=- +const char* SC_OPCODE_PROPER_ARY[] = +{ + NC_("SC_OPCODE_PROPER", "Capitalizes the first letter in all words."), + NC_("SC_OPCODE_PROPER", "text"), + NC_("SC_OPCODE_PROPER", "The text in which the beginning of words are to be replaced by capital letters.") +}; + +// -=*# Resource for function UPPER #*=- +const char* SC_OPCODE_UPPER_ARY[] = +{ + NC_("SC_OPCODE_UPPER", "Converts text to uppercase."), + NC_("SC_OPCODE_UPPER", "text"), + NC_("SC_OPCODE_UPPER", "The text in which lower case letters are to be converted to capitals.") +}; + +// -=*# Resource for function LOWER #*=- +const char* SC_OPCODE_LOWER_ARY[] = +{ + NC_("SC_OPCODE_LOWER", "Converts text to lowercase."), + NC_("SC_OPCODE_LOWER", "text"), + NC_("SC_OPCODE_LOWER", "The text in which capitals are converted to lower case letters.") +}; + +// -=*# Resource for function VALUE #*=- +const char* SC_OPCODE_VALUE_ARY[] = +{ + NC_("SC_OPCODE_VALUE", "Converts text to a number."), + NC_("SC_OPCODE_VALUE", "text"), + NC_("SC_OPCODE_VALUE", "The text to be converted to a number.") +}; + +// -=*# Resource for function TEXT #*=- +const char* SC_OPCODE_TEXT_ARY[] = +{ + NC_("SC_OPCODE_TEXT", "Converts a number to text according to a given format."), + NC_("SC_OPCODE_TEXT", "number"), + NC_("SC_OPCODE_TEXT", "The numeric value to be converted."), + NC_("SC_OPCODE_TEXT", "Format"), + NC_("SC_OPCODE_TEXT", "The text that describes the format.") +}; + +// -=*# Resource for function T #*=- +const char* SC_OPCODE_T_ARY[] = +{ + NC_("SC_OPCODE_T", "Returns a value if it is text, otherwise an empty string."), + NC_("SC_OPCODE_T", "value"), + NC_("SC_OPCODE_T", "The value to be checked and returned if it is text.") +}; + +// -=*# Resource for function REPLACE #*=- +const char* SC_OPCODE_REPLACE_ARY[] = +{ + NC_("SC_OPCODE_REPLACE", "Replaces characters within a text string with a different text string."), + NC_("SC_OPCODE_REPLACE", "Text"), + NC_("SC_OPCODE_REPLACE", "The text in which some characters are to be replaced."), + NC_("SC_OPCODE_REPLACE", "position"), + NC_("SC_OPCODE_REPLACE", "The character position from which text is to be replaced."), + NC_("SC_OPCODE_REPLACE", "length"), + NC_("SC_OPCODE_REPLACE", "The number of characters to be replaced."), + NC_("SC_OPCODE_REPLACE", "new text"), + NC_("SC_OPCODE_REPLACE", "The text to be inserted.") +}; + +// -=*# Resource for function FIXED #*=- +const char* SC_OPCODE_FIXED_ARY[] = +{ + NC_("SC_OPCODE_FIXED", "Formats a number with a fixed number of places after the decimal point and thousands separator."), + NC_("SC_OPCODE_FIXED", "number"), + NC_("SC_OPCODE_FIXED", "The number to be formatted."), + NC_("SC_OPCODE_FIXED", "Decimals"), + NC_("SC_OPCODE_FIXED", "Decimal places. The number of fixed decimal places that are to be displayed."), + NC_("SC_OPCODE_FIXED", "No thousands separators"), + NC_("SC_OPCODE_FIXED", "Thousands separator. If 0 or omitted the locale group separator is used else the separator is suppressed.") +}; + +// -=*# Resource for function LEN #*=- +const char* SC_OPCODE_LEN_ARY[] = +{ + NC_("SC_OPCODE_LEN", "Calculates length of a text string."), + NC_("SC_OPCODE_LEN", "text"), + NC_("SC_OPCODE_LEN", "The text in which the length is to be determined.") +}; + +// -=*# Resource for function LEFT #*=- +const char* SC_OPCODE_LEFT_ARY[] = +{ + NC_("SC_OPCODE_LEFT", "Returns the first character or characters of a text."), + NC_("SC_OPCODE_LEFT", "text"), + NC_("SC_OPCODE_LEFT", "The text where the initial partial words are to be determined."), + NC_("SC_OPCODE_LEFT", "number"), + NC_("SC_OPCODE_LEFT", "The number of characters for the start text.") +}; + +// -=*# Resource for function RIGHT #*=- +const char* SC_OPCODE_RIGHT_ARY[] = +{ + NC_("SC_OPCODE_RIGHT", "Returns the last character or characters of a text."), + NC_("SC_OPCODE_RIGHT", "text"), + NC_("SC_OPCODE_RIGHT", "The text in which the end partial words are to be determined."), + NC_("SC_OPCODE_RIGHT", "number"), + NC_("SC_OPCODE_RIGHT", "The number of characters for the end text.") +}; + +// -=*# Resource for function MID #*=- +const char* SC_OPCODE_MID_ARY[] = +{ + NC_("SC_OPCODE_MID", "Returns a partial text string of a text."), + NC_("SC_OPCODE_MID", "text"), + NC_("SC_OPCODE_MID", "The text in which partial words are to be determined."), + NC_("SC_OPCODE_MID", "start"), + NC_("SC_OPCODE_MID", "The position from which the part word is to be determined."), + NC_("SC_OPCODE_MID", "number"), + NC_("SC_OPCODE_MID", "The number of characters for the text.") +}; + +// -=*# Resource for function REPT #*=- +const char* SC_OPCODE_REPT_ARY[] = +{ + NC_("SC_OPCODE_REPT", "Repeats text a given number of times."), + NC_("SC_OPCODE_REPT", "text"), + NC_("SC_OPCODE_REPT", "The text to be repeated."), + NC_("SC_OPCODE_REPT", "number"), + NC_("SC_OPCODE_REPT", "The number of times the text is to be repeated.") +}; + +// -=*# Resource for function SUBSTITUTE #*=- +const char* SC_OPCODE_SUBSTITUTE_ARY[] = +{ + NC_("SC_OPCODE_SUBSTITUTE", "Substitutes new text for old text in a string."), + NC_("SC_OPCODE_SUBSTITUTE", "text"), + NC_("SC_OPCODE_SUBSTITUTE", "The text in which partial words are to be replaced."), + NC_("SC_OPCODE_SUBSTITUTE", "search_text"), + NC_("SC_OPCODE_SUBSTITUTE", "The partial string to be (repeatedly) replaced."), + NC_("SC_OPCODE_SUBSTITUTE", "new text"), + NC_("SC_OPCODE_SUBSTITUTE", "The text which is to replace the text string."), + NC_("SC_OPCODE_SUBSTITUTE", "occurrence"), + NC_("SC_OPCODE_SUBSTITUTE", "Which occurrence of the old text is to be replaced.") +}; + +// -=*# Resource for function BASE #*=- +const char* SC_OPCODE_BASE_ARY[] = +{ + NC_("SC_OPCODE_BASE", "Converts a positive integer to text from a number system to the base defined."), + NC_("SC_OPCODE_BASE", "number"), + NC_("SC_OPCODE_BASE", "The number to be converted."), + NC_("SC_OPCODE_BASE", "radix"), + NC_("SC_OPCODE_BASE", "The base number for conversion must be in the range 2 - 36."), + NC_("SC_OPCODE_BASE", "Minimum length"), + NC_("SC_OPCODE_BASE", "If the text is shorter than the specified length, zeros are added to the left of the string.") +}; + +// -=*# Resource for function DECIMAL #*=- +const char* SC_OPCODE_DECIMAL_ARY[] = +{ + NC_("SC_OPCODE_DECIMAL", "Converts a text of a specified number system to a positive integer in the base given."), + NC_("SC_OPCODE_DECIMAL", "text"), + NC_("SC_OPCODE_DECIMAL", "The text to be converted."), + NC_("SC_OPCODE_DECIMAL", "radix"), + NC_("SC_OPCODE_DECIMAL", "The base number for conversion must be in the range 2 - 36.") +}; + +// -=*# Resource for function CONVERT_OOO #*=- +const char* SC_OPCODE_CONVERT_OOO_ARY[] = +{ + NC_("SC_OPCODE_CONVERT_OOO", "Converts a value according to a conversion table in the configuration (main.xcd)."), + NC_("SC_OPCODE_CONVERT_OOO", "value"), + NC_("SC_OPCODE_CONVERT_OOO", "The value to be converted."), + NC_("SC_OPCODE_CONVERT_OOO", "text"), + NC_("SC_OPCODE_CONVERT_OOO", "Unit from which something is converted, case-sensitive."), + NC_("SC_OPCODE_CONVERT_OOO", "text"), + NC_("SC_OPCODE_CONVERT_OOO", "Unit into which something is converted, case-sensitive.") +}; + +// -=*# Resource for function ROMAN #*=- +const char* SC_OPCODE_ROMAN_ARY[] = +{ + NC_("SC_OPCODE_ROMAN", "Converts a number to a Roman numeral."), + NC_("SC_OPCODE_ROMAN", "Number"), + NC_("SC_OPCODE_ROMAN", "The number to be converted to a Roman numeral must be in the 0 - 3999 range."), + NC_("SC_OPCODE_ROMAN", "Mode"), + NC_("SC_OPCODE_ROMAN", "The more this value increases, the more the Roman numeral is simplified. The value must be in the 0 - 4 range.") +}; + +// -=*# Resource for function ARABIC #*=- +const char* SC_OPCODE_ARABIC_ARY[] = +{ + NC_("SC_OPCODE_ARABIC", "Calculates the value of a Roman numeral."), + NC_("SC_OPCODE_ARABIC", "Text"), + NC_("SC_OPCODE_ARABIC", "The text that represents a Roman numeral.") +}; + +const char* SC_OPCODE_INFO_ARY[] = +{ + NC_("SC_OPCODE_INFO", "Returns information about the environment."), + NC_("SC_OPCODE_INFO", "Text"), + NC_("SC_OPCODE_INFO", "Can be \"osversion\", \"system\", \"release\", \"numfile\", and \"recalc\".") +}; + +const char* SC_OPCODE_UNICODE_ARY[] = +{ + NC_("SC_OPCODE_UNICODE", "Returns the numeric code for the first Unicode character in a text string."), + NC_("SC_OPCODE_UNICODE", "text"), + NC_("SC_OPCODE_UNICODE", "This is the text for which the code of the first character is to be found.") +}; + +const char* SC_OPCODE_UNICHAR_ARY[] = +{ + NC_("SC_OPCODE_UNICHAR", "Converts a code number into a Unicode character or letter."), + NC_("SC_OPCODE_UNICHAR", "number"), + NC_("SC_OPCODE_UNICHAR", "The code value for the character.") +}; + +const char* SC_OPCODE_EUROCONVERT_ARY[] = +{ + NC_("SC_OPCODE_EUROCONVERT", "Converts a value from one to another Euro currency."), + NC_("SC_OPCODE_EUROCONVERT", "value"), + NC_("SC_OPCODE_EUROCONVERT", "The value to be converted."), + NC_("SC_OPCODE_EUROCONVERT", "from_currency"), + NC_("SC_OPCODE_EUROCONVERT", "ISO 4217 code of the currency from which is converted, case-sensitive."), + NC_("SC_OPCODE_EUROCONVERT", "to_currency"), + NC_("SC_OPCODE_EUROCONVERT", "ISO 4217 code of the currency into which is converted, case-sensitive."), + NC_("SC_OPCODE_EUROCONVERT", "full_precision"), + NC_("SC_OPCODE_EUROCONVERT", "If omitted or 0 or FALSE, the result is rounded to the decimals of to_currency. Else the result is not rounded."), + NC_("SC_OPCODE_EUROCONVERT", "triangulation_precision"), + /* This description uses almost all available space in the dialog, make sure translations fit in size */ + NC_("SC_OPCODE_EUROCONVERT", "If given and >=3, the intermediate result of a triangular conversion is rounded to that precision. If omitted, the result is not rounded.") +}; + +const char* SC_OPCODE_NUMBERVALUE_ARY[] = +{ + NC_("SC_OPCODE_NUMBERVALUE", "Converts text to a number, in a locale-independent way."), + NC_("SC_OPCODE_NUMBERVALUE", "text"), + NC_("SC_OPCODE_NUMBERVALUE", "The text to be converted to a number."), + NC_("SC_OPCODE_NUMBERVALUE", "decimal_separator"), + NC_("SC_OPCODE_NUMBERVALUE", "Defines the character used as the decimal separator."), + NC_("SC_OPCODE_NUMBERVALUE", "group_separator"), + NC_("SC_OPCODE_NUMBERVALUE", "Defines the character(s) used as the group separator.") +}; + + +const char* SC_OPCODE_BITAND_ARY[] = +{ + NC_("SC_OPCODE_BITAND", "Bitwise \"AND\" of two integers."), + NC_("SC_OPCODE_BITAND", "Number1"), + NC_("SC_OPCODE_BITAND", "Positive integer less than 2^48."), + NC_("SC_OPCODE_BITAND", "Number2"), + NC_("SC_OPCODE_BITAND", "Positive integer less than 2^48.") +}; + +const char* SC_OPCODE_BITOR_ARY[] = +{ + NC_("SC_OPCODE_BITOR", "Bitwise \"OR\" of two integers."), + NC_("SC_OPCODE_BITOR", "Number1"), + NC_("SC_OPCODE_BITOR", "Positive integer less than 2^48."), + NC_("SC_OPCODE_BITOR", "Number2"), + NC_("SC_OPCODE_BITOR", "Positive integer less than 2^48.") +}; + +const char* SC_OPCODE_BITXOR_ARY[] = +{ + NC_("SC_OPCODE_BITXOR", "Bitwise \"exclusive OR\" of two integers."), + NC_("SC_OPCODE_BITXOR", "Number1"), + NC_("SC_OPCODE_BITXOR", "Positive integer less than 2^48."), + NC_("SC_OPCODE_BITXOR", "Number2"), + NC_("SC_OPCODE_BITXOR", "Positive integer less than 2^48.") +}; + +const char* SC_OPCODE_BITRSHIFT_ARY[] = +{ + NC_("SC_OPCODE_BITRSHIFT", "Bitwise right shift of an integer value."), + NC_("SC_OPCODE_BITRSHIFT", "Number"), + NC_("SC_OPCODE_BITRSHIFT", "The value to be shifted. Positive integer less than 2^48."), + NC_("SC_OPCODE_BITRSHIFT", "Shift"), + NC_("SC_OPCODE_BITRSHIFT", "The integer number of bits the value is to be shifted.") +}; + +const char* SC_OPCODE_BITLSHIFT_ARY[] = +{ + NC_("SC_OPCODE_BITLSHIFT", "Bitwise left shift of an integer value."), + NC_("SC_OPCODE_BITLSHIFT", "Number"), + NC_("SC_OPCODE_BITLSHIFT", "The value to be shifted. Positive integer less than 2^48."), + NC_("SC_OPCODE_BITLSHIFT", "Shift"), + NC_("SC_OPCODE_BITLSHIFT", "The integer number of bits the value is to be shifted.") +}; + +const char* SC_OPCODE_LENB_ARY[] = +{ + NC_("SC_OPCODE_LENB", "Calculates length of a text string, with DBCS"), + NC_("SC_OPCODE_LENB", "text"), + NC_("SC_OPCODE_LENB", "The text in which the length is to be determined.") +}; + +const char* SC_OPCODE_RIGHTB_ARY[] = +{ + NC_("SC_OPCODE_RIGHTB", "Returns the last character or characters of a text,with DBCS"), + NC_("SC_OPCODE_RIGHTB", "text"), + NC_("SC_OPCODE_RIGHTB", "The text in which the end partial words are to be determined."), + NC_("SC_OPCODE_RIGHTB", "number"), + NC_("SC_OPCODE_RIGHTB", "The number of characters for the end text.") +}; + +const char* SC_OPCODE_LEFTB_ARY[] = +{ + NC_("SC_OPCODE_LEFTB", "Returns the first character or characters of a text,with DBCS"), + NC_("SC_OPCODE_LEFTB", "text"), + NC_("SC_OPCODE_LEFTB", "The text where the initial partial words are to be determined."), + NC_("SC_OPCODE_LEFTB", "number"), + NC_("SC_OPCODE_LEFTB", "The number of characters for the start text.") +}; + +const char* SC_OPCODE_MIDB_ARY[] = +{ + NC_("SC_OPCODE_MIDB", "Returns a partial text string of a text, with DBCS"), + NC_("SC_OPCODE_MIDB", "text"), + NC_("SC_OPCODE_MIDB", "The text in which partial words are to be determined."), + NC_("SC_OPCODE_MIDB", "start"), + NC_("SC_OPCODE_MIDB", "The position from which the part word is to be determined."), + NC_("SC_OPCODE_MIDB", "number"), + NC_("SC_OPCODE_MIDB", "The number of characters for the text.") +}; + +const char* SC_OPCODE_FILTERXML_ARY[] = +{ + NC_("SC_OPCODE_FILTERXML", "Apply an XPath expression to an XML document"), + NC_("SC_OPCODE_FILTERXML", "XML Document"), + NC_("SC_OPCODE_FILTERXML", "String containing a valid XML stream"), + NC_("SC_OPCODE_FILTERXML", "XPath expression"), + NC_("SC_OPCODE_FILTERXML", "String containing a valid XPath expression") +}; + +const char* SC_OPCODE_COLOR_ARY[] = +{ + NC_("SC_OPCODE_COLOR", "Returns an implementation defined value representing a RGBA color"), + NC_("SC_OPCODE_COLOR", "Red"), + NC_("SC_OPCODE_COLOR", "Value of red"), + NC_("SC_OPCODE_COLOR", "Green"), + NC_("SC_OPCODE_COLOR", "Value of green"), + NC_("SC_OPCODE_COLOR", "Blue"), + NC_("SC_OPCODE_COLOR", "Value of blue"), + NC_("SC_OPCODE_COLOR", "Alpha"), + NC_("SC_OPCODE_COLOR", "Value of alpha") +}; + +const char* SC_OPCODE_WEBSERVICE_ARY[] = +{ + NC_("SC_OPCODE_WEBSERVICE", "Get some webcontent from an URI."), + NC_("SC_OPCODE_WEBSERVICE", "URI"), + NC_("SC_OPCODE_WEBSERVICE", "URI of the webservice") +}; + +const char* SC_OPCODE_ENCODEURL_ARY[] = +{ + NC_("SC_OPCODE_ENCODEURL", "Return a URL-encoded string."), + NC_("SC_OPCODE_ENCODEURL", "Text"), + NC_("SC_OPCODE_ENCODEURL", "A string to be URL-encoded") +}; + +const char* SC_OPCODE_ERF_MS_ARY[] = +{ + NC_("SC_OPCODE_ERF_MS", "Returns the error function."), + NC_("SC_OPCODE_ERF_MS", "Lower Limit"), + NC_("SC_OPCODE_ERF_MS", "The lower limit for integration") +}; + +const char* SC_OPCODE_ERFC_MS_ARY[] = +{ + NC_("SC_OPCODE_ERFC_MS", "Returns the complementary error function."), + NC_("SC_OPCODE_ERFC_MS", "Lower Limit"), + NC_("SC_OPCODE_ERFC_MS", "The lower limit for integration") +}; + +const char* SC_OPCODE_RAWSUBTRACT_ARY[] = +{ + NC_("SC_OPCODE_RAWSUBTRACT", "Returns the subtraction of numbers. Like a-b-c but without eliminating small roundoff errors."), + NC_("SC_OPCODE_RAWSUBTRACT", "minuend"), + NC_("SC_OPCODE_RAWSUBTRACT", "Number from which following arguments are subtracted."), + NC_("SC_OPCODE_RAWSUBTRACT", "subtrahend "), + NC_("SC_OPCODE_RAWSUBTRACT", "Subtrahend 1, subtrahend 2, ... are numerical arguments subtracted from the minuend.") +}; + +// -=*# Resource for function ROUNDSIG #*=- +const char* SC_OPCODE_ROUNDSIG_ARY[] = +{ + NC_("SC_OPCODE_ROUNDSIG", "Rounds a number to predefined significant digits."), + NC_("SC_OPCODE_ROUNDSIG", "value"), + NC_("SC_OPCODE_ROUNDSIG", "The number to be rounded."), + NC_("SC_OPCODE_ROUNDSIG", "digits"), + NC_("SC_OPCODE_ROUNDSIG", "The number of significant digits to which value is to be rounded.") +}; + +const char* SC_OPCODE_REPLACEB_ARY[] = +{ + NC_("SC_OPCODE_REPLACEB", "Replaces characters within a text string with a different text string, with DBCS."), + NC_("SC_OPCODE_REPLACEB", "Text"), + NC_("SC_OPCODE_REPLACEB", "The text in which some characters are to be replaced."), + NC_("SC_OPCODE_REPLACEB", "position"), + NC_("SC_OPCODE_REPLACEB", "The character position from which text is to be replaced."), + NC_("SC_OPCODE_REPLACEB", "length"), + NC_("SC_OPCODE_REPLACEB", "The number of characters to be replaced."), + NC_("SC_OPCODE_REPLACEB", "new text"), + NC_("SC_OPCODE_REPLACEB", "The text to be inserted.") +}; + +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/sdbtools/inc/module_sdbt.hxx b/sc/inc/scfuncs.hxx similarity index 68% rename from dbaccess/source/sdbtools/inc/module_sdbt.hxx rename to sc/inc/scfuncs.hxx index 467b98963e3e..820fcc96a4c2 100644 --- a/dbaccess/source/sdbtools/inc/module_sdbt.hxx +++ b/sc/inc/scfuncs.hxx @@ -16,19 +16,21 @@ * 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_SC_INC_SCFUNCS_HXX +#define INCLUDED_SC_INC_SCFUNCS_HXX -#ifndef INCLUDED_DBACCESS_SOURCE_SDBTOOLS_INC_MODULE_SDBT_HXX -#define INCLUDED_DBACCESS_SOURCE_SDBTOOLS_INC_MODULE_SDBT_HXX +#define ID_FUNCTION_GRP_DATABASE 1 +#define ID_FUNCTION_GRP_DATETIME 2 +#define ID_FUNCTION_GRP_FINANZ 3 +#define ID_FUNCTION_GRP_INFO 4 +#define ID_FUNCTION_GRP_LOGIC 5 +#define ID_FUNCTION_GRP_MATH 6 +#define ID_FUNCTION_GRP_MATRIX 7 +#define ID_FUNCTION_GRP_STATISTIC 8 +#define ID_FUNCTION_GRP_TABLE 9 +#define ID_FUNCTION_GRP_TEXT 10 +#define ID_FUNCTION_GRP_ADDINS 11 -#include - -namespace sdbtools -{ - - DEFINE_MODULE( SdbtModule, SdbtClient, SdbtRes ) - -} // namespace sdbtools - -#endif // INCLUDED_DBACCESS_SOURCE_SDBTOOLS_INC_MODULE_SDBT_HXX +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/scres.hrc b/sc/inc/scres.hrc index 139e84001023..dfc56306c8be 100644 --- a/sc/inc/scres.hrc +++ b/sc/inc/scres.hrc @@ -24,350 +24,8 @@ #include "formula/compiler.hrc" #define STR_START (SC_RESOURCE_START+100) -#define SCSTR_UNDEFINED (STR_START + 8) -#define SCSTR_NONAME (STR_START + 9) -#define SCSTR_NONE (STR_START + 10) -#define SCSTR_FILTER_EMPTY (STR_START + 11) -#define SCSTR_FILTER_NOTEMPTY (STR_START + 12) -#define SCSTR_COLUMN (STR_START + 13) -#define SCSTR_ROW (STR_START + 14) -#define SCSTR_TABLE (STR_START + 24) -#define SCSTR_NAME (STR_START + 25) -#define SCSTR_APDTABLE (STR_START + 27) -#define SCSTR_RENAMETAB (STR_START + 28) -#define STR_INSERTGRAPHIC (STR_START + 29) - -#define SCSTR_PROTECTDOC (STR_START + 39) -#define SCSTR_UNPROTECTDOC (STR_START + 40) -#define SCSTR_UNPROTECTTAB (STR_START + 42) -#define SCSTR_PASSWORD (STR_START + 43) -#define SCSTR_PASSWORDOPT (STR_START + 44) -#define SCSTR_WRONGPASSWORD (STR_START + 45) - -#define SCSTR_END (STR_START + 47) - -#define SCSTR_UNKNOWN (STR_START + 49) -#define SCSTR_ALL (STR_START + 51) -#define SCSTR_STDFILTER (STR_START + 52) - -#define SCSTR_CHARSET_USER (STR_START + 59) -#define SCSTR_COLUMN_USER (STR_START + 60) -//free -//free -#define SCSTR_MULTIPLE (STR_START + 63) - -#define SCSTR_TOP10FILTER (STR_START + 66) - -#define SCSTR_UNDO_GRAFFILTER (STR_START + 83) - -#define SCSTR_COL_LABEL (STR_START + 84) -#define SCSTR_ROW_LABEL (STR_START + 85) - -#define SCSTR_CHG_PROTECT (STR_START + 86) -#define SCSTR_CHG_UNPROTECT (STR_START + 87) - -#define STR_CAPTION_DEFAULT_TEXT (STR_START + 88) - -// dialog: select sheets -#define STR_DLG_SELECTTABLES_TITLE (STR_START + 89) -#define STR_DLG_SELECTTABLES_LBNAME (STR_START + 90) - -// replace cell contents warning -#define STR_REPLCELLSWARN (STR_START + 91) - -#define SCSTR_DPFUNCLISTBOX (STR_START + 92) - -//free -#define SCSTR_UNIT (STR_START + 114) - -// print options -#define SCSTR_PRINTOPT_PAGES (STR_START + 120) -#define SCSTR_PRINTOPT_SUPPRESSEMPTY (STR_START + 121) -#define SCSTR_PRINTOPT_PRNTCONTENT (STR_START + 122) -#define SCSTR_PRINTOPT_ALLSHEETS (STR_START + 123) -#define SCSTR_PRINTOPT_SELECTEDSHEETS (STR_START + 124) -#define SCSTR_PRINTOPT_SELECTEDCELLS (STR_START + 125) -#define SCSTR_PRINTOPT_FROMWHICH (STR_START + 126) -#define SCSTR_PRINTOPT_ALLPAGES (STR_START + 127) -#define SCSTR_PRINTOPT_PAGES_ (STR_START + 128) -#define SCSTR_PRINTOPT_PRODNAME (STR_START + 129) - -// accessibility - -// CSV import -#define STR_ACC_CSVRULER_NAME (STR_START + 150) -#define STR_ACC_CSVRULER_DESCR (STR_START + 151) -#define STR_ACC_CSVGRID_NAME (STR_START + 152) -#define STR_ACC_CSVGRID_DESCR (STR_START + 153) - -// document -#define STR_ACC_DOC_NAME (STR_START + 154) -//free -#define STR_ACC_TABLE_NAME (STR_START + 156) -//free -#define STR_ACC_CELL_NAME (STR_START + 158) -//free - -// preview -#define STR_ACC_PREVIEWDOC_NAME (STR_START + 160) -//free -//free -//free -#define STR_ACC_LEFTAREA_NAME (STR_START + 164) -//free -#define STR_ACC_CENTERAREA_NAME (STR_START + 166) -//free -#define STR_ACC_RIGHTAREA_NAME (STR_START + 168) -//free -#define STR_ACC_HEADER_NAME (STR_START + 170) -//free -#define STR_ACC_FOOTER_NAME (STR_START + 172) -//free - -// Editline -#define STR_ACC_EDITLINE_NAME (STR_START + 174) -#define STR_ACC_EDITLINE_DESCR (STR_START + 175) - -#define STR_ACC_TOOLBAR_FORMULA (STR_START + 184) -#define STR_ACC_DOC_SPREADSHEET (STR_START + 185) -#define STR_ACC_DOC_PREVIEW_SUFFIX (STR_START + 186) -#define STR_ACC_DOC_SPREADSHEET_READONLY (STR_START + 187) - -#define SCSTR_SHORT_SCDOC_NAME (STR_START + 211) -#define SCSTR_LONG_SCDOC_NAME (STR_START + 212) - -#define SCSTR_FORMULA_AUTOCORRECTION (STR_START + 214) - -#define SCSTR_RENAMEOBJECT (STR_START + 215) -#define SCSTR_CONDITION (STR_START + 216) -#define SCSTR_WARN_ME_IN_FUTURE_CHECK (STR_START + 217) - -// header of search result dialog - -#define STR_SHEET (STR_START + 218) -#define STR_CELL (STR_START + 219) -#define STR_CONTENT (STR_START + 220) - -// Undo Anchor - -#define SCSTR_UNDO_PAGE_ANCHOR (STR_START + 221) -#define SCSTR_UNDO_CELL_ANCHOR (STR_START + 222) - -// navigator - in the same order as SC_CONTENT_... -#define SCSTR_CONTENT_ROOT (STR_START + 250) -#define SCSTR_CONTENT_TABLE (STR_START + 251) -#define SCSTR_CONTENT_RANGENAME (STR_START + 252) -#define SCSTR_CONTENT_DBAREA (STR_START + 253) -#define SCSTR_CONTENT_GRAPHIC (STR_START + 254) -#define SCSTR_CONTENT_OLEOBJECT (STR_START + 255) -#define SCSTR_CONTENT_NOTE (STR_START + 256) -#define SCSTR_CONTENT_AREALINK (STR_START + 257) -#define SCSTR_CONTENT_DRAWING (STR_START + 258) -#define SCSTR_DRAGMODE (STR_START + 259) -#define SCSTR_DISPLAY (STR_START + 260) -#define SCSTR_ACTIVE (STR_START + 261) -#define SCSTR_NOTACTIVE (STR_START + 262) -#define SCSTR_HIDDEN (STR_START + 263) -#define SCSTR_ACTIVEWIN (STR_START + 264) -#define SCSTR_QHLP_SCEN_LISTBOX (STR_START + 265) -#define SCSTR_QHLP_SCEN_COMMENT (STR_START + 266) - -// some space for extensions - -// input, quickhelp strings (HelpText now using HelpId from help) -#define SCSTR_QHELP_INPUTWND (STR_START + 307) -#define SCSTR_QHELP_POSWND (STR_START + 308) -#define SCSTR_QHELP_BTNCALC (STR_START + 309) -#define SCSTR_QHELP_BTNOK (STR_START + 310) -#define SCSTR_QHELP_BTNCANCEL (STR_START + 311) -#define SCSTR_QHELP_BTNSUM (STR_START + 312) -#define SCSTR_QHELP_BTNEQUAL (STR_START + 313) - -// validator -#define SCSTR_VALID_MINIMUM (STR_START + 314) -#define SCSTR_VALID_MAXIMUM (STR_START + 315) -#define SCSTR_VALID_VALUE (STR_START + 316) -#define SCSTR_VALID_RANGE (STR_START + 317) -#define SCSTR_VALID_LIST (STR_START + 318) - -// media shell -#define SCSTR_MEDIASHELL (STR_START + 401) - -#define RID_SCSTR_ONCLICK (STR_START + 402) - -#define SCSTR_SET_TAB_BG_COLOR (STR_START + 403) -#define SCSTR_NO_TAB_BG_COLOR (STR_START + 404) -#define SCSTR_DDEDOC_NOT_LOADED (STR_START + 405) -#define SCSTR_QHELP_EXPAND_FORMULA (STR_START + 406) -#define SCSTR_QHELP_COLLAPSE_FORMULA (STR_START + 407) -#define SCSTR_EXTDOC_NOT_LOADED (STR_START + 408) - -#define SCSTR_FORMULA_SYNTAX_CALC_A1 (STR_START + 409) -#define SCSTR_FORMULA_SYNTAX_XL_A1 (STR_START + 410) -#define SCSTR_FORMULA_SYNTAX_XL_R1C1 (STR_START + 411) - -#define SCSTR_FIELDSEP_TAB (STR_START + 412) -#define SCSTR_FIELDSEP_SPACE (STR_START + 413) - -#define SCSTR_VALERR (STR_START + 414) - -#define STR_NOFORMULASPECIFIED (STR_START + 415) -#define STR_NOCOLROW (STR_START + 416) -#define STR_WRONGFORMULA (STR_START + 417) -#define STR_WRONGROWCOL (STR_START + 418) -#define STR_NOCOLFORMULA (STR_START + 419) -#define STR_NOROWFORMULA (STR_START + 420) -#define STR_ADD_AUTOFORMAT_TITLE (STR_START + 421) -#define STR_RENAME_AUTOFORMAT_TITLE (STR_START + 422) -#define STR_ADD_AUTOFORMAT_LABEL (STR_START + 423) -#define STR_DEL_AUTOFORMAT_TITLE (STR_START + 424) -#define STR_DEL_AUTOFORMAT_MSG (STR_START + 425) -#define STR_BTN_AUTOFORMAT_CLOSE (STR_START + 426) -#define STR_JAN (STR_START + 427) -#define STR_FEB (STR_START + 428) -#define STR_MAR (STR_START + 429) -#define STR_NORTH (STR_START + 430) -#define STR_MID (STR_START + 431) -#define STR_SOUTH (STR_START + 432) -#define STR_SUM (STR_START + 433) -#define SCSTR_UPDATE_EXTDOCS (STR_START + 434) -#define STR_NOT_PROTECTED (STR_START + 435) -#define STR_NOT_PASS_PROTECTED (STR_START + 436) -#define STR_HASH_BAD (STR_START + 437) -#define STR_HASH_GOOD (STR_START + 438) -#define STR_RETYPE (STR_START + 440) - -#define STR_TITLE_CONFLICT (STR_START + 441) -#define STR_TITLE_AUTHOR (STR_START + 442) -#define STR_TITLE_DATE (STR_START + 443) -#define STR_UNKNOWN_USER_CONFLICT (STR_START + 444) - -#define STR_UNDO_DISTRIBUTION_TEMPLATE (STR_START + 445) -#define STR_DISTRIBUTION_UNIFORM_REAL (STR_START + 446) -#define STR_DISTRIBUTION_UNIFORM_INTEGER (STR_START + 447) -#define STR_DISTRIBUTION_NORMAL (STR_START + 448) -#define STR_DISTRIBUTION_CAUCHY (STR_START + 449) -#define STR_DISTRIBUTION_BERNOULLI (STR_START + 450) -#define STR_DISTRIBUTION_BINOMIAL (STR_START + 451) -#define STR_DISTRIBUTION_NEGATIVE_BINOMIAL (STR_START + 452) -#define STR_DISTRIBUTION_CHI_SQUARED (STR_START + 453) -#define STR_DISTRIBUTION_GEOMETRIC (STR_START + 454) - -#define STR_RNG_PARAMETER_MINIMUM (STR_START + 455) -#define STR_RNG_PARAMETER_MAXIMUM (STR_START + 456) -#define STR_RNG_PARAMETER_MEAN (STR_START + 457) -#define STR_RNG_PARAMETER_STANDARD_DEVIATION (STR_START + 458) -#define STR_RNG_PARAMETER_STANDARD_MEDIAN (STR_START + 459) -#define STR_RNG_PARAMETER_STANDARD_SIGMA (STR_START + 460) -#define STR_RNG_PARAMETER_STANDARD_PROBABILITY (STR_START + 461) -#define STR_RNG_PARAMETER_STANDARD_NUMBER_OF_TRIALS (STR_START + 462) -#define STR_RNG_PARAMETER_STANDARD_NU_VALUE (STR_START + 463) - -#define STR_SAMPLING_UNDO_NAME (STR_START + 464) - -#define STRID_CALC_MEAN (STR_START + 465) -#define STRID_CALC_STD_ERROR (STR_START + 466) -#define STRID_CALC_MODE (STR_START + 467) -#define STRID_CALC_MEDIAN (STR_START + 468) -#define STRID_CALC_VARIANCE (STR_START + 469) -#define STRID_CALC_STD_DEVIATION (STR_START + 470) -#define STRID_CALC_KURTOSIS (STR_START + 471) -#define STRID_CALC_SKEWNESS (STR_START + 472) -#define STRID_CALC_RANGE (STR_START + 473) -#define STRID_CALC_MIN (STR_START + 474) -#define STRID_CALC_MAX (STR_START + 475) -#define STRID_CALC_SUM (STR_START + 476) -#define STRID_CALC_COUNT (STR_START + 477) -#define STRID_CALC_FIRST_QUARTILE (STR_START + 478) -#define STRID_CALC_THIRD_QUARTILE (STR_START + 479) - -#define STR_DESCRIPTIVE_STATISTICS_UNDO_NAME (STR_START + 480) -#define STR_ANALYSIS_OF_VARIANCE_UNDO_NAME (STR_START + 481) -#define STR_CORRELATION_UNDO_NAME (STR_START + 482) -#define STR_COVARIANCE_UNDO_NAME (STR_START + 483) -#define STR_EXPONENTIAL_SMOOTHING_UNDO_NAME (STR_START + 484) -#define STR_MOVING_AVERAGE_UNDO_NAME (STR_START + 485) -#define STR_REGRESSION (STR_START + 486) -#define STR_REGRESSION_UNDO_NAME (STR_START + 487) -#define STR_TTEST (STR_START + 488) -#define STR_TTEST_UNDO_NAME (STR_START + 489) -#define STR_FTEST (STR_START + 490) -#define STR_FTEST_UNDO_NAME (STR_START + 491) -#define STR_ZTEST (STR_START + 492) -#define STR_ZTEST_UNDO_NAME (STR_START + 493) -#define STR_CHI_SQUARE_TEST (STR_START + 494) - -#define STR_COLUMN_LABEL_TEMPLATE (STR_START + 495) -#define STR_ROW_LABEL_TEMPLATE (STR_START + 496) - -#define STR_ANOVA_SINGLE_FACTOR_LABEL (STR_START + 497) -#define STR_ANOVA_LABEL_GROUPS (STR_START + 498) -#define STR_ANOVA_LABEL_BETWEEN_GROUPS (STR_START + 499) -#define STR_ANOVA_LABEL_WITHIN_GROUPS (STR_START + 500) -#define STR_ANOVA_LABEL_SOURCE_OF_VARIATION (STR_START + 501) -#define STR_ANOVA_LABEL_SS (STR_START + 502) -#define STR_ANOVA_LABEL_DF (STR_START + 503) -#define STR_ANOVA_LABEL_MS (STR_START + 504) -#define STR_ANOVA_LABEL_F (STR_START + 505) -#define STR_ANOVA_LABEL_P_VALUE (STR_START + 506) -#define STR_ANOVA_LABEL_F_CRITICAL (STR_START + 507) -#define STR_ANOVA_LABEL_TOTAL (STR_START + 508) -#define STR_ANOVA_TWO_FACTOR_LABEL (STR_START + 509) - -#define STR_CORRELATION_LABEL (STR_START + 510) -#define STR_COVARIANCE_LABEL (STR_START + 511) -#define STR_LABEL_ALPHA (STR_START + 512) -#define STR_VARIABLE_1_LABEL (STR_START + 513) -#define STR_VARIABLE_2_LABEL (STR_START + 514) -#define STR_HYPOTHESIZED_MEAN_DIFFERENCE_LABEL (STR_START + 515) -#define STR_OBSERVATIONS_LABEL (STR_START + 516) -#define STR_OBSERVED_MEAN_DIFFERENCE_LABEL (STR_START + 517) -#define STR_DEGREES_OF_FREEDOM_LABEL (STR_START + 518) -#define STR_P_VALUE_LABEL (STR_START + 519) -#define STR_CRITICAL_VALUE_LABEL (STR_START + 520) -#define STR_TEST_STATISTIC_LABEL (STR_START + 521) - -#define STR_LABEL_LINEAR (STR_START + 522) -#define STR_LABEL_LOGARITHMIC (STR_START + 523) -#define STR_LABEL_POWER (STR_START + 524) - -#define STR_LABEL_REGRESSION_MODEL (STR_START + 525) -#define STR_LABEL_RSQUARED (STR_START + 526) -#define STR_LABEL_SLOPE (STR_START + 527) -#define STR_LABEL_INTERCEPT (STR_START + 528) - -#define STR_FTEST_P_RIGHT_TAIL (STR_START + 529) -#define STR_FTEST_F_CRITICAL_RIGHT_TAIL (STR_START + 530) -#define STR_FTEST_P_LEFT_TAIL (STR_START + 531) -#define STR_FTEST_F_CRITICAL_LEFT_TAIL (STR_START + 532) -#define STR_FTEST_P_TWO_TAIL (STR_START + 533) -#define STR_FTEST_F_CRITICAL_TWO_TAIL (STR_START + 534) - -#define STR_TTEST_PEARSON_CORRELATION (STR_START + 535) -#define STR_TTEST_VARIANCE_OF_THE_DIFFERENCES (STR_START + 536) -#define STR_TTEST_T_STAT (STR_START + 537) -#define STR_TTEST_P_ONE_TAIL (STR_START + 538) -#define STR_TTEST_T_CRITICAL_ONE_TAIL (STR_START + 539) -#define STR_TTEST_P_TWO_TAIL (STR_START + 540) -#define STR_TTEST_T_CRITICAL_TWO_TAIL (STR_START + 541) - -#define STR_ZTEST_KNOWN_VARIANCE (STR_START + 542) -#define STR_ZTEST_Z_VALUE (STR_START + 543) -#define STR_ZTEST_P_ONE_TAIL (STR_START + 544) -#define STR_ZTEST_Z_CRITICAL_ONE_TAIL (STR_START + 545) -#define STR_ZTEST_P_TWO_TAIL (STR_START + 546) -#define STR_ZTEST_Z_CRITICAL_TWO_TAIL (STR_START + 547) - -#define STR_MENU_SORT_ASC (STR_START + 548) -#define STR_MENU_SORT_DESC (STR_START + 549) -#define STR_MENU_SORT_CUSTOM (STR_START + 550) -#define STR_BTN_TOGGLE_ALL (STR_START + 551) -#define STR_BTN_SELECT_CURRENT (STR_START + 552) -#define STR_BTN_UNSELECT_CURRENT (STR_START + 553) -#define STR_EDIT_SEARCH_ITEMS (STR_START + 554) - -#define STR_END (STR_EDIT_SEARCH_ITEMS) +#define STR_END (STR_START + 554) #define SC_DIALOGS_START (STR_END + 100) @@ -388,20 +46,8 @@ #define RID_SCDLG_HFEDIT_HEADER (SC_DIALOGS_START + 68) #define RID_SCDLG_HFEDIT_FOOTER (SC_DIALOGS_START + 69) -#define RID_CELLSTYLEFAMILY (SC_DIALOGS_START + 138) -#define RID_PAGESTYLEFAMILY (SC_DIALOGS_START + 139) - #define WID_CONDFRMT_REF (SC_DIALOGS_START + 163) -//put new things here and adjust SC_DIALOGS_END to match - -#define SC_DIALOGS_END (WID_CONDFRMT_REF + 1) - -#define RID_SC_FUNC_DESCRIPTIONS_START SC_DIALOGS_END -#define RID_SC_FUNC_DESCRIPTIONS_END (RID_SC_FUNC_DESCRIPTIONS_START + SC_OPCODE_LAST_OPCODE_ID + 1) - -#define RID_GLOBSTR_OFFSET (RID_SC_FUNC_DESCRIPTIONS_END + 1) - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/scresid.hxx b/sc/inc/scresid.hxx index d754f8eeea8f..e7bdb167ca5d 100644 --- a/sc/inc/scresid.hxx +++ b/sc/inc/scresid.hxx @@ -23,7 +23,7 @@ #include #include "scdllapi.h" -OUString SC_DLLPUBLIC ScResId(sal_uInt16 nId); +OUString SC_DLLPUBLIC ScResId(const char* pId); #endif // SC_SCRESMGR_HXX diff --git a/cui/source/dialogs/svuidlg.src b/sc/inc/scstyles.hrc similarity index 53% rename from cui/source/dialogs/svuidlg.src rename to sc/inc/scstyles.hrc index 81f89aa27707..08919cfbc44f 100644 --- a/cui/source/dialogs/svuidlg.src +++ b/sc/inc/scstyles.hrc @@ -17,39 +17,30 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include -#include "svuidlg.hrc" +#ifndef INCLUDED_SC_INC_SCSTYLES_HRC +#define INCLUDED_SC_INC_SCSTYLES_HRC +#include -String STR_AUTOLINK +#define NC_(Context, String) (Context "\004" u8##String) + +const std::pair RID_CELLSTYLEFAMILY[] = { - Text [ en-US ] = "Automatic" ; + { NC_("RID_CELLSTYLEFAMILY", "All Styles") , SFXSTYLEBIT_ALL_VISIBLE }, + { NC_("RID_CELLSTYLEFAMILY", "Hidden Styles") , SFXSTYLEBIT_HIDDEN }, + { NC_("RID_CELLSTYLEFAMILY", "Applied Styles") , SFXSTYLEBIT_USED }, + { NC_("RID_CELLSTYLEFAMILY", "Custom Styles") , SFXSTYLEBIT_USERDEF }, + { nullptr, 0 } }; -String STR_MANUALLINK +const std::pair RID_PAGESTYLEFAMILY[] = { - Text [ en-US ] = "Manual" ; -}; - -String STR_BROKENLINK -{ - Text [ en-US ] = "Not available" ; -}; - -String STR_CLOSELINKMSG -{ - Text [ en-US ] = "Are you sure you want to remove the selected link?" ; -}; - -String STR_CLOSELINKMSG_MULTI -{ - Text [ en-US ] = "Are you sure you want to remove the selected link?" ; -}; - -String STR_WAITINGLINK -{ - Text [ en-US ] = "Waiting"; + { NC_("RID_PAGESTYLEFAMILY", "All Styles") , SFXSTYLEBIT_ALL }, + { NC_("RID_PAGESTYLEFAMILY", "Hidden Styles") , SFXSTYLEBIT_HIDDEN }, + { NC_("RID_PAGESTYLEFAMILY", "Custom Styles") , SFXSTYLEBIT_USERDEF }, + { nullptr, 0 } }; +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc new file mode 100644 index 000000000000..26a6d5e4f2d3 --- /dev/null +++ b/sc/inc/strings.hrc @@ -0,0 +1,331 @@ +/* -*- 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_SC_INC_STRINGS_HRC +#define INCLUDED_SC_INC_STRINGS_HRC + +#define NC_(Context, String) (Context "\004" u8##String) + +// Strings for interface names ------------------------------------------- + +#define SCSTR_LONG_SCDOC_NAME NC_("SCSTR_LONG_SCDOC_NAME", "%PRODUCTNAME %PRODUCTVERSION Spreadsheet") +#define SCSTR_SHORT_SCDOC_NAME NC_("SCSTR_SHORT_SCDOC_NAME", "Spreadsheet") +#define SCSTR_UNDEFINED NC_("SCSTR_UNDEFINED", "- undefined -") +#define SCSTR_NONE NC_("SCSTR_NONE", "- none -") +#define SCSTR_ALL NC_("SCSTR_ALL", "- all -") +#define SCSTR_MULTIPLE NC_("SCSTR_MULTIPLE", "- multiple -") +#define SCSTR_STDFILTER NC_("SCSTR_STDFILTER", "Standard Filter...") +#define SCSTR_TOP10FILTER NC_("SCSTR_TOP10FILTER", "Top 10") +#define SCSTR_FILTER_EMPTY NC_("SCSTR_FILTER_EMPTY", "Empty") +#define SCSTR_FILTER_NOTEMPTY NC_("SCSTR_FILTER_NOTEMPTY", "Not Empty") +#define SCSTR_NONAME NC_("SCSTR_NONAME", "unnamed") +// "%1 is replaced to column letter, such as 'Column A'" +#define SCSTR_COLUMN NC_("SCSTR_COLUMN", "Column %1") +// "%1 is replaced to row number, such as 'Row 1'" +#define SCSTR_ROW NC_("SCSTR_ROW", "Row %1") +#define SCSTR_TABLE NC_("SCSTR_TABLE", "Sheet") +#define SCSTR_NAME NC_("SCSTR_NAME", "Name") +#define SCSTR_APDTABLE NC_("SCSTR_APDTABLE", "Append Sheet") +#define SCSTR_RENAMETAB NC_("SCSTR_RENAMETAB", "Rename Sheet") +#define SCSTR_SET_TAB_BG_COLOR NC_("SCSTR_SET_TAB_BG_COLOR", "Tab Color") +#define SCSTR_NO_TAB_BG_COLOR NC_("SCSTR_NO_TAB_BG_COLOR", "Default") +#define SCSTR_RENAMEOBJECT NC_("SCSTR_RENAMEOBJECT", "Name Object") +#define STR_INSERTGRAPHIC NC_("STR_INSERTGRAPHIC", "Insert Image") +// Attribute +#define SCSTR_PROTECTDOC NC_("SCSTR_PROTECTDOC", "Protect Document") +#define SCSTR_UNPROTECTDOC NC_("SCSTR_UNPROTECTDOC", "Unprotect document") +#define SCSTR_UNPROTECTTAB NC_("SCSTR_UNPROTECTTAB", "Unprotect sheet") +#define SCSTR_CHG_PROTECT NC_("SCSTR_CHG_PROTECT", "Protect Records") +#define SCSTR_CHG_UNPROTECT NC_("SCSTR_CHG_UNPROTECT", "Unprotect Records") +#define SCSTR_PASSWORD NC_("SCSTR_PASSWORD", "Password:") +#define SCSTR_PASSWORDOPT NC_("SCSTR_PASSWORDOPT", "Password (optional):") +#define SCSTR_WRONGPASSWORD NC_("SCSTR_WRONGPASSWORD", "Incorrect Password") +#define SCSTR_END NC_("SCSTR_END", "~End") +#define SCSTR_UNKNOWN NC_("SCSTR_UNKNOWN", "Unknown") +#define SCSTR_VALID_MINIMUM NC_("SCSTR_VALID_MINIMUM", "~Minimum") +#define SCSTR_VALID_MAXIMUM NC_("SCSTR_VALID_MAXIMUM", "~Maximum") +#define SCSTR_VALID_VALUE NC_("SCSTR_VALID_VALUE", "~Value") +#define SCSTR_VALID_RANGE NC_("SCSTR_VALID_RANGE", "~Source") +#define SCSTR_VALID_LIST NC_("SCSTR_VALID_LIST", "~Entries") +// for dialogues: +#define SCSTR_CHARSET_USER NC_("SCSTR_CHARSET_USER", "System") +#define SCSTR_COLUMN_USER NC_("SCSTR_COLUMN_USER", "Standard;Text;Date (DMY);Date (MDY);Date (YMD);US English;Hide") +#define SCSTR_FIELDSEP_TAB NC_("SCSTR_FIELDSEP_TAB", "Tab") +#define SCSTR_FIELDSEP_SPACE NC_("SCSTR_FIELDSEP_SPACE", "space") +#define SCSTR_FORMULA_AUTOCORRECTION NC_("SCSTR_FORMULA_AUTOCORRECTION", "%PRODUCTNAME Calc found an error in the formula entered.\nDo you want to accept the correction proposed below?\n\n") +#define SCSTR_UNDO_GRAFFILTER NC_("SCSTR_UNDO_GRAFFILTER", "Image Filter") +#define STR_CAPTION_DEFAULT_TEXT NC_("STR_CAPTION_DEFAULT_TEXT", "Text") +// Select tables dialog title +#define STR_DLG_SELECTTABLES_TITLE NC_("STR_DLG_SELECTTABLES_TITLE", "Select Sheets") +// Select tables dialog listbox +#define STR_DLG_SELECTTABLES_LBNAME NC_("STR_DLG_SELECTTABLES_LBNAME", "~Selected sheets") +#define STR_REPLCELLSWARN NC_("STR_REPLCELLSWARN", "You are pasting data into cells that already contain data.\nDo you really want to overwrite the existing data?") +#define STR_ACC_CSVRULER_NAME NC_("STR_ACC_CSVRULER_NAME", "Ruler") +#define STR_ACC_CSVRULER_DESCR NC_("STR_ACC_CSVRULER_DESCR", "This ruler manages objects at fixed positions.") +#define STR_ACC_CSVGRID_NAME NC_("STR_ACC_CSVGRID_NAME", "Preview") +#define STR_ACC_CSVGRID_DESCR NC_("STR_ACC_CSVGRID_DESCR", "This sheet shows how the data will be arranged in the document.") +#define STR_ACC_DOC_NAME NC_("STR_ACC_DOC_NAME", "Document view") +#define STR_ACC_TABLE_NAME NC_("STR_ACC_TABLE_NAME", "Sheet %1") +#define STR_ACC_CELL_NAME NC_("STR_ACC_CELL_NAME", "Cell %1") +#define STR_ACC_LEFTAREA_NAME NC_("STR_ACC_LEFTAREA_NAME", "Left area") +#define STR_ACC_PREVIEWDOC_NAME NC_("STR_ACC_PREVIEWDOC_NAME", "Page preview") +#define STR_ACC_CENTERAREA_NAME NC_("STR_ACC_CENTERAREA_NAME", "Center area") +#define STR_ACC_RIGHTAREA_NAME NC_("STR_ACC_RIGHTAREA_NAME", "Right area") +#define STR_ACC_HEADER_NAME NC_("STR_ACC_HEADER_NAME", "Header of page %1") +#define STR_ACC_FOOTER_NAME NC_("STR_ACC_FOOTER_NAME", "Footer of page %1") +#define STR_ACC_EDITLINE_NAME NC_("STR_ACC_EDITLINE_NAME", "Input line") +#define STR_ACC_EDITLINE_DESCR NC_("STR_ACC_EDITLINE_DESCR", "This is where you enter or edit text, numbers and formulas.") +#define SCSTR_MEDIASHELL NC_("SCSTR_MEDIASHELL", "Media Playback") +#define RID_SCSTR_ONCLICK NC_("RID_SCSTR_ONCLICK", "Mouse button pressed") +#define STR_ACC_TOOLBAR_FORMULA NC_("STR_ACC_TOOLBAR_FORMULA", "Formula Tool Bar") +#define STR_ACC_DOC_SPREADSHEET NC_("STR_ACC_DOC_SPREADSHEET", "%PRODUCTNAME Spreadsheets") +#define STR_ACC_DOC_SPREADSHEET_READONLY NC_("STR_ACC_DOC_SPREADSHEET_READONLY", "(read-only)") +#define STR_ACC_DOC_PREVIEW_SUFFIX NC_("STR_ACC_DOC_PREVIEW_SUFFIX", "(Preview mode)") +#define SCSTR_PRINTOPT_PAGES NC_("SCSTR_PRINTOPT_PAGES", "Pages") +#define SCSTR_PRINTOPT_SUPPRESSEMPTY NC_("SCSTR_PRINTOPT_SUPPRESSEMPTY", "~Suppress output of empty pages") +#define SCSTR_PRINTOPT_PRNTCONTENT NC_("SCSTR_PRINTOPT_PRNTCONTENT", "Print content") +#define SCSTR_PRINTOPT_ALLSHEETS NC_("SCSTR_PRINTOPT_ALLSHEETS", "~All sheets") +#define SCSTR_PRINTOPT_SELECTEDSHEETS NC_("SCSTR_PRINTOPT_SELECTEDSHEETS", "~Selected sheets") +#define SCSTR_PRINTOPT_SELECTEDCELLS NC_("SCSTR_PRINTOPT_SELECTEDCELLS", "Selected cells") +#define SCSTR_PRINTOPT_FROMWHICH NC_("SCSTR_PRINTOPT_FROMWHICH", "From which print") +#define SCSTR_PRINTOPT_ALLPAGES NC_("SCSTR_PRINTOPT_ALLPAGES", "All ~pages") +#define SCSTR_PRINTOPT_PAGES_ NC_("SCSTR_PRINTOPT_PAGES_", "Pa~ges") +#define SCSTR_PRINTOPT_PRODNAME NC_("SCSTR_PRINTOPT_PRODNAME", "%PRODUCTNAME %s") +#define SCSTR_WARN_ME_IN_FUTURE_CHECK NC_("SCSTR_WARN_ME_IN_FUTURE_CHECK", "Warn me about this in the future.") +#define SCSTR_DDEDOC_NOT_LOADED NC_("SCSTR_DDEDOC_NOT_LOADED", "The following DDE source could not be updated possibly because the source document was not open. Please launch the source document and try again." ) +#define SCSTR_EXTDOC_NOT_LOADED NC_("SCSTR_EXTDOC_NOT_LOADED", "The following external file could not be loaded. Data linked from this file did not get updated." ) +#define SCSTR_UPDATE_EXTDOCS NC_("SCSTR_UPDATE_EXTDOCS", "Updating external links.") +#define SCSTR_FORMULA_SYNTAX_CALC_A1 NC_("SCSTR_FORMULA_SYNTAX_CALC_A1", "Calc A1") +#define SCSTR_FORMULA_SYNTAX_XL_A1 NC_("SCSTR_FORMULA_SYNTAX_XL_A1", "Excel A1") +#define SCSTR_FORMULA_SYNTAX_XL_R1C1 NC_("SCSTR_FORMULA_SYNTAX_XL_R1C1", "Excel R1C1") +#define SCSTR_COL_LABEL NC_("SCSTR_COL_LABEL", "Range contains column la~bels" ) +#define SCSTR_ROW_LABEL NC_("SCSTR_ROW_LABEL", "Range contains ~row labels" ) +#define SCSTR_VALERR NC_("SCSTR_VALERR", "Invalid value" ) +#define STR_NOFORMULASPECIFIED NC_("STR_NOFORMULASPECIFIED", "No formula specified." ) +#define STR_NOCOLROW NC_("STR_NOCOLROW", "Neither row or column specified." ) +#define STR_WRONGFORMULA NC_("STR_WRONGFORMULA", "Undefined name or range." ) +#define STR_WRONGROWCOL NC_("STR_WRONGROWCOL", "Undefined name or wrong cell reference." ) +#define STR_NOCOLFORMULA NC_("STR_NOCOLFORMULA", "Formulas don't form a column." ) +#define STR_NOROWFORMULA NC_("STR_NOROWFORMULA", "Formulas don't form a row." ) +#define STR_ADD_AUTOFORMAT_TITLE NC_("STR_ADD_AUTOFORMAT_TITLE", "Add AutoFormat" ) +#define STR_RENAME_AUTOFORMAT_TITLE NC_("STR_RENAME_AUTOFORMAT_TITLE", "Rename AutoFormat" ) +#define STR_ADD_AUTOFORMAT_LABEL NC_("STR_ADD_AUTOFORMAT_LABEL", "Name" ) +#define STR_DEL_AUTOFORMAT_TITLE NC_("STR_DEL_AUTOFORMAT_TITLE", "Delete AutoFormat" ) +#define STR_DEL_AUTOFORMAT_MSG NC_("STR_DEL_AUTOFORMAT_MSG", "Do you really want to delete the # AutoFormat?" ) +#define STR_BTN_AUTOFORMAT_CLOSE NC_("STR_BTN_AUTOFORMAT_CLOSE", "~Close" ) +#define STR_JAN NC_("STR_JAN", "Jan" ) +#define STR_FEB NC_("STR_FEB", "Feb" ) +#define STR_MAR NC_("STR_MAR", "Mar" ) +#define STR_NORTH NC_("STR_NORTH", "North" ) +#define STR_MID NC_("STR_MID", "Mid" ) +#define STR_SOUTH NC_("STR_SOUTH", "South" ) +#define STR_SUM NC_("STR_SUM", "Total" ) +#define STR_SHEET NC_("STR_SHEET", "Sheet" ) +#define STR_CELL NC_("STR_CELL", "Cell" ) +#define STR_CONTENT NC_("STR_CONTENT", "Content" ) +#define SCSTR_UNDO_PAGE_ANCHOR NC_("SCSTR_UNDO_PAGE_ANCHOR", "Page Anchor" ) +#define SCSTR_UNDO_CELL_ANCHOR NC_("SCSTR_UNDO_CELL_ANCHOR", "Cell Anchor" ) +#define SCSTR_CONDITION NC_("SCSTR_CONDITION", "Condition ") + +// content description strings are also use d in ScLinkTargetsObj +#define SCSTR_CONTENT_ROOT NC_("SCSTR_CONTENT_ROOT", "Contents" ) +#define SCSTR_CONTENT_TABLE NC_("SCSTR_CONTENT_TABLE", "Sheets" ) +#define SCSTR_CONTENT_RANGENAME NC_("SCSTR_CONTENT_RANGENAME", "Range names" ) +#define SCSTR_CONTENT_DBAREA NC_("SCSTR_CONTENT_DBAREA", "Database ranges" ) +#define SCSTR_CONTENT_GRAPHIC NC_("SCSTR_CONTENT_GRAPHIC", "Images" ) +#define SCSTR_CONTENT_OLEOBJECT NC_("SCSTR_CONTENT_OLEOBJECT", "OLE objects" ) +#define SCSTR_CONTENT_NOTE NC_("SCSTR_CONTENT_NOTE", "Comments" ) +#define SCSTR_CONTENT_AREALINK NC_("SCSTR_CONTENT_AREALINK", "Linked areas" ) +#define SCSTR_CONTENT_DRAWING NC_("SCSTR_CONTENT_DRAWING", "Drawing objects") +#define SCSTR_DRAGMODE NC_("SCSTR_DRAGMODE", "Drag Mode" ) +#define SCSTR_DISPLAY NC_("SCSTR_DISPLAY", "Display" ) +#define SCSTR_ACTIVE NC_("SCSTR_ACTIVE", "active" ) +#define SCSTR_NOTACTIVE NC_("SCSTR_NOTACTIVE", "inactive" ) +#define SCSTR_HIDDEN NC_("SCSTR_HIDDEN", "hidden" ) +#define SCSTR_ACTIVEWIN NC_("SCSTR_ACTIVEWIN", "Active Window" ) +#define SCSTR_QHLP_SCEN_LISTBOX NC_("SCSTR_QHLP_SCEN_LISTBOX", "Scenario Name") +#define SCSTR_QHLP_SCEN_COMMENT NC_("SCSTR_QHLP_SCEN_COMMENT", "Comment") + +#define STR_MENU_SORT_ASC NC_("STR_MENU_SORT_ASC", "Sort Ascending") +#define STR_MENU_SORT_DESC NC_("STR_MENU_SORT_DESC", "Sort Descending") +#define STR_MENU_SORT_CUSTOM NC_("STR_MENU_SORT_CUSTOM", "Custom Sort") +#define STR_BTN_TOGGLE_ALL NC_("STR_BTN_TOGGLE_ALL", "All") +#define STR_BTN_SELECT_CURRENT NC_("STR_BTN_SELECT_CURRENT", "Show only the current item.") +#define STR_BTN_UNSELECT_CURRENT NC_("STR_BTN_UNSELECT_CURRENT", "Hide only the current item.") +#define STR_EDIT_SEARCH_ITEMS NC_("STR_EDIT_SEARCH_ITEMS", "Search items...") + +#define SCSTR_QHELP_POSWND NC_("SCSTR_QHELP_POSWND", "Name Box") +#define SCSTR_QHELP_INPUTWND NC_("SCSTR_QHELP_INPUTWND", "Input line") +#define SCSTR_QHELP_BTNCALC NC_("SCSTR_QHELP_BTNCALC", "Function Wizard") +#define SCSTR_QHELP_BTNOK NC_("SCSTR_QHELP_BTNOK", "Accept") +#define SCSTR_QHELP_BTNCANCEL NC_("SCSTR_QHELP_BTNCANCEL", "Cancel") +#define SCSTR_QHELP_BTNSUM NC_("SCSTR_QHELP_BTNSUM", "Sum") +#define SCSTR_QHELP_BTNEQUAL NC_("SCSTR_QHELP_BTNEQUAL", "Function") +#define SCSTR_QHELP_EXPAND_FORMULA NC_("SCSTR_QHELP_EXPAND_FORMULA", "Expand Formula Bar") +#define SCSTR_QHELP_COLLAPSE_FORMULA NC_("SCSTR_QHELP_COLLAPSE_FORMULA", "Collapse Formula Bar") + +#define STR_TITLE_CONFLICT NC_("STR_TITLE_CONFLICT", "Conflict") +#define STR_TITLE_AUTHOR NC_("STR_TITLE_AUTHOR", "Author") +#define STR_TITLE_DATE NC_("STR_TITLE_DATE", "Date") +#define STR_UNKNOWN_USER_CONFLICT NC_("STR_UNKNOWN_USER_CONFLICT", "Unknown User") + +#define STR_CHG_INSERT_COLS NC_("STR_CHG_INSERT_COLS", "Column inserted") +#define STR_CHG_INSERT_ROWS NC_("STR_CHG_INSERT_ROWS", "Row inserted ") +#define STR_CHG_INSERT_TABS NC_("STR_CHG_INSERT_TABS", "Sheet inserted ") +#define STR_CHG_DELETE_COLS NC_("STR_CHG_DELETE_COLS", "Column deleted") +#define STR_CHG_DELETE_ROWS NC_("STR_CHG_DELETE_ROWS", "Row deleted") +#define STR_CHG_DELETE_TABS NC_("STR_CHG_DELETE_TABS", "Sheet deleted") +#define STR_CHG_MOVE NC_("STR_CHG_MOVE", "Range moved") +#define STR_CHG_CONTENT NC_("STR_CHG_CONTENT", "Changed contents") +#define STR_CHG_CONTENT_WITH_CHILD NC_("STR_CHG_CONTENT_WITH_CHILD", "Changed contents") +#define STR_CHG_CHILD_CONTENT NC_("STR_CHG_CHILD_CONTENT", "Changed to ") +#define STR_CHG_CHILD_ORGCONTENT NC_("STR_CHG_CHILD_ORGCONTENT", "Original") +#define STR_CHG_REJECT NC_("STR_CHG_REJECT", "Changes rejected") +#define STR_CHG_ACCEPTED NC_("STR_CHG_ACCEPTED", "Accepted") +#define STR_CHG_REJECTED NC_("STR_CHG_REJECTED", "Rejected") +#define STR_CHG_NO_ENTRY NC_("STR_CHG_NO_ENTRY", "No Entry") +#define STR_CHG_EMPTY NC_("STR_CHG_EMPTY", "") + +#define STR_NOT_PROTECTED NC_("STR_NOT_PROTECTED", "Not protected") +#define STR_NOT_PASS_PROTECTED NC_("STR_NOT_PASS_PROTECTED", "Not password-protected") +#define STR_HASH_BAD NC_("STR_HASH_BAD", "Hash incompatible") +#define STR_HASH_GOOD NC_("STR_HASH_GOOD", "Hash compatible") +#define STR_RETYPE NC_("STR_RETYPE", "Re-type") + +/* MovingAverageDialog */ +#define STR_MOVING_AVERAGE_UNDO_NAME NC_("STR_MOVING_AVERAGE_UNDO_NAME", "Moving Average") +/* ExponentialSmoothingDialog */ +#define STR_EXPONENTIAL_SMOOTHING_UNDO_NAME NC_("STR_EXPONENTIAL_SMOOTHING_UNDO_NAME", "Exponential Smoothing") +/* AnalysisOfVarianceDialog */ +#define STR_ANALYSIS_OF_VARIANCE_UNDO_NAME NC_("STR_ANALYSIS_OF_VARIANCE_UNDO_NAME", "Analysis of Variance") +#define STR_ANOVA_SINGLE_FACTOR_LABEL NC_("STR_ANOVA_SINGLE_FACTOR_LABEL", "ANOVA - Single Factor") +#define STR_ANOVA_TWO_FACTOR_LABEL NC_("STR_ANOVA_TWO_FACTOR_LABEL", "ANOVA - Two Factor") +#define STR_ANOVA_LABEL_GROUPS NC_("STR_ANOVA_LABEL_GROUPS", "Groups") +#define STR_ANOVA_LABEL_BETWEEN_GROUPS NC_("STR_ANOVA_LABEL_BETWEEN_GROUPS", "Between Groups") +#define STR_ANOVA_LABEL_WITHIN_GROUPS NC_("STR_ANOVA_LABEL_WITHIN_GROUPS", "Within Groups") +#define STR_ANOVA_LABEL_SOURCE_OF_VARIATION NC_("STR_ANOVA_LABEL_SOURCE_OF_VARIATION", "Source of Variation") +#define STR_ANOVA_LABEL_SS NC_("STR_ANOVA_LABEL_SS", "SS") +#define STR_ANOVA_LABEL_DF NC_("STR_ANOVA_LABEL_DF", "df") +#define STR_ANOVA_LABEL_MS NC_("STR_ANOVA_LABEL_MS", "MS") +#define STR_ANOVA_LABEL_F NC_("STR_ANOVA_LABEL_F", "F") +#define STR_ANOVA_LABEL_P_VALUE NC_("STR_ANOVA_LABEL_P_VALUE", "P-value") +#define STR_ANOVA_LABEL_F_CRITICAL NC_("STR_ANOVA_LABEL_F_CRITICAL", "F critical") +#define STR_ANOVA_LABEL_TOTAL NC_("STR_ANOVA_LABEL_TOTAL", "Total") +/* CorrelationDialog */ +#define STR_CORRELATION_UNDO_NAME NC_("STR_CORRELATION_UNDO_NAME", "Correlation") +#define STR_CORRELATION_LABEL NC_("STR_CORRELATION_LABEL", "Correlations") +/* CovarianceDialog */ +#define STR_COVARIANCE_UNDO_NAME NC_("STR_COVARIANCE_UNDO_NAME", "Covariance") +#define STR_COVARIANCE_LABEL NC_("STR_COVARIANCE_LABEL", "Covariances") +/* DescriptiveStatisticsDialog */ +#define STR_DESCRIPTIVE_STATISTICS_UNDO_NAME NC_("STR_DESCRIPTIVE_STATISTICS_UNDO_NAME", "Descriptive Statistics") +#define STRID_CALC_MEAN NC_("STRID_CALC_MEAN", "Mean") +#define STRID_CALC_STD_ERROR NC_("STRID_CALC_STD_ERROR", "Standard Error") +#define STRID_CALC_MODE NC_("STRID_CALC_MODE", "Mode") +#define STRID_CALC_MEDIAN NC_("STRID_CALC_MEDIAN", "Median") +#define STRID_CALC_VARIANCE NC_("STRID_CALC_VARIANCE", "Variance") +#define STRID_CALC_STD_DEVIATION NC_("STRID_CALC_STD_DEVIATION", "Standard Deviation") +#define STRID_CALC_KURTOSIS NC_("STRID_CALC_KURTOSIS", "Kurtosis") +#define STRID_CALC_SKEWNESS NC_("STRID_CALC_SKEWNESS", "Skewness") +#define STRID_CALC_RANGE NC_("STRID_CALC_RANGE", "Range") +#define STRID_CALC_MIN NC_("STRID_CALC_MIN", "Minimum") +#define STRID_CALC_MAX NC_("STRID_CALC_MAX", "Maximum") +#define STRID_CALC_SUM NC_("STRID_CALC_SUM", "Sum") +#define STRID_CALC_COUNT NC_("STRID_CALC_COUNT", "Count") +#define STRID_CALC_FIRST_QUARTILE NC_("STRID_CALC_FIRST_QUARTILE", "First Quartile ") +#define STRID_CALC_THIRD_QUARTILE NC_("STRID_CALC_THIRD_QUARTILE", "Third Quartile") +/* RandomNumberGeneratorDialog */ +#define STR_UNDO_DISTRIBUTION_TEMPLATE NC_("STR_UNDO_DISTRIBUTION_TEMPLATE", "Random ($(DISTRIBUTION))") +#define STR_DISTRIBUTION_UNIFORM_REAL NC_("STR_DISTRIBUTION_UNIFORM_REAL", "Uniform") +#define STR_DISTRIBUTION_UNIFORM_INTEGER NC_("STR_DISTRIBUTION_UNIFORM_INTEGER", "Uniform Integer") +#define STR_DISTRIBUTION_NORMAL NC_("STR_DISTRIBUTION_NORMAL", "Normal") +#define STR_DISTRIBUTION_CAUCHY NC_("STR_DISTRIBUTION_CAUCHY", "Cauchy") +#define STR_DISTRIBUTION_BERNOULLI NC_("STR_DISTRIBUTION_BERNOULLI", "Bernoulli") +#define STR_DISTRIBUTION_BINOMIAL NC_("STR_DISTRIBUTION_BINOMIAL", "Binomial") +#define STR_DISTRIBUTION_NEGATIVE_BINOMIAL NC_("STR_DISTRIBUTION_NEGATIVE_BINOMIAL", "Negative Binomial") +#define STR_DISTRIBUTION_CHI_SQUARED NC_("STR_DISTRIBUTION_CHI_SQUARED", "Chi Squared") +#define STR_DISTRIBUTION_GEOMETRIC NC_("STR_DISTRIBUTION_GEOMETRIC", "Geometric") +#define STR_RNG_PARAMETER_MINIMUM NC_("STR_RNG_PARAMETER_MINIMUM", "Minimum") +#define STR_RNG_PARAMETER_MAXIMUM NC_("STR_RNG_PARAMETER_MAXIMUM", "Maximum") +#define STR_RNG_PARAMETER_MEAN NC_("STR_RNG_PARAMETER_MEAN", "Mean") +#define STR_RNG_PARAMETER_STANDARD_DEVIATION NC_("STR_RNG_PARAMETER_STANDARD_DEVIATION", "Standard Deviation") +#define STR_RNG_PARAMETER_STANDARD_MEDIAN NC_("STR_RNG_PARAMETER_STANDARD_MEDIAN", "Median") +#define STR_RNG_PARAMETER_STANDARD_SIGMA NC_("STR_RNG_PARAMETER_STANDARD_SIGMA", "Sigma") +#define STR_RNG_PARAMETER_STANDARD_PROBABILITY NC_("STR_RNG_PARAMETER_STANDARD_PROBABILITY", "p Value") +#define STR_RNG_PARAMETER_STANDARD_NUMBER_OF_TRIALS NC_("STR_RNG_PARAMETER_STANDARD_NUMBER_OF_TRIALS", "Number of Trials") +#define STR_RNG_PARAMETER_STANDARD_NU_VALUE NC_("STR_RNG_PARAMETER_STANDARD_NU_VALUE", "nu Value") +/* SamplingDialog */ +#define STR_SAMPLING_UNDO_NAME NC_("STR_SAMPLING_UNDO_NAME", "Sampling") +/* Names of dialogs */ +#define STR_FTEST NC_("STR_FTEST", "F-test") +#define STR_FTEST_UNDO_NAME NC_("STR_FTEST_UNDO_NAME", "F-test") +#define STR_TTEST NC_("STR_TTEST", "t-test") +#define STR_TTEST_UNDO_NAME NC_("STR_TTEST_UNDO_NAME", "t-test") +#define STR_ZTEST NC_("STR_ZTEST", "z-test") +#define STR_ZTEST_UNDO_NAME NC_("STR_ZTEST_UNDO_NAME", "z-test") +#define STR_CHI_SQUARE_TEST NC_("STR_CHI_SQUARE_TEST", "Test of Independence (Chi-Square)") +#define STR_REGRESSION_UNDO_NAME NC_("STR_REGRESSION_UNDO_NAME", "Regression") +#define STR_REGRESSION NC_("STR_REGRESSION", "Regression") +/* Common */ +#define STR_COLUMN_LABEL_TEMPLATE NC_("STR_COLUMN_LABEL_TEMPLATE", "Column %NUMBER%") +#define STR_ROW_LABEL_TEMPLATE NC_("STR_ROW_LABEL_TEMPLATE", "Row %NUMBER%") +#define STR_LABEL_ALPHA NC_("STR_LABEL_ALPHA", "Alpha") +#define STR_VARIABLE_1_LABEL NC_("STR_VARIABLE_1_LABEL", "Variable 1") +#define STR_VARIABLE_2_LABEL NC_("STR_VARIABLE_2_LABEL", "Variable 2") +#define STR_HYPOTHESIZED_MEAN_DIFFERENCE_LABEL NC_("STR_HYPOTHESIZED_MEAN_DIFFERENCE_LABEL", "Hypothesized Mean Difference") +#define STR_OBSERVATIONS_LABEL NC_("STR_OBSERVATIONS_LABEL", "Observations") +#define STR_OBSERVED_MEAN_DIFFERENCE_LABEL NC_("STR_OBSERVED_MEAN_DIFFERENCE_LABEL", "Observed Mean Difference") +#define STR_DEGREES_OF_FREEDOM_LABEL NC_("STR_DEGREES_OF_FREEDOM_LABEL", "df") +#define STR_P_VALUE_LABEL NC_("STR_P_VALUE_LABEL", "P-value") +#define STR_CRITICAL_VALUE_LABEL NC_("STR_CRITICAL_VALUE_LABEL", "Critical Value") +#define STR_TEST_STATISTIC_LABEL NC_("STR_TEST_STATISTIC_LABEL", "Test Statistic") +/* RegressionDialog */ +#define STR_LABEL_LINEAR NC_("STR_LABEL_LINEAR", "Linear") +#define STR_LABEL_LOGARITHMIC NC_("STR_LABEL_LOGARITHMIC", "Logarithmic") +#define STR_LABEL_POWER NC_("STR_LABEL_POWER", "Power") +#define STR_LABEL_REGRESSION_MODEL NC_("STR_LABEL_REGRESSION_MODEL", "Regression Model") +#define STR_LABEL_RSQUARED NC_("STR_LABEL_RSQUARED", "R^2") +#define STR_LABEL_SLOPE NC_("STR_LABEL_SLOPE", "Slope") +#define STR_LABEL_INTERCEPT NC_("STR_LABEL_INTERCEPT", "Intercept") +/*F Test */ +#define STR_FTEST_P_RIGHT_TAIL NC_("STR_FTEST_P_RIGHT_TAIL", "P (F<=f) right-tail") +#define STR_FTEST_F_CRITICAL_RIGHT_TAIL NC_("STR_FTEST_F_CRITICAL_RIGHT_TAIL", "F Critical right-tail") +#define STR_FTEST_P_LEFT_TAIL NC_("STR_FTEST_P_LEFT_TAIL", "P (F<=f) left-tail") +#define STR_FTEST_F_CRITICAL_LEFT_TAIL NC_("STR_FTEST_F_CRITICAL_LEFT_TAIL", "F Critical left-tail") +#define STR_FTEST_P_TWO_TAIL NC_("STR_FTEST_P_TWO_TAIL", "P two-tail") +#define STR_FTEST_F_CRITICAL_TWO_TAIL NC_("STR_FTEST_F_CRITICAL_TWO_TAIL", "F Critical two-tail") +/*t Test*/ +#define STR_TTEST_PEARSON_CORRELATION NC_("STR_TTEST_PEARSON_CORRELATION", "Pearson Correlation") +#define STR_TTEST_VARIANCE_OF_THE_DIFFERENCES NC_("STR_TTEST_VARIANCE_OF_THE_DIFFERENCES", "Variance of the Differences") +#define STR_TTEST_T_STAT NC_("STR_TTEST_T_STAT", "t Stat") +#define STR_TTEST_P_ONE_TAIL NC_("STR_TTEST_P_ONE_TAIL", "P (T<=t) one-tail") +#define STR_TTEST_T_CRITICAL_ONE_TAIL NC_("STR_TTEST_T_CRITICAL_ONE_TAIL", "t Critical one-tail") +#define STR_TTEST_P_TWO_TAIL NC_("STR_TTEST_P_TWO_TAIL", "P (T<=t) two-tail") +#define STR_TTEST_T_CRITICAL_TWO_TAIL NC_("STR_TTEST_T_CRITICAL_TWO_TAIL", "t Critical two-tail") +/*Z Test*/ +#define STR_ZTEST_Z_VALUE NC_("STR_ZTEST_Z_VALUE", "z") +#define STR_ZTEST_KNOWN_VARIANCE NC_("STR_ZTEST_KNOWN_VARIANCE", "Known Variance") +#define STR_ZTEST_P_ONE_TAIL NC_("STR_ZTEST_P_ONE_TAIL", "P (Z<=z) one-tail") +#define STR_ZTEST_Z_CRITICAL_ONE_TAIL NC_("STR_ZTEST_Z_CRITICAL_ONE_TAIL", "z Critical one-tail") +#define STR_ZTEST_P_TWO_TAIL NC_("STR_ZTEST_P_TWO_TAIL", "P (Z<=z) two-tail") +#define STR_ZTEST_Z_CRITICAL_TWO_TAIL NC_("STR_ZTEST_Z_CRITICAL_TWO_TAIL", "z Critical two-tail") + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx index f0a6408b7efc..57cf51bcdeff 100644 --- a/sc/inc/styleuno.hxx +++ b/sc/inc/styleuno.hxx @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/include/rsc/rscsfx.hxx b/sc/inc/units.hrc similarity index 60% rename from include/rsc/rscsfx.hxx rename to sc/inc/units.hrc index dad816a48740..acec84dc7865 100644 --- a/include/rsc/rscsfx.hxx +++ b/sc/inc/units.hrc @@ -16,22 +16,23 @@ * 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_RSC_RSCSFX_HXX -#define INCLUDED_RSC_RSCSFX_HXX -//========== S F X ======================================= -// This is used as a flags enum in sw/, but only there, -// so I don't pull in o3tl::typed_flags here -enum class SfxStyleFamily { - None = 0x00, - Char = 0x01, - Para = 0x02, - Frame = 0x04, - Page = 0x08, - Pseudo = 0x10, - Table = 0x20, - Cell = 0x40, - All = 0x7fff +#ifndef INCLUDED_SC_INC_UNITS_HRC +#define INCLUDED_SC_INC_UNITS_HRC + +#define NC_(Context, String) (Context "\004" u8##String) + +const std::pair SCSTR_UNIT[] = +{ + { NC_("SCSTR_UNIT", "Millimeter") , FUNIT_MM }, + { NC_("SCSTR_UNIT", "Centimeter") , FUNIT_CM }, + { NC_("SCSTR_UNIT", "Meter") , FUNIT_M }, + { NC_("SCSTR_UNIT", "Kilometer") , FUNIT_KM }, + { NC_("SCSTR_UNIT", "Inch") , FUNIT_INCH }, + { NC_("SCSTR_UNIT", "Foot") , FUNIT_FOOT }, + { NC_("SCSTR_UNIT", "Miles") , FUNIT_MILE }, + { NC_("SCSTR_UNIT", "Pica") , FUNIT_PICA }, + { NC_("SCSTR_UNIT", "Point") , FUNIT_POINT } }; #endif diff --git a/sc/qa/unit/ucalc_pivottable.cxx b/sc/qa/unit/ucalc_pivottable.cxx index e78065c11258..0b80e89f2207 100644 --- a/sc/qa/unit/ucalc_pivottable.cxx +++ b/sc/qa/unit/ucalc_pivottable.cxx @@ -300,8 +300,8 @@ void Test::testPivotTable() // This time clear the cache to refresh the data from the source range. CPPUNIT_ASSERT_MESSAGE("This datapilot should be based on sheet data.", pDPObj2->IsSheetData()); std::set aRefs; - sal_uLong nErrId = pDPs->ReloadCache(pDPObj2, aRefs); - CPPUNIT_ASSERT_EQUAL_MESSAGE("Cache reload failed.", sal_uLong(0), nErrId); + const char* pErrId = pDPs->ReloadCache(pDPObj2, aRefs); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Cache reload failed.", static_cast(nullptr), pErrId); CPPUNIT_ASSERT_EQUAL_MESSAGE("Reloading a cache shouldn't remove any cache.", static_cast(1), pDPs->GetSheetCaches().size()); @@ -1541,8 +1541,8 @@ void Test::testPivotTableEmptyRows() m_pDoc->SetString(1, 2, 0, "B"); std::set aRefs; - sal_uLong nErr = pDPs->ReloadCache(pDPObj, aRefs); - CPPUNIT_ASSERT_MESSAGE("Failed to reload cache.", !nErr); + const char* pErr = pDPs->ReloadCache(pDPObj, aRefs); + CPPUNIT_ASSERT_MESSAGE("Failed to reload cache.", !pErr); CPPUNIT_ASSERT_MESSAGE("There should only be one pivot table linked to this cache.", aRefs.size() == 1 && *aRefs.begin() == pDPObj); diff --git a/sc/sdi/scslots.hrc b/sc/sdi/scslots.hrc index f0dae70102f2..1dc2fc803cd0 100644 --- a/sc/sdi/scslots.hrc +++ b/sc/sdi/scslots.hrc @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include -#include #include #include #include diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index 729ad9486e7f..89bc7a80460c 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -700,7 +700,7 @@ static bool lcl_HFPresentation nTmp = rLRItem.GetRight(); nRightMargin = nTmp < 0 ? 0 : sal_uInt16(nTmp); - aText = EditResId::GetString(RID_SVXITEMS_LRSPACE_LEFT); + aText = EditResId(RID_SVXITEMS_LRSPACE_LEFT); if ( 100 != nPropLeftMargin ) { aText = aText + unicode::formatPercent(nPropLeftMargin, @@ -710,12 +710,12 @@ static bool lcl_HFPresentation { aText += GetMetricText( (long)nLeftMargin, eCoreMetric, ePresentationMetric, pIntl ); - aText += " " + EditResId::GetString(GetMetricId(ePresentationMetric)); + aText += " " + EditResId(GetMetricId(ePresentationMetric)); } aText += cpDelim; // We don't have a nPropFirstLineOfst - aText += EditResId::GetString(RID_SVXITEMS_LRSPACE_RIGHT); + aText += EditResId(RID_SVXITEMS_LRSPACE_RIGHT); if ( 100 != nPropRightMargin ) { aText = aText + unicode::formatPercent(nPropLeftMargin, @@ -725,7 +725,7 @@ static bool lcl_HFPresentation { aText += GetMetricText( (long)nRightMargin, eCoreMetric, ePresentationMetric, pIntl ); - aText += " " + EditResId::GetString(GetMetricId(ePresentationMetric)); + aText += " " + EditResId(GetMetricId(ePresentationMetric)); } } break; diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index 1dec3d68cd75..24fcdc64084e 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -75,7 +75,8 @@ #include "printopt.hxx" #include "externalrefmgr.hxx" #include "globstr.hrc" -#include "scres.hrc" +#include "strings.hrc" +#include "sc.hrc" #include "charthelper.hxx" #include "macromgr.hxx" #include "dpobject.hxx" diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx index fa785fdf4925..539ee2c7b16c 100644 --- a/sc/source/core/data/dpdimsave.cxx +++ b/sc/source/core/data/dpdimsave.cxx @@ -809,7 +809,7 @@ OUString ScDPDimensionSaveData::CreateGroupDimName( namespace { - static const sal_uInt16 nDatePartIds[] = + static const char* aDatePartIds[] = { STR_DPFIELD_GROUP_BY_SECONDS, STR_DPFIELD_GROUP_BY_MINUTES, @@ -829,13 +829,13 @@ OUString ScDPDimensionSaveData::CreateDateGroupDimName( OUString aPartName; switch( nDatePart ) { - case SECONDS: aPartName = ScGlobal::GetRscString( nDatePartIds[0] ); break; - case MINUTES: aPartName = ScGlobal::GetRscString( nDatePartIds[1] ); break; - case HOURS: aPartName = ScGlobal::GetRscString( nDatePartIds[2] ); break; - case DAYS: aPartName = ScGlobal::GetRscString( nDatePartIds[3] ); break; - case MONTHS: aPartName = ScGlobal::GetRscString( nDatePartIds[4] ); break; - case QUARTERS: aPartName = ScGlobal::GetRscString( nDatePartIds[5] ); break; - case YEARS: aPartName = ScGlobal::GetRscString( nDatePartIds[6] ); break; + case SECONDS: aPartName = ScGlobal::GetRscString(aDatePartIds[0]); break; + case MINUTES: aPartName = ScGlobal::GetRscString(aDatePartIds[1]); break; + case HOURS: aPartName = ScGlobal::GetRscString(aDatePartIds[2]); break; + case DAYS: aPartName = ScGlobal::GetRscString(aDatePartIds[3]); break; + case MONTHS: aPartName = ScGlobal::GetRscString(aDatePartIds[4]); break; + case QUARTERS: aPartName = ScGlobal::GetRscString(aDatePartIds[5]); break; + case YEARS: aPartName = ScGlobal::GetRscString(aDatePartIds[6]); break; } OSL_ENSURE(!aPartName.isEmpty(), "ScDPDimensionSaveData::CreateDateGroupDimName - invalid date part"); return CreateGroupDimName( aPartName, rObject, bAllowSource, pDeletedNames ); diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 3e07c82eddf1..5a646bb17947 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -3401,7 +3401,7 @@ public: } -sal_uLong ScDPCollection::ReloadCache(ScDPObject* pDPObj, std::set& rRefs) +const char* ScDPCollection::ReloadCache(ScDPObject* pDPObj, std::set& rRefs) { if (!pDPObj) return STR_ERR_DATAPILOTSOURCE; @@ -3413,9 +3413,9 @@ sal_uLong ScDPCollection::ReloadCache(ScDPObject* pDPObj, std::set& if (!pDesc) return STR_ERR_DATAPILOTSOURCE; - sal_uLong nErrId = pDesc->CheckSourceRange(); - if (nErrId) - return nErrId; + const char* pErrId = pDesc->CheckSourceRange(); + if (pErrId) + return pErrId; if (pDesc->HasRangeName()) { @@ -3462,7 +3462,7 @@ sal_uLong ScDPCollection::ReloadCache(ScDPObject* pDPObj, std::set& GetAllTables(pDesc->GetCommandType(), pDesc->aDBName, pDesc->aObject, rRefs); } } - return 0; + return nullptr; } bool ScDPCollection::ReloadGroupsInCache(ScDPObject* pDPObj, std::set& rRefs) diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx index 366538a354a4..d5b465c8a502 100644 --- a/sc/source/core/data/dpoutput.cxx +++ b/sc/source/core/data/dpoutput.cxx @@ -40,7 +40,7 @@ #include "stlsheet.hxx" #include "scresid.hxx" #include "unonames.hxx" -#include "scres.hrc" +#include "strings.hrc" #include "stringutil.hxx" #include "dputil.hxx" @@ -279,9 +279,9 @@ void ScDPOutputImpl::OutputBlockFrame ( SCCOL nStartCol, SCROW nStartRow, SCCOL } -void lcl_SetStyleById( ScDocument* pDoc, SCTAB nTab, - SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, - sal_uInt16 nStrId ) +void lcl_SetStyleById(ScDocument* pDoc, SCTAB nTab, + SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + const char* pStrId) { if ( nCol1 > nCol2 || nRow1 > nRow2 ) { @@ -289,7 +289,7 @@ void lcl_SetStyleById( ScDocument* pDoc, SCTAB nTab, return; } - OUString aStyleName = ScGlobal::GetRscString( nStrId ); + OUString aStyleName = ScGlobal::GetRscString(pStrId); ScStyleSheetPool* pStlPool = pDoc->GetStyleSheetPool(); ScStyleSheet* pStyle = static_cast( pStlPool->Find( aStyleName, SfxStyleFamily::Para ) ); if (!pStyle) @@ -300,9 +300,9 @@ void lcl_SetStyleById( ScDocument* pDoc, SCTAB nTab, SFXSTYLEBIT_USERDEF ) ); pStyle->SetParent( ScGlobal::GetRscString(STR_STYLENAME_STANDARD) ); SfxItemSet& rSet = pStyle->GetItemSet(); - if ( nStrId==STR_PIVOT_STYLE_RESULT || nStrId==STR_PIVOT_STYLE_TITLE ) + if (strcmp(pStrId, STR_PIVOT_STYLE_RESULT) == 0 || strcmp(pStrId, STR_PIVOT_STYLE_TITLE) == 0) rSet.Put( SvxWeightItem( WEIGHT_BOLD, ATTR_FONT_WEIGHT ) ); - if ( nStrId==STR_PIVOT_STYLE_CATEGORY || nStrId==STR_PIVOT_STYLE_TITLE ) + if (strcmp(pStrId, STR_PIVOT_STYLE_CATEGORY) == 0 || strcmp(pStrId, STR_PIVOT_STYLE_TITLE) == 0) rSet.Put( SvxHorJustifyItem( SvxCellHorJustify::Left, ATTR_HOR_JUSTIFY ) ); } @@ -1497,21 +1497,21 @@ namespace { OUString lcl_GetDataFieldName( const OUString& rSourceName, sal_Int16 eFunc ) { - sal_uInt16 nStrId = 0; + const char* pStrId = nullptr; switch ( eFunc ) { - case sheet::GeneralFunction2::SUM: nStrId = STR_FUN_TEXT_SUM; break; + case sheet::GeneralFunction2::SUM: pStrId = STR_FUN_TEXT_SUM; break; case sheet::GeneralFunction2::COUNT: - case sheet::GeneralFunction2::COUNTNUMS: nStrId = STR_FUN_TEXT_COUNT; break; - case sheet::GeneralFunction2::AVERAGE: nStrId = STR_FUN_TEXT_AVG; break; - case sheet::GeneralFunction2::MEDIAN: nStrId = STR_FUN_TEXT_MEDIAN; break; - case sheet::GeneralFunction2::MAX: nStrId = STR_FUN_TEXT_MAX; break; - case sheet::GeneralFunction2::MIN: nStrId = STR_FUN_TEXT_MIN; break; - case sheet::GeneralFunction2::PRODUCT: nStrId = STR_FUN_TEXT_PRODUCT; break; + case sheet::GeneralFunction2::COUNTNUMS: pStrId = STR_FUN_TEXT_COUNT; break; + case sheet::GeneralFunction2::AVERAGE: pStrId = STR_FUN_TEXT_AVG; break; + case sheet::GeneralFunction2::MEDIAN: pStrId = STR_FUN_TEXT_MEDIAN; break; + case sheet::GeneralFunction2::MAX: pStrId = STR_FUN_TEXT_MAX; break; + case sheet::GeneralFunction2::MIN: pStrId = STR_FUN_TEXT_MIN; break; + case sheet::GeneralFunction2::PRODUCT: pStrId = STR_FUN_TEXT_PRODUCT; break; case sheet::GeneralFunction2::STDEV: - case sheet::GeneralFunction2::STDEVP: nStrId = STR_FUN_TEXT_STDDEV; break; + case sheet::GeneralFunction2::STDEVP: pStrId = STR_FUN_TEXT_STDDEV; break; case sheet::GeneralFunction2::VAR: - case sheet::GeneralFunction2::VARP: nStrId = STR_FUN_TEXT_VAR; break; + case sheet::GeneralFunction2::VARP: pStrId = STR_FUN_TEXT_VAR; break; case sheet::GeneralFunction2::NONE: case sheet::GeneralFunction2::AUTO: break; default: @@ -1519,10 +1519,10 @@ OUString lcl_GetDataFieldName( const OUString& rSourceName, sal_Int16 eFunc ) assert(false); } } - if ( !nStrId ) + if (!pStrId) return OUString(); - OUStringBuffer aRet( ScGlobal::GetRscString( nStrId ) ); + OUStringBuffer aRet(ScGlobal::GetRscString(pStrId)); aRet.append(" - "); aRet.append(rSourceName); return aRet.makeStringAndClear(); diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx index a42443da47a1..74088de9832d 100644 --- a/sc/source/core/data/dpshttab.cxx +++ b/sc/source/core/data/dpshttab.cxx @@ -283,8 +283,8 @@ const ScDPCache* ScSheetSourceDesc::CreateCache(const ScDPDimensionSaveData* pDi if (!mpDoc) return nullptr; - sal_uLong nErrId = CheckSourceRange(); - if (nErrId) + const char* pErrId = CheckSourceRange(); + if (pErrId) { OSL_FAIL( "Error Create Cache" ); return nullptr; @@ -303,7 +303,7 @@ const ScDPCache* ScSheetSourceDesc::CreateCache(const ScDPDimensionSaveData* pDi return rCaches.getCache(GetSourceRange(), pDimData); } -sal_uLong ScSheetSourceDesc::CheckSourceRange() const +const char* ScSheetSourceDesc::CheckSourceRange() const { if (!mpDoc) return STR_ERR_DATAPILOTSOURCE; @@ -316,7 +316,7 @@ sal_uLong ScSheetSourceDesc::CheckSourceRange() const if (rSrcRange.aStart.Col() > rSrcRange.aEnd.Col() || rSrcRange.aStart.Row() > rSrcRange.aEnd.Row()) return STR_ERR_DATAPILOTSOURCE; - return 0; + return nullptr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx index f0bb00f03039..89996fa66984 100644 --- a/sc/source/core/data/dptabres.cxx +++ b/sc/source/core/data/dptabres.cxx @@ -56,9 +56,9 @@ using ::com::sun::star::uno::Sequence; namespace { -sal_uInt16 nFuncStrIds[] = // matching enum ScSubTotalFunc +const char* aFuncStrIds[] = // matching enum ScSubTotalFunc { - 0, // SUBTOTAL_FUNC_NONE + nullptr, // SUBTOTAL_FUNC_NONE STR_FUN_TEXT_AVG, // SUBTOTAL_FUNC_AVE STR_FUN_TEXT_COUNT, // SUBTOTAL_FUNC_CNT STR_FUN_TEXT_COUNT, // SUBTOTAL_FUNC_CNT2 @@ -71,7 +71,7 @@ sal_uInt16 nFuncStrIds[] = // matching enum ScSubTotalFunc STR_FUN_TEXT_VAR, // SUBTOTAL_FUNC_VAR STR_FUN_TEXT_VAR, // SUBTOTAL_FUNC_VARP STR_FUN_TEXT_MEDIAN, // SUBTOTAL_FUNC_MED - 0 // SUBTOTAL_FUNC_SELECTION_COUNT - not used for pivot table + nullptr // SUBTOTAL_FUNC_SELECTION_COUNT - not used for pivot table }; bool lcl_SearchMember( const std::vector & list, SCROW nOrder, SCROW& rIndex) @@ -837,9 +837,9 @@ OUString ScDPResultData::GetMeasureString(long nMeasure, bool bForce, ScSubTotal { // for user-specified subtotal function with all measures, // display only function name - assert(eForceFunc < SAL_N_ELEMENTS(nFuncStrIds)); + assert(eForceFunc < SAL_N_ELEMENTS(aFuncStrIds)); if ( eForceFunc != SUBTOTAL_FUNC_NONE ) - return ScGlobal::GetRscString(nFuncStrIds[eForceFunc]); + return ScGlobal::GetRscString(aFuncStrIds[eForceFunc]); rbTotalResult = true; return ScGlobal::GetRscString(STR_TABLE_ERGEBNIS); diff --git a/sc/source/core/data/dputil.cxx b/sc/source/core/data/dputil.cxx index 30272169f1cc..00b8b26d335c 100644 --- a/sc/source/core/data/dputil.cxx +++ b/sc/source/core/data/dputil.cxx @@ -368,8 +368,8 @@ sal_Int32 ScDPUtil::getDatePartValue( namespace { -sal_uInt16 nFuncStrIds[] = { - 0, // SUBTOTAL_FUNC_NONE +const char* aFuncStrIds[] = { + nullptr, // SUBTOTAL_FUNC_NONE STR_FUN_TEXT_AVG, // SUBTOTAL_FUNC_AVE STR_FUN_TEXT_COUNT, // SUBTOTAL_FUNC_CNT STR_FUN_TEXT_COUNT, // SUBTOTAL_FUNC_CNT2 @@ -382,7 +382,7 @@ sal_uInt16 nFuncStrIds[] = { STR_FUN_TEXT_VAR, // SUBTOTAL_FUNC_VAR STR_FUN_TEXT_VAR, // SUBTOTAL_FUNC_VARP STR_FUN_TEXT_MEDIAN, // SUBTOTAL_FUNC_MED - 0 // SUBTOTAL_FUNC_SELECTION_COUNT - not used for pivot table + nullptr // SUBTOTAL_FUNC_SELECTION_COUNT - not used for pivot table }; } @@ -390,11 +390,11 @@ sal_uInt16 nFuncStrIds[] = { OUString ScDPUtil::getDisplayedMeasureName(const OUString& rName, ScSubTotalFunc eFunc) { OUStringBuffer aRet; - assert(eFunc < SAL_N_ELEMENTS(nFuncStrIds)); - sal_uInt16 nId = nFuncStrIds[eFunc]; - if (nId) + assert(eFunc < SAL_N_ELEMENTS(aFuncStrIds)); + const char* pId = aFuncStrIds[eFunc]; + if (pId) { - aRet.append(ScGlobal::GetRscString(nId)); // function name + aRet.append(ScGlobal::GetRscString(pId)); // function name aRet.append(" - "); } aRet.append(rName); // field name diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx index 34898e116c9e..68071edbafba 100644 --- a/sc/source/core/data/funcdesc.cxx +++ b/sc/source/core/data/funcdesc.cxx @@ -23,15 +23,16 @@ #include "appoptio.hxx" #include "callform.hxx" #include "compiler.hxx" +#include "compiler.hrc" #include "global.hxx" #include "sc.hrc" +#include "scfuncs.hrc" #include "scmod.hxx" #include "scresid.hxx" +#include "helpids.h" #include #include -#include -#include #include #include #include @@ -45,6 +46,14 @@ struct ScFuncDescCore * An opcode from include/formula/compiler.hrc */ sal_uInt16 nOpCode; + /* + * Pointer to list of strings + */ + const char** pResource; + /* + * Count of list of strings + */ + size_t nResourceLen; /* * 16-bit value: * @@ -84,7 +93,7 @@ struct ScFuncDescCore class ScFuncRes { public: - ScFuncRes(ResId&, const ScFuncDescCore &rEntry, ScFuncDesc*, bool & rbSuppressed); + ScFuncRes(const ScFuncDescCore &rEntry, ScFuncDesc*, bool& rbSuppressed); }; // class ScFuncDesc: @@ -402,6 +411,8 @@ bool ScFuncDesc::compareByName(const ScFuncDesc* a, const ScFuncDesc* b) return (ScGlobal::GetCaseCollator()->compareString(*a->pFuncName, *b->pFuncName ) < 0); } +#define ENTRY(CODE) CODE, SAL_N_ELEMENTS(CODE) + // class ScFunctionList: ScFunctionList::ScFunctionList() : nMaxFuncNameLen(0) @@ -411,395 +422,395 @@ ScFunctionList::ScFunctionList() // which will concept check that the list is sorted on first use to ensure this holds ScFuncDescCore aDescs[] = { - { SC_OPCODE_IF, 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_WENN, 3, { 0, 1, 1 } }, - { SC_OPCODE_IF_ERROR, 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_IFERROR, 2, { 0, 0 } }, - { SC_OPCODE_IF_NA, 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_IFNA, 2, { 0, 0 } }, - { SC_OPCODE_CHOOSE, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_WAHL, VAR_ARGS+1, { 0, 0 } }, - { SC_OPCODE_AND, 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_UND, VAR_ARGS, { 0 } }, - { SC_OPCODE_OR, 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_ODER, VAR_ARGS, { 0 } }, - { SC_OPCODE_NOT, 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_NICHT, 1, { 0 } }, - { SC_OPCODE_PI, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_PI, 0, { } }, - { SC_OPCODE_RANDOM, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ZUFALLSZAHL, 0, { } }, - { SC_OPCODE_TRUE, 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_WAHR, 0, { } }, - { SC_OPCODE_FALSE, 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_FALSCH, 0, { } }, - { SC_OPCODE_GET_ACT_DATE, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_HEUTE, 0, { } }, - { SC_OPCODE_GET_ACT_TIME, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_JETZT, 0, { } }, - { SC_OPCODE_NO_VALUE, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_NV, 0, { } }, - { SC_OPCODE_CURRENT, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_AKTUELL, 0, { } }, - { SC_OPCODE_DEG, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_DEG, 1, { 0 } }, - { SC_OPCODE_RAD, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_RAD, 1, { 0 } }, - { SC_OPCODE_SIN, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_SIN, 1, { 0 } }, - { SC_OPCODE_COS, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_COS, 1, { 0 } }, - { SC_OPCODE_TAN, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_TAN, 1, { 0 } }, - { SC_OPCODE_COT, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_COT, 1, { 0 } }, - { SC_OPCODE_ARC_SIN, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ARCSIN, 1, { 0 } }, - { SC_OPCODE_ARC_COS, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ARCCOS, 1, { 0 } }, - { SC_OPCODE_ARC_TAN, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ARCTAN, 1, { 0 } }, - { SC_OPCODE_ARC_COT, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ARCCOT, 1, { 0 } }, - { SC_OPCODE_SIN_HYP, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_SINHYP, 1, { 0 } }, - { SC_OPCODE_COS_HYP, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_COSHYP, 1, { 0 } }, - { SC_OPCODE_TAN_HYP, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_TANHYP, 1, { 0 } }, - { SC_OPCODE_COT_HYP, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_COTHYP, 1, { 0 } }, - { SC_OPCODE_ARC_SIN_HYP, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ARSINHYP, 1, { 0 } }, - { SC_OPCODE_ARC_COS_HYP, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ARCOSHYP, 1, { 0 } }, - { SC_OPCODE_ARC_TAN_HYP, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ARTANHYP, 1, { 0 } }, - { SC_OPCODE_ARC_COT_HYP, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ARCOTHYP, 1, { 0 } }, - { SC_OPCODE_COSECANT, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_COSECANT, 1, { 0 } }, - { SC_OPCODE_SECANT, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_SECANT, 1, { 0 } }, - { SC_OPCODE_COSECANT_HYP, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_COSECANTHYP, 1, { 0 } }, - { SC_OPCODE_SECANT_HYP, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_SECANTHYP, 1, { 0 } }, - { SC_OPCODE_EXP, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_EXP, 1, { 0 } }, - { SC_OPCODE_LN, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_LN, 1, { 0 } }, - { SC_OPCODE_SQRT, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_WURZEL, 1, { 0 } }, - { SC_OPCODE_FACT, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_FAKULTAET, 1, { 0 } }, - { SC_OPCODE_GET_YEAR, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_JAHR, 1, { 0 } }, - { SC_OPCODE_GET_MONTH, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_MONAT, 1, { 0 } }, - { SC_OPCODE_GET_DAY, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_TAG, 1, { 0 } }, - { SC_OPCODE_GET_HOUR, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_STUNDE, 1, { 0 } }, - { SC_OPCODE_GET_MIN, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_MINUTE, 1, { 0 } }, - { SC_OPCODE_GET_SEC, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_SEKUNDE, 1, { 0 } }, - { SC_OPCODE_PLUS_MINUS, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_VORZEICHEN, 1, { 0 } }, - { SC_OPCODE_ABS, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ABS, 1, { 0 } }, - { SC_OPCODE_INT, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_GANZZAHL, 1, { 0 } }, - { SC_OPCODE_PHI, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_PHI, 1, { 0 } }, - { SC_OPCODE_GAUSS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GAUSS, 1, { 0 } }, - { SC_OPCODE_IS_EMPTY, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTLEER, 1, { 0 } }, - { SC_OPCODE_IS_STRING, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTTEXT, 1, { 0 } }, - { SC_OPCODE_IS_NON_STRING, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTKTEXT, 1, { 0 } }, - { SC_OPCODE_IS_LOGICAL, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTLOG, 1, { 0 } }, - { SC_OPCODE_TYPE, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_TYP, 1, { 0 } }, - { SC_OPCODE_IS_REF, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTBEZUG, 1, { 0 } }, - { SC_OPCODE_IS_VALUE, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTZAHL, 1, { 0 } }, - { SC_OPCODE_IS_FORMULA, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTFORMEL, 1, { 0 } }, - { SC_OPCODE_IS_NV, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTNV, 1, { 0 } }, - { SC_OPCODE_IS_ERR, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTFEHL, 1, { 0 } }, - { SC_OPCODE_IS_ERROR, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTFEHLER, 1, { 0 } }, - { SC_OPCODE_IS_EVEN, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTGERADE, 1, { 0 } }, - { SC_OPCODE_IS_ODD, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTUNGERADE, 1, { 0 } }, - { SC_OPCODE_N, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_N, 1, { 0 } }, - { SC_OPCODE_GET_DATE_VALUE, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_DATWERT, 1, { 0 } }, - { SC_OPCODE_GET_TIME_VALUE, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_ZEITWERT, 1, { 0 } }, - { SC_OPCODE_CODE, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_CODE, 1, { 0 } }, - { SC_OPCODE_TRIM, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_GLAETTEN, 1, { 0 } }, - { SC_OPCODE_UPPER, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_GROSS, 1, { 0 } }, - { SC_OPCODE_PROPER, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_GROSS2, 1, { 0 } }, - { SC_OPCODE_LOWER, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_KLEIN, 1, { 0 } }, - { SC_OPCODE_LEN, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_LAENGE, 1, { 0 } }, - { SC_OPCODE_T, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_T, 1, { 0 } }, - { SC_OPCODE_VALUE, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_WERT, 1, { 0 } }, - { SC_OPCODE_CLEAN, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_SAEUBERN, 1, { 0 } }, - { SC_OPCODE_CHAR, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_ZEICHEN, 1, { 0 } }, - { SC_OPCODE_LOG10, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_LOG10, 1, { 0 } }, - { SC_OPCODE_EVEN, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_GERADE, 1, { 0 } }, - { SC_OPCODE_ODD, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_UNGERADE, 1, { 0 } }, - { SC_OPCODE_STD_NORM_DIST, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STANDNORMVERT, 1, { 0 } }, - { SC_OPCODE_FISHER, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FISHER, 1, { 0 } }, - { SC_OPCODE_FISHER_INV, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FISHERINV, 1, { 0 } }, - { SC_OPCODE_S_NORM_INV, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STANDNORMINV, 1, { 0 } }, - { SC_OPCODE_GAMMA_LN, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GAMMALN, 1, { 0 } }, - { SC_OPCODE_ERROR_TYPE, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_FEHLERTYP, 1, { 0 } }, - { SC_OPCODE_FORMULA, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_FORMEL, 1, { 0 } }, - { SC_OPCODE_ARABIC, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_ARABISCH, 1, { 0 } }, - { SC_OPCODE_INFO, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_INFO, 1, { 0 } }, - { SC_OPCODE_BAHTTEXT, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_BAHTTEXT, 1, { 0 } }, - { SC_OPCODE_JIS, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_JIS, 1, { 0 } }, - { SC_OPCODE_ASC, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_ASC, 1, { 0 } }, - { SC_OPCODE_UNICODE, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_UNICODE, 1, { 0 } }, - { SC_OPCODE_UNICHAR, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_UNICHAR, 1, { 0 } }, - { SC_OPCODE_GAMMA, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GAMMA, 1, { 0 } }, - { SC_OPCODE_GAMMA_LN_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GAMMALN_MS, 1, { 0 } }, - { SC_OPCODE_ERF_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_ERF_MS, 1, { 0 } }, - { SC_OPCODE_ERFC_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_ERFC_MS, 1, { 0 } }, - { SC_OPCODE_ERROR_TYPE_ODF, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_ERROR_TYPE_ODF, 1, { 0 } }, - { SC_OPCODE_ENCODEURL, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_ENCODEURL, 1, { 0 } }, - { SC_OPCODE_ISOWEEKNUM, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_ISOWEEKNUM, 1, { 0 } }, - { SC_OPCODE_ARC_TAN_2, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ARCTAN2, 2, { 0, 0 } }, - { SC_OPCODE_CEIL, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_OBERGRENZE, 3, { 0, 1, 1 } }, - { SC_OPCODE_FLOOR, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_UNTERGRENZE, 3, { 0, 1, 1 } }, - { SC_OPCODE_ROUND, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_RUNDEN, 2, { 0, 1 } }, - { SC_OPCODE_ROUND_UP, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_AUFRUNDEN, 2, { 0, 1 } }, - { SC_OPCODE_ROUND_DOWN, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ABRUNDEN, 2, { 0, 1 } }, - { SC_OPCODE_TRUNC, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_KUERZEN, 2, { 0, 0 } }, - { SC_OPCODE_LOG, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_LOG, 2, { 0, 1 } }, - { SC_OPCODE_POWER, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_POTENZ, 2, { 0, 0 } }, - { SC_OPCODE_GCD, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_GGT, VAR_ARGS, { 0 } }, - { SC_OPCODE_LCM, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_KGV, VAR_ARGS, { 0 } }, - { SC_OPCODE_MOD, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_REST, 2, { 0, 0 } }, - { SC_OPCODE_SUM_PRODUCT, 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_SUMMENPRODUKT, VAR_ARGS, { 0 } }, - { SC_OPCODE_SUM_SQ, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_QUADRATESUMME, VAR_ARGS, { 0 } }, - { SC_OPCODE_SUM_X2MY2, 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_SUMMEX2MY2, 2, { 0, 0 } }, - { SC_OPCODE_SUM_X2DY2, 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_SUMMEX2PY2, 2, { 0, 0 } }, - { SC_OPCODE_SUM_XMY2, 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_SUMMEXMY2, 2, { 0, 0 } }, - { SC_OPCODE_GET_DATE, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_DATUM, 3, { 0, 0, 0 } }, - { SC_OPCODE_GET_TIME, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_ZEIT, 3, { 0, 0, 0 } }, - { SC_OPCODE_GET_DIFF_DATE, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_TAGE, 2, { 0, 0 } }, - { SC_OPCODE_GET_DIFF_DATE_360, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_TAGE360, 3, { 0, 0, 1 } }, - { SC_OPCODE_MIN, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MIN, VAR_ARGS, { 0 } }, - { SC_OPCODE_MAX, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MAX, VAR_ARGS, { 0 } }, - { SC_OPCODE_SUM, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_SUMME, VAR_ARGS, { 0 } }, - { SC_OPCODE_PRODUCT, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_PRODUKT, VAR_ARGS, { 0 } }, - { SC_OPCODE_AVERAGE, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MITTELWERT, VAR_ARGS, { 0 } }, - { SC_OPCODE_COUNT, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_ANZAHL, VAR_ARGS, { 0 } }, - { SC_OPCODE_COUNT_2, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_ANZAHL2, VAR_ARGS, { 0 } }, - { SC_OPCODE_NPV, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_NBW, VAR_ARGS+1, { 0, 0 } }, - { SC_OPCODE_IRR, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_IKV, 2, { 0, 1 } }, - { SC_OPCODE_VAR, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_VARIANZ, VAR_ARGS, { 0 } }, - { SC_OPCODE_VAR_P, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_VARIANZEN, VAR_ARGS, { 0 } }, - { SC_OPCODE_ST_DEV, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STABW, VAR_ARGS, { 0 } }, - { SC_OPCODE_ST_DEV_P, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STABWN, VAR_ARGS, { 0 } }, - { SC_OPCODE_B, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_B, 4, { 0, 0, 0, 1 } }, - { SC_OPCODE_NORM_DIST, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_NORMVERT, 4, { 0, 0, 0, 1 } }, - { SC_OPCODE_EXP_DIST, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_EXPONVERT, 3, { 0, 0, 0 } }, - { SC_OPCODE_BINOM_DIST, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_BINOMVERT, 4, { 0, 0, 0, 0 } }, - { SC_OPCODE_POISSON_DIST, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_POISSON, 3, { 0, 0, 1 } }, - { SC_OPCODE_COMBIN, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_KOMBINATIONEN, 2, { 0, 0 } }, - { SC_OPCODE_COMBIN_A, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_KOMBINATIONEN2, 2, { 0, 0 } }, - { SC_OPCODE_PERMUT, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_VARIATIONEN, 2, { 0, 0 } }, - { SC_OPCODE_PERMUTATION_A, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_VARIATIONEN2, 2, { 0, 0 } }, - { SC_OPCODE_PV, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_BW, 5, { 0, 0, 0, 1, 1 } }, - { SC_OPCODE_SYD, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_DIA, 4, { 0, 0, 0, 0 } }, - { SC_OPCODE_DDB, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_GDA, 5, { 0, 0, 0, 0, 1 } }, - { SC_OPCODE_DB, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_GDA2, 5, { 0, 0, 0, 0, 1 } }, - { SC_OPCODE_VBD , 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_VDB, 7, { 0, 0, 0, 0, 0, 1, 1 } }, - { SC_OPCODE_PDURATION, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_LAUFZEIT, 3, { 0, 0, 0 } }, - { SC_OPCODE_SLN, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_LIA, 3, { 0, 0, 0 } }, - { SC_OPCODE_PMT, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_RMZ, 5, { 0, 0, 0, 1, 1 } }, - { SC_OPCODE_COLUMNS, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_SPALTEN, 1, { 0 } }, - { SC_OPCODE_ROWS, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_ZEILEN, 1, { 0 } }, - { SC_OPCODE_COLUMN, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_SPALTE, 1, { 1 } }, - { SC_OPCODE_ROW, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_ZEILE, 1, { 1 } }, - { SC_OPCODE_RRI, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_ZGZ, 3, { 0, 0, 0 } }, - { SC_OPCODE_FV, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_ZW, 5, { 0, 0, 0, 1, 1 } }, - { SC_OPCODE_NPER, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_ZZR, 5, { 0, 0, 0, 1, 1 } }, - { SC_OPCODE_RATE, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_ZINS, 6, { 0, 0, 0, 1, 1, 1 } }, - { SC_OPCODE_IPMT, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_ZINSZ, 6, { 0, 0, 0, 0, 1, 1 } }, - { SC_OPCODE_PPMT, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_KAPZ, 6, { 0, 0, 0, 0, 1, 1 } }, - { SC_OPCODE_CUM_IPMT, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_KUMZINSZ, 6, { 0, 0, 0, 0, 0, 0 } }, - { SC_OPCODE_CUM_PRINC, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_KUMKAPITAL, 6, { 0, 0, 0, 0, 0, 0 } }, - { SC_OPCODE_EFFECT, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_EFFEKTIV, 2, { 0, 0 } }, - { SC_OPCODE_NOMINAL, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_NOMINAL, 2, { 0, 0 } }, - { SC_OPCODE_SUB_TOTAL, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_TEILERGEBNIS, 2, { 0, 0 } }, - { SC_OPCODE_DB_SUM, 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBSUMME, 3, { 0, 0, 0 } }, - { SC_OPCODE_DB_COUNT, 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBANZAHL, 3, { 0, 0, 0 } }, - { SC_OPCODE_DB_COUNT_2, 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBANZAHL2, 3, { 0, 0, 0 } }, - { SC_OPCODE_DB_AVERAGE, 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBMITTELWERT, 3, { 0, 0, 0 } }, - { SC_OPCODE_DB_GET, 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBAUSZUG, 3, { 0, 0, 0 } }, - { SC_OPCODE_DB_MAX, 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBMAX, 3, { 0, 0, 0 } }, - { SC_OPCODE_DB_MIN, 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBMIN, 3, { 0, 0, 0 } }, - { SC_OPCODE_DB_PRODUCT, 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBPRODUKT, 3, { 0, 0, 0 } }, - { SC_OPCODE_DB_STD_DEV, 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBSTDABW, 3, { 0, 0, 0 } }, - { SC_OPCODE_DB_STD_DEV_P, 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBSTDABWN, 3, { 0, 0, 0 } }, - { SC_OPCODE_DB_VAR, 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBVARIANZ, 3, { 0, 0, 0 } }, - { SC_OPCODE_DB_VAR_P, 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBVARIANZEN, 3, { 0, 0, 0 } }, - { SC_OPCODE_INDIRECT, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_INDIREKT, 2, { 0, 1 } }, - { SC_OPCODE_ADDRESS, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_ADRESSE, 5, { 0, 0, 1, 1, 1 } }, - { SC_OPCODE_MATCH, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_VERGLEICH, 3, { 0, 0, 1 } }, - { SC_OPCODE_COUNT_EMPTY_CELLS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_ANZAHLLEEREZELLEN, 1, { 0 } }, - { SC_OPCODE_COUNT_IF, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_ZAEHLENWENN, 2, { 0, 0 } }, - { SC_OPCODE_SUM_IF, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_SUMMEWENN, 3, { 0, 0, 1 } }, - { SC_OPCODE_LOOKUP, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_VERWEIS, 3, { 0, 0, 1 } }, - { SC_OPCODE_V_LOOKUP, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_SVERWEIS, 4, { 0, 0, 0, 1 } }, - { SC_OPCODE_H_LOOKUP, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_WVERWEIS, 4, { 0, 0, 0, 1 } }, - { SC_OPCODE_OFFSET, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_VERSCHIEBUNG, 5, { 0, 0, 0, 1, 1 } }, - { SC_OPCODE_INDEX, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_INDEX, 4, { 0, 1, 1, 1 } }, - { SC_OPCODE_AREAS, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_BEREICHE, 1, { 0 } }, - { SC_OPCODE_CURRENCY, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_DM, 2, { 0, 1 } }, - { SC_OPCODE_REPLACE, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_ERSETZEN, 4, { 0, 0, 0, 0 } }, - { SC_OPCODE_FIXED, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_FEST, 3, { 0, 0, 1 } }, - { SC_OPCODE_FIND, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_FINDEN, 3, { 0, 0, 1 } }, - { SC_OPCODE_EXACT, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_IDENTISCH, 2, { 0, 0 } }, - { SC_OPCODE_LEFT, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_LINKS, 2, { 0, 1 } }, - { SC_OPCODE_RIGHT, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_RECHTS, 2, { 0, 1 } }, - { SC_OPCODE_SEARCH, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_SUCHEN, 3, { 0, 0, 1 } }, - { SC_OPCODE_MID, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_TEIL, 3, { 0, 0, 0 } }, - { SC_OPCODE_TEXT, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_TEXT, 2, { 0, 0 } }, - { SC_OPCODE_SUBSTITUTE, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_WECHSELN, 4, { 0, 0, 0, 1 } }, - { SC_OPCODE_REPT, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_WIEDERHOLEN, 2, { 0, 0 } }, - { SC_OPCODE_CONCAT, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_VERKETTEN, VAR_ARGS, { 0 } }, - { SC_OPCODE_MAT_DET, 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_MDET, 1, { 0 } }, - { SC_OPCODE_MAT_INV, 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_MINV, 1, { 0 } }, - { SC_OPCODE_MAT_MULT, 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_MMULT, 2, { 0, 0 } }, - { SC_OPCODE_MAT_TRANS, 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_MTRANS, 1, { 0 } }, - { SC_OPCODE_MATRIX_UNIT, 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_EINHEITSMATRIX, 1, { 0 } }, - { SC_OPCODE_HYP_GEOM_DIST, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_HYPGEOMVERT, 5, { 0, 0, 0, 0, 1 } }, - { SC_OPCODE_LOG_NORM_DIST, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_LOGNORMVERT, 4, { 0, 1, 1, 1 } }, - { SC_OPCODE_T_DIST, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_TVERT, 3, { 0, 0, 0 } }, - { SC_OPCODE_F_DIST, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FVERT, 3, { 0, 0, 0 } }, - { SC_OPCODE_CHI_DIST, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHIVERT, 2, { 0, 0 } }, - { SC_OPCODE_WEIBULL, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_WEIBULL, 4, { 0, 0, 0, 0 } }, - { SC_OPCODE_NEG_BINOM_VERT, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_NEGBINOMVERT, 3, { 0, 0, 0 } }, - { SC_OPCODE_CRIT_BINOM, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_KRITBINOM, 3, { 0, 0, 0 } }, - { SC_OPCODE_KURT, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_KURT, VAR_ARGS, { 0 } }, - { SC_OPCODE_HAR_MEAN, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_HARMITTEL, VAR_ARGS, { 0 } }, - { SC_OPCODE_GEO_MEAN, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GEOMITTEL, VAR_ARGS, { 0 } }, - { SC_OPCODE_STANDARD, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STANDARDISIERUNG, 3, { 0, 0, 0 } }, - { SC_OPCODE_AVE_DEV, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MITTELABW, VAR_ARGS, { 0 } }, - { SC_OPCODE_SKEW, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_SCHIEFE, VAR_ARGS, { 0 } }, - { SC_OPCODE_DEV_SQ, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_SUMQUADABW, VAR_ARGS, { 0 } }, - { SC_OPCODE_MEDIAN, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MEDIAN, VAR_ARGS, { 0 } }, - { SC_OPCODE_MODAL_VALUE, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MODALWERT, VAR_ARGS, { 0 } }, - { SC_OPCODE_Z_TEST, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GTEST, 3, { 0, 0, 1 } }, - { SC_OPCODE_T_TEST, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_TTEST, 4, { 0, 0, 0, 0 } }, - { SC_OPCODE_RANK, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_RANG, 3, { 0, 0, 1 } }, - { SC_OPCODE_PERCENTILE, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_QUANTIL, 2, { 0, 0 } }, - { SC_OPCODE_PERCENT_RANK, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_QUANTILSRANG, 3, { 0, 0, 1 } }, - { SC_OPCODE_LARGE, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_KGROESSTE, 2, { 0, 0 } }, - { SC_OPCODE_SMALL, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_KKLEINSTE, 2, { 0, 0 } }, - { SC_OPCODE_FREQUENCY, 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_HAEUFIGKEIT, 2, { 0, 0 } }, - { SC_OPCODE_QUARTILE, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_QUARTILE, 2, { 0, 0 } }, - { SC_OPCODE_NORM_INV, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_NORMINV, 3, { 0, 0, 0 } }, - { SC_OPCODE_CONFIDENCE, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_KONFIDENZ, 3, { 0, 0, 0 } }, - { SC_OPCODE_F_TEST, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FTEST, 2, { 0, 0 } }, - { SC_OPCODE_TRIM_MEAN, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GESTUTZTMITTEL, 2, { 0, 0 } }, - { SC_OPCODE_PROB, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_WAHRSCHBEREICH, 4, { 0, 0, 0, 1 } }, - { SC_OPCODE_CORREL, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_KORREL, 2, { 0, 0 } }, - { SC_OPCODE_COVAR, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_KOVAR, 2, { 0, 0 } }, - { SC_OPCODE_PEARSON, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_PEARSON, 2, { 0, 0 } }, - { SC_OPCODE_RSQ, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_BESTIMMTHEITSMASS, 2, { 0, 0 } }, - { SC_OPCODE_STEYX, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STFEHLERYX, 2, { 0, 0 } }, - { SC_OPCODE_SLOPE, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STEIGUNG, 2, { 0, 0 } }, - { SC_OPCODE_INTERCEPT, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_ACHSENABSCHNITT, 2, { 0, 0 } }, - { SC_OPCODE_TREND, 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_TREND, 4, { 0, 1, 1, 1 } }, - { SC_OPCODE_GROWTH, 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_VARIATION, 4, { 0, 1, 1, 1 } }, - { SC_OPCODE_LINEST, 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_RGP, 4, { 0, 1, 1, 1 } }, - { SC_OPCODE_LOGEST, 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_RKP, 4, { 0, 1, 1, 1 } }, - { SC_OPCODE_FORECAST, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_SCHAETZER, 3, { 0, 0, 0 } }, - { SC_OPCODE_CHI_INV, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHIINV, 2, { 0, 0 } }, - { SC_OPCODE_GAMMA_DIST, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GAMMAVERT, 4, { 0, 0, 0, 1 } }, - { SC_OPCODE_GAMMA_INV, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GAMMAINV, 3, { 0, 0, 0 } }, - { SC_OPCODE_T_INV, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_TINV, 2, { 0, 0 } }, - { SC_OPCODE_F_INV, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FINV, 3, { 0, 0, 0 } }, - { SC_OPCODE_CHI_TEST, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHITEST, 2, { 0, 0 } }, - { SC_OPCODE_LOG_INV, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_LOGINV, 3, { 0, 1, 1 } }, - { SC_OPCODE_BETA_DIST, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_BETAVERT, 6, { 0, 0, 0, 1, 1, 1 } }, - { SC_OPCODE_BETA_INV, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_BETAINV, 5, { 0, 0, 0, 1, 1 } }, - { SC_OPCODE_WEEK, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_KALENDERWOCHE, 2, { 0, 1 } }, - { SC_OPCODE_GET_DAY_OF_WEEK, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_WOCHENTAG, 2, { 0, 1 } }, - { SC_OPCODE_STYLE, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_VORLAGE, 3, { 0, 1, 1 } }, - { SC_OPCODE_DDE, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_DDE, 4, { 0, 0, 0, 1 } }, - { SC_OPCODE_BASE, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_BASIS, 3, { 0, 0, 1 } }, - { SC_OPCODE_SHEET, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_TABELLE, 1, { 1 } }, - { SC_OPCODE_SHEETS, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_TABELLEN, 1, { 1 } }, - { SC_OPCODE_MIN_A, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MINA, VAR_ARGS, { 0 } }, - { SC_OPCODE_MAX_A, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MAXA, VAR_ARGS, { 0 } }, - { SC_OPCODE_AVERAGE_A, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MITTELWERTA, VAR_ARGS, { 0 } }, - { SC_OPCODE_ST_DEV_A, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STABWA, VAR_ARGS, { 0 } }, - { SC_OPCODE_ST_DEV_P_A, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STABWNA, VAR_ARGS, { 0 } }, - { SC_OPCODE_VAR_A, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_VARIANZA, VAR_ARGS, { 0 } }, - { SC_OPCODE_VAR_P_A, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_VARIANZENA, VAR_ARGS, { 0 } }, - { SC_OPCODE_EASTERSUNDAY, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_OSTERSONNTAG, 1, { 0 } }, - { SC_OPCODE_DECIMAL, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_DEZIMAL, 2, { 0, 0 } }, - { SC_OPCODE_CONVERT_OOO, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_UMRECHNEN, 3, { 0, 0, 0 } }, - { SC_OPCODE_ROMAN, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_ROEMISCH, 2, { 0, 1 } }, - { SC_OPCODE_MIRR, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_QIKV, 3, { 0, 0, 0 } }, - { SC_OPCODE_CELL, 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ZELLE, 2, { 0, 1 } }, - { SC_OPCODE_ISPMT, 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_ISPMT, 4, { 0, 0, 0, 0 } }, - { SC_OPCODE_HYPERLINK, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_HYPERLINK, 2, { 0, 1 } }, - { SC_OPCODE_GET_PIVOT_DATA, 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_GETPIVOTDATA, VAR_ARGS+2, { 0, 0, 1 } }, - { SC_OPCODE_EUROCONVERT, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_EUROCONVERT, 5, { 0, 0, 0, 1, 1 } }, - { SC_OPCODE_NUMBERVALUE, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_NUMBERVALUE, 3, { 0, 1, 1 } }, - { SC_OPCODE_CHISQ_DIST, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHISQDIST, 3, { 0, 0, 1 } }, - { SC_OPCODE_CHISQ_INV, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHISQINV, 2, { 0, 0 } }, - { SC_OPCODE_BITAND, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_BITAND, 2, { 0, 0 } }, - { SC_OPCODE_BITOR, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_BITOR, 2, { 0, 0 } }, - { SC_OPCODE_BITXOR, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_BITXOR, 2, { 0, 0 } }, - { SC_OPCODE_BITRSHIFT, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_BITRSHIFT, 2, { 0, 0 } }, - { SC_OPCODE_BITLSHIFT, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_BITLSHIFT, 2, { 0, 0 } }, - { SC_OPCODE_GET_DATEDIF, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_DATEDIF, 3, { 0, 0, 0 } }, - { SC_OPCODE_XOR, 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_XOR, VAR_ARGS, { 0 } }, - { SC_OPCODE_AVERAGE_IF, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_AVERAGEIF, 3, { 0, 0, 1 } }, - { SC_OPCODE_SUM_IFS, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_SUMIFS, PAIRED_VAR_ARGS+1, { 0, 0, 0 } }, - { SC_OPCODE_AVERAGE_IFS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_AVERAGEIFS, PAIRED_VAR_ARGS+1, { 0, 0, 0 } }, - { SC_OPCODE_COUNT_IFS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_COUNTIFS, PAIRED_VAR_ARGS, { 0, 0 } }, - { SC_OPCODE_SKEWP, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_SKEWP, VAR_ARGS, { 0 } }, - { SC_OPCODE_LENB, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_LENB, 1, { 0 } }, - { SC_OPCODE_RIGHTB, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_RIGHTB, 2, { 0, 1 } }, - { SC_OPCODE_LEFTB, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_LEFTB, 2, { 0, 1 } }, - { SC_OPCODE_MIDB, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_MIDB, 3, { 0, 0, 0 } }, - { SC_OPCODE_FILTERXML, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_FILTERXML, 2, { 0, 0 } }, - { SC_OPCODE_WEBSERVICE, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_WEBSERVICE, 1, { 0, 0 } }, - { SC_OPCODE_COVARIANCE_S, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_COVARIANCE_S, 2, { 0, 0 } }, - { SC_OPCODE_COVARIANCE_P, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_COVARIANCE_P, 2, { 0, 0 } }, - { SC_OPCODE_ST_DEV_P_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_ST_DEV_P_MS, VAR_ARGS, { 0 } }, - { SC_OPCODE_ST_DEV_S, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_ST_DEV_S, VAR_ARGS, { 0 } }, - { SC_OPCODE_VAR_P_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_VAR_P_MS, VAR_ARGS, { 0 } }, - { SC_OPCODE_VAR_S, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_VAR_S, VAR_ARGS, { 0 } }, - { SC_OPCODE_BETA_DIST_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_BETADIST_MS, 6, { 0, 0, 0, 0, 1, 1 } }, - { SC_OPCODE_BETA_INV_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_BETAINV_MS, 5, { 0, 0, 0, 1, 1 } }, - { SC_OPCODE_BINOM_DIST_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_BINOM_DIST_MS, 4, { 0, 0, 0, 0 } }, - { SC_OPCODE_BINOM_INV, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_BINOM_INV_MS, 3, { 0, 0, 0 } }, - { SC_OPCODE_CHI_DIST_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHIVERT_MS, 2, { 0, 0 } }, - { SC_OPCODE_CHI_INV_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHIINV_MS, 2, { 0, 0 } }, - { SC_OPCODE_CHI_TEST_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHITEST_MS, 2, { 0, 0 } }, - { SC_OPCODE_CHISQ_DIST_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHISQDIST_MS, 3, { 0, 0, 0 } }, - { SC_OPCODE_CHISQ_INV_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHISQINV_MS, 2, { 0, 0 } }, - { SC_OPCODE_CONFIDENCE_N, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CONFIDENCE_N, 3, { 0, 0, 0 } }, - { SC_OPCODE_CONFIDENCE_T, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CONFIDENCE_T, 3, { 0, 0, 0 } }, - { SC_OPCODE_F_DIST_LT, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_F_DIST_LT, 4, { 0, 0, 0, 1 } }, - { SC_OPCODE_F_DIST_RT, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_F_DIST_RT, 3, { 0, 0, 0 } }, - { SC_OPCODE_F_INV_LT, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_F_INV_LT, 3, { 0, 0, 0 } }, - { SC_OPCODE_F_INV_RT, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_F_INV_RT, 3, { 0, 0, 0 } }, - { SC_OPCODE_F_TEST_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_F_TEST_MS, 2, { 0, 0 } }, - { SC_OPCODE_EXP_DIST_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_EXP_DIST_MS, 3, { 0, 0, 0 } }, - { SC_OPCODE_HYP_GEOM_DIST_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_HYP_GEOM_DIST_MS, 5, { 0, 0, 0, 0, 0 } }, - { SC_OPCODE_POISSON_DIST_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_POISSON_DIST_MS, 3, { 0, 0, 1 } }, - { SC_OPCODE_WEIBULL_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_WEIBULL_DIST_MS, 4, { 0, 0, 0, 0 } }, - { SC_OPCODE_GAMMA_DIST_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GAMMADIST_MS, 4, { 0, 0, 0, 0 } }, - { SC_OPCODE_GAMMA_INV_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GAMMAINV_MS, 3, { 0, 0, 0 } }, - { SC_OPCODE_LOG_NORM_DIST_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_LOGNORMDIST_MS, 4, { 0, 0, 0, 0 } }, - { SC_OPCODE_LOG_INV_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_LOGINV, 3, { 0, 0, 0 } }, - { SC_OPCODE_NORM_DIST_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_NORMDIST_MS, 4, { 0, 0, 0, 0 } }, - { SC_OPCODE_NORM_INV_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_NORMINV_MS, 3, { 0, 0, 0 } }, - { SC_OPCODE_STD_NORM_DIST_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STD_NORMDIST_MS, 2, { 0, 0 } }, - { SC_OPCODE_S_NORM_INV_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STD_NORMINV_MS, 1, { 0 } }, - { SC_OPCODE_T_DIST_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_TDIST_MS, 3, { 0, 0, 0 } }, - { SC_OPCODE_T_DIST_RT, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_TDIST_RT, 2, { 0, 0 } }, - { SC_OPCODE_T_DIST_2T, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_TDIST_2T, 2, { 0, 0 } }, - { SC_OPCODE_T_INV_2T, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_TINV_2T, 2, { 0, 0 } }, - { SC_OPCODE_T_INV_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_TINV_MS, 2, { 0, 0 } }, - { SC_OPCODE_T_TEST_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_TTEST_MS, 4, { 0, 0, 0, 0 } }, - { SC_OPCODE_PERCENTILE_INC, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_PERCENTILE_INC, 2, { 0, 0 } }, - { SC_OPCODE_PERCENT_RANK_INC, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_PERCENTRANK_INC, 3, { 0, 0, 1 } }, - { SC_OPCODE_QUARTILE_INC, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_QUARTILE_INC, 2, { 0, 0 } }, - { SC_OPCODE_RANK_EQ, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_RANK_EQ, 3, { 0, 0, 1 } }, - { SC_OPCODE_PERCENTILE_EXC, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_PERCENTILE_EXC, 2, { 0, 0 } }, - { SC_OPCODE_PERCENT_RANK_EXC, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_PERCENTRANK_EXC, 3, { 0, 0, 1 } }, - { SC_OPCODE_QUARTILE_EXC, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_QUARTILE_EXC, 2, { 0, 0 } }, - { SC_OPCODE_RANK_AVG, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_RANK_AVG, 3, { 0, 0, 1 } }, - { SC_OPCODE_MODAL_VALUE_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MODAL_VALUE_MS, VAR_ARGS, { 0 } }, - { SC_OPCODE_MODAL_VALUE_MULTI, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MODAL_VALUE_MULTI, VAR_ARGS, { 0 } }, - { SC_OPCODE_NEG_BINOM_DIST_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_NEGBINOMDIST_MS, 4, { 0, 0, 0, 0 } }, - { SC_OPCODE_Z_TEST_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_Z_TEST_MS, 3, { 0, 0, 1 } }, - { SC_OPCODE_CEIL_MS, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_CEIL_MS, 2, { 0, 0 } }, - { SC_OPCODE_CEIL_ISO, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_CEIL_ISO, 2, { 0, 1 } }, - { SC_OPCODE_FLOOR_MS, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_FLOOR_MS, 2, { 0, 0 } }, - { SC_OPCODE_NETWORKDAYS_MS, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_NETWORKDAYS_MS, 4, { 0, 0, 1, 1 } }, - { SC_OPCODE_WORKDAY_MS, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_WORKDAY_MS, 4, { 0, 0, 1, 1 } }, - { SC_OPCODE_AGGREGATE, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_AGGREGATE, VAR_ARGS+3, { 0, 0, 0, 1 } }, - { SC_OPCODE_COLOR, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_COLOR, 4, { 0, 0, 0, 1 } }, - { SC_OPCODE_CEIL_MATH, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_CEIL_MATH, 3, { 0, 1, 1 } }, - { SC_OPCODE_CEIL_PRECISE, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_CEIL_PRECISE, 2, { 0, 1 } }, - { SC_OPCODE_NETWORKDAYS, 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_NETWORKDAYS, 4, { 0, 0, 1, 1 } }, - { SC_OPCODE_FLOOR_MATH, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_FLOOR_MATH, 3, { 0, 1, 1 } }, - { SC_OPCODE_FLOOR_PRECISE, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_FLOOR_PRECISE, 2, { 0, 1 } }, - { SC_OPCODE_RAWSUBTRACT, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_RAWSUBTRACT, VAR_ARGS+2, { 0, 0, 1 } }, - { SC_OPCODE_WEEKNUM_OOO, 2, ID_FUNCTION_GRP_DATETIME, HID_FUNC_WEEKNUM_OOO, 2, { 0, 0 } }, - { SC_OPCODE_FORECAST_ETS_ADD, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FORECAST_ETS_ADD, 6, { 0, 0, 0, 1, 1, 1 } }, - { SC_OPCODE_FORECAST_ETS_SEA, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FORECAST_ETS_SEA, 4, { 0, 0, 1, 1 } }, - { SC_OPCODE_FORECAST_ETS_MUL, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FORECAST_ETS_MUL, 6, { 0, 0, 0, 1, 1, 1 } }, - { SC_OPCODE_FORECAST_ETS_PIA, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FORECAST_ETS_PIA, 7, { 0, 0, 0, 1, 1, 1, 1 } }, - { SC_OPCODE_FORECAST_ETS_PIM, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FORECAST_ETS_PIM, 7, { 0, 0, 0, 1, 1, 1, 1 } }, - { SC_OPCODE_FORECAST_ETS_STA, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FORECAST_ETS_STA, 6, { 0, 0, 0, 1, 1, 1 } }, - { SC_OPCODE_FORECAST_ETS_STM, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FORECAST_ETS_STM, 6, { 0, 0, 0, 1, 1, 1 } }, - { SC_OPCODE_FORECAST_LIN, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FORECAST_LIN, 3, { 0, 0, 0 } }, - { SC_OPCODE_CONCAT_MS, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_CONCAT_MS, VAR_ARGS, { 0 } }, - { SC_OPCODE_TEXTJOIN_MS, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_TEXTJOIN_MS, VAR_ARGS + 2, { 0, 0, 0 } }, - { SC_OPCODE_IFS_MS, 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_IFS_MS, PAIRED_VAR_ARGS, { 0, 0 } }, - { SC_OPCODE_SWITCH_MS, 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_SWITCH_MS, PAIRED_VAR_ARGS + 1, { 0, 0, 0 } }, - { SC_OPCODE_MINIFS_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MINIFS_MS, PAIRED_VAR_ARGS + 1, { 0, 0, 0 } }, - { SC_OPCODE_MAXIFS_MS, 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MAXIFS_MS, PAIRED_VAR_ARGS + 1, { 0, 0, 0 } }, - { SC_OPCODE_ROUNDSIG, 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ROUNDSIG, 2, { 0, 0 } }, - { SC_OPCODE_REPLACEB, 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_REPLACEB, 4, { 0, 0, 0, 0 } } + { SC_OPCODE_IF, ENTRY(SC_OPCODE_IF_ARY), 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_WENN, 3, { 0, 1, 1 } }, + { SC_OPCODE_IF_ERROR, ENTRY(SC_OPCODE_IF_ERROR_ARY), 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_IFERROR, 2, { 0, 0 } }, + { SC_OPCODE_IF_NA, ENTRY(SC_OPCODE_IF_NA_ARY), 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_IFNA, 2, { 0, 0 } }, + { SC_OPCODE_CHOOSE, ENTRY(SC_OPCODE_CHOOSE_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_WAHL, VAR_ARGS+1, { 0, 0 } }, + { SC_OPCODE_AND, ENTRY(SC_OPCODE_AND_ARY), 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_UND, VAR_ARGS, { 0 } }, + { SC_OPCODE_OR, ENTRY(SC_OPCODE_OR_ARY), 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_ODER, VAR_ARGS, { 0 } }, + { SC_OPCODE_NOT, ENTRY(SC_OPCODE_NOT_ARY), 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_NICHT, 1, { 0 } }, + { SC_OPCODE_PI, ENTRY(SC_OPCODE_PI_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_PI, 0, { } }, + { SC_OPCODE_RANDOM, ENTRY(SC_OPCODE_RANDOM_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ZUFALLSZAHL, 0, { } }, + { SC_OPCODE_TRUE, ENTRY(SC_OPCODE_TRUE_ARY), 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_WAHR, 0, { } }, + { SC_OPCODE_FALSE, ENTRY(SC_OPCODE_FALSE_ARY), 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_FALSCH, 0, { } }, + { SC_OPCODE_GET_ACT_DATE, ENTRY(SC_OPCODE_GET_ACT_DATE_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_HEUTE, 0, { } }, + { SC_OPCODE_GET_ACT_TIME, ENTRY(SC_OPCODE_GET_ACT_TIME_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_JETZT, 0, { } }, + { SC_OPCODE_NO_VALUE, ENTRY(SC_OPCODE_NO_VALUE_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_NV, 0, { } }, + { SC_OPCODE_CURRENT, ENTRY(SC_OPCODE_CURRENT_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_AKTUELL, 0, { } }, + { SC_OPCODE_DEG, ENTRY(SC_OPCODE_DEG_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_DEG, 1, { 0 } }, + { SC_OPCODE_RAD, ENTRY(SC_OPCODE_RAD_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_RAD, 1, { 0 } }, + { SC_OPCODE_SIN, ENTRY(SC_OPCODE_SIN_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_SIN, 1, { 0 } }, + { SC_OPCODE_COS, ENTRY(SC_OPCODE_COS_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_COS, 1, { 0 } }, + { SC_OPCODE_TAN, ENTRY(SC_OPCODE_TAN_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_TAN, 1, { 0 } }, + { SC_OPCODE_COT, ENTRY(SC_OPCODE_COT_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_COT, 1, { 0 } }, + { SC_OPCODE_ARC_SIN, ENTRY(SC_OPCODE_ARC_SIN_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ARCSIN, 1, { 0 } }, + { SC_OPCODE_ARC_COS, ENTRY(SC_OPCODE_ARC_COS_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ARCCOS, 1, { 0 } }, + { SC_OPCODE_ARC_TAN, ENTRY(SC_OPCODE_ARC_TAN_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ARCTAN, 1, { 0 } }, + { SC_OPCODE_ARC_COT, ENTRY(SC_OPCODE_ARC_COT_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ARCCOT, 1, { 0 } }, + { SC_OPCODE_SIN_HYP, ENTRY(SC_OPCODE_SIN_HYP_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_SINHYP, 1, { 0 } }, + { SC_OPCODE_COS_HYP, ENTRY(SC_OPCODE_COS_HYP_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_COSHYP, 1, { 0 } }, + { SC_OPCODE_TAN_HYP, ENTRY(SC_OPCODE_TAN_HYP_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_TANHYP, 1, { 0 } }, + { SC_OPCODE_COT_HYP, ENTRY(SC_OPCODE_COT_HYP_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_COTHYP, 1, { 0 } }, + { SC_OPCODE_ARC_SIN_HYP, ENTRY(SC_OPCODE_ARC_SIN_HYP_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ARSINHYP, 1, { 0 } }, + { SC_OPCODE_ARC_COS_HYP, ENTRY(SC_OPCODE_ARC_COS_HYP_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ARCOSHYP, 1, { 0 } }, + { SC_OPCODE_ARC_TAN_HYP, ENTRY(SC_OPCODE_ARC_TAN_HYP_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ARTANHYP, 1, { 0 } }, + { SC_OPCODE_ARC_COT_HYP, ENTRY(SC_OPCODE_ARC_COT_HYP_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ARCOTHYP, 1, { 0 } }, + { SC_OPCODE_COSECANT, ENTRY(SC_OPCODE_COSECANT_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_COSECANT, 1, { 0 } }, + { SC_OPCODE_SECANT, ENTRY(SC_OPCODE_SECANT_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_SECANT, 1, { 0 } }, + { SC_OPCODE_COSECANT_HYP, ENTRY(SC_OPCODE_COSECANT_HYP_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_COSECANTHYP, 1, { 0 } }, + { SC_OPCODE_SECANT_HYP, ENTRY(SC_OPCODE_SECANT_HYP_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_SECANTHYP, 1, { 0 } }, + { SC_OPCODE_EXP, ENTRY(SC_OPCODE_EXP_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_EXP, 1, { 0 } }, + { SC_OPCODE_LN, ENTRY(SC_OPCODE_LN_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_LN, 1, { 0 } }, + { SC_OPCODE_SQRT, ENTRY(SC_OPCODE_SQRT_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_WURZEL, 1, { 0 } }, + { SC_OPCODE_FACT, ENTRY(SC_OPCODE_FACT_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_FAKULTAET, 1, { 0 } }, + { SC_OPCODE_GET_YEAR, ENTRY(SC_OPCODE_GET_YEAR_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_JAHR, 1, { 0 } }, + { SC_OPCODE_GET_MONTH, ENTRY(SC_OPCODE_GET_MONTH_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_MONAT, 1, { 0 } }, + { SC_OPCODE_GET_DAY, ENTRY(SC_OPCODE_GET_DAY_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_TAG, 1, { 0 } }, + { SC_OPCODE_GET_HOUR, ENTRY(SC_OPCODE_GET_HOUR_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_STUNDE, 1, { 0 } }, + { SC_OPCODE_GET_MIN, ENTRY(SC_OPCODE_GET_MIN_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_MINUTE, 1, { 0 } }, + { SC_OPCODE_GET_SEC, ENTRY(SC_OPCODE_GET_SEC_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_SEKUNDE, 1, { 0 } }, + { SC_OPCODE_PLUS_MINUS, ENTRY(SC_OPCODE_PLUS_MINUS_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_VORZEICHEN, 1, { 0 } }, + { SC_OPCODE_ABS, ENTRY(SC_OPCODE_ABS_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ABS, 1, { 0 } }, + { SC_OPCODE_INT, ENTRY(SC_OPCODE_INT_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_GANZZAHL, 1, { 0 } }, + { SC_OPCODE_PHI, ENTRY(SC_OPCODE_PHI_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_PHI, 1, { 0 } }, + { SC_OPCODE_GAUSS, ENTRY(SC_OPCODE_GAUSS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GAUSS, 1, { 0 } }, + { SC_OPCODE_IS_EMPTY, ENTRY(SC_OPCODE_IS_EMPTY_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTLEER, 1, { 0 } }, + { SC_OPCODE_IS_STRING, ENTRY(SC_OPCODE_IS_STRING_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTTEXT, 1, { 0 } }, + { SC_OPCODE_IS_NON_STRING, ENTRY(SC_OPCODE_IS_NON_STRING_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTKTEXT, 1, { 0 } }, + { SC_OPCODE_IS_LOGICAL, ENTRY(SC_OPCODE_IS_LOGICAL_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTLOG, 1, { 0 } }, + { SC_OPCODE_TYPE, ENTRY(SC_OPCODE_TYPE_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_TYP, 1, { 0 } }, + { SC_OPCODE_IS_REF, ENTRY(SC_OPCODE_IS_REF_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTBEZUG, 1, { 0 } }, + { SC_OPCODE_IS_VALUE, ENTRY(SC_OPCODE_IS_VALUE_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTZAHL, 1, { 0 } }, + { SC_OPCODE_IS_FORMULA, ENTRY(SC_OPCODE_IS_FORMULA_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTFORMEL, 1, { 0 } }, + { SC_OPCODE_IS_NV, ENTRY(SC_OPCODE_IS_NV_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTNV, 1, { 0 } }, + { SC_OPCODE_IS_ERR, ENTRY(SC_OPCODE_IS_ERR_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTFEHL, 1, { 0 } }, + { SC_OPCODE_IS_ERROR, ENTRY(SC_OPCODE_IS_ERROR_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTFEHLER, 1, { 0 } }, + { SC_OPCODE_IS_EVEN, ENTRY(SC_OPCODE_IS_EVEN_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTGERADE, 1, { 0 } }, + { SC_OPCODE_IS_ODD, ENTRY(SC_OPCODE_IS_ODD_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ISTUNGERADE, 1, { 0 } }, + { SC_OPCODE_N, ENTRY(SC_OPCODE_N_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_N, 1, { 0 } }, + { SC_OPCODE_GET_DATE_VALUE, ENTRY(SC_OPCODE_GET_DATE_VALUE_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_DATWERT, 1, { 0 } }, + { SC_OPCODE_GET_TIME_VALUE, ENTRY(SC_OPCODE_GET_TIME_VALUE_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_ZEITWERT, 1, { 0 } }, + { SC_OPCODE_CODE, ENTRY(SC_OPCODE_CODE_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_CODE, 1, { 0 } }, + { SC_OPCODE_TRIM, ENTRY(SC_OPCODE_TRIM_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_GLAETTEN, 1, { 0 } }, + { SC_OPCODE_UPPER, ENTRY(SC_OPCODE_UPPER_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_GROSS, 1, { 0 } }, + { SC_OPCODE_PROPER, ENTRY(SC_OPCODE_PROPER_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_GROSS2, 1, { 0 } }, + { SC_OPCODE_LOWER, ENTRY(SC_OPCODE_LOWER_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_KLEIN, 1, { 0 } }, + { SC_OPCODE_LEN, ENTRY(SC_OPCODE_LEN_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_LAENGE, 1, { 0 } }, + { SC_OPCODE_T, ENTRY(SC_OPCODE_T_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_T, 1, { 0 } }, + { SC_OPCODE_VALUE, ENTRY(SC_OPCODE_VALUE_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_WERT, 1, { 0 } }, + { SC_OPCODE_CLEAN, ENTRY(SC_OPCODE_CLEAN_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_SAEUBERN, 1, { 0 } }, + { SC_OPCODE_CHAR, ENTRY(SC_OPCODE_CHAR_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_ZEICHEN, 1, { 0 } }, + { SC_OPCODE_LOG10, ENTRY(SC_OPCODE_LOG10_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_LOG10, 1, { 0 } }, + { SC_OPCODE_EVEN, ENTRY(SC_OPCODE_EVEN_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_GERADE, 1, { 0 } }, + { SC_OPCODE_ODD, ENTRY(SC_OPCODE_ODD_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_UNGERADE, 1, { 0 } }, + { SC_OPCODE_STD_NORM_DIST, ENTRY(SC_OPCODE_STD_NORM_DIST_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STANDNORMVERT, 1, { 0 } }, + { SC_OPCODE_FISHER, ENTRY(SC_OPCODE_FISHER_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FISHER, 1, { 0 } }, + { SC_OPCODE_FISHER_INV, ENTRY(SC_OPCODE_FISHER_INV_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FISHERINV, 1, { 0 } }, + { SC_OPCODE_S_NORM_INV, ENTRY(SC_OPCODE_S_NORM_INV_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STANDNORMINV, 1, { 0 } }, + { SC_OPCODE_GAMMA_LN, ENTRY(SC_OPCODE_GAMMA_LN_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GAMMALN, 1, { 0 } }, + { SC_OPCODE_ERROR_TYPE, ENTRY(SC_OPCODE_ERROR_TYPE_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_FEHLERTYP, 1, { 0 } }, + { SC_OPCODE_FORMULA, ENTRY(SC_OPCODE_FORMULA_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_FORMEL, 1, { 0 } }, + { SC_OPCODE_ARABIC, ENTRY(SC_OPCODE_ARABIC_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_ARABISCH, 1, { 0 } }, + { SC_OPCODE_INFO, ENTRY(SC_OPCODE_INFO_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_INFO, 1, { 0 } }, + { SC_OPCODE_BAHTTEXT, ENTRY(SC_OPCODE_BAHTTEXT_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_BAHTTEXT, 1, { 0 } }, + { SC_OPCODE_JIS, ENTRY(SC_OPCODE_JIS_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_JIS, 1, { 0 } }, + { SC_OPCODE_ASC, ENTRY(SC_OPCODE_ASC_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_ASC, 1, { 0 } }, + { SC_OPCODE_UNICODE, ENTRY(SC_OPCODE_UNICODE_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_UNICODE, 1, { 0 } }, + { SC_OPCODE_UNICHAR, ENTRY(SC_OPCODE_UNICHAR_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_UNICHAR, 1, { 0 } }, + { SC_OPCODE_GAMMA, ENTRY(SC_OPCODE_GAMMA_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GAMMA, 1, { 0 } }, + { SC_OPCODE_GAMMA_LN_MS, ENTRY(SC_OPCODE_GAMMA_LN_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GAMMALN_MS, 1, { 0 } }, + { SC_OPCODE_ERF_MS, ENTRY(SC_OPCODE_ERF_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_ERF_MS, 1, { 0 } }, + { SC_OPCODE_ERFC_MS, ENTRY(SC_OPCODE_ERFC_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_ERFC_MS, 1, { 0 } }, + { SC_OPCODE_ERROR_TYPE_ODF, ENTRY(SC_OPCODE_ERROR_TYPE_ODF_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_ERROR_TYPE_ODF, 1, { 0 } }, + { SC_OPCODE_ENCODEURL, ENTRY(SC_OPCODE_ENCODEURL_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_ENCODEURL, 1, { 0 } }, + { SC_OPCODE_ISOWEEKNUM, ENTRY(SC_OPCODE_ISOWEEKNUM_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_ISOWEEKNUM, 1, { 0 } }, + { SC_OPCODE_ARC_TAN_2, ENTRY(SC_OPCODE_ARC_TAN_2_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ARCTAN2, 2, { 0, 0 } }, + { SC_OPCODE_CEIL, ENTRY(SC_OPCODE_CEIL_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_OBERGRENZE, 3, { 0, 1, 1 } }, + { SC_OPCODE_FLOOR, ENTRY(SC_OPCODE_FLOOR_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_UNTERGRENZE, 3, { 0, 1, 1 } }, + { SC_OPCODE_ROUND, ENTRY(SC_OPCODE_ROUND_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_RUNDEN, 2, { 0, 1 } }, + { SC_OPCODE_ROUND_UP, ENTRY(SC_OPCODE_ROUND_UP_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_AUFRUNDEN, 2, { 0, 1 } }, + { SC_OPCODE_ROUND_DOWN, ENTRY(SC_OPCODE_ROUND_DOWN_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ABRUNDEN, 2, { 0, 1 } }, + { SC_OPCODE_TRUNC, ENTRY(SC_OPCODE_TRUNC_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_KUERZEN, 2, { 0, 0 } }, + { SC_OPCODE_LOG, ENTRY(SC_OPCODE_LOG_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_LOG, 2, { 0, 1 } }, + { SC_OPCODE_POWER, ENTRY(SC_OPCODE_POWER_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_POTENZ, 2, { 0, 0 } }, + { SC_OPCODE_GCD, ENTRY(SC_OPCODE_GCD_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_GGT, VAR_ARGS, { 0 } }, + { SC_OPCODE_LCM, ENTRY(SC_OPCODE_LCM_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_KGV, VAR_ARGS, { 0 } }, + { SC_OPCODE_MOD, ENTRY(SC_OPCODE_MOD_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_REST, 2, { 0, 0 } }, + { SC_OPCODE_SUM_PRODUCT, ENTRY(SC_OPCODE_SUM_PRODUCT_ARY), 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_SUMMENPRODUKT, VAR_ARGS, { 0 } }, + { SC_OPCODE_SUM_SQ, ENTRY(SC_OPCODE_SUM_SQ_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_QUADRATESUMME, VAR_ARGS, { 0 } }, + { SC_OPCODE_SUM_X2MY2, ENTRY(SC_OPCODE_SUM_X2MY2_ARY), 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_SUMMEX2MY2, 2, { 0, 0 } }, + { SC_OPCODE_SUM_X2DY2, ENTRY(SC_OPCODE_SUM_X2DY2_ARY), 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_SUMMEX2PY2, 2, { 0, 0 } }, + { SC_OPCODE_SUM_XMY2, ENTRY(SC_OPCODE_SUM_XMY2_ARY), 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_SUMMEXMY2, 2, { 0, 0 } }, + { SC_OPCODE_GET_DATE, ENTRY(SC_OPCODE_GET_DATE_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_DATUM, 3, { 0, 0, 0 } }, + { SC_OPCODE_GET_TIME, ENTRY(SC_OPCODE_GET_TIME_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_ZEIT, 3, { 0, 0, 0 } }, + { SC_OPCODE_GET_DIFF_DATE, ENTRY(SC_OPCODE_GET_DIFF_DATE_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_TAGE, 2, { 0, 0 } }, + { SC_OPCODE_GET_DIFF_DATE_360, ENTRY(SC_OPCODE_GET_DIFF_DATE_360_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_TAGE360, 3, { 0, 0, 1 } }, + { SC_OPCODE_MIN, ENTRY(SC_OPCODE_MIN_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MIN, VAR_ARGS, { 0 } }, + { SC_OPCODE_MAX, ENTRY(SC_OPCODE_MAX_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MAX, VAR_ARGS, { 0 } }, + { SC_OPCODE_SUM, ENTRY(SC_OPCODE_SUM_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_SUMME, VAR_ARGS, { 0 } }, + { SC_OPCODE_PRODUCT, ENTRY(SC_OPCODE_PRODUCT_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_PRODUKT, VAR_ARGS, { 0 } }, + { SC_OPCODE_AVERAGE, ENTRY(SC_OPCODE_AVERAGE_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MITTELWERT, VAR_ARGS, { 0 } }, + { SC_OPCODE_COUNT, ENTRY(SC_OPCODE_COUNT_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_ANZAHL, VAR_ARGS, { 0 } }, + { SC_OPCODE_COUNT_2, ENTRY(SC_OPCODE_COUNT_2_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_ANZAHL2, VAR_ARGS, { 0 } }, + { SC_OPCODE_NPV, ENTRY(SC_OPCODE_NPV_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_NBW, VAR_ARGS+1, { 0, 0 } }, + { SC_OPCODE_IRR, ENTRY(SC_OPCODE_IRR_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_IKV, 2, { 0, 1 } }, + { SC_OPCODE_VAR, ENTRY(SC_OPCODE_VAR_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_VARIANZ, VAR_ARGS, { 0 } }, + { SC_OPCODE_VAR_P, ENTRY(SC_OPCODE_VAR_P_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_VARIANZEN, VAR_ARGS, { 0 } }, + { SC_OPCODE_ST_DEV, ENTRY(SC_OPCODE_ST_DEV_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STABW, VAR_ARGS, { 0 } }, + { SC_OPCODE_ST_DEV_P, ENTRY(SC_OPCODE_ST_DEV_P_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STABWN, VAR_ARGS, { 0 } }, + { SC_OPCODE_B, ENTRY(SC_OPCODE_B_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_B, 4, { 0, 0, 0, 1 } }, + { SC_OPCODE_NORM_DIST, ENTRY(SC_OPCODE_NORM_DIST_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_NORMVERT, 4, { 0, 0, 0, 1 } }, + { SC_OPCODE_EXP_DIST, ENTRY(SC_OPCODE_EXP_DIST_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_EXPONVERT, 3, { 0, 0, 0 } }, + { SC_OPCODE_BINOM_DIST, ENTRY(SC_OPCODE_BINOM_DIST_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_BINOMVERT, 4, { 0, 0, 0, 0 } }, + { SC_OPCODE_POISSON_DIST, ENTRY(SC_OPCODE_POISSON_DIST_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_POISSON, 3, { 0, 0, 1 } }, + { SC_OPCODE_COMBIN, ENTRY(SC_OPCODE_COMBIN_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_KOMBINATIONEN, 2, { 0, 0 } }, + { SC_OPCODE_COMBIN_A, ENTRY(SC_OPCODE_COMBIN_A_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_KOMBINATIONEN2, 2, { 0, 0 } }, + { SC_OPCODE_PERMUT, ENTRY(SC_OPCODE_PERMUT_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_VARIATIONEN, 2, { 0, 0 } }, + { SC_OPCODE_PERMUTATION_A, ENTRY(SC_OPCODE_PERMUTATION_A_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_VARIATIONEN2, 2, { 0, 0 } }, + { SC_OPCODE_PV, ENTRY(SC_OPCODE_PV_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_BW, 5, { 0, 0, 0, 1, 1 } }, + { SC_OPCODE_SYD, ENTRY(SC_OPCODE_SYD_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_DIA, 4, { 0, 0, 0, 0 } }, + { SC_OPCODE_DDB, ENTRY(SC_OPCODE_DDB_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_GDA, 5, { 0, 0, 0, 0, 1 } }, + { SC_OPCODE_DB, ENTRY(SC_OPCODE_DB_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_GDA2, 5, { 0, 0, 0, 0, 1 } }, + { SC_OPCODE_VBD , ENTRY(SC_OPCODE_VBD_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_VDB, 7, { 0, 0, 0, 0, 0, 1, 1 } }, + { SC_OPCODE_PDURATION, ENTRY(SC_OPCODE_PDURATION_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_LAUFZEIT, 3, { 0, 0, 0 } }, + { SC_OPCODE_SLN, ENTRY(SC_OPCODE_SLN_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_LIA, 3, { 0, 0, 0 } }, + { SC_OPCODE_PMT, ENTRY(SC_OPCODE_PMT_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_RMZ, 5, { 0, 0, 0, 1, 1 } }, + { SC_OPCODE_COLUMNS, ENTRY(SC_OPCODE_COLUMNS_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_SPALTEN, 1, { 0 } }, + { SC_OPCODE_ROWS, ENTRY(SC_OPCODE_ROWS_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_ZEILEN, 1, { 0 } }, + { SC_OPCODE_COLUMN, ENTRY(SC_OPCODE_COLUMN_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_SPALTE, 1, { 1 } }, + { SC_OPCODE_ROW, ENTRY(SC_OPCODE_ROW_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_ZEILE, 1, { 1 } }, + { SC_OPCODE_RRI, ENTRY(SC_OPCODE_RRI_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_ZGZ, 3, { 0, 0, 0 } }, + { SC_OPCODE_FV, ENTRY(SC_OPCODE_FV_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_ZW, 5, { 0, 0, 0, 1, 1 } }, + { SC_OPCODE_NPER, ENTRY(SC_OPCODE_NPER_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_ZZR, 5, { 0, 0, 0, 1, 1 } }, + { SC_OPCODE_RATE, ENTRY(SC_OPCODE_RATE_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_ZINS, 6, { 0, 0, 0, 1, 1, 1 } }, + { SC_OPCODE_IPMT, ENTRY(SC_OPCODE_IPMT_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_ZINSZ, 6, { 0, 0, 0, 0, 1, 1 } }, + { SC_OPCODE_PPMT, ENTRY(SC_OPCODE_PPMT_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_KAPZ, 6, { 0, 0, 0, 0, 1, 1 } }, + { SC_OPCODE_CUM_IPMT, ENTRY(SC_OPCODE_CUM_IPMT_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_KUMZINSZ, 6, { 0, 0, 0, 0, 0, 0 } }, + { SC_OPCODE_CUM_PRINC, ENTRY(SC_OPCODE_CUM_PRINC_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_KUMKAPITAL, 6, { 0, 0, 0, 0, 0, 0 } }, + { SC_OPCODE_EFFECT, ENTRY(SC_OPCODE_EFFECT_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_EFFEKTIV, 2, { 0, 0 } }, + { SC_OPCODE_NOMINAL, ENTRY(SC_OPCODE_NOMINAL_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_NOMINAL, 2, { 0, 0 } }, + { SC_OPCODE_SUB_TOTAL, ENTRY(SC_OPCODE_SUB_TOTAL_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_TEILERGEBNIS, 2, { 0, 0 } }, + { SC_OPCODE_DB_SUM, ENTRY(SC_OPCODE_DB_SUM_ARY), 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBSUMME, 3, { 0, 0, 0 } }, + { SC_OPCODE_DB_COUNT, ENTRY(SC_OPCODE_DB_COUNT_ARY), 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBANZAHL, 3, { 0, 0, 0 } }, + { SC_OPCODE_DB_COUNT_2, ENTRY(SC_OPCODE_DB_COUNT_2_ARY), 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBANZAHL2, 3, { 0, 0, 0 } }, + { SC_OPCODE_DB_AVERAGE, ENTRY(SC_OPCODE_DB_AVERAGE_ARY), 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBMITTELWERT, 3, { 0, 0, 0 } }, + { SC_OPCODE_DB_GET, ENTRY(SC_OPCODE_DB_GET_ARY), 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBAUSZUG, 3, { 0, 0, 0 } }, + { SC_OPCODE_DB_MAX, ENTRY(SC_OPCODE_DB_MAX_ARY), 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBMAX, 3, { 0, 0, 0 } }, + { SC_OPCODE_DB_MIN, ENTRY(SC_OPCODE_DB_MIN_ARY), 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBMIN, 3, { 0, 0, 0 } }, + { SC_OPCODE_DB_PRODUCT, ENTRY(SC_OPCODE_DB_PRODUCT_ARY), 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBPRODUKT, 3, { 0, 0, 0 } }, + { SC_OPCODE_DB_STD_DEV, ENTRY(SC_OPCODE_DB_STD_DEV_ARY), 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBSTDABW, 3, { 0, 0, 0 } }, + { SC_OPCODE_DB_STD_DEV_P, ENTRY(SC_OPCODE_DB_STD_DEV_P_ARY), 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBSTDABWN, 3, { 0, 0, 0 } }, + { SC_OPCODE_DB_VAR, ENTRY(SC_OPCODE_DB_VAR_ARY), 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBVARIANZ, 3, { 0, 0, 0 } }, + { SC_OPCODE_DB_VAR_P, ENTRY(SC_OPCODE_DB_VAR_P_ARY), 0, ID_FUNCTION_GRP_DATABASE, HID_FUNC_DBVARIANZEN, 3, { 0, 0, 0 } }, + { SC_OPCODE_INDIRECT, ENTRY(SC_OPCODE_INDIRECT_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_INDIREKT, 2, { 0, 1 } }, + { SC_OPCODE_ADDRESS, ENTRY(SC_OPCODE_ADDRESS_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_ADRESSE, 5, { 0, 0, 1, 1, 1 } }, + { SC_OPCODE_MATCH, ENTRY(SC_OPCODE_MATCH_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_VERGLEICH, 3, { 0, 0, 1 } }, + { SC_OPCODE_COUNT_EMPTY_CELLS, ENTRY(SC_OPCODE_COUNT_EMPTY_CELLS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_ANZAHLLEEREZELLEN, 1, { 0 } }, + { SC_OPCODE_COUNT_IF, ENTRY(SC_OPCODE_COUNT_IF_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_ZAEHLENWENN, 2, { 0, 0 } }, + { SC_OPCODE_SUM_IF, ENTRY(SC_OPCODE_SUM_IF_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_SUMMEWENN, 3, { 0, 0, 1 } }, + { SC_OPCODE_LOOKUP, ENTRY(SC_OPCODE_LOOKUP_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_VERWEIS, 3, { 0, 0, 1 } }, + { SC_OPCODE_V_LOOKUP, ENTRY(SC_OPCODE_V_LOOKUP_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_SVERWEIS, 4, { 0, 0, 0, 1 } }, + { SC_OPCODE_H_LOOKUP, ENTRY(SC_OPCODE_H_LOOKUP_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_WVERWEIS, 4, { 0, 0, 0, 1 } }, + { SC_OPCODE_OFFSET, ENTRY(SC_OPCODE_OFFSET_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_VERSCHIEBUNG, 5, { 0, 0, 0, 1, 1 } }, + { SC_OPCODE_INDEX, ENTRY(SC_OPCODE_INDEX_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_INDEX, 4, { 0, 1, 1, 1 } }, + { SC_OPCODE_AREAS, ENTRY(SC_OPCODE_AREAS_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_BEREICHE, 1, { 0 } }, + { SC_OPCODE_CURRENCY, ENTRY(SC_OPCODE_CURRENCY_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_DM, 2, { 0, 1 } }, + { SC_OPCODE_REPLACE, ENTRY(SC_OPCODE_REPLACE_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_ERSETZEN, 4, { 0, 0, 0, 0 } }, + { SC_OPCODE_FIXED, ENTRY(SC_OPCODE_FIXED_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_FEST, 3, { 0, 0, 1 } }, + { SC_OPCODE_FIND, ENTRY(SC_OPCODE_FIND_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_FINDEN, 3, { 0, 0, 1 } }, + { SC_OPCODE_EXACT, ENTRY(SC_OPCODE_EXACT_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_IDENTISCH, 2, { 0, 0 } }, + { SC_OPCODE_LEFT, ENTRY(SC_OPCODE_LEFT_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_LINKS, 2, { 0, 1 } }, + { SC_OPCODE_RIGHT, ENTRY(SC_OPCODE_RIGHT_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_RECHTS, 2, { 0, 1 } }, + { SC_OPCODE_SEARCH, ENTRY(SC_OPCODE_SEARCH_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_SUCHEN, 3, { 0, 0, 1 } }, + { SC_OPCODE_MID, ENTRY(SC_OPCODE_MID_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_TEIL, 3, { 0, 0, 0 } }, + { SC_OPCODE_TEXT, ENTRY(SC_OPCODE_TEXT_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_TEXT, 2, { 0, 0 } }, + { SC_OPCODE_SUBSTITUTE, ENTRY(SC_OPCODE_SUBSTITUTE_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_WECHSELN, 4, { 0, 0, 0, 1 } }, + { SC_OPCODE_REPT, ENTRY(SC_OPCODE_REPT_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_WIEDERHOLEN, 2, { 0, 0 } }, + { SC_OPCODE_CONCAT, ENTRY(SC_OPCODE_CONCAT_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_VERKETTEN, VAR_ARGS, { 0 } }, + { SC_OPCODE_MAT_DET, ENTRY(SC_OPCODE_MAT_DET_ARY), 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_MDET, 1, { 0 } }, + { SC_OPCODE_MAT_INV, ENTRY(SC_OPCODE_MAT_INV_ARY), 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_MINV, 1, { 0 } }, + { SC_OPCODE_MAT_MULT, ENTRY(SC_OPCODE_MAT_MULT_ARY), 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_MMULT, 2, { 0, 0 } }, + { SC_OPCODE_MAT_TRANS, ENTRY(SC_OPCODE_MAT_TRANS_ARY), 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_MTRANS, 1, { 0 } }, + { SC_OPCODE_MATRIX_UNIT, ENTRY(SC_OPCODE_MATRIX_UNIT_ARY), 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_EINHEITSMATRIX, 1, { 0 } }, + { SC_OPCODE_HYP_GEOM_DIST, ENTRY(SC_OPCODE_HYP_GEOM_DIST_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_HYPGEOMVERT, 5, { 0, 0, 0, 0, 1 } }, + { SC_OPCODE_LOG_NORM_DIST, ENTRY(SC_OPCODE_LOG_NORM_DIST_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_LOGNORMVERT, 4, { 0, 1, 1, 1 } }, + { SC_OPCODE_T_DIST, ENTRY(SC_OPCODE_T_DIST_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_TVERT, 3, { 0, 0, 0 } }, + { SC_OPCODE_F_DIST, ENTRY(SC_OPCODE_F_DIST_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FVERT, 3, { 0, 0, 0 } }, + { SC_OPCODE_CHI_DIST, ENTRY(SC_OPCODE_CHI_DIST_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHIVERT, 2, { 0, 0 } }, + { SC_OPCODE_WEIBULL, ENTRY(SC_OPCODE_WEIBULL_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_WEIBULL, 4, { 0, 0, 0, 0 } }, + { SC_OPCODE_NEG_BINOM_VERT, ENTRY(SC_OPCODE_NEG_BINOM_VERT_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_NEGBINOMVERT, 3, { 0, 0, 0 } }, + { SC_OPCODE_CRIT_BINOM, ENTRY(SC_OPCODE_CRIT_BINOM_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_KRITBINOM, 3, { 0, 0, 0 } }, + { SC_OPCODE_KURT, ENTRY(SC_OPCODE_KURT_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_KURT, VAR_ARGS, { 0 } }, + { SC_OPCODE_HAR_MEAN, ENTRY(SC_OPCODE_HAR_MEAN_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_HARMITTEL, VAR_ARGS, { 0 } }, + { SC_OPCODE_GEO_MEAN, ENTRY(SC_OPCODE_GEO_MEAN_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GEOMITTEL, VAR_ARGS, { 0 } }, + { SC_OPCODE_STANDARD, ENTRY(SC_OPCODE_STANDARD_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STANDARDISIERUNG, 3, { 0, 0, 0 } }, + { SC_OPCODE_AVE_DEV, ENTRY(SC_OPCODE_AVE_DEV_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MITTELABW, VAR_ARGS, { 0 } }, + { SC_OPCODE_SKEW, ENTRY(SC_OPCODE_SKEW_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_SCHIEFE, VAR_ARGS, { 0 } }, + { SC_OPCODE_DEV_SQ, ENTRY(SC_OPCODE_DEV_SQ_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_SUMQUADABW, VAR_ARGS, { 0 } }, + { SC_OPCODE_MEDIAN, ENTRY(SC_OPCODE_MEDIAN_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MEDIAN, VAR_ARGS, { 0 } }, + { SC_OPCODE_MODAL_VALUE, ENTRY(SC_OPCODE_MODAL_VALUE_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MODALWERT, VAR_ARGS, { 0 } }, + { SC_OPCODE_Z_TEST, ENTRY(SC_OPCODE_Z_TEST_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GTEST, 3, { 0, 0, 1 } }, + { SC_OPCODE_T_TEST, ENTRY(SC_OPCODE_T_TEST_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_TTEST, 4, { 0, 0, 0, 0 } }, + { SC_OPCODE_RANK, ENTRY(SC_OPCODE_RANK_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_RANG, 3, { 0, 0, 1 } }, + { SC_OPCODE_PERCENTILE, ENTRY(SC_OPCODE_PERCENTILE_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_QUANTIL, 2, { 0, 0 } }, + { SC_OPCODE_PERCENT_RANK, ENTRY(SC_OPCODE_PERCENT_RANK_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_QUANTILSRANG, 3, { 0, 0, 1 } }, + { SC_OPCODE_LARGE, ENTRY(SC_OPCODE_LARGE_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_KGROESSTE, 2, { 0, 0 } }, + { SC_OPCODE_SMALL, ENTRY(SC_OPCODE_SMALL_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_KKLEINSTE, 2, { 0, 0 } }, + { SC_OPCODE_FREQUENCY, ENTRY(SC_OPCODE_FREQUENCY_ARY), 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_HAEUFIGKEIT, 2, { 0, 0 } }, + { SC_OPCODE_QUARTILE, ENTRY(SC_OPCODE_QUARTILE_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_QUARTILE, 2, { 0, 0 } }, + { SC_OPCODE_NORM_INV, ENTRY(SC_OPCODE_NORM_INV_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_NORMINV, 3, { 0, 0, 0 } }, + { SC_OPCODE_CONFIDENCE, ENTRY(SC_OPCODE_CONFIDENCE_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_KONFIDENZ, 3, { 0, 0, 0 } }, + { SC_OPCODE_F_TEST, ENTRY(SC_OPCODE_F_TEST_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FTEST, 2, { 0, 0 } }, + { SC_OPCODE_TRIM_MEAN, ENTRY(SC_OPCODE_TRIM_MEAN_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GESTUTZTMITTEL, 2, { 0, 0 } }, + { SC_OPCODE_PROB, ENTRY(SC_OPCODE_PROB_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_WAHRSCHBEREICH, 4, { 0, 0, 0, 1 } }, + { SC_OPCODE_CORREL, ENTRY(SC_OPCODE_CORREL_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_KORREL, 2, { 0, 0 } }, + { SC_OPCODE_COVAR, ENTRY(SC_OPCODE_COVAR_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_KOVAR, 2, { 0, 0 } }, + { SC_OPCODE_PEARSON, ENTRY(SC_OPCODE_PEARSON_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_PEARSON, 2, { 0, 0 } }, + { SC_OPCODE_RSQ, ENTRY(SC_OPCODE_RSQ_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_BESTIMMTHEITSMASS, 2, { 0, 0 } }, + { SC_OPCODE_STEYX, ENTRY(SC_OPCODE_STEYX_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STFEHLERYX, 2, { 0, 0 } }, + { SC_OPCODE_SLOPE, ENTRY(SC_OPCODE_SLOPE_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STEIGUNG, 2, { 0, 0 } }, + { SC_OPCODE_INTERCEPT, ENTRY(SC_OPCODE_INTERCEPT_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_ACHSENABSCHNITT, 2, { 0, 0 } }, + { SC_OPCODE_TREND, ENTRY(SC_OPCODE_TREND_ARY), 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_TREND, 4, { 0, 1, 1, 1 } }, + { SC_OPCODE_GROWTH, ENTRY(SC_OPCODE_GROWTH_ARY), 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_VARIATION, 4, { 0, 1, 1, 1 } }, + { SC_OPCODE_LINEST, ENTRY(SC_OPCODE_LINEST_ARY), 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_RGP, 4, { 0, 1, 1, 1 } }, + { SC_OPCODE_LOGEST, ENTRY(SC_OPCODE_LOGEST_ARY), 0, ID_FUNCTION_GRP_MATRIX, HID_FUNC_RKP, 4, { 0, 1, 1, 1 } }, + { SC_OPCODE_FORECAST, ENTRY(SC_OPCODE_FORECAST_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_SCHAETZER, 3, { 0, 0, 0 } }, + { SC_OPCODE_CHI_INV, ENTRY(SC_OPCODE_CHI_INV_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHIINV, 2, { 0, 0 } }, + { SC_OPCODE_GAMMA_DIST, ENTRY(SC_OPCODE_GAMMA_DIST_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GAMMAVERT, 4, { 0, 0, 0, 1 } }, + { SC_OPCODE_GAMMA_INV, ENTRY(SC_OPCODE_GAMMA_INV_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GAMMAINV, 3, { 0, 0, 0 } }, + { SC_OPCODE_T_INV, ENTRY(SC_OPCODE_T_INV_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_TINV, 2, { 0, 0 } }, + { SC_OPCODE_F_INV, ENTRY(SC_OPCODE_F_INV_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FINV, 3, { 0, 0, 0 } }, + { SC_OPCODE_CHI_TEST, ENTRY(SC_OPCODE_CHI_TEST_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHITEST, 2, { 0, 0 } }, + { SC_OPCODE_LOG_INV, ENTRY(SC_OPCODE_LOG_INV_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_LOGINV, 3, { 0, 1, 1 } }, + { SC_OPCODE_BETA_DIST, ENTRY(SC_OPCODE_BETA_DIST_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_BETAVERT, 6, { 0, 0, 0, 1, 1, 1 } }, + { SC_OPCODE_BETA_INV, ENTRY(SC_OPCODE_BETA_INV_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_BETAINV, 5, { 0, 0, 0, 1, 1 } }, + { SC_OPCODE_WEEK, ENTRY(SC_OPCODE_WEEK_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_KALENDERWOCHE, 2, { 0, 1 } }, + { SC_OPCODE_GET_DAY_OF_WEEK, ENTRY(SC_OPCODE_GET_DAY_OF_WEEK_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_WOCHENTAG, 2, { 0, 1 } }, + { SC_OPCODE_STYLE, ENTRY(SC_OPCODE_STYLE_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_VORLAGE, 3, { 0, 1, 1 } }, + { SC_OPCODE_DDE, ENTRY(SC_OPCODE_DDE_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_DDE, 4, { 0, 0, 0, 1 } }, + { SC_OPCODE_BASE, ENTRY(SC_OPCODE_BASE_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_BASIS, 3, { 0, 0, 1 } }, + { SC_OPCODE_SHEET, ENTRY(SC_OPCODE_SHEET_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_TABELLE, 1, { 1 } }, + { SC_OPCODE_SHEETS, ENTRY(SC_OPCODE_SHEETS_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_TABELLEN, 1, { 1 } }, + { SC_OPCODE_MIN_A, ENTRY(SC_OPCODE_MIN_A_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MINA, VAR_ARGS, { 0 } }, + { SC_OPCODE_MAX_A, ENTRY(SC_OPCODE_MAX_A_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MAXA, VAR_ARGS, { 0 } }, + { SC_OPCODE_AVERAGE_A, ENTRY(SC_OPCODE_AVERAGE_A_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MITTELWERTA, VAR_ARGS, { 0 } }, + { SC_OPCODE_ST_DEV_A, ENTRY(SC_OPCODE_ST_DEV_A_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STABWA, VAR_ARGS, { 0 } }, + { SC_OPCODE_ST_DEV_P_A, ENTRY(SC_OPCODE_ST_DEV_P_A_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STABWNA, VAR_ARGS, { 0 } }, + { SC_OPCODE_VAR_A, ENTRY(SC_OPCODE_VAR_A_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_VARIANZA, VAR_ARGS, { 0 } }, + { SC_OPCODE_VAR_P_A, ENTRY(SC_OPCODE_VAR_P_A_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_VARIANZENA, VAR_ARGS, { 0 } }, + { SC_OPCODE_EASTERSUNDAY, ENTRY(SC_OPCODE_EASTERSUNDAY_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_OSTERSONNTAG, 1, { 0 } }, + { SC_OPCODE_DECIMAL, ENTRY(SC_OPCODE_DECIMAL_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_DEZIMAL, 2, { 0, 0 } }, + { SC_OPCODE_CONVERT_OOO, ENTRY(SC_OPCODE_CONVERT_OOO_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_UMRECHNEN, 3, { 0, 0, 0 } }, + { SC_OPCODE_ROMAN, ENTRY(SC_OPCODE_ROMAN_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_ROEMISCH, 2, { 0, 1 } }, + { SC_OPCODE_MIRR, ENTRY(SC_OPCODE_MIRR_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_QIKV, 3, { 0, 0, 0 } }, + { SC_OPCODE_CELL, ENTRY(SC_OPCODE_CELL_ARY), 0, ID_FUNCTION_GRP_INFO, HID_FUNC_ZELLE, 2, { 0, 1 } }, + { SC_OPCODE_ISPMT, ENTRY(SC_OPCODE_ISPMT_ARY), 0, ID_FUNCTION_GRP_FINANZ, HID_FUNC_ISPMT, 4, { 0, 0, 0, 0 } }, + { SC_OPCODE_HYPERLINK, ENTRY(SC_OPCODE_HYPERLINK_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_HYPERLINK, 2, { 0, 1 } }, + { SC_OPCODE_GET_PIVOT_DATA, ENTRY(SC_OPCODE_GET_PIVOT_DATA_ARY), 0, ID_FUNCTION_GRP_TABLE, HID_FUNC_GETPIVOTDATA, VAR_ARGS+2, { 0, 0, 1 } }, + { SC_OPCODE_EUROCONVERT, ENTRY(SC_OPCODE_EUROCONVERT_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_EUROCONVERT, 5, { 0, 0, 0, 1, 1 } }, + { SC_OPCODE_NUMBERVALUE, ENTRY(SC_OPCODE_NUMBERVALUE_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_NUMBERVALUE, 3, { 0, 1, 1 } }, + { SC_OPCODE_CHISQ_DIST, ENTRY(SC_OPCODE_CHISQ_DIST_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHISQDIST, 3, { 0, 0, 1 } }, + { SC_OPCODE_CHISQ_INV, ENTRY(SC_OPCODE_CHISQ_INV_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHISQINV, 2, { 0, 0 } }, + { SC_OPCODE_BITAND, ENTRY(SC_OPCODE_BITAND_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_BITAND, 2, { 0, 0 } }, + { SC_OPCODE_BITOR, ENTRY(SC_OPCODE_BITOR_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_BITOR, 2, { 0, 0 } }, + { SC_OPCODE_BITXOR, ENTRY(SC_OPCODE_BITXOR_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_BITXOR, 2, { 0, 0 } }, + { SC_OPCODE_BITRSHIFT, ENTRY(SC_OPCODE_BITRSHIFT_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_BITRSHIFT, 2, { 0, 0 } }, + { SC_OPCODE_BITLSHIFT, ENTRY(SC_OPCODE_BITLSHIFT_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_BITLSHIFT, 2, { 0, 0 } }, + { SC_OPCODE_GET_DATEDIF, ENTRY(SC_OPCODE_GET_DATEDIF_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_DATEDIF, 3, { 0, 0, 0 } }, + { SC_OPCODE_XOR, ENTRY(SC_OPCODE_XOR_ARY), 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_XOR, VAR_ARGS, { 0 } }, + { SC_OPCODE_AVERAGE_IF, ENTRY(SC_OPCODE_AVERAGE_IF_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_AVERAGEIF, 3, { 0, 0, 1 } }, + { SC_OPCODE_SUM_IFS, ENTRY(SC_OPCODE_SUM_IFS_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_SUMIFS, PAIRED_VAR_ARGS+1, { 0, 0, 0 } }, + { SC_OPCODE_AVERAGE_IFS, ENTRY(SC_OPCODE_AVERAGE_IFS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_AVERAGEIFS, PAIRED_VAR_ARGS+1, { 0, 0, 0 } }, + { SC_OPCODE_COUNT_IFS, ENTRY(SC_OPCODE_COUNT_IFS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_COUNTIFS, PAIRED_VAR_ARGS, { 0, 0 } }, + { SC_OPCODE_SKEWP, ENTRY(SC_OPCODE_SKEWP_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_SKEWP, VAR_ARGS, { 0 } }, + { SC_OPCODE_LENB, ENTRY(SC_OPCODE_LENB_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_LENB, 1, { 0 } }, + { SC_OPCODE_RIGHTB, ENTRY(SC_OPCODE_RIGHTB_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_RIGHTB, 2, { 0, 1 } }, + { SC_OPCODE_LEFTB, ENTRY(SC_OPCODE_LEFTB_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_LEFTB, 2, { 0, 1 } }, + { SC_OPCODE_MIDB, ENTRY(SC_OPCODE_MIDB_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_MIDB, 3, { 0, 0, 0 } }, + { SC_OPCODE_FILTERXML, ENTRY(SC_OPCODE_FILTERXML_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_FILTERXML, 2, { 0, 0 } }, + { SC_OPCODE_WEBSERVICE, ENTRY(SC_OPCODE_WEBSERVICE_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_WEBSERVICE, 1, { 0, 0 } }, + { SC_OPCODE_COVARIANCE_S, ENTRY(SC_OPCODE_COVARIANCE_S_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_COVARIANCE_S, 2, { 0, 0 } }, + { SC_OPCODE_COVARIANCE_P, ENTRY(SC_OPCODE_COVARIANCE_P_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_COVARIANCE_P, 2, { 0, 0 } }, + { SC_OPCODE_ST_DEV_P_MS, ENTRY(SC_OPCODE_ST_DEV_P_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_ST_DEV_P_MS, VAR_ARGS, { 0 } }, + { SC_OPCODE_ST_DEV_S, ENTRY(SC_OPCODE_ST_DEV_S_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_ST_DEV_S, VAR_ARGS, { 0 } }, + { SC_OPCODE_VAR_P_MS, ENTRY(SC_OPCODE_VAR_P_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_VAR_P_MS, VAR_ARGS, { 0 } }, + { SC_OPCODE_VAR_S, ENTRY(SC_OPCODE_VAR_S_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_VAR_S, VAR_ARGS, { 0 } }, + { SC_OPCODE_BETA_DIST_MS, ENTRY(SC_OPCODE_BETA_DIST_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_BETADIST_MS, 6, { 0, 0, 0, 0, 1, 1 } }, + { SC_OPCODE_BETA_INV_MS, ENTRY(SC_OPCODE_BETA_INV_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_BETAINV_MS, 5, { 0, 0, 0, 1, 1 } }, + { SC_OPCODE_BINOM_DIST_MS, ENTRY(SC_OPCODE_BINOM_DIST_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_BINOM_DIST_MS, 4, { 0, 0, 0, 0 } }, + { SC_OPCODE_BINOM_INV, ENTRY(SC_OPCODE_BINOM_INV_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_BINOM_INV_MS, 3, { 0, 0, 0 } }, + { SC_OPCODE_CHI_DIST_MS, ENTRY(SC_OPCODE_CHI_DIST_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHIVERT_MS, 2, { 0, 0 } }, + { SC_OPCODE_CHI_INV_MS, ENTRY(SC_OPCODE_CHI_INV_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHIINV_MS, 2, { 0, 0 } }, + { SC_OPCODE_CHI_TEST_MS, ENTRY(SC_OPCODE_CHI_TEST_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHITEST_MS, 2, { 0, 0 } }, + { SC_OPCODE_CHISQ_DIST_MS, ENTRY(SC_OPCODE_CHISQ_DIST_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHISQDIST_MS, 3, { 0, 0, 0 } }, + { SC_OPCODE_CHISQ_INV_MS, ENTRY(SC_OPCODE_CHISQ_INV_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CHISQINV_MS, 2, { 0, 0 } }, + { SC_OPCODE_CONFIDENCE_N, ENTRY(SC_OPCODE_CONFIDENCE_N_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CONFIDENCE_N, 3, { 0, 0, 0 } }, + { SC_OPCODE_CONFIDENCE_T, ENTRY(SC_OPCODE_CONFIDENCE_T_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_CONFIDENCE_T, 3, { 0, 0, 0 } }, + { SC_OPCODE_F_DIST_LT, ENTRY(SC_OPCODE_F_DIST_LT_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_F_DIST_LT, 4, { 0, 0, 0, 1 } }, + { SC_OPCODE_F_DIST_RT, ENTRY(SC_OPCODE_F_DIST_RT_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_F_DIST_RT, 3, { 0, 0, 0 } }, + { SC_OPCODE_F_INV_LT, ENTRY(SC_OPCODE_F_INV_LT_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_F_INV_LT, 3, { 0, 0, 0 } }, + { SC_OPCODE_F_INV_RT, ENTRY(SC_OPCODE_F_INV_RT_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_F_INV_RT, 3, { 0, 0, 0 } }, + { SC_OPCODE_F_TEST_MS, ENTRY(SC_OPCODE_F_TEST_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_F_TEST_MS, 2, { 0, 0 } }, + { SC_OPCODE_EXP_DIST_MS, ENTRY(SC_OPCODE_EXP_DIST_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_EXP_DIST_MS, 3, { 0, 0, 0 } }, + { SC_OPCODE_HYP_GEOM_DIST_MS, ENTRY(SC_OPCODE_HYP_GEOM_DIST_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_HYP_GEOM_DIST_MS, 5, { 0, 0, 0, 0, 0 } }, + { SC_OPCODE_POISSON_DIST_MS, ENTRY(SC_OPCODE_POISSON_DIST_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_POISSON_DIST_MS, 3, { 0, 0, 1 } }, + { SC_OPCODE_WEIBULL_MS, ENTRY(SC_OPCODE_WEIBULL_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_WEIBULL_DIST_MS, 4, { 0, 0, 0, 0 } }, + { SC_OPCODE_GAMMA_DIST_MS, ENTRY(SC_OPCODE_GAMMA_DIST_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GAMMADIST_MS, 4, { 0, 0, 0, 0 } }, + { SC_OPCODE_GAMMA_INV_MS, ENTRY(SC_OPCODE_GAMMA_INV_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_GAMMAINV_MS, 3, { 0, 0, 0 } }, + { SC_OPCODE_LOG_NORM_DIST_MS, ENTRY(SC_OPCODE_LOG_NORM_DIST_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_LOGNORMDIST_MS, 4, { 0, 0, 0, 0 } }, + { SC_OPCODE_LOG_INV_MS, ENTRY(SC_OPCODE_LOG_INV_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_LOGINV, 3, { 0, 0, 0 } }, + { SC_OPCODE_NORM_DIST_MS, ENTRY(SC_OPCODE_NORM_DIST_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_NORMDIST_MS, 4, { 0, 0, 0, 0 } }, + { SC_OPCODE_NORM_INV_MS, ENTRY(SC_OPCODE_NORM_INV_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_NORMINV_MS, 3, { 0, 0, 0 } }, + { SC_OPCODE_STD_NORM_DIST_MS, ENTRY(SC_OPCODE_STD_NORM_DIST_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STD_NORMDIST_MS, 2, { 0, 0 } }, + { SC_OPCODE_S_NORM_INV_MS, ENTRY(SC_OPCODE_S_NORM_INV_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_STD_NORMINV_MS, 1, { 0 } }, + { SC_OPCODE_T_DIST_MS, ENTRY(SC_OPCODE_T_DIST_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_TDIST_MS, 3, { 0, 0, 0 } }, + { SC_OPCODE_T_DIST_RT, ENTRY(SC_OPCODE_T_DIST_RT_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_TDIST_RT, 2, { 0, 0 } }, + { SC_OPCODE_T_DIST_2T, ENTRY(SC_OPCODE_T_DIST_2T_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_TDIST_2T, 2, { 0, 0 } }, + { SC_OPCODE_T_INV_2T, ENTRY(SC_OPCODE_T_INV_2T_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_TINV_2T, 2, { 0, 0 } }, + { SC_OPCODE_T_INV_MS, ENTRY(SC_OPCODE_T_INV_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_TINV_MS, 2, { 0, 0 } }, + { SC_OPCODE_T_TEST_MS, ENTRY(SC_OPCODE_T_TEST_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_TTEST_MS, 4, { 0, 0, 0, 0 } }, + { SC_OPCODE_PERCENTILE_INC, ENTRY(SC_OPCODE_PERCENTILE_INC_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_PERCENTILE_INC, 2, { 0, 0 } }, + { SC_OPCODE_PERCENT_RANK_INC, ENTRY(SC_OPCODE_PERCENT_RANK_INC_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_PERCENTRANK_INC, 3, { 0, 0, 1 } }, + { SC_OPCODE_QUARTILE_INC, ENTRY(SC_OPCODE_QUARTILE_INC_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_QUARTILE_INC, 2, { 0, 0 } }, + { SC_OPCODE_RANK_EQ, ENTRY(SC_OPCODE_RANK_EQ_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_RANK_EQ, 3, { 0, 0, 1 } }, + { SC_OPCODE_PERCENTILE_EXC, ENTRY(SC_OPCODE_PERCENTILE_EXC_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_PERCENTILE_EXC, 2, { 0, 0 } }, + { SC_OPCODE_PERCENT_RANK_EXC, ENTRY(SC_OPCODE_PERCENT_RANK_EXC_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_PERCENTRANK_EXC, 3, { 0, 0, 1 } }, + { SC_OPCODE_QUARTILE_EXC, ENTRY(SC_OPCODE_QUARTILE_EXC_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_QUARTILE_EXC, 2, { 0, 0 } }, + { SC_OPCODE_RANK_AVG, ENTRY(SC_OPCODE_RANK_AVG_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_RANK_AVG, 3, { 0, 0, 1 } }, + { SC_OPCODE_MODAL_VALUE_MS, ENTRY(SC_OPCODE_MODAL_VALUE_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MODAL_VALUE_MS, VAR_ARGS, { 0 } }, + { SC_OPCODE_MODAL_VALUE_MULTI, ENTRY(SC_OPCODE_MODAL_VALUE_MULTI_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MODAL_VALUE_MULTI, VAR_ARGS, { 0 } }, + { SC_OPCODE_NEG_BINOM_DIST_MS, ENTRY(SC_OPCODE_NEG_BINOM_DIST_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_NEGBINOMDIST_MS, 4, { 0, 0, 0, 0 } }, + { SC_OPCODE_Z_TEST_MS, ENTRY(SC_OPCODE_Z_TEST_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_Z_TEST_MS, 3, { 0, 0, 1 } }, + { SC_OPCODE_CEIL_MS, ENTRY(SC_OPCODE_CEIL_MS_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_CEIL_MS, 2, { 0, 0 } }, + { SC_OPCODE_CEIL_ISO, ENTRY(SC_OPCODE_CEIL_ISO_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_CEIL_ISO, 2, { 0, 1 } }, + { SC_OPCODE_FLOOR_MS, ENTRY(SC_OPCODE_FLOOR_MS_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_FLOOR_MS, 2, { 0, 0 } }, + { SC_OPCODE_NETWORKDAYS_MS, ENTRY(SC_OPCODE_NETWORKDAYS_MS_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_NETWORKDAYS_MS, 4, { 0, 0, 1, 1 } }, + { SC_OPCODE_WORKDAY_MS, ENTRY(SC_OPCODE_WORKDAY_MS_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_WORKDAY_MS, 4, { 0, 0, 1, 1 } }, + { SC_OPCODE_AGGREGATE, ENTRY(SC_OPCODE_AGGREGATE_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_AGGREGATE, VAR_ARGS+3, { 0, 0, 0, 1 } }, + { SC_OPCODE_COLOR, ENTRY(SC_OPCODE_COLOR_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_COLOR, 4, { 0, 0, 0, 1 } }, + { SC_OPCODE_CEIL_MATH, ENTRY(SC_OPCODE_CEIL_MATH_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_CEIL_MATH, 3, { 0, 1, 1 } }, + { SC_OPCODE_CEIL_PRECISE, ENTRY(SC_OPCODE_CEIL_PRECISE_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_CEIL_PRECISE, 2, { 0, 1 } }, + { SC_OPCODE_NETWORKDAYS, ENTRY(SC_OPCODE_NETWORKDAYS_ARY), 0, ID_FUNCTION_GRP_DATETIME, HID_FUNC_NETWORKDAYS, 4, { 0, 0, 1, 1 } }, + { SC_OPCODE_FLOOR_MATH, ENTRY(SC_OPCODE_FLOOR_MATH_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_FLOOR_MATH, 3, { 0, 1, 1 } }, + { SC_OPCODE_FLOOR_PRECISE, ENTRY(SC_OPCODE_FLOOR_PRECISE_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_FLOOR_PRECISE, 2, { 0, 1 } }, + { SC_OPCODE_RAWSUBTRACT, ENTRY(SC_OPCODE_RAWSUBTRACT_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_RAWSUBTRACT, VAR_ARGS+2, { 0, 0, 1 } }, + { SC_OPCODE_WEEKNUM_OOO, ENTRY(SC_OPCODE_WEEKNUM_OOO_ARY), 2, ID_FUNCTION_GRP_DATETIME, HID_FUNC_WEEKNUM_OOO, 2, { 0, 0 } }, + { SC_OPCODE_FORECAST_ETS_ADD, ENTRY(SC_OPCODE_FORECAST_ETS_ADD_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FORECAST_ETS_ADD, 6, { 0, 0, 0, 1, 1, 1 } }, + { SC_OPCODE_FORECAST_ETS_SEA, ENTRY(SC_OPCODE_FORECAST_ETS_SEA_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FORECAST_ETS_SEA, 4, { 0, 0, 1, 1 } }, + { SC_OPCODE_FORECAST_ETS_MUL, ENTRY(SC_OPCODE_FORECAST_ETS_MUL_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FORECAST_ETS_MUL, 6, { 0, 0, 0, 1, 1, 1 } }, + { SC_OPCODE_FORECAST_ETS_PIA, ENTRY(SC_OPCODE_FORECAST_ETS_PIA_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FORECAST_ETS_PIA, 7, { 0, 0, 0, 1, 1, 1, 1 } }, + { SC_OPCODE_FORECAST_ETS_PIM, ENTRY(SC_OPCODE_FORECAST_ETS_PIM_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FORECAST_ETS_PIM, 7, { 0, 0, 0, 1, 1, 1, 1 } }, + { SC_OPCODE_FORECAST_ETS_STA, ENTRY(SC_OPCODE_FORECAST_ETS_STA_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FORECAST_ETS_STA, 6, { 0, 0, 0, 1, 1, 1 } }, + { SC_OPCODE_FORECAST_ETS_STM, ENTRY(SC_OPCODE_FORECAST_ETS_STM_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FORECAST_ETS_STM, 6, { 0, 0, 0, 1, 1, 1 } }, + { SC_OPCODE_FORECAST_LIN, ENTRY(SC_OPCODE_FORECAST_LIN_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_FORECAST_LIN, 3, { 0, 0, 0 } }, + { SC_OPCODE_CONCAT_MS, ENTRY(SC_OPCODE_CONCAT_MS_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_CONCAT_MS, VAR_ARGS, { 0 } }, + { SC_OPCODE_TEXTJOIN_MS, ENTRY(SC_OPCODE_TEXTJOIN_MS_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_TEXTJOIN_MS, VAR_ARGS + 2, { 0, 0, 0 } }, + { SC_OPCODE_IFS_MS, ENTRY(SC_OPCODE_IFS_MS_ARY), 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_IFS_MS, PAIRED_VAR_ARGS, { 0, 0 } }, + { SC_OPCODE_SWITCH_MS, ENTRY(SC_OPCODE_SWITCH_MS_ARY), 0, ID_FUNCTION_GRP_LOGIC, HID_FUNC_SWITCH_MS, PAIRED_VAR_ARGS + 1, { 0, 0, 0 } }, + { SC_OPCODE_MINIFS_MS, ENTRY(SC_OPCODE_MINIFS_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MINIFS_MS, PAIRED_VAR_ARGS + 1, { 0, 0, 0 } }, + { SC_OPCODE_MAXIFS_MS, ENTRY(SC_OPCODE_MAXIFS_MS_ARY), 0, ID_FUNCTION_GRP_STATISTIC, HID_FUNC_MAXIFS_MS, PAIRED_VAR_ARGS + 1, { 0, 0, 0 } }, + { SC_OPCODE_ROUNDSIG, ENTRY(SC_OPCODE_ROUNDSIG_ARY), 0, ID_FUNCTION_GRP_MATH, HID_FUNC_ROUNDSIG, 2, { 0, 0 } }, + { SC_OPCODE_REPLACEB, ENTRY(SC_OPCODE_REPLACEB_ARY), 0, ID_FUNCTION_GRP_TEXT, HID_FUNC_REPLACEB, 4, { 0, 0, 0, 0 } } }; ScFuncDesc* pDesc = nullptr; @@ -810,23 +821,23 @@ ScFunctionList::ScFunctionList() // otherwise the sub resources within the resource blocks and the // resource blocks themselves would had to be ordered according to // OpCodes, which is utopian... + ScFuncDescCore* pDescsEnd = aDescs + SAL_N_ELEMENTS(aDescs); for (sal_uInt16 i = 0; i <= SC_OPCODE_LAST_OPCODE_ID; ++i) { - ResId aRes(RID_SC_FUNC_DESCRIPTIONS_START + i, *SC_MOD()->GetResMgr()); - aRes.SetRT(RSC_STRINGARRAY); + ScFuncDescCore *pEntry = std::lower_bound(aDescs, pDescsEnd, i, + [](const ScFuncDescCore &rItem, sal_uInt16 key) + { + return rItem.nOpCode < key; + } + ); + // Opcode Resource available? - if (SC_MOD()->GetResMgr()->IsAvailable(aRes)) + if (pEntry != pDescsEnd && pEntry->nOpCode == i && pEntry->pResource) { pDesc = new ScFuncDesc; bool bSuppressed = false; - ScFuncDescCore *pEntry = std::lower_bound(aDescs, aDescs + SAL_N_ELEMENTS(aDescs), i, - [](const ScFuncDescCore &rItem, sal_uInt16 key) - { - return rItem.nOpCode < key; - } - ); - ScFuncRes aSubRes(aRes, *pEntry, pDesc, bSuppressed); + ScFuncRes aSubRes(*pEntry, pDesc, bSuppressed); // Instead of dealing with this exceptional case at 1001 places // we simply don't add an entirely suppressed function to the // list and delete it. @@ -1181,8 +1192,7 @@ OUString ScFunctionMgr::GetCategoryName(sal_uInt32 _nCategoryNumber ) return OUString(); } - ResStringArray aStringArray(ResId(RID_FUNCTION_CATEGORIES, *SC_MOD()->GetResMgr())); - return aStringArray.GetString(_nCategoryNumber); + return ScResId(RID_FUNCTION_CATEGORIES[_nCategoryNumber]); } sal_Unicode ScFunctionMgr::getSingleToken(const formula::IFunctionManager::EToken _eToken) const @@ -1204,9 +1214,9 @@ sal_Unicode ScFunctionMgr::getSingleToken(const formula::IFunctionManager::EToke } // class ScFuncRes: -ScFuncRes::ScFuncRes(ResId &aRes, const ScFuncDescCore &rEntry, ScFuncDesc* pDesc, bool & rbSuppressed) +ScFuncRes::ScFuncRes(const ScFuncDescCore &rEntry, ScFuncDesc* pDesc, bool& rbSuppressed) { - const sal_uInt16 nOpCode = aRes.GetId() - RID_SC_FUNC_DESCRIPTIONS_START; + const sal_uInt16 nOpCode = rEntry.nOpCode; sal_uInt16 nFunctionFlags = rEntry.nFunctionFlags; // Bit 1: entirely suppressed // Bit 2: hidden unless used @@ -1239,8 +1249,7 @@ ScFuncRes::ScFuncRes(ResId &aRes, const ScFuncDescCore &rEntry, ScFuncDesc* pDes } pDesc->pFuncName = new OUString(ScCompiler::GetNativeSymbol(static_cast(nOpCode))); - ResStringArray aArr(aRes); - pDesc->pFuncDesc = new OUString(aArr.GetString(0)); + pDesc->pFuncDesc = new OUString(ScResId(rEntry.pResource[0])); if (nArgs) { @@ -1250,8 +1259,11 @@ ScFuncRes::ScFuncRes(ResId &aRes, const ScFuncDescCore &rEntry, ScFuncDesc* pDes pDesc->maDefArgDescs.resize(nArgs); for (sal_uInt16 i = 0; i < nArgs; ++i) { - pDesc->maDefArgNames[i] = aArr.GetString((i*2)+1); - pDesc->maDefArgDescs[i] = aArr.GetString((i*2)+2); + size_t nIndex = (i * 2) + 1; + if (nIndex < rEntry.nResourceLen) + pDesc->maDefArgNames[i] = ScResId(rEntry.pResource[nIndex]); + if (nIndex + 1 < rEntry.nResourceLen) + pDesc->maDefArgDescs[i] = ScResId(rEntry.pResource[nIndex + 1]); // If empty and variable number of arguments and last parameter and // parameter is optional and the previous is not optional, repeat // previous parameter name and description. diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 0bbe0c7fd0cf..73af65a3e149 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #include @@ -74,8 +73,7 @@ #include "parclass.hxx" #include "funcdesc.hxx" #include "globstr.hrc" -#include "scfuncs.hrc" -#include "scres.hrc" +#include "strings.hrc" #include "scmod.hxx" #include "appoptio.hxx" #include "editutil.hxx" @@ -87,7 +85,7 @@ ScAutoFormat* ScGlobal::pAutoFormat = nullptr; LegacyFuncCollection* ScGlobal::pLegacyFuncCollection = nullptr; ScUnoAddInCollection* ScGlobal::pAddInCollection = nullptr; ScUserList* ScGlobal::pUserList = nullptr; -OUString** ScGlobal::ppRscString = nullptr; +std::map* ScGlobal::pRscString = nullptr; LanguageType ScGlobal::eLnge = LANGUAGE_SYSTEM; css::lang::Locale* ScGlobal::pLocale = nullptr; SvtSysLocale* ScGlobal::pSysLocale = nullptr; @@ -313,109 +311,87 @@ void ScGlobal::SetUserList( const ScUserList* pNewList ) } } -const OUString& ScGlobal::GetRscString( sal_uInt16 nIndex ) +const OUString& ScGlobal::GetRscString(const char* pResId) { - assert( nIndex < SC_GLOBSTR_STR_COUNT); - if( !ppRscString[ nIndex ] ) - { - OpCode eOp = ocNone; - // Map former globstr.src strings moved to compiler.src - switch (nIndex) - { - case STR_NULL_ERROR: - eOp = ocErrNull; - break; - case STR_DIV_ZERO: - eOp = ocErrDivZero; - break; - case STR_NO_VALUE: - eOp = ocErrValue; - break; - case STR_NOREF_STR: - eOp = ocErrRef; - break; - case STR_NO_NAME_REF: - eOp = ocErrName; - break; - case STR_NUM_ERROR: - eOp = ocErrNum; - break; - case STR_NV_STR: - eOp = ocErrNA; - break; - default: - ; // nothing - } - if (eOp != ocNone) - ppRscString[ nIndex ] = new OUString(ScCompiler::GetNativeSymbol(eOp)); - else - ppRscString[ nIndex ] = new OUString(ScResId(nIndex + RID_GLOBSTR_OFFSET)); - } - return *ppRscString[ nIndex ]; + if (pRscString->find(pResId) == pRscString->end()) + (*pRscString)[pResId] = ScResId(pResId); + return (*pRscString)[pResId]; } OUString ScGlobal::GetErrorString(FormulaError nErr) { - sal_uInt16 nErrNumber; + const char* pErrNumber; switch (nErr) { - case FormulaError::NotAvailable : nErrNumber = STR_NV_STR; break; - case FormulaError::NoRef : nErrNumber = STR_NO_REF_TABLE; break; - case FormulaError::NoName : nErrNumber = STR_NO_NAME_REF; break; - case FormulaError::NoAddin : nErrNumber = STR_NO_ADDIN; break; - case FormulaError::NoMacro : nErrNumber = STR_NO_MACRO; break; - case FormulaError::NoValue : nErrNumber = STR_NO_VALUE; break; - case FormulaError::NoCode : nErrNumber = STR_NULL_ERROR; break; - case FormulaError::DivisionByZero : nErrNumber = STR_DIV_ZERO; break; - case FormulaError::IllegalFPOperation : nErrNumber = STR_NUM_ERROR; break; - - default : return GetRscString(STR_ERROR_STR) + OUString::number( (int)nErr ); + case FormulaError::NoRef: + pErrNumber = STR_NO_REF_TABLE; + break; + case FormulaError::NoAddin: + pErrNumber = STR_NO_ADDIN; + break; + case FormulaError::NoMacro: + pErrNumber = STR_NO_MACRO; + break; + case FormulaError::NotAvailable: + return ScCompiler::GetNativeSymbol(ocErrNA); + case FormulaError::NoName: + return ScCompiler::GetNativeSymbol(ocErrName); + case FormulaError::NoValue: + return ScCompiler::GetNativeSymbol(ocErrValue); + case FormulaError::NoCode: + return ScCompiler::GetNativeSymbol(ocErrNull); + case FormulaError::DivisionByZero: + return ScCompiler::GetNativeSymbol(ocErrDivZero); + case FormulaError::IllegalFPOperation: + return ScCompiler::GetNativeSymbol(ocErrNum); + default: + return GetRscString(STR_ERROR_STR) + OUString::number( (int)nErr ); } - return GetRscString( nErrNumber ); + return GetRscString(pErrNumber); } OUString ScGlobal::GetLongErrorString(FormulaError nErr) { - sal_uInt16 nErrNumber; + const char* pErrNumber; switch (nErr) { case FormulaError::NONE: - nErrNumber = 0; + pErrNumber = nullptr; break; case FormulaError::IllegalArgument: - nErrNumber = STR_LONG_ERR_ILL_ARG; + pErrNumber = STR_LONG_ERR_ILL_ARG; break; case FormulaError::IllegalFPOperation: - nErrNumber = STR_LONG_ERR_ILL_FPO; + pErrNumber = STR_LONG_ERR_ILL_FPO; break; case FormulaError::IllegalChar: - nErrNumber = STR_LONG_ERR_ILL_CHAR; + pErrNumber = STR_LONG_ERR_ILL_CHAR; break; case FormulaError::IllegalParameter: - nErrNumber = STR_LONG_ERR_ILL_PAR; + pErrNumber = STR_LONG_ERR_ILL_PAR; break; case FormulaError::Pair: case FormulaError::PairExpected: - nErrNumber = STR_LONG_ERR_PAIR; + pErrNumber = STR_LONG_ERR_PAIR; break; case FormulaError::OperatorExpected: - nErrNumber = STR_LONG_ERR_OP_EXP; + pErrNumber = STR_LONG_ERR_OP_EXP; break; case FormulaError::VariableExpected: case FormulaError::ParameterExpected: - nErrNumber = STR_LONG_ERR_VAR_EXP; + pErrNumber = STR_LONG_ERR_VAR_EXP; break; case FormulaError::CodeOverflow: - nErrNumber = STR_LONG_ERR_CODE_OVF; + pErrNumber = STR_LONG_ERR_CODE_OVF; break; case FormulaError::StringOverflow: - nErrNumber = STR_LONG_ERR_STR_OVF; + pErrNumber = STR_LONG_ERR_STR_OVF; break; case FormulaError::StackOverflow: - nErrNumber = STR_LONG_ERR_STACK_OVF; + pErrNumber = STR_LONG_ERR_STACK_OVF; break; case FormulaError::MatrixSize: - nErrNumber = STR_LONG_ERR_MATRIX_SIZE; + pErrNumber = STR_LONG_ERR_MATRIX_SIZE; break; case FormulaError::UnknownState: case FormulaError::UnknownVariable: @@ -423,44 +399,43 @@ OUString ScGlobal::GetLongErrorString(FormulaError nErr) case FormulaError::UnknownStackVariable: case FormulaError::UnknownToken: case FormulaError::NoCode: - nErrNumber = STR_LONG_ERR_SYNTAX; + pErrNumber = STR_LONG_ERR_SYNTAX; break; case FormulaError::CircularReference: - nErrNumber = STR_LONG_ERR_CIRC_REF; + pErrNumber = STR_LONG_ERR_CIRC_REF; break; case FormulaError::NoConvergence: - nErrNumber = STR_LONG_ERR_NO_CONV; + pErrNumber = STR_LONG_ERR_NO_CONV; break; case FormulaError::NoRef: - nErrNumber = STR_LONG_ERR_NO_REF; + pErrNumber = STR_LONG_ERR_NO_REF; break; case FormulaError::NoName: - nErrNumber = STR_LONG_ERR_NO_NAME; + pErrNumber = STR_LONG_ERR_NO_NAME; break; case FormulaError::NoAddin: - nErrNumber = STR_LONG_ERR_NO_ADDIN; + pErrNumber = STR_LONG_ERR_NO_ADDIN; break; case FormulaError::NoMacro: - nErrNumber = STR_LONG_ERR_NO_MACRO; + pErrNumber = STR_LONG_ERR_NO_MACRO; break; case FormulaError::DivisionByZero: - nErrNumber = STR_LONG_ERR_DIV_ZERO; + pErrNumber = STR_LONG_ERR_DIV_ZERO; break; case FormulaError::NestedArray: - nErrNumber = STR_ERR_LONG_NESTED_ARRAY; + pErrNumber = STR_ERR_LONG_NESTED_ARRAY; break; case FormulaError::NoValue: - nErrNumber = STR_LONG_ERR_NO_VALUE; + pErrNumber = STR_LONG_ERR_NO_VALUE; break; case FormulaError::NotAvailable: - nErrNumber = STR_LONG_ERR_NV; + pErrNumber = STR_LONG_ERR_NV; break; default: - nErrNumber = STR_ERROR_STR; + pErrNumber = STR_ERROR_STR; break; } - OUString aRes( GetRscString( nErrNumber ) ); - return aRes; + return GetRscString(pErrNumber); } SvxBrushItem* ScGlobal::GetButtonBrushItem() @@ -489,8 +464,7 @@ void ScGlobal::Init() pCharClass = pSysLocale->GetCharClassPtr(); pLocaleData = pSysLocale->GetLocaleDataPtr(); - ppRscString = new OUString *[ SC_GLOBSTR_STR_COUNT ]; - for( sal_uInt16 nC = 0 ; nC < SC_GLOBSTR_STR_COUNT ; nC++ ) ppRscString[ nC ] = nullptr; + pRscString = new std::map(); pEmptyBrushItem = new SvxBrushItem( Color( COL_TRANSPARENT ), ATTR_BACKGROUND ); pButtonBrushItem = new SvxBrushItem( Color(), ATTR_BACKGROUND ); @@ -580,15 +554,7 @@ void ScGlobal::Clear() DELETEZ(pLegacyFuncCollection); DELETEZ(pAddInCollection); DELETEZ(pUserList); - - if (ppRscString) - { - for (sal_uInt16 nC = 0; nC < SC_GLOBSTR_STR_COUNT; ++nC) - delete ppRscString[nC]; - delete[] ppRscString; - ppRscString = nullptr; - } - + DELETEZ(pRscString); DELETEZ(pStarCalcFunctionList); // Destroy before ResMgr! DELETEZ(pStarCalcFunctionMgr); ScParameterClassification::Exit(); diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index cda78f27dd2b..1bd97dcb8e91 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -2119,27 +2119,27 @@ bool ScTable::DoSubTotals( ScSubTotalParam& rParam ) if (aOutString.isEmpty()) aOutString = ScGlobal::GetRscString( STR_EMPTYDATA ); aOutString += " "; - sal_uInt16 nStrId = STR_TABLE_ERGEBNIS; + const char* pStrId = STR_TABLE_ERGEBNIS; if ( nResCount == 1 ) switch ( eResFunc[0] ) { - case SUBTOTAL_FUNC_AVE: nStrId = STR_FUN_TEXT_AVG; break; + case SUBTOTAL_FUNC_AVE: pStrId = STR_FUN_TEXT_AVG; break; case SUBTOTAL_FUNC_CNT: - case SUBTOTAL_FUNC_CNT2: nStrId = STR_FUN_TEXT_COUNT; break; - case SUBTOTAL_FUNC_MAX: nStrId = STR_FUN_TEXT_MAX; break; - case SUBTOTAL_FUNC_MIN: nStrId = STR_FUN_TEXT_MIN; break; - case SUBTOTAL_FUNC_PROD: nStrId = STR_FUN_TEXT_PRODUCT; break; + case SUBTOTAL_FUNC_CNT2: pStrId = STR_FUN_TEXT_COUNT; break; + case SUBTOTAL_FUNC_MAX: pStrId = STR_FUN_TEXT_MAX; break; + case SUBTOTAL_FUNC_MIN: pStrId = STR_FUN_TEXT_MIN; break; + case SUBTOTAL_FUNC_PROD: pStrId = STR_FUN_TEXT_PRODUCT; break; case SUBTOTAL_FUNC_STD: - case SUBTOTAL_FUNC_STDP: nStrId = STR_FUN_TEXT_STDDEV; break; - case SUBTOTAL_FUNC_SUM: nStrId = STR_FUN_TEXT_SUM; break; + case SUBTOTAL_FUNC_STDP: pStrId = STR_FUN_TEXT_STDDEV; break; + case SUBTOTAL_FUNC_SUM: pStrId = STR_FUN_TEXT_SUM; break; case SUBTOTAL_FUNC_VAR: - case SUBTOTAL_FUNC_VARP: nStrId = STR_FUN_TEXT_VAR; break; + case SUBTOTAL_FUNC_VARP: pStrId = STR_FUN_TEXT_VAR; break; default: { // added to avoid warnings } } - aOutString += ScGlobal::GetRscString( nStrId ); + aOutString += ScGlobal::GetRscString(pStrId); } SetString( nGroupCol[aRowEntry.nGroupNo], aRowEntry.nDestRow, nTab, aOutString ); ApplyStyle( nGroupCol[aRowEntry.nGroupNo], aRowEntry.nDestRow, pStyle ); diff --git a/sc/source/core/src/compiler.src b/sc/source/core/src/compiler.src deleted file mode 100644 index dd3199eda97d..000000000000 --- a/sc/source/core/src/compiler.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 "sc.hrc" -#include - -StringArray RID_FUNCTION_CATEGORIES -{ - ItemList [ en-US ] = - { - < "Database" ; >; - < "Date&Time" ; >; - < "Financial" ; >; - < "Information" ; >; - < "Logical" ; >; - < "Mathematical" ; >; - < "Array" ; >; - < "Statistical" ; >; - < "Spreadsheet" ; >; - < "Text" ; >; - < "Add-in" ; >; - }; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index 67252a1b22a0..085448a2aa1c 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -45,7 +45,7 @@ #include "addinlis.hxx" #include #include -#include "scfuncs.hrc" +#include "sc.hrc" #include "optutil.hxx" #include "addincfg.hxx" #include "scmod.hxx" diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx index 5d830cd69999..4dc6b2305bf8 100644 --- a/sc/source/core/tool/address.cxx +++ b/sc/source/core/tool/address.cxx @@ -2007,7 +2007,7 @@ template inline void lcl_Format( T& r, SCTAB nTab, SCROW nRow, SCCO { if ( nTab < 0 || nTab >= pDoc->GetTableCount() ) { - lcl_string_append(r, ScGlobal::GetRscString( STR_NOREF_STR )); + lcl_string_append(r, ScCompiler::GetNativeSymbol(ocErrRef)); return; } if( nFlags & ScRefFlags::TAB_3D ) @@ -2199,7 +2199,7 @@ OUString ScRange::Format( ScRefFlags nFlags, const ScDocument* pDoc, { if( !( nFlags & ScRefFlags::VALID ) ) { - return ScGlobal::GetRscString( STR_NOREF_STR ); + return ScCompiler::GetNativeSymbol(ocErrRef); } OUStringBuffer r; @@ -2451,7 +2451,7 @@ OUString ScRefAddress::GetRefString( ScDocument* pDoc, SCTAB nActTab, if ( !pDoc ) return EMPTY_OUSTRING; if ( Tab()+1 > pDoc->GetTableCount() ) - return ScGlobal::GetRscString( STR_NOREF_STR ); + return ScCompiler::GetNativeSymbol(ocErrRef); ScRefFlags nFlags = ScRefFlags::VALID; if ( nActTab != Tab() ) diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx index eb4fe52f3ebc..874321b9becd 100644 --- a/sc/source/core/tool/autoform.cxx +++ b/sc/source/core/tool/autoform.cxx @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -744,6 +745,26 @@ void ScAutoFormatData::GetFromItemSet( sal_uInt16 nIndex, const SfxItemSet& rIte rField.SetRotateMode ( static_cast (rItemSet.Get( ATTR_ROTATE_MODE )) ); } +static const char* RID_SVXSTR_TBLAFMT[] = +{ + RID_SVXSTR_TBLAFMT_3D, + RID_SVXSTR_TBLAFMT_BLACK1, + RID_SVXSTR_TBLAFMT_BLACK2, + RID_SVXSTR_TBLAFMT_BLUE, + RID_SVXSTR_TBLAFMT_BROWN, + RID_SVXSTR_TBLAFMT_CURRENCY, + RID_SVXSTR_TBLAFMT_CURRENCY_3D, + RID_SVXSTR_TBLAFMT_CURRENCY_GRAY, + RID_SVXSTR_TBLAFMT_CURRENCY_LAVENDER, + RID_SVXSTR_TBLAFMT_CURRENCY_TURQUOISE, + RID_SVXSTR_TBLAFMT_GRAY, + RID_SVXSTR_TBLAFMT_GREEN, + RID_SVXSTR_TBLAFMT_LAVENDER, + RID_SVXSTR_TBLAFMT_RED, + RID_SVXSTR_TBLAFMT_TURQUOISE, + RID_SVXSTR_TBLAFMT_YELLOW +}; + bool ScAutoFormatData::Load( SvStream& rStream, const ScAfVersions& rVersions ) { sal_uInt16 nVer = 0; @@ -764,12 +785,8 @@ bool ScAutoFormatData::Load( SvStream& rStream, const ScAfVersions& rVersions ) if( AUTOFORMAT_DATA_ID_552 <= nVer ) { rStream.ReadUInt16( nStrResId ); - sal_uInt16 nId = RID_SVXSTR_TBLAFMT_BEGIN + nStrResId; - if( RID_SVXSTR_TBLAFMT_BEGIN <= nId && - nId < RID_SVXSTR_TBLAFMT_END ) - { - aName = SvxResId( nId ); - } + if (nStrResId < SAL_N_ELEMENTS(RID_SVXSTR_TBLAFMT)) + aName = SvxResId(RID_SVXSTR_TBLAFMT[nStrResId]); else nStrResId = USHRT_MAX; } diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx index 5177a29189f3..dcf95153c636 100644 --- a/sc/source/core/tool/chgtrack.cxx +++ b/sc/source/core/tool/chgtrack.cxx @@ -18,6 +18,7 @@ */ #include "chgtrack.hxx" +#include "compiler.hxx" #include "formulacell.hxx" #include "document.hxx" #include "dociter.hxx" @@ -504,7 +505,7 @@ OUString ScChangeAction::GetRefString( OUStringBuffer aBuf; ScRefFlags nFlags = ( rRange.IsValid( pDoc ) ? ScRefFlags::VALID : ScRefFlags::ZERO ); if ( nFlags == ScRefFlags::ZERO ) - aBuf.append(ScGlobal::GetRscString(STR_NOREF_STR)); + aBuf.append(ScCompiler::GetNativeSymbol(ocErrRef)); else { ScRange aTmpRange( rRange.MakeRange() ); @@ -700,17 +701,17 @@ void ScChangeActionIns::GetDescription( { ScChangeAction::GetDescription( rStr, pDoc, bSplitRange, bWarning ); - sal_uInt16 nWhatId; + const char* pWhatId; switch ( GetType() ) { case SC_CAT_INSERT_COLS : - nWhatId = STR_COLUMN; + pWhatId = STR_COLUMN; break; case SC_CAT_INSERT_ROWS : - nWhatId = STR_ROW; + pWhatId = STR_ROW; break; default: - nWhatId = STR_AREA; + pWhatId = STR_AREA; } OUString aRsc = ScGlobal::GetRscString(STR_CHANGED_INSERT); @@ -718,7 +719,7 @@ void ScChangeActionIns::GetDescription( if (nPos >= 0) { // Construct a range string to replace '#1' first. - OUStringBuffer aBuf(ScGlobal::GetRscString(nWhatId)); + OUStringBuffer aBuf(ScGlobal::GetRscString(pWhatId)); aBuf.append(' '); aBuf.append(GetRefString(GetBigRange(), pDoc)); OUString aRangeStr = aBuf.makeStringAndClear(); @@ -937,17 +938,17 @@ void ScChangeActionDel::GetDescription( { ScChangeAction::GetDescription( rStr, pDoc, bSplitRange, bWarning ); - sal_uInt16 nWhatId; + const char* pWhatId; switch ( GetType() ) { case SC_CAT_DELETE_COLS : - nWhatId = STR_COLUMN; + pWhatId = STR_COLUMN; break; case SC_CAT_DELETE_ROWS : - nWhatId = STR_ROW; + pWhatId = STR_ROW; break; default: - nWhatId = STR_AREA; + pWhatId = STR_AREA; } ScBigRange aTmpRange( GetBigRange() ); @@ -968,7 +969,7 @@ void ScChangeActionDel::GetDescription( { // Build a string to replace with. OUStringBuffer aBuf; - aBuf.append(ScGlobal::GetRscString(nWhatId)); + aBuf.append(ScGlobal::GetRscString(pWhatId)); aBuf.append(' '); aBuf.append(GetRefString(aTmpRange, pDoc)); OUString aRangeStr = aBuf.makeStringAndClear(); @@ -1521,7 +1522,7 @@ void ScChangeActionContent::GetRefString( } } else - rStr = ScGlobal::GetRscString( STR_NOREF_STR ); + rStr = ScCompiler::GetNativeSymbol(ocErrRef); } bool ScChangeActionContent::Reject( ScDocument* pDoc ) diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index 0939e8e115c6..870d928b026b 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -5015,7 +5014,7 @@ void ScCompiler::CreateStringFromSingleRef( OUStringBuffer& rBuffer, const Formu } else { - rBuffer.append(ScGlobal::GetRscString(STR_NO_NAME_REF)); + rBuffer.append(ScCompiler::GetNativeSymbol(ocErrName)); pConv->makeRefStr(rBuffer, meGrammar, aPos, aErrRef, GetSetupTabNames(), aRef, true, (pArr && pArr->IsFromRangeName())); } @@ -5081,7 +5080,7 @@ void ScCompiler::CreateStringFromIndex( OUStringBuffer& rBuffer, const FormulaTo aBuffer.append( aName); } else - aBuffer.append( ScGlobal::GetRscString( STR_NO_NAME_REF)); + aBuffer.append(ScCompiler::GetNativeSymbol(ocErrName)); aBuffer.append( pConv->getSpecialSymbol( ScCompiler::Convention::SHEET_SEPARATOR)); } aBuffer.append(pData->GetName()); @@ -5141,7 +5140,7 @@ void ScCompiler::CreateStringFromIndex( OUStringBuffer& rBuffer, const FormulaTo if ( !aBuffer.isEmpty() ) rBuffer.append(aBuffer.makeStringAndClear()); else - rBuffer.append(ScGlobal::GetRscString(STR_NO_NAME_REF)); + rBuffer.append(ScCompiler::GetNativeSymbol(ocErrName)); } void ScCompiler::LocalizeString( OUString& rName ) const diff --git a/sc/source/core/tool/stylehelper.cxx b/sc/source/core/tool/stylehelper.cxx index e8fece39eef2..fb6a2447ec3d 100644 --- a/sc/source/core/tool/stylehelper.cxx +++ b/sc/source/core/tool/stylehelper.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include +#include #include #include "stylehelper.hxx" diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 46a33554f318..39ddeae9ac9e 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -4952,7 +4952,7 @@ void appendTokenByType( sc::TokenStringContext& rCxt, OUStringBuffer& rBuf, cons NameType::const_iterator it = rCxt.maGlobalRangeNames.find(nIndex); if (it == rCxt.maGlobalRangeNames.end()) { - rBuf.append(ScGlobal::GetRscString(STR_NO_NAME_REF)); + rBuf.append(ScCompiler::GetNativeSymbol(ocErrName)); break; } @@ -4973,14 +4973,14 @@ void appendTokenByType( sc::TokenStringContext& rCxt, OUStringBuffer& rBuf, cons rBuf.append( aName); } else - rBuf.append( ScGlobal::GetRscString( STR_NO_NAME_REF)); + rBuf.append(ScCompiler::GetNativeSymbol(ocErrName)); rBuf.append( rCxt.mpRefConv->getSpecialSymbol( ScCompiler::Convention::SHEET_SEPARATOR)); } sc::TokenStringContext::TabIndexMapType::const_iterator itTab = rCxt.maSheetRangeNames.find(nTab); if (itTab == rCxt.maSheetRangeNames.end()) { - rBuf.append(ScGlobal::GetRscString(STR_NO_NAME_REF)); + rBuf.append(ScCompiler::GetNativeSymbol(ocErrName)); break; } @@ -4988,7 +4988,7 @@ void appendTokenByType( sc::TokenStringContext& rCxt, OUStringBuffer& rBuf, cons NameType::const_iterator it = rNames.find(nIndex); if (it == rNames.end()) { - rBuf.append(ScGlobal::GetRscString(STR_NO_NAME_REF)); + rBuf.append(ScCompiler::GetNativeSymbol(ocErrName)); break; } @@ -5005,7 +5005,7 @@ void appendTokenByType( sc::TokenStringContext& rCxt, OUStringBuffer& rBuf, cons } break; default: - rBuf.append(ScGlobal::GetRscString(STR_NO_NAME_REF)); + rBuf.append(ScCompiler::GetNativeSymbol(ocErrName)); } } break; diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx index 91f97ec2f626..653fd6f945fe 100644 --- a/sc/source/filter/excel/xepivot.cxx +++ b/sc/source/filter/excel/xepivot.cxx @@ -864,24 +864,24 @@ OUString lclGetDataFieldCaption( const OUString& rFieldName, ScGeneralFunction e { OUString aCaption; - sal_uInt16 nResIdx = 0; + const char* pResIdx = nullptr; switch( eFunc ) { - case ScGeneralFunction::SUM: nResIdx = STR_FUN_TEXT_SUM; break; - case ScGeneralFunction::COUNT: nResIdx = STR_FUN_TEXT_COUNT; break; - case ScGeneralFunction::AVERAGE: nResIdx = STR_FUN_TEXT_AVG; break; - case ScGeneralFunction::MAX: nResIdx = STR_FUN_TEXT_MAX; break; - case ScGeneralFunction::MIN: nResIdx = STR_FUN_TEXT_MIN; break; - case ScGeneralFunction::PRODUCT: nResIdx = STR_FUN_TEXT_PRODUCT; break; - case ScGeneralFunction::COUNTNUMS: nResIdx = STR_FUN_TEXT_COUNT; break; - case ScGeneralFunction::STDEV: nResIdx = STR_FUN_TEXT_STDDEV; break; - case ScGeneralFunction::STDEVP: nResIdx = STR_FUN_TEXT_STDDEV; break; - case ScGeneralFunction::VAR: nResIdx = STR_FUN_TEXT_VAR; break; - case ScGeneralFunction::VARP: nResIdx = STR_FUN_TEXT_VAR; break; + case ScGeneralFunction::SUM: pResIdx = STR_FUN_TEXT_SUM; break; + case ScGeneralFunction::COUNT: pResIdx = STR_FUN_TEXT_COUNT; break; + case ScGeneralFunction::AVERAGE: pResIdx = STR_FUN_TEXT_AVG; break; + case ScGeneralFunction::MAX: pResIdx = STR_FUN_TEXT_MAX; break; + case ScGeneralFunction::MIN: pResIdx = STR_FUN_TEXT_MIN; break; + case ScGeneralFunction::PRODUCT: pResIdx = STR_FUN_TEXT_PRODUCT; break; + case ScGeneralFunction::COUNTNUMS: pResIdx = STR_FUN_TEXT_COUNT; break; + case ScGeneralFunction::STDEV: pResIdx = STR_FUN_TEXT_STDDEV; break; + case ScGeneralFunction::STDEVP: pResIdx = STR_FUN_TEXT_STDDEV; break; + case ScGeneralFunction::VAR: pResIdx = STR_FUN_TEXT_VAR; break; + case ScGeneralFunction::VARP: pResIdx = STR_FUN_TEXT_VAR; break; default:; } - if( nResIdx ) - aCaption = ScGlobal::GetRscString( nResIdx ) + " - "; + if (pResIdx) + aCaption = ScGlobal::GetRscString(pResIdx) + " - "; aCaption += rFieldName; return aCaption; } diff --git a/sc/source/filter/ftools/fprogressbar.cxx b/sc/source/filter/ftools/fprogressbar.cxx index 823c3b22b251..3a0c121d355b 100644 --- a/sc/source/filter/ftools/fprogressbar.cxx +++ b/sc/source/filter/ftools/fprogressbar.cxx @@ -41,8 +41,8 @@ ScfProgressBar::ScfProgressBar( SfxObjectShell* pDocShell, const OUString& rText Init( pDocShell ); } -ScfProgressBar::ScfProgressBar( SfxObjectShell* pDocShell, sal_uInt16 nResId ) : - maText( ScGlobal::GetRscString( nResId ) ) +ScfProgressBar::ScfProgressBar(SfxObjectShell* pDocShell, const char* pResId) + : maText(ScGlobal::GetRscString(pResId)) { Init( pDocShell ); } @@ -199,8 +199,8 @@ ScfSimpleProgressBar::ScfSimpleProgressBar( std::size_t nSize, SfxObjectShell* p Init( nSize ); } -ScfSimpleProgressBar::ScfSimpleProgressBar( std::size_t nSize, SfxObjectShell* pDocShell, sal_uInt16 nResId ) : - maProgress( pDocShell, nResId ) +ScfSimpleProgressBar::ScfSimpleProgressBar(std::size_t nSize, SfxObjectShell* pDocShell, const char* pResId) + : maProgress(pDocShell, pResId) { Init( nSize ); } diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index 75b7899c686b..e319a5c1a0c9 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -70,12 +70,12 @@ #include #include -// Without scres.hrc: error C2679: binary '=' : no operator defined which takes a +// Without strings.hrc: error C2679: binary '=' : no operator defined which takes a // right-hand operand of type 'const class String (__stdcall *)(class ScResId)' // at // const String aStrTable( ScResId( SCSTR_TABLE ) ); aStrOut = aStrTable; // ?!??? -#include "scres.hrc" +#include "strings.hrc" #include "globstr.hrc" #include diff --git a/sc/source/filter/inc/fprogressbar.hxx b/sc/source/filter/inc/fprogressbar.hxx index 6919831bb004..f00db4ce3842 100644 --- a/sc/source/filter/inc/fprogressbar.hxx +++ b/sc/source/filter/inc/fprogressbar.hxx @@ -106,8 +106,8 @@ public: ScfProgressBar(const ScfProgressBar&) = delete; const ScfProgressBar operator=(const ScfProgressBar&) = delete; - explicit ScfProgressBar( SfxObjectShell* pDocShell, const OUString& rText ); - explicit ScfProgressBar( SfxObjectShell* pDocShell, sal_uInt16 nResId ); + explicit ScfProgressBar(SfxObjectShell* pDocShell, const OUString& rText); + explicit ScfProgressBar(SfxObjectShell* pDocShell, const char* pResId); ~ScfProgressBar(); /** Adds a new segment to the progress bar. @@ -187,8 +187,8 @@ private: class ScfSimpleProgressBar { public: - explicit ScfSimpleProgressBar( std::size_t nSize, SfxObjectShell* pDocShell, const OUString& rText ); - explicit ScfSimpleProgressBar( std::size_t nSize, SfxObjectShell* pDocShell, sal_uInt16 nResId ); + explicit ScfSimpleProgressBar(std::size_t nSize, SfxObjectShell* pDocShell, const OUString& rText); + explicit ScfSimpleProgressBar(std::size_t nSize, SfxObjectShell* pDocShell, const char* pResId); /** Set progress bar to the specified position. */ void ProgressAbs( std::size_t nPos ) { maProgress.ProgressAbs( nPos ); } diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index 832dbb395b72..2112829cf425 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLIMPRT_HXX #define INCLUDED_SC_SOURCE_FILTER_XML_XMLIMPRT_HXX -#include +#include #include #include #include diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index 538bdcd60ebe..392f420ca8a6 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -18,7 +18,7 @@ */ #include -#include +#include #include #include #include diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx index 27440b9dee71..b83acae7751f 100644 --- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx @@ -26,7 +26,7 @@ #include "docsh.hxx" #include "formulacell.hxx" #include "scresid.hxx" -#include "scres.hrc" +#include "strings.hrc" #include "strings.hxx" #include "unonames.hxx" #include "detfunc.hxx" diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx index ed0fca0877b0..91f6f29ae956 100644 --- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx @@ -45,7 +45,7 @@ #include "AccessibleText.hxx" #include "editsrc.hxx" #include "scresid.hxx" -#include "scres.hrc" +#include "strings.hrc" #include "scmod.hxx" #include #include diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index 76bd1b0774d0..5ae0237824aa 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -30,7 +30,7 @@ #include "AccessibleEditObject.hxx" #include "userdat.hxx" #include "scresid.hxx" -#include "scres.hrc" +#include "strings.hrc" #include "strings.hxx" #include "table.hxx" #include "markdata.hxx" diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index f7f709add1f5..b05d88c05e2e 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -28,7 +28,7 @@ #include "drwlayer.hxx" #include "editsrc.hxx" #include "scresid.hxx" -#include "scres.hrc" +#include "strings.hrc" #include "strings.hxx" #include "DrawModelBroadcaster.hxx" #include "docsh.hxx" diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx index 80f33b6e9516..e610539c4dc8 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx @@ -28,7 +28,7 @@ #include "scitems.hxx" #include "attrib.hxx" #include "scresid.hxx" -#include "scres.hrc" +#include "strings.hrc" #include "strings.hxx" #include diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx index da2c3bcc02c3..baa827e18c0d 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx @@ -27,7 +27,7 @@ #include "prevwsh.hxx" #include "prevloc.hxx" #include "scresid.hxx" -#include "scres.hrc" +#include "strings.hrc" #include "strings.hxx" #include diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx index d13dfe1e072b..9cabb1f49b5f 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx @@ -31,7 +31,7 @@ #include "miscuno.hxx" #include "prevloc.hxx" #include "scresid.hxx" -#include "scres.hrc" +#include "strings.hrc" #include "strings.hxx" #include diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx index 8d9ee27c0070..a8a51dd51091 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx @@ -28,7 +28,7 @@ #include "attrib.hxx" #include "document.hxx" #include "scresid.hxx" -#include "scres.hrc" +#include "strings.hrc" #include "strings.hxx" #include diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index c456a42f685b..79ba53882d7f 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -38,7 +38,7 @@ #include #include #include "scresid.hxx" -#include "scres.hrc" +#include "strings.hrc" #include diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx index e9c22a9d8e0e..4dd5e0347213 100644 --- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx @@ -21,7 +21,7 @@ #include "miscuno.hxx" #include "document.hxx" #include "scresid.hxx" -#include "scres.hrc" +#include "strings.hrc" #include "strings.hxx" #include "table.hxx" diff --git a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx index 4c62091840f8..2b44b67061aa 100644 --- a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx @@ -22,29 +22,29 @@ #include "reffact.hxx" #include "docfunc.hxx" #include "TableFillingAndNavigationTools.hxx" - #include "AnalysisOfVarianceDialog.hxx" +#include "strings.hrc" namespace { struct StatisticCalculation { - sal_Int16 aLabelId; + const char* aLabelId; const char* aFormula; const char* aResultRangeName; }; static StatisticCalculation lclBasicStatistics[] = { - { STR_ANOVA_LABEL_GROUPS, nullptr, nullptr }, + { STR_ANOVA_LABEL_GROUPS, nullptr, nullptr }, { STRID_CALC_COUNT, "=COUNT(%RANGE%)", "COUNT_RANGE" }, { STRID_CALC_SUM, "=SUM(%RANGE%)", "SUM_RANGE" }, { STRID_CALC_MEAN, "=AVERAGE(%RANGE%)", "MEAN_RANGE" }, { STRID_CALC_VARIANCE, "=VAR(%RANGE%)", "VAR_RANGE" }, - { 0, nullptr, nullptr } + { nullptr, nullptr, nullptr } }; -static sal_Int16 lclAnovaLabels[] = +static const char* lclAnovaLabels[] = { STR_ANOVA_LABEL_SOURCE_OF_VARIATION, STR_ANOVA_LABEL_SS, @@ -53,7 +53,7 @@ static sal_Int16 lclAnovaLabels[] = STR_ANOVA_LABEL_F, STR_ANOVA_LABEL_P_VALUE, STR_ANOVA_LABEL_F_CRITICAL, - 0 + nullptr }; static const char strWildcardRange[] = "%RANGE%"; @@ -133,7 +133,7 @@ bool ScAnalysisOfVarianceDialog::Close() return DoClose( ScAnalysisOfVarianceDialogWrapper::GetChildWindowId() ); } -sal_Int16 ScAnalysisOfVarianceDialog::GetUndoNameId() +const char* ScAnalysisOfVarianceDialog::GetUndoNameId() { return STR_ANALYSIS_OF_VARIANCE_UNDO_NAME; } @@ -181,8 +181,8 @@ void ScAnalysisOfVarianceDialog::RowColumn(ScRangeList& rRangeList, AddressWalke } else { - sal_Int16 aLabelId = (aGroupedBy == BY_COLUMN) ? STR_COLUMN_LABEL_TEMPLATE : STR_ROW_LABEL_TEMPLATE; - OUString aLabelTemplate(ScResId(aLabelId)); + const char* pLabelId = (aGroupedBy == BY_COLUMN) ? STR_COLUMN_LABEL_TEMPLATE : STR_ROW_LABEL_TEMPLATE; + OUString aLabelTemplate(ScResId(pLabelId)); for (size_t i = 0; i < rRangeList.size(); i++) { @@ -210,7 +210,7 @@ void ScAnalysisOfVarianceDialog::AnovaSingleFactor(AddressWalkerWriter& output, output.newLine(); // Write labels - for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId != 0; i++) + for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId; i++) { output.writeString(ScResId(lclBasicStatistics[i].aLabelId)); output.nextColumn(); @@ -224,7 +224,7 @@ void ScAnalysisOfVarianceDialog::AnovaSingleFactor(AddressWalkerWriter& output, output.push(); // Write values - for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId != 0; i++) + for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId; i++) { output.resetRow(); ScRange aResultRange; @@ -242,7 +242,7 @@ void ScAnalysisOfVarianceDialog::AnovaSingleFactor(AddressWalkerWriter& output, // Write ANOVA labels output.resetColumn(); - for(sal_Int32 i = 0; lclAnovaLabels[i] != 0; i++) + for(sal_Int32 i = 0; lclAnovaLabels[i]; i++) { output.writeString(ScResId(lclAnovaLabels[i])); output.nextColumn(); @@ -358,7 +358,7 @@ void ScAnalysisOfVarianceDialog::AnovaTwoFactor(AddressWalkerWriter& output, For output.newLine(); // Write labels - for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId != 0; i++) + for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId; i++) { output.writeString(ScResId(lclBasicStatistics[i].aLabelId)); output.nextColumn(); @@ -373,7 +373,7 @@ void ScAnalysisOfVarianceDialog::AnovaTwoFactor(AddressWalkerWriter& output, For // Write ColumnX values output.push(); - for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId != 0; i++) + for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId; i++) { output.resetRow(); ScRange aResultRange; @@ -390,7 +390,7 @@ void ScAnalysisOfVarianceDialog::AnovaTwoFactor(AddressWalkerWriter& output, For // Write RowX values output.push(); - for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId != 0; i++) + for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId; i++) { output.resetRow(); ScRange aResultRange; @@ -407,7 +407,7 @@ void ScAnalysisOfVarianceDialog::AnovaTwoFactor(AddressWalkerWriter& output, For output.newLine(); // Write ANOVA labels - for(sal_Int32 i = 0; lclAnovaLabels[i] != 0; i++) + for(sal_Int32 i = 0; lclAnovaLabels[i]; i++) { output.writeString(ScResId(lclAnovaLabels[i])); output.nextColumn(); diff --git a/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx b/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx index 1a7591a121e1..96b2fffac7c8 100644 --- a/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx @@ -21,8 +21,8 @@ #include "reffact.hxx" #include "docfunc.hxx" #include "TableFillingAndNavigationTools.hxx" - #include "ChiSquareTestDialog.hxx" +#include "strings.hrc" ScChiSquareTestDialog::ScChiSquareTestDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, @@ -42,7 +42,7 @@ bool ScChiSquareTestDialog::Close() return DoClose(ScChiSquareTestDialogWrapper::GetChildWindowId()); } -sal_Int16 ScChiSquareTestDialog::GetUndoNameId() +const char* ScChiSquareTestDialog::GetUndoNameId() { return STR_CHI_SQUARE_TEST; } diff --git a/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx b/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx index 7eafe239aa40..446bf8a5e14e 100644 --- a/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx @@ -10,8 +10,8 @@ #include "docsh.hxx" #include "reffact.hxx" - #include "CorrelationDialog.hxx" +#include "strings.hrc" ScCorrelationDialog::ScCorrelationDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, diff --git a/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx index 5506444bfd41..c4cfff7b1501 100644 --- a/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx @@ -10,8 +10,8 @@ #include "docsh.hxx" #include "reffact.hxx" - #include "CovarianceDialog.hxx" +#include "strings.hrc" ScCovarianceDialog::ScCovarianceDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, @@ -21,7 +21,7 @@ ScCovarianceDialog::ScCovarianceDialog( "CovarianceDialog", "modules/scalc/ui/covariancedialog.ui" ) {} -sal_Int16 ScCovarianceDialog::GetUndoNameId() +const char* ScCovarianceDialog::GetUndoNameId() { return STR_COVARIANCE_UNDO_NAME; } diff --git a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx index 2dcc463a840e..38c412f5da09 100644 --- a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx @@ -22,14 +22,14 @@ #include "reffact.hxx" #include "docfunc.hxx" #include "TableFillingAndNavigationTools.hxx" - #include "DescriptiveStatisticsDialog.hxx" +#include "strings.hrc" namespace { struct StatisticCalculation { - sal_Int16 aCalculationNameId; + const char* aCalculationNameId; const char* aFormula; }; @@ -50,7 +50,7 @@ static const StatisticCalculation lclCalcDefinitions[] = { STRID_CALC_MAX, "=MAX(%RANGE%)"}, { STRID_CALC_SUM, "=SUM(%RANGE%)"}, { STRID_CALC_COUNT, "=COUNT(%RANGE%)" }, - { 0, nullptr } + { nullptr, nullptr } }; } @@ -71,7 +71,7 @@ bool ScDescriptiveStatisticsDialog::Close() return DoClose( ScDescriptiveStatisticsDialogWrapper::GetChildWindowId() ); } -sal_Int16 ScDescriptiveStatisticsDialog::GetUndoNameId() +const char* ScDescriptiveStatisticsDialog::GetUndoNameId() { return STR_DESCRIPTIVE_STATISTICS_UNDO_NAME; } diff --git a/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx b/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx index f5d679c3d339..2bad4e9e702a 100644 --- a/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx @@ -22,8 +22,8 @@ #include "reffact.hxx" #include "docfunc.hxx" #include "TableFillingAndNavigationTools.hxx" - #include "ExponentialSmoothingDialog.hxx" +#include "strings.hrc" ScExponentialSmoothingDialog::ScExponentialSmoothingDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, @@ -51,7 +51,7 @@ bool ScExponentialSmoothingDialog::Close() return DoClose( ScExponentialSmoothingDialogWrapper::GetChildWindowId() ); } -sal_Int16 ScExponentialSmoothingDialog::GetUndoNameId() +const char* ScExponentialSmoothingDialog::GetUndoNameId() { return STR_EXPONENTIAL_SMOOTHING_UNDO_NAME; } diff --git a/sc/source/ui/StatisticsDialogs/FTestDialog.cxx b/sc/source/ui/StatisticsDialogs/FTestDialog.cxx index a3cc2cb8b2b1..7461cec85d0c 100644 --- a/sc/source/ui/StatisticsDialogs/FTestDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/FTestDialog.cxx @@ -22,8 +22,8 @@ #include "reffact.hxx" #include "docfunc.hxx" #include "TableFillingAndNavigationTools.hxx" - #include "FTestDialog.hxx" +#include "strings.hrc" ScFTestDialog::ScFTestDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, @@ -43,7 +43,7 @@ bool ScFTestDialog::Close() return DoClose( ScFTestDialogWrapper::GetChildWindowId() ); } -sal_Int16 ScFTestDialog::GetUndoNameId() +const char* ScFTestDialog::GetUndoNameId() { return STR_FTEST_UNDO_NAME; } diff --git a/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx b/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx index 5d02286c98e9..984740e178c2 100644 --- a/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx +++ b/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx @@ -21,8 +21,8 @@ #include "reffact.hxx" #include "docfunc.hxx" #include "TableFillingAndNavigationTools.hxx" - #include "MatrixComparisonGenerator.hxx" +#include "strings.hrc" namespace { @@ -59,7 +59,7 @@ ScMatrixComparisonGenerator::ScMatrixComparisonGenerator( ScMatrixComparisonGenerator::~ScMatrixComparisonGenerator() {} -sal_Int16 ScMatrixComparisonGenerator::GetUndoNameId() +const char* ScMatrixComparisonGenerator::GetUndoNameId() { return STR_CORRELATION_UNDO_NAME; } diff --git a/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx b/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx index 540dd33e721c..af892c2bee43 100644 --- a/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx @@ -22,8 +22,8 @@ #include "reffact.hxx" #include "docfunc.hxx" #include "TableFillingAndNavigationTools.hxx" - #include "MovingAverageDialog.hxx" +#include "strings.hrc" ScMovingAverageDialog::ScMovingAverageDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, @@ -51,7 +51,7 @@ bool ScMovingAverageDialog::Close() return DoClose( ScMovingAverageDialogWrapper::GetChildWindowId() ); } -sal_Int16 ScMovingAverageDialog::GetUndoNameId() +const char* ScMovingAverageDialog::GetUndoNameId() { return STR_MOVING_AVERAGE_UNDO_NAME; } diff --git a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx index 1c6e40b5a60a..af5431197000 100644 --- a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx @@ -20,6 +20,7 @@ #include "uiitems.hxx" #include "reffact.hxx" #include "docfunc.hxx" +#include "strings.hrc" #include @@ -279,10 +280,10 @@ void ScRandomNumberGeneratorDialog::SelectGeneratorAndGenerateNumbers() } template -void ScRandomNumberGeneratorDialog::GenerateNumbers(RNG& randomGenerator, const sal_Int16 aDistributionStringId, boost::optional aDecimalPlaces) +void ScRandomNumberGeneratorDialog::GenerateNumbers(RNG& randomGenerator, const char* pDistributionStringId, boost::optional aDecimalPlaces) { OUString aUndo = ScResId(STR_UNDO_DISTRIBUTION_TEMPLATE); - OUString aDistributionName = ScResId(aDistributionStringId); + OUString aDistributionName = ScResId(pDistributionStringId); aUndo = aUndo.replaceAll("$(DISTRIBUTION)", aDistributionName); ScDocShell* pDocShell = mpViewData->GetDocShell(); diff --git a/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx b/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx index 6950c8dea61f..1438548cd007 100644 --- a/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx @@ -22,12 +22,12 @@ #include "reffact.hxx" #include "docfunc.hxx" #include "TableFillingAndNavigationTools.hxx" - #include "RegressionDialog.hxx" +#include "strings.hrc" namespace { - sal_Int16 constRegressionModel[] = + const char* constRegressionModel[] = { STR_LABEL_LINEAR, STR_LABEL_LOGARITHMIC, @@ -101,7 +101,7 @@ void ScRegressionDialog::dispose() ScStatisticsTwoVariableDialog::dispose(); } -sal_Int16 ScRegressionDialog::GetUndoNameId() +const char* ScRegressionDialog::GetUndoNameId() { return STR_REGRESSION_UNDO_NAME; } diff --git a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx index 7f683556bb65..a8f3a2a77fe1 100644 --- a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx @@ -19,8 +19,8 @@ #include "uiitems.hxx" #include "reffact.hxx" #include "docfunc.hxx" - #include "SamplingDialog.hxx" +#include "strings.hrc" ScSamplingDialog::ScSamplingDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, diff --git a/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src b/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src deleted file mode 100644 index 3289f306a246..000000000000 --- a/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src +++ /dev/null @@ -1,478 +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 "scres.hrc" - -/* MovingAverageDialog */ - -String STR_MOVING_AVERAGE_UNDO_NAME -{ - Text [ en-US ] = "Moving Average"; -}; - -/* ExponentialSmoothingDialog */ - -String STR_EXPONENTIAL_SMOOTHING_UNDO_NAME -{ - Text [ en-US ] = "Exponential Smoothing"; -}; - -/* AnalysisOfVarianceDialog */ - -String STR_ANALYSIS_OF_VARIANCE_UNDO_NAME -{ - Text [ en-US ] = "Analysis of Variance"; -}; - -String STR_ANOVA_SINGLE_FACTOR_LABEL -{ - Text [ en-US ] = "ANOVA - Single Factor"; -}; - -String STR_ANOVA_TWO_FACTOR_LABEL -{ - Text [ en-US ] = "ANOVA - Two Factor"; -}; - -String STR_ANOVA_LABEL_GROUPS -{ - Text [ en-US ] = "Groups"; -}; - -String STR_ANOVA_LABEL_BETWEEN_GROUPS -{ - Text [ en-US ] = "Between Groups"; -}; - -String STR_ANOVA_LABEL_WITHIN_GROUPS -{ - Text [ en-US ] = "Within Groups"; -}; - -String STR_ANOVA_LABEL_SOURCE_OF_VARIATION -{ - Text [ en-US ] = "Source of Variation"; -}; - -String STR_ANOVA_LABEL_SS -{ - Text [ en-US ] = "SS"; -}; - -String STR_ANOVA_LABEL_DF -{ - Text [ en-US ] = "df"; -}; - -String STR_ANOVA_LABEL_MS -{ - Text [ en-US ] = "MS"; -}; - -String STR_ANOVA_LABEL_F -{ - Text [ en-US ] = "F"; -}; - -String STR_ANOVA_LABEL_P_VALUE -{ - Text [ en-US ] = "P-value"; -}; - -String STR_ANOVA_LABEL_F_CRITICAL -{ - Text [ en-US ] = "F critical"; -}; - -String STR_ANOVA_LABEL_TOTAL -{ - Text [ en-US ] = "Total"; -}; - -/* CorrelationDialog */ - -String STR_CORRELATION_UNDO_NAME -{ - Text [ en-US ] = "Correlation"; -}; - -String STR_CORRELATION_LABEL -{ - Text [ en-US ] = "Correlations"; -}; - -/* CovarianceDialog */ - -String STR_COVARIANCE_UNDO_NAME -{ - Text [ en-US ] = "Covariance"; -}; - -String STR_COVARIANCE_LABEL -{ - Text [ en-US ] = "Covariances"; -}; - -/* DescriptiveStatisticsDialog */ - -String STR_DESCRIPTIVE_STATISTICS_UNDO_NAME -{ - Text [ en-US ] = "Descriptive Statistics"; -}; -String STRID_CALC_MEAN -{ - Text [ en-US ] = "Mean"; -}; -String STRID_CALC_STD_ERROR -{ - Text [ en-US ] = "Standard Error"; -}; -String STRID_CALC_MODE -{ - Text [ en-US ] = "Mode"; -}; -String STRID_CALC_MEDIAN -{ - Text [ en-US ] = "Median"; -}; -String STRID_CALC_VARIANCE -{ - Text [ en-US ] = "Variance"; -}; -String STRID_CALC_STD_DEVIATION -{ - Text [ en-US ] = "Standard Deviation"; -}; -String STRID_CALC_KURTOSIS -{ - Text [ en-US ] = "Kurtosis"; -}; -String STRID_CALC_SKEWNESS -{ - Text [ en-US ] = "Skewness"; -}; -String STRID_CALC_RANGE -{ - Text [ en-US ] = "Range"; -}; -String STRID_CALC_MIN -{ - Text [ en-US ] = "Minimum"; -}; -String STRID_CALC_MAX -{ - Text [ en-US ] = "Maximum"; -}; -String STRID_CALC_SUM -{ - Text [ en-US ] = "Sum"; -}; -String STRID_CALC_COUNT -{ - Text [ en-US ] = "Count"; -}; -String STRID_CALC_FIRST_QUARTILE -{ - Text [ en-US ] = "First Quartile "; -}; -String STRID_CALC_THIRD_QUARTILE -{ - Text [ en-US ] = "Third Quartile"; -}; - -/* RandomNumberGeneratorDialog */ - -String STR_UNDO_DISTRIBUTION_TEMPLATE -{ - Text [ en-US ] = "Random ($(DISTRIBUTION))"; -}; -String STR_DISTRIBUTION_UNIFORM_REAL -{ - Text [ en-US ] = "Uniform"; -}; -String STR_DISTRIBUTION_UNIFORM_INTEGER -{ - Text [ en-US ] = "Uniform Integer"; -}; -String STR_DISTRIBUTION_NORMAL -{ - Text [ en-US ] = "Normal"; -}; -String STR_DISTRIBUTION_CAUCHY -{ - Text [ en-US ] = "Cauchy"; -}; -String STR_DISTRIBUTION_BERNOULLI -{ - Text [ en-US ] = "Bernoulli"; -}; -String STR_DISTRIBUTION_BINOMIAL -{ - Text [ en-US ] = "Binomial"; -}; -String STR_DISTRIBUTION_NEGATIVE_BINOMIAL -{ - Text [ en-US ] = "Negative Binomial"; -}; -String STR_DISTRIBUTION_CHI_SQUARED -{ - Text [ en-US ] = "Chi Squared"; -}; -String STR_DISTRIBUTION_GEOMETRIC -{ - Text [ en-US ] = "Geometric"; -}; -String STR_RNG_PARAMETER_MINIMUM -{ - Text [ en-US ] = "Minimum"; -}; -String STR_RNG_PARAMETER_MAXIMUM -{ - Text [ en-US ] = "Maximum"; -}; -String STR_RNG_PARAMETER_MEAN -{ - Text [ en-US ] = "Mean"; -}; -String STR_RNG_PARAMETER_STANDARD_DEVIATION -{ - Text [ en-US ] = "Standard Deviation"; -}; -String STR_RNG_PARAMETER_STANDARD_MEDIAN -{ - Text [ en-US ] = "Median"; -}; -String STR_RNG_PARAMETER_STANDARD_SIGMA -{ - Text [ en-US ] = "Sigma"; -}; -String STR_RNG_PARAMETER_STANDARD_PROBABILITY -{ - Text [ en-US ] = "p Value"; -}; -String STR_RNG_PARAMETER_STANDARD_NUMBER_OF_TRIALS -{ - Text [ en-US ] = "Number of Trials"; -}; -String STR_RNG_PARAMETER_STANDARD_NU_VALUE -{ - Text [ en-US ] = "nu Value"; -}; - -/* SamplingDialog */ - -String STR_SAMPLING_UNDO_NAME -{ - Text [ en-US ] = "Sampling"; -}; - -/* Names of dialogs */ -String STR_FTEST -{ - Text [ en-US ] = "F-test"; -}; -String STR_FTEST_UNDO_NAME -{ - Text [ en-US ] = "F-test"; -}; -String STR_TTEST -{ - Text [ en-US ] = "t-test"; -}; -String STR_TTEST_UNDO_NAME -{ - Text [ en-US ] = "t-test"; -}; -String STR_ZTEST -{ - Text [ en-US ] = "z-test"; -}; -String STR_ZTEST_UNDO_NAME -{ - Text [ en-US ] = "z-test"; -}; -String STR_CHI_SQUARE_TEST -{ - Text [ en-US ] = "Test of Independence (Chi-Square)"; -}; -String STR_REGRESSION_UNDO_NAME -{ - Text [ en-US ] = "Regression"; -}; -String STR_REGRESSION -{ - Text [ en-US ] = "Regression"; -}; - -/* Common */ -String STR_COLUMN_LABEL_TEMPLATE -{ - Text [ en-US ] = "Column %NUMBER%"; -}; -String STR_ROW_LABEL_TEMPLATE -{ - Text [ en-US ] = "Row %NUMBER%"; -}; -String STR_LABEL_ALPHA -{ - Text [ en-US ] = "Alpha"; -}; -String STR_VARIABLE_1_LABEL -{ - Text [ en-US ] = "Variable 1"; -}; -String STR_VARIABLE_2_LABEL -{ - Text [ en-US ] = "Variable 2"; -}; -String STR_HYPOTHESIZED_MEAN_DIFFERENCE_LABEL -{ - Text [ en-US ] = "Hypothesized Mean Difference"; -}; -String STR_OBSERVATIONS_LABEL -{ - Text [ en-US ] = "Observations"; -}; -String STR_OBSERVED_MEAN_DIFFERENCE_LABEL -{ - Text [ en-US ] = "Observed Mean Difference"; -}; -String STR_DEGREES_OF_FREEDOM_LABEL -{ - Text [ en-US ] = "df"; -}; -String STR_P_VALUE_LABEL -{ - Text [ en-US ] = "P-value"; -}; -String STR_CRITICAL_VALUE_LABEL -{ - Text [ en-US ] = "Critical Value"; -}; -String STR_TEST_STATISTIC_LABEL -{ - Text [ en-US ] = "Test Statistic"; -}; - -/* RegressionDialog */ - -String STR_LABEL_LINEAR -{ - Text [ en-US ] = "Linear"; -}; -String STR_LABEL_LOGARITHMIC -{ - Text [ en-US ] = "Logarithmic"; -}; -String STR_LABEL_POWER -{ - Text [ en-US ] = "Power"; -}; - -String STR_LABEL_REGRESSION_MODEL -{ - Text [ en-US ] = "Regression Model"; -}; -String STR_LABEL_RSQUARED -{ - Text [ en-US ] = "R^2"; -}; -String STR_LABEL_SLOPE -{ - Text [ en-US ] = "Slope"; -}; -String STR_LABEL_INTERCEPT -{ - Text [ en-US ] = "Intercept"; -}; - -/*F Test */ -String STR_FTEST_P_RIGHT_TAIL -{ - Text [ en-US ] = "P (F<=f) right-tail"; -}; -String STR_FTEST_F_CRITICAL_RIGHT_TAIL -{ - Text [ en-US ] = "F Critical right-tail"; -}; -String STR_FTEST_P_LEFT_TAIL -{ - Text [ en-US ] = "P (F<=f) left-tail"; -}; -String STR_FTEST_F_CRITICAL_LEFT_TAIL -{ - Text [ en-US ] = "F Critical left-tail"; -}; -String STR_FTEST_P_TWO_TAIL -{ - Text [ en-US ] = "P two-tail"; -}; -String STR_FTEST_F_CRITICAL_TWO_TAIL -{ - Text [ en-US ] = "F Critical two-tail"; -}; - -/*t Test*/ -String STR_TTEST_PEARSON_CORRELATION -{ - Text [ en-US ] = "Pearson Correlation"; -}; -String STR_TTEST_VARIANCE_OF_THE_DIFFERENCES -{ - Text [ en-US ] = "Variance of the Differences"; -}; -String STR_TTEST_T_STAT -{ - Text [ en-US ] = "t Stat"; -}; -String STR_TTEST_P_ONE_TAIL -{ - Text [ en-US ] = "P (T<=t) one-tail"; -}; -String STR_TTEST_T_CRITICAL_ONE_TAIL -{ - Text [ en-US ] = "t Critical one-tail"; -}; -String STR_TTEST_P_TWO_TAIL -{ - Text [ en-US ] = "P (T<=t) two-tail"; -}; -String STR_TTEST_T_CRITICAL_TWO_TAIL -{ - Text [ en-US ] = "t Critical two-tail"; -}; - -/*Z Test*/ -String STR_ZTEST_Z_VALUE -{ - Text [ en-US ] = "z"; -}; -String STR_ZTEST_KNOWN_VARIANCE -{ - Text [ en-US ] = "Known Variance"; -}; -String STR_ZTEST_P_ONE_TAIL -{ - Text [ en-US ] = "P (Z<=z) one-tail"; -}; -String STR_ZTEST_Z_CRITICAL_ONE_TAIL -{ - Text [ en-US ] = "z Critical one-tail"; -}; -String STR_ZTEST_P_TWO_TAIL -{ - Text [ en-US ] = "P (Z<=z) two-tail"; -}; -String STR_ZTEST_Z_CRITICAL_TWO_TAIL -{ - Text [ en-US ] = "z Critical two-tail"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/StatisticsDialogs/TTestDialog.cxx b/sc/source/ui/StatisticsDialogs/TTestDialog.cxx index a94c82943dd6..46f3cd226170 100644 --- a/sc/source/ui/StatisticsDialogs/TTestDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/TTestDialog.cxx @@ -22,8 +22,8 @@ #include "reffact.hxx" #include "docfunc.hxx" #include "TableFillingAndNavigationTools.hxx" - #include "TTestDialog.hxx" +#include "strings.hrc" ScTTestDialog::ScTTestDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, @@ -43,7 +43,7 @@ bool ScTTestDialog::Close() return DoClose( ScTTestDialogWrapper::GetChildWindowId() ); } -sal_Int16 ScTTestDialog::GetUndoNameId() +const char* ScTTestDialog::GetUndoNameId() { return STR_TTEST_UNDO_NAME; } diff --git a/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx b/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx index b7a3f67ebd71..475a5f705f2a 100644 --- a/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx @@ -22,8 +22,8 @@ #include "reffact.hxx" #include "docfunc.hxx" #include "TableFillingAndNavigationTools.hxx" - #include "ZTestDialog.hxx" +#include "strings.hrc" ScZTestDialog::ScZTestDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, @@ -43,7 +43,7 @@ bool ScZTestDialog::Close() return DoClose( ScZTestDialogWrapper::GetChildWindowId() ); } -sal_Int16 ScZTestDialog::GetUndoNameId() +const char* ScZTestDialog::GetUndoNameId() { return STR_ZTEST_UNDO_NAME; } diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index d8ea6d85540b..9e491efe425e 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -2053,7 +2053,7 @@ bool ScInputHandler::StartTable( sal_Unicode cTyped, bool bFromCommand, bool bIn // whether it's part of an array or not or whether explicit cell // activation is requested (double-click or F2) or a click in input // line. - bool bShowError = (!bInputActivated || aTester.GetMessageId() != STR_PROTECTIONERR) && + bool bShowError = (!bInputActivated || !aTester.GetMessageId() || strcmp(aTester.GetMessageId(), STR_PROTECTIONERR) != 0) && !pActiveViewSh->GetViewData().GetDocShell()->IsReadOnly(); if (bShowError) { diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 96f0fb41da9f..2d9646a21150 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -47,7 +47,7 @@ #include "uiitems.hxx" #include "global.hxx" #include "scresid.hxx" -#include "scres.hrc" +#include "strings.hrc" #include "globstr.hrc" #include "bitmaps.hlst" #include "reffact.hxx" @@ -2008,37 +2008,36 @@ void ScPosWnd::Modify() // determine the action that would be taken for the current input ScNameInputType eType = lcl_GetInputType( GetText() ); // uses current view - sal_uInt16 nStrId = 0; + const char* pStrId = nullptr; switch ( eType ) { case SC_NAME_INPUT_CELL: - nStrId = STR_NAME_INPUT_CELL; + pStrId = STR_NAME_INPUT_CELL; break; case SC_NAME_INPUT_RANGE: case SC_NAME_INPUT_NAMEDRANGE: - nStrId = STR_NAME_INPUT_RANGE; // named range or range reference + pStrId = STR_NAME_INPUT_RANGE; // named range or range reference break; case SC_NAME_INPUT_DATABASE: - nStrId = STR_NAME_INPUT_DBRANGE; + pStrId = STR_NAME_INPUT_DBRANGE; break; case SC_NAME_INPUT_ROW: - nStrId = STR_NAME_INPUT_ROW; + pStrId = STR_NAME_INPUT_ROW; break; case SC_NAME_INPUT_SHEET: - nStrId = STR_NAME_INPUT_SHEET; + pStrId = STR_NAME_INPUT_SHEET; break; case SC_NAME_INPUT_DEFINE: - nStrId = STR_NAME_INPUT_DEFINE; + pStrId = STR_NAME_INPUT_DEFINE; break; default: // other cases (error): no tip help break; } - if ( nStrId ) + if (pStrId) { // show the help tip at the text cursor position - vcl::Window* pWin = GetSubEdit(); if (!pWin) pWin = this; @@ -2049,7 +2048,7 @@ void ScPosWnd::Modify() aPos = pWin->OutputToScreenPixel( aPos ); tools::Rectangle aRect( aPos, aPos ); - OUString aText = ScGlobal::GetRscString( nStrId ); + OUString aText = ScGlobal::GetRscString(pStrId); QuickHelpFlags const nAlign = QuickHelpFlags::Left|QuickHelpFlags::Bottom; nTipVisible = Help::ShowPopover(pWin, aRect, aText, nAlign); } @@ -2107,8 +2106,8 @@ void ScPosWnd::DoEnter() ScNameInputType eType = lcl_GetInputType( aText ); if ( eType == SC_NAME_INPUT_BAD_NAME || eType == SC_NAME_INPUT_BAD_SELECTION ) { - sal_uInt16 nId = ( eType == SC_NAME_INPUT_BAD_NAME ) ? STR_NAME_ERROR_NAME : STR_NAME_ERROR_SELECTION; - pViewSh->ErrorMessage( nId ); + const char* pId = (eType == SC_NAME_INPUT_BAD_NAME) ? STR_NAME_ERROR_NAME : STR_NAME_ERROR_SELECTION; + pViewSh->ErrorMessage(pId); } else if ( eType == SC_NAME_INPUT_DEFINE ) { diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index 0d062b10a1be..8dc2efb70498 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -38,6 +38,7 @@ #include #include +#include #include #include "scitems.hxx" @@ -107,9 +108,9 @@ #include #include "scabstdlg.hxx" -OUString ScResId(sal_uInt16 nId) +OUString ScResId(const char* pId) { - return ResId(nId, *SC_MOD()->GetResMgr()); + return Translate::get(pId, SC_MOD()->GetResLocale()); } void ScDLL::Init() diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index e14cf65c7cf7..f2b78808cc35 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -50,6 +50,7 @@ #include #include +#include #include #include #include @@ -61,6 +62,7 @@ #include #include #include +#include #include #include @@ -86,8 +88,11 @@ #include "docsh.hxx" #include "drwlayer.hxx" #include "uiitems.hxx" +#include "sc.hrc" +#include "scerrors.hrc" +#include "scstyles.hrc" #include "globstr.hrc" -#include "scres.hrc" +#include "strings.hrc" #include "bitmaps.hlst" #include "cfgids.hxx" #include "inputhdl.hxx" @@ -134,7 +139,7 @@ void ScModule::InitInterface_Impl() } ScModule::ScModule( SfxObjectFactory* pFact ) : - SfxModule( ResMgr::CreateResMgr( "sc" ), {pFact} ), + SfxModule( Translate::Create("sc", Application::GetSettings().GetUILanguageTag()), {pFact} ), aIdleTimer("sc ScModule IdleTimer"), aSpellIdle("sc ScModule SpellIdle"), mpDragData(new ScDragData), @@ -175,10 +180,10 @@ ScModule::ScModule( SfxObjectFactory* pFact ) : // Create ErrorHandler - was in Init() // Between OfficeApplication::Init and ScGlobal::Init SvxErrorHandler::ensure(); - pErrorHdl = new SfxErrorHandler( RID_ERRHDLSC, - ErrCode(ERRCODE_AREA_SC), - ErrCode(ERRCODE_AREA_APP2-1), - GetResMgr() ); + pErrorHdl = new SfxErrorHandler(RID_ERRHDLSC, + ErrCode(ERRCODE_AREA_SC), + ErrCode(ERRCODE_AREA_APP2-1), + &GetResLocale()); aSpellIdle.SetInvokeHandler( LINK( this, ScModule, SpellTimerHdl ) ); aSpellIdle.SetDebugName( "sc::ScModule aSpellIdle" ); @@ -2275,12 +2280,12 @@ SfxStyleFamilies* ScModule::CreateStyleFamilies() pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Para, ScGlobal::GetRscString(STR_STYLE_FAMILY_CELL), Image(BitmapEx(BMP_STYLES_FAMILY_CELL)), - ResId(RID_CELLSTYLEFAMILY, *SC_MOD()->GetResMgr()))); + RID_CELLSTYLEFAMILY, SC_MOD()->GetResLocale())); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Page, ScGlobal::GetRscString(STR_STYLE_FAMILY_PAGE), Image(BitmapEx(BMP_STYLES_FAMILY_PAGE)), - ResId(RID_PAGESTYLEFAMILY, *SC_MOD()->GetResMgr()))); + RID_PAGESTYLEFAMILY, SC_MOD()->GetResLocale())); return pStyleFamilies; } diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index 74f9bb1aeb38..302e6d0ccbc0 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -72,6 +72,8 @@ #include "condformatmgr.hxx" #include "xmlsourcedlg.hxx" #include "editutil.hxx" +#include "scres.hrc" +#include IMPL_ABSTDLG_BASE(AbstractScImportAsciiDlg_Impl); IMPL_ABSTDLG_BASE(AbstractScAutoFormatDlg_Impl); diff --git a/sc/source/ui/attrdlg/scuiexp.cxx b/sc/source/ui/attrdlg/scuiexp.cxx index b1e49d5a8cf8..137a07fb8791 100644 --- a/sc/source/ui/attrdlg/scuiexp.cxx +++ b/sc/source/ui/attrdlg/scuiexp.cxx @@ -59,8 +59,6 @@ namespace scui { if ( !pFactory ) pFactory = new ScAbstractDialogFactory_Impl; - //if ( !pSwResMgr) - // ScDialogsResMgr::GetResMgr(); return pFactory; } } diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index b52ff6bf86b8..9a04bad76bc1 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -20,7 +20,7 @@ #include "checklistmenu.hxx" #include "globstr.hrc" #include "scresid.hxx" -#include "scres.hrc" +#include "strings.hrc" #include "bitmaps.hlst" #include diff --git a/sc/source/ui/cctrl/checklistmenu.src b/sc/source/ui/cctrl/checklistmenu.src deleted file mode 100644 index 41c4c8618c40..000000000000 --- a/sc/source/ui/cctrl/checklistmenu.src +++ /dev/null @@ -1,57 +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 "scres.hrc" - -String STR_MENU_SORT_ASC -{ - Text [ en-US ] = "Sort Ascending" ; -}; - -String STR_MENU_SORT_DESC -{ - Text [ en-US ] = "Sort Descending" ; -}; - -String STR_MENU_SORT_CUSTOM -{ - Text [ en-US ] = "Custom Sort" ; -}; - -String STR_BTN_TOGGLE_ALL -{ - Text [ en-US ] = "All" ; -}; - -String STR_BTN_SELECT_CURRENT -{ - Text [ en-US ] = "Show only the current item." ; -}; - -String STR_BTN_UNSELECT_CURRENT -{ - Text [ en-US ] = "Hide only the current item." ; -}; - -String STR_EDIT_SEARCH_ITEMS -{ - Text [ en-US ] = "Search items..." ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 9369c617812b..8d01f93716c4 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -34,7 +34,7 @@ #include "colorformat.hxx" #include "globstr.hrc" -#include "scres.hrc" +#include "strings.hrc" #include diff --git a/sc/source/ui/condformat/condformathelper.cxx b/sc/source/ui/condformat/condformathelper.cxx index 0935b05648ff..c96cfdcd9656 100644 --- a/sc/source/ui/condformat/condformathelper.cxx +++ b/sc/source/ui/condformat/condformathelper.cxx @@ -98,10 +98,25 @@ OUString getExpression(sal_Int32 nIndex) OUString getDateString(sal_Int32 nIndex) { - sal_Int32 nStringIndex = STR_COND_TODAY + nIndex; - if(nStringIndex <= STR_COND_NEXTYEAR) - return ScGlobal::GetRscString(nStringIndex); + const char* aCondStrs[] = + { + STR_COND_TODAY, + STR_COND_YESTERDAY, + STR_COND_TOMORROW, + STR_COND_LAST7DAYS, + STR_COND_THISWEEK, + STR_COND_LASTWEEK, + STR_COND_NEXTWEEK, + STR_COND_THISMONTH, + STR_COND_LASTMONTH, + STR_COND_NEXTMONTH, + STR_COND_THISYEAR, + STR_COND_LASTYEAR, + STR_COND_NEXTYEAR + }; + if (nIndex >= 0 && static_cast(nIndex) < SAL_N_ELEMENTS(aCondStrs)) + return ScGlobal::GetRscString(aCondStrs[nIndex]); assert(false); return OUString(); } diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx index 59dc0e18723d..7d8ea4e3563e 100644 --- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx +++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx @@ -465,7 +465,7 @@ void ScPivotLayoutDialog::UpdateSourceRange() return; aSourceSheet.SetSourceRange(aSourceRange); - if (aSourceSheet.CheckSourceRange() != 0) + if (aSourceSheet.CheckSourceRange() != nullptr) { mpSourceEdit->SetRefValid(false); return; diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx index ab9139692b9f..9a15b12bdb30 100644 --- a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx +++ b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx @@ -28,27 +28,27 @@ namespace OUString lclGetFunctionMaskName(const PivotFunc nFunctionMask) { - sal_uInt16 nStrId = 0; + const char* pStrId = nullptr; switch (nFunctionMask) { - case PivotFunc::Sum: nStrId = STR_FUN_TEXT_SUM; break; - case PivotFunc::Count: nStrId = STR_FUN_TEXT_COUNT; break; - case PivotFunc::Average: nStrId = STR_FUN_TEXT_AVG; break; - case PivotFunc::Median: nStrId = STR_FUN_TEXT_MEDIAN; break; - case PivotFunc::Max: nStrId = STR_FUN_TEXT_MAX; break; - case PivotFunc::Min: nStrId = STR_FUN_TEXT_MIN; break; - case PivotFunc::Product: nStrId = STR_FUN_TEXT_PRODUCT; break; - case PivotFunc::CountNum: nStrId = STR_FUN_TEXT_COUNT; break; - case PivotFunc::StdDev: nStrId = STR_FUN_TEXT_STDDEV; break; - case PivotFunc::StdDevP: nStrId = STR_FUN_TEXT_STDDEV; break; - case PivotFunc::StdVar: nStrId = STR_FUN_TEXT_VAR; break; - case PivotFunc::StdVarP: nStrId = STR_FUN_TEXT_VAR; break; + case PivotFunc::Sum: pStrId = STR_FUN_TEXT_SUM; break; + case PivotFunc::Count: pStrId = STR_FUN_TEXT_COUNT; break; + case PivotFunc::Average: pStrId = STR_FUN_TEXT_AVG; break; + case PivotFunc::Median: pStrId = STR_FUN_TEXT_MEDIAN; break; + case PivotFunc::Max: pStrId = STR_FUN_TEXT_MAX; break; + case PivotFunc::Min: pStrId = STR_FUN_TEXT_MIN; break; + case PivotFunc::Product: pStrId = STR_FUN_TEXT_PRODUCT; break; + case PivotFunc::CountNum: pStrId = STR_FUN_TEXT_COUNT; break; + case PivotFunc::StdDev: pStrId = STR_FUN_TEXT_STDDEV; break; + case PivotFunc::StdDevP: pStrId = STR_FUN_TEXT_STDDEV; break; + case PivotFunc::StdVar: pStrId = STR_FUN_TEXT_VAR; break; + case PivotFunc::StdVarP: pStrId = STR_FUN_TEXT_VAR; break; default: assert(false); break; } - if (nStrId != 0) - return ScGlobal::GetRscString(nStrId); + if (pStrId) + return ScGlobal::GetRscString(pStrId); else return OUString(); } diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx index b104af3b7979..67afc817eb69 100644 --- a/sc/source/ui/dbgui/asciiopt.cxx +++ b/sc/source/ui/dbgui/asciiopt.cxx @@ -19,7 +19,6 @@ #include "global.hxx" #include "asciiopt.hxx" -#include "asciiopt.hrc" #include #include diff --git a/sc/source/ui/dbgui/asciiopt.hrc b/sc/source/ui/dbgui/asciiopt.hrc deleted file mode 100644 index 91eb70e3ae33..000000000000 --- a/sc/source/ui/dbgui/asciiopt.hrc +++ /dev/null @@ -1,24 +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 "scres.hrc" - -#define BTN_OK 1 -#define BTN_CANCEL 2 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx index e45c2cb31b63..a175220c62ea 100644 --- a/sc/source/ui/dbgui/consdlg.cxx +++ b/sc/source/ui/dbgui/consdlg.cxx @@ -29,7 +29,7 @@ #include "scresid.hxx" #include "globstr.hrc" -#include "scres.hrc" +#include "strings.hrc" #include "consdlg.hxx" #include diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx index 725311e816d4..e29cf9360f83 100644 --- a/sc/source/ui/dbgui/dpgroupdlg.cxx +++ b/sc/source/ui/dbgui/dpgroupdlg.cxx @@ -42,7 +42,7 @@ static const sal_Int32 spnDateParts[] = css::sheet::DataPilotFieldGroupBy::YEARS }; -static const sal_uInt16 nDatePartResIds[] = +static const char* aDatePartResIds[] = { STR_DPFIELD_GROUP_BY_SECONDS, STR_DPFIELD_GROUP_BY_MINUTES, @@ -227,9 +227,9 @@ ScDPDateGroupDlg::ScDPDateGroupDlg( vcl::Window* pParent, maStartHelper ( mpRbAutoStart, mpRbManStart, mpEdStart, rNullDate ), maEndHelper ( mpRbAutoEnd, mpRbManEnd, mpEdEnd, rNullDate ) { - static const size_t nCount = SAL_N_ELEMENTS( nDatePartResIds ); - for(sal_uInt16 nDatePartResId : nDatePartResIds) - mpLbUnits->InsertEntry( ScGlobal::GetRscString( nDatePartResId ) ); + static const size_t nCount = SAL_N_ELEMENTS(aDatePartResIds); + for (const char* pDatePartResId : aDatePartResIds) + mpLbUnits->InsertEntry(ScGlobal::GetRscString(pDatePartResId)); mpEdStart->SetShowDateCentury( true ); mpEdEnd->SetShowDateCentury( true ); diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index 12fbf3d4964e..1570e05dffcf 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -33,6 +33,7 @@ #include "foptmgr.hxx" #include "globstr.hrc" +#include "strings.hrc" #include "filtdlg.hxx" #include diff --git a/sc/source/ui/dbgui/outline.src b/sc/source/ui/dbgui/outline.src deleted file mode 100644 index 9c274a048016..000000000000 --- a/sc/source/ui/dbgui/outline.src +++ /dev/null @@ -1,25 +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 "scres.hrc" - -// Image list here, so that there is no interruption during assembly -// of the "real" image list in ui.src - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index c8087c3e90f0..aab52b766df9 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -31,7 +31,8 @@ #include "queryentry.hxx" #include "typedstrdata.hxx" -#include "scres.hrc" +#include "sc.hrc" +#include "strings.hrc" #include "globstr.hrc" #include "pfiltdlg.hxx" diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx index 7a956c22a602..d0e68d7eb950 100644 --- a/sc/source/ui/dbgui/pvfundlg.cxx +++ b/sc/source/ui/dbgui/pvfundlg.cxx @@ -27,14 +27,14 @@ #include #include -#include #include #include #include "scresid.hxx" #include "dpobject.hxx" #include "dpsave.hxx" -#include "scres.hrc" +#include "pvfundlg.hrc" +#include "strings.hrc" #include "scmod.hxx" #include "globstr.hrc" #include "dputil.hxx" @@ -181,9 +181,8 @@ void ScDPFunctionListBox::FillFunctionNames() { OSL_ENSURE( !GetEntryCount(), "ScDPMultiFuncListBox::FillFunctionNames - do not add texts to resource" ); Clear(); - ResStringArray aArr(ResId(SCSTR_DPFUNCLISTBOX, *SC_MOD()->GetResMgr())); - for( sal_uInt16 nIndex = 0, nCount = sal::static_int_cast(aArr.Count()); nIndex < nCount; ++nIndex ) - InsertEntry( aArr.GetString( nIndex ) ); + for (size_t nIndex = 0; nIndex < SAL_N_ELEMENTS(SCSTR_DPFUNCLISTBOX); ++nIndex) + InsertEntry(ScResId(SCSTR_DPFUNCLISTBOX[nIndex])); assert(GetEntryCount() == SAL_N_ELEMENTS(spnFunctions)); } diff --git a/sc/source/ui/dbgui/pvfundlg.hrc b/sc/source/ui/dbgui/pvfundlg.hrc deleted file mode 100644 index c922eddd4d7f..000000000000 --- a/sc/source/ui/dbgui/pvfundlg.hrc +++ /dev/null @@ -1,26 +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 "sc.hrc" - -#define BTN_OK 1 -#define BTN_CANCEL 2 - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/pvfundlg.src b/sc/source/ui/dbgui/pvfundlg.src deleted file mode 100644 index c7cba3b428d7..000000000000 --- a/sc/source/ui/dbgui/pvfundlg.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 "scres.hrc" - -StringArray SCSTR_DPFUNCLISTBOX -{ - ItemList [ en-US ] = - { - < "Sum" ; Default ; > ; - < "Count" ; Default ; > ; - < "Average" ; Default ; > ; - < "Median" ; Default ; > ; - < "Max" ; Default ; > ; - < "Min" ; Default ; > ; - < "Product" ; Default ; > ; - < "Count (Numbers only)" ; Default ; > ; - < "StDev (Sample)" ; Default ; > ; - < "StDevP (Population)" ; Default ; > ; - < "Var (Sample)" ; Default ; > ; - < "VarP (Population)" ; Default ; > ; - }; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index 4ab94073c79e..15a7088e238a 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -31,7 +31,7 @@ #include "scresid.hxx" #include "impex.hxx" #include "scuiasciiopt.hxx" -#include "asciiopt.hrc" +#include "strings.hrc" #include "strings.hxx" #include "csvtablebox.hxx" #include diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx index cb45ed52b803..13f002294af9 100644 --- a/sc/source/ui/dbgui/scuiimoptdlg.cxx +++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx @@ -22,7 +22,7 @@ #include "scuiimoptdlg.hxx" #include "tabvwsh.hxx" #include "scresid.hxx" -#include "scres.hrc" +#include "strings.hrc" #include "strings.hxx" #include #include diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index 59a7caceb59c..a9bbf8b00443 100644 --- a/sc/source/ui/dbgui/sfiltdlg.cxx +++ b/sc/source/ui/dbgui/sfiltdlg.cxx @@ -32,6 +32,7 @@ #include "foptmgr.hxx" #include "globstr.hrc" +#include "strings.hrc" #include "filtdlg.hxx" #include diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index 3ee1093e18a3..9ae6c8ecae24 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -36,7 +36,8 @@ #include "userlist.hxx" #include "rangeutl.hxx" #include "scresid.hxx" -#include "scres.hrc" +#include "sc.hrc" +#include "strings.hrc" #include "globstr.hrc" #include "sortkeydlg.hxx" diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index 43f574740e78..70199ffcc796 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -26,7 +26,8 @@ #include "viewdata.hxx" #include "document.hxx" #include "scresid.hxx" -#include "scres.hrc" +#include "sc.hrc" +#include "strings.hrc" #include "subtdlg.hxx" #include "tpsubt.hxx" diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 6d04a06745f6..fb5bf5954e50 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -34,7 +34,7 @@ #include #include "scresid.hxx" -#include "scres.hrc" +#include "strings.hrc" #include "stringutil.hxx" #include "validat.hxx" diff --git a/sc/source/ui/dialogs/searchresults.cxx b/sc/source/ui/dialogs/searchresults.cxx index d0f343035a72..6d49a01661d3 100644 --- a/sc/source/ui/dialogs/searchresults.cxx +++ b/sc/source/ui/dialogs/searchresults.cxx @@ -17,7 +17,8 @@ #include "document.hxx" #include "rangeutl.hxx" #include "tabvwsh.hxx" -#include +#include +#include "sc.hrc" #include "scresid.hxx" namespace sc { diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index 5f1eb7acde8a..72dbe61b9e57 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -1587,8 +1587,8 @@ void ScDBDocFunc::RefreshPivotTables(ScDPObject* pDPObj, bool bApi) return; std::set aRefs; - sal_uLong nErrId = pDPs->ReloadCache(pDPObj, aRefs); - if (nErrId) + const char* pErrId = pDPs->ReloadCache(pDPObj, aRefs); + if (pErrId) return; std::set::iterator it = aRefs.begin(), itEnd = aRefs.end(); diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index 3c928301af6b..60c379ed0174 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -142,7 +142,7 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, bool bSuccess = false; bool bApi = false; //! pass as argument bool bTruncated = false; // for warning - sal_uInt16 nErrStringId = 0; + const char* pErrStringId = nullptr; OUString aErrorMessage; SCCOL nCol = rParam.nCol1; @@ -402,7 +402,7 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, aTester.TestBlock( &rDoc, nTab, rParam.nCol1,rParam.nRow1,nEndCol,nEndRow ); if ( !aTester.IsEditable() ) { - nErrStringId = aTester.GetMessageId(); + pErrStringId = aTester.GetMessageId(); bSuccess = false; } else if ( (pChangeTrack = rDoc.GetChangeTrack()) != nullptr ) @@ -418,7 +418,7 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, nEndCol+nFormulaCols, nEndRow, nTab ); if (!rDoc.CanFitBlock( aOld, aNew )) { - nErrStringId = STR_MSSG_DOSUBTOTALS_2; // can't insert cells + pErrStringId = STR_MSSG_DOSUBTOTALS_2; // can't insert cells bSuccess = false; } } @@ -612,9 +612,9 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, if (aErrorMessage.isEmpty()) { - if (!nErrStringId) - nErrStringId = STR_MSSG_IMPORTDATA_0; - aErrorMessage = ScGlobal::GetRscString( nErrStringId ); + if (!pErrStringId) + pErrStringId = STR_MSSG_IMPORTDATA_0; + aErrorMessage = ScGlobal::GetRscString(pErrStringId); } ScopedVclPtrInstance< InfoBox > aInfoBox( ScDocShell::GetActiveDialogParent(), aErrorMessage ); aInfoBox->Execute(); diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index e7f6af5cee32..0a170c4b96e5 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -37,7 +37,8 @@ #include "docfunc.hxx" -#include "scres.hrc" +#include "sc.hrc" +#include "strings.hrc" #include "arealink.hxx" #include "attrib.hxx" @@ -5580,9 +5581,9 @@ void ScDocFunc::ConvertFormulaToValue( const ScRange& rRange, bool bInteraction aModificator.SetDocumentModified(); } -void ScDocFunc::EnterListAction( sal_uInt16 nNameResId ) +void ScDocFunc::EnterListAction(const char* pNameResId) { - OUString aUndo( ScGlobal::GetRscString( nNameResId ) ); + OUString aUndo(ScGlobal::GetRscString(pNameResId)); ViewShellId nViewShellId(-1); if (ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell()) nViewShellId = pViewSh->GetViewShellId(); diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index adb16f10827d..3242b15b0a0d 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -68,6 +68,7 @@ #include "scabstdlg.hxx" #include +#include #include "formulacell.hxx" #include "postit.hxx" @@ -79,7 +80,7 @@ #include "imoptdlg.hxx" #include "impex.hxx" #include "scresid.hxx" -#include "scres.hrc" +#include "strings.hrc" #include "globstr.hrc" #include "scerrors.hxx" #include "brdcst.hxx" diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 6233fa671711..030b7b476104 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -63,6 +63,7 @@ using namespace ::com::sun::star; #include "docshimp.hxx" #include "docfunc.hxx" #include "scres.hrc" +#include "strings.hrc" #include "stlsheet.hxx" #include "stlpool.hxx" #include "appoptio.hxx" diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index c3ed10e48c14..90fbe83b80d5 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -66,7 +66,7 @@ using ::std::vector; // former viewfunc/dbfunc methods -void ScDocShell::ErrorMessage( sal_uInt16 nGlobStrId ) +void ScDocShell::ErrorMessage(const char* pGlobStrId) { //! StopMarking at the (active) view? @@ -74,15 +74,15 @@ void ScDocShell::ErrorMessage( sal_uInt16 nGlobStrId ) ScWaitCursorOff aWaitOff( pParent ); bool bFocus = pParent && pParent->HasFocus(); - if(nGlobStrId==STR_PROTECTIONERR) + if (pGlobStrId && strcmp(pGlobStrId, STR_PROTECTIONERR) == 0) { - if(IsReadOnly()) + if (IsReadOnly()) { - nGlobStrId=STR_READONLYERR; + pGlobStrId = STR_READONLYERR; } } - ScopedVclPtrInstance< InfoBox > aBox( pParent, ScGlobal::GetRscString( nGlobStrId ) ); + ScopedVclPtrInstance< InfoBox > aBox( pParent, ScGlobal::GetRscString(pGlobStrId)); aBox->Execute(); if (bFocus) pParent->GrabFocus(); diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index 2f5b104ee18c..47b58ab1c08f 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -1081,8 +1081,8 @@ ErrCode ScDocShell::DBaseExport( const OUString& rFullFileName, rtl_TextEncoding else bTest = true; } - OUString sPosition( ScAddress( nDocCol, nDocRow, nTab).GetColRowString()); - OUString sEncoding( SvxTextEncodingTable().GetTextString( eCharSet)); + OUString sPosition(ScAddress(nDocCol, nDocRow, nTab).GetColRowString()); + OUString sEncoding(SvxTextEncodingTable::GetTextString(eCharSet)); nErr = *new TwoStringErrorInfo( (bEncErr ? SCERR_EXPORT_ENCODING : SCERR_EXPORT_FIELDWIDTH), sPosition, sEncoding, DialogMask::ButtonsOk | DialogMask::MessageError); diff --git a/sc/source/ui/docshell/documentlinkmgr.cxx b/sc/source/ui/docshell/documentlinkmgr.cxx index e1418d1d3422..c8ba3a48b6d4 100644 --- a/sc/source/ui/docshell/documentlinkmgr.cxx +++ b/sc/source/ui/docshell/documentlinkmgr.cxx @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include diff --git a/sc/source/ui/docshell/editable.cxx b/sc/source/ui/docshell/editable.cxx index 2a06c82dc322..feb34d0b41bf 100644 --- a/sc/source/ui/docshell/editable.cxx +++ b/sc/source/ui/docshell/editable.cxx @@ -146,10 +146,10 @@ void ScEditableTester::TestBlockForAction( } } -sal_uInt16 ScEditableTester::GetMessageId() const +const char* ScEditableTester::GetMessageId() const { if (mbIsEditable) - return 0; + return nullptr; else if (mbOnlyMatrix) return STR_MATRIXFRAGMENTERR; else diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx index 670d713774b7..05c8288a8fa2 100644 --- a/sc/source/ui/drawfunc/drawsh.cxx +++ b/sc/source/ui/drawfunc/drawsh.cxx @@ -19,6 +19,7 @@ #include #include +#include "sc.hrc" #include "scitems.hxx" @@ -36,7 +37,7 @@ #include "drawsh.hxx" #include "drwlayer.hxx" -#include "scres.hrc" +#include "strings.hrc" #include "viewdata.hxx" #include "document.hxx" #include "docpool.hxx" diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx index 3e0742bc5c6f..9646401a3dc9 100644 --- a/sc/source/ui/drawfunc/fuconrec.cxx +++ b/sc/source/ui/drawfunc/fuconrec.cxx @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -57,14 +58,14 @@ FuConstRectangle::~FuConstRectangle() namespace { -::basegfx::B2DPolyPolygon getPolygon( sal_uInt16 nResId, SdrModel* pDoc ) +::basegfx::B2DPolyPolygon getPolygon(const char* pResId, SdrModel* pDoc) { ::basegfx::B2DPolyPolygon aRetval; XLineEndListRef pLineEndList = pDoc->GetLineEndList(); if( pLineEndList.is() ) { - OUString aArrowName( SvxResId(nResId) ); + OUString aArrowName( SvxResId(pResId) ); long nCount = pLineEndList->Count(); long nIndex; for( nIndex = 0L; nIndex < nCount; nIndex++ ) diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx index ba26384d9f55..71474a37b6e1 100644 --- a/sc/source/ui/drawfunc/fuins1.cxx +++ b/sc/source/ui/drawfunc/fuins1.cxx @@ -38,7 +38,7 @@ #include "document.hxx" #include "scresid.hxx" #include "progress.hxx" -#include "scres.hrc" +#include "strings.hrc" #include "globstr.hrc" using namespace ::com::sun::star; diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx index f0cd3b57da20..22af1f211fde 100644 --- a/sc/source/ui/drawfunc/graphsh.cxx +++ b/sc/source/ui/drawfunc/graphsh.cxx @@ -32,7 +32,7 @@ #include #include "graphsh.hxx" -#include "scres.hrc" +#include "strings.hrc" #include "viewdata.hxx" #include "drawview.hxx" #include "scresid.hxx" diff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxx index 1d15b8cb720f..aabc12dea701 100644 --- a/sc/source/ui/drawfunc/mediash.cxx +++ b/sc/source/ui/drawfunc/mediash.cxx @@ -28,7 +28,7 @@ #include #include "mediash.hxx" -#include "scres.hrc" +#include "strings.hrc" #include "viewdata.hxx" #include "drawview.hxx" #include "scresid.hxx" diff --git a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx index 49b1efab696c..b29bbeb891c0 100644 --- a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx +++ b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx @@ -61,7 +61,7 @@ public: virtual bool Close() override; protected: - virtual sal_Int16 GetUndoNameId() override; + virtual const char* GetUndoNameId() override; virtual ScRange ApplyOutput(ScDocShell* pDocShell) override; }; diff --git a/sc/source/ui/inc/ChiSquareTestDialog.hxx b/sc/source/ui/inc/ChiSquareTestDialog.hxx index eb5ca54c4520..849914d57f6e 100644 --- a/sc/source/ui/inc/ChiSquareTestDialog.hxx +++ b/sc/source/ui/inc/ChiSquareTestDialog.hxx @@ -25,7 +25,7 @@ public: virtual bool Close() override; protected: - virtual sal_Int16 GetUndoNameId() override; + virtual const char* GetUndoNameId() override; virtual ScRange ApplyOutput(ScDocShell* pDocShell) override; }; diff --git a/sc/source/ui/inc/CovarianceDialog.hxx b/sc/source/ui/inc/CovarianceDialog.hxx index e127be99fc2e..3bd5a9e2657b 100644 --- a/sc/source/ui/inc/CovarianceDialog.hxx +++ b/sc/source/ui/inc/CovarianceDialog.hxx @@ -25,7 +25,7 @@ public: protected: virtual const OUString getLabel() override; virtual const OUString getTemplate() override; - virtual sal_Int16 GetUndoNameId() override; + virtual const char* GetUndoNameId() override; }; #endif diff --git a/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx b/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx index be891a6c013c..bbdc727b06e4 100644 --- a/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx +++ b/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx @@ -25,7 +25,7 @@ public: virtual bool Close() override; protected: - virtual sal_Int16 GetUndoNameId() override; + virtual const char* GetUndoNameId() override; virtual ScRange ApplyOutput(ScDocShell* pDocShell) override; }; diff --git a/sc/source/ui/inc/ExponentialSmoothingDialog.hxx b/sc/source/ui/inc/ExponentialSmoothingDialog.hxx index 0162b0cd577d..1393c09b215f 100644 --- a/sc/source/ui/inc/ExponentialSmoothingDialog.hxx +++ b/sc/source/ui/inc/ExponentialSmoothingDialog.hxx @@ -37,7 +37,7 @@ public: virtual bool Close() override; protected: - virtual sal_Int16 GetUndoNameId() override; + virtual const char* GetUndoNameId() override; virtual ScRange ApplyOutput(ScDocShell* pDocShell) override; }; diff --git a/sc/source/ui/inc/FTestDialog.hxx b/sc/source/ui/inc/FTestDialog.hxx index d4ef1cfd5541..04c7f40e2d89 100644 --- a/sc/source/ui/inc/FTestDialog.hxx +++ b/sc/source/ui/inc/FTestDialog.hxx @@ -25,7 +25,7 @@ public: virtual bool Close() override; protected: - virtual sal_Int16 GetUndoNameId() override; + virtual const char* GetUndoNameId() override; virtual ScRange ApplyOutput(ScDocShell* pDocShell) override; }; diff --git a/sc/source/ui/inc/MatrixComparisonGenerator.hxx b/sc/source/ui/inc/MatrixComparisonGenerator.hxx index 3745357fa26b..3fb40c43f913 100644 --- a/sc/source/ui/inc/MatrixComparisonGenerator.hxx +++ b/sc/source/ui/inc/MatrixComparisonGenerator.hxx @@ -32,7 +32,7 @@ public: virtual ~ScMatrixComparisonGenerator() override; protected: - virtual sal_Int16 GetUndoNameId() override; + virtual const char* GetUndoNameId() override; virtual ScRange ApplyOutput(ScDocShell* pDocShell) override; virtual const OUString getLabel() = 0; diff --git a/sc/source/ui/inc/MovingAverageDialog.hxx b/sc/source/ui/inc/MovingAverageDialog.hxx index c1f15ea7fea5..a6b62243f798 100644 --- a/sc/source/ui/inc/MovingAverageDialog.hxx +++ b/sc/source/ui/inc/MovingAverageDialog.hxx @@ -37,7 +37,7 @@ public: virtual bool Close() override; protected: - virtual sal_Int16 GetUndoNameId() override; + virtual const char* GetUndoNameId() override; virtual ScRange ApplyOutput(ScDocShell* pDocShell) override; }; diff --git a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx index 87821f4e6341..82967424215a 100644 --- a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx +++ b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx @@ -66,7 +66,7 @@ private: template - void GenerateNumbers(RNG& randomGenerator, const sal_Int16 aDistributionStringId, const boost::optional aDecimalPlaces); + void GenerateNumbers(RNG& randomGenerator, const char* pDistributionStringId, const boost::optional aDecimalPlaces); void SelectGeneratorAndGenerateNumbers(); diff --git a/sc/source/ui/inc/RegressionDialog.hxx b/sc/source/ui/inc/RegressionDialog.hxx index 8b6d114024bd..254562e93dbc 100644 --- a/sc/source/ui/inc/RegressionDialog.hxx +++ b/sc/source/ui/inc/RegressionDialog.hxx @@ -30,7 +30,7 @@ public: protected: void dispose() override; - virtual sal_Int16 GetUndoNameId() override; + virtual const char* GetUndoNameId() override; virtual ScRange ApplyOutput(ScDocShell* pDocShell) override; }; diff --git a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx index 8a55f5dd9857..a551ed320600 100644 --- a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx +++ b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx @@ -42,7 +42,7 @@ protected: void CalculateInputAndWriteToOutput(); virtual ScRange ApplyOutput(ScDocShell* pDocShell) = 0; - virtual sal_Int16 GetUndoNameId() = 0; + virtual const char* GetUndoNameId() = 0; // Widgets VclPtr mpInputRangeLabel; diff --git a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx index ac15249d25c5..ba20289fcfcf 100644 --- a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx +++ b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx @@ -42,7 +42,7 @@ protected: void CalculateInputAndWriteToOutput(); virtual ScRange ApplyOutput(ScDocShell* pDocShell) = 0; - virtual sal_Int16 GetUndoNameId() = 0; + virtual const char* GetUndoNameId() = 0; // Widgets VclPtr mpVariable1RangeLabel; diff --git a/sc/source/ui/inc/TTestDialog.hxx b/sc/source/ui/inc/TTestDialog.hxx index 3d08b94f0214..6c068a87a0e8 100644 --- a/sc/source/ui/inc/TTestDialog.hxx +++ b/sc/source/ui/inc/TTestDialog.hxx @@ -25,7 +25,7 @@ public: virtual bool Close() override; protected: - virtual sal_Int16 GetUndoNameId() override; + virtual const char* GetUndoNameId() override; virtual ScRange ApplyOutput(ScDocShell* pDocShell) override; }; diff --git a/sc/source/ui/inc/ZTestDialog.hxx b/sc/source/ui/inc/ZTestDialog.hxx index 84281a652083..6fd8496c814b 100644 --- a/sc/source/ui/inc/ZTestDialog.hxx +++ b/sc/source/ui/inc/ZTestDialog.hxx @@ -25,7 +25,7 @@ public: virtual bool Close() override; protected: - virtual sal_Int16 GetUndoNameId() override; + virtual const char* GetUndoNameId() override; virtual ScRange ApplyOutput(ScDocShell* pDocShell) override; }; diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index 215341a0fcef..e0364a6f616b 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -166,17 +166,10 @@ template< class TWindow, bool bBindRef = true > class ScRefHdlrImplBase: public TWindow, public ScRefHandler { private: - template - ScRefHdlrImplBase( TBindings* pB, TChildWindow* pCW, - TParentWindow* pParent, TResId nResId ); - template ScRefHdlrImplBase( TBindings* pB, TChildWindow* pCW, TParentWindow* pParent, const OUString& rID, const OUString& rUIXMLDescription ); - template - ScRefHdlrImplBase( TParentWindow* pParent, TResId nResId, const TArg &rArg, SfxBindings *pB ); - template ScRefHdlrImplBase( TParentWindow* pParent, const OUString& rID, const OUString& rUIXMLDescription, const TArg &rArg, SfxBindings *pB ); @@ -185,15 +178,6 @@ private: template friend struct ScRefHdlrImpl; }; -template -template -ScRefHdlrImplBase::ScRefHdlrImplBase( TBindings* pB, TChildWindow* pCW, - TParentWindow* pParent, TResId nResId) - : TWindow(pB, pCW, pParent, ScResId(static_cast( nResId ) ) ) - , ScRefHandler( *static_cast(this), pB, bBindRef ) -{ -} - template template ScRefHdlrImplBase::ScRefHdlrImplBase( TBindings* pB, TChildWindow* pCW, @@ -203,14 +187,6 @@ ScRefHdlrImplBase::ScRefHdlrImplBase( TBindings* pB, TChildWi { } -template -template -ScRefHdlrImplBase::ScRefHdlrImplBase( TParentWindow* pParent, TResId nResIdP, const TArg &rArg, SfxBindings *pB ) - : TWindow( pParent, ScResId(static_cast( nResIdP )), rArg ), - ScRefHandler( *static_cast(this), pB, bBindRef ) -{ -} - template template ScRefHdlrImplBase::ScRefHdlrImplBase( TParentWindow* pParent, const OUString& rID, const OUString& rUIXMLDescription, const TArg &rArg, SfxBindings *pB ) diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx index a2010c4ac6c3..10deed238c9e 100644 --- a/sc/source/ui/inc/docfunc.hxx +++ b/sc/source/ui/inc/docfunc.hxx @@ -72,7 +72,7 @@ public: DECL_LINK( NotifyDrawUndo, SdrUndoAction*, void ); // for grouping multiple operations into one with a new name - void EnterListAction( sal_uInt16 nNameResId ); + void EnterListAction(const char* pNameResId); void EndListAction(); bool DetectiveAddPred(const ScAddress& rPos); diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index b7f1016c8f49..b6beb2cfc11d 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -255,7 +255,7 @@ public: void DoAutoStyle( const ScRange& rRange, const OUString& rStyle ); static vcl::Window* GetActiveDialogParent(); - void ErrorMessage( sal_uInt16 nGlobStrId ); + void ErrorMessage(const char* pGlobStrId); bool IsEditable() const; bool AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab ); diff --git a/sc/source/ui/inc/editable.hxx b/sc/source/ui/inc/editable.hxx index e47e2d473060..6e2fb0bd5e88 100644 --- a/sc/source/ui/inc/editable.hxx +++ b/sc/source/ui/inc/editable.hxx @@ -79,7 +79,7 @@ public: bool IsEditable() const { return mbIsEditable; } bool IsFormatEditable() const { return mbIsEditable || mbOnlyMatrix; } - sal_uInt16 GetMessageId() const; + const char* GetMessageId() const; }; #endif diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx index 3fab54c6373b..39e61e2b9343 100644 --- a/sc/source/ui/inc/reffact.hxx +++ b/sc/source/ui/inc/reffact.hxx @@ -25,7 +25,7 @@ #include "dbfunc.hxx" -#include "scres.hrc" +#include "sc.hrc" #define DECL_WRAPPER_WITHID(Class) \ class Class : public SfxChildWindow \ diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index 2a7e67994b74..a605535369ec 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -571,7 +571,7 @@ public: void SplitAtPixel( const Point& rPixel ); void InvalidateSplit(); - void ErrorMessage( sal_uInt16 nGlobStrId ); + void ErrorMessage(const char* pGlobStrId); void EnableRefInput(bool bFlag); diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index 480d82432442..6ac52a2d1cd6 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -105,8 +105,6 @@ class ScTpLayoutOptions : public SfxTabPage VclPtr m_pReplWarnCB; VclPtr m_pLegacyCellSelectionCB; - SvxStringArray aUnitArr; - DECL_LINK(MetricHdl, ListBox&, void ); DECL_LINK( AlignHdl, Button*, void ); diff --git a/sc/source/ui/inc/undostyl.hxx b/sc/source/ui/inc/undostyl.hxx index ac63b0ab7063..972905cd031f 100644 --- a/sc/source/ui/inc/undostyl.hxx +++ b/sc/source/ui/inc/undostyl.hxx @@ -21,7 +21,7 @@ #define INCLUDED_SC_SOURCE_UI_INC_UNDOSTYL_HXX #include -#include +#include #include "undobase.hxx" class ScDocShell; diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index fd76c74a8bf1..9829a1922ed9 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -29,6 +29,7 @@ #include #include "anyrefdg.hxx" +#include "sc.hrc" struct ScRefHandlerCaller : public virtual VclReferenceBase { }; diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index ae1dbd9c5630..eca4369b36c7 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -33,7 +33,7 @@ #include "docsh.hxx" #include "scresid.hxx" #include "globstr.hrc" -#include "scres.hrc" +#include "strings.hrc" #include "simpref.hxx" #include "scmod.hxx" #include "tabvwsh.hxx" diff --git a/sc/source/ui/miscdlgs/acredlin.src b/sc/source/ui/miscdlgs/acredlin.src deleted file mode 100644 index 3c0dbcae18f2..000000000000 --- a/sc/source/ui/miscdlgs/acredlin.src +++ /dev/null @@ -1,86 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "globstr.hrc" - -String STR_CHG_INSERT_COLS -{ - Text [ en-US ] = "Column inserted" ; -}; -String STR_CHG_INSERT_ROWS -{ - Text [ en-US ] = "Row inserted " ; -}; -String STR_CHG_INSERT_TABS -{ - Text [ en-US ] = "Sheet inserted " ; -}; -String STR_CHG_DELETE_COLS -{ - Text [ en-US ] = "Column deleted" ; -}; -String STR_CHG_DELETE_ROWS -{ - Text [ en-US ] = "Row deleted" ; -}; -String STR_CHG_DELETE_TABS -{ - Text [ en-US ] = "Sheet deleted" ; -}; -String STR_CHG_MOVE -{ - Text [ en-US ] = "Range moved" ; -}; -String STR_CHG_CONTENT -{ - Text [ en-US ] = "Changed contents" ; -}; -String STR_CHG_CONTENT_WITH_CHILD -{ - Text [ en-US ] = "Changed contents" ; -}; -String STR_CHG_CHILD_CONTENT -{ - Text [ en-US ] = "Changed to " ; -}; -String STR_CHG_CHILD_ORGCONTENT -{ - Text [ en-US ] = "Original" ; -}; -String STR_CHG_REJECT -{ - Text [ en-US ] = "Changes rejected" ; -}; -String STR_CHG_ACCEPTED -{ - Text [ en-US ] = "Accepted" ; -}; -String STR_CHG_REJECTED -{ - Text [ en-US ] = "Rejected" ; -}; -String STR_CHG_NO_ENTRY -{ - Text [ en-US ] = "No Entry" ; -}; -String STR_CHG_EMPTY -{ - Text [ en-US ] = "" ; -}; -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx index c228e2f8f4d5..0a7f9de81a50 100644 --- a/sc/source/ui/miscdlgs/autofmt.cxx +++ b/sc/source/ui/miscdlgs/autofmt.cxx @@ -37,7 +37,7 @@ #include #include -#include "scres.hrc" +#include "strings.hrc" #include "scmod.hxx" #include "attrib.hxx" #include "zforauto.hxx" diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index bbab72f1827d..c88ed6023e47 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -21,7 +21,7 @@ #include #include "conflictsdlg.hxx" -#include "scres.hrc" +#include "strings.hrc" #include "scresid.hxx" #include "viewdata.hxx" #include "dbfunc.hxx" diff --git a/sc/source/ui/miscdlgs/conflictsdlg.src b/sc/source/ui/miscdlgs/conflictsdlg.src deleted file mode 100644 index e22979e85da7..000000000000 --- a/sc/source/ui/miscdlgs/conflictsdlg.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 "scres.hrc" - -String STR_TITLE_CONFLICT -{ - Text [ en-US ] = "Conflict" ; -}; - -String STR_TITLE_AUTHOR -{ - Text [ en-US ] = "Author" ; -}; - -String STR_TITLE_DATE -{ - Text [ en-US ] = "Date" ; -}; - -String STR_UNKNOWN_USER_CONFLICT -{ - Text [ en-US ] = "Unknown User" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/crdlg.cxx b/sc/source/ui/miscdlgs/crdlg.cxx index 41c2992860f9..77520bbb9778 100644 --- a/sc/source/ui/miscdlgs/crdlg.cxx +++ b/sc/source/ui/miscdlgs/crdlg.cxx @@ -21,7 +21,7 @@ #include "crdlg.hxx" #include "scresid.hxx" -#include "scres.hrc" +#include "strings.hrc" ScColOrRowDlg::ScColOrRowDlg(vcl::Window* pParent, const OUString& rStrTitle, const OUString& rStrLabel) diff --git a/sc/source/ui/miscdlgs/delcldlg.cxx b/sc/source/ui/miscdlgs/delcldlg.cxx index 7eecf2d1b292..31528b1b2899 100644 --- a/sc/source/ui/miscdlgs/delcldlg.cxx +++ b/sc/source/ui/miscdlgs/delcldlg.cxx @@ -21,7 +21,7 @@ #include "delcldlg.hxx" #include "scresid.hxx" -#include "scres.hrc" +#include "strings.hrc" static sal_uInt8 nDelItemChecked=0; diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx index 79fac75b8859..fa862b1378c8 100644 --- a/sc/source/ui/miscdlgs/delcodlg.cxx +++ b/sc/source/ui/miscdlgs/delcodlg.cxx @@ -21,7 +21,7 @@ #include "delcodlg.hxx" #include "scresid.hxx" -#include "scres.hrc" +#include "strings.hrc" bool ScDeleteContentsDlg::bPreviousAllCheck = false; InsertDeleteFlags ScDeleteContentsDlg::nPreviousChecks = (InsertDeleteFlags::DATETIME | InsertDeleteFlags::STRING | diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx index 4c8ca4c158fc..c5e16bfa7c73 100644 --- a/sc/source/ui/miscdlgs/filldlg.cxx +++ b/sc/source/ui/miscdlgs/filldlg.cxx @@ -26,7 +26,7 @@ #include "scresid.hxx" #include "document.hxx" #include "globstr.hrc" -#include "scres.hrc" +#include "strings.hrc" #include "filldlg.hxx" // class ScFillSeriesDlg diff --git a/sc/source/ui/miscdlgs/inscldlg.cxx b/sc/source/ui/miscdlgs/inscldlg.cxx index 977358b5c4b7..891d3ae9b7f9 100644 --- a/sc/source/ui/miscdlgs/inscldlg.cxx +++ b/sc/source/ui/miscdlgs/inscldlg.cxx @@ -21,7 +21,7 @@ #include "inscldlg.hxx" #include "scresid.hxx" -#include "scres.hrc" +#include "strings.hrc" static sal_uInt8 nInsItemChecked=0; diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx index 190d108e9e63..eb99aff262cb 100644 --- a/sc/source/ui/miscdlgs/inscodlg.cxx +++ b/sc/source/ui/miscdlgs/inscodlg.cxx @@ -21,7 +21,7 @@ #include "inscodlg.hxx" #include "scresid.hxx" -#include "scres.hrc" +#include "strings.hrc" bool ScInsertContentsDlg::bPreviousAllCheck = false; InsertDeleteFlags ScInsertContentsDlg::nPreviousChecks = (InsertDeleteFlags::VALUE | InsertDeleteFlags::DATETIME | InsertDeleteFlags::STRING); diff --git a/sc/source/ui/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxx index d9adb2d426c9..ff59830c1926 100644 --- a/sc/source/ui/miscdlgs/lbseldlg.cxx +++ b/sc/source/ui/miscdlgs/lbseldlg.cxx @@ -23,7 +23,7 @@ #include "lbseldlg.hxx" #include "scresid.hxx" -#include "scres.hrc" +#include "strings.hrc" ScSelEntryDlg::ScSelEntryDlg(vcl::Window* pParent, const std::vector &rEntryList) : ModalDialog(pParent, "SelectRangeDialog", "modules/scalc/ui/selectrange.ui") diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx index 7a81c54c67ed..b38bc98a6d58 100644 --- a/sc/source/ui/miscdlgs/mtrindlg.cxx +++ b/sc/source/ui/miscdlgs/mtrindlg.cxx @@ -21,7 +21,7 @@ #include "mtrindlg.hxx" #include "scresid.hxx" -#include "scres.hrc" +#include "strings.hrc" ScMetricInputDlg::ScMetricInputDlg( vcl::Window* pParent, const OString& sDialogName, diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index 0d3abf9fd624..820c4affe618 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -24,7 +24,7 @@ #include "mvtabdlg.hxx" #include "document.hxx" #include "docsh.hxx" -#include "scres.hrc" +#include "strings.hrc" #include "global.hxx" #include "scresid.hxx" #include "globstr.hrc" diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx index 92afddb5b14c..e193e023f453 100644 --- a/sc/source/ui/miscdlgs/retypepassdlg.cxx +++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "scres.hrc" +#include "strings.hrc" #include "retypepassdlg.hxx" #include "scresid.hxx" #include "document.hxx" diff --git a/sc/source/ui/miscdlgs/retypepassdlg.src b/sc/source/ui/miscdlgs/retypepassdlg.src deleted file mode 100644 index a2cc62ee2bc1..000000000000 --- a/sc/source/ui/miscdlgs/retypepassdlg.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 "scres.hrc" - -String STR_NOT_PROTECTED -{ - Text [ en-US ] = "Not protected" ; -}; - -String STR_NOT_PASS_PROTECTED -{ - Text [ en-US ] = "Not password-protected" ; -}; - -String STR_HASH_BAD -{ - Text [ en-US ] = "Hash incompatible" ; -}; - -String STR_HASH_GOOD -{ - Text [ en-US ] = "Hash compatible" ; -}; - -String STR_RETYPE -{ - Text [ en-US ] = "Re-type" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index fbf1245de8d1..da465ae23774 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -34,8 +34,9 @@ #include #include #include +#include #include -#include "scres.hrc" +#include "strings.hrc" #include "scmod.hxx" #include "attrib.hxx" #include "zforauto.hxx" @@ -46,6 +47,7 @@ #include "scuiautofmt.hxx" #include "scresid.hxx" #include "document.hxx" +#include "helpids.h" // AutoFormat-Dialog: diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx index db473dca0ccb..747351aef56e 100644 --- a/sc/source/ui/miscdlgs/shtabdlg.cxx +++ b/sc/source/ui/miscdlgs/shtabdlg.cxx @@ -23,7 +23,7 @@ #include "shtabdlg.hxx" #include "scresid.hxx" -#include "scres.hrc" +#include "strings.hrc" ScShowTabDlg::ScShowTabDlg(vcl::Window* pParent) : ModalDialog(pParent, "ShowSheetDialog", "modules/scalc/ui/showsheetdialog.ui") diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx index 69f6a4e5a7d0..bc63af0afc9e 100644 --- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx +++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx @@ -20,15 +20,15 @@ #undef SC_DLLIMPLEMENTATION #include "tabbgcolordlg.hxx" +#include "sc.hrc" #include "scresid.hxx" -#include "scres.hrc" +#include "strings.hrc" #include #include #include #include #include -#include #include #include #include diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx index daf684dac704..101293a867d4 100644 --- a/sc/source/ui/miscdlgs/tabopdlg.cxx +++ b/sc/source/ui/miscdlgs/tabopdlg.cxx @@ -26,6 +26,7 @@ #include "document.hxx" #include "scresid.hxx" #include "sc.hrc" +#include "strings.hrc" #include "reffact.hxx" #include "tabopdlg.hxx" diff --git a/sc/source/ui/miscdlgs/textdlgs.cxx b/sc/source/ui/miscdlgs/textdlgs.cxx index 578681598940..c1416798f247 100644 --- a/sc/source/ui/miscdlgs/textdlgs.cxx +++ b/sc/source/ui/miscdlgs/textdlgs.cxx @@ -20,6 +20,7 @@ #undef SC_DLLIMPLEMENTATION #include +#include #include #include diff --git a/sc/source/ui/miscdlgs/warnbox.cxx b/sc/source/ui/miscdlgs/warnbox.cxx index 20b4bdb6f10a..9cd98b09f60c 100644 --- a/sc/source/ui/miscdlgs/warnbox.cxx +++ b/sc/source/ui/miscdlgs/warnbox.cxx @@ -22,7 +22,8 @@ #include "scmod.hxx" #include "inputopt.hxx" #include "scresid.hxx" -#include "scres.hrc" +#include "strings.hrc" +#include "helpids.h" ScReplaceWarnBox::ScReplaceWarnBox( vcl::Window* pParent ) : WarningBox( pParent, WB_YES_NO | WB_DEF_YES, ScResId( STR_REPLCELLSWARN ) ) diff --git a/sc/source/ui/namedlg/namepast.cxx b/sc/source/ui/namedlg/namepast.cxx index 92cdc070a24a..beae45add424 100644 --- a/sc/source/ui/namedlg/namepast.cxx +++ b/sc/source/ui/namedlg/namepast.cxx @@ -22,7 +22,7 @@ #include "namepast.hxx" #include "scresid.hxx" #include "docsh.hxx" -#include "scres.hrc" +#include "strings.hrc" #include "rangenam.hxx" #include "viewdata.hxx" diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index 28f8d77987be..380f18084913 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -48,7 +48,7 @@ #include "lnktrans.hxx" #include "formulacell.hxx" #include "dociter.hxx" -#include "scres.hrc" +#include "strings.hrc" #include "scresid.hxx" #include "globstr.hrc" #include "bitmaps.hlst" @@ -224,6 +224,19 @@ OUString ScContentTree::GetEntryLongDescription( SvTreeListEntry* pEntry ) const return getAltLongDescText( pEntry, false ); } +static const char* SCSTR_CONTENT_ARY[] = +{ + SCSTR_CONTENT_ROOT, + SCSTR_CONTENT_TABLE, + SCSTR_CONTENT_RANGENAME, + SCSTR_CONTENT_DBAREA, + SCSTR_CONTENT_GRAPHIC, + SCSTR_CONTENT_OLEOBJECT, + SCSTR_CONTENT_NOTE, + SCSTR_CONTENT_AREALINK, + SCSTR_CONTENT_DRAWING +}; + void ScContentTree::InitRoot( ScContentId nType ) { if ( nType == ScContentId::ROOT ) @@ -237,7 +250,7 @@ void ScContentTree::InitRoot( ScContentId nType ) BitmapEx aBitmap(aContentBmps[(int)nType - 1]); Image aImage(aBitmap); - OUString aName(ScResId(SCSTR_CONTENT_ROOT + (int)nType)); + OUString aName(ScResId(SCSTR_CONTENT_ARY[(int)nType])); // back to the correct position: sal_uInt16 nPos = nRootType != ScContentId::ROOT ? 0 : pPosList[nType]-1; SvTreeListEntry* pNew = InsertEntry( aName, aImage, aImage, nullptr, false, nPos ); diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index af2b0c5778fc..5a70da276730 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -37,7 +37,8 @@ #include "dbdata.hxx" #include "rangenam.hxx" #include "rangeutl.hxx" -#include "scres.hrc" +#include "sc.hrc" +#include "strings.hrc" #include "bitmaps.hlst" #include "scresid.hxx" #include "scmod.hxx" diff --git a/sc/source/ui/navipi/navipi.src b/sc/source/ui/navipi/navipi.src deleted file mode 100644 index 1838bb535788..000000000000 --- a/sc/source/ui/navipi/navipi.src +++ /dev/null @@ -1,109 +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 "scres.hrc" - -// content description strings are also used in ScLinkTargetsObj - -String SCSTR_CONTENT_ROOT -{ - Text [ en-US ] = "Contents" ; -}; - -String SCSTR_CONTENT_TABLE -{ - Text [ en-US ] = "Sheets" ; -}; - -String SCSTR_CONTENT_RANGENAME -{ - Text [ en-US ] = "Range names" ; -}; - -String SCSTR_CONTENT_DBAREA -{ - Text [ en-US ] = "Database ranges" ; -}; - -String SCSTR_CONTENT_GRAPHIC -{ - Text [ en-US ] = "Images" ; -}; - -String SCSTR_CONTENT_OLEOBJECT -{ - Text [ en-US ] = "OLE objects" ; -}; - -String SCSTR_CONTENT_NOTE -{ - Text [ en-US ] = "Comments" ; -}; - -String SCSTR_CONTENT_AREALINK -{ - Text [ en-US ] = "Linked areas" ; -}; - -String SCSTR_CONTENT_DRAWING -{ - Text [ en-US ] = "Drawing objects"; -}; - -String SCSTR_DRAGMODE -{ - Text [ en-US ] = "Drag Mode" ; -}; - -String SCSTR_DISPLAY -{ - Text [ en-US ] = "Display" ; -}; - -String SCSTR_ACTIVE -{ - Text [ en-US ] = "active" ; -}; - -String SCSTR_NOTACTIVE -{ - Text [ en-US ] = "inactive" ; -}; - -String SCSTR_HIDDEN -{ - Text [ en-US ] = "hidden" ; -}; - -String SCSTR_ACTIVEWIN -{ - Text [ en-US ] = "Active Window" ; -}; - -String SCSTR_QHLP_SCEN_LISTBOX -{ - Text [ en-US ] = "Scenario Name"; -}; - -String SCSTR_QHLP_SCEN_COMMENT -{ - Text [ en-US ] = "Comment"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx index 3246d3abb08d..e10fff290086 100644 --- a/sc/source/ui/navipi/scenwnd.cxx +++ b/sc/source/ui/navipi/scenwnd.cxx @@ -27,7 +27,8 @@ #include #include "navipi.hxx" #include "scresid.hxx" -#include "scres.hrc" +#include "sc.hrc" +#include "strings.hrc" #include "globstr.hrc" // class ScScenarioWindow ------------------------------------------------ diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx index ffa726a7c27a..5aa63a7bacec 100644 --- a/sc/source/ui/optdlg/tpformula.cxx +++ b/sc/source/ui/optdlg/tpformula.cxx @@ -24,7 +24,8 @@ #include #include "tpformula.hxx" #include "formulaopt.hxx" -#include "scres.hrc" +#include "sc.hrc" +#include "strings.hrc" #include "scresid.hxx" #include #include "calcoptionsdlg.hxx" diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index bf47a82f5b62..d8e242474293 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -27,8 +27,10 @@ #include "uiitems.hxx" #include "scresid.hxx" #include "docsh.hxx" -#include "scres.hrc" +#include "sc.hrc" +#include "strings.hrc" #include "globstr.hrc" +#include "units.hrc" #include #include #include @@ -329,7 +331,6 @@ ScTpLayoutOptions::ScTpLayoutOptions( vcl::Window* pParent, const SfxItemSet& rArgSet ) : SfxTabPage( pParent, "ScGeneralPage", "modules/scalc/ui/scgeneralpage.ui", &rArgSet), - aUnitArr(ResId(SCSTR_UNIT, *SC_MOD()->GetResMgr())), pDoc(nullptr) { get( m_pUnitLB, "unitlb"); @@ -356,10 +357,10 @@ ScTpLayoutOptions::ScTpLayoutOptions( vcl::Window* pParent, m_pAlignCB->SetClickHdl(LINK(this, ScTpLayoutOptions, AlignHdl)); - for ( sal_uInt32 i = 0; i < aUnitArr.Count(); ++i ) + for (size_t i = 0; i < SAL_N_ELEMENTS(SCSTR_UNIT); ++i) { - OUString sMetric = aUnitArr.GetStringByPos( i ); - FieldUnit eFUnit = (FieldUnit)aUnitArr.GetValue( i ); + OUString sMetric = ScResId(SCSTR_UNIT[i].first); + FieldUnit eFUnit = SCSTR_UNIT[i].second; switch ( eFUnit ) { @@ -380,7 +381,6 @@ ScTpLayoutOptions::ScTpLayoutOptions( vcl::Window* pParent, } } } - } ScTpLayoutOptions::~ScTpLayoutOptions() diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index 9c5cac6a5692..df331676d935 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -40,6 +40,7 @@ #include "scresid.hxx" #include "sc.hrc" #include "globstr.hrc" +#include "strings.hrc" #include "tabvwsh.hxx" #include "prevwsh.hxx" #include "AccessibleEditObject.hxx" diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx index f629d7b3e574..61e68d32f505 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx @@ -20,7 +20,8 @@ #include #include #include "CellAppearancePropertyPanel.hxx" -#include "scres.hrc" +#include "sc.hrc" +#include "strings.hrc" #include "bitmaps.hlst" #include "scresid.hxx" #include diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src deleted file mode 100644 index 349a33030a6b..000000000000 --- a/sc/source/ui/src/globstr.src +++ /dev/null @@ -1,1962 +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 "globstr.hrc" -#include "scres.hrc" - -String STR_UNDO_INSERTCELLS+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Insert" ; -}; -String STR_UNDO_DELETECELLS+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Delete" ; -}; -String STR_UNDO_CUT+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Cut" ; -}; -String STR_UNDO_PASTE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Insert" ; -}; -String STR_UNDO_DRAGDROP+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Drag and Drop" ; -}; -String STR_UNDO_MOVE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Move" ; -}; -String STR_UNDO_COPY+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Copy" ; -}; -String STR_UNDO_DELETECONTENTS+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Delete" ; -}; -String STR_UNDO_SELATTR+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Attributes" ; -}; -String STR_UNDO_SELATTRLINES+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Attributes/Lines" ; -}; -String STR_UNDO_COLWIDTH+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Column Width" ; -}; -String STR_UNDO_OPTCOLWIDTH+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Optimal Column Width" ; -}; -String STR_UNDO_ROWHEIGHT+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Row height" ; -}; -String STR_UNDO_OPTROWHEIGHT+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Optimal Row Height" ; -}; -String STR_UNDO_AUTOFILL+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Fill" ; -}; -String STR_UNDO_MERGE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Merge" ; -}; -String STR_UNDO_REMERGE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Split" ; -}; -String STR_UNDO_AUTOFORMAT+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "AutoFormat" ; -}; -String STR_UNDO_REPLACE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Replace" ; -}; -String STR_UNDO_CURSORATTR+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Attributes" ; -}; -String STR_UNDO_ENTERDATA+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Input" ; -}; -String STR_UNDO_INSCOLBREAK+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Insert Column Break" ; -}; -String STR_UNDO_DELCOLBREAK+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Delete column break" ; -}; -String STR_UNDO_INSROWBREAK+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Insert Row Break" ; -}; -String STR_UNDO_DELROWBREAK+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Delete row break" ; -}; -String STR_UNDO_DOOUTLINE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "View Details" ; -}; -String STR_UNDO_REDOOUTLINE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Hide details" ; -}; -String STR_UNDO_MAKEOUTLINE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Group" ; -}; -String STR_UNDO_REMAKEOUTLINE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Ungroup" ; -}; -String STR_UNDO_OUTLINELEVEL+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Select outline level" ; -}; -String STR_UNDO_DOOUTLINEBLK+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "View Details" ; -}; -String STR_UNDO_REDOOUTLINEBLK+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Hide details" ; -}; -String STR_UNDO_REMOVEALLOTLNS+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Clear Outline" ; -}; -String STR_UNDO_AUTOOUTLINE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "AutoOutline" ; -}; -String STR_UNDO_SUBTOTALS+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Subtotals" ; -}; -String STR_UNDO_SORT+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Sort" ; -}; -String STR_UNDO_QUERY+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Filter" ; -}; -String STR_UNDO_DBDATA+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Change Database Range" ; -}; -String STR_UNDO_IMPORTDATA+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Importing" ; -}; -String STR_UNDO_REPEATDB+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Refresh range" ; -}; -String STR_UNDO_LISTNAMES+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "List names" ; -}; -String STR_UNDO_PIVOT_NEW+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Create pivot table" ; -}; -String STR_UNDO_PIVOT_MODIFY+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Edit pivot table" ; -}; -String STR_UNDO_PIVOT_DELETE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Delete pivot table" ; -}; -String STR_UNDO_CONSOLIDATE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Consolidate" ; -}; -String STR_UNDO_USESCENARIO+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Use scenario" ; -}; -String STR_UNDO_MAKESCENARIO+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Create scenario" ; -}; -String STR_UNDO_EDITSCENARIO+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Edit scenario" ; -}; -String STR_UNDO_APPLYCELLSTYLE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Apply Cell Style" ; -}; -String STR_UNDO_EDITCELLSTYLE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Edit Cell Style"; -}; -String STR_UNDO_APPLYPAGESTYLE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Apply Page Style"; -}; -String STR_UNDO_EDITPAGESTYLE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Edit Page Style"; -}; -String STR_UNDO_DETADDPRED+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Trace Precedents" ; -}; -String STR_UNDO_DETDELPRED+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Remove Precedent" ; -}; -String STR_UNDO_DETADDSUCC+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Trace Dependents" ; -}; -String STR_UNDO_DETDELSUCC+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Remove Dependent" ; -}; -String STR_UNDO_DETADDERROR+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Trace Error" ; -}; -String STR_UNDO_DETDELALL+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Remove all Traces" ; -}; -String STR_UNDO_DETINVALID+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Mark invalid data" ; -}; -String STR_UNDO_DETREFRESH+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Refresh Traces" ; -}; -String STR_UNDO_CHARTDATA+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Modify chart data range" ; -}; -String STR_UNDO_ORIGINALSIZE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Original Size" ; -}; -String STR_UNDO_UPDATELINK+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Update Link" ; -}; -String STR_UNDO_REMOVELINK+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Unlink" ; -}; -String STR_UNDO_INSERTAREALINK+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Insert Link" ; -}; -String STR_UNDO_ENTERMATRIX+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Insert Array Formula" ; -}; -String STR_UNDO_INSERTNOTE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Insert Comment" ; -}; -String STR_UNDO_DELETENOTE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Delete Comment" ; -}; -String STR_UNDO_SHOWNOTE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Show Comment" ; -}; -String STR_UNDO_HIDENOTE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Hide Comment" ; -}; -String STR_UNDO_SHOWALLNOTES+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Show All Comments" ; -}; -String STR_UNDO_HIDEALLNOTES+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Hide All Comments" ; -}; -String STR_UNDO_EDITNOTE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Edit Comment" ; -}; -String STR_UNDO_DEC_INDENT+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Decrease Indent" ; -}; -String STR_UNDO_INC_INDENT+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Increase Indent" ; -}; -String STR_UNDO_PROTECT_TAB+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Protect sheet" ; -}; -String STR_UNDO_UNPROTECT_TAB+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Unprotect sheet" ; -}; -String STR_UNDO_PROTECT_DOC+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Protect document" ; -}; -String STR_UNDO_UNPROTECT_DOC+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Unprotect document" ; -}; -String STR_UNDO_PRINTRANGES+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Print range" ; -}; -String STR_UNDO_REMOVEBREAKS+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Delete Page Breaks" ; -}; -String STR_UNDO_PRINTSCALE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Change Scale" ; -}; -String STR_UNDO_DRAG_BREAK+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Move Page Break" ; -}; -String STR_UNDO_RANGENAMES+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Edit range names" ; -}; -String STR_UNDO_TRANSLITERATE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Change Case"; -}; -String STR_DBNAME_IMPORT+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Import" ; -}; -String STR_MSSG_DOSUBTOTALS_0+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "%PRODUCTNAME Calc" ; -}; -String STR_MSSG_DOSUBTOTALS_1+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Delete data?" ; -}; -String STR_MSSG_DOSUBTOTALS_2+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Unable to insert rows" ; -}; -String STR_MSSG_REPEATDB_0+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "No operations to execute" ; -}; -String STR_MSSG_MAKEAUTOFILTER_0+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "The range does not contain column headers.\nDo you want the first line to be used as column header?" ; -}; -String STR_MSSG_IMPORTDATA_0+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Error while importing data!" ; -}; -String STR_PROGRESS_IMPORT+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "# records imported..." ; -}; -String STR_MSSG_MAKEOUTLINE_0+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Grouping not possible" ; -}; -String STR_MSSG_REMOVEOUTLINE_0+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Ungrouping not possible" ; -}; -String STR_MSSG_PASTEFROMCLIP_0+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Insert into multiple selection not possible" ; -}; -String STR_MSSG_MOVEBLOCKTO_0+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Cell merge not possible if cells already merged!" ; -}; -String STR_MSSG_INSERTCELLS_0+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Inserting into merged ranges not possible" ; -}; -String STR_MSSG_DELETECELLS_0+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Deleting in merged ranges not possible" ; -}; -String STR_MSSG_MERGECELLS_0+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Cell merge not possible if cells already merged" ; -}; -String STR_SORT_ERR_MERGED+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Ranges containing merged cells can only be sorted without formats." ; -}; -String STR_MSSG_SOLVE_0+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Goal Seek succeeded. Result: " ; -}; -String STR_MSSG_SOLVE_1+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "\n\nInsert the result into the variable cell?" ; -}; -String STR_MSSG_SOLVE_2+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Goal Seek failed.\n\n" ; -}; -String STR_MSSG_SOLVE_3+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Insert the closest value (" ; -}; -String STR_MSSG_SOLVE_4+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = ") into the variable cell anyway?" ; -}; -String STR_TABLE_GESAMTERGEBNIS+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Grand Total" ; -}; -String STR_TABLE_ERGEBNIS+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Result" ; -}; -String STR_UNDO_SPELLING+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Spellcheck" ; -}; -String STR_TABLE_UND+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "AND" ; -}; -String STR_TABLE_ODER+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "OR" ; -}; -String STR_TABLE_DEF+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Sheet" ; -}; -String STR_MOVE_TO_END+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "- move to end position -" ; -}; -String STR_NO_REF_TABLE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "#REF!" ; -}; -String STR_PIVOT_NODATA+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "The pivot table must contain at least one entry." ; -}; -String STR_PIVOT_MOVENOTALLOWED+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "The data range can not be deleted." ; -}; -String STR_PIVOT_ERROR+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Error creating the pivot table." ; -}; -String STR_PIVOT_NOTEMPTY+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "The destination range is not empty. Overwrite existing contents?" ; -}; -String STR_PIVOT_REMOVE_PIVOTCHART+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "There is at least one pivot chart associated with this pivot table. Should remove all or abort?" ; -}; -String STR_DATAPILOT_SUBTOTAL+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "The source range contains subtotals which may distort the results. Use it anyway?"; -}; -String STR_PIVOT_TOTAL+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Total" ; -}; -String STR_PIVOT_DATA+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Data" ; -}; -String STR_PIVOT_GROUP+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Group" ; -}; -String STR_ROWCOL_SELCOUNT+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "$1 rows, $2 columns selected"; -}; -String STR_FILTER_SELCOUNT+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "$1 of $2 records found"; -}; -String STR_COLUMN+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Column" ; -}; -String STR_ROW+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Row" ; -}; -String STR_PAGE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Page" ; -}; -String STR_PGNUM+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Page %1" ; -}; -String STR_LOAD_DOC+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Load document" ; -}; -String STR_SAVE_DOC+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Save document" ; -}; -String STR_AREA_ALREADY_INSERTED+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "This range has already been inserted." ; -}; -String STR_INVALID_TABREF+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Invalid sheet reference." ; -}; -String STR_INVALID_QUERYAREA+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "This range does not contain a valid query." ; -}; -String STR_REIMPORT_EMPTY+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "This range does not contain imported data." ; -}; -String STR_NOMULTISELECT+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "This function cannot be used with multiple selections." ; -}; -String STR_FILL_SERIES_PROGRESS+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Fill Row..." ; -}; -String STR_UNDO_THESAURUS+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Thesaurus" ; -}; -String STR_FILL_TAB+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Fill Sheets" ; -}; -String STR_UPDATE_SCENARIO+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Add selected ranges to current scenario?" ; -}; -String STR_ERR_NEWSCENARIO+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "The scenario ranges must be selected in order to be able to create a new scenario." ; -}; -String STR_NOAREASELECTED+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "A range has not been selected." ; -}; -String STR_NEWTABNAMENOTUNIQUE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "This name already exists." ; -}; -String STR_INVALIDTABNAME+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Invalid sheet name.\nThe sheet name must not be a duplicate of an existing name \nand may not contain the characters [ ] * ? : / \\" ; -}; -String STR_SCENARIO+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Scenario" ; -}; -String STR_PIVOT_TABLE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Pivot Table" ; -}; - // Text strings for captions of subtotal functions. -String STR_FUN_TEXT_SUM+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Sum" ; -}; -String STR_FUN_TEXT_SELECTION_COUNT+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Selection count" ; -}; -String STR_FUN_TEXT_COUNT+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Count" ; -}; -String STR_FUN_TEXT_COUNT2+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "CountA" ; -}; -String STR_FUN_TEXT_AVG+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Average" ; -}; -String STR_FUN_TEXT_MEDIAN+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Median" ; -}; -String STR_FUN_TEXT_MAX+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Max" ; -}; -String STR_FUN_TEXT_MIN+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Min" ; -}; -String STR_FUN_TEXT_PRODUCT+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Product" ; -}; -String STR_FUN_TEXT_STDDEV+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "StDev" ; -}; -String STR_FUN_TEXT_VAR+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Var" ; -}; -String STR_NOCHARTATCURSOR+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "No chart found at this position." ; -}; -String STR_PIVOT_NOTFOUND+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "No pivot table found at this position." ; -}; -String STR_EMPTYDATA+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "(empty)" ; -}; -String STR_PRINT_INVALID_AREA+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Invalid print range" ; -}; -String STR_PAGESTYLE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Page Style" ; -}; -String STR_HEADER+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Header" ; -}; -String STR_FOOTER+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Footer" ; -}; -String STR_TEXTATTRS+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Text Attributes" ; -}; -String STR_HFCMD_DELIMITER+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "\\" ; -}; -String STR_HFCMD_PAGE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "PAGE" ; -}; -String STR_HFCMD_PAGES+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "PAGES" ; -}; -String STR_HFCMD_DATE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "DATE" ; -}; -String STR_HFCMD_TIME+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "TIME" ; -}; -String STR_HFCMD_FILE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "FILE" ; -}; -String STR_HFCMD_TABLE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "SHEET" ; -}; -String STR_PROTECTIONERR+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Protected cells can not be modified." ; -}; -String STR_READONLYERR+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Document opened in read-only mode."; -}; -String STR_MATRIXFRAGMENTERR+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "You cannot change only part of an array." ; -}; -String STR_PAGEHEADER+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Header" ; -}; -String STR_PAGEFOOTER+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Footer" ; -}; - -/* BEGIN error constants and error strings. */ - -String STR_ERROR_STR+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Err:" ; -}; -/* BEGIN defined ERROR.TYPE() values. */ -/* ERROR.TYPE( #DIV/0! ) == 2 */ -String STR_LONG_ERR_DIV_ZERO+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Error: Division by zero" ; -}; -/* ERROR.TYPE( #VALUE! ) == 3 */ -String STR_LONG_ERR_NO_VALUE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Error: Wrong data type" ; -}; -/* ERROR.TYPE( #REF! ) == 4 */ -String STR_LONG_ERR_NO_REF+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Error: Not a valid reference" ; -}; -/* ERROR.TYPE( #NAME! ) == 5 */ -String STR_LONG_ERR_NO_NAME+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Error: Invalid name" ; -}; -/* ERROR.TYPE( #NUM! ) == 6 */ -String STR_LONG_ERR_ILL_FPO+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Error: Invalid numeric value" ; -}; -/* ERROR.TYPE( #N/A ) == 7 */ -String STR_LONG_ERR_NV+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Error: Value not available" ; -}; -/* END defined ERROR.TYPE() values. */ -String STR_NO_ADDIN+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "#ADDIN?" ; -}; -String STR_LONG_ERR_NO_ADDIN+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Error: Add-in not found" ; -}; -String STR_NO_MACRO+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "#MACRO?" ; -}; -String STR_LONG_ERR_NO_MACRO+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Error: Macro not found" ; -}; -String STR_LONG_ERR_SYNTAX+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Internal syntactical error" ; -}; -String STR_LONG_ERR_ILL_ARG+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Error: Invalid argument" ; -}; -String STR_LONG_ERR_ILL_PAR+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Error in parameter list" ; -}; -String STR_LONG_ERR_ILL_CHAR+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Error: Invalid character" ; -}; -String STR_LONG_ERR_PAIR+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Error: in bracketing" ; -}; -String STR_LONG_ERR_OP_EXP+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Error: Operator missing" ; -}; -String STR_LONG_ERR_VAR_EXP+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Error: Variable missing" ; -}; -String STR_LONG_ERR_CODE_OVF+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Error: Formula overflow" ; -}; -String STR_LONG_ERR_STR_OVF+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Error: String overflow" ; -}; -String STR_LONG_ERR_STACK_OVF+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Error: Internal overflow" ; -}; -String STR_LONG_ERR_MATRIX_SIZE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Error: Array or matrix size" ; -}; -String STR_LONG_ERR_CIRC_REF+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Error: Circular reference" ; -}; -String STR_LONG_ERR_NO_CONV+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Error: Calculation does not converge" ; -}; - -/* END error constants and error strings. */ - -String STR_GRIDCOLOR+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Grid color" ; -}; -String STR_CELL_FILTER+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Filter" ; -}; -String STR_TARGETNOTFOUND+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "The target database range does not exist." ; -}; -String STR_INVALID_EPS+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Invalid increment" ; -}; -String STR_UNDO_TABOP+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Multiple operations" ; -}; -String STR_INVALID_AFNAME+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "You have entered an invalid name.\nAutoFormat could not be created. \nTry again using a different name." ; -}; -String STR_AREA+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Range" ; -}; -String STR_YES+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Yes" ; -}; -String STR_NO+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "No" ; -}; -String STR_PROTECTION+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Protection" ; -}; -String STR_FORMULAS+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Formulas" ; -}; -String STR_HIDE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Hide" ; -}; -String STR_PRINT+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Print" ; -}; -String STR_INVALID_AFAREA+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "To apply an AutoFormat,\na table range of at least\n3x3 cells must be selected." ; -}; -String STR_OPTIONAL+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "(optional)" ; -}; -String STR_REQUIRED+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "(required)" ; -}; -String STR_NOTES+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Comments" ; -}; -String STR_QUERY_DELTAB+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Are you sure you want to delete the selected sheet(s)?" ; -}; -String STR_QUERY_DELSCENARIO+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Are you sure you want to delete the selected scenario?" ; -}; -String STR_EXPORT_ASCII+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Export Text File" ; -}; -String STR_IMPORT_LOTUS+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Import Lotus files" ; -}; -String STR_IMPORT_DBF+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Import DBase files" ; -}; -String STR_EXPORT_DBF+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "DBase export"; -}; -String STR_EXPORT_DIF+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Dif Export" ; -}; -String STR_IMPORT_DIF+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Dif Import" ; -}; -String STR_STYLENAME_STANDARD+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Default" ; -}; -String STR_STYLENAME_RESULT+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Result" ; -}; -String STR_STYLENAME_RESULT1+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Result2" ; -}; -String STR_STYLENAME_HEADLINE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Heading" ; -}; -String STR_STYLENAME_HEADLINE1+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Heading1" ; -}; -String STR_STYLENAME_REPORT+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Report" ; -}; -String STR_THESAURUS_NO_STRING+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Thesaurus can only be used in text cells!" ; -}; -String STR_SPELLING_BEGIN_TAB+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Should the spellcheck be continued at the beginning of the current sheet?" ; -}; -String STR_SPELLING_NO_LANG+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "is not available for the thesaurus.\nPlease check your installation and install \nthe desired language if necessary" ; -}; -String STR_SPELLING_STOP_OK+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "The spellcheck of this sheet has been completed." ; -}; -String STR_UNDO_INSERT_TAB+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Insert Sheet" ; -}; -String STR_UNDO_DELETE_TAB+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Delete Sheets" ; -}; -String STR_UNDO_RENAME_TAB+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Rename Sheet" ; -}; -String STR_UNDO_SET_TAB_BG_COLOR+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Color Tab" ; -}; -String STR_UNDO_SET_MULTI_TAB_BG_COLOR+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Color Tabs" ; -}; -String STR_UNDO_MOVE_TAB+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Move Sheets" ; -}; -String STR_UNDO_COPY_TAB+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Copy Sheet" ; -}; -String STR_UNDO_APPEND_TAB+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Append sheet" ; -}; -String STR_UNDO_SHOWTAB+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Show Sheet" ; -}; -String STR_UNDO_SHOWTABS+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Show Sheets" ; -}; -String STR_UNDO_HIDETAB+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Hide sheet" ; -}; -String STR_UNDO_HIDETABS+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Hide sheets" ; -}; -String STR_UNDO_TAB_RTL+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Flip sheet" ; -}; -String STR_ABSREFLOST+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "The new table contains absolute references to other tables which may be incorrect!" ; -}; -String STR_NAMECONFLICT+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Due to identical names, an existing range name in the destination document has been altered!" ; -}; -String STR_ERR_AUTOFILTER+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "AutoFilter not possible" ; -}; -String STR_CREATENAME_REPLACE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Replace existing definition of #?" ; -}; -String STR_CREATENAME_MARKERR+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Invalid selection for range names" ; -}; -String STR_CONSOLIDATE_ERR1+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "References can not be inserted above the source data." ; -}; -String STR_SCENARIO_NOTFOUND+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Scenario not found" ; -}; -String STR_QUERY_DELENTRY+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Do you really want to delete the entry #?" ; -}; -String STR_VOBJ_OBJECT+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Objects/Images" ; -}; -String STR_VOBJ_CHART+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Charts" ; -}; -String STR_VOBJ_DRAWINGS+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Drawing Objects" ; -}; -String STR_VOBJ_MODE_SHOW+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Show" ; -}; -String STR_VOBJ_MODE_HIDE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Hide" ; -}; -String STR_SCATTR_PAGE_TOPDOWN+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Top to bottom" ; -}; -String STR_SCATTR_PAGE_LEFTRIGHT+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Left-to-right" ; -}; -String STR_SCATTR_PAGE_NOTES+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Comments" ; -}; -String STR_SCATTR_PAGE_GRID+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Grid" ; -}; -String STR_SCATTR_PAGE_HEADERS+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Row & Column Headers" ; -}; -String STR_SCATTR_PAGE_FORMULAS+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Formulas" ; -}; -String STR_SCATTR_PAGE_NULLVALS+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Zero Values" ; -}; -String STR_SCATTR_PAGE_PRINTDIR+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Print direction" ; -}; -String STR_SCATTR_PAGE_FIRSTPAGENO+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "First page number" ; -}; -String STR_SCATTR_PAGE_SCALE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Reduce/enlarge printout" ; -}; -String STR_SCATTR_PAGE_SCALETOPAGES+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Fit print range(s) on number of pages" ; -}; -String STR_SCATTR_PAGE_SCALETO+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Fit print range(s) to width/height" ; -}; -String STR_SCATTR_PAGE_SCALE_WIDTH+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Width" ; -}; -String STR_SCATTR_PAGE_SCALE_HEIGHT+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Height" ; -}; -String STR_SCATTR_PAGE_SCALE_PAGES+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "%1 page(s)" ; -}; -String STR_SCATTR_PAGE_SCALE_AUTO+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "automatic" ; -}; -String STR_DOC_STAT+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Statistics" ; -}; -String STR_LINKERROR+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "The link could not be updated." ; -}; -String STR_LINKERRORFILE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "File:" ; -}; -String STR_LINKERRORTAB+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Sheet:" ; -}; -String STR_OVERVIEW+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Overview" ; -}; -String STR_DOC_INFO+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Doc.Information" ; -}; -String STR_DOC_PRINTED+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Printed" ; -}; -String STR_BY+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "by" ; -}; -String STR_ON+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "on" ; -}; -String STR_RELOAD_TABLES+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "This file contains links to other files.\nShould they be updated?" ; -}; -String STR_REIMPORT_AFTER_LOAD+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "This file contains queries. The results of these queries were not saved.\nDo you want these queries to be repeated?" ; -}; -String STR_INSERT_FULL+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Filled cells cannot be shifted\nbeyond the sheet." ; -}; -String STR_TABINSERT_ERROR+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "The table could not be inserted." ; -}; -String STR_TABREMOVE_ERROR+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "The sheets could not be deleted." ; -}; -String STR_PASTE_ERROR+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "The contents of the clipboard could not be pasted." ; -}; -String STR_PASTE_FULL+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "There is not enough space on the sheet to insert here." ; -}; -String STR_PASTE_BIGGER+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "The content of the clipboard is bigger than the range selected.\nDo you want to insert it anyway?"; -}; -String STR_ERR_NOREF+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "No cell references are found in the selected cells." ; -}; -String STR_GRAPHICNAME+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Image" ; -}; -String STR_INVALIDNAME+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Invalid name." ; -}; -String STR_VALID_MACRONOTFOUND+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Selected macro not found." ; -}; -String STR_VALID_DEFERROR+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Invalid value." ; -}; -String STR_PROGRESS_CALCULATING+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "calculating" ; -}; -String STR_PROGRESS_SORTING+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "sorting" ; -}; -String STR_PROGRESS_HEIGHTING+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Adapt row height" ; -}; -String STR_PROGRESS_COMPARING+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Compare #" ; -}; -String STR_DETINVALID_OVERFLOW+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "The maximum number of invalid cells has been exceeded.\nNot all invalid cells have been marked." ; -}; -String STR_QUICKHELP_DELETE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Delete contents" ; -}; -String STR_QUICKHELP_REF+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "%1 R x %2 C" ; -}; -String STR_FUNCTIONLIST_MORE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "More..." ; -}; -String STR_ERR_INVALID_AREA+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Invalid range" ; -}; - // Templates for data pilot tables. -String STR_PIVOT_STYLE_INNER+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Pivot Table Value" ; -}; -String STR_PIVOT_STYLE_RESULT+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Pivot Table Result" ; -}; -String STR_PIVOT_STYLE_CATEGORY+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Pivot Table Category" ; -}; -String STR_PIVOT_STYLE_TITLE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Pivot Table Title" ; -}; -String STR_PIVOT_STYLE_FIELDNAME+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Pivot Table Field" ; -}; -String STR_PIVOT_STYLE_TOP+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Pivot Table Corner" ; -}; -String STR_OPERATION_FILTER+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Filter" ; -}; -String STR_OPERATION_SORT+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Sort" ; -}; -String STR_OPERATION_SUBTOTAL+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Subtotals" ; -}; -String STR_OPERATION_NONE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "None" ; -}; -String STR_IMPORT_REPLACE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Do you want to replace the contents of #?" ; -}; -String STR_TIP_WIDTH+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Width:" ; -}; -String STR_TIP_HEIGHT+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Height:" ; -}; -String STR_TIP_HIDE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Hide" ; -}; -String STR_CHANGED_BLANK+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "" ; -}; -String STR_CHANGED_CELL+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Cell #1 changed from '#2' to '#3'" ; -}; -String STR_CHANGED_INSERT+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "#1 inserted" ; -}; -String STR_CHANGED_DELETE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "#1 deleted" ; -}; -String STR_CHANGED_MOVE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Range moved from #1 to #2" ; -}; -String STR_END_REDLINING+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "This action will exit the change recording mode.\nAny information about changes will be lost.\n\nExit change recording mode?\n\n" ; -}; -String STR_CLOSE_ERROR_LINK+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "The document can not be closed while a link is being updated." ; -}; -String STR_UNDO_RESIZEMATRIX+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Adapt array area"; -}; -String STR_TIP_RESIZEMATRIX+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Array formula %1 R x %2 C"; -}; - -String STR_UNDO_HANGULHANJA+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Hangul/Hanja Conversion"; -}; - -String STR_NAME_INPUT_CELL+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Select Cell"; -}; -String STR_NAME_INPUT_RANGE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Select Range"; -}; -String STR_NAME_INPUT_DBRANGE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Select Database Range"; -}; -String STR_NAME_INPUT_ROW+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Go To Row"; -}; -String STR_NAME_INPUT_SHEET+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Go To Sheet"; -}; -String STR_NAME_INPUT_DEFINE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Define Name for Range"; -}; -String STR_NAME_ERROR_SELECTION+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "The selection needs to be rectangular in order to name it."; -}; -String STR_NAME_ERROR_NAME+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "You must enter a valid reference or type a valid name for the selected range."; -}; - -String STR_CHANGED_MOVE_REJECTION_WARNING+RID_GLOBSTR_OFFSET -{ - Text[ en-US ] = "WARNING: This action may have resulted in unintended changes to cell references in formulas."; -}; - -String STR_CHANGED_DELETE_REJECTION_WARNING+RID_GLOBSTR_OFFSET -{ - Text[ en-US ] = "WARNING: This action may have resulted in references to the deleted area not being restored."; -}; - -String STR_UNDO_CHINESE_TRANSLATION+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Chinese conversion"; -}; - -String STR_ERR_DATAPILOT_INPUT+RID_GLOBSTR_OFFSET -{ - Text[ en-US ] = "You cannot change this part of the pivot table."; -}; - -String STR_RECALC_MANUAL+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Manual"; -}; -String STR_RECALC_AUTO+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Automatic"; -}; -String STR_ERR_LONG_NESTED_ARRAY+RID_GLOBSTR_OFFSET -{ -Text [ en-US ] = "Nested arrays are not supported." ; -}; -String STR_UNDO_TEXTTOCOLUMNS+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Text to Columns"; -}; -String STR_DOC_UPDATED+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Your spreadsheet has been updated with changes saved by other users."; -}; -String STR_DOC_WILLBESAVED+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "The spreadsheet must be saved now to activate sharing mode.\n\nDo you want to continue?"; -}; -String STR_DOC_WILLNOTBESAVED+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Already resolved merge conflicts will be lost and your changes to the shared spreadsheet will not be saved.\n\nDo you want to continue?"; -}; -String STR_DOC_DISABLESHARED+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Disabling shared mode of a spreadsheet hinders all other users of the shared spreadsheet to merge back their work.\n\nDo you want to continue?"; -}; -String STR_DOC_NOLONGERSHARED+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "This spreadsheet is no longer in shared mode.\n\nSave your spreadsheet to a separate file and merge your changes to the shared spreadsheet manually."; -}; -String STR_SHARED_DOC_WARNING+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "The spreadsheet is in shared mode. This allows multiple users to access and edit the spreadsheet at the same time.\n\nChanges to formatting attributes like fonts, colors, and number formats will not be saved and some functionalities like editing charts and drawing objects are not available in shared mode. Turn off shared mode to get exclusive access needed for those changes and functionalities."; -}; -String STR_FILE_LOCKED_TRY_LATER+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "The shared spreadsheet file is locked due to a merge in progress by user: '%1'\n\nSharing mode of a locked file cannot be disabled. Try again later."; -}; -String STR_FILE_LOCKED_SAVE_LATER+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "The shared spreadsheet file is locked due to a merge in progress by user: '%1'\n\nTry again later to save your changes."; -}; -String STR_UNKNOWN_USER+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Unknown User"; -}; - -String STR_SHAPE_AUTOSHAPE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "AutoShape"; -}; - -String STR_SHAPE_RECTANGLE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Rectangle"; -}; - -String STR_SHAPE_LINE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Line"; -}; - -String STR_SHAPE_OVAL+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Oval"; -}; - -String STR_FORM_BUTTON+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Button"; -}; - -String STR_FORM_CHECKBOX+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Check Box"; -}; - -String STR_FORM_OPTIONBUTTON+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Option Button"; -}; - -String STR_FORM_LABEL+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Label"; -}; - -String STR_FORM_LISTBOX+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "List Box"; -}; - -String STR_FORM_GROUPBOX+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Group Box"; -}; - -String STR_FORM_DROPDOWN+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Drop Down"; -}; - -String STR_FORM_SPINNER+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Spinner"; -}; - -String STR_FORM_SCROLLBAR+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Scroll Bar"; -}; - -String STR_STYLE_FAMILY_CELL+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Cell Styles"; -}; -String STR_STYLE_FAMILY_PAGE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Page Styles"; -}; -String STR_ERR_DATAPILOTSOURCE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Pivot table source data is invalid."; -}; -String STR_OPTIONS_WARN_SEPARATORS+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Because the current formula separator settings conflict with the locale, the formula separators have been reset to their default values."; -}; -String STR_UNDO_INSERT_CURRENT_DATE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Insert Current Date"; -}; -String STR_UNDO_INSERT_CURRENT_TIME+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Insert Current Time"; -}; -String STR_MANAGE_NAMES+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Manage Names..."; -}; -String STR_HEADER_NAME+RID_GLOBSTR_OFFSET -{ - Text [en-US] = "Name"; -}; -String STR_HEADER_RANGE_OR_EXPR+RID_GLOBSTR_OFFSET -{ - Text [en-US] = "Range or formula expression"; -}; -String STR_HEADER_SCOPE+RID_GLOBSTR_OFFSET -{ - Text [en-US] = "Scope"; -}; -String STR_MULTI_SELECT+RID_GLOBSTR_OFFSET -{ - Text [en-US] = "(multiple)"; -}; -String STR_GLOBAL_SCOPE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Document (Global)" ; -}; -String STR_ERR_NAME_EXISTS+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Invalid name. Already in use for the selected scope."; -}; -String STR_ERR_NAME_INVALID+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Invalid name. Only use letters, numbers and underscore."; -}; -String STR_UNSAVED_EXT_REF+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "This Document contains external references to unsaved documents.\n\nDo you want to continue?"; -}; -String STR_CLOSE_WITH_UNSAVED_REFS+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "This Document is referenced by another document and not yet saved. Closing it without saving will result in data loss."; -}; -String STR_HEADER_RANGE+RID_GLOBSTR_OFFSET -{ - Text [en-US] = "Range"; -}; -String STR_HEADER_COND+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "First Condition"; -}; -String STR_COND_CONDITION+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Cell value is"; -}; -String STR_COND_COLORSCALE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "ColorScale"; -}; -String STR_COND_DATABAR+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "DataBar"; -}; -String STR_COND_ICONSET+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "IconSet"; -}; -String STR_COND_BETWEEN+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "between"; -}; -String STR_COND_NOTBETWEEN+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "not between"; -}; -String STR_COND_UNIQUE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "unique"; -}; -String STR_COND_DUPLICATE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "duplicate"; -}; -String STR_COND_FORMULA+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Formula is"; -}; -String STR_COND_TOP10+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Top Elements"; -}; -String STR_COND_BOTTOM10+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Bottom Elements"; -}; -String STR_COND_TOP_PERCENT+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Top Percent"; -}; -String STR_COND_DATE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Date is"; -}; -String STR_COND_BOTTOM_PERCENT+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Bottom Percent"; -}; -String STR_COND_ABOVE_AVERAGE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Above Average"; -}; -String STR_COND_BELOW_AVERAGE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Below Average"; -}; -String STR_COND_ABOVE_EQUAL_AVERAGE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Above or equal Average"; -}; -String STR_COND_BELOW_EQUAL_AVERAGE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Below or equal Average"; -}; -String STR_COND_ERROR+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "an Error code"; -}; -String STR_COND_NOERROR+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "not an Error code"; -}; -String STR_COND_BEGINS_WITH+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Begins with"; -}; -String STR_COND_ENDS_WITH+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Ends with"; -}; -String STR_COND_CONTAINS+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Contains"; -}; -String STR_COND_NOT_CONTAINS+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Not Contains"; -}; -String STR_COND_TODAY+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "today"; -}; -String STR_COND_YESTERDAY+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "yesterday"; -}; -String STR_COND_TOMORROW+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "tomorrow"; -}; -String STR_COND_LAST7DAYS+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "in the last 7 days"; -}; -String STR_COND_THISWEEK+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "this week"; -}; -String STR_COND_LASTWEEK+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "last week"; -}; -String STR_COND_NEXTWEEK+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "next week"; -}; -String STR_COND_THISMONTH+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "this month"; -}; -String STR_COND_LASTMONTH+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "last month"; -}; -String STR_COND_NEXTMONTH+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "next month"; -}; -String STR_COND_THISYEAR+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "this year"; -}; -String STR_COND_LASTYEAR+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "last year"; -}; -String STR_COND_NEXTYEAR+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "next year"; -}; -String STR_COND_AND+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "and"; -}; -String STR_ERR_CONDFORMAT_PROTECTED+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Conditional Formats can not be created, deleted or changed in protected sheets!"; -}; -String STR_EDIT_EXISTING_COND_FORMATS+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "The selected cell already contains conditional formatting. You can either edit the existing conditional format or you define a new overlapping conditional format.\n\n Do you want to edit the existing conditional format?"; -}; - -String STR_QUERY_FORMULA_RECALC_ONLOAD_ODS+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "This document was last saved by an application other than %PRODUCTNAME. Some formula cells may produce different results when recalculated.\n\nDo you want to recalculate all formula cells in this document now?"; -}; - -String STR_QUERY_FORMULA_RECALC_ONLOAD_XLS+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "This document was last saved by Excel. Some formula cells may produce different results when recalculated.\n\nDo you want to recalculate all formula cells now?"; -}; - -String STR_ALWAYS_PERFORM_SELECTED+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Always perform this without prompt in the future."; -}; - -String STR_NO_INSERT_DELETE_OVER_PIVOT_TABLE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "You cannot insert or delete cells when the affected range intersects with pivot table."; -}; - -String STR_DPFIELD_GROUP_BY_SECONDS+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Seconds" ; -}; -String STR_DPFIELD_GROUP_BY_MINUTES+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Minutes" ; -}; -String STR_DPFIELD_GROUP_BY_HOURS+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Hours" ; -}; -String STR_DPFIELD_GROUP_BY_DAYS+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Days" ; -}; -String STR_DPFIELD_GROUP_BY_MONTHS+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Months" ; -}; -String STR_DPFIELD_GROUP_BY_QUARTERS+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Quarters" ; -}; -String STR_DPFIELD_GROUP_BY_YEARS+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Years" ; -}; -String STR_INVALIDVAL+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Invalid target value." ; -}; -String STR_INVALIDVAR+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Undefined name for variable cell." ; -}; -String STR_INVALIDFORM+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Undefined name as formula cell." ; -}; -String STR_NOFORMULA+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Formula cell must contain a formula." ; -}; -String STR_INVALIDINPUT+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Invalid input." ; -}; -String STR_INVALIDCONDITION+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Invalid condition." ; -}; -String STR_QUERYREMOVE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Should the entry\n#\nbe deleted?" ; -}; -String STR_COPYLIST+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Copy List" ; -}; -String STR_COPYFROM+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "List from" ; -}; -String STR_COPYERR+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Cells without text have been ignored." ; -}; -String STR_CTRLCLICKHYPERLINK+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "%s-click to follow hyperlink:"; -}; -String STR_CLICKHYPERLINK+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "click to open hyperlink:"; -}; - -String STR_PRINT_PREVIEW_NODATA+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "No Data"; -}; - -String STR_PRINT_PREVIEW_EMPTY_RANGE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Print Range Empty"; -}; - -String STR_UNDO_CONDFORMAT+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Conditional Format"; -}; - -String STR_UNDO_CONDFORMAT_LIST+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Conditional Formats"; -}; - -String STR_UNDO_FORMULA_TO_VALUE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Convert Formula To Value"; -}; -String STR_UNQUOTED_STRING+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Strings without quotes are interpreted as column/row labels."; -}; -String STR_ENTER_VALUE+RID_GLOBSTR_OFFSET -{ - Text[ en-US ] = "Enter a value!"; -}; -String STR_TABLE_COUNT+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Sheet %1 of %2"; -}; -String STR_FUNCTIONS_FOUND+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "%1 and %2 more"; -}; -String STR_GENERAL+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "General"; -}; -String STR_NUMBER+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Number"; -}; -String STR_PERCENT+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Percent"; -}; -String STR_CURRENCY+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Currency"; -}; -String STR_DATE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Date"; -}; -String STR_TIME+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Time"; -}; -String STR_SCIENTIFIC+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Scientific"; -}; -String STR_FRACTION+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Fraction"; -}; -String STR_BOOLEAN_VALUE+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Boolean Value"; -}; -String STR_TEXT+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Text"; -}; -String STR_QUERY_PIVOTTABLE_DELTAB+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "The selected sheet(s) contain source data of related pivot tables that will be lost. Are you sure you want to delete the selected sheet(s)?"; -}; -String STR_ERR_NAME_INVALID_CELL_REF+RID_GLOBSTR_OFFSET -{ - Text [ en-US ] = "Invalid name. Reference to a cell, or a range of cells not allowed."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/src/sc.src b/sc/source/ui/src/sc.src deleted file mode 100644 index 7cc96981288f..000000000000 --- a/sc/source/ui/src/sc.src +++ /dev/null @@ -1,27 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * 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 "sc.hrc" - - // ??? -String 30001 { Text = "Dummy1" ; }; -String 30002 { Text = "Dummy2" ; }; -String 30006 { Text = "Dummy3" ; }; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/src/scerrors.src b/sc/source/ui/src/scerrors.src deleted file mode 100644 index f9ad6237b843..000000000000 --- a/sc/source/ui/src/scerrors.src +++ /dev/null @@ -1,106 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#include "scerrors.hxx" -#include "sc.hrc" - -StringArray RID_ERRHDLSC -{ - ItemList [ en-US ] = - { - // ERRORS ----------------------------------------------------- - < "Impossible to connect to the file." ; - SCERR_IMPORT_CONNECT & ERRCODE_RES_MASK ; >; - < "File could not be opened." ; - SCERR_IMPORT_OPEN & ERRCODE_RES_MASK ; >; - < "An unknown error has occurred." ; - SCERR_IMPORT_UNKNOWN & ERRCODE_RES_MASK ; >; - < "Not enough memory while importing." ; - SCERR_IMPORT_OUTOFMEM & ERRCODE_RES_MASK ; >; - < "Unknown Lotus1-2-3 file format." ; - SCERR_IMPORT_UNKNOWN_WK & ERRCODE_RES_MASK ; >; - < "Error in file structure while importing." ; - SCERR_IMPORT_FORMAT & ERRCODE_RES_MASK ; >; - < "There is no filter available for this file type." ; - SCERR_IMPORT_NI & ERRCODE_RES_MASK ; >; - < "Unknown or unsupported Excel file format." ; - SCERR_IMPORT_UNKNOWN_BIFF & ERRCODE_RES_MASK ; >; - < "Excel file format not yet implemented." ; - SCERR_IMPORT_NI_BIFF & ERRCODE_RES_MASK ; >; - < "This file is password-protected." ; - SCERR_IMPORT_FILEPASSWD & ERRCODE_RES_MASK ; >; - < "Internal import error." ; - SCERR_IMPORT_INTERNAL & ERRCODE_RES_MASK ; >; - < "The file contains data after row 8192 and therefore can not be read." ; - SCERR_IMPORT_8K_LIMIT & ERRCODE_RES_MASK ; >; - < "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(row,col)."; - SCERR_IMPORT_FILE_ROWCOL & ERRCODE_RES_MASK ; >; - < "File format error found at $(ARG1)(row,col)." ; - SCERR_IMPORT_FORMAT_ROWCOL & ERRCODE_RES_MASK ; >; - - // Export ---------------------------------------------------- - < "Connection to the file could not be established." ; - SCERR_EXPORT_CONNECT & ERRCODE_RES_MASK ; >; - < "Data could not be written." ; - SCERR_EXPORT_DATA & ERRCODE_RES_MASK ; >; - < "$(ARG1)" ; - SCERR_EXPORT_SQLEXCEPTION & ERRCODE_RES_MASK ; >; - < "Cell $(ARG1) contains characters that are not representable in the selected target character set \"$(ARG2)\"." ; - SCERR_EXPORT_ENCODING & ERRCODE_RES_MASK ; >; - < "Cell $(ARG1) contains a string that is longer in the selected target character set \"$(ARG2)\" than the given field width." ; - SCERR_EXPORT_FIELDWIDTH & ERRCODE_RES_MASK ; >; - - // WARNINGS --------------------------------------------------- - < "Only the active sheet was saved." ; - SCWARN_EXPORT_ASCII & ERRCODE_RES_MASK ; >; - < "The maximum number of rows has been exceeded. Excess rows were not imported!" ; - SCWARN_IMPORT_RANGE_OVERFLOW & ERRCODE_RES_MASK ; >; - < "The data could not be loaded completely because the maximum number of rows per sheet was exceeded." ; - SCWARN_IMPORT_ROW_OVERFLOW & ERRCODE_RES_MASK ; >; - < "The data could not be loaded completely because the maximum number of columns per sheet was exceeded." ; - SCWARN_IMPORT_COLUMN_OVERFLOW & ERRCODE_RES_MASK ; >; - < "Not all sheets have been loaded because the maximum number of sheets was exceeded.\n\nPlease be warned that re-saving this document will permanently delete those sheets that have not been loaded!" ; - SCWARN_IMPORT_SHEET_OVERFLOW & ERRCODE_RES_MASK ; >; - < "The data could not be loaded completely because the maximum number of characters per cell was exceeded." ; - SCWARN_IMPORT_CELL_OVERFLOW & ERRCODE_RES_MASK ; >; - < "Corresponding FM3-File could not be opened." ; - SCWARN_IMPORT_OPEN_FM3 & ERRCODE_RES_MASK ; >; - < "Error in file structure of corresponding FM3-File." ; - SCWARN_IMPORT_WRONG_FM3 & ERRCODE_RES_MASK ; >; - < "Document too complex for automatic calculation. Press F9 to recalculate." ; - SCWARN_CORE_HARD_RECALC & ERRCODE_RES_MASK ; >; - < "The document contains more rows than supported in the selected format.\nAdditional rows were not saved." ; - SCWARN_EXPORT_MAXROW & ERRCODE_RES_MASK ; >; - < "The document contains more columns than supported in the selected format.\nAdditional columns were not saved." ; - SCWARN_EXPORT_MAXCOL & ERRCODE_RES_MASK ; >; - < "The document contains more sheets than supported in the selected format.\nAdditional sheets were not saved." ; - SCWARN_EXPORT_MAXTAB & ERRCODE_RES_MASK ; >; - < "The document contains information not recognized by this program version.\nResaving the document will delete this information!" ; - SCWARN_IMPORT_INFOLOST & ERRCODE_RES_MASK ; >; - < "Not all cell contents could be saved in the specified format." ; - SCWARN_EXPORT_DATALOST & ERRCODE_RES_MASK ; >; - < "The following characters could not be converted to the selected character set\nand were written as Ӓ surrogates:\n\n$(ARG1)"; - SCWARN_EXPORT_NONCONVERTIBLE_CHARS & ERRCODE_RES_MASK ; >; - < "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(row,col)."; - SCWARN_IMPORT_FILE_ROWCOL & ERRCODE_RES_MASK ; >; - < "Not all attributes could be read." ; - SCWARN_IMPORT_FEATURES_LOST & ERRCODE_RES_MASK ; >; - }; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src deleted file mode 100644 index 82b369afacc5..000000000000 --- a/sc/source/ui/src/scfuncs.src +++ /dev/null @@ -1,4875 +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 . - */ - -/* Resource file for the function wizard / autopilot. - * - * For every function there is a StringArray with a resource id (offset by - * RID_SC_FUNC_DESCRIPTIONS_START) with the OpCode of the function - * - * In this stringarray, the description of the function is given as the first - * entry, followed by two entries for each parameter, first the type or name - * of the parameter, second a description of the parameter. - */ - -#include "scfuncs.hrc" -#include "formula/compiler.hrc" - - // -=*# Resource for function DCOUNT #*=- -StringArray SC_OPCODE_DB_COUNT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Counts the cells of a data range whose contents match the search criteria." ; >; - < "Database" ; >; - < "The range of cells containing data." ; >; - < "Database field" ; >; - < "Indicates which database field (column) is to be used for the search criteria." ; >; - < "Search criteria" ; >; - < "Defines the cell range containing the search criteria." ; >; - }; -}; - // -=*# Resource for function DCOUNTA #*=- -StringArray SC_OPCODE_DB_COUNT_2+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Counts all non-blank cells of a data range where the content corresponds to the search criteria." ; >; - < "Database" ; >; - < "The range of cells containing data." ; >; - < "Database field" ; >; - < "Indicates which database field (column) is to be used for the search criteria." ; >; - < "Search criteria" ; >; - < "Defines the cell range containing the search criteria." ; >; - }; -}; - // -=*# Resource for function DAVERAGE #*=- -StringArray SC_OPCODE_DB_AVERAGE+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the average value of all the cells of a data range whose contents match the search criteria." ; >; - < "Database" ; >; - < "The range of cells containing data." ; >; - < "Database field" ; >; - < "Indicates which database field (column) is to be used for the search criteria." ; >; - < "Search criteria" ; >; - < "Defines the cell range containing the search criteria." ; >; - }; -}; - // -=*# Resource for function DGET #*=- -StringArray SC_OPCODE_DB_GET+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Defines the contents of the cell of a data range which matches the search criteria." ; >; - < "Database" ; >; - < "The range of cells containing data." ; >; - < "Database field" ; >; - < "Indicates which database field (column) is to be used for the search criteria." ; >; - < "Search criteria" ; >; - < "Defines the cell range containing the search criteria." ; >; - }; -}; - // -=*# Resource for function DMAX #*=- -StringArray SC_OPCODE_DB_MAX+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the maximum value from all of the cells of a data range which correspond to the search criteria." ; >; - < "Database" ; >; - < "The range of cells containing data." ; >; - < "Database field" ; >; - < "Indicates which database field (column) is to be used for the search criteria." ; >; - < "Search criteria" ; >; - < "Defines the cell range containing the search criteria." ; >; - }; -}; - // -=*# Resource for function DMIN #*=- -StringArray SC_OPCODE_DB_MIN+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the minimum of all cells of a data range where the contents correspond to the search criteria." ; >; - < "Database" ; >; - < "The range of cells containing data." ; >; - < "Database field" ; >; - < "Indicates which database field (column) is to be used for the search criteria." ; >; - < "Search criteria" ; >; - < "Defines the cell range containing the search criteria." ; >; - }; -}; - // -=*# Resource for function DPRODUCT #*=- -StringArray SC_OPCODE_DB_PRODUCT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Multiplies all cells of a data range where the contents match the search criteria." ; >; - < "Database" ; >; - < "The range of cells containing data." ; >; - < "Database field" ; >; - < "Indicates which database field (column) is to be used for the search criteria." ; >; - < "Search criteria" ; >; - < "Defines the cell range containing the search criteria." ; >; - }; -}; - // -=*# Resource for function DSTDEV #*=- -StringArray SC_OPCODE_DB_STD_DEV+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the standard deviation of all cells in a data range whose contents match the search criteria." ; >; - < "Database" ; >; - < "The range of cells containing data." ; >; - < "Database field" ; >; - < "Indicates which database field (column) is to be used for the search criteria." ; >; - < "Search criteria" ; >; - < "Defines the cell range containing the search criteria." ; >; - }; -}; - // -=*# Resource for function DSTDEVP #*=- -StringArray SC_OPCODE_DB_STD_DEV_P+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the standard deviation with regards to the population of all cells of a data range matching the search criteria." ; >; - < "Database" ; >; - < "The range of cells containing data." ; >; - < "Database field" ; >; - < "Indicates which database field (column) is to be used for the search criteria." ; >; - < "Search criteria" ; >; - < "Defines the cell range containing the search criteria." ; >; - }; -}; - // -=*# Resource for function DSUM #*=- -StringArray SC_OPCODE_DB_SUM+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Adds all the cells of a data range where the contents match the search criteria." ; >; - < "Database" ; >; - < "The range of cells containing data." ; >; - < "Database field" ; >; - < "Indicates which database field (column) is to be used for the search criteria." ; >; - < "Search criteria" ; >; - < "Defines the cell range containing the search criteria." ; >; - }; -}; - // -=*# Resource for function DVAR #*=- -StringArray SC_OPCODE_DB_VAR+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Determines the variance of all the cells in a data range where the contents match the search criteria." ; >; - < "Database" ; >; - < "The range of cells containing data." ; >; - < "Database field" ; >; - < "Indicates which database field (column) is to be used for the search criteria." ; >; - < "Search criteria" ; >; - < "Defines the cell range containing the search criteria." ; >; - }; -}; - // -=*# Resource for function DVARP #*=- -StringArray SC_OPCODE_DB_VAR_P+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Determines variance of a population based on all cells in a data range where contents match the search criteria." ; >; - < "Database" ; >; - < "The range of cells containing data." ; >; - < "Database field" ; >; - < "Indicates which database field (column) is to be used for the search criteria." ; >; - < "Search criteria" ; >; - < "Defines the cell range containing the search criteria." ; >; - }; -}; - // -=*# Resource for function DATE #*=- -StringArray SC_OPCODE_GET_DATE+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Provides an internal number for the date given." ; >; - < "year" ; >; - < "An integer between 1583 and 9956 or 0 and 99 (19xx or 20xx depending on the defined option)." ; >; - < "month" ; >; - < "An integer between 1 and 12 representing the month." ; >; - < "day" ; >; - < "An integer between 1 and 31 representing the day of the month." ; >; - }; -}; - // -=*# Resource for function DATE_VALUE #*=- -StringArray SC_OPCODE_GET_DATE_VALUE+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns an internal number for a text having a possible date format." ; >; - < "text" ; >; - < "A text enclosed in quotation marks which returns a date in a %PRODUCTNAME date format." ; >; - }; -}; - // -=*# Resource for function DAY #*=- -StringArray SC_OPCODE_GET_DAY+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the sequential date of the month as an integer (1-31) in relation to the date value." ; >; - < "Number" ; >; - < "The internal number for the date." ; >; - }; -}; - // -=*# Resource for function DAYS360 #*=- -StringArray SC_OPCODE_GET_DIFF_DATE_360+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the number of days between two dates based on a 360-day year." ; >; - < "Date_1" ; >; - < "The start date for calculating the difference in days." ; >; - < "Date_2" ; >; - < "The end date for calculating the difference in days." ; >; - < "Type" ; >; - < "Method used to form differences: Type = 0 denotes US method (NASD), Type = 1 denotes the European method." ; >; - }; -}; - // -=*# Resource for function NETWORKDAYS #*=- -StringArray SC_OPCODE_NETWORKDAYS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the number of workdays between two dates using arguments to indicate weekenddays and holidays." ; >; - < "Start Date" ; >; - < "Start date for calculation." ; >; - < "End Date" ; >; - < "End date for calculation." ; >; - < "list of dates" ; >; - < "Optional set of one or more dates to be considered as holiday." ; >; - < "array" ; >; - < "Optional list of numbers to indicate working (0) and weekend (non-zero) days. When omitted, weekend is Saturday and Sunday." ; >; - }; -}; - // -=*# Resource for function NETWORKDAYS.INTL #*=- -StringArray SC_OPCODE_NETWORKDAYS_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the number of workdays between two dates using arguments to indicate weekend days and holidays." ; >; - < "Start Date" ; >; - < "Start date for calculation." ; >; - < "End Date" ; >; - < "End date for calculation." ; >; - < "number or string" ; >; - < "Optional number or string to indicate when weekends occur. When omitted, weekend is Saturday and Sunday." ; >; - < "array" ; >; - < "Optional set of one or more dates to be considered as holiday." ; >; - }; -}; - // -=*# Resource for function WORKDAY.INTL #*=- -StringArray SC_OPCODE_WORKDAY_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the serial number of the date before or after a number of workdays using arguments to indicate weekend days and holidays." ; >; - < "Start Date" ; >; - < "Start date for calculation." ; >; - < "Days" ; >; - < "The number of workdays before or after start date." ; >; - < "number or string" ; >; - < "Optional number or string to indicate when weekends occur. When omitted, weekend is Saturday and Sunday." ; >; - < "array" ; >; - < "Optional set of one or more dates to be considered as holiday." ; >; - }; -}; - // -=*# Resource for function HOUR #*=- -StringArray SC_OPCODE_GET_HOUR+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Determines the sequential number of the hour of the day (0-23) for the time value." ; >; - < "Number" ; >; - < "Internal time value" ; >; - }; -}; - // -=*# Resource for function MINUTE #*=- -StringArray SC_OPCODE_GET_MIN+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Determines the sequential number for the minute of the hour (0-59) for the time value." ; >; - < "Number" ; >; - < "Internal time value." ; >; - }; -}; - // -=*# Resource for function MONTH #*=- -StringArray SC_OPCODE_GET_MONTH+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Determines the sequential number of a month of the year (1-12) for the date value." ; >; - < "Number" ; >; - < "The internal number of the date." ; >; - }; -}; - // -=*# Resource for function NOW #*=- -StringArray SC_OPCODE_GET_ACT_TIME+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Determines the current time of the computer." ; >; - }; -}; - // -=*# Resource for function SECOND #*=- -StringArray SC_OPCODE_GET_SEC+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Determines the sequential number of the second of a minute (0-59) for the time value." ; >; - < "Number" ; >; - < "The internal time value." ; >; - }; -}; - // -=*# Resource for function TIME #*=- -StringArray SC_OPCODE_GET_TIME+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Determines a time value from the details for hour, minute and second." ; >; - < "hour" ; >; - < "The integer for the hour." ; >; - < "minute" ; >; - < "The integer for the minute." ; >; - < "second" ; >; - < "The integer for the second." ; >; - }; -}; - // -=*# Resource for function TIMEVALUE #*=- -StringArray SC_OPCODE_GET_TIME_VALUE+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns a sequential number for a text shown in a possible time entry format." ; >; - < "text" ; >; - < "A text enclosed in quotation marks which returns a time in a %PRODUCTNAME time format." ; >; - }; -}; - // -=*# Resource for function TODAY #*=- -StringArray SC_OPCODE_GET_ACT_DATE+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Determines the current date of the computer." ; >; - }; -}; - // -=*# Resource for function WEEKDAY #*=- -StringArray SC_OPCODE_GET_DAY_OF_WEEK+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the day of the week for the date value as an integer." ; >; - < "Number" ; >; - < "The internal number for the date." ; >; - < "Type" ; >; - < "Fixes the beginning of the week and the type of calculation to be used." ; >; - }; -}; - // -=*# Resource for function YEAR #*=- -StringArray SC_OPCODE_GET_YEAR+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the year of a date value as an integer." ; >; - < "Number" ; >; - < "Internal number of the date." ; >; - }; -}; - // -=*# Resource for function DAYS #*=- -StringArray SC_OPCODE_GET_DIFF_DATE+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the number of days between two dates." ; >; - < "Date_2" ; >; - < "The end date for calculating the difference in days." ; >; - < "Date_1" ; >; - < "The start date for calculating the difference in days." ; >; - }; -}; - // -=*# Resource for function DATEDIF #*=- -StringArray SC_OPCODE_GET_DATEDIF+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the number of whole days, months or years between 'start date' and 'end date'."; >; - - < "Start date"; >; - - < "The start date."; >; - - < "End date"; >; - - < "The end date."; >; - - < "Interval"; >; - - < "Interval to be calculated. Can be \"d\", \"m\", \"y\", \"ym\", \"md\" or \"yd\"."; >; - }; -}; - // -=*# Resource for function WEEKNUM #*=- -StringArray SC_OPCODE_WEEK+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the calendar week corresponding to the given date." ; >; - < "Number" ; >; - < "The internal number of the date." ; >; - < "mode" ; >; - < "Indicates the first day of the week and when week 1 starts." ; >; - }; -}; - // -=*# Resource for function ISOWEEKNUM #*=- -StringArray SC_OPCODE_ISOWEEKNUM+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the ISO 8601 calendar week for the given date." ; >; - < "Number" ; >; - < "The internal number of the date." ; >; - }; -}; -StringArray SC_OPCODE_WEEKNUM_OOO+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the calendar week corresponding to the given date.\nThis function only provides interoperability with %PRODUCTNAME 5.0 and earlier and OpenOffice.org." ; >; - < "Number" ; >; - < "The internal number of the date." ; >; - < "mode" ; >; - < "Indicates the first day of the week (1 = Sunday, other values = Monday)." ; >; - }; -}; - // -=*# Resource for function EASTERSUNDAY #*=- -StringArray SC_OPCODE_EASTERSUNDAY+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the date of Easter Sunday in a given year."; >; - < "year"; >; - < "An integer between 1583 and 9956, or 0 and 99 (19xx or 20xx depending on the option set)."; >; - }; -}; - // -=*# Resource for function PV #*=- -StringArray SC_OPCODE_PV+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Present value. Calculates the present value of an investment." ; >; - < "Rate" ; >; - < "The rate of interest for the period given." ; >; - < "NPER" ; >; - < "The payment period. The total number of periods in which the annuity is paid." ; >; - < "PMT" ; >; - < "Regular payments. The constant amount of annuity that is paid in each period." ; >; - < "FV" ; >; - < "Future value. The value (final value) to be attained after the last payment." ; >; - < "Type" ; >; - < "Type = 1 denotes due at the beginning of the period, = 0 at the end." ; >; - }; -}; - // -=*# Resource for function FV #*=- -StringArray SC_OPCODE_FV+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Future value. Returns the future value of an investment based on regular payments and a constant interest rate." ; >; - < "Rate" ; >; - < "The rate of interest per period." ; >; - < "NPER" ; >; - < "Payment period. The total number of periods in which the annuity (pension) is paid." ; >; - < "PMT" ; >; - < "Regular payments. The constant annuity to be paid in each period." ; >; - < "PV" ; >; - < "Present value. The current value of a series of payments" ; >; - < "Type" ; >; - < "Type = 1 denotes due at the beginning of the period, = 0 at the end." ; >; - }; -}; - // -=*# Resource for function NPER #*=- -StringArray SC_OPCODE_NPER+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Payment period. Calculates the number of payment periods for an investment based on regular payments and a constant interest rate." ; >; - < "Rate" ; >; - < "The rate of interest per period." ; >; - < "PMT" ; >; - < "Regular payments. The constant annuity to be paid in each period." ; >; - < "PV" ; >; - < "Present value. The current value of a series of payments" ; >; - < "FV" ; >; - < "Future value. The value (end value) to be attained after the final payment." ; >; - < "Type" ; >; - < "Type = 1 denotes due at the beginning of the period, = 0 at the end." ; >; - }; -}; - // -=*# Resource for function PMT #*=- -StringArray SC_OPCODE_PMT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Regular payments. Returns the periodic payment of an annuity, based on regular payments and a fixed periodic interest rate." ; >; - < "Rate" ; >; - < "The rate of interest per period." ; >; - < "NPER" ; >; - < "Payment period. The total number of periods in which the annuity (pension) is paid." ; >; - < "PV" ; >; - < "Present value. The current value of a series of payments" ; >; - < "FV" ; >; - < "Future value. The value (end value) to be attained after the final payment." ; >; - < "Type" ; >; - < "Type = 1 denotes due at the beginning of the period, = 0 at the end." ; >; - }; -}; - // -=*# Resource for function RATE #*=- -StringArray SC_OPCODE_RATE+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the constant interest rate of an investment with regular payments." ; >; - < "NPER" ; >; - < "Payment period. The total number of periods in which the annuity (pension) is paid." ; >; - < "PMT" ; >; - < "Regular payments. The constant annuity to be paid in each period." ; >; - < "PV" ; >; - < "Present value. The current value of a series of payments" ; >; - < "FV" ; >; - < "Future value. The value (end value) to be attained after the final payment." ; >; - < "Type" ; >; - < "Type = 1 denotes due at the beginning of the period, = 0 at the end." ; >; - < "Guess" ; >; - < "Guess. The estimate of the interest rate for the iterative calculating method." ; >; - }; -}; - // -=*# Resource for function IPMT #*=- -StringArray SC_OPCODE_IPMT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Compounded interest. Calculates the interest payment on the principal for an investment with regular payments and a constant interest rate for a given period." ; >; - < "Rate" ; >; - < "The rate of interest per period." ; >; - < "Period" ; >; - < "Periods. The periods for which the compounded interest is to be calculated. P = 1 denotes for the first period, P = NPER for the last one." ; >; - < "NPER" ; >; - < "Payment period. The total number of periods in which the annuity (pension) is paid." ; >; - < "pv" ; >; - < "Present value. The current value of a series of payments" ; >; - < "FV" ; >; - < "Future value. The value (end value) to be attained after the final payment." ; >; - < "Type" ; >; - < "Type = 1 denotes due at the beginning of the period, = 0 at the end." ; >; - }; -}; - // -=*# Resource for function PPMT #*=- -StringArray SC_OPCODE_PPMT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Repayment. Calculates the repayment amount for a period for an investment whereby the payments are at regular intervals and the interest rate constant." ; >; - < "Rate" ; >; - < "The interest rate per period." ; >; - < "Period" ; >; - < "Period. The period for which the repayments are to be calculated. Per = 1 denotes for the first period, P = NPER for the last" ; >; - < "NPER" ; >; - < "The payment period. The total number of periods in which the annuity (pension) is paid." ; >; - < "PV" ; >; - < "The present value. The present value or the amount the annuity is currently worth." ; >; - < "FV" ; >; - < "Future value. The value (end value) attained after the last payment has been made." ; >; - < "Type" ; >; - < "Type = 1 denotes due at the beginning of the period, = 0 at the end." ; >; - }; -}; - // -=*# Resource for function CUMPRINC #*=- -StringArray SC_OPCODE_CUM_PRINC+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Cumulative Capital. Calculates the total amount of the repayment share in a period for an investment with constant interest rate." ; >; - < "Rate" ; >; - < "The rate of interest per period." ; >; - < "NPER" ; >; - < "Payment period. The total number of periods in which the annuity (pension) is paid." ; >; - < "PV" ; >; - < "The present value. The present value or the amount the annuity is currently worth." ; >; - < "S" ; >; - < "The start period. The first period to be taken into account. S = 1 denotes the very first period." ; >; - < "E" ; >; - < "End period. The last period to be taken into account." ; >; - < "Type" ; >; - < "Type = 1 denotes due at the beginning of the period, = 0 at the end." ; >; - }; -}; - // -=*# Resource for function CUMIPMT #*=- -StringArray SC_OPCODE_CUM_IPMT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Cumulative compounded interest. Calculates the total amount of the interest share in a period for an investment with a constant interest rate." ; >; - < "Rate" ; >; - < "The rate of interest per period." ; >; - < "NPER" ; >; - < "Payment period. The total number of periods in which the annuity (pension) is paid." ; >; - < "pv" ; >; - < "The present value. The present value or the amount the annuity is currently worth." ; >; - < "S" ; >; - < "The start period. The first period to be taken into account. S = 1 denotes the very first period." ; >; - < "E" ; >; - < "The end period. The last period to be taken into account." ; >; - < "Type" ; >; - < "Type = 1 denotes due at the beginning of the period, = 0 at the end." ; >; - }; -}; - // -=*# Resource for function SYD #*=- -StringArray SC_OPCODE_SYD+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the arithmetically declining value of an asset (depreciation) for a specified period." ; >; - < "Cost" ; >; - < "Acquisition costs. The initial cost of the asset." ; >; - < "Salvage" ; >; - < "Salvage: The remaining value of the asset at the end of its life." ; >; - < "Life" ; >; - < "Useful life. The number of periods in the useful life of the asset." ; >; - < "Period" ; >; - < "Period. The depreciation period which must have the same time unit as average useful life." ; >; - }; -}; - // -=*# Resource for function SLN #*=- -StringArray SC_OPCODE_SLN+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the linear depreciation per period." ; >; - < "Cost" ; >; - < "Acquisition cost. The initial cost of an asset." ; >; - < "Salvage" ; >; - < "Salvage: The remaining value of the asset at the end of its life." ; >; - < "Life" ; >; - < "Useful life. The number of periods in the useful life of the asset." ; >; - }; -}; - // -=*# Resource for function DDB #*=- -StringArray SC_OPCODE_DDB+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the depreciation of an asset for a specific period using the double-declining balance method or declining balance factor." ; >; - < "Cost" ; >; - < "Acquisition costs. The initial cost of the asset." ; >; - < "Salvage" ; >; - < "Salvage: The remaining value of the asset at the end of its life." ; >; - < "Life" ; >; - < "Useful life. The number of periods in the useful life of the asset." ; >; - < "Period" ; >; - < "Period. The depreciation period in the same time unit as the average useful life entry." ; >; - < "Factor" ; >; - < "Factor. The factor for balance decline. F = 2 means a double declining balance factor" ; >; - }; -}; - // -=*# Resource for function DB #*=- -StringArray SC_OPCODE_DB+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the real depreciation of an asset for a specified period using the fixed-declining balance method." ; >; - < "Cost" ; >; - < "Acquisition costs: The initial cost of the asset." ; >; - < "Salvage" ; >; - < "Salvage: The remaining value of the asset at the end of its life." ; >; - < "Life" ; >; - < "Useful life. The number of periods in the useful life of the asset." ; >; - < "Period" ; >; - < "Periods: The period for which the depreciation is calculated. The time unit used for period must be the same as that for the useful life." ; >; - < "month" ; >; - < "Months: The number of months in the first year of depreciation." ; >; - }; -}; - // -=*# Resource for function VDB #*=- -StringArray SC_OPCODE_VBD+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Variable declining balance. Returns the declining balance depreciation for a particular period." ; >; - < "Cost" ; >; - < "Cost. The initial cost of the asset." ; >; - < "Salvage" ; >; - < "Salvage. The salvage value of an asset at the end of its useful life." ; >; - < "Life" ; >; - < "Useful life. The number of periods in the useful life of the asset." ; >; - < "S" ; >; - < "Start. The first period for depreciation in the same time unit as the useful life." ; >; - < "end" ; >; - < "End. The last period of the depreciation using the same time unit as for the useful life." ; >; - < "Factor" ; >; - < "Factor. The factor for the reduction of the depreciation. F = 2 denotes double rate depreciation." ; >; - < "Type" ; >; - < "Do not alter. Type = 1 denotes switch to linear depreciation, type = 0 do not switch." ; >; - }; -}; - // -=*# Resource for function EFFECT #*=- -StringArray SC_OPCODE_EFFECT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the annual net interest rate for a nominal interest rate." ; >; - < "NOM" ; >; - < "Nominal Interest" ; >; - < "P" ; >; - < "Periods. The number of interest payments per year." ; >; - }; -}; - // -=*# Resource for function NOMINAL #*=- -StringArray SC_OPCODE_NOMINAL+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the yearly nominal interest rate as an effective interest rate." ; >; - < "effect_rate" ; >; - < "The effective interest rate" ; >; - < "npery" ; >; - < "Periods. The number of interest payment per year." ; >; - }; -}; - // -=*# Resource for function NPV #*=- -StringArray SC_OPCODE_NPV+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Net present value. Calculates the net present value of an investment based on a series of periodic payments and a discount rate." ; >; - < "RATE" ; >; - < "The rate of discount for one period." ; >; - < "value " ; >; - < "Value 1, value 2,... are arguments representing payments and income." ; >; - }; -}; - // -=*# Resource for function IRR #*=- -StringArray SC_OPCODE_IRR+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the actuarial rate of interest of an investment excluding costs or profits." ; >; - < "Values" ; >; - < "An array or reference to cells whose contents correspond to the payments." ; >; - < "Guess" ; >; - < "Guess. An estimated value of the rate of return to be used for the iteration calculation." ; >; - }; -}; - // -=*# Resource for function MIRR #*=- -StringArray SC_OPCODE_MIRR+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the modified internal rate of return for a series of investments."; >; - < "Values"; >; - < "An array or reference to cells whose contents correspond to the payments."; >; - < "investment"; >; - < "Interest rate for investments (the negative values in the array)."; >; - < "reinvest_rate"; >; - < "interest rate for reinvestments (the positive values in the array)."; >; - }; -}; - // -=*# Resource for function ISPMT #*=- -StringArray SC_OPCODE_ISPMT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the amount of interest for constant amortization rates."; >; - < "rate"; >; - < "Interest rate for a single amortization rate."; >; - < "Period"; >; - < "Number of amortization periods for the calculation of the interest."; >; - < "total_periods"; >; - < "Sum total of amortization periods."; >; - < "invest"; >; - < "Amount of the investment."; >; - }; -}; - // -=*# Resource for function PDURATION #*=- -StringArray SC_OPCODE_PDURATION+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Duration. Calculates the number of periods required by an investment to attain the desired value." ; >; - < "RATE" ; >; - < "The constant rate of interest." ; >; - < "pv" ; >; - < "The present value. The current value of the investment." ; >; - < "FV" ; >; - < "The future value of the investment." ; >; - }; -}; - // -=*# Resource for function RRI #*=- -StringArray SC_OPCODE_RRI+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Interest. Calculates the interest rate which represents the rate of return from an investment." ; >; - < "P" ; >; - < "The number of periods used in the calculation." ; >; - < "pv" ; >; - < "Present value. The current value of the investment." ; >; - < "FV" ; >; - < "The future value of the investment." ; >; - }; -}; - // -=*# Resource for function ISREF #*=- -StringArray SC_OPCODE_IS_REF+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns TRUE if value is a reference." ; >; - < "value" ; >; - < "The value to be tested." ; >; - }; -}; - // -=*# Resource for function ISERR #*=- -StringArray SC_OPCODE_IS_ERR+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns TRUE if the value is an error value not equal to #N/A." ; >; - < "value" ; >; - < "The value to be tested." ; >; - }; -}; - // -=*# Resource for function ISERROR #*=- -StringArray SC_OPCODE_IS_ERROR+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns TRUE if the value is an error value." ; >; - < "value" ; >; - < "The value to be tested." ; >; - }; -}; - // -=*# Resource for function ISBLANK #*=- -StringArray SC_OPCODE_IS_EMPTY+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns TRUE if value refers to an empty cell." ; >; - < "value" ; >; - < "The value to be tested." ; >; - }; -}; - // -=*# Resource for function ISLOGICAL #*=- -StringArray SC_OPCODE_IS_LOGICAL+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns TRUE if the value carries a logical number format." ; >; - < "value" ; >; - < "The value to be tested." ; >; - }; -}; - // -=*# Resource for function ISNA #*=- -StringArray SC_OPCODE_IS_NV+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns TRUE if value equals #N/A." ; >; - < "value" ; >; - < "The value to be tested." ; >; - }; -}; - // -=*# Resource for function ISNONTEXT #*=- -StringArray SC_OPCODE_IS_NON_STRING+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns TRUE if the value is not text." ; >; - < "value" ; >; - < "The value to be tested." ; >; - }; -}; - // -=*# Resource for function ISTEXT #*=- -StringArray SC_OPCODE_IS_STRING+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns TRUE if value is text." ; >; - < "value" ; >; - < "The value to be tested." ; >; - }; -}; - // -=*# Resource for function ISNUMBER #*=- -StringArray SC_OPCODE_IS_VALUE+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns TRUE if value is a number." ; >; - < "value" ; >; - < "The value to be tested." ; >; - }; -}; - // -=*# Resource for function ISFORMULA #*=- -StringArray SC_OPCODE_IS_FORMULA+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns TRUE if the cell is a formula cell." ; >; - < "reference" ; >; - < "The cell to be checked." ; >; - }; -}; - // -=*# Resource for function FORMULA #*=- -StringArray SC_OPCODE_FORMULA+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the formula of a formula cell."; >; - < "Reference"; >; - < "The formula cell."; >; - }; -}; - // -=*# Resource for function N #*=- -StringArray SC_OPCODE_N+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Converts a value to a number." ; >; - < "value" ; >; - < "The value to be interpreted as a number." ; >; - }; -}; - // -=*# Resource for function NA #*=- -StringArray SC_OPCODE_NO_VALUE+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Not available. Returns the error value #N/A." ; >; - }; -}; - // -=*# Resource for function TYPE #*=- -StringArray SC_OPCODE_TYPE+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the data type of a value (1 = number, 2 = text, 4 = Boolean value, 8 = formula, 16 = error value, 64 = array)." ; >; - < "value" ; >; - < "The value for which the data type is to be determined." ; >; - }; -}; - // -=*# Resource for function CELL #*=- -StringArray SC_OPCODE_CELL+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Determines information about address, formatting or contents of a cell."; >; - < "info_type"; >; - < "String that specifies the type of information."; >; - < "Reference"; >; - < "The position of the cell you want to examine."; >; - }; -}; - // -=*# Resource for function CURRENT #*=- -StringArray SC_OPCODE_CURRENT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the current value of the formula at the present location." ; >; - }; -}; - // -=*# Resource for function FALSE #*=- -StringArray SC_OPCODE_FALSE+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Defines the logical value as FALSE." ; >; - }; -}; - // -=*# Resource for function NOT #*=- -StringArray SC_OPCODE_NOT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Reverses the value of the argument." ; >; - < "Logical value" ; >; - < "An expression that can be either TRUE or FALSE." ; >; - }; -}; - // -=*# Resource for function TRUE #*=- -StringArray SC_OPCODE_TRUE+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the logical value TRUE." ; >; - }; -}; - // -=*# Resource for function IF #*=- -StringArray SC_OPCODE_IF+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Specifies a logical test to be performed." ; >; - < "Test" ; >; - < "Any value or expression which can be either TRUE or FALSE." ; >; - < "Then_value" ; >; - < "The result of the function if the logical test returns a TRUE." ; >; - < "Otherwise_value" ; >; - < "The result of the function if the logical test returns FALSE." ; >; - }; -}; - // -=*# Resource for function IFERROR #*=- -StringArray SC_OPCODE_IF_ERROR+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns value if not an error value, else alternative." ; >; - < "value" ; >; - < "The value to be calculated." ; >; - < "alternative value" ; >; - < "The alternative to be returned, should value be an error value." ; >; - }; -}; - // -=*# Resource for function IFNA #*=- -StringArray SC_OPCODE_IF_NA+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns value if not a #N/A error, else alternative." ; >; - < "value" ; >; - < "The value to be calculated." ; >; - < "alternative value" ; >; - < "The alternative to be returned, should value be a #N/A error." ; >; - }; -}; - // -=*# Resource for function OR #*=- -StringArray SC_OPCODE_OR+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns TRUE if an argument is TRUE." ; >; - < "Logical value " ; >; - < "Logical value 1, logical value 2,... are conditions to be tested and which return either TRUE or FALSE." ; >; - }; -}; - // -=*# Resource for function XOR #*=- -StringArray SC_OPCODE_XOR+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns TRUE if an odd number of arguments evaluates to TRUE." ; >; - < "Logical value " ; >; - < "Logical value 1, logical value 2, ... are conditions to be tested and which return either TRUE or FALSE." ; >; - }; -}; - // -=*# Resource for function AND #*=- -StringArray SC_OPCODE_AND+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns TRUE if all arguments are TRUE." ; >; - < "Logical value " ; >; - < "Logical value 1, logical value 2;...are conditions to be tested and each returns either TRUE or FALSE." ; >; - }; -}; - // -=*# Resource for function ABS #*=- -StringArray SC_OPCODE_ABS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Absolute value of a number." ; >; - < "Number" ; >; - < "The number whose absolute value is to be returned." ; >; - }; -}; - // -=*# Resource for function POWER #*=- -StringArray SC_OPCODE_POWER+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns a^b, base a raised to the power of exponent b." ; >; - < "Base" ; >; - < "The base a of the power a^b." ; >; - < "Exponent" ; >; - < "The exponent b of the power a^b." ; >; - }; -}; - // -=*# Resource for function COUNTBLANK #*=- -StringArray SC_OPCODE_COUNT_EMPTY_CELLS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Counts the blank cells in a specified range." ; >; - < "range" ; >; - < "The range in which empty cells are to be counted." ; >; - }; -}; - // -=*# Resource for function PI #*=- -StringArray SC_OPCODE_PI+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the value of the number Pi." ; >; - }; -}; - // -=*# Resource for function SUM #*=- -StringArray SC_OPCODE_SUM+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the sum of all arguments." ; >; - < "number " ; >; - < "Number 1, number 2, ... are arguments whose total is to be calculated." ; >; - }; -}; - // -=*# Resource for function SUMSQ #*=- -StringArray SC_OPCODE_SUM_SQ+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the sum of the squares of the arguments." ; >; - < "number " ; >; - < "Number 1, number 2,... are arguments for which the sum of the squares is to be calculated." ; >; - }; -}; - // -=*# Resource for function PRODUCT #*=- -StringArray SC_OPCODE_PRODUCT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Multiplies the arguments." ; >; - < "Number " ; >; - < "Number 1, number 2, ... are arguments to be multiplied and a result returned." ; >; - }; -}; - // -=*# Resource for function SUMIF #*=- -StringArray SC_OPCODE_SUM_IF+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Totals the arguments that meet the condition." ; >; - < "range" ; >; - < "The range to be evaluated by the criteria given." ; >; - < "criteria" ; >; - < "The criteria to be applied to the range." ; >; - < "sum_range" ; >; - < "The range from which the values are to be totalled." ; >; - }; -}; - -// -=*# Resource for function AVERAGEIF #*=- -StringArray SC_OPCODE_AVERAGE_IF+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Averages the arguments that meet the conditions." ; >; - < "range" ; >; - < "The range to be evaluated by the criteria given." ; >; - < "criteria" ; >; - < "The criteria to be applied to the range." ; >; - < "average_range" ; >; - < "The range from which the values are to be averaged." ; >; - }; -}; - -StringArray SC_OPCODE_SUM_IFS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Totals the values of cells in a range that meet multiple criteria in multiple ranges." ; >; - < "sum_range" ; >; - < "The range from which the values are to be totalled." ; >; - < "range " ; >; - < "Range 1, range 2,... are the ranges to be evaluated by the criteria given." ; >; - < "criteria " ; >; - < "Criteria 1, criteria 2,... are the criteria to be applied to the ranges given." ; >; - }; -}; - -// -=*# Resource for function AVERAGEIFS #*=- -StringArray SC_OPCODE_AVERAGE_IFS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Averages the value of the cells that meet multiple criteria in multiple ranges." ; >; - < "average_range" ; >; - < "The range from which the values are to be averaged." ; >; - < "range " ; >; - < "Range 1, range 2,... are the ranges to be evaluated by the criteria given." ; >; - < "criteria " ; >; - < "Criteria 1, criteria 2,... are the criteria to be applied to the ranges given." ; >; - }; -}; - -// -=*# Resource for function COUNTIFS #*=- -StringArray SC_OPCODE_COUNT_IFS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Counts the cells that meet multiple criteria in multiple ranges." ; >; - < "range " ; >; - < "Range 1, range 2,... are the ranges to be evaluated by the criteria given." ; >; - < "criteria " ; >; - < "Criteria 1, criteria 2,... are the criteria to be applied to the ranges given." ; >; - }; -}; - - // -=*# Resource for function COUNTIF #*=- -StringArray SC_OPCODE_COUNT_IF+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Counts the arguments which meet the set conditions." ; >; - < "range" ; >; - < "The range of cells to be evaluated by the criteria given." ; >; - < "criteria" ; >; - < "The criteria to be applied to the range." ; >; - }; -}; - // -=*# Resource for function SQRT #*=- -StringArray SC_OPCODE_SQRT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the square root of a number." ; >; - < "number" ; >; - < "A positive value for which the square root is to be calculated." ; >; - }; -}; - // -=*# Resource for function RAND #*=- -StringArray SC_OPCODE_RANDOM+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns a random number between 0 and 1." ; >; - }; -}; - // -=*# Resource for function ISEVEN #*=- -StringArray SC_OPCODE_IS_EVEN+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns TRUE if value is an even integer." ; >; - < "value" ; >; - < "The value to be tested." ; >; - }; -}; - // -=*# Resource for function ISODD #*=- -StringArray SC_OPCODE_IS_ODD+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns TRUE if value is an odd integer." ; >; - < "value" ; >; - < "The value to be tested." ; >; - }; -}; - // -=*# Resource for function COMBIN #*=- -StringArray SC_OPCODE_COMBIN+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the number of combinations for elements without repetition." ; >; - < "number_1" ; >; - < "The total number of elements." ; >; - < "number_2" ; >; - < "The number of elements selected." ; >; - }; -}; - // -=*# Resource for function COMBINA #*=- -StringArray SC_OPCODE_COMBIN_A+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the number of combinations of elements including repetition." ; >; - < "number_1" ; >; - < "The total number of elements." ; >; - < "number_2" ; >; - < "The number of elements selected." ; >; - }; -}; - // -=*# Resource for function ARCCOS #*=- -StringArray SC_OPCODE_ARC_COS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the arccosine of a number." ; >; - < "Number" ; >; - < "A value between -1 and 1 for which the arccosine is to be returned." ; >; - }; -}; - // -=*# Resource for function ARCSIN #*=- -StringArray SC_OPCODE_ARC_SIN+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the arcsine of a number." ; >; - < "Number" ; >; - < "A value between -1 and 1 for which the arcsine is to be returned." ; >; - }; -}; - // -=*# Resource for function ARCCOSHYP #*=- -StringArray SC_OPCODE_ARC_COS_HYP+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the inverse hyperbolic cosine of a number." ; >; - < "Number" ; >; - < "A value greater than or equal to 1 for which the inverse hyperbolic cosine is to be returned." ; >; - }; -}; - // -=*# Resource for function ARCSINHYP #*=- -StringArray SC_OPCODE_ARC_SIN_HYP+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the inverse hyperbolic sine of a number." ; >; - < "Number" ; >; - < "The value for which the inverse hyperbolic sine is to be returned." ; >; - }; -}; - // -=*# Resource for function ARCCOT #*=- -StringArray SC_OPCODE_ARC_COT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the inverse cotangent of a number." ; >; - < "Number" ; >; - < "The value for which the inverse cotangent is to be returned." ; >; - }; -}; - // -=*# Resource for function ARCTAN #*=- -StringArray SC_OPCODE_ARC_TAN+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the arctangent of a number." ; >; - < "Number" ; >; - < "The value for which the arctangent is to be returned." ; >; - }; -}; - // -=*# Resource for function ARCCOTHYP #*=- -StringArray SC_OPCODE_ARC_COT_HYP+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the inverse hyperbolic cotangent of a number." ; >; - < "Number" ; >; - < "A value smaller than -1 or greater than 1 for which the inverse hyperbolic cotangent is to be returned." ; >; - }; -}; - // -=*# Resource for function ARCTANHYP #*=- -StringArray SC_OPCODE_ARC_TAN_HYP+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the inverse hyperbolic tangent of a number." ; >; - < "Number" ; >; - < "A value between -1 and 1 for which the inverse hyperbolic tangent is to be returned." ; >; - }; -}; - // -=*# Resource for function COS #*=- -StringArray SC_OPCODE_COS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the cosine of a number." ; >; - < "Number" ; >; - < "The angle in the radians for which the cosine is to be returned." ; >; - }; -}; - // -=*# Resource for function SIN #*=- -StringArray SC_OPCODE_SIN+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the sine of a number." ; >; - < "number" ; >; - < "The angle in radians for which the sine is to be calculated." ; >; - }; -}; - // -=*# Resource for function COT #*=- -StringArray SC_OPCODE_COT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the cotangent of a number." ; >; - < "Number" ; >; - < "The angle in radians whose cotangent value is to be returned." ; >; - }; -}; - // -=*# Resource for function TAN #*=- -StringArray SC_OPCODE_TAN+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the tangent of a number." ; >; - < "number" ; >; - < "The angle in radians for which the tangent is to be calculated." ; >; - }; -}; - // -=*# Resource for function COSHYP #*=- -StringArray SC_OPCODE_COS_HYP+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the hyperbolic cosine of a number." ; >; - < "Number" ; >; - < "The value for which the hyperbolic cosine is to be returned." ; >; - }; -}; - // -=*# Resource for function SINHYP #*=- -StringArray SC_OPCODE_SIN_HYP+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the hyperbolic sine of a number." ; >; - < "number" ; >; - < "The value for which the hyperbolic sine is to be calculated." ; >; - }; -}; - // -=*# Resource for function COTHYP #*=- -StringArray SC_OPCODE_COT_HYP+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the hyperbolic cotangent of a number." ; >; - < "Number" ; >; - < "A value not equal to 0 for which the hyperbolic cotangent is to be returned." ; >; - }; -}; - // -=*# Resource for function TANHYP #*=- -StringArray SC_OPCODE_TAN_HYP+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the hyperbolic tangent of a number." ; >; - < "number" ; >; - < "The value for which the hyperbolic tangent is to be calculated." ; >; - }; -}; - // -=*# Resource for function ARCTAN2 #*=- -StringArray SC_OPCODE_ARC_TAN_2+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the arctangent for the specified coordinates." ; >; - < "number_x" ; >; - < "The value for the x coordinate." ; >; - < "number_y" ; >; - < "The value for the y coordinate." ; >; - }; -}; - -// -=*# Resource for function CSC #*=- -StringArray SC_OPCODE_COSECANT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Return the cosecant of an angle. CSC(x)=1/SIN(x)" ; >; - < "Angle" ; >; - < "The angle in radians for which the cosecant is to be calculated." ; >; - }; -}; - -// -=*# Resource for function SEC #*=- -StringArray SC_OPCODE_SECANT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Return the secant of an angle. SEC(x)=1/COS(x)" ; >; - < "Angle" ; >; - < "The angle in radians for which the secant is to be calculated." ; >; - }; -}; -// -=*# Resource for function CSCH #*=- -StringArray SC_OPCODE_COSECANT_HYP+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Return the hyperbolic cosecant of a hyperbolic angle. CSCH(x)=1/SINH(x)" ; >; - < "Angle" ; >; - < "The hyperbolic angle in radians for which the hyperbolic cosecant is to be calculated." ; >; - }; -}; -// -=*# Resource for function SECH #*=- -StringArray SC_OPCODE_SECANT_HYP+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Return the hyperbolic secant of a hyperbolic angle. SECH(x)=1/COSH(x)" ; >; - < "Angle" ; >; - < "The hyperbolic angle in radians for which the hyperbolic secant is to be calculated." ; >; - }; -}; - - // -=*# Resource for function DEG #*=- -StringArray SC_OPCODE_DEG+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Converts a radian to degrees" ; >; - < "Number" ; >; - < "The angle in a radian" ; >; - }; -}; - // -=*# Resource for function RAD #*=- -StringArray SC_OPCODE_RAD+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Converts degrees to radians" ; >; - < "Number" ; >; - < "The angle in degrees." ; >; - }; -}; - // -=*# Resource for function EXP #*=- -StringArray SC_OPCODE_EXP+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the exponent for basis e." ; >; - < "Number" ; >; - < "The exponent applied to base e." ; >; - }; -}; - // -=*# Resource for function LOG #*=- -StringArray SC_OPCODE_LOG+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the logarithm to any specified base." ; >; - < "Number" ; >; - < "A value greater than 0 for which the logarithm is to be calculated." ; >; - < "Base" ; >; - < "The base of the logarithm. If omitted, the base is regarded as 10." ; >; - }; -}; - // -=*# Resource for function LN #*=- -StringArray SC_OPCODE_LN+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the natural logarithm of a number." ; >; - < "Number" ; >; - < "A value greater than 0 for which the natural logarithm is to be calculated." ; >; - }; -}; - // -=*# Resource for function LOG10 #*=- -StringArray SC_OPCODE_LOG10+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the base-10 logarithm of a number." ; >; - < "Number" ; >; - < "A value greater than 0 for which the logarithm is to be calculated." ; >; - }; -}; - // -=*# Resource for function FACT #*=- -StringArray SC_OPCODE_FACT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the factorial of a number." ; >; - < "Number" ; >; - < "The number for which the factorial is to be calculated." ; >; - }; -}; - // -=*# Resource for function MOD #*=- -StringArray SC_OPCODE_MOD+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the remainder of a division." ; >; - < "Dividend" ; >; - < "The number to be divided." ; >; - < "Divisor" ; >; - < "The number by which the dividend is divided." ; >; - }; -}; - // -=*# Resource for function SIGN #*=- -StringArray SC_OPCODE_PLUS_MINUS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the algebraic sign of a number." ; >; - < "Number" ; >; - < "The number for which the algebraic sign is to be determined." ; >; - }; -}; - // -=*# Resource for function SUBTOTAL #*=- -StringArray SC_OPCODE_SUB_TOTAL+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates subtotals in a spreadsheet." ; >; - < "Function" ; >; - < "Function index. Is an index of the possible functions Total, Max, ..." ; >; - < "range" ; >; - < "The cells of the range which are to be taken into account." ; >; - }; -}; - // -=*# Resource for function AGGREGATE #*=- -StringArray SC_OPCODE_AGGREGATE+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates an aggregate in a spreadsheet." ; >; - < "Function" ; >; - < "Function index. Is an index of the possible functions Total, Max, ..." ; >; - < "Options" ; >; - < "Option index. Is an index of the possible ignore options." ; >; - < "Ref1 or array " ; >; - < "The cell(s) of the range which are to be taken into account." ; >; - < "Ref2..n or k " ; >; - < "The cells of the range which are to be taken into account or mandatory 2nd argument for certain functions." ; >; - }; -}; - // -=*# Resource for function INT #*=- -StringArray SC_OPCODE_INT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Rounds a number down to the nearest integer." ; >; - < "Number" ; >; - < "The number to be rounded down." ; >; - }; -}; - // -=*# Resource for function TRUNC #*=- -StringArray SC_OPCODE_TRUNC+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Truncates the decimal places of a number." ; >; - < "number" ; >; - < "The number to be truncated." ; >; - < "count" ; >; - < "The number of places after the decimal point that are not to be truncated." ; >; - }; -}; - // -=*# Resource for function ROUND #*=- -StringArray SC_OPCODE_ROUND+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Rounds a number to a predefined accuracy." ; >; - < "number" ; >; - < "The number to be rounded." ; >; - < "count" ; >; - < "The number of places to which a number is to be rounded." ; >; - }; -}; - // -=*# Resource for function ROUNDUP #*=- -StringArray SC_OPCODE_ROUND_UP+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Rounds a number up to the predefined accuracy." ; >; - < "number" ; >; - < "The number to be rounded up." ; >; - < "count" ; >; - < "The number of places to which a number is to be rounded." ; >; - }; -}; - // -=*# Resource for function ROUNDDOWN #*=- -StringArray SC_OPCODE_ROUND_DOWN+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Rounds a number down to a predefined accuracy." ; >; - < "number" ; >; - < "The number to be rounded down." ; >; - < "count" ; >; - < "The number of places down to which a number is to be rounded." ; >; - }; -}; - // -=*# Resource for function EVEN #*=- -StringArray SC_OPCODE_EVEN+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Rounds a positive number up and negative number down to the nearest even integer."; >; - < "Number" ; >; - < "The number to be rounded up." ; >; - }; -}; - // -=*# Resource for function ODD #*=- -StringArray SC_OPCODE_ODD+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Rounds a positive number up and negative number down to the nearest odd integer."; >; - < "Number" ; >; - < "The number to be rounded up." ; >; - }; -}; - // -=*# Resource for function CEILING.XCL #*=- -StringArray SC_OPCODE_CEIL_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Rounds a number away from zero to the nearest multiple of significance.\nThis function exists for interoperability with Microsoft Excel 2007 or older versions." ; >; - < "Number" ; >; - < "The number to be rounded up." ; >; - < "Significance" ; >; - < "The number to whose multiple the value is rounded." ; >; - }; -}; - // -=*# Resource for function CEILING.PRECISE #*=- -StringArray SC_OPCODE_CEIL_PRECISE+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Rounds a number up to the nearest multiple of significance, regardless of sign of significance." ; >; - < "Number" ; >; - < "The number to be rounded up." ; >; - < "Significance" ; >; - < "The number to whose multiple the value is rounded." ; >; - }; -}; - // -=*# Resource for function ISO.CEILING #*=- -StringArray SC_OPCODE_CEIL_ISO+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Rounds a number up to the nearest multiple of significance, regardless of sign of significance." ; >; - < "Number" ; >; - < "The number to be rounded up." ; >; - < "Significance" ; >; - < "The number to whose multiple the value is rounded." ; >; - }; -}; - // -=*# Resource for function CEILING #*=- -StringArray SC_OPCODE_CEIL+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Rounds a number up to the nearest multiple of significance." ; >; - < "Number" ; >; - < "The number to be rounded up." ; >; - < "Significance" ; >; - < "If given the number to whose multiple the value is rounded, else -1 or 1 depending on sign of Number." ; >; - < "Mode" ; >; - < "If given and not equal to zero then rounded up according to amount when a negative number and significance." ; >; - }; -}; - // -=*# Resource for function CEILING.MATH #*=- -StringArray SC_OPCODE_CEIL_MATH+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Rounds a number up to the nearest multiple of significance." ; >; - < "Number" ; >; - < "The number to be rounded up." ; >; - < "Significance" ; >; - < "If given the number to whose multiple the value is rounded, else 1." ; >; - < "Mode" ; >; - < "For negative numbers; if given and not equal to zero then rounds away from zero, else rounds towards zero." ; >; - }; -}; - // -=*# Resource for function FLOOR #*=- -StringArray SC_OPCODE_FLOOR+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Rounds number down to the nearest multiple of significance." ; >; - < "Number" ; >; - < "The number to be rounded down." ; >; - < "Significance" ; >; - < "The number to whose multiple the value is to be rounded down." ; >; - < "Mode" ; >; - < "If given and not equal to zero then rounded towards zero with negative number and significance." ; >; - }; -}; - // -=*# Resource for function FLOOR.XCL #*=- -StringArray SC_OPCODE_FLOOR_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Rounds number towards zero to the nearest multiple of absolute value of significance.\nThis function exists for interoperability with Microsoft Excel 2007 or older versions." ; >; - < "Number" ; >; - < "The number to be rounded down." ; >; - < "Significance" ; >; - < "The number to whose multiple the value is to be rounded down." ; >; - }; -}; - // -=*# Resource for function FLOOR.MATH #*=- -StringArray SC_OPCODE_FLOOR_MATH+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Rounds number down to the nearest multiple of significance, regardless of sign of significance." ; >; - < "Number" ; >; - < "The number to be rounded down." ; >; - < "Significance" ; >; - < "The number to whose multiple the value is to be rounded down." ; >; - < "Mode" ; >; - < "For negative numbers; if given and not equal to or less than zero rounds towards zero." ; >; - }; -}; - // -=*# Resource for function FLOOR.PRECISE #*=- -StringArray SC_OPCODE_FLOOR_PRECISE+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Rounds number down (towards -∞) to the nearest multiple of significance." ; >; - < "Number" ; >; - < "The number to be rounded down." ; >; - < "Significance" ; >; - < "The number to whose multiple the value is to be rounded down. Sign has no meaning." ; >; - }; -}; - // -=*# Resource for function GCD #*=- -StringArray SC_OPCODE_GCD+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Greatest Common Divisor" ; >; - < "Integer " ; >; - < "Integer 1; integer 2,... are integers for which the greatest common divisor is to be calculated." ; >; - }; -}; - // -=*# Resource for function LCM #*=- -StringArray SC_OPCODE_LCM+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Lowest common multiple" ; >; - < "Integer " ; >; - < "Integer 1; integer 2,... are integers whose smallest common multiple is to be calculated." ; >; - }; -}; - // -=*# Resource for function TRANSPOSE #*=- -StringArray SC_OPCODE_MAT_TRANS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Array transposition. Exchanges the rows and columns of an array." ; >; - < "array" ; >; - < "The array in which the rows and columns have been transposed." ; >; - }; -}; - // -=*# Resource for function MMULT #*=- -StringArray SC_OPCODE_MAT_MULT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Array multiplication. Returns the product of two arrays." ; >; - < "array_1" ; >; - < "The first array for the array product." ; >; - < "array_2" ; >; - < "The second array having the same number of rows as the first array has columns." ; >; - }; -}; - // -=*# Resource for function MDETERM #*=- -StringArray SC_OPCODE_MAT_DET+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the array determinant." ; >; - < "array" ; >; - < "The array for which the determinant is to be determined." ; >; - }; -}; - // -=*# Resource for function MINVERSE #*=- -StringArray SC_OPCODE_MAT_INV+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the inverse of an array." ; >; - < "array" ; >; - < "The array to be inverted." ; >; - }; -}; - // -=*# Resource for function MUNIT #*=- -StringArray SC_OPCODE_MATRIX_UNIT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the unitary square array of a certain size." ; >; - < "Dimensions" ; >; - < "The size of the unitary array." ; >; - }; -}; - // -=*# Resource for function SUMPRODUCT #*=- -StringArray SC_OPCODE_SUM_PRODUCT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "(Inner products) Returns the sum of the products of array arguments." ; >; - < "Array " ; >; - < "Array 1, array 2, ... are arrays whose arguments are to be multiplied." ; >; - }; -}; - // -=*# Resource for function SUMX2MY2 #*=- -StringArray SC_OPCODE_SUM_X2MY2+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the sum of the difference of squares of two arrays." ; >; - < "array_x" ; >; - < "First array where the square of the arguments are totalled." ; >; - < "array_y" ; >; - < "Second array where the square of the arguments is to be subtracted." ; >; - }; -}; - // -=*# Resource for function SUMX2PY2 #*=- -StringArray SC_OPCODE_SUM_X2DY2+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the total of the square sum of two arrays." ; >; - < "array_x" ; >; - < "First array where the square of the arguments are totalled." ; >; - < "array_y" ; >; - < "Second array where the square of the arguments is to be totalled." ; >; - }; -}; - // -=*# Resource for function SUMXMY2 #*=- -StringArray SC_OPCODE_SUM_XMY2+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the sum of squares of differences of two arrays." ; >; - < "array_x" ; >; - < "First array for forming argument differences." ; >; - < "array_y" ; >; - < "Second array for forming the argument differences." ; >; - }; -}; - - // -=*# Resource for function FREQUENCY #*=- -StringArray SC_OPCODE_FREQUENCY+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns a frequency distribution as a vertical array." ; >; - < "data" ; >; - < "The array of the data." ; >; - < "classes" ; >; - < "The array for forming classes." ; >; - }; -}; - // -=*# Resource for function LINEST #*=- -StringArray SC_OPCODE_LINEST+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates parameters of the linear regression as an array." ; >; - < "data_Y" ; >; - < "The Y data array." ; >; - < "data_X" ; >; - < "The X data array." ; >; - < "Linear_type" ; >; - < "If type = 0 the linears will be calculated through the zero point, or else moved linears." ; >; - < "stats" ; >; - < "If parameter = 0 then only the regression coefficient will be calculated, otherwise other values as well." ; >; - }; -}; - // -=*# Resource for function LOGEST #*=- -StringArray SC_OPCODE_LOGEST+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the parameters of the exponential regression curve as an array." ; >; - < "data_Y" ; >; - < "The Y data array." ; >; - < "data_X" ; >; - < "The X data array." ; >; - < "Function_type" ; >; - < "If type = 0 then the functions will be calculated in the form of y=m^x, or also functions y=b*m^x." ; >; - < "stats" ; >; - < "If parameter = 0 then only the regression coefficient will be calculated, otherwise other values as well." ; >; - }; -}; - // -=*# Resource for function TREND #*=- -StringArray SC_OPCODE_TREND+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates points along a regression line." ; >; - < "data_Y" ; >; - < "The Y data array." ; >; - < "data_X" ; >; - < "The X data array as the basis for the regression." ; >; - < "new data_X" ; >; - < "The array of X data for recalculating the values." ; >; - < "Linear_type" ; >; - < "If type = 0 the linears will be calculated through the zero point, or else moved linears." ; >; - }; -}; - // -=*# Resource for function GROWTH #*=- -StringArray SC_OPCODE_GROWTH+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates points on the exponential regression function." ; >; - < "data_Y" ; >; - < "The Y data array." ; >; - < "data_X" ; >; - < "The X data array as the basis for the regression." ; >; - < "new_data_X" ; >; - < "The array of X data for recalculating the values." ; >; - < "Function_type" ; >; - < "If type = 0 then the functions will be calculated in the form of y=m^x, or also functions y=b*m^x." ; >; - }; -}; - // -=*# Resource for function COUNT #*=- -StringArray SC_OPCODE_COUNT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Counts how many numbers are in the list of arguments." ; >; - < "value " ; >; - < "Value 1, value 2, ... are arguments containing different data types but where only numbers are counted." ; >; - }; -}; - // -=*# Resource for function COUNTA #*=- -StringArray SC_OPCODE_COUNT_2+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Counts how many values are in the list of arguments." ; >; - < "value " ; >; - < "Value 1, value 2, ... are arguments representing the values to be counted." ; >; - }; -}; - // -=*# Resource for function MAX #*=- -StringArray SC_OPCODE_MAX+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the maximum value in a list of arguments." ; >; - < "number " ; >; - < "Number 1, number 2, ... are numerical arguments for which the largest number is to be determined." ; >; - }; -}; - // -=*# Resource for function MAXA #*=- -StringArray SC_OPCODE_MAX_A+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the maximum value in a list of arguments. Text is evaluated as Zero."; >; - < "value "; >; - < "Value 1, value 2, are arguments whose largest value is to be determined."; >; - }; -}; - // -=*# Resource for function MIN #*=- -StringArray SC_OPCODE_MIN+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the minimum value in a list of arguments." ; >; - < "number " ; >; - < "Number 1, number 2, ... are numerical arguments for which the smallest number is to be determined." ; >; - }; -}; - // -=*# Resource for function MINA #*=- -StringArray SC_OPCODE_MIN_A+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the smallest value in a list of arguments. Text is evaluated as zero."; >; - < "value "; >; - < "Value 1; value 2;... are arguments whose smallest number is to be determined."; >; - }; -}; - // -=*# Resource for function VAR #*=- -StringArray SC_OPCODE_VAR+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the variance based on a sample." ; >; - < "number " ; >; - < "Number 1, number 2, ... are numerical arguments which portray a sample of a population." ; >; - }; -}; - // -=*# Resource for function VAR.S #*=- -StringArray SC_OPCODE_VAR_S+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the variance based on a sample." ; >; - < "number " ; >; - < "Number 1, number 2, ... are numerical arguments which portray a sample of a population." ; >; - }; -}; - // -=*# Resource for function VARA #*=- -StringArray SC_OPCODE_VAR_A+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the variance based on a sample. Text is evaluated as zero."; >; - < "value "; >; - < "Value 1; value 2; ... are arguments representing a sample taken from a basic total population."; >; - }; -}; - // -=*# Resource for function VARP #*=- -StringArray SC_OPCODE_VAR_P+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates variance based on the entire population." ; >; - < "number " ; >; - < "Number 1, number 2, ... are numerical arguments which represent a population." ; >; - }; -}; - // -=*# Resource for function VAR.P #*=- -StringArray SC_OPCODE_VAR_P_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates variance based on the entire population." ; >; - < "number " ; >; - < "Number 1, number 2, ... are numerical arguments which represent a population." ; >; - }; -}; - // -=*# Resource for function VARPA #*=- -StringArray SC_OPCODE_VAR_P_A+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the variance based on the entire population. Text is evaluated as zero."; >; - < "value "; >; - < "Value 1; value 2;... are arguments representing a population."; >; - }; -}; - // -=*# Resource for function STDEV #*=- -StringArray SC_OPCODE_ST_DEV+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the standard deviation based on a sample." ; >; - < "number " ; >; - < "Number 1, number 2, ... are numerical arguments which portray a sample of a population." ; >; - }; -}; - // -=*# Resource for function STDEV.S #*=- -StringArray SC_OPCODE_ST_DEV_S+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the standard deviation based on a sample." ; >; - < "number " ; >; - < "Number 1, number 2, ... are numerical arguments which portray a sample of a population." ; >; - }; -}; - // -=*# Resource for function STDEVA #*=- -StringArray SC_OPCODE_ST_DEV_A+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the standard deviation based on a sample. Text is evaluated as zero."; >; - < "value "; >; - < "Value 1; value 2; ... are arguments representing a sample taken from a basic total population."; >; - }; -}; - // -=*# Resource for function STDEVP #*=- -StringArray SC_OPCODE_ST_DEV_P+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the standard deviation based on the entire population." ; >; - < "number " ; >; - < "Number 1, number 2, ... are numerical arguments which portray a population." ; >; - }; -}; - // -=*# Resource for function STDEV.P #*=- -StringArray SC_OPCODE_ST_DEV_P_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the standard deviation based on the entire population." ; >; - < "number " ; >; - < "Number 1, number 2, ... are numerical arguments which portray a population." ; >; - }; -}; - // -=*# Resource for function STDEVPA #*=- -StringArray SC_OPCODE_ST_DEV_P_A+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the standard deviation based on the entire population. Text is evaluated as zero."; >; - < "value "; >; - < "Value 1; value 2;... are arguments corresponding to a population."; >; - }; -}; - // -=*# Resource for function AVERAGE #*=- -StringArray SC_OPCODE_AVERAGE+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the average of a sample." ; >; - < "number " ; >; - < "Number 1, number 2;...are numeric arguments representing a population sample." ; >; - }; -}; - // -=*# Resource for function AVERAGEA #*=- -StringArray SC_OPCODE_AVERAGE_A+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the average value for a sample. Text is evaluated as zero."; >; - < "value "; >; - < "Value 1; value 2; ... are arguments representing a sample taken from a basic total population."; >; - }; -}; - // -=*# Resource for function DEVSQ #*=- -StringArray SC_OPCODE_DEV_SQ+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the sum of squares of deviations from the sample mean value" ; >; - < "number " ; >; - < "Number 1, number 2, ... are numerical arguments which portray a sample." ; >; - }; -}; - // -=*# Resource for function AVEDEV #*=- -StringArray SC_OPCODE_AVE_DEV+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the average of the absolute deviations of a sample from the mean." ; >; - < "number " ; >; - < "Number 1, number 2;...are numerical arguments representing a sample." ; >; - }; -}; - // -=*# Resource for function SKEW #*=- -StringArray SC_OPCODE_SKEW+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the skewness of a distribution." ; >; - < "number " ; >; - < "Number 1, number 2, ... are numerical arguments portraying a sample of the distribution." ; >; - }; -}; - // -=*# Resource for function SKEWP #*=- -StringArray SC_OPCODE_SKEWP+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the skewness of a distribution using the population of a random variable." ; >; - < "number " ; >; - < "Number 1, number 2, ... are numerical arguments portraying the population." ; >; - }; -}; - // -=*# Resource for function KURT #*=- -StringArray SC_OPCODE_KURT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the kurtosis of a distribution." ; >; - < "number " ; >; - < "Number 1, number 2, ... are numerical arguments, representing a sample of the distribution." ; >; - }; -}; - // -=*# Resource for function GEOMEAN #*=- -StringArray SC_OPCODE_GEO_MEAN+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the geometric mean of a sample." ; >; - < "number " ; >; - < "Number 1, number 2, ... are numerical arguments which portray a sample." ; >; - }; -}; - // -=*# Resource for function HARMEAN #*=- -StringArray SC_OPCODE_HAR_MEAN+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the harmonic mean of a sample." ; >; - < "number " ; >; - < "Number 1, number 2, ... are numerical arguments which portray a sample." ; >; - }; -}; - // -=*# Resource for function MODE #*=- -StringArray SC_OPCODE_MODAL_VALUE+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the most common value in a sample." ; >; - < "number " ; >; - < "Number 1, number 2, ... are numerical arguments which portray a sample." ; >; - }; -}; - // -=*# Resource for function MODE.SNGL #*=- -StringArray SC_OPCODE_MODAL_VALUE_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the most common value in a sample." ; >; - < "number " ; >; - < "Number 1, number 2, ... are numerical arguments which portray a sample." ; >; - }; -}; - // -=*# Resource for function MODE.MULT #*=- -StringArray SC_OPCODE_MODAL_VALUE_MULTI+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the most common value in a sample." ; >; - < "number " ; >; - < "Number 1, number 2, ... are 1 to 254 numerical arguments which portray a sample." ; >; - }; -}; - // -=*# Resource for function MEDIAN #*=- -StringArray SC_OPCODE_MEDIAN+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the median of a given sample." ; >; - < "number " ; >; - < "Number 1, number 2, ... are numerical arguments which portray a sample." ; >; - }; -}; - // -=*# Resource for function PERCENTILE #*=- -StringArray SC_OPCODE_PERCENTILE+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the alpha quantile of a sample." ; >; - < "data" ; >; - < "The array of the data in the sample." ; >; - < "Alpha" ; >; - < "The percentage rate of the quantile between 0 and 1." ; >; - }; -}; - // -=*# Resource for function PERCENTILE.EXC #*=- -StringArray SC_OPCODE_PERCENTILE_EXC+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the alpha percentile of a sample." ; >; - < "data" ; >; - < "The array of the data in the sample." ; >; - < "Alpha" ; >; - < "The percentile value, range 0...1, exclusive." ; >; - }; -}; - // -=*# Resource for function PERCENTILE.INC #*=- -StringArray SC_OPCODE_PERCENTILE_INC+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the alpha percentile of a sample." ; >; - < "data" ; >; - < "The array of the data in the sample." ; >; - < "Alpha" ; >; - < "The percentile value, range 0...1, inclusive." ; >; - }; -}; - // -=*# Resource for function QUARTILE #*=- -StringArray SC_OPCODE_QUARTILE+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the quartile of a sample." ; >; - < "data" ; >; - < "The array of the data in the sample." ; >; - < "Type" ; >; - < "The type of the quartile (0 = MIN, 1 = 25%, 2 = 50%, 3 = 75%, 4 = MAX)." ; >; - }; -}; - // -=*# Resource for function QUARTILE.EXC #*=- -StringArray SC_OPCODE_QUARTILE_EXC+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the quartile of a sample." ; >; - < "data" ; >; - < "The array of the data in the sample." ; >; - < "Type" ; >; - < "The type of the quartile (1 = 25%, 2 = 50%, 3 = 75%)." ; >; - }; -}; - // -=*# Resource for function QUARTILE.INC #*=- -StringArray SC_OPCODE_QUARTILE_INC+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the quartile of a sample." ; >; - < "data" ; >; - < "The array of the data in the sample." ; >; - < "Type" ; >; - < "The type of the quartile (0 = MIN, 1 = 25%, 2 = 50%, 3 = 75%, 4 = MAX)." ; >; - }; -}; - // -=*# Resource for function LARGE #*=- -StringArray SC_OPCODE_LARGE+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the k-th largest value of a sample." ; >; - < "data" ; >; - < "The array of the data in the sample." ; >; - < "Rank_c" ; >; - < "The ranking of the value." ; >; - }; -}; - // -=*# Resource for function SMALL #*=- -StringArray SC_OPCODE_SMALL+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the k-th smallest value of a sample." ; >; - < "data" ; >; - < "The array of the data in the sample." ; >; - < "Rank_c" ; >; - < "The ranking of the value." ; >; - }; -}; - // -=*# Resource for function PERCENTRANK #*=- -StringArray SC_OPCODE_PERCENT_RANK+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the percentage rank of a value in a sample." ; >; - < "data" ; >; - < "The array of the data in the sample." ; >; - < "value" ; >; - < "The value for which percentage ranking is to be determined." ; >; - < "significance" ; >; - < "The number of significant digits for the returned percentage: if omitted, a value of 3 is used." ; >; - }; -}; - // -=*# Resource for function PERCENTRANK.EXC #*=- -StringArray SC_OPCODE_PERCENT_RANK_EXC+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the percentage rank (0..1, exclusive) of a value in a sample." ; >; - < "data" ; >; - < "The array of the data in the sample." ; >; - < "value" ; >; - < "The value for which percentage ranking is to be determined." ; >; - < "significance" ; >; - < "The number of significant digits for the returned percentage: if omitted, a value of 3 is used." ; >; - }; -}; - // -=*# Resource for function PERCENTRANK.INC #*=- -StringArray SC_OPCODE_PERCENT_RANK_INC+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the percentage rank (0..1, inclusive) of a value in a sample." ; >; - < "data" ; >; - < "The array of the data in the sample." ; >; - < "value" ; >; - < "The value for which percentage ranking is to be determined." ; >; - < "significance" ; >; - < "The number of significant digits for the returned percentage: if omitted, a value of 3 is used." ; >; - }; -}; - // -=*# Resource for function RANK #*=- -StringArray SC_OPCODE_RANK+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the ranking of a value in a sample." ; >; - < "value" ; >; - < "The value for which the rank is to be determined." ; >; - < "Data" ; >; - < "The array of the data in the sample." ; >; - < "Type" ; >; - < "Sequence order: 0 or omitted means descending, any other value than 0 means ascending." ; >; - }; -}; - // -=*# Resource for function RANK.EQ #*=- -StringArray SC_OPCODE_RANK_EQ+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the ranking of a value in a sample; if more than one value has the same rank, the top rank of that set of values is returned." ; >; - < "value" ; >; - < "The value for which the rank is to be determined." ; >; - < "Data" ; >; - < "The array of the data in the sample." ; >; - < "Type" ; >; - < "Sequence order: 0 or omitted means descending, any other value than 0 means ascending." ; >; - }; -}; - // -=*# Resource for function RANK.AVG #*=- -StringArray SC_OPCODE_RANK_AVG+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the ranking of a value in a sample; if more than one value has the same rank, the average rank is returned." ; >; - < "value" ; >; - < "The value for which the rank is to be determined." ; >; - < "Data" ; >; - < "The array of the data in the sample." ; >; - < "Type" ; >; - < "Sequence order: 0 or omitted means descending, any other value than 0 means ascending." ; >; - }; -}; - // -=*# Resource for function TRIMMEAN #*=- -StringArray SC_OPCODE_TRIM_MEAN+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the mean of a sample without including the marginal values." ; >; - < "data" ; >; - < "The array of the data in the sample." ; >; - < "Alpha" ; >; - < "The percentage of marginal data that is not to be taken into account." ; >; - }; -}; - // -=*# Resource for function PROB #*=- -StringArray SC_OPCODE_PROB+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the discrete probability of an interval." ; >; - < "data" ; >; - < "The sample data array." ; >; - < "probability" ; >; - < "The array of the associated probabilities." ; >; - < "Start" ; >; - < "The start of the value interval whose probabilities is to be totalled." ; >; - < "End" ; >; - < "The end of the value interval where the probabilities are to be totalled." ; >; - }; -}; - // -=*# Resource for function B #*=- -StringArray SC_OPCODE_B+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the probability of a trial result using binomial distribution." ; >; - < "trials" ; >; - < "The number of trials." ; >; - < "SP" ; >; - < "The individual probability of a trial result." ; >; - < "T_1" ; >; - < "Lower limit for the number of trials." ; >; - < "T_2" ; >; - < "Upper limit for the number of trials." ; >; - }; -}; - // -=*# Resource for function PHI #*=- -StringArray SC_OPCODE_PHI+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the distribution function for a standard normal distribution." ; >; - < "number" ; >; - < "The value for which the standard normal distribution is to be calculated." ; >; - }; -}; - // -=*# Resource for function GAUSS #*=- -StringArray SC_OPCODE_GAUSS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the integral values of the standard normal cumulative distribution." ; >; - < "Number" ; >; - < "The value for which the integral value of the standard normal distribution is to be calculated." ; >; - }; -}; - // -=*# Resource for function FISHER #*=- -StringArray SC_OPCODE_FISHER+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the Fisher transformation." ; >; - < "Number" ; >; - < "The value to be transformed (-1 < VALUE < 1)." ; >; - }; -}; - // -=*# Resource for function FISHERINV #*=- -StringArray SC_OPCODE_FISHER_INV+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the inverse of the Fisher transformation." ; >; - < "Number" ; >; - < "The value that is to be transformed back." ; >; - }; -}; - // -=*# Resource for function BINOMDIST #*=- -StringArray SC_OPCODE_BINOM_DIST+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the binomial distribution." ; >; - < "X" ; >; - < "The number of successes in a series of trials." ; >; - < "trials" ; >; - < "The total number of trials." ; >; - < "SP" ; >; - < "The success probability of a trial." ; >; - < "C" ; >; - < "Cumulated. C=0 calculates the individual probability, C=1 the cumulated probability." ; >; - }; -}; - // -=*# Resource for function BINOM.DIST #*=- -StringArray SC_OPCODE_BINOM_DIST_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the binomial distribution." ; >; - < "X" ; >; - < "The number of successes in a series of trials." ; >; - < "trials" ; >; - < "The total number of trials." ; >; - < "SP" ; >; - < "The success probability of a trial." ; >; - < "C" ; >; - < "Cumulated. C=0 calculates the individual probability, C=1 the cumulated probability." ; >; - }; -}; - // -=*# Resource for function NEGBINOMDIST #*=- -StringArray SC_OPCODE_NEG_BINOM_VERT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the negative binomial distribution." ; >; - < "X" ; >; - < "The number of failures in the trial range." ; >; - < "R" ; >; - < "The number of successes in the trial sequence." ; >; - < "SP" ; >; - < "The success probability of a trial." ; >; - }; -}; - // -=*# Resource for function NEGBINOM.DIST #*=- -StringArray SC_OPCODE_NEG_BINOM_DIST_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the negative binomial distribution." ; >; - < "X" ; >; - < "The number of failures in the trial range." ; >; - < "R" ; >; - < "The number of successes in the trial sequence." ; >; - < "SP" ; >; - < "The success probability of a trial." ; >; - < "Cumulative" ; >; - < "0 or FALSE calculates the probability density function. Any other value or TRUE calculates the cumulative distribution function." ; >; - }; -}; - // -=*# Resource for function CRITBINOM #*=- -StringArray SC_OPCODE_CRIT_BINOM+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the smallest value for which the cumulative binomial distribution is greater than or equal to a criterion value." ; >; - < "trials" ; >; - < "The total number of trials." ; >; - < "SP" ; >; - < "The success probability of a trial." ; >; - < "alpha" ; >; - < "The border probability that is attained or exceeded." ; >; - }; -}; - // -=*# Resource for function BINOM.INV #*=- -StringArray SC_OPCODE_BINOM_INV+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the smallest value for which the cumulative binomial distribution is greater than or equal to a criterion value." ; >; - < "trials" ; >; - < "The total number of trials." ; >; - < "SP" ; >; - < "The success probability of a trial." ; >; - < "alpha" ; >; - < "The border probability that is attained or exceeded." ; >; - }; -}; - // -=*# Resource for function POISSON #*=- -StringArray SC_OPCODE_POISSON_DIST+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the Poisson distribution." ; >; - < "Number" ; >; - < "The value for which the Poisson distribution is to be calculated." ; >; - < "mean" ; >; - < "Mean. The mean value of the Poisson distribution." ; >; - < "Cumulative" ; >; - < "0 or FALSE calculates the probability density function. Any other value or TRUE or omitted calculates the cumulative distribution function." ; >; - }; -}; - // -=*# Resource for function POISSON.DIST #*=- -StringArray SC_OPCODE_POISSON_DIST_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the Poisson distribution." ; >; - < "Number" ; >; - < "The value for which the Poisson distribution is to be calculated." ; >; - < "mean" ; >; - < "Mean. The mean value of the Poisson distribution." ; >; - < "Cumulative" ; >; - < "0 or FALSE calculates the probability density function. Any other value or TRUE or omitted calculates the cumulative distribution function." ; >; - }; -}; - // -=*# Resource for function NORMDIST #*=- -StringArray SC_OPCODE_NORM_DIST+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the normal distribution." ; >; - < "Number" ; >; - < "The value for which the normal distribution is to be calculated." ; >; - < "Mean" ; >; - < "The mean value. The mean value of the normal distribution." ; >; - < "STDEV" ; >; - < "Standard deviation. The standard deviation of the normal distribution." ; >; - < "C" ; >; - < "0 or FALSE calculates the probability density function. Any other value or TRUE or omitted calculates the cumulative distribution function." ; >; - }; -}; - // -=*# Resource for function NORM.DIST #*=- -StringArray SC_OPCODE_NORM_DIST_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the normal distribution." ; >; - < "Number" ; >; - < "The value for which the normal distribution is to be calculated." ; >; - < "Mean" ; >; - < "The mean value. The mean value of the normal distribution." ; >; - < "STDEV" ; >; - < "Standard deviation. The standard deviation of the normal distribution." ; >; - < "C" ; >; - < "0 or FALSE calculates the probability density function. Any other value or TRUE calculates the cumulative distribution function." ; >; - }; -}; - // -=*# Resource for function NORMINV #*=- -StringArray SC_OPCODE_NORM_INV+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the inverse normal distribution." ; >; - < "number" ; >; - < "The probability value for which the inverse normal distribution is to be calculated." ; >; - < "mean" ; >; - < "The mean value. The mean value of the normal distribution." ; >; - < "STDEV" ; >; - < "Standard deviation. The standard deviation of the normal distribution." ; >; - }; -}; - // -=*# Resource for function NORM.INV #*=- -StringArray SC_OPCODE_NORM_INV_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the inverse normal distribution." ; >; - < "number" ; >; - < "The probability value for which the inverse normal distribution is to be calculated." ; >; - < "mean" ; >; - < "The mean value. The mean value of the normal distribution." ; >; - < "STDEV" ; >; - < "Standard deviation. The standard deviation of the normal distribution." ; >; - }; -}; - // -=*# Resource for function NORMSDIST #*=- -StringArray SC_OPCODE_STD_NORM_DIST+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "The values of the standard normal cumulative distribution." ; >; - < "Number" ; >; - < "The value for which the standard normal distribution is to be calculated." ; >; - }; -}; - // -=*# Resource for function NORM.S.DIST #*=- -StringArray SC_OPCODE_STD_NORM_DIST_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "The values of the standard normal distribution." ; >; - < "Number" ; >; - < "The value for which the standard normal distribution is to be calculated." ; >; - < "Cumulative" ; >; - < "0 or FALSE calculates the probability density function. Any other value or TRUE calculates the cumulative distribution function." ; >; - }; -}; - // -=*# Resource for function NORMSINV #*=- -StringArray SC_OPCODE_S_NORM_INV+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the inverse standard normal distribution." ; >; - < "number" ; >; - < "The probability value for which the inverse standard normal distribution is to be calculated." ; >; - }; -}; - // -=*# Resource for function NORM.S.INV #*=- -StringArray SC_OPCODE_S_NORM_INV_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the inverse standard normal distribution." ; >; - < "number" ; >; - < "The probability value for which the inverse standard normal distribution is to be calculated." ; >; - }; -}; - // -=*# Resource for function LOGNORMDIST #*=- -StringArray SC_OPCODE_LOG_NORM_DIST+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the log normal distribution." ; >; - < "Number" ; >; - < "The value for which the log normal distribution is to be calculated." ; >; - < "mean" ; >; - < "The mean value of the log normal distribution. It is set to 0 if omitted." ; >; - < "STDEV" ; >; - < "The standard deviation of the log normal distribution. It is set to 1 if omitted." ; >; - < "Cumulative"; >; - < "0 or FALSE calculates the probability density function. Any other value or TRUE or omitted calculates the cumulative distribution function." ; >; - }; -}; - // -=*# Resource for function LOGNORM.DIST #*=- -StringArray SC_OPCODE_LOG_NORM_DIST_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the log normal distribution." ; >; - < "Number" ; >; - < "The value for which the log normal distribution is to be calculated." ; >; - < "mean" ; >; - < "The mean value of the log normal distribution." ; >; - < "STDEV" ; >; - < "The standard deviation of the log normal distribution." ; >; - < "Cumulative"; >; - < "0 or FALSE calculates the probability density function. Any other value or TRUE calculates the cumulative distribution function." ; >; - }; -}; - // -=*# Resource for function LOGINV #*=- -StringArray SC_OPCODE_LOG_INV+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the inverse of the lognormal distribution." ; >; - < "number" ; >; - < "The probability value for which the inverse log normal distribution is to be calculated." ; >; - < "mean" ; >; - < "Mean value. The mean value of the log normal distribution." ; >; - < "STDEV" ; >; - < "Standard deviation. The standard deviation of the log normal distribution." ; >; - }; -}; - // -=*# Resource for function LOGNORM.INV #*=- -StringArray SC_OPCODE_LOG_INV_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the inverse of the lognormal distribution." ; >; - < "number" ; >; - < "The probability value for which the inverse log normal distribution is to be calculated." ; >; - < "mean" ; >; - < "Mean value. The mean value of the log normal distribution." ; >; - < "STDEV" ; >; - < "Standard deviation. The standard deviation of the log normal distribution." ; >; - }; -}; - // -=*# Resource for function EXPONDIST #*=- -StringArray SC_OPCODE_EXP_DIST+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the exponential distribution." ; >; - < "Number" ; >; - < "The value to which the exponential distribution is to be calculated." ; >; - < "lambda" ; >; - < "The parameters of the exponential distribution." ; >; - < "C" ; >; - < "Cumulated. C=0 calculates the density function, C=1 the distribution." ; >; - }; -}; - // -=*# Resource for function EXPON.DIST #*=- -StringArray SC_OPCODE_EXP_DIST_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the exponential distribution." ; >; - < "Number" ; >; - < "The value to which the exponential distribution is to be calculated." ; >; - < "lambda" ; >; - < "The parameters of the exponential distribution." ; >; - < "C" ; >; - < "Cumulated. C=0 calculates the density function, C=1 the distribution." ; >; - }; -}; - // -=*# Resource for function GAMMADIST #*=- -StringArray SC_OPCODE_GAMMA_DIST+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the value of the probability density function or the cumulative distribution function for the Gamma distribution." ; >; - < "Number" ; >; - < "The value for which the gamma distribution is to be calculated." ; >; - < "alpha" ; >; - < "The Alpha parameter of the Gamma distribution." ; >; - < "beta" ; >; - < "The Beta parameter of the Gamma distribution." ; >; - < "Cumulative" ; >; - < "0 or FALSE calculates the probability density function. Any other value or TRUE or omitted calculates the cumulative distribution function." ; >; - }; -}; - // -=*# Resource for function GAMMA.DIST #*=- -StringArray SC_OPCODE_GAMMA_DIST_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the value of the probability density function or the cumulative distribution function for the Gamma distribution." ; >; - < "Number" ; >; - < "The value for which the gamma distribution is to be calculated." ; >; - < "alpha" ; >; - < "The Alpha parameter of the Gamma distribution." ; >; - < "beta" ; >; - < "The Beta parameter of the Gamma distribution." ; >; - < "Cumulative" ; >; - < "0 or FALSE calculates the probability density function. Any other value or TRUE calculates the cumulative distribution function." ; >; - }; -}; - // -=*# Resource for function GAMMAINV #*=- -StringArray SC_OPCODE_GAMMA_INV+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the inverse gamma distribution." ; >; - < "Number" ; >; - < "The probability value for which the inverse gamma distribution is to be calculated." ; >; - < "alpha" ; >; - < "The Alpha (shape) parameter of the Gamma distribution." ; >; - < "beta" ; >; - < "The Beta (scale) parameter of the Gamma distribution." ; >; - }; -}; - // -=*# Resource for function GAMMA.INV #*=- -StringArray SC_OPCODE_GAMMA_INV_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the inverse gamma distribution." ; >; - < "Number" ; >; - < "The probability value for which the inverse gamma distribution is to be calculated." ; >; - < "alpha" ; >; - < "The Alpha (shape) parameter of the Gamma distribution." ; >; - < "beta" ; >; - < "The Beta (scale) parameter of the Gamma distribution." ; >; - }; -}; - // -=*# Resource for function GAMMALN #*=- -StringArray SC_OPCODE_GAMMA_LN+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the natural logarithm of the gamma function." ; >; - < "Number" ; >; - < "The value for which the natural logarithm of the gamma function is to be calculated." ; >; - }; -}; - // -=*# Resource for function GAMMALN.PRECISE #*=- -StringArray SC_OPCODE_GAMMA_LN_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the natural logarithm of the gamma function." ; >; - < "Number" ; >; - < "The value for which the natural logarithm of the gamma function is to be calculated." ; >; - }; -}; - - // -=*# Resource for function GAMMA #*=- -StringArray SC_OPCODE_GAMMA+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the value of the Gamma function." ; >; - < "Number" ; >; - < "The value for which the Gamma function is to be calculated." ; >; - }; -}; - - // -=*# Resource for function BETADIST #*=- -StringArray SC_OPCODE_BETA_DIST+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the beta distribution." ; >; - < "number" ; >; - < "The value for which the beta distribution is to be calculated." ; >; - < "alpha" ; >; - < "The Alpha parameter of the Beta distribution." ; >; - < "beta" ; >; - < "The Beta parameter of the Beta distribution." ; >; - < "Start" ; >; - < "The starting value for the value interval of the distribution." ; >; - < "End" ; >; - < "The final value for the value interval of the distribution." ; >; - < "Cumulative" ; >; - < "0 or FALSE for probability density function, any other value or TRUE or omitted for cumulative distribution function."; >; - }; -}; - // -=*# Resource for function BETAINV #*=- -StringArray SC_OPCODE_BETA_INV+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the inverse beta distribution." ; >; - < "number" ; >; - < "The probability value for which the inverse beta distribution is to be calculated." ; >; - < "alpha" ; >; - < "The Alpha parameter of the Beta distribution." ; >; - < "beta" ; >; - < "The Beta parameter of the Beta distribution." ; >; - < "Start" ; >; - < "The starting value for the value interval of the distribution." ; >; - < "End" ; >; - < "The final value for the value interval of the distribution." ; >; - }; -}; - // -=*# Resource for function BETA.DIST #*=- -StringArray SC_OPCODE_BETA_DIST_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the beta distribution." ; >; - < "number" ; >; - < "The value for which the beta distribution is to be calculated." ; >; - < "alpha" ; >; - < "The Alpha parameter of the Beta distribution." ; >; - < "beta" ; >; - < "The Beta parameter of the Beta distribution." ; >; - < "Cumulative" ; >; - < "0 or FALSE for probability density function, any other value or TRUE or omitted for cumulative distribution function."; >; - < "Start" ; >; - < "The starting value for the value interval of the distribution." ; >; - < "End" ; >; - < "The final value for the value interval of the distribution." ; >; - }; -}; - // -=*# Resource for function BETA.INV #*=- -StringArray SC_OPCODE_BETA_INV_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the inverse beta distribution." ; >; - < "number" ; >; - < "The probability value for which the inverse beta distribution is to be calculated." ; >; - < "alpha" ; >; - < "The Alpha parameter of the Beta distribution." ; >; - < "beta" ; >; - < "The Beta parameter of the Beta distribution." ; >; - < "Start" ; >; - < "The starting value for the value interval of the distribution." ; >; - < "End" ; >; - < "The final value for the value interval of the distribution." ; >; - }; -}; - // -=*# Resource for function WEIBULL #*=- -StringArray SC_OPCODE_WEIBULL+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the values of the Weibull distribution." ; >; - < "Number" ; >; - < "The value for which the Weibull distribution is to be calculated." ; >; - < "Alpha" ; >; - < "The Alpha parameter of the Weibull distribution." ; >; - < "beta" ; >; - < "The Beta parameter of the Weibull distribution." ; >; - < "C" ; >; - < "Cumulated. C=0 calculates the density function, C=1 the distribution." ; >; - }; -}; - // -=*# Resource for function WEIBULL.DIST #*=- -StringArray SC_OPCODE_WEIBULL_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the values of the Weibull distribution." ; >; - < "Number" ; >; - < "The value for which the Weibull distribution is to be calculated." ; >; - < "Alpha" ; >; - < "The Alpha parameter of the Weibull distribution." ; >; - < "beta" ; >; - < "The Beta parameter of the Weibull distribution." ; >; - < "C" ; >; - < "Cumulated. C=0 calculates the density function, C=1 the distribution." ; >; - }; -}; - // -=*# Resource for function HYPGEOMDIST #*=- -StringArray SC_OPCODE_HYP_GEOM_DIST+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the hypergeometric distribution." ; >; - < "X" ; >; - < "The number of successes in the sample." ; >; - < "n_sample" ; >; - < "The size of the sample." ; >; - < "successes" ; >; - < "The number of successes in the population." ; >; - < "n_population" ; >; - < "The population size." ; >; - < "Cumulative" ; >; - < "Cumulated. TRUE calculates the cumulative distribution function, FALSE the probability mass function." ; >; - }; -}; - // -=*# Resource for function HYPGEOM.DIST #*=- -StringArray SC_OPCODE_HYP_GEOM_DIST_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the hypergeometric distribution." ; >; - < "X" ; >; - < "The number of successes in the sample." ; >; - < "n_sample" ; >; - < "The size of the sample." ; >; - < "successes" ; >; - < "The number of successes in the population." ; >; - < "n_population" ; >; - < "The population size." ; >; - < "Cumulative" ; >; - < "Cumulated. TRUE calculates the cumulative distribution function, FALSE the probability mass function." ; >; - }; -}; - // -=*# Resource for function TDIST #*=- -StringArray SC_OPCODE_T_DIST+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the t-distribution." ; >; - < "Number" ; >; - < "The value for which the T distribution is to be calculated." ; >; - < "degrees_freedom" ; >; - < "The degrees of freedom of the T distribution." ; >; - < "mode" ; >; - < "Mode = 1 calculates the one-tailed test, 2 = two-tailed distribution." ; >; - }; -}; - // -=*# Resource for function T.DIST.2T #*=- -StringArray SC_OPCODE_T_DIST_2T+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the two-tailed t-distribution." ; >; - < "Number" ; >; - < "The value for which the T distribution is to be calculated." ; >; - < "degrees_freedom" ; >; - < "The degrees of freedom of the T distribution." ; >; - }; -}; - // -=*# Resource for function T.DIST #*=- -StringArray SC_OPCODE_T_DIST_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the t-distribution." ; >; - < "Number" ; >; - < "The value for which the T distribution is to be calculated." ; >; - < "degrees_freedom" ; >; - < "The degrees of freedom of the T distribution." ; >; - < "cumulative" ; >; - < "True calculates the cumulative distribution function, false the probability density function." ; >; - }; -}; - // -=*# Resource for function T.DIST.RT #*=- -StringArray SC_OPCODE_T_DIST_RT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the right-tailed t-distribution." ; >; - < "Number" ; >; - < "The value for which the T distribution is to be calculated." ; >; - < "degrees_freedom" ; >; - < "The degrees of freedom of the T distribution." ; >; - }; -}; - // -=*# Resource for function TINV #*=- -StringArray SC_OPCODE_T_INV+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the inverse t-distribution." ; >; - < "number" ; >; - < "The probability value for which the inverse T distribution is to be calculated." ; >; - < "degrees_freedom" ; >; - < "The degrees of freedom of the T distribution." ; >; - }; -}; - // -=*# Resource for function T.INV #*=- -StringArray SC_OPCODE_T_INV_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the left-tailed inverse t-distribution." ; >; - < "number" ; >; - < "The probability value for which the inverse T distribution is to be calculated." ; >; - < "degrees_freedom" ; >; - < "The degrees of freedom of the T distribution." ; >; - }; -}; - // -=*# Resource for function T.INV.2T #*=- -StringArray SC_OPCODE_T_INV_2T+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the two-tailed inverse t-distribution." ; >; - < "number" ; >; - < "The probability value for which the inverse T distribution is to be calculated." ; >; - < "degrees_freedom" ; >; - < "The degrees of freedom of the T distribution." ; >; - }; -}; - // -=*# Resource for function FDIST #*=- -StringArray SC_OPCODE_F_DIST+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the F probability distribution." ; >; - < "Number" ; >; - < "The value for which the F distribution is to be calculated." ; >; - < "degrees_freedom_1" ; >; - < "The degrees of freedom in the numerator of the F distribution." ; >; - < "degrees_freedom_2" ; >; - < "The degrees of freedom in the denominator of the F distribution." ; >; - }; -}; - // -=*# Resource for function F.DIST #*=- -StringArray SC_OPCODE_F_DIST_LT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the left tail F probability distribution." ; >; - < "Number" ; >; - < "The value for which the F distribution is to be calculated." ; >; - < "degrees_freedom_1" ; >; - < "The degrees of freedom in the numerator of the F distribution." ; >; - < "degrees_freedom_2" ; >; - < "The degrees of freedom in the denominator of the F distribution." ; >; - < "cumulative" ; >; - < "Cumulative distribution function (TRUE) or probability density function (FALSE)." ; >; - }; -}; - // -=*# Resource for function F.DIST.RT #*=- -StringArray SC_OPCODE_F_DIST_RT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the right tail F probability distribution." ; >; - < "Number" ; >; - < "The value for which the F distribution is to be calculated." ; >; - < "degrees_freedom_1" ; >; - < "The degrees of freedom in the numerator of the F distribution." ; >; - < "degrees_freedom_2" ; >; - < "The degrees of freedom in the denominator of the F distribution." ; >; - }; -}; - // -=*# Resource for function FINV #*=- -StringArray SC_OPCODE_F_INV+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the inverse F distribution." ; >; - < "number" ; >; - < "The probability value for which the inverse F distribution is to be calculated." ; >; - < "degrees_freedom_1" ; >; - < "The degrees of freedom in the numerator of the F distribution." ; >; - < "degrees_freedom_2" ; >; - < "The degrees of freedom in the denominator of the F distribution." ; >; - }; -}; - // -=*# Resource for function F.INV #*=- -StringArray SC_OPCODE_F_INV_LT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the inverse left tail F distribution." ; >; - < "number" ; >; - < "The probability value for which the inverse F distribution is to be calculated." ; >; - < "degrees_freedom_1" ; >; - < "The degrees of freedom in the numerator of the F distribution." ; >; - < "degrees_freedom_2" ; >; - < "The degrees of freedom in the denominator of the F distribution." ; >; - }; -}; - // -=*# Resource for function F.INV.RT #*=- -StringArray SC_OPCODE_F_INV_RT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the inverse right tail F distribution." ; >; - < "number" ; >; - < "The probability value for which the inverse F distribution is to be calculated." ; >; - < "degrees_freedom_1" ; >; - < "The degrees of freedom in the numerator of the F distribution." ; >; - < "degrees_freedom_2" ; >; - < "The degrees of freedom in the denominator of the F distribution." ; >; - }; -}; - // -=*# Resource for function CHIDIST #*=- -StringArray SC_OPCODE_CHI_DIST+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the right-tail probability of the chi-square distribution." ; >; - < "Number" ; >; - < "The value for which the chi square distribution is to be calculated." ; >; - < "degrees_freedom" ; >; - < "The degrees of freedom of the chi square distribution." ; >; - }; -}; - // -=*# Resource for function CHISQ.DIST.RT #*=- -StringArray SC_OPCODE_CHI_DIST_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the right-tail probability of the chi-square distribution." ; >; - < "Number" ; >; - < "The value for which the chi square distribution is to be calculated." ; >; - < "degrees_freedom" ; >; - < "The degrees of freedom of the chi square distribution." ; >; - }; -}; - - // -=*# Resource for function CHISQDIST #*=- -StringArray SC_OPCODE_CHISQ_DIST+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns left-tail probability of the cumulative distribution function or values of the probability density function of the chi-square distribution." ; >; - < "Number" ; >; - < "The value for which the probability density function or cumulative distribution function is to be calculated." ; >; - < "Degrees of Freedom" ; >; - < "The degrees of freedom of the chi-square distribution." ; >; - < "Cumulative" ; >; - < "0 or FALSE calculates the probability density function. Any other value or TRUE or omitted calculates the cumulative distribution function." ; >; - }; -}; - - // -=*# Resource for function CHISQ.DIST #*=- -StringArray SC_OPCODE_CHISQ_DIST_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns left-tail probability of the cumulative distribution function or values of the probability density function of the chi-square distribution." ; >; - < "Number" ; >; - < "The value for which the probability density function or cumulative distribution function is to be calculated." ; >; - < "Degrees of Freedom" ; >; - < "The degrees of freedom of the chi-square distribution." ; >; - < "Cumulative" ; >; - < "0 or FALSE calculates the probability density function. Any other value or TRUE calculates the cumulative distribution function." ; >; - }; -}; - - // -=*# Resource for function CHIINV #*=- -StringArray SC_OPCODE_CHI_INV+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the inverse of CHIDIST(x; DegreesOfFreedom)." ; >; - < "number" ; >; - < "The probability value for which the inverse chi square distribution is to be calculated." ; >; - < "degrees_freedom" ; >; - < "The degrees of freedom of the chi square distribution." ; >; - }; -}; - - // -=*# Resource for function CHISQ.INV.RT #*=- -StringArray SC_OPCODE_CHI_INV_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the inverse of CHIDIST(x; DegreesOfFreedom)." ; >; - < "number" ; >; - < "The probability value for which the inverse chi square distribution is to be calculated." ; >; - < "degrees_freedom" ; >; - < "The degrees of freedom of the chi square distribution." ; >; - }; -}; - - // -=*# Resource for function CHISQINV #*=- -StringArray SC_OPCODE_CHISQ_INV+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the inverse of CHISQDIST(x;DegreesOfFreedom;TRUE())." ; >; - < "Probability" ; >; - < "The probability value for which the inverse of the chi square distribution is to be calculated." ; >; - < "Degrees of Freedom" ; >; - < "The degrees of freedom of the chi square distribution." ; >; - }; -}; - - // -=*# Resource for function CHISQ.INV #*=- -StringArray SC_OPCODE_CHISQ_INV_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Values of the inverse of CHISQ.DIST(x;DegreesOfFreedom;TRUE())." ; >; - < "Probability" ; >; - < "The probability value for which the inverse of the chi square distribution is to be calculated." ; >; - < "Degrees of Freedom" ; >; - < "The degrees of freedom of the chi square distribution." ; >; - }; -}; - - // -=*# Resource for function STANDARDIZE #*=- -StringArray SC_OPCODE_STANDARD+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Converts a random variable to a normalized value." ; >; - < "Number" ; >; - < "The value to be standardized." ; >; - < "mean" ; >; - < "The mean value used for moving." ; >; - < "STDEV" ; >; - < "The standard deviation used for scaling." ; >; - }; -}; - // -=*# Resource for function PERMUT #*=- -StringArray SC_OPCODE_PERMUT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the number of permutations for a given number of elements without repetition." ; >; - < "Count_1" ; >; - < "The total number of elements." ; >; - < "Count_2" ; >; - < "The selection number taken from the elements." ; >; - }; -}; - // -=*# Resource for function PERMUTATIONA #*=- -StringArray SC_OPCODE_PERMUTATION_A+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the number of permutations for a given number of objects (repetition allowed)." ; >; - < "Count_1" ; >; - < "The total number of elements." ; >; - < "Count_2" ; >; - < "The selection number taken from the elements." ; >; - }; -}; - // -=*# Resource for function CONFIDENCE #*=- -StringArray SC_OPCODE_CONFIDENCE+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns a (1-alpha) confidence interval for a normal distribution." ; >; - < "alpha" ; >; - < "The level of the confidence interval." ; >; - < "STDEV" ; >; - < "The standard deviation of the population." ; >; - < "size" ; >; - < "The size of the population." ; >; - }; -}; - // -=*# Resource for function CONFIDENCE.NORM #*=- -StringArray SC_OPCODE_CONFIDENCE_N+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns a (1-alpha) confidence interval for a normal distribution." ; >; - < "alpha" ; >; - < "The level of the confidence interval." ; >; - < "STDEV" ; >; - < "The standard deviation of the population." ; >; - < "size" ; >; - < "The size of the population." ; >; - }; -}; - // -=*# Resource for function CONFIDENCE.T #*=- -StringArray SC_OPCODE_CONFIDENCE_T+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns a (1-alpha) confidence interval for a Student's t distribution." ; >; - < "alpha" ; >; - < "The level of the confidence interval." ; >; - < "STDEV" ; >; - < "The standard deviation of the population." ; >; - < "size" ; >; - < "The size of the population." ; >; - }; -}; - // -=*# Resource for function ZTEST #*=- -StringArray SC_OPCODE_Z_TEST+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the probability of observing a z-statistic greater than the one computed based on a sample." ; >; - < "data" ; >; - < "The given sample, drawn from a normally distributed population." ; >; - < "mu" ; >; - < "The known mean of the population." ; >; - < "sigma" ; >; - < "The known standard deviation of the population. If omitted, the standard deviation of the given sample is used." ; >; - }; -}; - // -=*# Resource for function Z.TEST #*=- -StringArray SC_OPCODE_Z_TEST_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the probability of observing a z-statistic greater than the one computed based on a sample." ; >; - < "data" ; >; - < "The given sample, drawn from a normally distributed population." ; >; - < "mu" ; >; - < "The known mean of the population." ; >; - < "sigma" ; >; - < "The known standard deviation of the population. If omitted, the standard deviation of the given sample is used." ; >; - }; -}; - // -=*# Resource for function CHITEST #*=- -StringArray SC_OPCODE_CHI_TEST+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the chi square independence test." ; >; - < "Data_B" ; >; - < "The observed data array." ; >; - < "data_E" ; >; - < "The expected data array." ; >; - }; -}; - // -=*# Resource for function CHISQ.TEST #*=- -StringArray SC_OPCODE_CHI_TEST_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the chi square independence test." ; >; - < "Data_B" ; >; - < "The observed data array." ; >; - < "data_E" ; >; - < "The expected data array." ; >; - }; -}; - // -=*# Resource for function FTEST #*=- -StringArray SC_OPCODE_F_TEST+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the F test." ; >; - < "data_1" ; >; - < "The first record array." ; >; - < "data_2" ; >; - < "The second record array." ; >; - }; -}; - // -=*# Resource for function F.TEST #*=- -StringArray SC_OPCODE_F_TEST_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the F test." ; >; - < "data_1" ; >; - < "The first record array." ; >; - < "data_2" ; >; - < "The second record array." ; >; - }; -}; - // -=*# Resource for function TTEST #*=- -StringArray SC_OPCODE_T_TEST+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the T test." ; >; - < "data_1" ; >; - < "The first record array." ; >; - < "data_2" ; >; - < "The second record array." ; >; - < "mode" ; >; - < "Mode specifies the number of distribution tails to return. 1= one-tailed, 2 = two-tailed distribution" ; >; - < "Type" ; >; - < "The type of the T test." ; >; - }; -}; - // -=*# Resource for function T.TEST #*=- -StringArray SC_OPCODE_T_TEST_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the T test." ; >; - < "data_1" ; >; - < "The first record array." ; >; - < "data_2" ; >; - < "The second record array." ; >; - < "mode" ; >; - < "Mode specifies the number of distribution tails to return. 1= one-tailed, 2 = two-tailed distribution" ; >; - < "Type" ; >; - < "The type of the T test." ; >; - }; -}; - // -=*# Resource for function RSQ #*=- -StringArray SC_OPCODE_RSQ+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the square of the Pearson product moment correlation coefficient." ; >; - < "data_Y" ; >; - < "The Y data array." ; >; - < "data_X" ; >; - < "The X data array." ; >; - }; -}; - // -=*# Resource for function INTERCEPT #*=- -StringArray SC_OPCODE_INTERCEPT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the intercept of the linear regression line and the Y axis." ; >; - < "data_Y" ; >; - < "The Y data array." ; >; - < "data_X" ; >; - < "The X data array." ; >; - }; -}; - // -=*# Resource for function SLOPE #*=- -StringArray SC_OPCODE_SLOPE+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the slope of the linear regression line." ; >; - < "data_Y" ; >; - < "The Y data array." ; >; - < "data_X" ; >; - < "The X data array." ; >; - }; -}; - // -=*# Resource for function STEYX #*=- -StringArray SC_OPCODE_STEYX+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the standard error of the linear regression." ; >; - < "data_Y" ; >; - < "The Y data array." ; >; - < "data_X" ; >; - < "The X data array." ; >; - }; -}; - // -=*# Resource for function PEARSON #*=- -StringArray SC_OPCODE_PEARSON+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the Pearson product moment correlation coefficient." ; >; - < "Data_1" ; >; - < "The first record array." ; >; - < "Data_2" ; >; - < "The second record array." ; >; - }; -}; - // -=*# Resource for function CORREL #*=- -StringArray SC_OPCODE_CORREL+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the correlation coefficient." ; >; - < "Data_1" ; >; - < "The first record array." ; >; - < "Data_2" ; >; - < "The second record array." ; >; - }; -}; - // -=*# Resource for function COVAR #*=- -StringArray SC_OPCODE_COVAR+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the population covariance." ; >; - < "Data_1" ; >; - < "The first record array." ; >; - < "Data_2" ; >; - < "The second record array." ; >; - }; -}; - // -=*# Resource for function COVARIANCE.P #*=- -StringArray SC_OPCODE_COVARIANCE_P+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the population covariance." ; >; - < "Data_1" ; >; - < "The first record array." ; >; - < "Data_2" ; >; - < "The second record array." ; >; - }; -}; - // -=*# Resource for function COVARIANCE.S #*=- -StringArray SC_OPCODE_COVARIANCE_S+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the sample covariance." ; >; - < "Data_1" ; >; - < "The first record array." ; >; - < "Data_2" ; >; - < "The second record array." ; >; - }; -}; - // -=*# Resource for function FORECAST #*=- -StringArray SC_OPCODE_FORECAST+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns a value along a linear regression" ; >; - < "value" ; >; - < "The X value for which the Y value on the regression linear is to be calculated." ; >; - < "data_Y" ; >; - < "The Y data array." ; >; - < "data_X" ; >; - < "The X data array." ; >; - }; -}; - // -=*# Resource for function FORECAST.ETS #*=- -StringArray SC_OPCODE_FORECAST_ETS_ADD+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates future value(s) using additive Exponential Smoothing algorithm." ; >; - < "target" ; >; - < "The date (array) for which you want to predict a value." ; >; - < "values" ; >; - < "The data array from which you want to forecast." ; >; - < "timeline" ; >; - < "The date or numeric array; a consistent step between values is needed." ; >; - < "period length" ; >; - < "Number of Samples in Period (default 1); length of the seasonal pattern." ; >; - < "data completion" ; >; - < "Data completion (default 1); 0 treats missing points as zero, 1 interpolates." ; >; - < "aggregation" ; >; - < "Aggregation (default 1 = AVERAGE); method to be used to aggregate identical (time) values." ; >; - }; -}; - // -=*# Resource for function FORECAST.ETS.MULT #*=- -StringArray SC_OPCODE_FORECAST_ETS_MUL+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates future value(s) using multiplicative Exponential Smoothing algorithm." ; >; - < "target" ; >; - < "The date (array) for which you want to predict a value." ; >; - < "values" ; >; - < "The data array from which you want to forecast." ; >; - < "timeline" ; >; - < "The date or numeric array; a consistent step between values is needed." ; >; - < "period length" ; >; - < "Number of Samples in Period (default 1); length of the seasonal pattern." ; >; - < "data completion" ; >; - < "Data completion (default 1); 0 treats missing points as zero, 1 interpolates." ; >; - < "aggregation" ; >; - < "Aggregation (default 1 = AVERAGE); method to be used to aggregate identical (time) values." ; >; - }; -}; - // -=*# Resource for function FORECAST.ETS.CONFINT #*=- -StringArray SC_OPCODE_FORECAST_ETS_PIA+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns a prediction interval at the specified target value(s) for additive Exponential Smoothing method" ; >; - < "target" ; >; - < "The date (array) for which you want to predict a value." ; >; - < "values" ; >; - < "The data array from which you want to forecast." ; >; - < "timeline" ; >; - < "The date or numeric array; a consistent step between values is needed." ; >; - < "confidence level" ; >; - < "Confidence level (default 0.95); value 0 to 1 (exclusive) for 0 to 100% calculated prediction interval." ; >; - < "period length" ; >; - < "Number of Samples in Period (default 1); length of the seasonal pattern." ; >; - < "data completion" ; >; - < "Data completion (default 1); 0 treats missing points as zero, 1 interpolates." ; >; - < "aggregation" ; >; - < "Aggregation (default 1 = AVERAGE); method to be used to aggregate identical (time) values." ; >; - }; -}; - // -=*# Resource for function FORECAST.ETS.PI.MULT #*=- -StringArray SC_OPCODE_FORECAST_ETS_PIM+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns a prediction interval at the specified target value(s) for multiplicative Exponential Smoothing method" ; >; - < "target" ; >; - < "The date (array) for which you want to predict a value." ; >; - < "values" ; >; - < "The data array from which you want to forecast." ; >; - < "timeline" ; >; - < "The date or numeric array; a consistent step between values is needed." ; >; - < "confidence level" ; >; - < "Confidence level (default 0.95); value 0 to 1 (exclusive) for 0 to 100% calculated prediction interval." ; >; - < "period length" ; >; - < "Number of Samples in Period (default 1); length of the seasonal pattern." ; >; - < "data completion" ; >; - < "Data completion (default 1); 0 treats missing points as zero, 1 interpolates." ; >; - < "aggregation" ; >; - < "Aggregation (default 1 = AVERAGE); method to be used to aggregate identical (time) values." ; >; - }; -}; - // -=*# Resource for function FORECAST.ETS.SEASONALITY #*=- -StringArray SC_OPCODE_FORECAST_ETS_SEA+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the number of samples in period (season) using additive Exponential Triple Smoothing algorithm." ; >; - < "values" ; >; - < "The data array from which you want to forecast." ; >; - < "timeline" ; >; - < "The date or numeric array; a consistent step between values is needed." ; >; - < "data completion" ; >; - < "Data completion (default 1); 0 treats missing points as zero, 1 interpolates." ; >; - < "aggregation" ; >; - < "Aggregation (default 1 = AVERAGE); method to be used to aggregate identical (time) values." ; >; - }; -}; - // -=*# Resource for function FORECAST.ETS.STAT #*=- -StringArray SC_OPCODE_FORECAST_ETS_STA+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns statistical value(s) using additive Exponential Smoothing algorithm." ; >; - < "values" ; >; - < "The data array from which you want to forecast." ; >; - < "timeline" ; >; - < "The date or numeric array; a consistent step between values is needed." ; >; - < "statistic type" ; >; - < "Value (1-9) or array of values, indicating which statistic will be returned for the calculated forecast" ; >; - < "period length" ; >; - < "Number of Samples in Period (default 1); length of the seasonal pattern." ; >; - < "data completion" ; >; - < "Data completion (default 1); 0 treats missing points as zero, 1 interpolates." ; >; - < "aggregation" ; >; - < "Aggregation (default 1 = AVERAGE); method to be used to aggregate identical (time) values." ; >; - }; -}; - // -=*# Resource for function FORECAST.ETS.STAT.MULT #*=- -StringArray SC_OPCODE_FORECAST_ETS_STM+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns statistical value(s) using multiplicative Exponential Smoothing algorithm." ; >; - < "values" ; >; - < "The data array from which you want to forecast." ; >; - < "timeline" ; >; - < "The date or numeric array; a consistent step between values is needed." ; >; - < "statistic type" ; >; - < "Value (1-9) or array of values, indicating which statistic will be returned for the calculated forecast" ; >; - < "period length" ; >; - < "Number Of Samples in Period (default 1); length of the seasonal pattern." ; >; - < "data completion" ; >; - < "Data completion (default 1); 0 treats missing points as zero, 1 interpolates." ; >; - < "aggregation" ; >; - < "Aggregation (default 1 = AVERAGE); method to be used to aggregate identical (time) values." ; >; - }; -}; - // -=*# Resource for function FORECAST.LINEAR #*=- -StringArray SC_OPCODE_FORECAST_LIN+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns a value along a linear regression" ; >; - < "value" ; >; - < "The X value for which the Y value on the regression linear is to be calculated." ; >; - < "data_Y" ; >; - < "The Y data array." ; >; - < "data_X" ; >; - < "The X data array." ; >; - }; -}; - // -=*# Resource for function ADDRESS #*=- -StringArray SC_OPCODE_ADDRESS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the reference to a cell as text." ; >; - < "row" ; >; - < "The row number of the cell." ; >; - < "column" ; >; - < "The column number of the cell." ; >; - < "ABS" ; >; - < "Specifies whether absolute or relative referencing is to be used." ; >; - < "A1" ; >; - < "The reference style: 0 or FALSE means R1C1 style, any other value or omitted means A1 style." ; >; - < "sheet" ; >; // previously to OOo3.0 this was String resource RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_ADDRESS 8 - < "The spreadsheet name of the cell reference." ; >; // previously to OOo3.0 this was String resource RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_ADDRESS 9 - }; -}; - // -=*# Resource for function AREAS #*=- -StringArray SC_OPCODE_AREAS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the number of individual ranges that belong to a (multiple) range." ; >; - < "reference" ; >; - < "The reference to a (multiple) range." ; >; - }; -}; - // -=*# Resource for function CHOOSE #*=- -StringArray SC_OPCODE_CHOOSE+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Selects a value from a list of up to 30 value arguments." ; >; - < "Index" ; >; - < "The index of the value (1..30) selected." ; >; - < "value " ; >; - < "Value 1, value 2,... The list of arguments from which a value is chosen." ; >; - }; -}; - // -=*# Resource for function COLUMNS #*=- -StringArray SC_OPCODE_COLUMN+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the internal column number of a reference." ; >; - < "reference" ; >; - < "The reference to a cell or a range." ; >; - }; -}; - // -=*# Resource for function ROW #*=- -StringArray SC_OPCODE_ROW+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Defines the internal row number of a reference." ; >; - < "reference" ; >; - < "The reference to a cell or a range." ; >; - }; -}; - // -=*# Resource for function SHEET #*=- -StringArray SC_OPCODE_SHEET+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the internal sheet number of a reference or a string." ; >; - < "reference" ; >; - < "The reference to a cell or a range or the character string of a sheet name." ; >; - }; -}; - // -=*# Resource for function COLUMNS #*=- -StringArray SC_OPCODE_COLUMNS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the number of columns in an array or reference." ; >; - < "array" ; >; - < "The array (reference) for which the number of columns is to be determined." ; >; - }; -}; - // -=*# Resource for function ROWS #*=- -StringArray SC_OPCODE_ROWS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the number of rows in a reference or array." ; >; - < "array" ; >; - < "The array (reference) for which the number of rows is to be determined." ; >; - }; -}; - // -=*# Resource for function SHEETS #*=- -StringArray SC_OPCODE_SHEETS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the number of sheets of a given reference. If no parameter has been entered, the total number of sheets in the document is returned." ; >; - < "reference" ; >; - < "The reference to a cell or a range." ; >; - }; -}; - // -=*# Resource for function HLOOKUP #*=- -StringArray SC_OPCODE_H_LOOKUP+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Horizontal search and reference to the cells located below." ; >; - < "search_criteria" ; >; - < "The value to be found in the first row." ; >; - < "array" ; >; - < "The array or the range for the reference." ; >; - < "Index" ; >; - < "The row index in the array." ; >; - < "sorted" ; >; - < "If the value is TRUE or not given, the search row of the array must be sorted in ascending order." ; >; - }; -}; - // -=*# Resource for function VLOOKUP #*=- -StringArray SC_OPCODE_V_LOOKUP+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Vertical search and reference to indicated cells." ; >; - < "Search criterion" ; >; - < "The value to be found in the first column." ; >; - < "array" ; >; - < "The array or range for referencing." ; >; - < "Index" ; >; - < "Column index number in the array." ; >; - < "sort order" ; >; - < "If the value is TRUE or not given, the search column of the array must be sorted in ascending order." ; >; - }; -}; - // -=*# Resource for function INDEX #*=- -StringArray SC_OPCODE_INDEX+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns a reference to a cell from a defined range." ; >; - < "reference" ; >; - < "The reference to a (multiple) range." ; >; - < "row" ; >; - < "The row in the range." ; >; - < "column" ; >; - < "The column in the range." ; >; - < "range" ; >; - < "The index of the subrange if referring to a multiple range." ; >; - }; -}; - // -=*# Resource for function INDIRECT #*=- -StringArray SC_OPCODE_INDIRECT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the contents of a cell that is referenced in text form." ; >; - < "ref" ; >; - < "The cell whose contents are to be evaluated is to be referenced in text form (e.g. \"A1\")." ; >; - < "A1" ; >; - < "The reference style: 0 or FALSE means R1C1 style, any other value or omitted means A1 style." ; >; - }; -}; - // -=*# Resource for function LOOKUP #*=- -StringArray SC_OPCODE_LOOKUP+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Determines a value in a vector by comparison to values in another vector." ; >; - < "Search criterion" ; >; - < "The value to be used for comparison." ; >; - < "Search vector" ; >; - < "The vector (row or column) in which to search." ; >; - < "result_vector" ; >; - < "The vector (row or range) from which the value is to be determined." ; >; - }; -}; - // -=*# Resource for function MATCH #*=- -StringArray SC_OPCODE_MATCH+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Defines a position in a array after comparing values." ; >; - < "Search criterion" ; >; - < "The value to be used for comparison." ; >; - < "lookup_array" ; >; - < "The array (range) in which the search is made." ; >; - < "Type" ; >; - < "Type can take the value 1, 0 or -1 and determines the criteria are to be used for comparison purposes." ; >; - }; -}; - // -=*# Resource for function OFFSET #*=- -StringArray SC_OPCODE_OFFSET+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns a reference which has been moved in relation to the starting point." ; >; - < "reference" ; >; - < "The reference (cell) from which to base the movement." ; >; - < "rows" ; >; - < "The number of rows to be moved either up or down." ; >; - < "columns" ; >; - < "The number of columns that are to be moved to the left or to the right." ; >; - < "height" ; >; - < "The number of rows of the moved reference." ; >; - < "width" ; >; - < "The number of columns in the moved reference." ; >; - }; -}; - // -=*# Resource for function ERRORTYPE #*=- -StringArray SC_OPCODE_ERROR_TYPE+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns a number corresponding to an error type" ; >; - < "reference" ; >; - < "The reference (cell) in which the error occurred." ; >; - }; -}; - // -=*# Resource for function ERROR.TYPE #*=- -StringArray SC_OPCODE_ERROR_TYPE_ODF+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns a number corresponding to one of the error values or #N/A if no error exists" ; >; - < "expression" ; >; - < "The error value whose identifying number you want to find. Can be the actual error value or a reference to a cell that you want to test." ; >; - }; -}; - // -=*# Resource for function STYLE #*=- -StringArray SC_OPCODE_STYLE+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Applies a Style to the formula cell." ; >; - < "Style" ; >; - < "The name of the Style to be applied." ; >; - < "Time" ; >; - < "The time (in seconds) that the Style is to remain valid." ; >; - < "Style2" ; >; - < "The Style to be applied after time expires." ; >; - }; -}; - // -=*# Resource for function DDE #*=- -StringArray SC_OPCODE_DDE+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Result of a DDE link." ; >; - < "server" ; >; - < "The name of the server application." ; >; - < "File" ; >; - < "The name of the file." ; >; - < "range" ; >; - < "The range from which data is to be taken." ; >; - < "mode" ; >; - < "Defines how data is to be converted to numbers." ; >; - }; -}; - // -=*# Resource for function HYPERLINK #*=- -StringArray SC_OPCODE_HYPERLINK+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Hyperlink." ; >; - < "URL" ; >; - < "URL"; >; - < "CellText" ; >; - < "Cell Text"; >; - }; -}; - // -=*# Resource for function GETPIVOTDATA #*=- -StringArray SC_OPCODE_GET_PIVOT_DATA+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Extracts value(s) from a pivot table."; >; - < "Data Field"; >; - < "The name of the pivot table field to extract."; >; - < "Pivot Table"; >; - < "A reference to a cell or range in the pivot table."; >; - < "Field Name / Item"; >; - < "Field name/value pair to filter the target data."; >; - }; -}; - // -=*# Resource for function BAHTTEXT #*=- -StringArray SC_OPCODE_BAHTTEXT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Converts a number to text (Baht)." ; >; - < "Number" ; >; - < "The number to convert."; >; - }; -}; - // -=*# Resource for function JIS #*=- -StringArray SC_OPCODE_JIS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Converts half-width ASCII and katakana characters to full-width." ; >; - < "text" ; >; - < "The text to convert."; >; - }; -}; - // -=*# Resource for function ASC #*=- -StringArray SC_OPCODE_ASC+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Converts full-width ASCII and katakana characters to half-width." ; >; - < "text" ; >; - < "The text to convert."; >; - }; -}; - // -=*# Resource for function CODE #*=- -StringArray SC_OPCODE_CODE+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns a numeric code for the first character in a text string." ; >; - < "text" ; >; - < "This is the text for which the code of the first character is to be found." ; >; - }; -}; - // -=*# Resource for function DOLLAR #*=- -StringArray SC_OPCODE_CURRENCY+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Converts a number to text in currency format." ; >; - < "value" ; >; - < "Value is a number, a reference to a cell containing a number or a formula that results in a number." ; >; - < "decimals" ; >; - < "Decimal places. Denotes the number of digits to the right of the decimal point." ; >; - }; -}; - // -=*# Resource for function CHAR #*=- -StringArray SC_OPCODE_CHAR+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Converts a code number into a character or letter." ; >; - < "number" ; >; - < "The code value for the character." ; >; - }; -}; - // -=*# Resource for function CLEAN #*=- -StringArray SC_OPCODE_CLEAN+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Removes all nonprintable characters from text." ; >; - < "text" ; >; - < "The text from which nonprintable characters are to be removed." ; >; - }; -}; - // -=*# Resource for function CONCATENATE #*=- -StringArray SC_OPCODE_CONCAT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Combines several text items into one." ; >; - < "text" ; >; - < "Text for the concatenation." ; >; - }; -}; - // -=*# Resource for function CONCAT #*=- -StringArray SC_OPCODE_CONCAT_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Combines several text items into one, accepts cell ranges as arguments." ; >; - < "text" ; >; - < "Text and/or cell ranges for the concatenation." ; >; - }; -}; - // -=*# Resource for function TEXTJOIN #*=- -StringArray SC_OPCODE_TEXTJOIN_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Combines several text items into one, accepts cell ranges as arguments. Uses delimiter between items." ; >; - < "delimiter" ; >; - < "Text string to be used as delimiter." ; >; - < "skip empty cells" ; >; - < "If TRUE, empty cells will be ignored." ; >; - < "text" ; >; - < "Text and/or cell ranges for the concatenation." ; >; - }; -}; - // -=*# Resource for function IFS #*=- -StringArray SC_OPCODE_IFS_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Checks 1 or more conditions and returns a value corresponding to the first true condition." ; >; - < "test" ; >; - < "Any value or expression which can be either TRUE or FALSE." ; >; - < "result" ; >; - < "The result of the function if test is TRUE." ; >; - }; -}; - // -=*# Resource for function SWITCH #*=- -StringArray SC_OPCODE_SWITCH_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Checks 1 or more values and returns a result corresponding to the first value equal to the given expression." ; >; - < "expression" ; >; - < "Value that will be compared against value1-valueN." ; >; - < "value" ; >; - < "Value that will be compared against expression." ; >; - < "result" ; >; - < "Value to return when corresponding value argument matches expression." ; >; - }; -}; -StringArray SC_OPCODE_MINIFS_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the minimum value in a range that meet multiple criteria in multiple ranges." ; >; - < "min_range" ; >; - < "The range from which the minimum will be determined." ; >; - < "range" ; >; - < "Range 1, range 2,... are the ranges to be evaluated by the criteria given." ; >; - < "criteria" ; >; - < "Criteria 1, criteria 2,... are the criteria to be applied to the ranges given." ; >; - }; -}; -StringArray SC_OPCODE_MAXIFS_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the maximum value in a range that meet multiple criteria in multiple ranges." ; >; - < "max_range" ; >; - < "The range from which the maximum will be determined." ; >; - < "range" ; >; - < "Range 1, range 2,... are the ranges to be evaluated by the criteria given." ; >; - < "criteria" ; >; - < "Criteria 1, criteria 2,... are the criteria to be applied to the ranges given." ; >; - }; -}; - // -=*# Resource for function EXACT #*=- -StringArray SC_OPCODE_EXACT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Specifies whether two texts are identical." ; >; - < "text_1" ; >; - < "The first text to be used for comparing texts." ; >; - < "text_2" ; >; - < "The second text for comparing texts." ; >; - }; -}; - // -=*# Resource for function FIND #*=- -StringArray SC_OPCODE_FIND+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Looks for a string of text within another (case sensitive)" ; >; - < "find_text" ; >; - < "The text to be found." ; >; - < "text" ; >; - < "The text in which a search is to be made." ; >; - < "position" ; >; - < "The position in the text from which the search starts." ; >; - }; -}; - // -=*# Resource for function SEARCH #*=- -StringArray SC_OPCODE_SEARCH+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Looks for one text value within another (not case-sensitive)." ; >; - < "find_text" ; >; - < "The text to be found." ; >; - < "text" ; >; - < "The text in which a search is to be made." ; >; - < "position" ; >; - < "The position in the text where the search is started." ; >; - }; -}; - // -=*# Resource for function TRIM #*=- -StringArray SC_OPCODE_TRIM+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Removes extra spaces from text." ; >; - < "text" ; >; - < "The text in which extra spaces between words are to be deleted." ; >; - }; -}; - // -=*# Resource for function PROPER #*=- -StringArray SC_OPCODE_PROPER+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Capitalizes the first letter in all words." ; >; - < "text" ; >; - < "The text in which the beginning of words are to be replaced by capital letters." ; >; - }; -}; - // -=*# Resource for function UPPER #*=- -StringArray SC_OPCODE_UPPER+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Converts text to uppercase." ; >; - < "text" ; >; - < "The text in which lower case letters are to be converted to capitals." ; >; - }; -}; - // -=*# Resource for function LOWER #*=- -StringArray SC_OPCODE_LOWER+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Converts text to lowercase." ; >; - < "text" ; >; - < "The text in which capitals are converted to lower case letters." ; >; - }; -}; - // -=*# Resource for function VALUE #*=- -StringArray SC_OPCODE_VALUE+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Converts text to a number." ; >; - < "text" ; >; - < "The text to be converted to a number." ; >; - }; -}; - // -=*# Resource for function TEXT #*=- -StringArray SC_OPCODE_TEXT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Converts a number to text according to a given format." ; >; - < "number" ; >; - < "The numeric value to be converted." ; >; - < "Format" ; >; - < "The text that describes the format." ; >; - }; -}; - // -=*# Resource for function T #*=- -StringArray SC_OPCODE_T+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns a value if it is text, otherwise an empty string." ; >; - < "value" ; >; - < "The value to be checked and returned if it is text." ; >; - }; -}; - // -=*# Resource for function REPLACE #*=- -StringArray SC_OPCODE_REPLACE+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Replaces characters within a text string with a different text string." ; >; - < "Text" ; >; - < "The text in which some characters are to be replaced." ; >; - < "position" ; >; - < "The character position from which text is to be replaced." ; >; - < "length" ; >; - < "The number of characters to be replaced." ; >; - < "new text" ; >; - < "The text to be inserted." ; >; - }; -}; - // -=*# Resource for function FIXED #*=- -StringArray SC_OPCODE_FIXED+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Formats a number with a fixed number of places after the decimal point and thousands separator." ; >; - < "number" ; >; - < "The number to be formatted." ; >; - < "Decimals" ; >; - < "Decimal places. The number of fixed decimal places that are to be displayed." ; >; - < "No thousands separators" ; >; - < "Thousands separator. If 0 or omitted the locale group separator is used else the separator is suppressed." ; >; - }; -}; - // -=*# Resource for function LEN #*=- -StringArray SC_OPCODE_LEN+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates length of a text string." ; >; - < "text" ; >; - < "The text in which the length is to be determined." ; >; - }; -}; - // -=*# Resource for function LEFT #*=- -StringArray SC_OPCODE_LEFT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the first character or characters of a text." ; >; - < "text" ; >; - < "The text where the initial partial words are to be determined." ; >; - < "number" ; >; - < "The number of characters for the start text." ; >; - }; -}; - // -=*# Resource for function RIGHT #*=- -StringArray SC_OPCODE_RIGHT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the last character or characters of a text." ; >; - < "text" ; >; - < "The text in which the end partial words are to be determined." ; >; - < "number" ; >; - < "The number of characters for the end text." ; >; - }; -}; - // -=*# Resource for function MID #*=- -StringArray SC_OPCODE_MID+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns a partial text string of a text." ; >; - < "text" ; >; - < "The text in which partial words are to be determined." ; >; - < "start" ; >; - < "The position from which the part word is to be determined." ; >; - < "number" ; >; - < "The number of characters for the text." ; >; - }; -}; - // -=*# Resource for function REPT #*=- -StringArray SC_OPCODE_REPT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Repeats text a given number of times." ; >; - < "text" ; >; - < "The text to be repeated." ; >; - < "number" ; >; - < "The number of times the text is to be repeated." ; >; - }; -}; - // -=*# Resource for function SUBSTITUTE #*=- -StringArray SC_OPCODE_SUBSTITUTE+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Substitutes new text for old text in a string." ; >; - < "text" ; >; - < "The text in which partial words are to be replaced." ; >; - < "search_text" ; >; - < "The partial string to be (repeatedly) replaced." ; >; - < "new text" ; >; - < "The text which is to replace the text string." ; >; - < "occurrence" ; >; - < "Which occurrence of the old text is to be replaced." ; >; - }; -}; - // -=*# Resource for function BASE #*=- -StringArray SC_OPCODE_BASE+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Converts a positive integer to text from a number system to the base defined." ; >; - < "number" ; >; - < "The number to be converted." ; >; - < "radix" ; >; - < "The base number for conversion must be in the range 2 - 36." ; >; - < "Minimum length" ; >; - < "If the text is shorter than the specified length, zeros are added to the left of the string." ; >; - }; -}; - // -=*# Resource for function DECIMAL #*=- -StringArray SC_OPCODE_DECIMAL+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Converts a text of a specified number system to a positive integer in the base given." ; >; - < "text" ; >; - < "The text to be converted." ; >; - < "radix" ; >; - < "The base number for conversion must be in the range 2 - 36." ; >; - }; -}; - // -=*# Resource for function CONVERT_OOO #*=- -StringArray SC_OPCODE_CONVERT_OOO+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Converts a value according to a conversion table in the configuration (main.xcd)."; >; - < "value" ; >; - < "The value to be converted."; >; - < "text" ; >; - < "Unit from which something is converted, case-sensitive."; >; - < "text" ; >; - < "Unit into which something is converted, case-sensitive."; >; - }; -}; - // -=*# Resource for function ROMAN #*=- -StringArray SC_OPCODE_ROMAN+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Converts a number to a Roman numeral."; >; - < "Number"; >; - < "The number to be converted to a Roman numeral must be in the 0 - 3999 range."; >; - < "Mode"; >; - < "The more this value increases, the more the Roman numeral is simplified. The value must be in the 0 - 4 range."; >; - }; -}; - // -=*# Resource for function ARABIC #*=- -StringArray SC_OPCODE_ARABIC+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates the value of a Roman numeral."; >; - < "Text"; >; - < "The text that represents a Roman numeral."; >; - }; -}; -StringArray SC_OPCODE_INFO+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns information about the environment."; >; - < "Text"; >; - < "Can be \"osversion\", \"system\", \"release\", \"numfile\", and \"recalc\"."; >; - }; -}; -StringArray SC_OPCODE_UNICODE+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the numeric code for the first Unicode character in a text string." ; >; - < "text" ; >; - < "This is the text for which the code of the first character is to be found." ; >; - }; -}; -StringArray SC_OPCODE_UNICHAR+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Converts a code number into a Unicode character or letter." ; >; - < "number" ; >; - < "The code value for the character." ; >; - }; -}; -StringArray SC_OPCODE_EUROCONVERT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Converts a value from one to another Euro currency."; >; - < "value" ; >; - < "The value to be converted."; >; - < "from_currency" ; >; - < "ISO 4217 code of the currency from which is converted, case-sensitive."; >; - < "to_currency" ; >; - < "ISO 4217 code of the currency into which is converted, case-sensitive."; >; - < "full_precision" ; >; - < "If omitted or 0 or FALSE, the result is rounded to the decimals of to_currency. Else the result is not rounded."; >; - < "triangulation_precision" ; >; - < "If given and >=3, the intermediate result of a triangular conversion is rounded to that precision. If omitted, the result is not rounded."; >; // This description uses almost all available space in the dialog, make sure translations fit in size. - }; -}; -StringArray SC_OPCODE_NUMBERVALUE+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Converts text to a number, in a locale-independent way." ; >; - < "text" ; >; - < "The text to be converted to a number." ; >; - < "decimal_separator" ; >; - < "Defines the character used as the decimal separator." ; >; - < "group_separator" ; >; - < "Defines the character(s) used as the group separator." ; >; - }; -}; - -StringArray SC_OPCODE_BITAND+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Bitwise \"AND\" of two integers."; >; - < "Number1" ; >; - < "Positive integer less than 2^48." ; >; - < "Number2" ; >; - < "Positive integer less than 2^48." ; >; - }; -}; -StringArray SC_OPCODE_BITOR+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Bitwise \"OR\" of two integers."; >; - < "Number1" ; >; - < "Positive integer less than 2^48." ; >; - < "Number2" ; >; - < "Positive integer less than 2^48." ; >; - }; -}; -StringArray SC_OPCODE_BITXOR+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Bitwise \"exclusive OR\" of two integers."; >; - < "Number1" ; >; - < "Positive integer less than 2^48." ; >; - < "Number2" ; >; - < "Positive integer less than 2^48." ; >; - }; -}; -StringArray SC_OPCODE_BITRSHIFT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Bitwise right shift of an integer value."; >; - < "Number" ; >; - < "The value to be shifted. Positive integer less than 2^48." ; >; - < "Shift" ; >; - < "The integer number of bits the value is to be shifted." ; >; - }; -}; -StringArray SC_OPCODE_BITLSHIFT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Bitwise left shift of an integer value."; >; - < "Number" ; >; - < "The value to be shifted. Positive integer less than 2^48." ; >; - < "Shift" ; >; - < "The integer number of bits the value is to be shifted." ; >; - }; -}; -StringArray SC_OPCODE_LENB+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Calculates length of a text string, with DBCS" ; >; - < "text" ; >; - < "The text in which the length is to be determined." ; >; - }; -}; -StringArray SC_OPCODE_RIGHTB+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the last character or characters of a text,with DBCS" ; >; - < "text" ; >; - < "The text in which the end partial words are to be determined." ; >; - < "number" ; >; - < "The number of characters for the end text." ; >; - }; -}; -StringArray SC_OPCODE_LEFTB+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the first character or characters of a text,with DBCS" ; >; - < "text" ; >; - < "The text where the initial partial words are to be determined." ; >; - < "number" ; >; - < "The number of characters for the start text." ; >; - }; -}; -StringArray SC_OPCODE_MIDB+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns a partial text string of a text, with DBCS" ; >; - < "text" ; >; - < "The text in which partial words are to be determined." ; >; - < "start" ; >; - < "The position from which the part word is to be determined." ; >; - < "number" ; >; - < "The number of characters for the text." ; >; - }; -}; -StringArray SC_OPCODE_FILTERXML+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Apply an XPath expression to an XML document"; >; - < "XML Document"; >; - < "String containing a valid XML stream"; >; - < "XPath expression"; >; - < "String containing a valid XPath expression"; >; - }; -}; -StringArray SC_OPCODE_COLOR+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns an implementation defined value representing a RGBA color"; >; - < "Red"; >; - < "Value of red"; >; - < "Green"; >; - < "Value of green"; >; - < "Blue"; >; - < "Value of blue"; >; - < "Alpha"; >; - < "Value of alpha"; >; - }; -}; -StringArray SC_OPCODE_WEBSERVICE+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Get some webcontent from an URI."; >; - < "URI"; >; - < "URI of the webservice"; >; - }; -}; -StringArray SC_OPCODE_ENCODEURL+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Return a URL-encoded string."; >; - < "Text"; >; - < "A string to be URL-encoded"; >; - }; -}; -StringArray SC_OPCODE_ERF_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the error function."; >; - < "Lower Limit"; >; - < "The lower limit for integration"; >; - }; -}; -StringArray SC_OPCODE_ERFC_MS+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the complementary error function."; >; - < "Lower Limit"; >; - < "The lower limit for integration"; >; - }; -}; -StringArray SC_OPCODE_RAWSUBTRACT+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Returns the subtraction of numbers. Like a-b-c but without eliminating small roundoff errors." ; >; - < "minuend" ; >; - < "Number from which following arguments are subtracted." ; >; - < "subtrahend " ; >; - < "Subtrahend 1, subtrahend 2, ... are numerical arguments subtracted from the minuend." ; >; - }; -}; - // -=*# Resource for function ROUNDSIG #*=- -StringArray SC_OPCODE_ROUNDSIG+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Rounds a number to predefined significant digits." ; >; - < "value" ; >; - < "The number to be rounded." ; >; - < "digits" ; >; - < "The number of significant digits to which value is to be rounded." ; >; - }; -}; -StringArray SC_OPCODE_REPLACEB+RID_SC_FUNC_DESCRIPTIONS_START -{ - ItemList [ en-US ] = - { - < "Replaces characters within a text string with a different text string, with DBCS." ; >; - < "Text" ; >; - < "The text in which some characters are to be replaced." ; >; - < "position" ; >; - < "The character position from which text is to be replaced." ; >; - < "length" ; >; - < "The number of characters to be replaced." ; >; - < "new text" ; >; - < "The text to be inserted." ; >; - }; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src deleted file mode 100644 index 4ca3e92fb35b..000000000000 --- a/sc/source/ui/src/scstring.src +++ /dev/null @@ -1,605 +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 "scres.hrc" - - // Strings for interface names ------------------------------------------- - -String SCSTR_LONG_SCDOC_NAME -{ - Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION Spreadsheet"; -}; - -String SCSTR_SHORT_SCDOC_NAME -{ - Text [ en-US ] = "Spreadsheet" ; -}; - -String SCSTR_UNDEFINED -{ - Text [ en-US ] = "- undefined -" ; -}; - -String SCSTR_NONE -{ - Text [ en-US ] = "- none -" ; -}; - -String SCSTR_ALL -{ - Text [ en-US ] = "- all -" ; -}; - -String SCSTR_MULTIPLE -{ - Text [ en-US ] = "- multiple -" ; -}; - -String SCSTR_STDFILTER -{ - Text [ en-US ] = "Standard Filter..." ; -}; - -String SCSTR_TOP10FILTER -{ - Text [ en-US ] = "Top 10" ; -}; - -String SCSTR_FILTER_EMPTY -{ - Text [ en-US ] = "Empty" ; -}; - -String SCSTR_FILTER_NOTEMPTY -{ - Text [ en-US ] = "Not Empty" ; -}; - -String SCSTR_NONAME -{ - Text [ en-US ] = "unnamed" ; -}; - -String SCSTR_COLUMN -{ - Text [ x-comment ] = "%1 is replaced to column letter, such as 'Column A'" ; - Text [ en-US ] = "Column %1" ; -}; - -String SCSTR_ROW -{ - Text [ x-comment ] = "%1 is replaced to row number, such as 'Row 1'" ; - Text [ en-US ] = "Row %1" ; -}; - -String SCSTR_TABLE -{ - Text [ en-US ] = "Sheet" ; -}; - -String SCSTR_NAME -{ - Text [ en-US ] = "Name" ; -}; - -String SCSTR_APDTABLE -{ - Text [ en-US ] = "Append Sheet" ; -}; - -String SCSTR_RENAMETAB -{ - Text [ en-US ] = "Rename Sheet" ; -}; - -String SCSTR_SET_TAB_BG_COLOR -{ - Text [ en-US ] = "Tab Color" ; -}; - -String SCSTR_NO_TAB_BG_COLOR -{ - Text [ en-US ] = "Default" ; -}; - -String SCSTR_RENAMEOBJECT -{ - Text [ en-US ] = "Name Object"; -}; - -String STR_INSERTGRAPHIC -{ - Text [ en-US ] = "Insert Image" ; -}; - - // Attribute - -String SCSTR_PROTECTDOC -{ - Text [ en-US ] = "Protect Document" ; -}; - -String SCSTR_UNPROTECTDOC -{ - Text [ en-US ] = "Unprotect document" ; -}; - -String SCSTR_UNPROTECTTAB -{ - Text [ en-US ] = "Unprotect sheet" ; -}; - -String SCSTR_CHG_PROTECT -{ - Text [ en-US ] = "Protect Records" ; -}; - -String SCSTR_CHG_UNPROTECT -{ - Text [ en-US ] = "Unprotect Records" ; -}; - -String SCSTR_PASSWORD -{ - Text [ en-US ] = "Password:" ; -}; - -String SCSTR_PASSWORDOPT -{ - Text [ en-US ] = "Password (optional):" ; -}; - -String SCSTR_WRONGPASSWORD -{ - Text [ en-US ] = "Incorrect Password" ; -}; - -String SCSTR_END -{ - Text [ en-US ] = "~End" ; -}; - -String SCSTR_UNKNOWN -{ - Text [ en-US ] = "Unknown" ; -}; - -String SCSTR_VALID_MINIMUM -{ - Text [ en-US ] = "~Minimum" ; -}; - -String SCSTR_VALID_MAXIMUM -{ - Text [ en-US ] = "~Maximum" ; -}; - -String SCSTR_VALID_VALUE -{ - Text [ en-US ] = "~Value" ; -}; - -String SCSTR_VALID_RANGE -{ - Text [ en-US ] = "~Source" ; -}; - -String SCSTR_VALID_LIST -{ - Text [ en-US ] = "~Entries" ; -}; - - // for dialogues: - -String SCSTR_CHARSET_USER -{ - Text [ en-US ] = "System" ; -}; - -String SCSTR_COLUMN_USER -{ - Text [ en-US ] = "Standard;Text;Date (DMY);Date (MDY);Date (YMD);US English;Hide" ; -}; - -String SCSTR_FIELDSEP_TAB -{ - Text [ en-US ] = "Tab" ; -}; - -String SCSTR_FIELDSEP_SPACE -{ - Text [ en-US ] = "space" ; -}; - -String SCSTR_FORMULA_AUTOCORRECTION -{ - Text [ en-US ] = "%PRODUCTNAME Calc found an error in the formula entered.\nDo you want to accept the correction proposed below?\n\n" ; -}; - -String SCSTR_UNDO_GRAFFILTER -{ - Text [ en-US ] = "Image Filter" ; -}; - -String STR_CAPTION_DEFAULT_TEXT -{ - Text [ en-US ] = "Text" ; -}; - -// Select tables dialog title -String STR_DLG_SELECTTABLES_TITLE -{ - Text [ en-US ] = "Select Sheets"; -}; - -// Select tables dialog listbox -String STR_DLG_SELECTTABLES_LBNAME -{ - Text [ en-US ] = "~Selected sheets"; -}; - -String STR_REPLCELLSWARN -{ - Text [ en-US ] = "You are pasting data into cells that already contain data.\nDo you really want to overwrite the existing data?"; -}; - -String STR_ACC_CSVRULER_NAME -{ - Text [ en-US ] = "Ruler"; -}; - -String STR_ACC_CSVRULER_DESCR -{ - Text [ en-US ] = "This ruler manages objects at fixed positions."; -}; - -String STR_ACC_CSVGRID_NAME -{ - Text [ en-US ] = "Preview"; -}; - -String STR_ACC_CSVGRID_DESCR -{ - Text [ en-US ] = "This sheet shows how the data will be arranged in the document."; -}; - -String STR_ACC_DOC_NAME -{ - Text [ en-US ] = "Document view"; -}; - -String STR_ACC_TABLE_NAME -{ - Text [ en-US ] = "Sheet %1"; -}; - -String STR_ACC_CELL_NAME -{ - Text [ en-US ] = "Cell %1"; -}; - -String STR_ACC_LEFTAREA_NAME -{ - Text [ en-US ] = "Left area"; -}; - -String STR_ACC_PREVIEWDOC_NAME -{ - Text [ en-US ] = "Page preview"; -}; - -String STR_ACC_CENTERAREA_NAME -{ - Text [ en-US ] = "Center area"; -}; - -String STR_ACC_RIGHTAREA_NAME -{ - Text [ en-US ] = "Right area"; -}; - -String STR_ACC_HEADER_NAME -{ - Text [ en-US ] = "Header of page %1"; -}; - -String STR_ACC_FOOTER_NAME -{ - Text [ en-US ] = "Footer of page %1"; -}; - -String STR_ACC_EDITLINE_NAME -{ - Text [ en-US ] = "Input line"; -}; - -String STR_ACC_EDITLINE_DESCR -{ - Text [ en-US ] = "This is where you enter or edit text, numbers and formulas."; -}; - -String SCSTR_MEDIASHELL -{ - Text [ en-US ] = "Media Playback"; -}; - -String RID_SCSTR_ONCLICK -{ - Text [ en-US ] = "Mouse button pressed"; -}; - -String STR_ACC_TOOLBAR_FORMULA -{ - Text [ en-US ] = "Formula Tool Bar"; -}; -String STR_ACC_DOC_SPREADSHEET -{ - Text [ en-US ] = "%PRODUCTNAME Spreadsheets"; -}; -String STR_ACC_DOC_SPREADSHEET_READONLY -{ - Text [ en-US ] = "(read-only)"; -}; -String STR_ACC_DOC_PREVIEW_SUFFIX -{ - Text [ en-US ] = "(Preview mode)"; -}; - -String SCSTR_PRINTOPT_PAGES -{ - Text [ en-US ] = "Pages"; -}; - -String SCSTR_PRINTOPT_SUPPRESSEMPTY -{ - Text [ en-US ] = "~Suppress output of empty pages"; -}; - -String SCSTR_PRINTOPT_PRNTCONTENT -{ - Text [ en-US ] = "Print content"; -}; - -String SCSTR_PRINTOPT_ALLSHEETS -{ - Text [ en-US ] = "~All sheets"; -}; - -String SCSTR_PRINTOPT_SELECTEDSHEETS -{ - Text [ en-US ] = "~Selected sheets"; -}; - -String SCSTR_PRINTOPT_SELECTEDCELLS -{ - Text [ en-US ] = "Selected cells"; -}; - -String SCSTR_PRINTOPT_FROMWHICH -{ - Text [ en-US ] = "From which print"; -}; - -String SCSTR_PRINTOPT_ALLPAGES -{ - Text [ en-US ] = "All ~pages"; -}; - -String SCSTR_PRINTOPT_PAGES_ -{ - Text [ en-US ] = "Pa~ges"; -}; - -String SCSTR_PRINTOPT_PRODNAME -{ - Text [ en-US ] = "%PRODUCTNAME %s"; -}; - -String SCSTR_WARN_ME_IN_FUTURE_CHECK -{ - Text [ en-US ] = "Warn me about this in the future."; -}; - -String SCSTR_DDEDOC_NOT_LOADED -{ - Text [ en-US ] = "The following DDE source could not be updated possibly because the source document was not open. Please launch the source document and try again." ; -}; - -String SCSTR_EXTDOC_NOT_LOADED -{ - Text [ en-US ] = "The following external file could not be loaded. Data linked from this file did not get updated." ; -}; - -String SCSTR_UPDATE_EXTDOCS -{ - Text [ en-US ] = "Updating external links."; -}; - -String SCSTR_FORMULA_SYNTAX_CALC_A1 -{ - Text [ en-US ] = "Calc A1"; -}; - -String SCSTR_FORMULA_SYNTAX_XL_A1 -{ - Text [ en-US ] = "Excel A1"; -}; - -String SCSTR_FORMULA_SYNTAX_XL_R1C1 -{ - Text [ en-US ] = "Excel R1C1"; -}; - -String SCSTR_COL_LABEL -{ - Text [ en-US ] = "Range contains column la~bels" ; -}; - -String SCSTR_ROW_LABEL -{ - Text [ en-US ] = "Range contains ~row labels" ; -}; - -StringArray SCSTR_UNIT -{ - ItemList [ en-US ] = - { - < "Millimeter" ; FUNIT_MM ; > ; - < "Centimeter" ; FUNIT_CM ; > ; - < "Meter" ; FUNIT_M ; > ; - < "Kilometer" ; FUNIT_KM ; > ; - < "Inch" ; FUNIT_INCH ; > ; - < "Foot" ; FUNIT_FOOT ; > ; - < "Miles" ; FUNIT_MILE ; > ; - < "Pica" ; FUNIT_PICA ; > ; - < "Point" ; FUNIT_POINT ; > ; - }; -}; - -String SCSTR_VALERR -{ - Text [ en-US ] = "Invalid value" ; -}; - -String STR_NOFORMULASPECIFIED -{ - Text [ en-US ] = "No formula specified." ; -}; - -String STR_NOCOLROW -{ - Text [ en-US ] = "Neither row or column specified." ; -}; - -String STR_WRONGFORMULA -{ - Text [ en-US ] = "Undefined name or range." ; -}; - -String STR_WRONGROWCOL -{ - Text [ en-US ] = "Undefined name or wrong cell reference." ; -}; - -String STR_NOCOLFORMULA -{ - Text [ en-US ] = "Formulas don't form a column." ; -}; - -String STR_NOROWFORMULA -{ - Text [ en-US ] = "Formulas don't form a row." ; -}; - -String STR_ADD_AUTOFORMAT_TITLE -{ - Text [ en-US ] = "Add AutoFormat" ; -}; - -String STR_RENAME_AUTOFORMAT_TITLE -{ - Text [ en-US ] = "Rename AutoFormat" ; -}; - -String STR_ADD_AUTOFORMAT_LABEL -{ - Text [ en-US ] = "Name" ; -}; - -String STR_DEL_AUTOFORMAT_TITLE -{ - Text [ en-US ] = "Delete AutoFormat" ; -}; - -String STR_DEL_AUTOFORMAT_MSG -{ - Text [ en-US ] = "Do you really want to delete the # AutoFormat?" ; -}; - -String STR_BTN_AUTOFORMAT_CLOSE -{ - Text [ en-US ] = "~Close" ; -}; - -String STR_JAN -{ - Text [ en-US ] = "Jan" ; -}; - -String STR_FEB -{ - Text [ en-US ] = "Feb" ; -}; - -String STR_MAR -{ - Text [ en-US ] = "Mar" ; -}; - -String STR_NORTH -{ - Text [ en-US ] = "North" ; -}; - -String STR_MID -{ - Text [ en-US ] = "Mid" ; -}; - -String STR_SOUTH -{ - Text [ en-US ] = "South" ; -}; - -String STR_SUM -{ - Text [ en-US ] = "Total" ; -}; - -String STR_SHEET -{ - Text [ en-US ] = "Sheet" ; -}; - -String STR_CELL -{ - Text [ en-US ] = "Cell" ; -}; - -String STR_CONTENT -{ - Text [ en-US ] = "Content" ; -}; - -String SCSTR_UNDO_PAGE_ANCHOR -{ - Text [ en-US ] = "Page Anchor" ; -}; - -String SCSTR_UNDO_CELL_ANCHOR -{ - Text [ en-US ] = "Cell Anchor" ; -}; - -String SCSTR_CONDITION -{ - Text [ en-US ] = "Condition "; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/src/toolbox.src b/sc/source/ui/src/toolbox.src deleted file mode 100644 index 9cc4f70a0218..000000000000 --- a/sc/source/ui/src/toolbox.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 "scres.hrc" - -String SCSTR_QHELP_POSWND -{ - Text [ en-US ] = "Name Box" ; -}; - -String SCSTR_QHELP_INPUTWND -{ - Text [ en-US ] = "Input line" ; -}; - -String SCSTR_QHELP_BTNCALC -{ - Text [ en-US ] = "Function Wizard" ; -}; - -String SCSTR_QHELP_BTNOK -{ - Text [ en-US ] = "Accept" ; -}; - -String SCSTR_QHELP_BTNCANCEL -{ - Text [ en-US ] = "Cancel" ; -}; - -String SCSTR_QHELP_BTNSUM -{ - Text [ en-US ] = "Sum" ; -}; - -String SCSTR_QHELP_BTNEQUAL -{ - Text [ en-US ] = "Function" ; -}; - -String SCSTR_QHELP_EXPAND_FORMULA -{ - Text [ en-US ] = "Expand Formula Bar" ; -}; - -String SCSTR_QHELP_COLLAPSE_FORMULA -{ - Text [ en-US ] = "Collapse Formula Bar" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/styleui/scstyles.src b/sc/source/ui/styleui/scstyles.src deleted file mode 100644 index 45e7c6073da2..000000000000 --- a/sc/source/ui/styleui/scstyles.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 "scres.hrc" -#include - -StringArray RID_CELLSTYLEFAMILY -{ - ItemList [ en-US ] = - { - < "All Styles" ; SFXSTYLEBIT_ALL_VISIBLE ; > ; - < "Hidden Styles" ; SFXSTYLEBIT_HIDDEN ; > ; - < "Applied Styles" ; SFXSTYLEBIT_USED ; > ; - < "Custom Styles" ; SFXSTYLEBIT_USERDEF ; > ; - }; -}; - -StringArray RID_PAGESTYLEFAMILY -{ - ItemList [ en-US ] = - { - < "All Styles" ; SFXSTYLEBIT_ALL ; > ; - < "Hidden Styles" ; SFXSTYLEBIT_HIDDEN ; > ; - < "Custom Styles" ; SFXSTYLEBIT_USERDEF ; > ; - }; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx index 34e3ab1d5e35..0f0c43cce8fa 100644 --- a/sc/source/ui/styleui/styledlg.cxx +++ b/sc/source/ui/styleui/styledlg.cxx @@ -31,6 +31,7 @@ #include "tptable.hxx" #include "scresid.hxx" #include "scres.hrc" +#include "strings.hrc" #include #include #include diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx index f4ad5170139a..8573e1768485 100644 --- a/sc/source/ui/undo/undoblk.cxx +++ b/sc/source/ui/undo/undoblk.cxx @@ -1934,8 +1934,8 @@ ScUndoIndent::~ScUndoIndent() OUString ScUndoIndent::GetComment() const { - sal_uInt16 nId = bIsIncrement ? STR_UNDO_INC_INDENT : STR_UNDO_DEC_INDENT; - return ScGlobal::GetRscString( nId ); + const char* pId = bIsIncrement ? STR_UNDO_INC_INDENT : STR_UNDO_DEC_INDENT; + return ScGlobal::GetRscString(pId); } void ScUndoIndent::Undo() diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx index df07b286bd04..173a569a8002 100644 --- a/sc/source/ui/undo/undocell.cxx +++ b/sc/source/ui/undo/undocell.cxx @@ -874,18 +874,18 @@ ScUndoDetective::~ScUndoDetective() OUString ScUndoDetective::GetComment() const { - sal_uInt16 nId = STR_UNDO_DETDELALL; + const char* pId = STR_UNDO_DETDELALL; if ( !bIsDelete ) switch ( (ScDetOpType) nAction ) { - case SCDETOP_ADDSUCC: nId = STR_UNDO_DETADDSUCC; break; - case SCDETOP_DELSUCC: nId = STR_UNDO_DETDELSUCC; break; - case SCDETOP_ADDPRED: nId = STR_UNDO_DETADDPRED; break; - case SCDETOP_DELPRED: nId = STR_UNDO_DETDELPRED; break; - case SCDETOP_ADDERROR: nId = STR_UNDO_DETADDERROR; break; + case SCDETOP_ADDSUCC: pId = STR_UNDO_DETADDSUCC; break; + case SCDETOP_DELSUCC: pId = STR_UNDO_DETDELSUCC; break; + case SCDETOP_ADDPRED: pId = STR_UNDO_DETADDPRED; break; + case SCDETOP_DELPRED: pId = STR_UNDO_DETDELPRED; break; + case SCDETOP_ADDERROR: pId = STR_UNDO_DETADDERROR; break; } - return ScGlobal::GetRscString( nId ); + return ScGlobal::GetRscString(pId); } void ScUndoDetective::Undo() diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx index c1a19e9ec490..965fcf6f912e 100644 --- a/sc/source/ui/undo/undodat.cxx +++ b/sc/source/ui/undo/undodat.cxx @@ -1376,15 +1376,15 @@ ScUndoDataPilot::ScUndoDataPilot( ScDocShell* pNewDocShell, OUString ScUndoDataPilot::GetComment() const { - sal_uInt16 nIndex; + const char* pResId; if (xOldUndoDoc && xNewUndoDoc) - nIndex = STR_UNDO_PIVOT_MODIFY; + pResId = STR_UNDO_PIVOT_MODIFY; else if (xNewUndoDoc) - nIndex = STR_UNDO_PIVOT_NEW; + pResId = STR_UNDO_PIVOT_NEW; else - nIndex = STR_UNDO_PIVOT_DELETE; + pResId = STR_UNDO_PIVOT_DELETE; - return ScGlobal::GetRscString( nIndex ); + return ScGlobal::GetRscString(pResId); } void ScUndoDataPilot::Undo() diff --git a/sc/source/ui/undo/undostyl.cxx b/sc/source/ui/undo/undostyl.cxx index a021422bdf25..1af29c7bc135 100644 --- a/sc/source/ui/undo/undostyl.cxx +++ b/sc/source/ui/undo/undostyl.cxx @@ -80,10 +80,10 @@ ScUndoModifyStyle::~ScUndoModifyStyle() OUString ScUndoModifyStyle::GetComment() const { - sal_uInt16 nId = (eFamily == SfxStyleFamily::Para) ? + const char* pId = (eFamily == SfxStyleFamily::Para) ? STR_UNDO_EDITCELLSTYLE : STR_UNDO_EDITPAGESTYLE; - return ScGlobal::GetRscString( nId ); + return ScGlobal::GetRscString(pId); } static void lcl_DocStyleChanged( ScDocument* pDoc, SfxStyleSheetBase* pStyle, bool bRemoved ) diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx index f3dc9aa6fe5d..09bcd659431b 100644 --- a/sc/source/ui/undo/undotab.cxx +++ b/sc/source/ui/undo/undotab.cxx @@ -28,7 +28,8 @@ #include "tabvwsh.hxx" #include "globstr.hrc" #include "global.hxx" -#include "scres.hrc" +#include "sc.hrc" +#include "strings.hrc" #include "undoolk.hxx" #include "target.hxx" #include "uiitems.hxx" @@ -1143,17 +1144,17 @@ bool ScUndoShowHideTab::CanRepeat(SfxRepeatTarget& rTarget) const OUString ScUndoShowHideTab::GetComment() const { - sal_uInt16 nId; + const char* pId; if (undoTabs.size() > 1) { - nId = bShow ? STR_UNDO_SHOWTABS : STR_UNDO_HIDETABS; + pId = bShow ? STR_UNDO_SHOWTABS : STR_UNDO_HIDETABS; } else { - nId = bShow ? STR_UNDO_SHOWTAB : STR_UNDO_HIDETAB; + pId = bShow ? STR_UNDO_SHOWTAB : STR_UNDO_HIDETAB; } - return ScGlobal::GetRscString( nId ); + return ScGlobal::GetRscString(pId); } ScUndoDocProtect::ScUndoDocProtect(ScDocShell* pShell, unique_ptr && pProtectSettings) : @@ -1219,8 +1220,8 @@ bool ScUndoDocProtect::CanRepeat(SfxRepeatTarget& /* rTarget */) const OUString ScUndoDocProtect::GetComment() const { - sal_uInt16 nId = mpProtectSettings->isProtected() ? STR_UNDO_PROTECT_DOC : STR_UNDO_UNPROTECT_DOC; - return ScGlobal::GetRscString( nId ); + const char* pId = mpProtectSettings->isProtected() ? STR_UNDO_PROTECT_DOC : STR_UNDO_UNPROTECT_DOC; + return ScGlobal::GetRscString(pId); } ScUndoTabProtect::ScUndoTabProtect(ScDocShell* pShell, SCTAB nTab, unique_ptr && pProtectSettings) : @@ -1287,8 +1288,8 @@ bool ScUndoTabProtect::CanRepeat(SfxRepeatTarget& /* rTarget */) const OUString ScUndoTabProtect::GetComment() const { - sal_uInt16 nId = mpProtectSettings->isProtected() ? STR_UNDO_PROTECT_TAB : STR_UNDO_UNPROTECT_TAB; - return ScGlobal::GetRscString( nId ); + const char* pId = mpProtectSettings->isProtected() ? STR_UNDO_PROTECT_TAB : STR_UNDO_UNPROTECT_TAB; + return ScGlobal::GetRscString(pId); } ScUndoPrintRange::ScUndoPrintRange( ScDocShell* pShell, SCTAB nNewTab, diff --git a/sc/source/ui/unoobj/PivotTableDataProvider.cxx b/sc/source/ui/unoobj/PivotTableDataProvider.cxx index 7247e49495d4..90450c17c51d 100644 --- a/sc/source/ui/unoobj/PivotTableDataProvider.cxx +++ b/sc/source/ui/unoobj/PivotTableDataProvider.cxx @@ -20,7 +20,7 @@ #include "docsh.hxx" #include "scresid.hxx" #include "globstr.hrc" -#include "scres.hrc" +#include "strings.hrc" #include "dpobject.hxx" #include "hints.hxx" diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 84f46138e8d5..b6eeca6fc39a 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -47,7 +47,6 @@ #include #include #include -#include #include #include @@ -122,7 +121,7 @@ #include "transobj.hxx" #include "chgtrack.hxx" -#include "scres.hrc" +#include "strings.hrc" using namespace com::sun::star; diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index f8a10d2abb25..44cb888ff183 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -866,19 +866,19 @@ uno::Any SAL_CALL ScStyleFamilyObj::getPropertyValue( const OUString& sPropertyN if ( sPropertyName == "DisplayName" ) { SolarMutexGuard aGuard; - sal_uInt32 nResId = 0; + const char* pResId = nullptr; switch ( eFamily ) { case SfxStyleFamily::Para: - nResId = STR_STYLE_FAMILY_CELL; break; + pResId = STR_STYLE_FAMILY_CELL; break; case SfxStyleFamily::Page: - nResId = STR_STYLE_FAMILY_PAGE; break; + pResId = STR_STYLE_FAMILY_PAGE; break; default: OSL_FAIL( "ScStyleFamilyObj::getPropertyValue(): invalid family" ); } - if ( nResId > 0 ) + if (pResId) { - OUString sDisplayName( ScGlobal::GetRscString( static_cast< sal_uInt16 >( nResId ) ) ); + OUString sDisplayName(ScGlobal::GetRscString(pResId)); aRet <<= sDisplayName; } } diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx index 569a054419d3..74ed4fd1681d 100644 --- a/sc/source/ui/unoobj/targuno.cxx +++ b/sc/source/ui/unoobj/targuno.cxx @@ -34,13 +34,13 @@ #include "docsh.hxx" #include "content.hxx" #include "scresid.hxx" -#include "scres.hrc" +#include "strings.hrc" #include "bitmaps.hlst" #include "unonames.hxx" using namespace ::com::sun::star; -sal_uInt16 const nTypeResIds[SC_LINKTARGETTYPE_COUNT] = +static const char* aTypeResIds[SC_LINKTARGETTYPE_COUNT] = { SCSTR_CONTENT_TABLE, // SC_LINKTARGETTYPE_SHEET SCSTR_CONTENT_RANGENAME, // SC_LINKTARGETTYPE_RANGENAME @@ -71,7 +71,7 @@ ScLinkTargetTypesObj::ScLinkTargetTypesObj(ScDocShell* pDocSh) : pDocShell->GetDocument().AddUnoObject(*this); for (sal_uInt16 i=0; iGetDocument().AddUnoObject(*this); - aName = ScResId( nTypeResIds[nType] ); //! on demand? + aName = ScResId(aTypeResIds[nType]); //! on demand? } ScLinkTargetTypeObj::~ScLinkTargetTypeObj() diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 1ffb68bcb209..c576d27c8cad 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -2844,7 +2844,7 @@ void ScCellShell::ExecuteDataPilotDialog() } else // create new table { - sal_uLong nSrcErrorId = 0; + const char* pSrcErrorId = nullptr; // select database range or data pTabViewShell->GetDBData( true, SC_DB_OLD ); @@ -2921,8 +2921,8 @@ void ScCellShell::ExecuteDataPilotDialog() OUString aName = pTypeDlg->GetSelectedNamedRange(); ScSheetSourceDesc aShtDesc(pDoc); aShtDesc.SetRangeName(aName); - nSrcErrorId = aShtDesc.CheckSourceRange(); - if (!nSrcErrorId) + pSrcErrorId = aShtDesc.CheckSourceRange(); + if (!pSrcErrorId) { pNewDPObject.reset(new ScDPObject(pDoc)); pNewDPObject->SetSheetDesc(aShtDesc); @@ -2963,8 +2963,8 @@ void ScCellShell::ExecuteDataPilotDialog() { ScSheetSourceDesc aShtDesc(pDoc); aShtDesc.SetSourceRange(aRange); - nSrcErrorId = aShtDesc.CheckSourceRange(); - if (!nSrcErrorId) + pSrcErrorId = aShtDesc.CheckSourceRange(); + if (!pSrcErrorId) { pNewDPObject.reset(new ScDPObject(pDoc)); pNewDPObject->SetSheetDesc( aShtDesc ); @@ -2980,10 +2980,10 @@ void ScCellShell::ExecuteDataPilotDialog() } } - if (nSrcErrorId) + if (pSrcErrorId) { // Error occurred during data creation. Launch an error and bail out. - ScopedVclPtrInstance< InfoBox > aBox(pTabViewShell->GetDialogParent(), ScGlobal::GetRscString(nSrcErrorId)); + ScopedVclPtrInstance< InfoBox > aBox(pTabViewShell->GetDialogParent(), ScGlobal::GetRscString(pSrcErrorId)); aBox->Execute(); return; } diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx index 51f028f5503d..c0b91e6d1056 100644 --- a/sc/source/ui/view/dbfunc3.cxx +++ b/sc/source/ui/view/dbfunc3.cxx @@ -1328,7 +1328,7 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const OUString& rString ) return; } - sal_uInt16 nErrorId = 0; + const char* pErrorId = nullptr; pDPObj->BuildAllDimensionMembers(); ScDPSaveData aData( *pDPObj->GetSaveData() ); @@ -1359,7 +1359,7 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const OUString& rString ) bChange = true; } else - nErrorId = STR_INVALIDNAME; + pErrorId = STR_INVALIDNAME; } } else if (nOrient == DataPilotFieldOrientation_COLUMN || nOrient == DataPilotFieldOrientation_ROW) @@ -1382,10 +1382,10 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const OUString& rString ) bChange = true; } else - nErrorId = STR_INVALIDNAME; + pErrorId = STR_INVALIDNAME; } else - nErrorId = STR_INVALIDNAME; + pErrorId = STR_INVALIDNAME; } } } @@ -1408,10 +1408,10 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const OUString& rString ) bChange = true; } else - nErrorId = STR_INVALIDNAME; + pErrorId = STR_INVALIDNAME; } else - nErrorId = STR_INVALIDNAME; + pErrorId = STR_INVALIDNAME; } } else @@ -1455,7 +1455,7 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const OUString& rString ) bChange = true; } else - nErrorId = STR_INVALIDNAME; + pErrorId = STR_INVALIDNAME; } } else if (aPosData.Flags & MemberResultFlags::GRANDTOTAL) @@ -1481,7 +1481,7 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const OUString& rString ) if (rString.isEmpty()) { - nErrorId = STR_INVALIDNAME; + pErrorId = STR_INVALIDNAME; break; } @@ -1496,7 +1496,7 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const OUString& rString ) bChange = true; } else - nErrorId = STR_INVALIDNAME; + pErrorId = STR_INVALIDNAME; } while (false); } @@ -1554,10 +1554,10 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const OUString& rString ) bChange = true; } else - nErrorId = STR_INVALIDNAME; + pErrorId = STR_INVALIDNAME; } else - nErrorId = STR_INVALIDNAME; + pErrorId = STR_INVALIDNAME; } } while (false); @@ -1575,9 +1575,9 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const OUString& rString ) } else { - if ( !nErrorId ) - nErrorId = STR_ERR_DATAPILOT_INPUT; - ErrorMessage( nErrorId ); + if (!pErrorId) + pErrorId = STR_ERR_DATAPILOT_INPUT; + ErrorMessage(pErrorId); } } diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx index daf4666a15ab..3a541afe5530 100644 --- a/sc/source/ui/view/drawvie3.cxx +++ b/sc/source/ui/view/drawvie3.cxx @@ -22,7 +22,7 @@ #include #include -#include "scres.hrc" +#include "strings.hrc" #include "scresid.hxx" #include "drawview.hxx" #include "drwlayer.hxx" diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 8475c7c400e0..01007fc205d3 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -60,6 +60,7 @@ #include "formatsh.hxx" #include "sc.hrc" +#include "scres.hrc" #include "globstr.hrc" #include "docsh.hxx" #include "patattr.hxx" diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 6725ffb5ef8c..b37b6d1f2e99 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -83,6 +83,7 @@ #include "cbutton.hxx" #include "sc.hrc" #include "globstr.hrc" +#include "strings.hrc" #include "editutil.hxx" #include "scresid.hxx" #include "inputhdl.hxx" diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx index 632ef881a1d4..e5d007bc8d71 100644 --- a/sc/source/ui/view/gridwin2.cxx +++ b/sc/source/ui/view/gridwin2.cxx @@ -31,6 +31,7 @@ #include "scresid.hxx" #include "sc.hrc" #include "globstr.hrc" +#include "strings.hrc" #include "pagedata.hxx" #include "dpobject.hxx" #include "dpsave.hxx" diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx index 6e1d9174dd4d..63851cff97a0 100644 --- a/sc/source/ui/view/olinewin.cxx +++ b/sc/source/ui/view/olinewin.cxx @@ -25,7 +25,7 @@ #include "olinetab.hxx" #include "document.hxx" #include "dbfunc.hxx" -#include "scres.hrc" +#include "strings.hrc" #include "scresid.hxx" #include "bitmaps.hlst" diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx index d843cb50fbcc..9be4c1747916 100644 --- a/sc/source/ui/view/reffact.cxx +++ b/sc/source/ui/view/reffact.cxx @@ -29,6 +29,7 @@ #include "acredlin.hxx" #include "simpref.hxx" #include "scmod.hxx" +#include "scres.hrc" #include "validate.hxx" SFX_IMPL_MODELESSDIALOG_WITHID(ScNameDlgWrapper, FID_DEFINE_NAME ) diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx index 84f6babcb0d3..84f19b96ff46 100644 --- a/sc/source/ui/view/tabview2.cxx +++ b/sc/source/ui/view/tabview2.cxx @@ -1414,7 +1414,7 @@ void ScTabView::MakeDrawLayer() } } -void ScTabView::ErrorMessage( sal_uInt16 nGlobStrId ) +void ScTabView::ErrorMessage(const char* pGlobStrId) { if ( SC_MOD()->IsInExecuteDrop() ) { @@ -1428,15 +1428,15 @@ void ScTabView::ErrorMessage( sal_uInt16 nGlobStrId ) ScWaitCursorOff aWaitOff( pParent ); bool bFocus = pParent && pParent->HasFocus(); - if(nGlobStrId==STR_PROTECTIONERR) + if (pGlobStrId && strcmp(pGlobStrId, STR_PROTECTIONERR) == 0) { - if(aViewData.GetDocShell()->IsReadOnly()) + if (aViewData.GetDocShell()->IsReadOnly()) { - nGlobStrId=STR_READONLYERR; + pGlobStrId = STR_READONLYERR; } } - ScopedVclPtrInstance< InfoBox > aBox( pParent, ScGlobal::GetRscString( nGlobStrId ) ); + ScopedVclPtrInstance aBox(pParent, ScGlobal::GetRscString(pGlobStrId)); aBox->Execute(); if (bFocus) pParent->GrabFocus(); diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index 559aa45506bc..f477bf941440 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -34,6 +34,7 @@ #include #include "globstr.hrc" +#include "strings.hrc" #include "scmod.hxx" #include "appoptio.hxx" #include "tabvwsh.hxx" diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index c43b968b7ab5..4401d7cc57c0 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -23,6 +23,7 @@ #include #include +#include #include #include #include diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx index 8320d32aabb4..49754e374a06 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -87,30 +87,30 @@ bool ScTabViewShell::GetFunction( OUString& rFuncStr, FormulaError nErrCode ) return true; } - sal_uInt16 nGlobStrId = 0; + const char* pGlobStrId = nullptr; switch (eFunc) { - case SUBTOTAL_FUNC_AVE: nGlobStrId = STR_FUN_TEXT_AVG; break; - case SUBTOTAL_FUNC_CNT: nGlobStrId = STR_FUN_TEXT_COUNT; break; - case SUBTOTAL_FUNC_CNT2: nGlobStrId = STR_FUN_TEXT_COUNT2; break; - case SUBTOTAL_FUNC_MAX: nGlobStrId = STR_FUN_TEXT_MAX; break; - case SUBTOTAL_FUNC_MIN: nGlobStrId = STR_FUN_TEXT_MIN; break; - case SUBTOTAL_FUNC_SUM: nGlobStrId = STR_FUN_TEXT_SUM; break; - case SUBTOTAL_FUNC_SELECTION_COUNT: nGlobStrId = STR_FUN_TEXT_SELECTION_COUNT; break; + case SUBTOTAL_FUNC_AVE: pGlobStrId = STR_FUN_TEXT_AVG; break; + case SUBTOTAL_FUNC_CNT: pGlobStrId = STR_FUN_TEXT_COUNT; break; + case SUBTOTAL_FUNC_CNT2: pGlobStrId = STR_FUN_TEXT_COUNT2; break; + case SUBTOTAL_FUNC_MAX: pGlobStrId = STR_FUN_TEXT_MAX; break; + case SUBTOTAL_FUNC_MIN: pGlobStrId = STR_FUN_TEXT_MIN; break; + case SUBTOTAL_FUNC_SUM: pGlobStrId = STR_FUN_TEXT_SUM; break; + case SUBTOTAL_FUNC_SELECTION_COUNT: pGlobStrId = STR_FUN_TEXT_SELECTION_COUNT; break; default: { // added to avoid warnings } } - if (nGlobStrId) + if (pGlobStrId) { ScDocument* pDoc = rViewData.GetDocument(); SCCOL nPosX = rViewData.GetCurX(); SCROW nPosY = rViewData.GetCurY(); SCTAB nTab = rViewData.GetTabNo(); - aStr = ScGlobal::GetRscString(nGlobStrId); + aStr = ScGlobal::GetRscString(pGlobStrId); aStr += ": "; ScAddress aCursor( nPosX, nPosY, nTab ); diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx index 53ad7ede5038..a2df0116562f 100644 --- a/sc/source/ui/view/tabvwshc.cxx +++ b/sc/source/ui/view/tabvwshc.cxx @@ -28,6 +28,7 @@ #include "tabvwsh.hxx" #include "sc.hrc" +#include "scres.hrc" #include "globstr.hrc" #include "global.hxx" #include "scmod.hxx" diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx index 5a2449cca069..ad32a62964d8 100644 --- a/sc/source/ui/view/tabvwshf.cxx +++ b/sc/source/ui/view/tabvwshf.cxx @@ -41,6 +41,7 @@ #include "shtabdlg.hxx" #include "scresid.hxx" #include "globstr.hrc" +#include "strings.hrc" #include "docfunc.hxx" #include "eventuno.hxx" #include "dpobject.hxx" diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index d287ba5fe63f..8175d3b767de 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -47,7 +47,8 @@ #include "patattr.hxx" #include "docpool.hxx" #include "uiitems.hxx" -#include "scres.hrc" +#include "sc.hrc" +#include "strings.hrc" #include "undocell.hxx" #include "undoblk.hxx" #include "undotab.hxx" @@ -1611,9 +1612,9 @@ void ScViewFunc::DeleteMulti( bool bRows ) // test if allowed - sal_uInt16 nErrorId = 0; + const char* pErrorId = nullptr; bool bNeedRefresh = false; - for (size_t i = 0, n = aSpans.size(); i < n && !nErrorId; ++i) + for (size_t i = 0, n = aSpans.size(); i < n && !pErrorId; ++i) { SCCOLROW nStart = aSpans[i].mnStart; SCCOLROW nEnd = aSpans[i].mnEnd; @@ -1641,7 +1642,7 @@ void ScViewFunc::DeleteMulti( bool bRows ) // test to the end of the sheet ScEditableTester aTester( &rDoc, nTab, nStartCol, nStartRow, MAXCOL, MAXROW ); if (!aTester.IsEditable()) - nErrorId = aTester.GetMessageId(); + pErrorId = aTester.GetMessageId(); } // merged cells @@ -1657,7 +1658,7 @@ void ScViewFunc::DeleteMulti( bool bRows ) // Disallow deleting parts of a merged cell. // Deleting the start is allowed (merge is removed), so the end doesn't have to be checked. - nErrorId = STR_MSSG_DELETECELLS_0; + pErrorId = STR_MSSG_DELETECELLS_0; } if ( nMergeEndX != nEndCol || nMergeEndY != nEndRow ) { @@ -1667,9 +1668,9 @@ void ScViewFunc::DeleteMulti( bool bRows ) } } - if ( nErrorId ) + if (pErrorId) { - ErrorMessage( nErrorId ); + ErrorMessage(pErrorId); return; } diff --git a/sc/uiconfig/scalc/ui/advancedfilterdialog.ui b/sc/uiconfig/scalc/ui/advancedfilterdialog.ui index 30b511d186ec..4667716b5bab 100644 --- a/sc/uiconfig/scalc/ui/advancedfilterdialog.ui +++ b/sc/uiconfig/scalc/ui/advancedfilterdialog.ui @@ -1,12 +1,12 @@ - + False 6 - Advanced Filter + Advanced Filter False dialog @@ -148,7 +148,7 @@ True False - Read _Filter Criteria From + Read _Filter Criteria From True lbfilterarea @@ -189,7 +189,7 @@ 12 - _Case sensitive + _Case sensitive True True False @@ -205,7 +205,7 @@ - Range c_ontains column labels + Range c_ontains column labels True True False @@ -221,7 +221,7 @@ - Regular _expressions + Regular _expressions True True False @@ -237,7 +237,7 @@ - _No duplications + _No duplications True True False @@ -253,7 +253,7 @@ - Co_py results to: + Co_py results to: True True False @@ -273,7 +273,7 @@ - _Keep filter criteria + _Keep filter criteria True True False @@ -312,7 +312,7 @@ - Copy results to: + Copy results to: @@ -334,7 +334,7 @@ - Copy results to: + Copy results to: @@ -372,7 +372,7 @@ False False - Data range: + Data range: 0 @@ -385,7 +385,7 @@ False False True - dummy + dummy 0 @@ -405,7 +405,7 @@ True False - Op_tions + Op_tions True diff --git a/sc/uiconfig/scalc/ui/allheaderfooterdialog.ui b/sc/uiconfig/scalc/ui/allheaderfooterdialog.ui index 82b822d25aea..a5b9dadd123f 100644 --- a/sc/uiconfig/scalc/ui/allheaderfooterdialog.ui +++ b/sc/uiconfig/scalc/ui/allheaderfooterdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Headers/Footers + Headers/Footers False dialog @@ -97,7 +97,7 @@ True False - Header (right) + Header (right) False @@ -110,7 +110,7 @@ True False - Header (left) + Header (left) 1 @@ -124,7 +124,7 @@ True False - Footer (right) + Footer (right) 2 @@ -138,7 +138,7 @@ True False - Footer (left) + Footer (left) 3 diff --git a/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui b/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui index e4e6bf865e77..e125af995bed 100644 --- a/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui +++ b/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui @@ -1,6 +1,6 @@ - + @@ -13,7 +13,7 @@ False 6 - Analysis of Variance (ANOVA) + Analysis of Variance (ANOVA) False dialog @@ -105,7 +105,7 @@ True False 0 - Input range: + Input range: True input-range-edit @@ -119,7 +119,7 @@ True False 0 - Results to: + Results to: True output-range-edit @@ -186,7 +186,7 @@ True False - Data + Data @@ -221,7 +221,7 @@ 12 - Single factor + Single factor True True False @@ -237,7 +237,7 @@ - Two factor + Two factor True True False @@ -259,7 +259,7 @@ True False - Type + Type @@ -294,7 +294,7 @@ 12 - Columns + Columns True True False @@ -311,7 +311,7 @@ - Rows + Rows True True False @@ -334,7 +334,7 @@ True False - Grouped by + Grouped by @@ -372,7 +372,7 @@ True False 0 - Alpha: + Alpha: True alpha-spin @@ -386,7 +386,7 @@ True True • - 0,05 + 0,05 alpha-adjustment 2 0.050000000000000003 @@ -401,7 +401,7 @@ True False 0 - Rows per sample: + Rows per sample: True rows-per-sample-spin @@ -431,7 +431,7 @@ True False - Parameters + Parameters diff --git a/sc/uiconfig/scalc/ui/autoformattable.ui b/sc/uiconfig/scalc/ui/autoformattable.ui index 707b8b6db719..0e9e01ae848c 100644 --- a/sc/uiconfig/scalc/ui/autoformattable.ui +++ b/sc/uiconfig/scalc/ui/autoformattable.ui @@ -1,12 +1,12 @@ - + False 6 - AutoFormat + AutoFormat normal @@ -91,7 +91,7 @@ - Rename + Rename True True True @@ -183,7 +183,7 @@ True False - Format + Format @@ -216,7 +216,7 @@ 12 - _Number format + _Number format True True False @@ -233,7 +233,7 @@ - _Borders + _Borders True True False @@ -250,7 +250,7 @@ - F_ont + F_ont True True False @@ -267,7 +267,7 @@ - _Pattern + _Pattern True True False @@ -284,7 +284,7 @@ - Alignmen_t + Alignmen_t True True False @@ -301,7 +301,7 @@ - A_utoFit width and height + A_utoFit width and height True True False @@ -324,7 +324,7 @@ True False - Formatting + Formatting diff --git a/sc/uiconfig/scalc/ui/cellprotectionpage.ui b/sc/uiconfig/scalc/ui/cellprotectionpage.ui index 83e0bc3220a4..eb7e117a944d 100644 --- a/sc/uiconfig/scalc/ui/cellprotectionpage.ui +++ b/sc/uiconfig/scalc/ui/cellprotectionpage.ui @@ -1,5 +1,5 @@ - + True @@ -32,7 +32,7 @@ 12 - _Protected + _Protected True True False @@ -52,7 +52,7 @@ - Hide _formula + Hide _formula True True False @@ -71,7 +71,7 @@ - Hide _all + Hide _all True True False @@ -96,7 +96,7 @@ end True 0 - Cell protection is only effective after the current sheet has been protected. + Cell protection is only effective after the current sheet has been protected. Select 'Protect Sheet' from the 'Tools' menu. True @@ -117,7 +117,7 @@ Select 'Protect Sheet' from the 'Tools' menu. True False - Protection + Protection @@ -151,7 +151,7 @@ Select 'Protect Sheet' from the 'Tools' menu. 12 - Hide _when printing + Hide _when printing True True False @@ -174,7 +174,7 @@ Select 'Protect Sheet' from the 'Tools' menu. end True 0 - The cells selected will be omitted when printing. + The cells selected will be omitted when printing. True 52 @@ -193,7 +193,7 @@ Select 'Protect Sheet' from the 'Tools' menu. True False - Print + Print diff --git a/sc/uiconfig/scalc/ui/changesourcedialog.ui b/sc/uiconfig/scalc/ui/changesourcedialog.ui index c3906dc41bc7..79b5c13a5942 100644 --- a/sc/uiconfig/scalc/ui/changesourcedialog.ui +++ b/sc/uiconfig/scalc/ui/changesourcedialog.ui @@ -1,11 +1,11 @@ - + False 6 - Change Source Data Range + Change Source Data Range False normal @@ -89,7 +89,7 @@ 6 - First _column as label + First _column as label True True False @@ -104,7 +104,7 @@ - First _row as label + First _row as label True True False @@ -125,7 +125,7 @@ True False - Labels + Labels diff --git a/sc/uiconfig/scalc/ui/chardialog.ui b/sc/uiconfig/scalc/ui/chardialog.ui index 2790aede6d54..dcc8881e396c 100644 --- a/sc/uiconfig/scalc/ui/chardialog.ui +++ b/sc/uiconfig/scalc/ui/chardialog.ui @@ -1,11 +1,11 @@ - + False 6 - Character + Character False dialog @@ -97,7 +97,7 @@ True False - Font + Font False @@ -110,7 +110,7 @@ True False - Font Effects + Font Effects 1 @@ -124,7 +124,7 @@ True False - Position + Position 2 diff --git a/sc/uiconfig/scalc/ui/chisquaretestdialog.ui b/sc/uiconfig/scalc/ui/chisquaretestdialog.ui index 6c77b5af0fae..d8ae6880ffa8 100644 --- a/sc/uiconfig/scalc/ui/chisquaretestdialog.ui +++ b/sc/uiconfig/scalc/ui/chisquaretestdialog.ui @@ -1,12 +1,12 @@ - + False 6 - Chi Square Test + Chi Square Test False dialog @@ -39,7 +39,7 @@ True False 0 - Input range: + Input range: True input-range-edit @@ -78,7 +78,7 @@ True False 0 - Results to: + Results to: True output-range-edit @@ -120,7 +120,7 @@ True False - Data + Data @@ -214,7 +214,7 @@ 12 - _Columns + _Columns True True False @@ -230,7 +230,7 @@ - _Rows + _Rows True True False @@ -252,7 +252,7 @@ True False - Grouped by + Grouped by diff --git a/sc/uiconfig/scalc/ui/colorrowdialog.ui b/sc/uiconfig/scalc/ui/colorrowdialog.ui index e3007f48d816..a3737a742345 100644 --- a/sc/uiconfig/scalc/ui/colorrowdialog.ui +++ b/sc/uiconfig/scalc/ui/colorrowdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Copy List + Copy List False dialog @@ -90,7 +90,7 @@ 6 - _Columns + _Columns True True False @@ -108,7 +108,7 @@ - _Rows + _Rows True True False @@ -131,7 +131,7 @@ True False - List From + List From diff --git a/sc/uiconfig/scalc/ui/colwidthdialog.ui b/sc/uiconfig/scalc/ui/colwidthdialog.ui index a829a5eded18..a97a439834d6 100644 --- a/sc/uiconfig/scalc/ui/colwidthdialog.ui +++ b/sc/uiconfig/scalc/ui/colwidthdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Column Width + Column Width False dialog @@ -85,7 +85,7 @@ True False 0 - Width + Width True value:0.00cm @@ -109,7 +109,7 @@ - _Default value + _Default value True True False diff --git a/sc/uiconfig/scalc/ui/condformatmanager.ui b/sc/uiconfig/scalc/ui/condformatmanager.ui index b4b34d05ff79..5e5582342652 100644 --- a/sc/uiconfig/scalc/ui/condformatmanager.ui +++ b/sc/uiconfig/scalc/ui/condformatmanager.ui @@ -1,11 +1,11 @@ - + False 6 - Manage Conditional Formatting + Manage Conditional Formatting False dialog @@ -59,7 +59,7 @@ start - Add + Add False True True @@ -73,7 +73,7 @@ - Edit... + Edit... False True True @@ -87,7 +87,7 @@ - Remove + Remove False True True @@ -114,7 +114,7 @@ True False - Conditional Formats + Conditional Formats diff --git a/sc/uiconfig/scalc/ui/conditionalentry.ui b/sc/uiconfig/scalc/ui/conditionalentry.ui index 88ec9b39069a..96b66543b9e1 100644 --- a/sc/uiconfig/scalc/ui/conditionalentry.ui +++ b/sc/uiconfig/scalc/ui/conditionalentry.ui @@ -1,6 +1,6 @@ - + @@ -55,10 +55,10 @@ True False - All Cells - Cell value is - Formula is - Date is + All Cells + Cell value is + Formula is + Date is @@ -69,7 +69,7 @@ False - Apply Style: + Apply Style: True style 0 @@ -83,7 +83,7 @@ False - New Style... + New Style... @@ -94,7 +94,7 @@ False - Enter a value: + Enter a value: 0 @@ -159,7 +159,7 @@ - More Options... + More Options... True True @@ -172,13 +172,13 @@ False - Automatic - Min - Max - Percentile - Value - Percent - Formula + Automatic + Min + Max + Percentile + Value + Percent + Formula @@ -190,13 +190,13 @@ False - Automatic - Min - Max - Percentile - Value - Percent - Formula + Automatic + Min + Max + Percentile + Value + Percent + Formula @@ -208,13 +208,13 @@ False - Automatic - Min - Max - Percentile - Value - Percent - Formula + Automatic + Min + Max + Percentile + Value + Percent + Formula @@ -225,7 +225,7 @@ False - Example + Example True @@ -248,30 +248,30 @@ False True - equal to - less than - greater than - less than or equal to - greater than or equal to - not equal to - between - not between - duplicate - not duplicate - top 10 elements - bottom 10 elements - top 10 percent - bottom 10 percent - above average - below average - above or equal average - below or equal average - Error - No Error - Begins with - Ends with - Contains - Not Contains + equal to + less than + greater than + less than or equal to + greater than or equal to + not equal to + between + not between + duplicate + not duplicate + top 10 elements + bottom 10 elements + top 10 percent + bottom 10 percent + above average + below average + above or equal average + below or equal average + Error + No Error + Begins with + Ends with + Contains + Not Contains @@ -284,19 +284,19 @@ False True - Today - Yesterday - Tomorrow - Last 7 days - This week - Last week - Next week - This month - Last month - Next month - This year - Last year - Next year + Today + Yesterday + Tomorrow + Last 7 days + This week + Last week + Next week + This month + Last month + Next month + This year + Last year + Next year @@ -309,10 +309,10 @@ False True - Color Scale (2 Entries) - Color Scale (3 Entries) - Data Bar - Icon Set + Color Scale (2 Entries) + Color Scale (3 Entries) + Data Bar + Icon Set @@ -356,28 +356,28 @@ False - 3 Arrows - 3 Gray Arrows - 3 Flags - 3 Traffic Lights 1 - 3 Traffic Lights 2 - 3 Signs - 3 Symbols 1 - 3 Symbols 2 - 3 Smileys - 3 Stars - 3 Triangles - 3 Colored Smileys - 4 Arrows - 4 Gray Arrows - 4 Circles Red to Black - 4 Ratings - 4 Traffic Lights - 5 Arrows - 5 Gray Arrows - 5 Ratings - 5 Quarters - 5 Boxes + 3 Arrows + 3 Gray Arrows + 3 Flags + 3 Traffic Lights 1 + 3 Traffic Lights 2 + 3 Signs + 3 Symbols 1 + 3 Symbols 2 + 3 Smileys + 3 Stars + 3 Triangles + 3 Colored Smileys + 4 Arrows + 4 Gray Arrows + 4 Circles Red to Black + 4 Ratings + 4 Traffic Lights + 5 Arrows + 5 Gray Arrows + 5 Ratings + 5 Quarters + 5 Boxes diff --git a/sc/uiconfig/scalc/ui/conditionalformatdialog.ui b/sc/uiconfig/scalc/ui/conditionalformatdialog.ui index c7797cb0542c..783814fe501c 100644 --- a/sc/uiconfig/scalc/ui/conditionalformatdialog.ui +++ b/sc/uiconfig/scalc/ui/conditionalformatdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Conditional Formatting for + Conditional Formatting for False dialog @@ -125,7 +125,7 @@ True False - Conditions + Conditions @@ -220,7 +220,7 @@ True False center - Range: + Range: True edassign @@ -265,7 +265,7 @@ True False - Cell Range + Cell Range diff --git a/sc/uiconfig/scalc/ui/conditionaliconset.ui b/sc/uiconfig/scalc/ui/conditionaliconset.ui index fb2048f12fd1..491bffeb8147 100644 --- a/sc/uiconfig/scalc/ui/conditionaliconset.ui +++ b/sc/uiconfig/scalc/ui/conditionaliconset.ui @@ -1,6 +1,6 @@ - + True @@ -17,7 +17,7 @@ True False - >= + >= 1 @@ -40,10 +40,10 @@ True False - Value - Percent - Percentile - Formula + Value + Percent + Percentile + Formula diff --git a/sc/uiconfig/scalc/ui/conflictsdialog.ui b/sc/uiconfig/scalc/ui/conflictsdialog.ui index 912482e61d54..894e1c42b2d0 100644 --- a/sc/uiconfig/scalc/ui/conflictsdialog.ui +++ b/sc/uiconfig/scalc/ui/conflictsdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Resolve Conflicts + Resolve Conflicts False dialog @@ -19,7 +19,7 @@ end - _Keep All Mine + _Keep All Mine False True True @@ -34,7 +34,7 @@ - Keep _All Others + Keep _All Others False True True @@ -99,7 +99,7 @@ False start 0 - There are conflicting changes in this shared spreadsheet. Conflicts must be resolved before saving the spreadsheet. Keep either own or other changes. + There are conflicting changes in this shared spreadsheet. Conflicts must be resolved before saving the spreadsheet. Keep either own or other changes. True 120 @@ -134,7 +134,7 @@ center - Keep _Mine + Keep _Mine False True True @@ -149,7 +149,7 @@ - Keep _Other + Keep _Other False True True diff --git a/sc/uiconfig/scalc/ui/consolidatedialog.ui b/sc/uiconfig/scalc/ui/consolidatedialog.ui index deec922eaf27..f075c4b95772 100644 --- a/sc/uiconfig/scalc/ui/consolidatedialog.ui +++ b/sc/uiconfig/scalc/ui/consolidatedialog.ui @@ -1,12 +1,12 @@ - + False 6 - Consolidate + Consolidate False dialog @@ -88,7 +88,7 @@ False True 0 - _Function: + _Function: True func @@ -105,7 +105,7 @@ False True 0 - _Consolidation ranges: + _Consolidation ranges: True consareas:border @@ -122,17 +122,17 @@ False True - Sum - Count - Average - Max - Min - Product - Count (numbers only) - StDev (sample) - StDevP (population) - Var (sample) - VarP (population) + Sum + Count + Average + Max + Min + Product + Count (numbers only) + StDev (sample) + StDevP (population) + Var (sample) + VarP (population) @@ -341,7 +341,7 @@ True False 0 - _Source data ranges: + _Source data ranges: True lbdataarea @@ -357,7 +357,7 @@ True False 0 - Copy results _to: + Copy results _to: True lbdestarea @@ -414,7 +414,7 @@ 6 - _Row labels + _Row labels True True False @@ -432,7 +432,7 @@ - C_olumn labels + C_olumn labels True True False @@ -456,7 +456,7 @@ True False - Consolidate by + Consolidate by @@ -488,7 +488,7 @@ 12 - _Link to source data + _Link to source data True True False @@ -504,7 +504,7 @@ True False - Options + Options @@ -523,7 +523,7 @@ True False - Options + Options diff --git a/sc/uiconfig/scalc/ui/correlationdialog.ui b/sc/uiconfig/scalc/ui/correlationdialog.ui index 2312d24359bf..83a08ecdf519 100644 --- a/sc/uiconfig/scalc/ui/correlationdialog.ui +++ b/sc/uiconfig/scalc/ui/correlationdialog.ui @@ -1,12 +1,12 @@ - + False 6 - Correlation + Correlation False dialog @@ -97,7 +97,7 @@ True False 0 - Input range: + Input range: True input-range-edit @@ -111,7 +111,7 @@ True False 0 - Results to: + Results to: True output-range-edit @@ -178,7 +178,7 @@ True False - Data + Data @@ -213,7 +213,7 @@ 12 - Columns + Columns True True False @@ -228,7 +228,7 @@ - Rows + Rows True True False @@ -249,7 +249,7 @@ True False - Grouped by + Grouped by diff --git a/sc/uiconfig/scalc/ui/covariancedialog.ui b/sc/uiconfig/scalc/ui/covariancedialog.ui index 6fb73387ebfb..11ccaab113a1 100644 --- a/sc/uiconfig/scalc/ui/covariancedialog.ui +++ b/sc/uiconfig/scalc/ui/covariancedialog.ui @@ -1,13 +1,13 @@ - + False 6 - Covariance + Covariance False dialog @@ -39,7 +39,7 @@ True False 0 - Input range: + Input range: True input-range-edit @@ -78,7 +78,7 @@ True False 0 - Results to: + Results to: True output-range-edit @@ -120,7 +120,7 @@ True False - Data + Data @@ -214,7 +214,7 @@ 12 - Columns + Columns True True False @@ -229,7 +229,7 @@ - Rows + Rows True True False @@ -250,7 +250,7 @@ True False - Grouped by + Grouped by diff --git a/sc/uiconfig/scalc/ui/createnamesdialog.ui b/sc/uiconfig/scalc/ui/createnamesdialog.ui index 90db355bca55..1879ac49bca8 100644 --- a/sc/uiconfig/scalc/ui/createnamesdialog.ui +++ b/sc/uiconfig/scalc/ui/createnamesdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Create Names + Create Names False dialog @@ -93,7 +93,7 @@ 6 - _Top row + _Top row True True False @@ -109,7 +109,7 @@ - _Left column + _Left column True True False @@ -125,7 +125,7 @@ - _Bottom row + _Bottom row True True False @@ -143,7 +143,7 @@ - _Right column + _Right column True True False @@ -166,7 +166,7 @@ True False 0.49000000953674316 - Create Names From + Create Names From diff --git a/sc/uiconfig/scalc/ui/dapiservicedialog.ui b/sc/uiconfig/scalc/ui/dapiservicedialog.ui index 167defd0295c..a00d14b4b5d7 100644 --- a/sc/uiconfig/scalc/ui/dapiservicedialog.ui +++ b/sc/uiconfig/scalc/ui/dapiservicedialog.ui @@ -1,12 +1,12 @@ - + False True True 6 - External Source + External Source dialog @@ -105,7 +105,7 @@ False start 0 - _Service + _Service True @@ -121,7 +121,7 @@ False start 0 - So_urce + So_urce True @@ -137,7 +137,7 @@ False start 0 - _Name + _Name True @@ -153,7 +153,7 @@ False start 0 - Us_er + Us_er True @@ -169,7 +169,7 @@ False start 0 - _Password + _Password True @@ -256,7 +256,7 @@ True False - Selection + Selection diff --git a/sc/uiconfig/scalc/ui/databaroptions.ui b/sc/uiconfig/scalc/ui/databaroptions.ui index 580f3053f5d5..b3d242c693f6 100644 --- a/sc/uiconfig/scalc/ui/databaroptions.ui +++ b/sc/uiconfig/scalc/ui/databaroptions.ui @@ -1,12 +1,12 @@ - + False 6 - Data Bar + Data Bar dialog @@ -86,7 +86,7 @@ True False end - Minimum: + Minimum: True min @@ -100,7 +100,7 @@ True False end - Maximum: + Maximum: True max @@ -115,13 +115,13 @@ False True - Automatic - Minimum - Maximum - Percentile - Value - Percent - Formula + Automatic + Minimum + Maximum + Percentile + Value + Percent + Formula @@ -135,13 +135,13 @@ False True - Automatic - Minimum - Maximum - Percentile - Value - Percent - Formula + Automatic + Minimum + Maximum + Percentile + Value + Percent + Formula @@ -179,7 +179,7 @@ True False - Entry Values + Entry Values @@ -217,7 +217,7 @@ True False end - Positive: + Positive: True positive_colour @@ -231,7 +231,7 @@ True False end - Negative: + Negative: True negative_colour @@ -267,7 +267,7 @@ True False end - Fill: + Fill: 0 @@ -279,8 +279,8 @@ True False - Color - Gradient + Color + Gradient @@ -296,7 +296,7 @@ True False - Bar Colors + Bar Colors @@ -334,7 +334,7 @@ True False end - Position of vertical axis: + Position of vertical axis: True axis_pos @@ -348,7 +348,7 @@ True False end - Color of vertical axis: + Color of vertical axis: True axis_colour @@ -363,9 +363,9 @@ False True - Automatic - Middle - None + Automatic + Middle + None @@ -392,7 +392,7 @@ True False - Axis + Axis @@ -430,7 +430,7 @@ True False end - Minimum bar length (%): + Minimum bar length (%): True min_length @@ -444,7 +444,7 @@ True False end - Maximum bar length (%): + Maximum bar length (%): True max_length @@ -483,7 +483,7 @@ True False - Bar Lengths + Bar Lengths @@ -498,7 +498,7 @@ - Display bar only + Display bar only True True False @@ -515,7 +515,7 @@ False 0 - The minimum value must be less than the maximum value. + The minimum value must be less than the maximum value. False diff --git a/sc/uiconfig/scalc/ui/datafielddialog.ui b/sc/uiconfig/scalc/ui/datafielddialog.ui index 8ca7c634cb9c..91fe0d0ee189 100644 --- a/sc/uiconfig/scalc/ui/datafielddialog.ui +++ b/sc/uiconfig/scalc/ui/datafielddialog.ui @@ -1,11 +1,11 @@ - + False 6 - Data Field + Data Field False dialog @@ -127,7 +127,7 @@ True False - Function + Function @@ -141,7 +141,7 @@ - Show it_ems without data + Show it_ems without data True True False @@ -164,7 +164,7 @@ True False 0 - Name: + Name: 0 @@ -212,7 +212,7 @@ True False 0 - _Type: + _Type: True type end @@ -227,7 +227,7 @@ True False 0 - _Base field: + _Base field: True basefield end @@ -242,7 +242,7 @@ True False 0 - Ba_se item: + Ba_se item: True baseitem end @@ -257,15 +257,15 @@ True False - Normal - Difference from - % of - % difference from - Running total in - % of row - % of column - % of total - Index + Normal + Difference from + % of + % difference from + Running total in + % of row + % of column + % of total + Index @@ -288,8 +288,8 @@ True False - - previous item - - - next item - + - previous item - + - next item - @@ -305,7 +305,7 @@ True False - Displayed value + Displayed value diff --git a/sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui b/sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui index 26f7b8fea307..b4091b8e98bb 100644 --- a/sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui +++ b/sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui @@ -1,6 +1,6 @@ - + 1 @@ -12,7 +12,7 @@ False 6 - Data Field Options + Data Field Options False dialog @@ -107,7 +107,7 @@ 12 - _Ascending + _Ascending True True False @@ -124,7 +124,7 @@ - _Descending + _Descending True True False @@ -140,7 +140,7 @@ - _Manual + _Manual True True False @@ -178,7 +178,7 @@ True False - Sort by + Sort by @@ -210,7 +210,7 @@ 12 - _Repeat item labels + _Repeat item labels True True False @@ -226,7 +226,7 @@ - _Empty line after each item + _Empty line after each item True True False @@ -245,7 +245,7 @@ True False 0 - _Layout: + _Layout: True layout @@ -260,9 +260,9 @@ False True - Tabular layout - Outline layout with subtotals at the top - Outline layout with subtotals at the bottom + Tabular layout + Outline layout with subtotals at the top + Outline layout with subtotals at the bottom @@ -278,7 +278,7 @@ True False - Display Options + Display Options @@ -310,7 +310,7 @@ 12 - _Show: + _Show: True True False @@ -331,7 +331,7 @@ True False 0 - _From: + _From: True from @@ -345,7 +345,7 @@ True False 0 - _Using field: + _Using field: True using @@ -364,7 +364,7 @@ True False 0 - items + items True layout @@ -398,8 +398,8 @@ True False - Top - Bottom + Top + Bottom @@ -425,7 +425,7 @@ True False - Show Automatically + Show Automatically @@ -470,7 +470,7 @@ True False - Hide Items + Hide Items @@ -502,7 +502,7 @@ True False 0 - Hierarch_y: + Hierarch_y: True hierarchy diff --git a/sc/uiconfig/scalc/ui/dataform.ui b/sc/uiconfig/scalc/ui/dataform.ui index b7abf26c4f6e..92c0322b5fbe 100644 --- a/sc/uiconfig/scalc/ui/dataform.ui +++ b/sc/uiconfig/scalc/ui/dataform.ui @@ -1,11 +1,11 @@ - + False 6 - Data Form + Data Form dialog @@ -22,7 +22,7 @@ True False 0 - New Record + New Record False @@ -32,7 +32,7 @@ - _New + _New True True True @@ -48,7 +48,7 @@ - _Delete + _Delete True True True @@ -62,7 +62,7 @@ - _Restore + _Restore True True True @@ -76,7 +76,7 @@ - _Previous Record + _Previous Record True True True @@ -91,7 +91,7 @@ - Ne_xt Record + Ne_xt Record True True True @@ -121,7 +121,7 @@ - _Close + _Close True True True diff --git a/sc/uiconfig/scalc/ui/datastreams.ui b/sc/uiconfig/scalc/ui/datastreams.ui index 18915175f38e..8063776c7af4 100644 --- a/sc/uiconfig/scalc/ui/datastreams.ui +++ b/sc/uiconfig/scalc/ui/datastreams.ui @@ -1,12 +1,12 @@ - + False 6 - Live Data Streams + Live Data Streams dialog @@ -47,7 +47,7 @@ True False - URL: + URL: False @@ -60,7 +60,7 @@ True False True - Enter the URL of the source document in the local file system or Internet here. + Enter the URL of the source document in the local file system or Internet here. True True 48 @@ -78,7 +78,7 @@ - _Browse... + _Browse... True True True @@ -105,7 +105,7 @@ 6 - Direct data feed + Direct data feed True True False @@ -122,7 +122,7 @@ - Script to execute to obtain the data + Script to execute to obtain the data True True False @@ -163,7 +163,7 @@ 6 - value1,value2,...,valueN, and fill into range: + value1,value2,...,valueN, and fill into range: True True False @@ -180,7 +180,7 @@ - address,value + address,value True True False @@ -217,7 +217,7 @@ True False - Interpret stream data as + Interpret stream data as @@ -230,7 +230,7 @@ - Empty lines trigger UI refresh + Empty lines trigger UI refresh True True False @@ -252,7 +252,7 @@ True False - Source Stream + Source Stream @@ -293,7 +293,7 @@ 6 - Move existing data down + Move existing data down True True False @@ -310,7 +310,7 @@ - Move the range down + Move the range down True True False @@ -328,7 +328,7 @@ - Overwrite existing data + Overwrite existing data True True False @@ -351,7 +351,7 @@ True False - When New Data Arrives + When New Data Arrives @@ -385,7 +385,7 @@ 6 - Limit to: + Limit to: True True False @@ -415,7 +415,7 @@ - _Unlimited + _Unlimited True True False @@ -441,7 +441,7 @@ True False - Maximal Amount of Rows + Maximal Amount of Rows diff --git a/sc/uiconfig/scalc/ui/definedatabaserangedialog.ui b/sc/uiconfig/scalc/ui/definedatabaserangedialog.ui index 0d1a5666d3f5..772a2fff1940 100644 --- a/sc/uiconfig/scalc/ui/definedatabaserangedialog.ui +++ b/sc/uiconfig/scalc/ui/definedatabaserangedialog.ui @@ -1,12 +1,12 @@ - + False 5 - Define Database Range + Define Database Range dialog @@ -58,7 +58,7 @@ True False - Name + Name @@ -122,7 +122,7 @@ True False - Range + Range @@ -157,7 +157,7 @@ - M_odify + M_odify True True True @@ -210,7 +210,7 @@ 6 - Co_ntains column labels + Co_ntains column labels True True False @@ -226,7 +226,7 @@ - Contains _totals row + Contains _totals row True True False @@ -242,7 +242,7 @@ - Insert or delete _cells + Insert or delete _cells True True False @@ -258,7 +258,7 @@ - Keep _formatting + Keep _formatting True True False @@ -274,7 +274,7 @@ - Don't save _imported data + Don't save _imported data True True False @@ -293,7 +293,7 @@ True False 0 - Source: + Source: False @@ -306,7 +306,7 @@ True False 0 - Operations: + Operations: False @@ -319,7 +319,7 @@ False True 0 - Invalid range + Invalid range False @@ -335,7 +335,7 @@ True False - Options + Options diff --git a/sc/uiconfig/scalc/ui/definename.ui b/sc/uiconfig/scalc/ui/definename.ui index 01a6a69210fe..75bc7b1b8d41 100644 --- a/sc/uiconfig/scalc/ui/definename.ui +++ b/sc/uiconfig/scalc/ui/definename.ui @@ -1,12 +1,12 @@ - + False 6 - Define Name + Define Name dialog @@ -86,7 +86,7 @@ True False 0 - Name: + Name: True edit @@ -100,7 +100,7 @@ True False 0 - Range or formula expression: + Range or formula expression: True range @@ -114,7 +114,7 @@ True False 0 - Scope: + Scope: True scope @@ -187,7 +187,7 @@ True False 0 - Define the name and range or formula expression. + Define the name and range or formula expression. 0 @@ -217,7 +217,7 @@ True - _Print range + _Print range True True False @@ -232,7 +232,7 @@ - _Filter + _Filter True True False @@ -247,7 +247,7 @@ - Repeat _column + Repeat _column True True False @@ -262,7 +262,7 @@ - Repeat _row + Repeat _row True True False @@ -281,7 +281,7 @@ True False - Range _Options + Range _Options True diff --git a/sc/uiconfig/scalc/ui/deletecells.ui b/sc/uiconfig/scalc/ui/deletecells.ui index eb8f5b29daeb..f9dc0dd886b8 100644 --- a/sc/uiconfig/scalc/ui/deletecells.ui +++ b/sc/uiconfig/scalc/ui/deletecells.ui @@ -1,11 +1,11 @@ - + False 6 - Delete Cells + Delete Cells False dialog @@ -90,7 +90,7 @@ 6 - Shift cells _up + Shift cells _up True True False @@ -108,7 +108,7 @@ - Shift cells _left + Shift cells _left True True False @@ -125,7 +125,7 @@ - Delete entire _row(s) + Delete entire _row(s) True True False @@ -142,7 +142,7 @@ - Delete entire _column(s) + Delete entire _column(s) True True False @@ -165,7 +165,7 @@ True False - Selection + Selection diff --git a/sc/uiconfig/scalc/ui/deletecontents.ui b/sc/uiconfig/scalc/ui/deletecontents.ui index 11d1d139f3b6..57171e188050 100644 --- a/sc/uiconfig/scalc/ui/deletecontents.ui +++ b/sc/uiconfig/scalc/ui/deletecontents.ui @@ -1,11 +1,11 @@ - + False 6 - Delete Contents + Delete Contents False dialog @@ -90,7 +90,7 @@ 12 - Delete _all + Delete _all True True False @@ -113,7 +113,7 @@ True - _Text + _Text True True False @@ -128,7 +128,7 @@ - _Numbers + _Numbers True True False @@ -143,7 +143,7 @@ - _Date & time + _Date & time True True False @@ -158,7 +158,7 @@ - _Formulas + _Formulas True True False @@ -173,7 +173,7 @@ - _Comments + _Comments True True False @@ -188,7 +188,7 @@ - For_mats + For_mats True True False @@ -203,7 +203,7 @@ - _Objects + _Objects True True False @@ -234,7 +234,7 @@ True False - Selection + Selection diff --git a/sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui b/sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui index 6a1054d097d0..490a9bbd6dad 100644 --- a/sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui +++ b/sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui @@ -1,12 +1,12 @@ - + False 6 - Descriptive Statistics + Descriptive Statistics False dialog @@ -39,7 +39,7 @@ True False 0 - Input range: + Input range: True input-range-edit @@ -78,7 +78,7 @@ True False 0 - Results to: + Results to: True output-range-edit @@ -120,7 +120,7 @@ True False - Data + Data @@ -214,7 +214,7 @@ 12 - _Columns + _Columns True True False @@ -230,7 +230,7 @@ - _Rows + _Rows True True False @@ -252,7 +252,7 @@ True False - Grouped by + Grouped by diff --git a/sc/uiconfig/scalc/ui/doubledialog.ui b/sc/uiconfig/scalc/ui/doubledialog.ui index 39ac15ecf0e9..f90be37f4672 100644 --- a/sc/uiconfig/scalc/ui/doubledialog.ui +++ b/sc/uiconfig/scalc/ui/doubledialog.ui @@ -1,10 +1,10 @@ - + False 6 - Edit Setting + Edit Setting dialog diff --git a/sc/uiconfig/scalc/ui/dropmenu.ui b/sc/uiconfig/scalc/ui/dropmenu.ui index 5cd023b0c577..051fa1c4ad3f 100644 --- a/sc/uiconfig/scalc/ui/dropmenu.ui +++ b/sc/uiconfig/scalc/ui/dropmenu.ui @@ -1,6 +1,6 @@ - + True @@ -9,7 +9,7 @@ True False - Insert as Hyperlink + Insert as Hyperlink True @@ -17,7 +17,7 @@ True False - Insert as Link + Insert as Link True @@ -25,7 +25,7 @@ True False - Insert as Copy + Insert as Copy True diff --git a/sc/uiconfig/scalc/ui/erroralerttabpage.ui b/sc/uiconfig/scalc/ui/erroralerttabpage.ui index 5209904241d7..74d3e9112423 100644 --- a/sc/uiconfig/scalc/ui/erroralerttabpage.ui +++ b/sc/uiconfig/scalc/ui/erroralerttabpage.ui @@ -1,5 +1,5 @@ - + True @@ -11,7 +11,7 @@ 12 - Show error _message when invalid values are entered + Show error _message when invalid values are entered True True False @@ -56,7 +56,7 @@ True False 0 - _Action: + _Action: True actionCB @@ -73,7 +73,7 @@ False 0 0 - _Title: + _Title: True title @@ -125,7 +125,7 @@ False 0 0 - _Error message: + _Error message: True errorMsg:border @@ -138,7 +138,7 @@ - _Browse... + _Browse... True True True @@ -157,10 +157,10 @@ False True - Stop - Warning - Information - Macro + Stop + Warning + Information + Macro @@ -178,7 +178,7 @@ True False - Contents + Contents diff --git a/sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui b/sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui index 93a5884e338d..b6de19c1c9fe 100644 --- a/sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui +++ b/sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui @@ -1,6 +1,6 @@ - + @@ -12,7 +12,7 @@ False 6 - Exponential Smoothing + Exponential Smoothing False dialog @@ -45,7 +45,7 @@ True False 0 - Input range: + Input range: True input-range-edit @@ -84,7 +84,7 @@ True False 0 - Results to: + Results to: True output-range-edit @@ -126,7 +126,7 @@ True False - Data + Data @@ -220,7 +220,7 @@ 12 - Columns + Columns True True False @@ -236,7 +236,7 @@ - Rows + Rows True True False @@ -258,7 +258,7 @@ True False - Grouped by + Grouped by @@ -296,7 +296,7 @@ True False 0 - Smoothing factor: + Smoothing factor: True smoothing-factor-spin @@ -328,7 +328,7 @@ True False - Parameters + Parameters diff --git a/sc/uiconfig/scalc/ui/externaldata.ui b/sc/uiconfig/scalc/ui/externaldata.ui index 96c1e7f90768..1da3ed8b81a5 100644 --- a/sc/uiconfig/scalc/ui/externaldata.ui +++ b/sc/uiconfig/scalc/ui/externaldata.ui @@ -1,6 +1,6 @@ - + @@ -13,7 +13,7 @@ False 6 - External Data + External Data dialog @@ -115,7 +115,7 @@ True False - Enter the URL of the source document in the local file system or Internet here. + Enter the URL of the source document in the local file system or Internet here. True True 48 @@ -133,7 +133,7 @@ - _Browse... + _Browse... True True True @@ -160,7 +160,7 @@ True False - URL of _External Data Source + URL of _External Data Source True @@ -230,7 +230,7 @@ 12 - _Update every: + _Update every: True True False @@ -272,7 +272,7 @@ True False - _seconds + _seconds True @@ -304,7 +304,7 @@ True False 0.47999998927116394 - _Available Tables/Ranges + _Available Tables/Ranges True diff --git a/sc/uiconfig/scalc/ui/filldlg.ui b/sc/uiconfig/scalc/ui/filldlg.ui index cf23243dfb05..fc71a32888f6 100644 --- a/sc/uiconfig/scalc/ui/filldlg.ui +++ b/sc/uiconfig/scalc/ui/filldlg.ui @@ -1,11 +1,11 @@ - + False 6 - Fill Series + Fill Series dialog @@ -97,7 +97,7 @@ 6 - _Down + _Down True True False @@ -115,7 +115,7 @@ - _Right + _Right True True False @@ -132,7 +132,7 @@ - _Up + _Up True True False @@ -149,7 +149,7 @@ - _Left + _Left True True False @@ -173,7 +173,7 @@ True False True - Direction + Direction @@ -208,7 +208,7 @@ 6 - Li_near + Li_near True True False @@ -226,7 +226,7 @@ - _Growth + _Growth True True False @@ -243,7 +243,7 @@ - Da_te + Da_te True True False @@ -260,7 +260,7 @@ - _AutoFill + _AutoFill True True False @@ -284,7 +284,7 @@ True False True - Series Type + Series Type @@ -319,7 +319,7 @@ 6 - Da_y + Da_y True True False @@ -337,7 +337,7 @@ - _Weekday + _Weekday True True False @@ -355,7 +355,7 @@ - _Month + _Month True True False @@ -372,7 +372,7 @@ - Y_ear + Y_ear True True False @@ -396,7 +396,7 @@ True False True - Time Unit + Time Unit @@ -419,7 +419,7 @@ True False 0 - _Start value: + _Start value: True startValue @@ -433,7 +433,7 @@ True False 0 - End _value: + End _value: True endValue @@ -447,7 +447,7 @@ True False 0 - In_crement: + In_crement: True increment diff --git a/sc/uiconfig/scalc/ui/floatingborderstyle.ui b/sc/uiconfig/scalc/ui/floatingborderstyle.ui index e397aafbd76a..e3f56b9a5af1 100644 --- a/sc/uiconfig/scalc/ui/floatingborderstyle.ui +++ b/sc/uiconfig/scalc/ui/floatingborderstyle.ui @@ -1,6 +1,6 @@ - + False @@ -29,7 +29,7 @@ True False - No Border + No Border none sc/res/sidebar/CellBorder_Empty_18x18.png @@ -42,7 +42,7 @@ True False - All Borders + All Borders all sc/res/sidebar/CellBorder_All_18x18.png @@ -55,7 +55,7 @@ True False - Outside Borders + Outside Borders outside sc/res/sidebar/CellBorder_FourBorders_18x18.png @@ -68,7 +68,7 @@ True False - Thick Box Border + Thick Box Border thickbox sc/res/sidebar/CellBorder_FourBorders_Thick_18x18.png @@ -92,7 +92,7 @@ True False - Thick Bottom Border + Thick Bottom Border thickbottom sc/res/sidebar/CellBorder_Bottom_Thick_18x18.png @@ -105,7 +105,7 @@ True False - Double Bottom Border + Double Bottom Border doublebottom sc/res/sidebar/CellBorder_Bottom_Double_18x18.png @@ -118,7 +118,7 @@ True False - Top and Thick Bottom Borders + Top and Thick Bottom Borders topthickbottom sc/res/sidebar/CellBorder_TopThin_BottomThick_18x18.png @@ -131,7 +131,7 @@ True False - Top and Double Bottom Borders + Top and Double Bottom Borders topdoublebottom sc/res/sidebar/CellBorder_TopSingle_BottomDouble_18x18.png @@ -155,7 +155,7 @@ True False - Left Border + Left Border left sc/res/sidebar/CellBorder_Left_18x18.png @@ -168,7 +168,7 @@ True False - Right Border + Right Border right sc/res/sidebar/CellBorder_Right_18x18.png @@ -181,7 +181,7 @@ True False - Top Border + Top Border top sc/res/sidebar/CellBorder_Top_18x18.png @@ -194,7 +194,7 @@ True False - Bottom Border + Bottom Border bottom sc/res/sidebar/CellBorder_Bottom_18x18.png @@ -207,7 +207,7 @@ True False - Diagonal Up Border + Diagonal Up Border diagup True sc/res/sidebar/CellBorder_RightDiagonal_18x18.png @@ -221,7 +221,7 @@ True False - Diagonal Down Border + Diagonal Down Border diagdown True sc/res/sidebar/CellBorder_LeftDiagonal_18x18.png @@ -235,7 +235,7 @@ True False - Top and Bottom Borders + Top and Bottom Borders topbottom True sc/res/sidebar/CellBorder_TopAndBottom_18x18.png @@ -249,7 +249,7 @@ True False - Left and Right Borders + Left and Right Borders leftright True sc/res/sidebar/CellBorder_LeftAndRight_18x18.png diff --git a/sc/uiconfig/scalc/ui/floatinglinestyle.ui b/sc/uiconfig/scalc/ui/floatinglinestyle.ui index d6c6f0b029c2..a6d584c22d8a 100644 --- a/sc/uiconfig/scalc/ui/floatinglinestyle.ui +++ b/sc/uiconfig/scalc/ui/floatinglinestyle.ui @@ -1,6 +1,6 @@ - + False @@ -38,7 +38,7 @@ - _More Options... + _More Options... True True True diff --git a/sc/uiconfig/scalc/ui/footerdialog.ui b/sc/uiconfig/scalc/ui/footerdialog.ui index 3b3102e347ea..88a7f9466a82 100644 --- a/sc/uiconfig/scalc/ui/footerdialog.ui +++ b/sc/uiconfig/scalc/ui/footerdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Footers + Footers False dialog @@ -97,7 +97,7 @@ True False - Footer (right) + Footer (right) False @@ -110,7 +110,7 @@ True False - Footer (left) + Footer (left) 1 diff --git a/sc/uiconfig/scalc/ui/formatcellsdialog.ui b/sc/uiconfig/scalc/ui/formatcellsdialog.ui index 135e0bbd3522..8618f7c0b2c1 100644 --- a/sc/uiconfig/scalc/ui/formatcellsdialog.ui +++ b/sc/uiconfig/scalc/ui/formatcellsdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Format Cells + Format Cells False dialog @@ -97,7 +97,7 @@ True False - Numbers + Numbers False @@ -110,7 +110,7 @@ True False - Font + Font 1 @@ -124,7 +124,7 @@ True False - Font Effects + Font Effects 2 @@ -138,7 +138,7 @@ True False - Alignment + Alignment 3 @@ -152,7 +152,7 @@ True False - Asian Typography + Asian Typography 4 @@ -166,7 +166,7 @@ True False - Borders + Borders 5 @@ -180,7 +180,7 @@ True False - Background + Background 6 @@ -194,7 +194,7 @@ True False - Cell Protection + Cell Protection 7 diff --git a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui index ffeda7079a0e..502c45e68cff 100644 --- a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui +++ b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui @@ -1,6 +1,6 @@ - + @@ -13,7 +13,7 @@ False True 6 - Detailed Calculation Settings + Detailed Calculation Settings dialog @@ -43,7 +43,7 @@ True False 0 - Conversion from text to number: + Conversion from text to number: 0 @@ -52,7 +52,7 @@ - Treat _empty string as zero + Treat _empty string as zero True True False @@ -70,7 +70,7 @@ True False - Reference syntax for string reference: + Reference syntax for string reference: 0 @@ -82,7 +82,7 @@ True False - Use formula syntax + Use formula syntax Calc A1 Excel A1 Excel R1C1 @@ -99,10 +99,10 @@ True False - Generate #VALUE! error - Treat as zero - Convert only if unambiguous - Convert also locale dependent + Generate #VALUE! error + Treat as zero + Convert only if unambiguous + Convert also locale dependent @@ -112,7 +112,7 @@ - Apply those settings to current document only + Apply those settings to current document only True True False @@ -133,7 +133,7 @@ True False - Contents to Numbers + Contents to Numbers diff --git a/sc/uiconfig/scalc/ui/functionpanel.ui b/sc/uiconfig/scalc/ui/functionpanel.ui index 1f367cee0535..65be2e18eecf 100644 --- a/sc/uiconfig/scalc/ui/functionpanel.ui +++ b/sc/uiconfig/scalc/ui/functionpanel.ui @@ -1,6 +1,6 @@ - + True @@ -42,7 +42,7 @@ True True True - Insert Function into calculation sheet + Insert Function into calculation sheet image1 @@ -56,19 +56,19 @@ False True - Last Used - All - Database - Date&Time - Financial - Information - Logical - Mathematical - Array - Statistical - Spreadsheet - Text - Add-in + Last Used + All + Database + Date&Time + Financial + Information + Logical + Mathematical + Array + Statistical + Spreadsheet + Text + Add-in @@ -109,7 +109,7 @@ 0 True False - label + label True 0 0 diff --git a/sc/uiconfig/scalc/ui/goalseekdlg.ui b/sc/uiconfig/scalc/ui/goalseekdlg.ui index 1514cafecbb5..e2f983bf5745 100644 --- a/sc/uiconfig/scalc/ui/goalseekdlg.ui +++ b/sc/uiconfig/scalc/ui/goalseekdlg.ui @@ -1,12 +1,12 @@ - + False 6 - Goal Seek + Goal Seek dialog @@ -94,7 +94,7 @@ True False - _Formula cell: + _Formula cell: True formulaedit @@ -107,7 +107,7 @@ True False - Target _value: + Target _value: True target @@ -120,7 +120,7 @@ True False - Variable _cell: + Variable _cell: True varedit @@ -226,7 +226,7 @@ True False - Default Settings + Default Settings diff --git a/sc/uiconfig/scalc/ui/groupbydate.ui b/sc/uiconfig/scalc/ui/groupbydate.ui index 83db3a49e012..b7f27003c1ed 100644 --- a/sc/uiconfig/scalc/ui/groupbydate.ui +++ b/sc/uiconfig/scalc/ui/groupbydate.ui @@ -1,11 +1,11 @@ - + False 6 - Grouping + Grouping False dialog @@ -96,7 +96,7 @@ 12 - _Automatically + _Automatically True True False @@ -113,7 +113,7 @@ - _Manually at: + _Manually at: True True False @@ -150,7 +150,7 @@ True False - Start + Start @@ -185,7 +185,7 @@ 12 - A_utomatically + A_utomatically True True False @@ -202,7 +202,7 @@ - Ma_nually at: + Ma_nually at: True True False @@ -239,7 +239,7 @@ True False - End + End @@ -274,7 +274,7 @@ 12 - Number of _days: + Number of _days: True True False @@ -291,7 +291,7 @@ - _Intervals: + _Intervals: True True False @@ -341,7 +341,7 @@ True False - Group by + Group by diff --git a/sc/uiconfig/scalc/ui/groupbynumber.ui b/sc/uiconfig/scalc/ui/groupbynumber.ui index f9c3bfeb5c20..ee31440fde58 100644 --- a/sc/uiconfig/scalc/ui/groupbynumber.ui +++ b/sc/uiconfig/scalc/ui/groupbynumber.ui @@ -1,12 +1,12 @@ - + False 6 - Grouping + Grouping False dialog @@ -97,7 +97,7 @@ 12 - _Automatically + _Automatically True True False @@ -114,7 +114,7 @@ - _Manually at: + _Manually at: True True False @@ -152,7 +152,7 @@ True False - Start + Start @@ -187,7 +187,7 @@ 12 - A_utomatically + A_utomatically True True False @@ -204,7 +204,7 @@ - Ma_nually at: + Ma_nually at: True True False @@ -242,7 +242,7 @@ True False - End + End @@ -280,7 +280,7 @@ True False - Group by + Group by diff --git a/sc/uiconfig/scalc/ui/groupdialog.ui b/sc/uiconfig/scalc/ui/groupdialog.ui index 6d35a9a18568..3274a4e0ed69 100644 --- a/sc/uiconfig/scalc/ui/groupdialog.ui +++ b/sc/uiconfig/scalc/ui/groupdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Group + Group False dialog @@ -95,7 +95,7 @@ 6 - _Rows + _Rows True True False @@ -113,7 +113,7 @@ - _Columns + _Columns True True False @@ -138,7 +138,7 @@ False True 0 - Include + Include diff --git a/sc/uiconfig/scalc/ui/headerdialog.ui b/sc/uiconfig/scalc/ui/headerdialog.ui index 73703f3a4c7b..92b487d1e5aa 100644 --- a/sc/uiconfig/scalc/ui/headerdialog.ui +++ b/sc/uiconfig/scalc/ui/headerdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Headers + Headers False dialog @@ -97,7 +97,7 @@ True False - Header (right) + Header (right) False @@ -110,7 +110,7 @@ True False - Header (left) + Header (left) 1 diff --git a/sc/uiconfig/scalc/ui/headerfootercontent.ui b/sc/uiconfig/scalc/ui/headerfootercontent.ui index c0609951a000..e67a66400bac 100644 --- a/sc/uiconfig/scalc/ui/headerfootercontent.ui +++ b/sc/uiconfig/scalc/ui/headerfootercontent.ui @@ -1,5 +1,5 @@ - + @@ -19,7 +19,7 @@ True False 0 - _Left area + _Left area True @@ -34,7 +34,7 @@ True False 0 - _Center area + _Center area True @@ -49,7 +49,7 @@ True False 0 - R_ight area + R_ight area True @@ -120,7 +120,7 @@ False True 0 - _Header + _Header True @@ -134,7 +134,7 @@ False True 0 - _Footer + _Footer True @@ -161,7 +161,7 @@ False True 0 - Custom header + Custom header False @@ -174,7 +174,7 @@ False True 0 - Custom footer + Custom footer False @@ -201,7 +201,7 @@ True True True - Text Attributes + Text Attributes imageBTN_TEXT @@ -215,7 +215,7 @@ True False True - Title + Title imageBTN_FILE @@ -230,7 +230,7 @@ True True True - Sheet Name + Sheet Name imageBTN_TABLE 0.47999998927116394 @@ -246,7 +246,7 @@ True True True - Page + Page imageBTN_PAGE @@ -261,7 +261,7 @@ True True True - Pages + Pages imageBTN_PAGES 0.49000000953674316 @@ -277,7 +277,7 @@ True True True - Date + Date imageBTN_DATE 0.37000000476837158 @@ -293,7 +293,7 @@ True True True - Time + Time imageBTN_TIME 0.41999998688697815 @@ -346,7 +346,7 @@ True False - Use the buttons to change the font or insert field commands such as date, time, etc. + Use the buttons to change the font or insert field commands such as date, time, etc. @@ -355,7 +355,7 @@ True False - Note + Note @@ -376,7 +376,7 @@ True False - (none) + (none) False @@ -388,7 +388,7 @@ True False - Page + Page False @@ -400,7 +400,7 @@ True False - of ? + of ? False @@ -412,7 +412,7 @@ True False - Confidential + Confidential False @@ -424,7 +424,7 @@ True False - Created by + Created by False @@ -436,7 +436,7 @@ True False - Customized + Customized False @@ -448,7 +448,7 @@ True False - of + of False @@ -506,7 +506,7 @@ True False - Title + Title True @@ -514,7 +514,7 @@ True False - File Name + File Name True @@ -522,7 +522,7 @@ True False - Path/File Name + Path/File Name True diff --git a/sc/uiconfig/scalc/ui/headerfooterdialog.ui b/sc/uiconfig/scalc/ui/headerfooterdialog.ui index 2bcfd98d8324..9fe800299573 100644 --- a/sc/uiconfig/scalc/ui/headerfooterdialog.ui +++ b/sc/uiconfig/scalc/ui/headerfooterdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Headers/Footers + Headers/Footers False dialog @@ -97,7 +97,7 @@ True False - Header + Header False @@ -110,7 +110,7 @@ True False - Footer + Footer 1 diff --git a/sc/uiconfig/scalc/ui/imoptdialog.ui b/sc/uiconfig/scalc/ui/imoptdialog.ui index c8883ff2f695..f1930a9fe3ac 100644 --- a/sc/uiconfig/scalc/ui/imoptdialog.ui +++ b/sc/uiconfig/scalc/ui/imoptdialog.ui @@ -1,12 +1,12 @@ - + False 6 - Import File + Import File dialog @@ -94,7 +94,7 @@ True False 0 - _Character set: + _Character set: True @@ -107,7 +107,7 @@ True False 0 - _Field delimiter: + _Field delimiter: True field @@ -121,7 +121,7 @@ True False 0 - _Text delimiter: + _Text delimiter: True text @@ -132,7 +132,7 @@ - Save cell content as _shown + Save cell content as _shown True False True @@ -148,7 +148,7 @@ - Save cell fo_rmulas instead of calculated values + Save cell fo_rmulas instead of calculated values True False True @@ -164,7 +164,7 @@ - _Quote all text cells + _Quote all text cells True False True @@ -180,7 +180,7 @@ - Fixed column _width + Fixed column _width True False True @@ -269,7 +269,7 @@ True False - Field Options + Field Options diff --git a/sc/uiconfig/scalc/ui/inputstringdialog.ui b/sc/uiconfig/scalc/ui/inputstringdialog.ui index 8e542abe31b0..2cb2700ebc51 100644 --- a/sc/uiconfig/scalc/ui/inputstringdialog.ui +++ b/sc/uiconfig/scalc/ui/inputstringdialog.ui @@ -1,6 +1,6 @@ - + False diff --git a/sc/uiconfig/scalc/ui/insertcells.ui b/sc/uiconfig/scalc/ui/insertcells.ui index b1b45583d58e..3d6884bba97c 100644 --- a/sc/uiconfig/scalc/ui/insertcells.ui +++ b/sc/uiconfig/scalc/ui/insertcells.ui @@ -1,11 +1,11 @@ - + False 6 - Insert Cells + Insert Cells False dialog @@ -95,7 +95,7 @@ 6 - Shift cells _down + Shift cells _down False True True @@ -114,7 +114,7 @@ - Shift cells _right + Shift cells _right False True True @@ -132,7 +132,7 @@ - Entire ro_w + Entire ro_w False True True @@ -150,7 +150,7 @@ - Entire _column + Entire _column False True True @@ -174,7 +174,7 @@ True False - Selection + Selection diff --git a/sc/uiconfig/scalc/ui/insertname.ui b/sc/uiconfig/scalc/ui/insertname.ui index 6f2daae7a011..81ad58dad5ae 100644 --- a/sc/uiconfig/scalc/ui/insertname.ui +++ b/sc/uiconfig/scalc/ui/insertname.ui @@ -1,11 +1,11 @@ - + False 6 - Paste Names + Paste Names False dialog @@ -34,7 +34,7 @@ - _Paste All + _Paste All True True True diff --git a/sc/uiconfig/scalc/ui/insertsheet.ui b/sc/uiconfig/scalc/ui/insertsheet.ui index ecc94244379d..5174eac8d732 100644 --- a/sc/uiconfig/scalc/ui/insertsheet.ui +++ b/sc/uiconfig/scalc/ui/insertsheet.ui @@ -1,6 +1,6 @@ - + 1 @@ -12,7 +12,7 @@ False 6 - Insert Sheet + Insert Sheet dialog @@ -102,7 +102,7 @@ 6 - B_efore current sheet + B_efore current sheet True True False @@ -120,7 +120,7 @@ - _After current sheet + _After current sheet True True False @@ -143,7 +143,7 @@ True False - Position + Position @@ -189,7 +189,7 @@ 6 - _New sheet + _New sheet True True False @@ -223,7 +223,7 @@ True False 0 - N_o. of sheets: + N_o. of sheets: True countnf @@ -239,7 +239,7 @@ True False 0 - Na_me: + Na_me: True nameed @@ -272,7 +272,7 @@ True • 52 - Sheet... + Sheet... 1 @@ -307,7 +307,7 @@ 6 - _From file + _From file True True False @@ -368,7 +368,7 @@ - Tables in file + Tables in file @@ -388,7 +388,7 @@ 12 - _Browse... + _Browse... True True True @@ -403,7 +403,7 @@ - Lin_k + Lin_k True True False @@ -452,7 +452,7 @@ True False - Sheet + Sheet diff --git a/sc/uiconfig/scalc/ui/integerdialog.ui b/sc/uiconfig/scalc/ui/integerdialog.ui index 340214751930..939645bb5d48 100644 --- a/sc/uiconfig/scalc/ui/integerdialog.ui +++ b/sc/uiconfig/scalc/ui/integerdialog.ui @@ -1,6 +1,6 @@ - + 2147483647 @@ -11,7 +11,7 @@ False 6 - Edit Setting + Edit Setting False dialog diff --git a/sc/uiconfig/scalc/ui/leftfooterdialog.ui b/sc/uiconfig/scalc/ui/leftfooterdialog.ui index f8c31d2e9095..8ac633186472 100644 --- a/sc/uiconfig/scalc/ui/leftfooterdialog.ui +++ b/sc/uiconfig/scalc/ui/leftfooterdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Footer (left) + Footer (left) False dialog @@ -97,7 +97,7 @@ True False - Footer (left) + Footer (left) False diff --git a/sc/uiconfig/scalc/ui/leftheaderdialog.ui b/sc/uiconfig/scalc/ui/leftheaderdialog.ui index 4d6a7c544fbd..95b591d2155b 100644 --- a/sc/uiconfig/scalc/ui/leftheaderdialog.ui +++ b/sc/uiconfig/scalc/ui/leftheaderdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Header (left) + Header (left) False dialog @@ -97,7 +97,7 @@ True False - Header (left) + Header (left) False diff --git a/sc/uiconfig/scalc/ui/managenamesdialog.ui b/sc/uiconfig/scalc/ui/managenamesdialog.ui index e4b2a8e42651..058918e7efa5 100644 --- a/sc/uiconfig/scalc/ui/managenamesdialog.ui +++ b/sc/uiconfig/scalc/ui/managenamesdialog.ui @@ -1,13 +1,13 @@ - + False 6 - Manage Names + Manage Names dialog @@ -112,7 +112,7 @@ True False start - Select cells in the document to update the range. + Select cells in the document to update the range. False @@ -133,7 +133,7 @@ False start 0 - Name: + Name: True @@ -147,7 +147,7 @@ False start 0 - Scope: + Scope: True scope @@ -211,7 +211,7 @@ False start 0 - Range or formula expression: + Range or formula expression: True range @@ -258,7 +258,7 @@ True - _Print range + _Print range True True False @@ -273,7 +273,7 @@ - _Filter + _Filter True True False @@ -288,7 +288,7 @@ - Repeat _column + Repeat _column True True False @@ -303,7 +303,7 @@ - Repeat _row + Repeat _row True True False @@ -324,7 +324,7 @@ True False - Range _Options + Range _Options True @@ -392,6 +392,6 @@ - column + column diff --git a/sc/uiconfig/scalc/ui/mergecellsdialog.ui b/sc/uiconfig/scalc/ui/mergecellsdialog.ui index ac45f304def5..8c957dba6f8f 100644 --- a/sc/uiconfig/scalc/ui/mergecellsdialog.ui +++ b/sc/uiconfig/scalc/ui/mergecellsdialog.ui @@ -1,11 +1,11 @@ - + False 6 - Merge Cells + Merge Cells dialog @@ -81,7 +81,7 @@ True False - Some cells are not empty. + Some cells are not empty. 0 @@ -92,7 +92,7 @@ - Move the contents of the hidden cells into the first cell + Move the contents of the hidden cells into the first cell True True False @@ -109,7 +109,7 @@ - Keep the contents of the hidden cells + Keep the contents of the hidden cells True True False @@ -126,7 +126,7 @@ - Empty the contents of the hidden cells + Empty the contents of the hidden cells True True False diff --git a/sc/uiconfig/scalc/ui/movecopysheet.ui b/sc/uiconfig/scalc/ui/movecopysheet.ui index 24ffed59faee..2e1e86b8ada6 100644 --- a/sc/uiconfig/scalc/ui/movecopysheet.ui +++ b/sc/uiconfig/scalc/ui/movecopysheet.ui @@ -1,11 +1,11 @@ - + False 6 - Move/Copy Sheet + Move/Copy Sheet dialog @@ -87,7 +87,7 @@ False - _Move + _Move True True False @@ -106,7 +106,7 @@ - C_opy + C_opy True True False @@ -131,7 +131,7 @@ True False 1 - Action + Action center @@ -181,7 +181,7 @@ False 0 0 - To _document + To _document True toDocument @@ -196,8 +196,8 @@ True False - (current document) - - new document - + (current document) + - new document - @@ -226,7 +226,7 @@ True False 0 - _Insert before + _Insert before True insertBefore:before @@ -276,7 +276,7 @@ True False - Location + Location @@ -345,7 +345,7 @@ start 0 0 - This name is already used. + This name is already used. False @@ -360,7 +360,7 @@ start 0 0 - Name is empty. + Name is empty. False @@ -375,7 +375,7 @@ start 0 0 - Name contains one or more invalid characters. + Name contains one or more invalid characters. False @@ -400,7 +400,7 @@ False 5 2 - New _name + New _name True diff --git a/sc/uiconfig/scalc/ui/movingaveragedialog.ui b/sc/uiconfig/scalc/ui/movingaveragedialog.ui index c16f4aded5c7..39806c4fe14f 100644 --- a/sc/uiconfig/scalc/ui/movingaveragedialog.ui +++ b/sc/uiconfig/scalc/ui/movingaveragedialog.ui @@ -1,6 +1,6 @@ - + @@ -13,7 +13,7 @@ False 6 - Moving Average + Moving Average False dialog @@ -46,7 +46,7 @@ True False 0 - Input range: + Input range: True input-range-edit @@ -85,7 +85,7 @@ True False 0 - Results to: + Results to: True output-range-edit @@ -127,7 +127,7 @@ True False - Data + Data @@ -221,7 +221,7 @@ 12 - Columns + Columns True True False @@ -236,7 +236,7 @@ - Rows + Rows True True False @@ -257,7 +257,7 @@ True False - Grouped by + Grouped by @@ -295,7 +295,7 @@ True False 0 - Interval: + Interval: True @@ -325,7 +325,7 @@ True False - Parameters + Parameters diff --git a/sc/uiconfig/scalc/ui/multipleoperationsdialog.ui b/sc/uiconfig/scalc/ui/multipleoperationsdialog.ui index bb664fe90952..a67e90115b23 100644 --- a/sc/uiconfig/scalc/ui/multipleoperationsdialog.ui +++ b/sc/uiconfig/scalc/ui/multipleoperationsdialog.ui @@ -1,12 +1,12 @@ - + False 6 - Multiple operations + Multiple operations False dialog @@ -39,7 +39,7 @@ True False 0 - _Formulas: + _Formulas: True formulas @@ -53,7 +53,7 @@ True False 0 - _Row input cell: + _Row input cell: True row @@ -67,7 +67,7 @@ True False 0 - _Column input cell: + _Column input cell: True col @@ -156,7 +156,7 @@ True False - Default Settings + Default Settings diff --git a/sc/uiconfig/scalc/ui/namerangesdialog.ui b/sc/uiconfig/scalc/ui/namerangesdialog.ui index 3bdd96ac6a0a..40c2538dacce 100644 --- a/sc/uiconfig/scalc/ui/namerangesdialog.ui +++ b/sc/uiconfig/scalc/ui/namerangesdialog.ui @@ -1,12 +1,12 @@ - + False 6 - Define Label Range + Define Label Range False dialog @@ -144,7 +144,7 @@ 12 - Contains _column labels + Contains _column labels True True False @@ -162,7 +162,7 @@ - Contains _row labels + Contains _row labels True True False @@ -189,7 +189,7 @@ True False 0 - For _data range + For _data range True edassign2 @@ -300,7 +300,7 @@ True False - Range + Range diff --git a/sc/uiconfig/scalc/ui/navigatorpanel.ui b/sc/uiconfig/scalc/ui/navigatorpanel.ui index f17825a123c7..8e9d8733e670 100644 --- a/sc/uiconfig/scalc/ui/navigatorpanel.ui +++ b/sc/uiconfig/scalc/ui/navigatorpanel.ui @@ -1,6 +1,6 @@ - + True @@ -27,7 +27,7 @@ True False start - Column: + Column: True column @@ -41,7 +41,7 @@ True False start - Row: + Row: True row @@ -55,7 +55,7 @@ True True True - Column + Column 1 @@ -67,7 +67,7 @@ True True True - Row + Row 1 @@ -83,7 +83,7 @@ True False - Data Range + Data Range datarange sc/res/na03.png @@ -96,7 +96,7 @@ True False - Start + Start start sc/res/na05.png @@ -109,7 +109,7 @@ True False - End + End end sc/res/na06.png @@ -122,7 +122,7 @@ True False - Contents + Contents contents sc/res/na011.png @@ -135,7 +135,7 @@ True False - Toggle + Toggle toggle sc/res/na010.png @@ -148,7 +148,7 @@ True False - Scenarios + Scenarios scenarios sc/res/na07.png @@ -161,7 +161,7 @@ True False - Drag Mode + Drag Mode dragmode sc/res/na09.png @@ -187,10 +187,10 @@ True False - Document + Document - Active Window + Active Window diff --git a/sc/uiconfig/scalc/ui/nosolutiondialog.ui b/sc/uiconfig/scalc/ui/nosolutiondialog.ui index fefffdd59b59..9a99cb8b5145 100644 --- a/sc/uiconfig/scalc/ui/nosolutiondialog.ui +++ b/sc/uiconfig/scalc/ui/nosolutiondialog.ui @@ -1,11 +1,11 @@ - + False 6 - No Solution + No Solution False dialog @@ -52,7 +52,7 @@ True False True - No solution was found. + No solution was found. 0 diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui index b35d37a82bd7..c37d6ff40d38 100644 --- a/sc/uiconfig/scalc/ui/notebookbar.ui +++ b/sc/uiconfig/scalc/ui/notebookbar.ui @@ -1,6 +1,6 @@ - + @@ -383,7 +383,7 @@ True False - File + File True @@ -460,7 +460,7 @@ False - Clone + Clone True True True @@ -659,7 +659,7 @@ True False True - Specify the borders of the selected cells. + Specify the borders of the selected cells. start .uno:SetBorderStyle toolbutton1 @@ -897,7 +897,7 @@ True False True - Vertical Alignment + Vertical Alignment end True False @@ -1043,7 +1043,7 @@ True False True - Horizontal Alignment + Horizontal Alignment start False @@ -1106,14 +1106,14 @@ True False True - Indent + Indent False True False True - Increase Indent + Increase Indent True .uno:IncrementIndent True @@ -1129,7 +1129,7 @@ True False True - Decrease Indent + Decrease Indent True .uno:DecrementIndent True @@ -1663,7 +1663,7 @@ True False - Home + Home True @@ -3246,7 +3246,7 @@ True False - Image + Image True @@ -5892,7 +5892,7 @@ False True .uno:AnchorMenu - Anchor + Anchor True @@ -6421,7 +6421,7 @@ True False - Frame / OLE + Frame / OLE