diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-08-10 10:57:27 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-08-10 10:57:27 +0000 |
| commit | 068074b37ec80c1dd4060a9bd6758ca9ac8b1c81 (patch) | |
| tree | 9b58b6bdfae152028f57f71aa6a496e4f0c8339a /editors/openoffice-1.0/files | |
| parent | Changed the installation directory of the Sun JDK 1.4.x (diff) | |
Check in two cases if a string is NULL. Fixes WITH_DEBUG=
installation.
Notes
Notes:
svn path=/head/; revision=64328
Diffstat (limited to 'editors/openoffice-1.0/files')
| -rw-r--r-- | editors/openoffice-1.0/files/patch-tools+source+string+tstring.cxx | 22 | ||||
| -rw-r--r-- | editors/openoffice-1.0/files/patch-tools::source::string::tstring.cxx | 22 |
2 files changed, 44 insertions, 0 deletions
diff --git a/editors/openoffice-1.0/files/patch-tools+source+string+tstring.cxx b/editors/openoffice-1.0/files/patch-tools+source+string+tstring.cxx new file mode 100644 index 000000000000..12bd6bd0b244 --- /dev/null +++ b/editors/openoffice-1.0/files/patch-tools+source+string+tstring.cxx @@ -0,0 +1,22 @@ +--- ../tools/source/string/tstring.cxx.orig Sat Aug 10 12:53:42 2002 ++++ ../tools/source/string/tstring.cxx Sat Aug 10 12:54:16 2002 +@@ -103,6 +103,9 @@ + xub_StrLen ImplStringLen( const sal_Char* pStr ) + { + const sal_Char* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); +@@ -113,6 +116,9 @@ + xub_StrLen ImplStringLen( const sal_Unicode* pStr ) + { + const sal_Unicode* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); diff --git a/editors/openoffice-1.0/files/patch-tools::source::string::tstring.cxx b/editors/openoffice-1.0/files/patch-tools::source::string::tstring.cxx new file mode 100644 index 000000000000..12bd6bd0b244 --- /dev/null +++ b/editors/openoffice-1.0/files/patch-tools::source::string::tstring.cxx @@ -0,0 +1,22 @@ +--- ../tools/source/string/tstring.cxx.orig Sat Aug 10 12:53:42 2002 ++++ ../tools/source/string/tstring.cxx Sat Aug 10 12:54:16 2002 +@@ -103,6 +103,9 @@ + xub_StrLen ImplStringLen( const sal_Char* pStr ) + { + const sal_Char* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); +@@ -113,6 +116,9 @@ + xub_StrLen ImplStringLen( const sal_Unicode* pStr ) + { + const sal_Unicode* pTempStr = pStr; ++ ++ if (pStr == NULL) ++ return(0); + while( *pTempStr ) + pTempStr++; + return (xub_StrLen)(pTempStr-pStr); |