diff options
Diffstat (limited to 'registry/source')
| -rw-r--r-- | registry/source/reflread.cxx | 5 | ||||
| -rw-r--r-- | registry/source/reflread.hxx | 6 | ||||
| -rw-r--r-- | registry/source/reflwrit.cxx | 8 | ||||
| -rw-r--r-- | registry/source/reflwrit.hxx | 7 | ||||
| -rw-r--r-- | registry/source/regimpl.cxx | 11 |
5 files changed, 11 insertions, 26 deletions
diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx index 9d7ce59a7eb7..1df3a639aa09 100644 --- a/registry/source/reflread.cxx +++ b/registry/source/reflread.cxx @@ -1723,11 +1723,10 @@ void TYPEREG_CALLTYPE typereg_reader_getSuperTypeName( } RegistryTypeReader::RegistryTypeReader(const sal_uInt8* buffer, - sal_uInt32 bufferLen, - bool copyData) + sal_uInt32 bufferLen) : m_hImpl(nullptr) { - m_hImpl = createEntry(buffer, bufferLen, copyData); + m_hImpl = createEntry(buffer, bufferLen, false/*copyData*/); } RegistryTypeReader::~RegistryTypeReader() diff --git a/registry/source/reflread.hxx b/registry/source/reflread.hxx index 6912fa8baf45..ab029bd2cb52 100644 --- a/registry/source/reflread.hxx +++ b/registry/source/reflread.hxx @@ -43,13 +43,9 @@ public: @param buffer points to the binary data block. @param bufferLen specifies the size of the binary data block. - @param copyData specifies if the data block should be copied. - The block can be copied to ensure that the data - is valid for the lifetime of this instance. */ RegistryTypeReader(const sal_uInt8* buffer, - sal_uInt32 bufferLen, - bool copyData); + sal_uInt32 bufferLen); /// Destructor. The Destructor frees the data block if the copyData flag was TRUE. ~RegistryTypeReader(); diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx index eaa1d18ab3fc..59e712f5a966 100644 --- a/registry/source/reflwrit.cxx +++ b/registry/source/reflwrit.cxx @@ -1337,17 +1337,15 @@ static TypeWriterImpl TYPEREG_CALLTYPE createEntry( RegistryTypeWriter::RegistryTypeWriter(RTTypeClass RTTypeClass, const rtl::OUString& typeName, const rtl::OUString& superTypeName, - sal_uInt16 fieldCount, - sal_uInt16 methodCount, - sal_uInt16 referenceCount) + sal_uInt16 fieldCount) : m_hImpl(nullptr) { m_hImpl = createEntry(RTTypeClass, typeName.pData, superTypeName.pData, fieldCount, - methodCount, - referenceCount); + 0, + 0); } RegistryTypeWriter::~RegistryTypeWriter() diff --git a/registry/source/reflwrit.hxx b/registry/source/reflwrit.hxx index dcf2eecaf722..9e47e53300db 100644 --- a/registry/source/reflwrit.hxx +++ b/registry/source/reflwrit.hxx @@ -47,16 +47,11 @@ public: with '/' as separator. @param fieldCount specifies the number of fields (eg. number of attrbutes/properties, enum values or constants). - @param methodCount specifies the number of methods. - @param referenceCount specifies the number of references (eg. number of supported interfaces, - exported services ...) */ RegistryTypeWriter(RTTypeClass RTTypeClass, const rtl::OUString& typeName, const rtl::OUString& superTypeName, - sal_uInt16 fieldCount, - sal_uInt16 methodCount, - sal_uInt16 referenceCount); + sal_uInt16 fieldCount); /** Destructor. The Destructor frees the internal data block. diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx index 12455b00c363..e367edbe53da 100644 --- a/registry/source/regimpl.cxx +++ b/registry/source/regimpl.cxx @@ -1074,7 +1074,7 @@ RegError ORegistry::checkBlop(OStoreStream& rValue, sal_uInt8* pSrcBuffer, bool bReport) { - RegistryTypeReader reader(pSrcBuffer, srcValueSize, false); + RegistryTypeReader reader(pSrcBuffer, srcValueSize); if (reader.getTypeClass() == RT_TYPE_INVALID) { @@ -1101,7 +1101,7 @@ RegError ORegistry::checkBlop(OStoreStream& rValue, if (!rValue.readAt(VALUE_HEADEROFFSET, pBuffer, valueSize, rwBytes) && (rwBytes == valueSize)) { - RegistryTypeReader reader2(pBuffer, valueSize, false); + RegistryTypeReader reader2(pBuffer, valueSize); if ((reader.getTypeClass() != reader2.getTypeClass()) || reader2.getTypeClass() == RT_TYPE_INVALID) @@ -1212,9 +1212,7 @@ RegError ORegistry::mergeModuleValue(OStoreStream& rTargetValue, RegistryTypeWriter writer(reader.getTypeClass(), reader.getTypeName(), reader.getSuperTypeName(), - (sal_uInt16)count, - 0, - 0); + (sal_uInt16)count); for (sal_uInt32 i=0 ; i < reader.getFieldCount(); i++) { @@ -1502,8 +1500,7 @@ RegError ORegistry::dumpValue(const OUString& sPath, const OUString& sName, sal_ sal::static_int_cast< unsigned long >(valueSize)); fprintf(stdout, "%s Data = ", indent); dumpType( - typereg::Reader( - pBuffer, valueSize, false, TYPEREG_VERSION_1), + typereg::Reader(pBuffer, valueSize), sIndent + " "); } break; |