From 96fb3c52f5d04c8257cefd97630173005e6e466c Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 25 May 2016 13:37:34 +0200 Subject: [PATCH] l10ntools: replace boost::crc with rtl_crc32 Tested with output of "make translations", it apparently computes the same CRC function, despite the documentation specifying different polynomials, but maybe that is just different notations... Change-Id: Ia28a881f5cdf54326fe5051527acd445e7a5771c --- l10ntools/source/gConvPo.cxx | 13 ++----------- l10ntools/source/po.cxx | 14 ++------------ 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/l10ntools/source/gConvPo.cxx b/l10ntools/source/gConvPo.cxx index 40be9f9e5373..2f36797f0346 100644 --- a/l10ntools/source/gConvPo.cxx +++ b/l10ntools/source/gConvPo.cxx @@ -22,14 +22,7 @@ #include using namespace std; -#ifdef _MSC_VER -#pragma warning (push, 1) -#pragma warning (disable: 4245) -#endif -#include -#ifdef _MSC_VER -#pragma warning (pop) -#endif +#include #include "gL10nMem.hxx" #include "gConvPo.hxx" @@ -250,7 +243,6 @@ void convert_po::endSave() string convert_po::genKeyId(const string& text) { string newText(text); - boost::crc_32_type aCRC32; int i; for (i = 0; (i = newText.find("\\\\", 0)) != (int)string::npos;) { @@ -263,8 +255,7 @@ string convert_po::genKeyId(const string& text) newText.erase(i, 1); newText[i] = 0x0A; } - aCRC32.process_bytes(newText.c_str(), newText.length()); - unsigned int nCRC = aCRC32.checksum(); + sal_uInt32 const nCRC = rtl_crc32(0, newText.c_str(), newText.length()); string key; // Use simple ASCII characters, exclude I, l, 1 and O, 0 to avoid confusing IDs diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index 176ce1d813b1..4662d58e0567 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -8,6 +8,7 @@ */ #include +#include #include #include @@ -16,15 +17,6 @@ #include #include -#ifdef _MSC_VER -#pragma warning (push, 1) -#pragma warning (disable: 4245) -#endif -#include -#ifdef _MSC_VER -#pragma warning (pop) -#endif - #include "po.hxx" #include "helper.hxx" @@ -376,9 +368,7 @@ bool PoEntry::IsInSameComp(const PoEntry& rPo1,const PoEntry& rPo2) OString PoEntry::genKeyId(const OString& rGenerator) { - boost::crc_32_type aCRC32; - aCRC32.process_bytes(rGenerator.getStr(), rGenerator.getLength()); - sal_uInt32 nCRC = aCRC32.checksum(); + sal_uInt32 nCRC = rtl_crc32(0, rGenerator.getStr(), rGenerator.getLength()); // Use simple ASCII characters, exclude I, l, 1 and O, 0 to avoid confusing IDs static const char sSymbols[] = "ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz23456789";