mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:makeshared in linguistic

Browse Source 
Change-Id: Id852ace32903e8bae622be36a7318d0f4f201832
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92749
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2020-04-23 11:37:44 +02:00
parent 23a3727dc6
commit 524c4c61eb
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
linguistic/source/convdic.cxx
View File

@@ -224,7 +224,7 @@ void ConvDic::Save()
if (!xStream.is()) if (!xStream.is())
return; return;
SvStreamPtr pStream( utl::UcbStreamHelper::CreateStream( xStream ) ); std::unique_ptr<SvStream> pStream( utl::UcbStreamHelper::CreateStream( xStream ) );
// get XML writer // get XML writer
uno::Reference< xml::sax::XWriter > xSaxWriter = xml::sax::Writer::create(xContext); uno::Reference< xml::sax::XWriter > xSaxWriter = xml::sax::Writer::create(xContext);

28
linguistic/source/dicimp.cxx
View File

@@ -107,7 +107,7 @@ static bool getTag(const OString &rLine, const char *pTagName,
} }
sal_Int16 ReadDicVersion( SvStreamPtr const &rpStream, LanguageType &nLng, bool &bNeg, OUString &aDicName ) sal_Int16 ReadDicVersion( SvStream& rStream, LanguageType &nLng, bool &bNeg, OUString &aDicName )
{ {
// Sniff the header // Sniff the header
sal_Int16 nDicVersion = DIC_VERSION_DONTKNOW; sal_Int16 nDicVersion = DIC_VERSION_DONTKNOW;
@@ -116,13 +116,13 @@ sal_Int16 ReadDicVersion( SvStreamPtr const &rpStream, LanguageType &nLng, bool
nLng = LANGUAGE_NONE; nLng = LANGUAGE_NONE;
bNeg = false; bNeg = false;
if (!rpStream.get() || rpStream->GetError()) if (rStream.GetError())
return -1; return -1;
sal_uInt64 const nSniffPos = rpStream->Tell(); sal_uInt64 const nSniffPos = rStream.Tell();
static std::size_t nVerOOo7Len = sal::static_int_cast< std::size_t >(strlen( pVerOOo7 )); static std::size_t nVerOOo7Len = sal::static_int_cast< std::size_t >(strlen( pVerOOo7 ));
pMagicHeader[ nVerOOo7Len ] = '\0'; pMagicHeader[ nVerOOo7Len ] = '\0';
if ((rpStream->ReadBytes(static_cast<void *>(pMagicHeader), nVerOOo7Len) == nVerOOo7Len) && if ((rStream.ReadBytes(static_cast<void *>(pMagicHeader), nVerOOo7Len) == nVerOOo7Len) &&
!strcmp(pMagicHeader, pVerOOo7)) !strcmp(pMagicHeader, pVerOOo7))
{ {
bool bSuccess; bool bSuccess;
@@ -131,10 +131,10 @@ sal_Int16 ReadDicVersion( SvStreamPtr const &rpStream, LanguageType &nLng, bool
nDicVersion = DIC_VERSION_7; nDicVersion = DIC_VERSION_7;
// 1st skip magic / header line // 1st skip magic / header line
rpStream->ReadLine(aLine); rStream.ReadLine(aLine);
// 2nd line: language all | en-US | pt-BR ... // 2nd line: language all | en-US | pt-BR ...
while ((bSuccess = rpStream->ReadLine(aLine))) while ((bSuccess = rStream.ReadLine(aLine)))
{ {
OString aTagValue; OString aTagValue;
@@ -177,13 +177,13 @@ sal_Int16 ReadDicVersion( SvStreamPtr const &rpStream, LanguageType &nLng, bool
{ {
sal_uInt16 nLen; sal_uInt16 nLen;
rpStream->Seek (nSniffPos ); rStream.Seek (nSniffPos );
rpStream->ReadUInt16( nLen ); rStream.ReadUInt16( nLen );
if (nLen >= MAX_HEADER_LENGTH) if (nLen >= MAX_HEADER_LENGTH)
return -1; return -1;
rpStream->ReadBytes(pMagicHeader, nLen); rStream.ReadBytes(pMagicHeader, nLen);
pMagicHeader[nLen] = '\0'; pMagicHeader[nLen] = '\0';
// Check version magic // Check version magic
@@ -202,13 +202,13 @@ sal_Int16 ReadDicVersion( SvStreamPtr const &rpStream, LanguageType &nLng, bool
{ {
// The language of the dictionary // The language of the dictionary
sal_uInt16 nTmp = 0; sal_uInt16 nTmp = 0;
rpStream->ReadUInt16( nTmp ); rStream.ReadUInt16( nTmp );
nLng = LanguageType(nTmp); nLng = LanguageType(nTmp);
if (VERS2_NOLANGUAGE == static_cast<sal_uInt16>(nLng)) if (VERS2_NOLANGUAGE == static_cast<sal_uInt16>(nLng))
nLng = LANGUAGE_NONE; nLng = LANGUAGE_NONE;
// Negative Flag // Negative Flag
rpStream->ReadCharAsBool( bNeg ); rStream.ReadCharAsBool( bNeg );
} }
} }
@@ -290,12 +290,12 @@ ErrCode DictionaryNeo::loadEntries(const OUString &rMainURL)
if (!xStream.is()) if (!xStream.is())
return ErrCode(sal_uInt32(-1)); return ErrCode(sal_uInt32(-1));
SvStreamPtr pStream( utl::UcbStreamHelper::CreateStream( xStream ) ); std::unique_ptr<SvStream> pStream( utl::UcbStreamHelper::CreateStream( xStream ) );
// read header // read header
bool bNegativ; bool bNegativ;
LanguageType nLang; LanguageType nLang;
nDicVersion = ReadDicVersion(pStream, nLang, bNegativ, aDicName); nDicVersion = ReadDicVersion(*pStream, nLang, bNegativ, aDicName);
ErrCode nErr = pStream->GetError(); ErrCode nErr = pStream->GetError();
if (nErr != ERRCODE_NONE) if (nErr != ERRCODE_NONE)
return nErr; return nErr;
@@ -424,7 +424,7 @@ ErrCode DictionaryNeo::saveEntries(const OUString &rURL)
if (!xStream.is()) if (!xStream.is())
return ErrCode(sal_uInt32(-1)); return ErrCode(sal_uInt32(-1));
SvStreamPtr pStream( utl::UcbStreamHelper::CreateStream( xStream ) ); std::unique_ptr<SvStream> pStream( utl::UcbStreamHelper::CreateStream( xStream ) );
// Always write as the latest version, i.e. DIC_VERSION_7 // Always write as the latest version, i.e. DIC_VERSION_7

2
linguistic/source/dicimp.hxx
View File

@@ -32,7 +32,7 @@
#define DIC_MAX_ENTRIES 30000 #define DIC_MAX_ENTRIES 30000
sal_Int16 ReadDicVersion( SvStreamPtr const &rpStream, LanguageType &nLng, bool &bNeg, OUString &aDicName ); sal_Int16 ReadDicVersion( SvStream& rStream, LanguageType &nLng, bool &bNeg, OUString &aDicName );
class DictionaryNeo : class DictionaryNeo :
public ::cppu::WeakImplHelper public ::cppu::WeakImplHelper

4
linguistic/source/dlistimp.cxx
View File

@@ -809,9 +809,9 @@ static bool IsVers2OrNewer( const OUString& rFileURL, LanguageType& nLng, bool&
if (!xStream.is()) if (!xStream.is())
return false; return false;
SvStreamPtr pStream( utl::UcbStreamHelper::CreateStream( xStream ) ); std::unique_ptr<SvStream> pStream( utl::UcbStreamHelper::CreateStream( xStream ) );
int nDicVersion = ReadDicVersion(pStream, nLng, bNeg, aDicName); int nDicVersion = ReadDicVersion(*pStream, nLng, bNeg, aDicName);
return 2 == nDicVersion || nDicVersion >= 5; return 2 == nDicVersion || nDicVersion >= 5;
} }