tdf#39674 Translate German variable names

Titel -> Title
Thema -> Subject

In "strings.hrc", translated the defines, but kept the their NC_(...)
translation references to prevent a need to update translations.

Change-Id: Ie8b4a94376495d5e148bc50dcc9902e805deff0d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90156
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>

10 files changed, 13 insertions, 13 deletions

diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx
index 063c37df58c4..91764214c133 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -435,8 +435,8 @@ static const char* STR_POOLCOLL_REGISTER_ARY[] =
 static const char* STR_POOLCOLL_DOC_ARY[] =
 {
     // Category Chapter/Document
-    STR_POOLCOLL_DOC_TITEL,
-    STR_POOLCOLL_DOC_SUBTITEL,
+    STR_POOLCOLL_DOC_TITLE,
+    STR_POOLCOLL_DOC_SUBTITLE,
     STR_POOLCOLL_DOC_APPENDIX
 };
 
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 13394c76cb64..4faf7c3bd74a 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -865,7 +865,7 @@ OUString SwDocInfoFieldType::Expand( sal_uInt16 nSub, sal_uInt32 nFormat,
     switch(nSub)
     {
     case DI_TITLE:  aStr = xDocProps->getTitle();       break;
-    case DI_THEMA:  aStr = xDocProps->getSubject();     break;
+    case DI_SUBJECT:aStr = xDocProps->getSubject();     break;
     case DI_KEYS:   aStr = ::comphelper::string::convertCommaSeparated(
                                 xDocProps->getKeywords());
                     break;
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index 064d86e78a8b..5460099da890 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -109,7 +109,7 @@ static const sal_uInt16 aDocInfoSubTypeFromService[] =
     DI_PRINT | DI_SUB_AUTHOR,   //PROPERTY_MAP_FLDTYP_DOCINFO_PRINT_AUTHOR
     DI_PRINT | DI_SUB_DATE,     //PROPERTY_MAP_FLDTYP_DOCINFO_PRINT_DATE_TIME
     DI_KEYS,                    //PROPERTY_MAP_FLDTYP_DOCINFO_KEY_WORDS
-    DI_THEMA,                   //PROPERTY_MAP_FLDTYP_DOCINFO_SUBJECT
+    DI_SUBJECT,                 //PROPERTY_MAP_FLDTYP_DOCINFO_SUBJECT
     DI_TITLE,                   //PROPERTY_MAP_FLDTYP_DOCINFO_TITLE
     DI_DOCNO                    //PROPERTY_MAP_FLDTYP_DOCINFO_REVISION
 };
@@ -226,7 +226,7 @@ static SwServiceType lcl_GetServiceForField( const SwField& rField )
             case DI_EDIT:   nSrvId = SwServiceType::FieldTypeDocInfoEditTime;break;
             case DI_COMMENT:nSrvId = SwServiceType::FieldTypeDocInfoDescription;break;
             case DI_KEYS:   nSrvId = SwServiceType::FieldTypeDocInfoKeywords;break;
-            case DI_THEMA:  nSrvId = SwServiceType::FieldTypeDocInfoSubject;  break;
+            case DI_SUBJECT:nSrvId = SwServiceType::FieldTypeDocInfoSubject;  break;
             case DI_TITLE:  nSrvId = SwServiceType::FieldTypeDocInfoTitle;    break;
             case DI_DOCNO:  nSrvId = SwServiceType::FieldTypeDocInfoRevision; break;
             case DI_CUSTOM: nSrvId = SwServiceType::FieldTypeDocInfoCustom;   break;
diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx
index 2d8a71082cee..24786c5e8f56 100644
--- a/sw/source/filter/html/htmlfld.cxx
+++ b/sw/source/filter/html/htmlfld.cxx
@@ -153,7 +153,7 @@ static HTMLOptionEnum<SwPageNumSubType> const aHTMLPageNumFieldSubTable[] =
 static HTMLOptionEnum<sal_uInt16> const aHTMLDocInfoFieldSubTable[] =
 {
     { OOO_STRING_SW_HTML_FS_title,   DI_TITLE },
-    { OOO_STRING_SW_HTML_FS_theme,   DI_THEMA },
+    { OOO_STRING_SW_HTML_FS_theme,   DI_SUBJECT },
     { OOO_STRING_SW_HTML_FS_keys,    DI_KEYS },
     { OOO_STRING_SW_HTML_FS_comment, DI_COMMENT },
     { "INFO1",                       DI_INFO1 },
diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx
index 67d79cc28c04..825d563a9f39 100644
--- a/sw/source/filter/html/htmlfldw.cxx
+++ b/sw/source/filter/html/htmlfldw.cxx
@@ -170,7 +170,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pField,
                 switch( nSubType )
                 {
                     case DI_TITLE:      pSubStr = OOO_STRING_SW_HTML_FS_title;  break;
-                    case DI_THEMA:      pSubStr = OOO_STRING_SW_HTML_FS_theme;  break;
+                    case DI_SUBJECT:    pSubStr = OOO_STRING_SW_HTML_FS_theme;  break;
                     case DI_KEYS:       pSubStr = OOO_STRING_SW_HTML_FS_keys;   break;
                     case DI_COMMENT:    pSubStr = OOO_STRING_SW_HTML_FS_comment; break;
                     case DI_CREATE:     pSubStr = OOO_STRING_SW_HTML_FS_create;     break;
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 61080c928881..de0dbd2a3ed1 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -2857,7 +2857,7 @@ void AttributeOutputBase::TextField( const SwFormatField& rField )
                 case DI_TITLE:
                     eField = ww::eTITLE;
                     break;
-                case DI_THEMA:
+                case DI_SUBJECT:
                     eField = ww::eSUBJECT;
                     break;
                 case DI_KEYS:
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 5387db91479d..b8cdf1c27671 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -1657,7 +1657,7 @@ eF_ResT SwWW8ImplReader::Read_F_DocInfo( WW8FieldDesc* pF, OUString& rStr )
             nSub = DI_TITLE;
             break;
         case 16:
-            nSub = DI_THEMA;
+            nSub = DI_SUBJECT;
             break;
         case 18:
             nSub = DI_KEYS;
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index 05246a423f20..a1145acb05a5 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -160,7 +160,7 @@ void SwFieldDokInfPage::Reset(const SfxItemSet* )
             }
             else
             {
-                if (!(IsFieldDlgHtmlMode() && (i == DI_EDIT || i == DI_THEMA || i == DI_PRINT)))
+                if (!(IsFieldDlgHtmlMode() && (i == DI_EDIT || i == DI_SUBJECT || i == DI_PRINT)))
                 {
                     m_xTypeTLB->insert(nullptr, -1, &aLst[i], &sId,
                                        nullptr, nullptr, nullptr, false, xEntry.get());
diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx
index 0a2ef5d50054..929b731e6856 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -625,7 +625,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
                 goto FIELD_INSERT;
             case FN_INSERT_FLD_TOPIC   :
                 nInsertType = SwFieldTypesEnum::DocumentInfo;
-                nInsertSubType = DI_THEMA;
+                nInsertSubType = DI_SUBJECT;
                 goto FIELD_INSERT;
             case FN_INSERT_FLD_TITLE   :
                 nInsertType = SwFieldTypesEnum::DocumentInfo;
diff --git a/sw/source/uibase/utlui/initui.cxx b/sw/source/uibase/utlui/initui.cxx
index be6c92e29a93..f9567ec4ab45 100644
--- a/sw/source/uibase/utlui/initui.cxx
+++ b/sw/source/uibase/utlui/initui.cxx
@@ -91,8 +91,8 @@ void InitUI()
 
 static const char* FLD_DOCINFO_ARY[] =
 {
-    FLD_DOCINFO_TITEL,
-    FLD_DOCINFO_THEMA,
+    FLD_DOCINFO_TITLE,
+    FLD_DOCINFO_SUBJECT,
     FLD_DOCINFO_KEYS,
     FLD_DOCINFO_COMMENT,
     FLD_DOCINFO_CREATE,