diff options
| author | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2013-12-26 14:31:33 +0100 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2013-12-27 07:14:54 +0100 |
| commit | edf7d340eb8d78cb99941cc28e23928d05697b10 (patch) | |
| tree | f71f130ba0ceb5fc7539e92d8af8e6173fd5aaff /l10ntools | |
| parent | 0dbd93b92a694a384b293e0dce87b5acdf12e9e8 (diff) | |
Transex3: remove obsolete HelpText
Used alternative: Text[ x-comment ]
Change-Id: I762bf89c5ed316ec63183e3bedc22cbaac2e8aba
Diffstat (limited to 'l10ntools')
| -rw-r--r-- | l10ntools/inc/export.hxx | 4 | ||||
| -rw-r--r-- | l10ntools/source/export.cxx | 23 | ||||
| -rw-r--r-- | l10ntools/source/merge.cxx | 2 |
3 files changed, 1 insertions, 28 deletions
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx index a160f6ab4fc4..e3a919035490 100644 --- a/l10ntools/inc/export.hxx +++ b/l10ntools/inc/export.hxx @@ -112,7 +112,6 @@ public: sal_Bool bChildWithText; sal_Bool bText; - sal_Bool bHelpText; sal_Bool bQuickHelpText; sal_Bool bTitle; sal_Bool bList; @@ -125,8 +124,6 @@ public: OStringHashMap sText; - OStringHashMap sHelpText; - OStringHashMap sQuickHelpText; OStringHashMap sTitle; @@ -150,7 +147,6 @@ public: #define LIST_ITEM 0x0004 #define LIST_PAIRED 0x0005 #define STRING_TYP_TEXT 0x0010 -#define STRING_TYP_HELPTEXT 0x0020 #define STRING_TYP_QUICKHELPTEXT 0x0040 #define STRING_TYP_TITLE 0x0080 diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx index 5bd5e84d255c..7df459af13fc 100644 --- a/l10ntools/source/export.cxx +++ b/l10ntools/source/export.cxx @@ -646,21 +646,6 @@ int Export::Execute( int nToken, const char * pToken ) pResData->sText[ sLangIndex ] = sText; } } - else if ( sKey == "HELPTEXT" ) { - SetChildWithText(); - pResData->bHelpText = sal_True; - if ( !bMergeMode ) - { - if (!pResData->sHelpText[ sLangIndex ].isEmpty()) - { - OStringBuffer sError("Language "); - sError.append(sLangIndex); - sError.append(" defined twice"); - YYWarning(sError.getStr()); - } - pResData->sHelpText[ sLangIndex ] = sText; - } - } else if ( sKey == "QUICKHELPTEXT" ) { SetChildWithText(); pResData->bQuickHelpText = sal_True; @@ -774,8 +759,6 @@ sal_Bool Export::WriteData( ResData *pResData, sal_Bool bCreateNew ) if (( !pResData->sText[ SOURCE_LANGUAGE ].isEmpty()) || - ( !pResData->sHelpText[ SOURCE_LANGUAGE ].isEmpty()) - || ( !pResData->sQuickHelpText[ SOURCE_LANGUAGE ].isEmpty()) || ( !pResData->sTitle[ SOURCE_LANGUAGE ].isEmpty())) @@ -794,10 +777,7 @@ sal_Bool Export::WriteData( ResData *pResData, sal_Bool bCreateNew ) OString sXTitle; sXText = pResData->sText[ SOURCE_LANGUAGE ]; - if (!pResData->sText[ X_COMMENT ].isEmpty()) - sXHText = pResData->sText[ X_COMMENT ]; - else - sXHText = pResData->sHelpText[ SOURCE_LANGUAGE ]; + sXHText = pResData->sText[ X_COMMENT ]; sXQHText = pResData->sQuickHelpText[ SOURCE_LANGUAGE ]; sXTitle = pResData->sTitle[ SOURCE_LANGUAGE ]; @@ -826,7 +806,6 @@ sal_Bool Export::WriteData( ResData *pResData, sal_Bool bCreateNew ) if ( bCreateNew ) { pResData->sText[ SOURCE_LANGUAGE ] = ""; - pResData->sHelpText[ SOURCE_LANGUAGE ] = ""; pResData->sQuickHelpText[ SOURCE_LANGUAGE ]= ""; pResData->sTitle[ SOURCE_LANGUAGE ] = ""; } diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx index befa5905bb34..0d427d9bd6aa 100644 --- a/l10ntools/source/merge.cxx +++ b/l10ntools/source/merge.cxx @@ -69,7 +69,6 @@ ResData::ResData( const OString &rGId ) bChild( sal_False ), bChildWithText( sal_False ), bText( sal_False ), - bHelpText( sal_False ), bQuickHelpText( sal_False ), bTitle( sal_False ), bList( sal_False ), @@ -89,7 +88,6 @@ ResData::ResData( const OString &rGId, const OString &rFilename) bChild( sal_False ), bChildWithText( sal_False ), bText( sal_False ), - bHelpText( sal_False ), bQuickHelpText( sal_False ), bTitle( sal_False ), bList( sal_False ), |