diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-07-13 14:36:24 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-07-13 14:36:24 +0200 |
| commit | d6fff0796828dab5afb054e7ad3dd8c8c6ed8d52 (patch) | |
| tree | 09721660070414d00cc2f83b19bf29892763c99e /svl/source/misc | |
| parent | 13650e71469d579a91f3de3eefa977e825567b57 (diff) | |
| parent | be588658ea127a6a05390435126f1d739a477b58 (diff) | |
CWS gnumake2: resync to DEV300_m84
Diffstat (limited to 'svl/source/misc')
| -rw-r--r-- | svl/source/misc/inettype.cxx | 21 | ||||
| -rw-r--r-- | svl/source/misc/mediatyp.src | 2 | ||||
| -rw-r--r-- | svl/source/misc/urihelper.cxx | 3 |
3 files changed, 10 insertions, 16 deletions
diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx index bec8b91e7c22..0b9efdf22afd 100644 --- a/svl/source/misc/inettype.cxx +++ b/svl/source/misc/inettype.cxx @@ -31,9 +31,7 @@ #include <tools/wldcrd.hxx> #include <svl/inettype.hxx> #include <svl/svldata.hxx> -#ifndef _SVTOOLS_HRC -#include <svl/svtools.hrc> -#endif +#include <svl/svl.hrc> #ifndef _SVSTDARR_STRINGSSORT_DECL #define _SVSTDARR_STRINGSSORT @@ -806,16 +804,13 @@ namespace unnamed_svl_inettype { MediaTypeEntry const * seekEntry(UniString const & rTypeName, MediaTypeEntry const * pMap, sal_Size nSize) { -#if defined DBG_UTIL || defined INETTYPE_DEBUG - static bool bChecked = false; - if (!bChecked) - { - for (sal_Size i = 0; i < nSize - 1; ++i) - DBG_ASSERT(pMap[i].m_pTypeName < pMap[i + 1].m_pTypeName, - "seekEntry(): Bad map"); - bChecked = true; - } -#endif // DBG_UTIL, INETTYPE_DEBUG +#if defined DBG_UTIL + for (sal_Size i = 0; i < nSize - 1; ++i) + DBG_ASSERT( + rtl_str_compare( + pMap[i].m_pTypeName, pMap[i + 1].m_pTypeName) < 0, + "seekEntry(): Bad map"); +#endif sal_Size nLow = 0; sal_Size nHigh = nSize; diff --git a/svl/source/misc/mediatyp.src b/svl/source/misc/mediatyp.src index 195b2c640d67..333963c1d2d9 100644 --- a/svl/source/misc/mediatyp.src +++ b/svl/source/misc/mediatyp.src @@ -32,7 +32,7 @@ //============================================================================ #ifndef _SVTOOLS_HRC -#include <svl/svtools.hrc> +#include <svl/svl.hrc> #endif String STR_SVT_MIMETYPE_APP_OCTSTREAM diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx index 95d957655d5e..656000fceae3 100644 --- a/svl/source/misc/urihelper.cxx +++ b/svl/source/misc/urihelper.cxx @@ -123,8 +123,7 @@ inline UniString SmartRel2Abs_Impl(INetURLObject const & rTheBaseURIRef, eStyle); if (bCheckFileExists && !bWasAbsolute - && (aAbsURIRef.GetProtocol() == INET_PROT_FILE - || aAbsURIRef.GetProtocol() == INET_PROT_VND_SUN_STAR_WFS)) + && (aAbsURIRef.GetProtocol() == INET_PROT_FILE)) { INetURLObject aNonFileURIRef; aNonFileURIRef.SetSmartURL(rTheRelURIRef, |