diff options
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/SwStyleNameMapper.hxx | 1 | ||||
| -rw-r--r-- | sw/inc/calc.hxx | 4 | ||||
| -rw-r--r-- | sw/inc/doc.hxx | 3 | ||||
| -rw-r--r-- | sw/inc/numrule.hxx | 1 | ||||
| -rw-r--r-- | sw/inc/stringhash.hxx | 98 |
5 files changed, 3 insertions, 104 deletions
diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx index 08251c1c3822..e2fdedec8302 100644 --- a/sw/inc/SwStyleNameMapper.hxx +++ b/sw/inc/SwStyleNameMapper.hxx @@ -25,7 +25,6 @@ #include "swdllapi.h" #include <boost/unordered_map.hpp> -#include <stringhash.hxx> #include <vector> diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx index 4051e657b899..4227f8fdbade 100644 --- a/sw/inc/calc.hxx +++ b/sw/inc/calc.hxx @@ -221,10 +221,10 @@ public: void SetCalcError( SwCalcError eErr ) { eError = eErr; } sal_Bool IsCalcError() const { return 0 != eError; } - static bool Str2Double( const String& rStr, xub_StrLen& rPos, + static bool Str2Double( const OUString& rStr, sal_Int32& rPos, double& rVal, LocaleDataWrapper const*const pData = 0 ); - static bool Str2Double( const String& rStr, xub_StrLen& rPos, + static bool Str2Double( const OUString& rStr, sal_Int32& rPos, double& rVal, SwDoc *const pDoc ); SW_DLLPUBLIC static sal_Bool IsValidVarName( const OUString& rStr, diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 8d6ea4db9c0e..80caaa8276a7 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -70,7 +70,6 @@ class SwList; #include <com/sun/star/script/vba/XVBAEventProcessor.hpp> #include <boost/unordered_map.hpp> -#include <stringhash.hxx> #include <svtools/embedhlp.hxx> #include <vector> @@ -352,7 +351,7 @@ class SW_DLLPUBLIC SwDoc : /// Hash map to find numrules by name mutable boost::unordered_map<OUString, SwNumRule *, OUStringHash> maNumRuleMap; - typedef boost::unordered_map< String, SwList*, StringHash > tHashMapForLists; + typedef boost::unordered_map<OUString, SwList*, OUStringHash> tHashMapForLists; /// container to hold the lists of the text document tHashMapForLists maLists; /// relation between list style and its default list diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx index 850d4128cd9c..39edc8bc924e 100644 --- a/sw/inc/numrule.hxx +++ b/sw/inc/numrule.hxx @@ -28,7 +28,6 @@ #include <calbck.hxx> #include <hints.hxx> #include <boost/unordered_map.hpp> -#include <stringhash.hxx> #include <SwNumberTreeTypes.hxx> #include <vector> diff --git a/sw/inc/stringhash.hxx b/sw/inc/stringhash.hxx deleted file mode 100644 index 51efab426b8a..000000000000 --- a/sw/inc/stringhash.hxx +++ /dev/null @@ -1,98 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef _STRINGHASH_HXX -#define _STRINGHASH_HXX - -#include <tools/string.hxx> - -struct StringEq -{ - sal_Bool operator() ( const String *r1, - const String *r2) const - { - return r1->Equals(*r2); - } -}; - -struct StringEqRef -{ - sal_Bool operator() (const String &r1, const String &r2) const - { - return r1.Equals(r2); - } -}; - -struct StringHash -{ - size_t operator() ( const String *rString) const - { - sal_Int32 h, nLen; - h = nLen = rString->Len(); - const sal_Unicode *pStr = rString->GetBuffer(); - - if ( nLen < 16 ) - while ( nLen-- > 0 ) - h = (h*37) + *(pStr++); - else - { - sal_Int32 nSkip; - const sal_Unicode* pEndStr = pStr+nLen-5; - - /* only sample some characters */ - /* the first 3, some characters between, and the last 5 */ - h = (h*39) + *(pStr++); - h = (h*39) + *(pStr++); - h = (h*39) + *(pStr++); - - nSkip = nLen / nLen < 32 ? 4 : 8; - nLen -= 8; - while ( nLen > 0 ) - { - h = (h*39) + ( *pStr ); - pStr += nSkip; - nLen -= nSkip; - } - - h = (h*39) + *(pEndStr++); - h = (h*39) + *(pEndStr++); - h = (h*39) + *(pEndStr++); - h = (h*39) + *(pEndStr++); - h = (h*39) + *(pEndStr++); - } - return h; - } - - size_t operator() (const String & rStr) const - { - return (*this)(&rStr); - } -}; - -struct StringHashRef -{ - size_t operator () (const String &rStr) const - { - StringHash aStrHash; - - return aStrHash(&rStr); - } -}; -#endif // _STRINGHASH_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |