diff options
author | Michael Stahl <mstahl@redhat.com> | 2013-03-25 16:28:21 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-03-25 16:29:08 +0100 |
commit | d4244efeb171632f309c8cfcbea4fbe2a3de3193 (patch) | |
tree | e6cdec349d373a5eb2b53211b9865d44313126cd | |
parent | remove that silly SfxInternetPage already (diff) | |
download | core-d4244efeb171632f309c8cfcbea4fbe2a3de3193.tar.gz core-d4244efeb171632f309c8cfcbea4fbe2a3de3193.zip |
libexttextcat: fix spelling of _TEXTCAT_RESULT_UNKOWN
and remove the _ prefix too while at it
Change-Id: I30ee8cd5aead53abac19fdc372e1fe45b3cbf55f
-rw-r--r-- | libexttextcat/UnpackedTarball_exttextcat.mk | 1 | ||||
-rw-r--r-- | libexttextcat/unkown.patch.1 | 30 | ||||
-rw-r--r-- | lingucomponent/source/languageguessing/guess.cxx | 4 |
3 files changed, 33 insertions, 2 deletions
diff --git a/libexttextcat/UnpackedTarball_exttextcat.mk b/libexttextcat/UnpackedTarball_exttextcat.mk index ef90108f2913..c6fa03cca3f6 100644 --- a/libexttextcat/UnpackedTarball_exttextcat.mk +++ b/libexttextcat/UnpackedTarball_exttextcat.mk @@ -13,6 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,exttextcat,$(LIBEXTTEXTCAT_TARBALL) $(eval $(call gb_UnpackedTarball_add_patches,exttextcat,\ libexttextcat/android.patch \ + libexttextcat/unkown.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/libexttextcat/unkown.patch.1 b/libexttextcat/unkown.patch.1 new file mode 100644 index 000000000000..b57ceeb7e729 --- /dev/null +++ b/libexttextcat/unkown.patch.1 @@ -0,0 +1,30 @@ +diff -ur exttextcat.old/src/textcat.c exttextcat/src/textcat.c +--- exttextcat.old/src/textcat.c 2012-11-01 15:40:35.000000000 +0100 ++++ exttextcat/src/textcat.c 2013-03-25 16:22:57.226896529 +0100 +@@ -274,10 +274,10 @@ + switch (cnt) + { + case TEXTCAT_RESULT_UNKOWN: +- result = _TEXTCAT_RESULT_UNKOWN; ++ result = TEXTCAT_RESULT_UNKNOWN_STR; + break; + case TEXTCAT_RESULT_SHORT: +- result = _TEXTCAT_RESULT_SHORT; ++ result = TEXTCAT_RESULT_SHORT_STR; + break; + default: + { +diff -ur exttextcat.old/src/textcat.h exttextcat/src/textcat.h +--- exttextcat.old/src/textcat.h 2012-01-13 22:04:24.000000000 +0100 ++++ exttextcat/src/textcat.h 2013-03-25 16:22:11.131896925 +0100 +@@ -40,8 +40,8 @@ + #include "common.h" + #include "textcat_properties.h" + +-#define _TEXTCAT_RESULT_UNKOWN "UNKNOWN" +-#define _TEXTCAT_RESULT_SHORT "SHORT" ++#define TEXTCAT_RESULT_UNKNOWN_STR "UNKNOWN" ++#define TEXTCAT_RESULT_SHORT_STR "SHORT" + #define TEXTCAT_RESULT_UNKOWN 0 + #define TEXTCAT_RESULT_SHORT -2 + diff --git a/lingucomponent/source/languageguessing/guess.cxx b/lingucomponent/source/languageguessing/guess.cxx index f107e728885f..4c8ed8e843f3 100644 --- a/lingucomponent/source/languageguessing/guess.cxx +++ b/lingucomponent/source/languageguessing/guess.cxx @@ -57,9 +57,9 @@ Guess::Guess(const char * guess_str) // && // strncmp((const char*)(guess_str + 1), _TEXTCAT_RESULT_SHORT, strlen(_TEXTCAT_RESULT_SHORT)) != 0) // { - if(strcmp((const char*)(guess_str + 1), _TEXTCAT_RESULT_UNKNOWN) != 0 + if(strcmp((const char*)(guess_str + 1), TEXTCAT_RESULT_UNKNOWN_STR) != 0 && - strcmp((const char*)(guess_str + 1), _TEXTCAT_RESULT_SHORT) != 0) + strcmp((const char*)(guess_str + 1), TEXTCAT_RESULT_SHORT_STR) != 0) { int current_pointer = 0; |