diff options
author | Andras Timar <atimar@suse.com> | 2012-10-13 17:41:05 +0200 |
---|---|---|
committer | Andras Timar <atimar@suse.com> | 2012-10-13 17:41:05 +0200 |
commit | e5ce011c3f32f53ef073aec5485450b2588b656a (patch) | |
tree | 8a838a53bcdd70cc3d4cdbca0ebe07504790952e /basic | |
parent | c6b26144c93aa5222e4260c5b0ef45ce5bdc18d2 (diff) | |
parent | e74fc93e4aba7887e6a278cc44c4bc0962471065 (diff) |
Merge branch 'master' into feature/killsdf
Conflicts:
Makefile.top
Module_tail_build.mk
RepositoryExternal.mk
RepositoryFixes.mk
accessibility/source/standard/vclxaccessibletoolbox.cxx
basic/source/uno/dlgcont.cxx
connectivity/Library_ado.mk
cross_tail_build/prj/build.lst
desktop/source/offacc/acceptor.cxx
filter/Library_PptImporter.mk
filter/source/t602/filterenv.cxx
i18npool/Library_textconv_dict.mk
ooo.lst.in
saxon/ExternalProject_saxon.mk
saxon/build.xml
sc/sdi/scalc.sdi
sc/source/filter/xml/xmlstyli.cxx
sc/source/ui/condformat/condformatdlg.cxx
sc/source/ui/condformat/condformatmgr.cxx
sc/source/ui/view/cellsh1.cxx
sdext/source/pdfimport/misc/pwdinteract.cxx
shell/qa/zip/makefile.mk
shell/qa/zip/testimpl/makefile.mk
solenv/gbuild/CppunitTest.mk
solenv/gbuild/gbuild.mk
solenv/gbuild/platform/android.mk
solenv/gbuild/platform/com_GCC_defs.mk
solenv/gbuild/platform/macosx.mk
soltools/Executable_adjustvisibility.mk
soltools/Executable_checkdll.mk
soltools/Executable_cpp.mk
soltools/Executable_javadep.mk
soltools/Executable_makedepend.mk
sw/qa/extras/rtfimport/rtfimport.cxx
tail_build/prj/build.lst
tomcat/ExternalProject_tomcat.mk
ucb/source/ucp/webdav/webdavcontent.cxx
xml2cmp/Executable_xml2cmp.mk
Diffstat (limited to 'basic')
-rw-r--r-- | basic/source/basmgr/basmgr.cxx | 2 | ||||
-rw-r--r-- | basic/source/classes/sbunoobj.cxx | 8 | ||||
-rw-r--r-- | basic/source/comp/exprtree.cxx | 18 | ||||
-rw-r--r-- | basic/source/inc/date.hxx | 37 | ||||
-rw-r--r-- | basic/source/runtime/iosys.cxx | 5 | ||||
-rw-r--r-- | basic/source/runtime/methods.cxx | 8 | ||||
-rw-r--r-- | basic/source/runtime/methods1.cxx | 19 | ||||
-rw-r--r-- | basic/source/runtime/step0.cxx | 8 | ||||
-rw-r--r-- | basic/source/sbx/sbxscan.cxx | 8 | ||||
-rw-r--r-- | basic/source/uno/dlgcont.cxx | 20 | ||||
-rw-r--r-- | basic/source/uno/namecont.cxx | 18 | ||||
-rw-r--r-- | basic/source/uno/scriptcont.cxx | 16 |
12 files changed, 83 insertions, 84 deletions
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 7f5c691da472..3bd3a52438b2 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -2009,7 +2009,7 @@ uno::Sequence< sal_Int8 > implGetDialogData( SbxObject* pDialog ) uno::Sequence< sal_Int8 > aData( nLen ); sal_Int8* pDestData = aData.getArray(); const sal_Int8* pSrcData = (const sal_Int8*)aMemStream.GetData(); - rtl_copyMemory( pDestData, pSrcData, nLen ); + memcpy( pDestData, pSrcData, nLen ); return aData; } diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 6735dfe6299c..cd43e1b4c6bd 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -494,7 +494,7 @@ void clearNativeObjectWrapperVector( void ) GaNativeObjectWrapperVector::get().clear(); } -sal_uInt32 lcl_registerNativeObjectWrapper( SbxObject* pNativeObj ) +static sal_uInt32 lcl_registerNativeObjectWrapper( SbxObject* pNativeObj ) { NativeObjectWrapperVector &rNativeObjectWrapperVector = GaNativeObjectWrapperVector::get(); sal_uInt32 nIndex = rNativeObjectWrapperVector.size(); @@ -502,7 +502,7 @@ sal_uInt32 lcl_registerNativeObjectWrapper( SbxObject* pNativeObj ) return nIndex; } -SbxObject* lcl_getNativeObject( sal_uInt32 nIndex ) +static SbxObject* lcl_getNativeObject( sal_uInt32 nIndex ) { SbxObjectRef xRetObj; NativeObjectWrapperVector &rNativeObjectWrapperVector = GaNativeObjectWrapperVector::get(); @@ -4552,7 +4552,7 @@ typedef std::vector< StarBasicDisposeItem* > DisposeItemVector; static DisposeItemVector GaDisposeItemVector; -DisposeItemVector::iterator lcl_findItemForBasic( StarBASIC* pBasic ) +static DisposeItemVector::iterator lcl_findItemForBasic( StarBASIC* pBasic ) { DisposeItemVector::iterator it; for( it = GaDisposeItemVector.begin() ; it != GaDisposeItemVector.end() ; ++it ) @@ -4564,7 +4564,7 @@ DisposeItemVector::iterator lcl_findItemForBasic( StarBASIC* pBasic ) return GaDisposeItemVector.end(); } -StarBasicDisposeItem* lcl_getOrCreateItemForBasic( StarBASIC* pBasic ) +static StarBasicDisposeItem* lcl_getOrCreateItemForBasic( StarBASIC* pBasic ) { DisposeItemVector::iterator it = lcl_findItemForBasic( pBasic ); StarBasicDisposeItem* pItem = (it != GaDisposeItemVector.end()) ? *it : NULL; diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx index 710965dd56cb..1a4b465ded02 100644 --- a/basic/source/comp/exprtree.cxx +++ b/basic/source/comp/exprtree.cxx @@ -819,10 +819,22 @@ short SbiConstExpression::GetShortValue() else { double n = nVal; - if( n > 0 ) n += .5; else n -= .5; - if( n > SbxMAXINT ) n = SbxMAXINT, pParser->Error( SbERR_OUT_OF_RANGE ); + if( n > 0 ) + n += .5; else - if( n < SbxMININT ) n = SbxMININT, pParser->Error( SbERR_OUT_OF_RANGE ); + n -= .5; + + if( n > SbxMAXINT ) + { + n = SbxMAXINT; + pParser->Error( SbERR_OUT_OF_RANGE ); + } + else if( n < SbxMININT ) + { + n = SbxMININT; + pParser->Error( SbERR_OUT_OF_RANGE ); + } + return (short) n; } } diff --git a/basic/source/inc/date.hxx b/basic/source/inc/date.hxx new file mode 100644 index 000000000000..cd38c896d1df --- /dev/null +++ b/basic/source/inc/date.hxx @@ -0,0 +1,37 @@ +/* -*- 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 _SBDATE_HXX +#define _SBDATE_HXX + +bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, double& rdRet ); + +sal_Int16 implGetWeekDay( double aDate, bool bFirstDayParam = false, sal_Int16 nFirstDay = 0 ); + +sal_Int16 implGetDateYear( double aDate ); +sal_Int16 implGetDateMonth( double aDate ); +sal_Int16 implGetDateDay( double aDate ); + +sal_Int16 implGetHour( double dDate ); +sal_Int16 implGetMinute( double dDate ); +sal_Int16 implGetSecond( double dDate ); + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index 7f2753ad8b61..d03b8a67d58d 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <string.h> #include <vcl/dialog.hxx> #include <vcl/edit.hxx> #include <vcl/button.hxx> @@ -435,14 +436,14 @@ sal_uIntPtr UCBStream::GetData( void* pData, sal_uIntPtr nSize ) { Sequence<sal_Int8> aData; nSize = xIS->readBytes( aData, nSize ); - rtl_copyMemory( pData, aData.getConstArray(), nSize ); + memcpy( pData, aData.getConstArray(), nSize ); return nSize; } else if( xS.is() && (xISFromS = xS->getInputStream()).is() ) { Sequence<sal_Int8> aData; nSize = xISFromS->readBytes( aData, nSize ); - rtl_copyMemory( pData, aData.getConstArray(), nSize ); + memcpy(pData, aData.getConstArray(), nSize ); return nSize; } else diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index a90cc0e72817..054de265eb46 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -63,6 +63,7 @@ using namespace com::sun::star; #include <comphelper/string.hxx> +#include "date.hxx" #include "stdobj.hxx" #include <basic/sbstdobj.hxx> #include "rtlproto.hxx" @@ -103,9 +104,6 @@ SbxVariable* getDefaultProp( SbxVariable* pRef ); #ifndef DISABLE_SCRIPTING -// forward decl. -bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, double& rdRet ); - // from source/classes/sbxmod.cxx uno::Reference< frame::XModel > getDocumentModel( StarBASIC* ); @@ -1701,8 +1699,6 @@ sal_Int16 implGetDateMonth( double aDate ) return nRet; } -sal_Int16 implGetDateYear( double aDate ); - // Function to convert date to ISO 8601 date format RTLFUNC(CDateToIso) { @@ -1956,8 +1952,6 @@ RTLFUNC(Hour) } } -sal_Int16 implGetMinute( double dDate ); - RTLFUNC(Minute) { (void)pBasic; diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index 3e1d94900f76..7072c09cb3d7 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -32,6 +32,7 @@ #include <vcl/jobset.hxx> #include <basic/sbobjmod.hxx> +#include "date.hxx" #include "sbintern.hxx" #include "runtime.hxx" #include "stdobj.hxx" @@ -57,7 +58,6 @@ using namespace com::sun::star::i18n; void unoToSbxValue( SbxVariable* pVar, const Any& aValue ); Any sbxToUnoValue( SbxVariable* pVar, const Type& rType, com::sun::star::beans::Property* pUnoProperty = NULL ); -sal_Int16 implGetWeekDay( double aDate, bool bFirstDayParam = false, sal_Int16 nFirstDay = 0 ); static Reference< XCalendar3 > getLocaleCalendar( void ) { @@ -915,7 +915,7 @@ RTLFUNC(FindPropertyObject) -sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm, +static sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm, sal_Bool bBinary, short nBlockLen, sal_Bool bIsArray ) { sal_uIntPtr nFPos = pStrm->Tell(); @@ -1001,7 +1001,7 @@ sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm, return pStrm->GetErrorCode() ? sal_False : sal_True; } -sal_Bool lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm, +static sal_Bool lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm, sal_Bool bBinary, short nBlockLen, sal_Bool bIsArray ) { (void)bBinary; @@ -1111,7 +1111,7 @@ sal_Bool lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm, // nCurDim = 1...n -sal_Bool lcl_WriteReadSbxArray( SbxDimArray& rArr, SvStream* pStrm, +static sal_Bool lcl_WriteReadSbxArray( SbxDimArray& rArr, SvStream* pStrm, sal_Bool bBinary, short nCurDim, short* pOtherDims, sal_Bool bWrite ) { DBG_ASSERT( nCurDim > 0,"Bad Dim"); @@ -1906,17 +1906,6 @@ IntervalInfo* getIntervalInfo( const String& rStringCode ) return pInfo; } -// From methods.cxx -bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, double& rdRet ); -sal_Int16 implGetDateDay( double aDate ); -sal_Int16 implGetDateMonth( double aDate ); -sal_Int16 implGetDateYear( double aDate ); - -sal_Int16 implGetHour( double dDate ); -sal_Int16 implGetMinute( double dDate ); -sal_Int16 implGetSecond( double dDate ); - - inline void implGetDayMonthYear( sal_Int16& rnYear, sal_Int16& rnMonth, sal_Int16& rnDay, double dDate ) { rnDay = implGetDateDay( dDate ); diff --git a/basic/source/runtime/step0.cxx b/basic/source/runtime/step0.cxx index 40d8f6982fcb..05a2759af4ef 100644 --- a/basic/source/runtime/step0.cxx +++ b/basic/source/runtime/step0.cxx @@ -43,8 +43,8 @@ Reference< XInterface > createComListener( const Any& aControlAny, const ::rtl:: // for a patch forward declaring these methods below makes sense // but, #FIXME lets really just move the methods to the top -void lcl_clearImpl( SbxVariableRef& refVar, SbxDataType& eType ); -void lcl_eraseImpl( SbxVariableRef& refVar, bool bVBAEnabled ); +static void lcl_clearImpl( SbxVariableRef& refVar, SbxDataType& eType ); +static void lcl_eraseImpl( SbxVariableRef& refVar, bool bVBAEnabled ); SbxVariable* getDefaultProp( SbxVariable* pRef ); @@ -972,7 +972,7 @@ void SbiRuntime::StepREDIMP_ERASE() refVar->SetType( SbxEMPTY ); } -void lcl_clearImpl( SbxVariableRef& refVar, SbxDataType& eType ) +static void lcl_clearImpl( SbxVariableRef& refVar, SbxDataType& eType ) { sal_uInt16 nSavFlags = refVar->GetFlags(); refVar->ResetFlag( SBX_FIXED ); @@ -981,7 +981,7 @@ void lcl_clearImpl( SbxVariableRef& refVar, SbxDataType& eType ) refVar->Clear(); } -void lcl_eraseImpl( SbxVariableRef& refVar, bool bVBAEnabled ) +static void lcl_eraseImpl( SbxVariableRef& refVar, bool bVBAEnabled ) { SbxDataType eType = refVar->GetType(); if( eType & SbxARRAY ) diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx index bc235236d785..7ea06b5e4fb5 100644 --- a/basic/source/sbx/sbxscan.cxx +++ b/basic/source/sbx/sbxscan.cxx @@ -39,6 +39,7 @@ #include <svtools/svtools.hrc> #include "basrid.hxx" +#include "date.hxx" #include "runtime.hxx" #include <rtl/strbuf.hxx> @@ -689,13 +690,6 @@ VbaFormatInfo* getFormatInfo( const String& rFmt ) #define VBAFORMAT_LOWERCASE "<" #define VBAFORMAT_UPPERCASE ">" -// From methods1.cxx -sal_Int16 implGetWeekDay( double aDate, bool bFirstDayParam = false, sal_Int16 nFirstDay = 0 ); -// from methods.cxx -sal_Int16 implGetMinute( double dDate ); -sal_Int16 implGetDateYear( double aDate ); -bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, double& rdRet ); - void SbxValue::Format( XubString& rRes, const XubString* pFmt ) const { short nComma = 0; diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx index 2cfe035a21b7..b9ad7f19ecce 100644 --- a/basic/source/uno/dlgcont.cxx +++ b/basic/source/uno/dlgcont.cxx @@ -18,7 +18,7 @@ */ #include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/xml/sax/XParser.hpp> +#include <com/sun/star/xml/sax/Parser.hpp> #include <com/sun/star/xml/sax/InputSource.hpp> #include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/io/XInputStream.hpp> @@ -32,6 +32,7 @@ #include "com/sun/star/document/XGraphicObjectResolver.hpp" #include "dlgcont.hxx" #include "sbmodule.hxx" +#include <comphelper/componentcontext.hxx> #include <comphelper/processfactory.hxx> #include <unotools/streamwrap.hxx> #include <osl/mutex.hxx> @@ -122,12 +123,7 @@ bool writeOasis2OOoLibraryElement( Reference< lang::XMultiComponentFactory > xSMgr( xContext->getServiceManager() ); - Reference< xml::sax::XParser > xParser( - xSMgr->createInstanceWithContext( - OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.xml.sax.Parser" ) ), - xContext ), - UNO_QUERY ); + Reference< xml::sax::XParser > xParser = xml::sax::Parser::create(xContext); Reference< xml::sax::XExtendedDocumentHandler > xWriter( xSMgr->createInstanceWithContext( @@ -139,7 +135,7 @@ bool writeOasis2OOoLibraryElement( Reference< io::XActiveDataSource > xSource( xWriter, UNO_QUERY ); xSource->setOutputStream( xOutput ); - if ( !xParser.is() || !xWriter.is() ) + if ( !xWriter.is() ) { return sal_False; } @@ -297,13 +293,7 @@ Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement // return aRetAny; //} - Reference< XParser > xParser( mxMSF->createInstance( - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser") ) ), UNO_QUERY ); - if( !xParser.is() ) - { - OSL_FAIL( "### couldn't create sax parser component\n" ); - return aRetAny; - } + Reference< XParser > xParser = xml::sax::Parser::create( comphelper::getComponentContext(mxMSF) ); Reference< XNameContainer > xDialogModel( mxMSF->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDialogModel" ) ) ), UNO_QUERY ); diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index 77ced57a2eec..dfce89aa5101 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -41,7 +41,7 @@ #include <svtools/ehdl.hxx> #include <basic/basmgr.hxx> #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> -#include <com/sun/star/xml/sax/XParser.hpp> +#include <com/sun/star/xml/sax/Parser.hpp> #include <com/sun/star/xml/sax/InputSource.hpp> #include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/io/XInputStream.hpp> @@ -650,13 +650,7 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL, maLibraryPath = SvtPathOptions().GetBasicPath(); } - Reference< XParser > xParser( mxMSF->createInstance( - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser") ) ), UNO_QUERY ); - if( !xParser.is() ) - { - SAL_WARN("basic", "couldn't create sax parser component"); - return; - } + Reference< XParser > xParser = xml::sax::Parser::create(comphelper::getComponentContext(mxMSF)); uno::Reference< io::XInputStream > xInput; @@ -1603,13 +1597,7 @@ void SfxLibraryContainer::implStoreLibraryIndexFile( SfxLibrary* pLib, bool SfxLibraryContainer::implLoadLibraryIndexFile( SfxLibrary* pLib, ::xmlscript::LibDescriptor& rLib, const uno::Reference< embed::XStorage >& xStorage, const OUString& aIndexFileName ) { - Reference< XParser > xParser( mxMSF->createInstance( - OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser") ) ), UNO_QUERY ); - if( !xParser.is() ) - { - SAL_WARN("basic", "couldn't create sax parser component"); - return false; - } + Reference< XParser > xParser = xml::sax::Parser::create(comphelper::getComponentContext(mxMSF)); sal_Bool bLink = sal_False; bool bStorage = false; diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index cdd4b9ef6b56..bbc8509d23c2 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -20,7 +20,7 @@ #include "scriptcont.hxx" #include "sbmodule.hxx" #include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/xml/sax/XParser.hpp> +#include <com/sun/star/xml/sax/Parser.hpp> #include <com/sun/star/xml/sax/InputSource.hpp> #include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/io/XInputStream.hpp> @@ -32,6 +32,7 @@ #include <com/sun/star/embed/XTransactedObject.hpp> #include <com/sun/star/task/ErrorCodeIOException.hpp> #include <com/sun/star/script/ModuleType.hpp> +#include <comphelper/componentcontext.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/storagehelper.hxx> #include <unotools/streamwrap.hxx> @@ -238,14 +239,7 @@ Any SAL_CALL SfxScriptLibraryContainer::importLibraryElement { Any aRetAny; - Reference< XParser > xParser( mxMSF->createInstance( - OUString( "com.sun.star.xml.sax.Parser" ) ), UNO_QUERY ); - if( !xParser.is() ) - { - OSL_FAIL( "### couldn't create sax parser component\n" ); - return aRetAny; - } - + Reference< XParser > xParser = xml::sax::Parser::create( comphelper::getComponentContext(mxMSF) ); // Read from storage? sal_Bool bStorage = xInStream.is(); @@ -639,7 +633,7 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, sal_Int32 nSize = (sal_Int32)aMemStream.Tell(); Sequence< sal_Int8 > aBinSeq( nSize ); sal_Int8* pData = aBinSeq.getArray(); - ::rtl_copyMemory( pData, aMemStream.GetData(), nSize ); + memcpy( pData, aMemStream.GetData(), nSize ); Reference< XOutputStream > xOut = xCodeStream->getOutputStream(); if ( !xOut.is() ) @@ -775,7 +769,7 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, sal_Int32 nSize = (sal_Int32)aMemStream.Tell(); Sequence< sal_Int8 > aBinSeq( nSize ); sal_Int8* pData = aBinSeq.getArray(); - ::rtl_copyMemory( pData, aMemStream.GetData(), nSize ); + memcpy( pData, aMemStream.GetData(), nSize ); Reference< XOutputStream > xOut = xCodeStream->getOutputStream(); if ( xOut.is() ) |