From c46dfb8ba633ae79e8dfbedaaa7d4b5e406623f7 Mon Sep 17 00:00:00 2001 From: Andrea Gelmini Date: Sun, 23 Sep 2018 00:09:51 +0200 Subject: Fix DI_TITEL -> DI_TITLE It passed "make check" on Linux. Change-Id: I3239622286c07914f88727ffdbb0be8d2ca724ea Reviewed-on: https://gerrit.libreoffice.org/61084 Tested-by: Jenkins Reviewed-by: Julien Nabet --- sw/inc/docufld.hxx | 2 +- sw/source/core/fields/docufld.cxx | 2 +- sw/source/core/unocore/unofield.cxx | 4 ++-- sw/source/filter/html/htmlfld.cxx | 2 +- sw/source/filter/html/htmlfldw.cxx | 2 +- sw/source/filter/ww8/ww8atr.cxx | 2 +- sw/source/filter/ww8/ww8par5.cxx | 2 +- sw/source/uibase/shells/textfld.cxx | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) (limited to 'sw') diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index 5a6545f712b6..043e55d1e5c0 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -62,7 +62,7 @@ namespace nsSwDocInfoSubType in filter/html/htmlfld.cxx, so make sure that DI_SUBTYPE_END really is the end, and is at least 4 less than DI_SUB_*! */ const SwDocInfoSubType DI_SUBTYPE_BEGIN = 0; - const SwDocInfoSubType DI_TITEL = DI_SUBTYPE_BEGIN; + const SwDocInfoSubType DI_TITLE = DI_SUBTYPE_BEGIN; const SwDocInfoSubType DI_THEMA = 1; const SwDocInfoSubType DI_KEYS = 2; const SwDocInfoSubType DI_COMMENT = 3; diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index 19a5c71bab24..0281c74a41bd 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -876,7 +876,7 @@ OUString SwDocInfoFieldType::Expand( sal_uInt16 nSub, sal_uInt32 nFormat, OUString aStr; switch(nSub) { - case DI_TITEL: aStr = xDocProps->getTitle(); break; + case DI_TITLE: aStr = xDocProps->getTitle(); break; case DI_THEMA: aStr = xDocProps->getSubject(); break; case DI_KEYS: aStr = ::comphelper::string::convertCommaSeparated( xDocProps->getKeywords()); diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index b6335a7b6a36..dbebe8c4aaa7 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -125,7 +125,7 @@ static const sal_uInt16 aDocInfoSubTypeFromService[] = 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_TITEL, //PROPERTY_MAP_FLDTYP_DOCINFO_TITLE + DI_TITLE, //PROPERTY_MAP_FLDTYP_DOCINFO_TITLE DI_DOCNO //PROPERTY_MAP_FLDTYP_DOCINFO_REVISION }; @@ -238,7 +238,7 @@ static SwServiceType lcl_GetServiceForField( const SwField& rField ) case DI_COMMENT:nSrvId = SwServiceType::FieldTypeDocInfoDescription;break; case DI_KEYS: nSrvId = SwServiceType::FieldTypeDocInfoKeywords;break; case DI_THEMA: nSrvId = SwServiceType::FieldTypeDocInfoSubject; break; - case DI_TITEL: nSrvId = SwServiceType::FieldTypeDocInfoTitle; 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 53a7b1b435ab..c05dfc8bce74 100644 --- a/sw/source/filter/html/htmlfld.cxx +++ b/sw/source/filter/html/htmlfld.cxx @@ -147,7 +147,7 @@ static HTMLOptionEnum aHTMLPageNumFieldSubTable[] = static HTMLOptionEnum aHTMLDocInfoFieldSubTable[] = { - { OOO_STRING_SW_HTML_FS_title, DI_TITEL }, + { OOO_STRING_SW_HTML_FS_title, DI_TITLE }, { OOO_STRING_SW_HTML_FS_theme, DI_THEMA }, { OOO_STRING_SW_HTML_FS_keys, DI_KEYS }, { OOO_STRING_SW_HTML_FS_comment, DI_COMMENT }, diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx index dd8bd381f762..e9ee2209e15d 100644 --- a/sw/source/filter/html/htmlfldw.cxx +++ b/sw/source/filter/html/htmlfldw.cxx @@ -167,7 +167,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pField, switch( nSubType ) { - case DI_TITEL: pSubStr = OOO_STRING_SW_HTML_FS_title; break; + case DI_TITLE: pSubStr = OOO_STRING_SW_HTML_FS_title; break; case DI_THEMA: 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; diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 393bae52f49f..a93b849797ea 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -2851,7 +2851,7 @@ void AttributeOutputBase::TextField( const SwFormatField& rField ) ww::eField eField(ww::eNONE); switch (0xff & nSubType) { - case DI_TITEL: + case DI_TITLE: eField = ww::eTITLE; break; case DI_THEMA: diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index b265592e42de..c72bc4811ec3 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -1623,7 +1623,7 @@ eF_ResT SwWW8ImplReader::Read_F_DocInfo( WW8FieldDesc* pF, OUString& rStr ) nSub = DI_KEYS; break; case 15: - nSub = DI_TITEL; + nSub = DI_TITLE; break; case 16: nSub = DI_THEMA; diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx index a33b9a8b10fe..d0861d7ab6ae 100644 --- a/sw/source/uibase/shells/textfld.cxx +++ b/sw/source/uibase/shells/textfld.cxx @@ -696,7 +696,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) goto FIELD_INSERT; case FN_INSERT_FLD_TITLE : nInsertType = TYP_DOCINFOFLD; - nInsertSubType = DI_TITEL; + nInsertSubType = DI_TITLE; goto FIELD_INSERT; case FN_INSERT_FLD_AUTHOR : nInsertType = TYP_DOCINFOFLD; -- cgit