store: Use rtl::Reference::get() instead of &*
Using &* can be problematic if the pointer is null. In this case it doesn’t matter, but using Reference::get() is probably easier to understand anyway. This also paves the way for a later compiler plugin to check for this. Change-Id: I52837f7c972a87229ecbc4f72ee4c2f352a04dc8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/211840 Reviewed-by: Neil Roberts <nroberts@libreoffice.org> Tested-by: Jenkins
This commit is contained in:
@@ -105,7 +105,7 @@ storeError store_createMemoryFile (
|
|||||||
Reference<OStorePageManager> xManager (new OStorePageManager());
|
Reference<OStorePageManager> xManager (new OStorePageManager());
|
||||||
|
|
||||||
eErrCode = xManager->initialize (
|
eErrCode = xManager->initialize (
|
||||||
&*xLockBytes, storeAccessMode::Create, nPageSize);
|
xLockBytes.get(), storeAccessMode::Create, nPageSize);
|
||||||
if (eErrCode != store_E_None)
|
if (eErrCode != store_E_None)
|
||||||
return eErrCode;
|
return eErrCode;
|
||||||
|
|
||||||
@@ -137,7 +137,7 @@ storeError store_openFile (
|
|||||||
|
|
||||||
Reference<OStorePageManager> xManager (new OStorePageManager());
|
Reference<OStorePageManager> xManager (new OStorePageManager());
|
||||||
eErrCode = xManager->initialize (
|
eErrCode = xManager->initialize (
|
||||||
&*xLockBytes, eAccessMode, nPageSize);
|
xLockBytes.get(), eAccessMode, nPageSize);
|
||||||
if (eErrCode != store_E_None)
|
if (eErrCode != store_E_None)
|
||||||
return eErrCode;
|
return eErrCode;
|
||||||
|
|
||||||
@@ -201,7 +201,7 @@ storeError store_openDirectory (
|
|||||||
OString aPath (pPath->buffer, pPath->length, RTL_TEXTENCODING_UTF8);
|
OString aPath (pPath->buffer, pPath->length, RTL_TEXTENCODING_UTF8);
|
||||||
OString aName (pName->buffer, pName->length, RTL_TEXTENCODING_UTF8);
|
OString aName (pName->buffer, pName->length, RTL_TEXTENCODING_UTF8);
|
||||||
|
|
||||||
eErrCode = xDirectory->create (&*xManager, aPath.pData, aName.pData, eAccessMode);
|
eErrCode = xDirectory->create (xManager.get(), aPath.pData, aName.pData, eAccessMode);
|
||||||
if (eErrCode != store_E_None)
|
if (eErrCode != store_E_None)
|
||||||
return eErrCode;
|
return eErrCode;
|
||||||
|
|
||||||
@@ -279,7 +279,7 @@ storeError store_openStream (
|
|||||||
OString aPath (pPath->buffer, pPath->length, RTL_TEXTENCODING_UTF8);
|
OString aPath (pPath->buffer, pPath->length, RTL_TEXTENCODING_UTF8);
|
||||||
OString aName (pName->buffer, pName->length, RTL_TEXTENCODING_UTF8);
|
OString aName (pName->buffer, pName->length, RTL_TEXTENCODING_UTF8);
|
||||||
|
|
||||||
eErrCode = xLockBytes->create (&*xManager, aPath.pData, aName.pData, eAccessMode);
|
eErrCode = xLockBytes->create (xManager.get(), aPath.pData, aName.pData, eAccessMode);
|
||||||
if (eErrCode != store_E_None)
|
if (eErrCode != store_E_None)
|
||||||
return eErrCode;
|
return eErrCode;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user