summaryrefslogtreecommitdiff
path: root/sfx2/inc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-06-11 20:56:30 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-07-21 08:20:50 +0100
commit00657aef09d854c74fb426a935a3e8b1fc390bb0 (patch)
treefd1a9bb264fe15dcc129498e62060ecd256b1ee7 /sfx2/inc
parentfa987cbb813cfd729fe490f2f1258b7c8d7fb174 (diff)
migrate to boost::gettext
* all .ui files go from <interface> to <interface domain="MODULE"> e.g. vcl * all .src files go away and the english source strings folded into the .hrc as NC_("context", "source string") * ResMgr is dropped in favour of std::locale imbued by boost::locale::generator pointed at matching MODULE .mo files * UIConfig translations are folded into the module .mo, so e.g. UIConfig_cui goes from l10n target to normal one, so the res/lang.zips of UI files go away * translation via Translation::get(hrc-define-key, imbued-std::locale) * python can now be translated with its inbuilt gettext support (we keep the name strings.hrc there to keep finding the .hrc file uniform) so magic numbers can go away there * java and starbasic components can be translated via the pre-existing css.resource.StringResourceWithLocation mechanism * en-US res files go away, their strings are now the .hrc keys in the source code * remaining .res files are replaced by .mo files * in .res/.ui-lang-zip files, the old scheme missing translations of strings results in inserting the english original so something can be found, now the standard fallback of using the english original from the source key is used, so partial translations shrink dramatically in size * extract .hrc strings with hrcex which backs onto xgettext -C --add-comments --keyword=NC_:1c,2 --from-code=UTF-8 --no-wrap * extract .ui strings with uiex which backs onto xgettext --add-comments --no-wrap * qtz for gettext translations is generated at runtime as ascii-ified crc32 of content + "|" + msgid * [API CHANGE] remove deprecated binary .res resouce loader related uno apis com::sun::star::resource::OfficeResourceLoader com::sun::star::resource::XResourceBundleLoader com::sun::star::resource::XResourceBundle when translating strings via uno apis com.sun.star.resource.StringResourceWithLocation can continue to be used Change-Id: Ia2594a2672b7301d9c3421fdf31b6cfe7f3f8d0a
Diffstat (limited to 'sfx2/inc')
-rw-r--r--sfx2/inc/app.hrc94
-rw-r--r--sfx2/inc/dinfdlg.hrc79
-rw-r--r--sfx2/inc/doc.hrc111
-rw-r--r--sfx2/inc/doctempl.hrc (renamed from sfx2/inc/filedlghelper.hrc)24
-rw-r--r--sfx2/inc/pch/precompiled_sfx.hxx4
-rw-r--r--sfx2/inc/strings.hxx8
6 files changed, 105 insertions, 215 deletions
diff --git a/sfx2/inc/app.hrc b/sfx2/inc/app.hrc
deleted file mode 100644
index aa6f54351ab2..000000000000
--- a/sfx2/inc/app.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_SFX2_INC_APP_HRC
-#define INCLUDED_SFX2_INC_APP_HRC
-
-#include <sfx2/sfx.hrc>
-
-#define STR_NO_WEBBROWSER_FOUND (RID_SFX_APP_START+7)
-#define STR_NO_ABS_URI_REF (RID_SFX_APP_START+8)
-
-#define STR_QUITAPP (RID_SFX_APP_START+59)
-
-#define RID_STR_HLPFILENOTEXIST (RID_SFX_APP_START+68)
-
-#define RID_STR_HELP (RID_SFX_APP_START+79)
-
-#define STR_INFO_NOSEARCHRESULTS (RID_SFX_APP_START+106)
-#define STR_INFO_NOSEARCHTEXTFOUND (RID_SFX_APP_START+107)
-
-#define STR_HELP_WINDOW_TITLE (RID_SFX_APP_START+125) // string
-
-#define STR_HELP_BUTTON_INDEX_ON (RID_SFX_APP_START+126)
-#define STR_HELP_BUTTON_START (RID_SFX_APP_START+127)
-#define STR_HELP_BUTTON_PREV (RID_SFX_APP_START+128)
-#define STR_HELP_BUTTON_NEXT (RID_SFX_APP_START+129)
-#define STR_HELP_BUTTON_PRINT (RID_SFX_APP_START+130)
-#define STR_HELP_BUTTON_SOURCEVIEW (RID_SFX_APP_START+131)
-
-#define STR_QUICKSTART_EXIT (RID_SFX_APP_START+134)
-#define STR_QUICKSTART_TIP (RID_SFX_APP_START+135)
-#define STR_QUICKSTART_FILEOPEN (RID_SFX_APP_START+136)
-#define STR_QUICKSTART_FROMTEMPLATE (RID_SFX_APP_START+137)
-#define STR_QUICKSTART_PRELAUNCH (RID_SFX_APP_START+138)
-#define STR_QUICKSTART_LNKNAME (RID_SFX_APP_START+139)
-#define STR_HELP_BUTTON_ADDBOOKMARK (RID_SFX_APP_START+140)
-#define STR_HELP_BUTTON_INDEX_OFF (RID_SFX_APP_START+141)
-#define STR_HELP_BUTTON_SEARCHDIALOG (RID_SFX_APP_START+142)
-#define STR_HELP_MENU_TEXT_SELECTION_MODE (RID_SFX_APP_START+143)
-#define STR_HELP_MENU_TEXT_COPY (RID_SFX_APP_START+144)
-#define STR_QUICKSTART_PRELAUNCH_UNX (RID_SFX_APP_START+146)
-#define STR_QUICKSTART_FILE (RID_SFX_APP_START+147)
-#define STR_QUICKSTART_STARTCENTER (RID_SFX_APP_START+148)
-#define STR_QUICKSTART_RECENTDOC (RID_SFX_APP_START+149)
-
-#define RID_HELP_ONSTARTUP_TEXT (RID_SFX_APP_START+145)
-
-#define RID_SECURITY_WARNING_TITLE (RID_SFX_APP_START + 181)
-
-#define RID_SVXSTR_XMLSEC_QUERY_LOSINGSIGNATURE (RID_SFX_APP_START + 186)
-#define RID_SVXSTR_XMLSEC_QUERY_SAVEBEFORESIGN (RID_SFX_APP_START + 187)
-#define STR_QUERY_CANCELCHECKOUT (RID_SFX_APP_START + 188)
-
-#define STR_INFO_WRONGDOCFORMAT (RID_SFX_APP_START + 190)
-
-#define STR_QUERY_UPDATE_LINKS (RID_SFX_APP_START + 192)
-#define STR_DDE_ERROR (RID_SFX_APP_START + 193)
-#define STR_SECURITY_WARNING_NO_HYPERLINKS (RID_SFX_APP_START + 194)
-
-#define RID_SVXSTR_FILELINK (RID_SFX_APP_START + 195)
-#define RID_SVXSTR_GRAFIKLINK (RID_SFX_APP_START + 196)
-#define RID_SVXSTR_EDITGRFLINK (RID_SFX_APP_START + 197)
-
-// strings for error messages of OpenGraphics dialog
-#define RID_SVXSTR_GRFILTER_OPENERROR (RID_SFX_APP_START + 198)
-#define RID_SVXSTR_GRFILTER_IOERROR (RID_SFX_APP_START + 199)
-#define RID_SVXSTR_GRFILTER_FORMATERROR (RID_SFX_APP_START + 200)
-#define RID_SVXSTR_GRFILTER_VERSIONERROR (RID_SFX_APP_START + 201)
-#define RID_SVXSTR_GRFILTER_FILTERERROR (RID_SFX_APP_START + 202)
-
-#define RID_SVXSTR_END_REDLINING_WARNING (RID_SFX_APP_START + 212)
-#define RID_SVXSTR_INCORRECT_PASSWORD (RID_SFX_APP_START + 213)
-
-
-#endif // #ifndef _SFX_APP_HRC
-
-// ******************************************************************* EOF
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/dinfdlg.hrc b/sfx2/inc/dinfdlg.hrc
new file mode 100644
index 000000000000..69447b1833c9
--- /dev/null
+++ b/sfx2/inc/dinfdlg.hrc
@@ -0,0 +1,79 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this 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_DINFDLG_HRC
+#define INCLUDED_SFX2_INC_DINFDLG_HRC
+
+#define NC_(Context, String) (Context "\004" u8##String)
+
+const char* SFX_CB_PROPERTY_STRINGARRAY[] =
+{
+ NC_("SFX_CB_PROPERTY_STRINGARRAY", "Checked by"),
+ NC_("SFX_CB_PROPERTY_STRINGARRAY", "Client"),
+ NC_("SFX_CB_PROPERTY_STRINGARRAY", "Date completed"),
+ NC_("SFX_CB_PROPERTY_STRINGARRAY", "Department"),
+ NC_("SFX_CB_PROPERTY_STRINGARRAY", "Destinations"),
+ NC_("SFX_CB_PROPERTY_STRINGARRAY", "Disposition"),
+ NC_("SFX_CB_PROPERTY_STRINGARRAY", "Division"),
+ NC_("SFX_CB_PROPERTY_STRINGARRAY", "Document number"),
+ NC_("SFX_CB_PROPERTY_STRINGARRAY", "Editor"),
+ NC_("SFX_CB_PROPERTY_STRINGARRAY", "E-Mail"),
+ NC_("SFX_CB_PROPERTY_STRINGARRAY", "Forward to"),
+ NC_("SFX_CB_PROPERTY_STRINGARRAY", "Group"),
+ NC_("SFX_CB_PROPERTY_STRINGARRAY", "Info"),
+ NC_("SFX_CB_PROPERTY_STRINGARRAY", "Language"),
+ NC_("SFX_CB_PROPERTY_STRINGARRAY", "Mailstop"),
+ NC_("SFX_CB_PROPERTY_STRINGARRAY", "Matter"),
+ NC_("SFX_CB_PROPERTY_STRINGARRAY", "Office"),
+ NC_("SFX_CB_PROPERTY_STRINGARRAY", "Owner"),
+ NC_("SFX_CB_PROPERTY_STRINGARRAY", "Project"),
+ NC_("SFX_CB_PROPERTY_STRINGARRAY", "Publisher"),
+ NC_("SFX_CB_PROPERTY_STRINGARRAY", "Purpose"),
+ NC_("SFX_CB_PROPERTY_STRINGARRAY", "Received from"),
+ NC_("SFX_CB_PROPERTY_STRINGARRAY", "Recorded by"),
+ NC_("SFX_CB_PROPERTY_STRINGARRAY", "Recorded date"),
+ NC_("SFX_CB_PROPERTY_STRINGARRAY", "Reference"),
+ NC_("SFX_CB_PROPERTY_STRINGARRAY", "Source"),
+ NC_("SFX_CB_PROPERTY_STRINGARRAY", "Status"),
+ NC_("SFX_CB_PROPERTY_STRINGARRAY", "Telephone number"),
+ NC_("SFX_CB_PROPERTY_STRINGARRAY", "Typist"),
+ NC_("SFX_CB_PROPERTY_STRINGARRAY", "URL")
+};
+
+#define CUSTOM_TYPE_UNKNOWN 0
+#define CUSTOM_TYPE_TEXT 1
+#define CUSTOM_TYPE_NUMBER 2
+#define CUSTOM_TYPE_DATE 3
+#define CUSTOM_TYPE_BOOLEAN 4
+#define CUSTOM_TYPE_DURATION 5
+#define CUSTOM_TYPE_DATETIME 6
+
+const std::pair<const char*, int> SFX_LB_PROPERTY_STRINGARRAY[] =
+{
+ { NC_("SFX_CB_PROPERTY_STRINGARRAY", "Text") , CUSTOM_TYPE_TEXT },
+ { NC_("SFX_CB_PROPERTY_STRINGARRAY", "DateTime") , CUSTOM_TYPE_DATETIME },
+ { NC_("SFX_CB_PROPERTY_STRINGARRAY", "Date") , CUSTOM_TYPE_DATE },
+ { NC_("SFX_CB_PROPERTY_STRINGARRAY", "Duration") , CUSTOM_TYPE_DURATION },
+ { NC_("SFX_CB_PROPERTY_STRINGARRAY", "Number") , CUSTOM_TYPE_NUMBER },
+ { NC_("SFX_CB_PROPERTY_STRINGARRAY", "Yes or no") , CUSTOM_TYPE_BOOLEAN }
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/doc.hrc b/sfx2/inc/doc.hrc
deleted file mode 100644
index 959e5b23e71f..000000000000
--- a/sfx2/inc/doc.hrc
+++ /dev/null
@@ -1,111 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this 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_SOURCE_DOC_DOC_HRC
-#define INCLUDED_SFX2_SOURCE_DOC_DOC_HRC
-
-#include <sfx2/sfx.hrc>
-
-// #defines *****************************************************************
-
-#define RID_SFX_DOC_END (RID_SFX_DIALOG_START-1)
-
-#define STR_NODEFPRINTER (RID_SFX_DOC_START+ 0)
-#define STR_ERROR_PRINTER_BUSY (RID_SFX_DOC_START+ 1)
-#define STR_NOSTARTPRINTER (RID_SFX_DOC_START+ 2)
-
-#define STR_TEMPLATE_FILTER (RID_SFX_DOC_START+ 28)
-
-#define STR_SAVEDOC (RID_SFX_DOC_START+ 45)
-#define STR_SAVEASDOC (RID_SFX_DOC_START+ 47)
-
-#define STR_CLOSEDOC (RID_SFX_DOC_START+ 49)
-#define STR_SAVEACOPY (RID_SFX_DOC_START+ 55)
-
-#define STR_AUTOMATICVERSION (RID_SFX_DOC_START+ 68)
-
-#define TEMPLATE_LONG_NAMES_ARY (RID_SFX_DOC_START+ 81)
-#define TEMPLATE_SHORT_NAMES_ARY (RID_SFX_DOC_START+ 82)
-#define RID_CNT_STR_WAITING (RID_SFX_DOC_START+ 83)
-
-#define STR_EXPORTBUTTON (RID_SFX_DOC_START+93)
-
-#define STR_LABEL_FILEFORMAT (RID_SFX_DOC_START+96)
-
-#define STR_HIDDENINFO_CONTAINS (RID_SFX_DOC_START+110)
-#define STR_HIDDENINFO_RECORDCHANGES (RID_SFX_DOC_START+111)
-#define STR_HIDDENINFO_NOTES (RID_SFX_DOC_START+112)
-#define STR_HIDDENINFO_DOCVERSIONS (RID_SFX_DOC_START+113)
-#define STR_HIDDENINFO_CONTINUE_SAVING (RID_SFX_DOC_START+116)
-#define STR_HIDDENINFO_CONTINUE_PRINTING (RID_SFX_DOC_START+117)
-#define STR_HIDDENINFO_CONTINUE_SIGNING (RID_SFX_DOC_START+118)
-#define STR_HIDDENINFO_CONTINUE_CREATEPDF (RID_SFX_DOC_START+119)
-
-#define STR_NEW_FILENAME_SAVE (RID_SFX_DOC_START+121)
-
-#define STR_XMLSEC_QUERY_SAVESIGNEDBEFORESIGN (RID_SFX_DOC_START+125)
-#define STR_XMLSEC_ODF12_EXPECTED (RID_SFX_DOC_START+126)
-
-#define STR_QRYTEMPL_MESSAGE (RID_SFX_DOC_START+127)
-#define STR_QRYTEMPL_UPDATE_BTN (RID_SFX_DOC_START+128)
-#define STR_QRYTEMPL_KEEP_BTN (RID_SFX_DOC_START+129)
-
-#define STR_ACTION_REFRESH (RID_SFX_DOC_START+131)
-#define STR_ACTION_DEFAULT (RID_SFX_DOC_START+132)
-#define STR_INPUT_NEW (RID_SFX_DOC_START+134)
-#define STR_MSG_ERROR_LOCAL_MOVE (RID_SFX_DOC_START+137)
-#define STR_MSG_ERROR_EXPORT (RID_SFX_DOC_START+139)
-#define STR_MSG_ERROR_IMPORT (RID_SFX_DOC_START+140)
-#define STR_MSG_ERROR_DELETE_TEMPLATE (RID_SFX_DOC_START+141)
-#define STR_MSG_ERROR_DELETE_FOLDER (RID_SFX_DOC_START+142)
-#define STR_QMSG_SEL_FOLDER_DELETE (RID_SFX_DOC_START+146)
-#define STR_QMSG_TEMPLATE_OVERWRITE (RID_SFX_DOC_START+147)
-#define STR_QMSG_SEL_TEMPLATE_DELETE (RID_SFX_DOC_START+148)
-
-#define STR_OPEN (RID_SFX_DOC_START+151)
-#define STR_EDIT_TEMPLATE (RID_SFX_DOC_START+152)
-#define STR_DEFAULT_TEMPLATE (RID_SFX_DOC_START+153)
-#define STR_RENAME (RID_SFX_DOC_START+154)
-#define STR_DELETE (RID_SFX_DOC_START+155)
-#define STR_RENAME_TEMPLATE (RID_SFX_DOC_START+157)
-
-#define STR_CATEGORY_NEW (RID_SFX_DOC_START+158)
-#define STR_CATEGORY_SELECT (RID_SFX_DOC_START+100)
-#define STR_CATEGORY_DELETE (RID_SFX_DOC_START+101)
-#define STR_CREATE_ERROR (RID_SFX_DOC_START+103)
-#define STR_ERROR_SAVEAS (RID_SFX_DOC_START+105)
-#define STR_CATEGORY_RENAME (RID_SFX_DOC_START+109)
-#define STR_TEMPLATE_SELECTION (RID_SFX_DOC_START+120)
-#define STR_RESET_DEFAULT (RID_SFX_DOC_START+122)
-#define STR_TEMPLATE_TOOLTIP (RID_SFX_DOC_START+169)
-#define STR_MSG_EXPORT_SUCCESS (RID_SFX_DOC_START+170)
-#define STR_MSG_QUERY_COPY (RID_SFX_DOC_START+171)
-
-#define STR_QMSG_ERROR_OPENING_FILE (RID_SFX_DOC_START+180)
-#define STR_QMSG_ERROR_OPENING_FILE_DETAILS (RID_SFX_DOC_START+181)
-#define STR_QMSG_ERROR_OPENING_FILE_CONTINUE (RID_SFX_DOC_START+182)
-
-// please update to the last id
-#define ACT_SFX_DOC_END STR_QMSG_ERROR_OPENING_FILE_CONTINUE
-#if ACT_SFX_DOC_END > RID_SFX_DOC_END
-#error resource overflow in #line, #file
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/filedlghelper.hrc b/sfx2/inc/doctempl.hrc
index 86cf4d56eecd..f897a187759e 100644
--- a/sfx2/inc/filedlghelper.hrc
+++ b/sfx2/inc/doctempl.hrc
@@ -17,14 +17,26 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SFX2_INC_FILEDLGHELPER_HRC
-#define INCLUDED_SFX2_INC_FILEDLGHELPER_HRC
+#ifndef INCLUDED_SFX2_INC_DOCTEMPL_HRC
+#define INCLUDED_SFX2_INC_DOCTEMPL_HRC
-#include <sfx2/sfx.hrc>
+#define NC_(Context, String) (Context "\004" u8##String)
-#define STR_PB_SAVEACOPY (RID_SFX_EXPLORER_START + 65)
-#define STR_PB_COMPAREDOC (RID_SFX_EXPLORER_START + 66)
-#define STR_PB_MERGEDOC (RID_SFX_EXPLORER_START + 67)
+const char* TEMPLATE_LONG_NAMES_ARY[] =
+{
+ NC_("TEMPLATE_LONG_NAMES_ARY", "My Templates"),
+ NC_("TEMPLATE_LONG_NAMES_ARY", "Business Correspondence"),
+ NC_("TEMPLATE_LONG_NAMES_ARY", "Other Business Documents"),
+ NC_("TEMPLATE_LONG_NAMES_ARY", "Personal Correspondence and Documents"),
+ NC_("TEMPLATE_LONG_NAMES_ARY", "Forms and Contracts"),
+ NC_("TEMPLATE_LONG_NAMES_ARY", "Finances"),
+ NC_("TEMPLATE_LONG_NAMES_ARY", "Education"),
+ NC_("TEMPLATE_LONG_NAMES_ARY", "Presentation Backgrounds"),
+ NC_("TEMPLATE_LONG_NAMES_ARY", "Presentations"),
+ NC_("TEMPLATE_LONG_NAMES_ARY", "Miscellaneous"),
+ NC_("TEMPLATE_LONG_NAMES_ARY", "Labels"),
+ NC_("TEMPLATE_LONG_NAMES_ARY", "Styles")
+};
#endif
diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx
index 7a3e57ac264d..e381e7370484 100644
--- a/sfx2/inc/pch/precompiled_sfx.hxx
+++ b/sfx2/inc/pch/precompiled_sfx.hxx
@@ -348,7 +348,6 @@
#include <i18nlangtag/languagetag.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <officecfg/Office/Common.hxx>
-#include <rsc/rscsfx.hxx>
#include <sax/tools/converter.hxx>
#include <sot/exchange.hxx>
#include <sot/formats.hxx>
@@ -403,9 +402,7 @@
#include <tools/globname.hxx>
#include <tools/link.hxx>
#include <tools/poly.hxx>
-#include <tools/rcid.h>
#include <tools/ref.hxx>
-#include <tools/resid.hxx>
#include <tools/resmgr.hxx>
#include <tools/solar.h>
#include <tools/stream.hxx>
@@ -445,7 +442,6 @@
#include <sfx2/bindings.hxx>
#include <sfx2/childwin.hxx>
#include <sfx2/ctrlitem.hxx>
-#include <sfx2/dinfdlg.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/dllapi.h>
#include <sfx2/docfac.hxx>
diff --git a/sfx2/inc/strings.hxx b/sfx2/inc/strings.hxx
index bd024c27ed90..9fb8ccf070fe 100644
--- a/sfx2/inc/strings.hxx
+++ b/sfx2/inc/strings.hxx
@@ -24,6 +24,14 @@
#define STR_TEMPLATE_NAME9_DEF "Sunset"
#define STR_TEMPLATE_NAME10_DEF "Vintage"
+#define SFX_ST_EDIT "..."
+
+#define CMIS_TYPE_STRING "String"
+#define CMIS_TYPE_INTEGER "Integer"
+#define CMIS_TYPE_DECIMAL "Decimal"
+#define CMIS_TYPE_DATETIME "Datetime"
+#define CMIS_TYPE_BOOL "Bool"
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */