diff options
Diffstat (limited to 'package')
86 files changed, 997 insertions, 804 deletions
diff --git a/package/inc/ByteChucker.hxx b/package/inc/ByteChucker.hxx index d0a07cdfadaf..733756e2dd65 100644 --- a/package/inc/ByteChucker.hxx +++ b/package/inc/ByteChucker.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -65,3 +66,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/ByteGrabber.hxx b/package/inc/ByteGrabber.hxx index 8ef127900655..a9bdfb1e1928 100644 --- a/package/inc/ByteGrabber.hxx +++ b/package/inc/ByteGrabber.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -75,3 +76,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/CRC32.hxx b/package/inc/CRC32.hxx index b8de389c8721..cb3c75e41685 100644 --- a/package/inc/CRC32.hxx +++ b/package/inc/CRC32.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,3 +55,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/Deflater.hxx b/package/inc/Deflater.hxx index f39b8e2b9547..6c1cf4456d30 100644 --- a/package/inc/Deflater.hxx +++ b/package/inc/Deflater.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,14 +29,16 @@ #define _DEFLATER_HXX_ #include <com/sun/star/uno/Sequence.hxx> +#include "packagedllapi.hxx" -extern "C" +struct z_stream_s; + +namespace ZipUtils { + +class DLLPUBLIC_PACKAGE Deflater { typedef struct z_stream_s z_stream; -} -class Deflater -{ protected: com::sun::star::uno::Sequence< sal_Int8 > sInBuffer; sal_Bool bFinish; @@ -63,4 +66,8 @@ public: void SAL_CALL end( ); }; +} + #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/EncryptedDataHeader.hxx b/package/inc/EncryptedDataHeader.hxx index be2c7643ec51..43487ac88ea0 100644 --- a/package/inc/EncryptedDataHeader.hxx +++ b/package/inc/EncryptedDataHeader.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -53,3 +54,5 @@ const sal_uInt32 n_ConstHeader = 0x05024d4dL; // "MM\002\005" const sal_Int32 n_ConstHeaderSize = 38; // + salt length + iv length + digest length + mediatype length const sal_Int16 n_ConstCurrentVersion = 1; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/EncryptionData.hxx b/package/inc/EncryptionData.hxx index 5d49ae2b7b0f..283b0b94caea 100644 --- a/package/inc/EncryptionData.hxx +++ b/package/inc/EncryptionData.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -79,3 +80,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/HashMaps.hxx b/package/inc/HashMaps.hxx index b10f42aa7020..0a2fb3d9b7ae 100644 --- a/package/inc/HashMaps.hxx +++ b/package/inc/HashMaps.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,8 +29,8 @@ #define _HASHMAPS_HXX #include <ZipEntry.hxx> -#include <vos/ref.hxx> -#include <hash_map> +#include <rtl/ref.hxx> +#include <boost/unordered_map.hpp> struct eqFunc { @@ -45,19 +46,21 @@ namespace com { namespace sun { namespace star { namespace packages { class ContentInfo; } } } } -typedef std::hash_map < rtl::OUString, +typedef boost::unordered_map < rtl::OUString, ZipPackageFolder *, ::rtl::OUStringHash, eqFunc > FolderHash; -typedef std::hash_map < rtl::OUString, - vos::ORef < com::sun::star::packages::ContentInfo >, +typedef boost::unordered_map < rtl::OUString, + rtl::Reference < com::sun::star::packages::ContentInfo >, ::rtl::OUStringHash, eqFunc > ContentHash; -typedef std::hash_map < rtl::OUString, +typedef boost::unordered_map < rtl::OUString, ZipEntry, rtl::OUStringHash, eqFunc > EntryHash; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/Inflater.hxx b/package/inc/Inflater.hxx index 26c903ae5c47..f5241df133d2 100644 --- a/package/inc/Inflater.hxx +++ b/package/inc/Inflater.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,13 +29,16 @@ #define _INFLATER_HXX_ #include <com/sun/star/uno/Sequence.hxx> +#include "packagedllapi.hxx" -extern "C" +struct z_stream_s; + +namespace ZipUtils { + +class DLLPUBLIC_PACKAGE Inflater { typedef struct z_stream_s z_stream; -} -class Inflater -{ + protected: sal_Bool bFinish, bFinished, bSetParams, bNeedDict; sal_Int32 nOffset, nLength, nLastInflateError; @@ -54,4 +58,8 @@ public: sal_Int32 getLastInflateError() { return nLastInflateError; } }; +} + #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/PackageConstants.hxx b/package/inc/PackageConstants.hxx index 90c73edf2ba7..be82010175fc 100644 --- a/package/inc/PackageConstants.hxx +++ b/package/inc/PackageConstants.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,4 @@ const sal_Int32 n_ConstDigestDecrypt = 1056; // 1024 + 32 #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/ZipEntry.hxx b/package/inc/ZipEntry.hxx index 4f47f25a1329..915d1ca7bb21 100644 --- a/package/inc/ZipEntry.hxx +++ b/package/inc/ZipEntry.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,3 +45,5 @@ struct ZipEntry ::rtl::OUString sPath; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/ZipEnumeration.hxx b/package/inc/ZipEnumeration.hxx index 967007ade78d..bd64b31e9373 100644 --- a/package/inc/ZipEnumeration.hxx +++ b/package/inc/ZipEnumeration.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,3 +42,5 @@ public: ~ZipEnumeration(); }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx index 2be52615c90b..05186c0abccf 100644 --- a/package/inc/ZipFile.hxx +++ b/package/inc/ZipFile.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,8 +35,6 @@ #include <com/sun/star/xml/crypto/XCipherContext.hpp> #include <com/sun/star/xml/crypto/XDigestContext.hpp> -#include <rtl/ref.hxx> - #include <ByteGrabber.hxx> #include <HashMaps.hxx> #include <Inflater.hxx> @@ -47,6 +46,10 @@ namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } namespace ucb { class XProgressHandler; } } } } +namespace rtl +{ + template < class T > class Reference; +} /* * We impose arbitrary but reasonable limit on ZIP files. @@ -66,7 +69,7 @@ protected: ::rtl::OUString sComment; /* zip file comment */ EntryHash aEntries; ByteGrabber aGrabber; - Inflater aInflater; + ZipUtils::Inflater aInflater; com::sun::star::uno::Reference < com::sun::star::io::XInputStream > xStream; com::sun::star::uno::Reference < com::sun::star::io::XSeekable > xSeek; const ::com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > m_xFactory; @@ -95,7 +98,7 @@ protected: sal_Bool bDecrypt, ::rtl::OUString aMediaType = ::rtl::OUString() ); - sal_Bool hasValidPassword ( ZipEntry & rEntry, const ::rtl::Reference < EncryptionData > &rData ); + sal_Bool hasValidPassword ( ZipEntry & rEntry, const rtl::Reference < EncryptionData > &rData ); sal_Bool checkSizeAndCRC( const ZipEntry& aEntry ); @@ -210,3 +213,5 @@ protected: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/ZipOutputStream.hxx b/package/inc/ZipOutputStream.hxx index 48fafb4c4a9c..b5d6ee8b54f2 100644 --- a/package/inc/ZipOutputStream.hxx +++ b/package/inc/ZipOutputStream.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,6 +42,10 @@ struct ZipEntry; class ZipPackageStream; +namespace rtl +{ + template < class T > class Reference; +} class ZipOutputStream { @@ -53,7 +58,7 @@ protected: ::com::sun::star::uno::Sequence< sal_Int8 > m_aDeflateBuffer; ::rtl::OUString sComment; - Deflater aDeflater; + ZipUtils::Deflater aDeflater; ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XCipherContext > m_xCipherContext; ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XDigestContext > m_xDigestContext; @@ -106,3 +111,5 @@ protected: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/ZipPackage.hxx b/package/inc/ZipPackage.hxx index f7b80f38b359..ed7be23ea429 100644 --- a/package/inc/ZipPackage.hxx +++ b/package/inc/ZipPackage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,6 +44,7 @@ #include <HashMaps.hxx> #include <osl/file.h> #include <mutexholder.hxx> +#include <vector> class ZipOutputStream; class ZipPackageFolder; @@ -199,3 +201,5 @@ public: sal_Bool SAL_CALL static_supportsService(rtl::OUString const & rServiceName); }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/ZipPackageBuffer.hxx b/package/inc/ZipPackageBuffer.hxx index 54876d97bde1..e8cf9ff87e86 100644 --- a/package/inc/ZipPackageBuffer.hxx +++ b/package/inc/ZipPackageBuffer.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,9 +31,7 @@ #include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/io/XSeekable.hpp> #include <com/sun/star/io/XInputStream.hpp> -#ifndef _CPPUHELPER_IMPLBASE3_HXX #include <cppuhelper/implbase3.hxx> -#endif class ZipPackage; @@ -82,3 +81,5 @@ public: throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/ZipPackageEntry.hxx b/package/inc/ZipPackageEntry.hxx index 767d84511a12..6ae623a50664 100644 --- a/package/inc/ZipPackageEntry.hxx +++ b/package/inc/ZipPackageEntry.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,9 +33,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/container/XNameContainer.hpp> -#ifndef _COM_SUN_STAR_LANG_XPSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif #include <ZipEntry.hxx> #include <cppuhelper/implbase5.hxx> @@ -103,3 +102,5 @@ public: throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/ZipPackageFolder.hxx b/package/inc/ZipPackageFolder.hxx index 6a80f0effdaa..59be1b7b36ce 100644 --- a/package/inc/ZipPackageFolder.hxx +++ b/package/inc/ZipPackageFolder.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,6 +34,7 @@ #include <HashMaps.hxx> #include <ZipPackageEntry.hxx> #include <cppuhelper/implbase2.hxx> +#include <vector> namespace com { namespace sun { namespace star { namespace beans @@ -144,3 +146,5 @@ public: throw (::com::sun::star::uno::RuntimeException); }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/ZipPackageStream.hxx b/package/inc/ZipPackageStream.hxx index a3bbf73bf84c..cb165af9ee97 100644 --- a/package/inc/ZipPackageStream.hxx +++ b/package/inc/ZipPackageStream.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,11 +32,10 @@ #include <com/sun/star/io/XSeekable.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/packages/XDataSinkEncrSupport.hpp> - +#include <ZipPackageEntry.hxx> #include <rtl/ref.hxx> #include <cppuhelper/implbase2.hxx> -#include <ZipPackageEntry.hxx> #include <EncryptionData.hxx> #include <mutexholder.hxx> @@ -214,3 +214,5 @@ public: throw (::com::sun::star::uno::RuntimeException); }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/mutexholder.hxx b/package/inc/mutexholder.hxx index 97b410ad549b..3fbbd4c5738a 100644 --- a/package/inc/mutexholder.hxx +++ b/package/inc/mutexholder.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -129,3 +130,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/packagedllapi.hxx b/package/inc/packagedllapi.hxx new file mode 100644 index 000000000000..41e8efa4dae4 --- /dev/null +++ b/package/inc/packagedllapi.hxx @@ -0,0 +1,15 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +#ifndef INCLUDED_PACKAGEDLLAPI_H +#define INCLUDED_PACKAGEDLLAPI_H + +#include "sal/types.h" + +#if defined(DLLIMPLEMENTATION_PACKAGE) +#define DLLPUBLIC_PACKAGE SAL_DLLPUBLIC_EXPORT +#else +#define DLLPUBLIC_PACKAGE SAL_DLLPUBLIC_IMPORT +#endif + +#endif /* INCLUDED_PACKAGEDLLAPI_H */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/pch/precompiled_package.cxx b/package/inc/pch/precompiled_package.cxx index da7eca4d4557..49b45ad88d87 100644 --- a/package/inc/pch/precompiled_package.cxx +++ b/package/inc/pch/precompiled_package.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,3 +28,4 @@ #include "precompiled_package.hxx" +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/pch/precompiled_package.hxx b/package/inc/pch/precompiled_package.hxx index 3fc91f789528..dfadd0a869a6 100644 --- a/package/inc/pch/precompiled_package.hxx +++ b/package/inc/pch/precompiled_package.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,3 +31,4 @@ #ifdef PRECOMPILED_HEADERS #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/zipfileaccess.hxx b/package/inc/zipfileaccess.hxx index 61297aed6da6..1516aa4d7fef 100644 --- a/package/inc/zipfileaccess.hxx +++ b/package/inc/zipfileaccess.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -107,3 +108,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/prj/d.lst b/package/prj/d.lst index 919a1719aa09..bcb9c084e3f2 100644 --- a/package/prj/d.lst +++ b/package/prj/d.lst @@ -1,7 +1,11 @@ -..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map -..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll -..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so -..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib -..\dtd\*.dtd %_DEST%\bin%_EXT%\*.* -..\%__SRC%\misc\package2.component %_DEST%\xml%_EXT%\package2.component -..\%__SRC%\misc\xstor.component %_DEST%\xml%_EXT%\xstor.component +..\%__SRC%\misc\*.map %_DEST%\bin\*.map +..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll +..\%__SRC%\lib\*.lib %_DEST%\lib\*.lib +..\%__SRC%\lib\lib*.so %_DEST%\lib\lib*.so +..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib +..\dtd\*.dtd %_DEST%\bin\*.* +..\%__SRC%\misc\package2.component %_DEST%\xml\package2.component +..\%__SRC%\misc\xstor.component %_DEST%\xml\xstor.component +..\inc\Inflater.hxx %_DEST%\inc\package\Inflater.hxx +..\inc\Deflater.hxx %_DEST%\inc\package\Deflater.hxx +..\inc\packagedllapi.hxx %_DEST%\inc\package\packagedllapi.hxx diff --git a/package/source/manifest/Base64Codec.cxx b/package/source/manifest/Base64Codec.cxx index 3539b2bb75b4..b4f5b6d32ffd 100644 --- a/package/source/manifest/Base64Codec.cxx +++ b/package/source/manifest/Base64Codec.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,10 +31,11 @@ #include "Base64Codec.hxx" #include <rtl/ustrbuf.hxx> #include <osl/diagnose.h> -using namespace rtl; using namespace osl; using namespace com::sun::star; +using ::rtl::OUStringBuffer; + const sal_Char aBase64EncodeTable[] = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', @@ -202,3 +204,5 @@ void Base64Codec::decodeBase64(uno::Sequence< sal_Int8 >& aBuffer, const rtl::OU aBuffer = uno::Sequence<sal_Int8>( reinterpret_cast< sal_Int8* >( pBuffer ), nSecondLength ); delete[] pBuffer; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/manifest/Base64Codec.hxx b/package/source/manifest/Base64Codec.hxx index f655ee54431a..60bd018c159b 100644 --- a/package/source/manifest/Base64Codec.hxx +++ b/package/source/manifest/Base64Codec.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,3 +44,5 @@ public: static void decodeBase64(com::sun::star::uno::Sequence<sal_Int8>& aPass, const rtl::OUString& sBuffer); }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/manifest/ManifestDefines.hxx b/package/source/manifest/ManifestDefines.hxx index a34648d892ec..969f4d834835 100644 --- a/package/source/manifest/ManifestDefines.hxx +++ b/package/source/manifest/ManifestDefines.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -78,3 +79,5 @@ #define PBKDF2_URL "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0#pbkdf2" #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/manifest/ManifestExport.cxx b/package/source/manifest/ManifestExport.cxx index 068ff48e2c69..b5dc6c049440 100644 --- a/package/source/manifest/ManifestExport.cxx +++ b/package/source/manifest/ManifestExport.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,6 +47,9 @@ using namespace ::com::sun::star; +using ::rtl::OUString; +using ::rtl::OUStringBuffer; + ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHandler, const uno::Sequence< uno::Sequence < beans::PropertyValue > >& rManList ) { const ::rtl::OUString sFileEntryElement ( RTL_CONSTASCII_USTRINGPARAM ( ELEMENT_FILE_ENTRY ) ); @@ -169,11 +173,7 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa { // this is ODF12 generation, let encrypted streams contain start-key-generation entry bStoreStartKeyGeneration = sal_True; - - // starting from ODF12 the version should be also in manifest:manifest element - pRootAttrList->AddAttribute ( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( ATTRIBUTE_VERSION ) ), - sCdataAttribute, - aDocVersion ); + pRootAttrList->AddAttribute ( sVersionAttribute, sCdataAttribute, aDocVersion ); } } else @@ -390,3 +390,5 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa xHandler->endElement( sManifestElement ); xHandler->endDocument(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/manifest/ManifestExport.hxx b/package/source/manifest/ManifestExport.hxx index 13407a9dbbe2..73b8cce89725 100644 --- a/package/source/manifest/ManifestExport.hxx +++ b/package/source/manifest/ManifestExport.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,3 +45,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx index 08999765cf7d..f685f7ea87fb 100644 --- a/package/source/manifest/ManifestImport.cxx +++ b/package/source/manifest/ManifestImport.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,7 +31,6 @@ #include <ManifestImport.hxx> #include <ManifestDefines.hxx> #include <Base64Codec.hxx> - #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <com/sun/star/xml/crypto/DigestID.hpp> #include <com/sun/star/xml/crypto/CipherID.hpp> @@ -39,9 +39,10 @@ using namespace com::sun::star::uno; using namespace com::sun::star::beans; using namespace com::sun::star; -using namespace rtl; using namespace std; +using ::rtl::OUString; + // --------------------------------------------------- ManifestImport::ManifestImport( vector < Sequence < PropertyValue > > & rNewManVector ) : nNumProperty ( 0 ) @@ -159,7 +160,7 @@ void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Re else if ( aStack.size() > 1 ) { ManifestStack::reverse_iterator aIter = aStack.rbegin(); - aIter++; + ++aIter; if ( aIter->m_aConvertedName.equals( sFileEntryElement ) ) { @@ -418,7 +419,7 @@ void SAL_CALL ManifestImport::setDocumentLocator( const uno::Reference< xml::sax ::rtl::OUString ManifestImport::ConvertName( const ::rtl::OUString& aName ) { ::rtl::OUString aConvertedName; - for ( ManifestStack::reverse_iterator aIter = aStack.rbegin(); !aConvertedName.getLength() && aIter != aStack.rend(); aIter++ ) + for ( ManifestStack::reverse_iterator aIter = aStack.rbegin(); !aConvertedName.getLength() && aIter != aStack.rend(); ++aIter ) { if ( !aIter->m_aNamespaces.empty() ) aConvertedName = ConvertNameWithNamespace( aName, aIter->m_aNamespaces ); @@ -430,3 +431,4 @@ void SAL_CALL ManifestImport::setDocumentLocator( const uno::Reference< xml::sax return aConvertedName; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/manifest/ManifestImport.hxx index 8c42960c220f..1c646a7952a6 100644 --- a/package/source/manifest/ManifestImport.hxx +++ b/package/source/manifest/ManifestImport.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ #define _MANIFEST_IMPORT_HXX #include <cppuhelper/implbase1.hxx> // helper for implementations -#ifndef _COM_SUN_STAR_XML_SAX_XDUCUMENTHANDLER_HPP_ #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -#endif #include <vector> #include <HashMaps.hxx> @@ -41,7 +40,7 @@ namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } -typedef ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash, eqFunc > StringHashMap; +typedef ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash, eqFunc > StringHashMap; struct ManifestScopeEntry { @@ -151,3 +150,5 @@ public: throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/manifest/ManifestReader.cxx b/package/source/manifest/ManifestReader.cxx index 5beefc177b39..9e973a65d31e 100644 --- a/package/source/manifest/ManifestReader.cxx +++ b/package/source/manifest/ManifestReader.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,24 +31,13 @@ #include <ManifestReader.hxx> #include <ManifestImport.hxx> #include <cppuhelper/factory.hxx> -#ifndef _COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -#endif -#ifndef _COM_SUN_STAR_XML_SAX_SAXPARSEEXCEPTION_HPP #include <com/sun/star/xml/sax/SAXParseException.hpp> -#endif -#ifndef _COM_SUN_STAR_XML_SAX_XPARSER_HPP #include <com/sun/star/xml/sax/XParser.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#endif #include <vector> -using namespace ::rtl; using namespace ::std; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -57,6 +47,7 @@ using namespace ::com::sun::star::registry; using namespace ::com::sun::star::packages; using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::packages::manifest; +using ::rtl::OUString; ManifestReader::ManifestReader( const Reference < XMultiServiceFactory > & xNewFactory ) : xFactory ( xNewFactory ) @@ -148,3 +139,5 @@ Reference < XSingleServiceFactory > ManifestReader::createServiceFactory( Refere ManifestReader_createInstance, static_getSupportedServiceNames()); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/manifest/ManifestReader.hxx b/package/source/manifest/ManifestReader.hxx index 92c99587f212..7454e26b0e98 100644 --- a/package/source/manifest/ManifestReader.hxx +++ b/package/source/manifest/ManifestReader.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,12 +30,8 @@ #define _MANIFEST_READER_HXX #include <cppuhelper/implbase2.hxx> -#ifndef _COM_SUN_STAR_PACKAGES_MANIFEST_XMANIFESTREADER_HPP #include <com/sun/star/packages/manifest/XManifestReader.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XPSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; class XSingleServiceFactory; } @@ -71,3 +68,5 @@ public: static ::com::sun::star::uno::Reference < com::sun::star::lang::XSingleServiceFactory > createServiceFactory( com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > const & rServiceFactory ); }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/manifest/ManifestWriter.cxx b/package/source/manifest/ManifestWriter.cxx index dc4dbea2486e..ef829ff5ac03 100644 --- a/package/source/manifest/ManifestWriter.cxx +++ b/package/source/manifest/ManifestWriter.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,21 +31,11 @@ #include <ManifestWriter.hxx> #include <ManifestExport.hxx> #include <cppuhelper/factory.hxx> -#ifndef _COM_SUN_STAR_IO_XACTIVEDATASOURCE_HPP #include <com/sun/star/io/XActiveDataSource.hpp> -#endif -#ifndef _COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_XML_SAX_SAXEXCEPTION_HPP #include <com/sun/star/xml/sax/SAXException.hpp> -#endif #include <osl/diagnose.hxx> @@ -133,3 +124,5 @@ Reference < XSingleServiceFactory > ManifestWriter::createServiceFactory( Refere ManifestWriter_createInstance, static_getSupportedServiceNames()); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/manifest/ManifestWriter.hxx b/package/source/manifest/ManifestWriter.hxx index 3c5097e55cb2..eac775b08ad2 100644 --- a/package/source/manifest/ManifestWriter.hxx +++ b/package/source/manifest/ManifestWriter.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,12 +30,8 @@ #define _MANIFEST_WRITER_HXX #include <cppuhelper/implbase2.hxx> -#ifndef _COM_SUN_STAR_PACKAGES_MANIFEST_XMANIFESTWRITER_HPP #include <com/sun/star/packages/manifest/XManifestWriter.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XPSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; class XSingleServiceFactory; } @@ -72,3 +69,4 @@ public: }; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/manifest/UnoRegister.cxx b/package/source/manifest/UnoRegister.cxx index 41b35c95af57..d26deb81ec84 100644 --- a/package/source/manifest/UnoRegister.cxx +++ b/package/source/manifest/UnoRegister.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,15 +31,12 @@ #include <ManifestReader.hxx> #include <ManifestWriter.hxx> #include <cppuhelper/factory.hxx> -#ifndef _COM_SUN_STAR_REGISTRY_XREGISTRYKEY_HPP #include <com/sun/star/registry/XRegistryKey.hpp> -#endif -#include <vos/diagnose.hxx> +#include <osl/diagnose.h> #include <ZipPackage.hxx> #include <zipfileaccess.hxx> -using namespace ::rtl; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -47,9 +45,11 @@ using namespace ::com::sun::star::registry; using namespace ::com::sun::star::packages; using namespace ::com::sun::star::packages::manifest; +using rtl::OUString; + // C functions to implement this as a component -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; @@ -62,7 +62,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( * @param pRegistryKey registry data key to read and write component persistent data * @return a component factory (generic uno interface) */ -extern "C" void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; @@ -90,3 +90,4 @@ extern "C" void * SAL_CALL component_getFactory( return pRet; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/xstor/disposelistener.cxx b/package/source/xstor/disposelistener.cxx index 73c0689a6a40..97b06e790051 100644 --- a/package/source/xstor/disposelistener.cxx +++ b/package/source/xstor/disposelistener.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,3 +56,4 @@ void SAL_CALL OChildDispListener_Impl::disposing( const lang::EventObject& Sourc m_pStorage->ChildIsDisposed( Source.Source ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/xstor/disposelistener.hxx b/package/source/xstor/disposelistener.hxx index 73feb249e3de..8c8e02096027 100644 --- a/package/source/xstor/disposelistener.hxx +++ b/package/source/xstor/disposelistener.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/xstor/ocompinstream.cxx b/package/source/xstor/ocompinstream.cxx index fcb118f4b967..1a95d186e7be 100644 --- a/package/source/xstor/ocompinstream.cxx +++ b/package/source/xstor/ocompinstream.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -656,12 +657,12 @@ uno::Any SAL_CALL OInputCompStream::getPropertyValue( const ::rtl::OUString& aPr } ::rtl::OUString aPropertyName; - if ( aProp.equalsAscii( "IsEncrypted" ) ) + if ( aProp.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsEncrypted" ) ) ) aPropertyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Encrypted" ) ); else aPropertyName = aProp; - if ( aPropertyName.equalsAscii( "RelationsInfo" ) ) + if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "RelationsInfo" ) ) ) throw beans::UnknownPropertyException(); // TODO // all the provided properties are accessible @@ -757,3 +758,4 @@ void SAL_CALL OInputCompStream::removeVetoableChangeListener( } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/xstor/ocompinstream.hxx b/package/source/xstor/ocompinstream.hxx index fcb472e3f92a..98bafe333efb 100644 --- a/package/source/xstor/ocompinstream.hxx +++ b/package/source/xstor/ocompinstream.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -126,3 +127,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/xstor/ohierarchyholder.cxx b/package/source/xstor/ohierarchyholder.cxx index 32ebc7068ec3..8a4908e27cbc 100644 --- a/package/source/xstor/ohierarchyholder.cxx +++ b/package/source/xstor/ohierarchyholder.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -196,7 +197,6 @@ void OHierarchyElement_Impl::RemoveStreamHierarchically( OStringList_Impl& aList } else { - sal_Bool bNewElement = sal_False; ::rtl::Reference< OHierarchyElement_Impl > aElement; OHierarchyElementList_Impl::iterator aIter = m_aChildren.find( aNextName ); if ( aIter != m_aChildren.end() ) @@ -204,7 +204,6 @@ void OHierarchyElement_Impl::RemoveStreamHierarchically( OStringList_Impl& aList if ( !aElement.is() ) { - bNewElement = sal_True; uno::Reference< embed::XStorage > xChildStorage = xOwnStor->openStorageElement( aNextName, embed::ElementModes::READWRITE ); if ( !xChildStorage.is() ) @@ -359,3 +358,4 @@ void SAL_CALL OHierarchyElement_Impl::reverted( const ::com::sun::star::lang::Ev { } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/xstor/ohierarchyholder.hxx b/package/source/xstor/ohierarchyholder.hxx index d36d784ac839..15c207ff5ab9 100644 --- a/package/source/xstor/ohierarchyholder.hxx +++ b/package/source/xstor/ohierarchyholder.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,7 +38,7 @@ #include <rtl/ref.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <list> #include <vector> @@ -51,7 +52,7 @@ struct eqFunc return r1 == r2; } }; -typedef ::std::hash_map< ::rtl::OUString, +typedef ::boost::unordered_map< ::rtl::OUString, ::rtl::Reference< OHierarchyElement_Impl >, ::rtl::OUStringHash, eqFunc > OHierarchyElementList_Impl; @@ -139,3 +140,4 @@ public: #endif // _OHIERARCHYHOLDER +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/xstor/oseekinstream.cxx b/package/source/xstor/oseekinstream.cxx index 0cd3f595c2b3..0c8ee1527b0d 100644 --- a/package/source/xstor/oseekinstream.cxx +++ b/package/source/xstor/oseekinstream.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -178,3 +179,4 @@ sal_Int64 SAL_CALL OInputSeekStream::getLength() return m_xSeekable->getLength(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/xstor/oseekinstream.hxx b/package/source/xstor/oseekinstream.hxx index 92a611af16aa..8203be6ec8b9 100644 --- a/package/source/xstor/oseekinstream.hxx +++ b/package/source/xstor/oseekinstream.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -66,3 +67,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx index 2fd6a47c12ff..d4af5eefad66 100644 --- a/package/source/xstor/owriteablestream.cxx +++ b/package/source/xstor/owriteablestream.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -100,7 +101,7 @@ void StaticAddLog( const ::rtl::OUString& aMessage ) xLogRing->logString( aMessage ); } } - catch( uno::Exception& ) + catch( const uno::Exception& ) { // No log } @@ -121,11 +122,11 @@ void SetEncryptionKeyProperty_Impl( const uno::Reference< beans::XPropertySet >& try { xPropertySet->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STORAGE_ENCRYPTION_KEYS_PROPERTY ) ), uno::makeAny( aKey ) ); } - catch ( uno::Exception& aException ) + catch ( const uno::Exception& rException ) { - ::package::StaticAddLog( aException.Message ); - ::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Can't set encryption" ) ) ); - OSL_ENSURE( sal_False, "Can't write encryption related properties!\n" ); + ::package::StaticAddLog( rException.Message ); + ::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Can't set encryption") ) ); + OSL_FAIL( "Can't write encryption related properties!\n" ); throw io::IOException(); // TODO } } @@ -140,12 +141,12 @@ uno::Any GetEncryptionKeyProperty_Impl( const uno::Reference< beans::XPropertySe try { return xPropertySet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STORAGE_ENCRYPTION_KEYS_PROPERTY ) ) ); } - catch ( uno::Exception& aException ) + catch ( const uno::Exception& rException ) { - ::package::StaticAddLog( aException.Message ); + ::package::StaticAddLog( rException.Message ); ::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Can't get encryption property" ) ) ); - OSL_ENSURE( sal_False, "Can't get encryption related properties!\n" ); + OSL_FAIL( "Can't get encryption related properties!\n" ); throw io::IOException(); // TODO } } @@ -224,7 +225,7 @@ sal_Bool KillFile( const ::rtl::OUString& aURL, const uno::Reference< lang::XMul { uno::Reference < ucb::XSimpleFileAccess > xAccess( xFactory->createInstance ( - ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess" ) ) ), uno::UNO_QUERY ); if ( xAccess.is() ) @@ -233,10 +234,10 @@ sal_Bool KillFile( const ::rtl::OUString& aURL, const uno::Reference< lang::XMul bRet = sal_True; } } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - ::package::StaticAddLog( aException.Message ); - ::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Quiet exception" ) ) ); + ::package::StaticAddLog( rException.Message ); + ::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Quiet exception") ) ); } return bRet; @@ -250,21 +251,21 @@ const sal_Int32 n_ConstBufferSize = 32000; ::rtl::OUString aTempURL; uno::Reference < beans::XPropertySet > xTempFile( - xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ), + xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile") ) ), uno::UNO_QUERY ); if ( !xTempFile.is() ) throw uno::RuntimeException(); // TODO try { - xTempFile->setPropertyValue( ::rtl::OUString::createFromAscii( "RemoveFile" ), uno::makeAny( sal_False ) ); - uno::Any aUrl = xTempFile->getPropertyValue( ::rtl::OUString::createFromAscii( "Uri" ) ); + xTempFile->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RemoveFile") ), uno::makeAny( sal_False ) ); + uno::Any aUrl = xTempFile->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Uri") ) ); aUrl >>= aTempURL; } - catch ( uno::Exception& aException ) + catch ( const uno::Exception& rException ) { - ::package::StaticAddLog( aException.Message ); - ::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Quiet exception" ) ) ); + ::package::StaticAddLog( rException.Message ); + ::package::StaticAddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Quiet exception") ) ); } if ( !aTempURL.getLength() ) @@ -279,7 +280,7 @@ uno::Reference< io::XStream > CreateMemoryStream( const uno::Reference< lang::XM if ( !xFactory.is() ) throw uno::RuntimeException(); - return uno::Reference< io::XStream >( xFactory->createInstance ( ::rtl::OUString::createFromAscii( "com.sun.star.comp.MemoryStream" ) ), uno::UNO_QUERY_THROW ); + return uno::Reference< io::XStream >( xFactory->createInstance (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.MemoryStream") ) ), uno::UNO_QUERY_THROW); } } // anonymous namespace @@ -344,7 +345,7 @@ void OWriteStream_Impl::CleanCacheStream() if ( xInputCache.is() ) xInputCache->closeInput(); } - catch( uno::Exception& ) + catch( const uno::Exception& ) {} try @@ -353,7 +354,7 @@ void OWriteStream_Impl::CleanCacheStream() if ( xOutputCache.is() ) xOutputCache->closeOutput(); } - catch( uno::Exception& ) + catch( const uno::Exception& ) {} m_xCacheStream = uno::Reference< io::XStream >(); @@ -372,7 +373,7 @@ void OWriteStream_Impl::AddLog( const ::rtl::OUString& aMessage ) if ( aContext.is() ) m_xLogRing.set( aContext.getSingleton( "com.sun.star.logging.DocumentIOLogRing" ), uno::UNO_QUERY_THROW ); } - catch( uno::Exception& ) + catch( const uno::Exception& ) { // No log } @@ -422,21 +423,21 @@ sal_Bool OWriteStream_Impl::IsEncrypted() uno::Reference< beans::XPropertySet > xPropSet( m_xPackageStream, uno::UNO_QUERY ); if ( xPropSet.is() ) { - uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString::createFromAscii( "WasEncrypted" ) ); + uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WasEncrypted") ) ); if ( !( aValue >>= bWasEncr ) ) { - OSL_ENSURE( sal_False, "The property WasEncrypted has wrong type!\n" ); + OSL_FAIL( "The property WasEncrypted has wrong type!\n" ); } } sal_Bool bToBeEncr = sal_False; for ( sal_Int32 nInd = 0; nInd < m_aProps.getLength(); nInd++ ) { - if ( m_aProps[nInd].Name.equalsAscii( "Encrypted" ) ) + if ( m_aProps[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Encrypted" ) ) ) { if ( !( m_aProps[nInd].Value >>= bToBeEncr ) ) { - OSL_ENSURE( sal_False, "The property has wrong type!\n" ); + OSL_FAIL( "The property has wrong type!\n" ); } } } @@ -483,7 +484,7 @@ void OWriteStream_Impl::SetDecrypted() for ( sal_Int32 nInd = 0; nInd < m_aProps.getLength(); nInd++ ) { - if ( m_aProps[nInd].Name.equalsAscii( "Encrypted" ) ) + if ( m_aProps[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Encrypted" ) ) ) m_aProps[nInd].Value <<= sal_False; } } @@ -507,7 +508,7 @@ void OWriteStream_Impl::SetEncrypted( const ::comphelper::SequenceAsHashMap& aEn // introduce encryption info for ( sal_Int32 nInd = 0; nInd < m_aProps.getLength(); nInd++ ) { - if ( m_aProps[nInd].Name.equalsAscii( "Encrypted" ) ) + if ( m_aProps[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Encrypted" ) ) ) m_aProps[nInd].Value <<= sal_True; } @@ -526,10 +527,10 @@ void OWriteStream_Impl::DisposeWrappers() try { m_pAntiImpl->dispose(); } - catch ( uno::RuntimeException& aRuntimeException ) + catch ( const uno::RuntimeException& rRuntimeException ) { - AddLog( aRuntimeException.Message ); - AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Quiet exception" ) ) ); + AddLog( rRuntimeException.Message ); + AddLog( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(OSL_LOG_PREFIX "Quiet exception") ) ); } m_pAntiImpl = NULL; @@ -569,11 +570,11 @@ uno::Reference< lang::XMultiServiceFactory > OWriteStream_Impl::GetServiceFactor ::rtl::OUString aTempURL = GetNewTempFileURL( GetServiceFactory() ); try { - if ( aTempURL && xStream.is() ) + if ( aTempURL.getLength() && xStream.is() ) { uno::Reference < ucb::XSimpleFileAccess > xTempAccess( GetServiceFactory()->createInstance ( - ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess") ) ), uno::UNO_QUERY ); if ( !xTempAccess.is() ) @@ -591,18 +592,18 @@ uno::Reference< lang::XMultiServiceFactory > OWriteStream_Impl::GetServiceFactor throw io::IOException(); // TODO: } } - catch( packages::WrongPasswordException& aWrongPasswordException ) + catch( const packages::WrongPasswordException& rWrongPasswordException ) { - AddLog( aWrongPasswordException.Message ); - AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); + AddLog( rWrongPasswordException.Message ); + AddLog( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow") ) ); KillFile( aTempURL, GetServiceFactory() ); throw; } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - AddLog( aException.Message ); - AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); + AddLog( rException.Message ); + AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow") ) ); KillFile( aTempURL, GetServiceFactory() ); throw; @@ -663,7 +664,7 @@ uno::Reference< lang::XMultiServiceFactory > OWriteStream_Impl::GetServiceFactor { uno::Reference < ucb::XSimpleFileAccess > xTempAccess( GetServiceFactory()->createInstance ( - ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess") ) ), uno::UNO_QUERY ); if ( !xTempAccess.is() ) @@ -685,14 +686,14 @@ uno::Reference< lang::XMultiServiceFactory > OWriteStream_Impl::GetServiceFactor throw io::IOException(); // TODO: } } - catch( packages::WrongPasswordException& ) + catch( const packages::WrongPasswordException& ) { KillFile( m_aTempURL, GetServiceFactory() ); m_aTempURL = ::rtl::OUString(); throw; } - catch( uno::Exception& ) + catch( const uno::Exception& ) { KillFile( m_aTempURL, GetServiceFactory() ); m_aTempURL = ::rtl::OUString(); @@ -719,7 +720,7 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetTempFileAsStream() // the temporary file is not used if the cache is used uno::Reference < ucb::XSimpleFileAccess > xTempAccess( GetServiceFactory()->createInstance ( - ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess") ) ), uno::UNO_QUERY ); if ( !xTempAccess.is() ) @@ -729,10 +730,10 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetTempFileAsStream() { xTempStream = xTempAccess->openFileReadWrite( m_aTempURL ); } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - AddLog( aException.Message ); - AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Quiet exception" ) ) ); + AddLog( rException.Message ); + AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Quiet exception" ) ) ); } } } @@ -764,7 +765,7 @@ uno::Reference< io::XInputStream > OWriteStream_Impl::GetTempFileAsInputStream() // the temporary file is not used if the cache is used uno::Reference < ucb::XSimpleFileAccess > xTempAccess( GetServiceFactory()->createInstance ( - ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess") ) ), uno::UNO_QUERY ); if ( !xTempAccess.is() ) @@ -774,9 +775,9 @@ uno::Reference< io::XInputStream > OWriteStream_Impl::GetTempFileAsInputStream() { xInputStream = xTempAccess->openFileRead( m_aTempURL ); } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - AddLog( aException.Message ); + AddLog( rException.Message ); AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Quiet exception" ) ) ); } } @@ -844,7 +845,7 @@ void OWriteStream_Impl::InsertStreamDirectly( const uno::Reference< io::XInputSt { xPropertySet->setPropertyValue( aProps[nInd].Name, aProps[nInd].Value ); } - else if ( m_nStorageType == embed::StorageFormats::PACKAGE && aProps[nInd].Name.equalsAscii( "UseCommonStoragePasswordEncryption" ) ) + else if ( m_nStorageType == embed::StorageFormats::PACKAGE && aProps[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UseCommonStoragePasswordEncryption" ) ) ) aProps[nInd].Value >>= m_bUseCommonEncryption; else throw lang::IllegalArgumentException(); @@ -870,9 +871,9 @@ void OWriteStream_Impl::InsertStreamDirectly( const uno::Reference< io::XInputSt throw uno::RuntimeException(); // set to be encrypted but do not use encryption key - xPropertySet->setPropertyValue( ::rtl::OUString::createFromAscii( STORAGE_ENCRYPTION_KEYS_PROPERTY ), + xPropertySet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( STORAGE_ENCRYPTION_KEYS_PROPERTY ) ), uno::makeAny( uno::Sequence< beans::NamedValue >() ) ); - xPropertySet->setPropertyValue( ::rtl::OUString::createFromAscii( "Encrypted" ), + xPropertySet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Encrypted") ), uno::makeAny( sal_True ) ); } @@ -923,7 +924,7 @@ void OWriteStream_Impl::Commit() { xInStream.set( static_cast< io::XInputStream* >( new OSelfTerminateFileStream( GetServiceFactory(), m_aTempURL ) ), uno::UNO_QUERY ); } - catch( uno::Exception& ) + catch( const uno::Exception& ) { } @@ -951,7 +952,7 @@ void OWriteStream_Impl::Commit() for ( sal_Int32 nInd = 0; nInd < m_aProps.getLength(); nInd++ ) { - if ( m_aProps[nInd].Name.equalsAscii( "Size" ) ) + if ( m_aProps[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Size" ) ) ) { if ( m_pAntiImpl && !m_bHasInsertedStreamOptimization && m_pAntiImpl->m_xSeekable.is() ) { @@ -969,9 +970,9 @@ void OWriteStream_Impl::Commit() throw uno::RuntimeException(); // set to be encrypted but do not use encryption key - xPropertySet->setPropertyValue( ::rtl::OUString::createFromAscii( STORAGE_ENCRYPTION_KEYS_PROPERTY ), + xPropertySet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( STORAGE_ENCRYPTION_KEYS_PROPERTY ) ), uno::makeAny( uno::Sequence< beans::NamedValue >() ) ); - xPropertySet->setPropertyValue( ::rtl::OUString::createFromAscii( "Encrypted" ), + xPropertySet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Encrypted") ), uno::makeAny( sal_True ) ); } else if ( m_bHasCachedEncryptionData ) @@ -979,7 +980,7 @@ void OWriteStream_Impl::Commit() if ( m_nStorageType != embed::StorageFormats::PACKAGE ) throw uno::RuntimeException(); - xPropertySet->setPropertyValue( ::rtl::OUString::createFromAscii( STORAGE_ENCRYPTION_KEYS_PROPERTY ), + xPropertySet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( STORAGE_ENCRYPTION_KEYS_PROPERTY ) ), uno::makeAny( m_aEncryptionData.getAsConstNamedValueList() ) ); } @@ -1064,14 +1065,14 @@ uno::Sequence< beans::PropertyValue > OWriteStream_Impl::InsertOwnProps( if ( m_nStorageType == embed::StorageFormats::PACKAGE ) { for ( sal_Int32 nInd = 0; nInd < nLen; nInd++ ) - if ( aResult[nInd].Name.equalsAscii( "UseCommonStoragePasswordEncryption" ) ) + if ( aResult[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UseCommonStoragePasswordEncryption" ) ) ) { aResult[nInd].Value <<= bUseCommonEncryption; return aResult; } aResult.realloc( ++nLen ); - aResult[nLen - 1].Name = ::rtl::OUString::createFromAscii( "UseCommonStoragePasswordEncryption" ); + aResult[nLen - 1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseCommonStoragePasswordEncryption") ); aResult[nLen - 1].Value <<= bUseCommonEncryption; } else if ( m_nStorageType == embed::StorageFormats::OFOPXML ) @@ -1088,14 +1089,14 @@ uno::Sequence< beans::PropertyValue > OWriteStream_Impl::InsertOwnProps( uno::Reference< uno::XInterface >() ); for ( sal_Int32 nInd = 0; nInd < nLen; nInd++ ) - if ( aResult[nInd].Name.equalsAscii( "RelationsInfo" ) ) + if ( aResult[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "RelationsInfo" ) ) ) { aResult[nInd].Value = aValue; return aResult; } aResult.realloc( ++nLen ); - aResult[nLen - 1].Name = ::rtl::OUString::createFromAscii( "RelationsInfo" ); + aResult[nLen - 1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RelationsInfo") ); aResult[nLen - 1].Value = aValue; } @@ -1131,9 +1132,9 @@ void OWriteStream_Impl::ReadRelInfoIfNecessary() m_xOrigRelInfoStream = uno::Reference< io::XInputStream >(); m_nRelInfoStatus = RELINFO_READ; } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - AddLog( aException.Message ); + AddLog( rException.Message ); AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Quiet exception" ) ) ); m_nRelInfoStatus = RELINFO_BROKEN; @@ -1153,7 +1154,7 @@ void OWriteStream_Impl::ReadRelInfoIfNecessary() m_nRelInfoStatus = RELINFO_CHANGED_STREAM_READ; } - catch( uno::Exception ) + catch( const uno::Exception& ) { m_nRelInfoStatus = RELINFO_CHANGED_BROKEN; } @@ -1177,17 +1178,17 @@ uno::Sequence< beans::PropertyValue > OWriteStream_Impl::ReadPackageStreamProper if ( m_nStorageType == embed::StorageFormats::OFOPXML || m_nStorageType == embed::StorageFormats::PACKAGE ) { - aResult[0].Name = ::rtl::OUString::createFromAscii("MediaType"); - aResult[1].Name = ::rtl::OUString::createFromAscii("Compressed"); - aResult[2].Name = ::rtl::OUString::createFromAscii("Size"); + aResult[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType") ); + aResult[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Compressed") ); + aResult[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Size") ); if ( m_nStorageType == embed::StorageFormats::PACKAGE ) - aResult[3].Name = ::rtl::OUString::createFromAscii("Encrypted"); + aResult[3].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Encrypted") ); } else { - aResult[0].Name = ::rtl::OUString::createFromAscii("Compressed"); - aResult[1].Name = ::rtl::OUString::createFromAscii("Size"); + aResult[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Compressed") ); + aResult[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Size") ); } @@ -1201,18 +1202,18 @@ uno::Sequence< beans::PropertyValue > OWriteStream_Impl::ReadPackageStreamProper try { aResult[nInd].Value = xPropSet->getPropertyValue( aResult[nInd].Name ); } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - AddLog( aException.Message ); + AddLog( rException.Message ); AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Quiet exception" ) ) ); - OSL_ENSURE( sal_False, "A property can't be retrieved!\n" ); + OSL_FAIL( "A property can't be retrieved!\n" ); } } } else { - OSL_ENSURE( sal_False, "Can not get properties from a package stream!\n" ); + OSL_FAIL( "Can not get properties from a package stream!\n" ); throw uno::RuntimeException(); } @@ -1322,19 +1323,19 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetStream( sal_Int32 nStreamMod m_bHasCachedEncryptionData = sal_True; m_aEncryptionData = aEncryptionData; } - catch( packages::WrongPasswordException& aWrongPasswordException ) + catch( const packages::WrongPasswordException& rWrongPasswordException ) { SetEncryptionKeyProperty_Impl( xPropertySet, uno::Sequence< beans::NamedValue >() ); - AddLog( aWrongPasswordException.Message ); + AddLog( rWrongPasswordException.Message ); AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch ( uno::Exception& aException ) + catch ( const uno::Exception& rException ) { - AddLog( aException.Message ); + AddLog( rException.Message ); AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Quiet exception" ) ) ); - OSL_ENSURE( sal_False, "Can't write encryption related properties!\n" ); + OSL_FAIL( "Can't write encryption related properties!\n" ); SetEncryptionKeyProperty_Impl( xPropertySet, uno::Sequence< beans::NamedValue >() ); throw io::IOException(); // TODO: } @@ -1364,9 +1365,9 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetStream( sal_Int32 nStreamMod { aGlobalEncryptionData = GetCommonRootEncryptionData(); } - catch( packages::NoEncryptionException& aNoEncryptionException ) + catch( const packages::NoEncryptionException& rNoEncryptionException ) { - AddLog( aNoEncryptionException.Message ); + AddLog( rNoEncryptionException.Message ); AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw packages::WrongPasswordException(); @@ -1552,7 +1553,7 @@ void OWriteStream_Impl::CreateReadonlyCopyBasedOnData( const uno::Reference< io: uno::Reference < io::XStream > xTempFile; if ( !xTargetStream.is() ) xTempFile = uno::Reference < io::XStream >( - m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ), + m_xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile") ) ), uno::UNO_QUERY ); else xTempFile = xTargetStream; @@ -1601,9 +1602,9 @@ void OWriteStream_Impl::GetCopyOfLastCommit( uno::Reference< io::XStream >& xTar { aGlobalEncryptionData = GetCommonRootEncryptionData(); } - catch( packages::NoEncryptionException& aNoEncryptionException ) + catch( const packages::NoEncryptionException& rNoEncryptionException ) { - AddLog( aNoEncryptionException.Message ); + AddLog( rNoEncryptionException.Message ); AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "No Element" ) ) ); throw packages::WrongPasswordException(); @@ -1647,12 +1648,12 @@ void OWriteStream_Impl::GetCopyOfLastCommit( uno::Reference< io::XStream >& xTar throw uno::RuntimeException(); sal_Bool bEncr = sal_False; - xProps->getPropertyValue( ::rtl::OUString::createFromAscii( "Encrypted" ) ) >>= bEncr; + xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Encrypted") ) ) >>= bEncr; if ( !bEncr ) throw packages::NoEncryptionException(); uno::Sequence< beans::NamedValue > aPackKey; - xProps->getPropertyValue( ::rtl::OUString::createFromAscii( STORAGE_ENCRYPTION_KEYS_PROPERTY ) ) >>= aPackKey; + xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( STORAGE_ENCRYPTION_KEYS_PROPERTY ) ) ) >>= aPackKey; if ( !SequencesEqual( aKey, aPackKey ) ) throw packages::WrongPasswordException(); @@ -1669,15 +1670,15 @@ void OWriteStream_Impl::GetCopyOfLastCommit( uno::Reference< io::XStream >& xTar if ( !xDataToCopy.is() ) { - OSL_ENSURE( sal_False, "Encrypted ZipStream must already have input stream inside!\n" ); + OSL_FAIL( "Encrypted ZipStream must already have input stream inside!\n" ); SetEncryptionKeyProperty_Impl( xPropertySet, uno::Sequence< beans::NamedValue >() ); } } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - OSL_ENSURE( sal_False, "Can't open encrypted stream!\n" ); + OSL_FAIL( "Can't open encrypted stream!\n" ); SetEncryptionKeyProperty_Impl( xPropertySet, uno::Sequence< beans::NamedValue >() ); - AddLog( aException.Message ); + AddLog( rException.Message ); AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } @@ -1852,9 +1853,9 @@ OWriteStream::~OWriteStream() try { dispose(); } - catch( uno::RuntimeException& aRuntimeException ) + catch( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Quiet exception" ) ) ); } } @@ -1937,7 +1938,7 @@ void OWriteStream::CopyToStreamInternally_Impl( const uno::Reference< io::XStrea try { ::comphelper::OStorageHelper::CopyInputToOutput( m_xInStream, xDestOutStream ); } - catch ( uno::Exception& e ) + catch ( const uno::Exception& e ) { eThrown = e; bThrown = sal_True; @@ -1948,13 +1949,13 @@ void OWriteStream::CopyToStreamInternally_Impl( const uno::Reference< io::XStrea try { m_xSeekable->seek( nCurPos ); } - catch ( uno::Exception& aException ) + catch ( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Quiet exception" ) ) ); // TODO: set the stoream in invalid state or dispose - OSL_ENSURE( sal_False, "The stream become invalid during copiing!\n" ); + OSL_FAIL( "The stream become invalid during copiing!\n" ); throw uno::RuntimeException(); } @@ -1963,16 +1964,16 @@ void OWriteStream::CopyToStreamInternally_Impl( const uno::Reference< io::XStrea // now the properties can be copied // the order of the properties setting is not important for StorageStream API - ::rtl::OUString aPropName = ::rtl::OUString::createFromAscii( "Compressed" ); + ::rtl::OUString aPropName (RTL_CONSTASCII_USTRINGPARAM("Compressed") ); xDestProps->setPropertyValue( aPropName, getPropertyValue( aPropName ) ); if ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE || m_pData->m_nStorageType == embed::StorageFormats::OFOPXML ) { - aPropName = ::rtl::OUString::createFromAscii( "MediaType" ); + aPropName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType" ) ); xDestProps->setPropertyValue( aPropName, getPropertyValue( aPropName ) ); if ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE ) { - aPropName = ::rtl::OUString::createFromAscii( "UseCommonStoragePasswordEncryption" ); + aPropName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseCommonStoragePasswordEncryption") ); xDestProps->setPropertyValue( aPropName, getPropertyValue( aPropName ) ); } } @@ -2454,7 +2455,7 @@ void OWriteStream::CloseOutput_Impl() for ( sal_Int32 nInd = 0; nInd < m_pImpl->m_aProps.getLength(); nInd++ ) { - if ( m_pImpl->m_aProps[nInd].Name.equalsAscii( "Size" ) ) + if ( m_pImpl->m_aProps[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Size" ) ) ) m_pImpl->m_aProps[nInd].Value <<= ((sal_Int32)m_xSeekable->getLength()); } } @@ -2572,7 +2573,7 @@ void SAL_CALL OWriteStream::truncate() if ( !xTruncate.is() ) { - OSL_ENSURE( sal_False, "The output stream must support XTruncate interface!\n" ); + OSL_FAIL( "The output stream must support XTruncate interface!\n" ); throw uno::RuntimeException(); } @@ -2624,14 +2625,14 @@ void SAL_CALL OWriteStream::dispose() m_pImpl->Revert(); } } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); throw lang::WrappedTargetRuntimeException( - ::rtl::OUString::createFromAscii( "Can not commit/revert the storage!\n" ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can not commit/revert the storage!\n") ), uno::Reference< uno::XInterface >( static_cast< OWeakObject* >( this ), uno::UNO_QUERY ), aCaught ); @@ -2769,9 +2770,9 @@ sal_Bool SAL_CALL OWriteStream::hasByID( const ::rtl::OUString& sID ) getRelationshipByID( sID ); return sal_True; } - catch( container::NoSuchElementException& aNoSuchElementException ) + catch( const container::NoSuchElementException& rNoSuchElementException ) { - m_pImpl->AddLog( aNoSuchElementException.Message ); + m_pImpl->AddLog( rNoSuchElementException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "No Element" ) ) ); } @@ -3187,7 +3188,7 @@ void SAL_CALL OWriteStream::setPropertyValue( const ::rtl::OUString& aPropertyNa } } else if ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE - && aPropertyName.equalsAscii( "UseCommonStoragePasswordEncryption" ) ) + && aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UseCommonStoragePasswordEncryption" ) ) ) { sal_Bool bUseCommonEncryption = sal_False; if ( aValue >>= bUseCommonEncryption ) @@ -3219,7 +3220,7 @@ void SAL_CALL OWriteStream::setPropertyValue( const ::rtl::OUString& aPropertyNa m_pImpl->m_aProps[nInd].Value = aValue; } } - else if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML && aPropertyName.equalsAscii( "RelationsInfoStream" ) ) + else if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML && aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "RelationsInfoStream" ) ) ) { uno::Reference< io::XInputStream > xInRelStream; if ( ( aValue >>= xInRelStream ) && xInRelStream.is() ) @@ -3240,7 +3241,7 @@ void SAL_CALL OWriteStream::setPropertyValue( const ::rtl::OUString& aPropertyNa else throw lang::IllegalArgumentException(); // TODO } - else if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML && aPropertyName.equalsAscii( "RelationsInfo" ) ) + else if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML && aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "RelationsInfo" ) ) ) { if ( aValue >>= m_pImpl->m_aNewRelInfo ) { @@ -3248,10 +3249,10 @@ void SAL_CALL OWriteStream::setPropertyValue( const ::rtl::OUString& aPropertyNa else throw lang::IllegalArgumentException(); // TODO } - else if ( aPropertyName.equalsAscii( "Size" ) ) + else if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Size" ) ) ) throw beans::PropertyVetoException(); // TODO else if ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE - && ( aPropertyName.equalsAscii( "IsEncrypted" ) || aPropertyName.equalsAscii( "Encrypted" ) ) ) + && ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsEncrypted" ) ) || aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Encrypted" ) ) ) ) throw beans::PropertyVetoException(); // TODO else throw beans::UnknownPropertyException(); // TODO @@ -3275,21 +3276,21 @@ uno::Any SAL_CALL OWriteStream::getPropertyValue( const ::rtl::OUString& aProp ) throw lang::DisposedException(); } - if ( aProp.equalsAscii( "RelId" ) ) + if ( aProp.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "RelId" ) ) ) { return uno::makeAny( m_pImpl->GetNewRelId() ); } ::rtl::OUString aPropertyName; - if ( aProp.equalsAscii( "IsEncrypted" ) ) + if ( aProp.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsEncrypted" ) ) ) aPropertyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Encrypted" ) ); else aPropertyName = aProp; if ( ( ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE || m_pData->m_nStorageType == embed::StorageFormats::OFOPXML ) - && aPropertyName.equalsAscii( "MediaType" ) ) - || ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE && aPropertyName.equalsAscii( "Encrypted" ) ) - || aPropertyName.equalsAscii( "Compressed" ) ) + && aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) ) + || ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE && aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Encrypted" ) ) ) + || aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Compressed" ) ) ) { m_pImpl->GetStreamProperties(); @@ -3300,9 +3301,9 @@ uno::Any SAL_CALL OWriteStream::getPropertyValue( const ::rtl::OUString& aProp ) } } else if ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE - && aPropertyName.equalsAscii( "UseCommonStoragePasswordEncryption" ) ) + && aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UseCommonStoragePasswordEncryption" ) ) ) return uno::makeAny( m_pImpl->m_bUseCommonEncryption ); - else if ( aPropertyName.equalsAscii( "Size" ) ) + else if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Size" ) ) ) { CheckInitOnDemand(); @@ -3478,31 +3479,31 @@ void SAL_CALL OWriteStream::commit() // when the storage is commited the parent is modified ModifyParentUnlockMutex_Impl( aGuard ); } - catch( io::IOException& aIOException ) + catch( const io::IOException& rIOException ) { - m_pImpl->AddLog( aIOException.Message ); + m_pImpl->AddLog( rIOException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( embed::StorageWrappedTargetException& aStorageWrappedTargetException ) + catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException ) { - m_pImpl->AddLog( aStorageWrappedTargetException.Message ); + m_pImpl->AddLog( rStorageWrappedTargetException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::RuntimeException& aRuntimeException ) + catch( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); - throw embed::StorageWrappedTargetException( ::rtl::OUString::createFromAscii( "Problems on commit!" ), + throw embed::StorageWrappedTargetException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Problems on commit!") ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >( this ) ), aCaught ); } @@ -3542,31 +3543,31 @@ void SAL_CALL OWriteStream::revert() try { m_pImpl->Revert(); } - catch( io::IOException& aIOException ) + catch( const io::IOException& rIOException ) { - m_pImpl->AddLog( aIOException.Message ); + m_pImpl->AddLog( rIOException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( embed::StorageWrappedTargetException& aStorageWrappedTargetException ) + catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException ) { - m_pImpl->AddLog( aStorageWrappedTargetException.Message ); + m_pImpl->AddLog( rStorageWrappedTargetException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::RuntimeException& aRuntimeException ) + catch( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); - throw embed::StorageWrappedTargetException( ::rtl::OUString::createFromAscii( "Problems on revert!" ), + throw embed::StorageWrappedTargetException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Problems on revert!") ), uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >( this ) ), aCaught ); } @@ -3619,3 +3620,4 @@ void SAL_CALL OWriteStream::removeTransactionListener( const uno::Reference< emb } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/xstor/owriteablestream.hxx b/package/source/xstor/owriteablestream.hxx index 08f862b22f6c..0e9884bd75cb 100644 --- a/package/source/xstor/owriteablestream.hxx +++ b/package/source/xstor/owriteablestream.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -189,10 +190,10 @@ public: void AddLog( const ::rtl::OUString& aMessage ); sal_Bool UsesCommonEncryption_Impl() { return m_bUseCommonEncryption; } - sal_Bool HasTempFile_Impl() { return ( m_aTempURL.getLength() != 0 ); } + sal_Bool HasTempFile_Impl() const { return ( m_aTempURL.getLength() != 0 ); } sal_Bool IsTransacted(); - sal_Bool HasWriteOwner_Impl() { return ( m_pAntiImpl != NULL ); } + sal_Bool HasWriteOwner_Impl() const { return ( m_pAntiImpl != NULL ); } void InsertIntoPackageFolder( const ::rtl::OUString& aName, @@ -415,3 +416,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/xstor/register.cxx b/package/source/xstor/register.cxx index 808788345bfc..688d0a9414eb 100644 --- a/package/source/xstor/register.cxx +++ b/package/source/xstor/register.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,12 +41,12 @@ using namespace ::com::sun::star; extern "C" { -void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; @@ -71,3 +72,4 @@ void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServic } // extern "C" +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/xstor/selfterminatefilestream.cxx b/package/source/xstor/selfterminatefilestream.cxx index 61df5e486250..bb4cde077011 100644 --- a/package/source/xstor/selfterminatefilestream.cxx +++ b/package/source/xstor/selfterminatefilestream.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,7 +48,7 @@ OSelfTerminateFileStream::OSelfTerminateFileStream( const uno::Reference< lang:: // otherwise an exception is thrown in constructor m_xFileAccess.set( xOwnFactory->createInstance ( - ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess") ) ), uno::UNO_QUERY_THROW ); m_xInputStream.set( m_xFileAccess->openFileRead( aURL ), uno::UNO_SET_THROW ); @@ -151,3 +152,4 @@ sal_Int64 SAL_CALL OSelfTerminateFileStream::getLength() return m_xSeekable->getLength(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/xstor/selfterminatefilestream.hxx b/package/source/xstor/selfterminatefilestream.hxx index e0dde5d837e8..16bc65c5d6cd 100644 --- a/package/source/xstor/selfterminatefilestream.hxx +++ b/package/source/xstor/selfterminatefilestream.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,3 +75,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/xstor/switchpersistencestream.cxx b/package/source/xstor/switchpersistencestream.cxx index 8756b1d61815..1de56c2163ee 100644 --- a/package/source/xstor/switchpersistencestream.cxx +++ b/package/source/xstor/switchpersistencestream.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -184,7 +185,7 @@ void SwitchablePersistenceStream::CopyAndSwitchPersistenceTo( const uno::Referen if ( !xTargetStream.is() ) { xTargetStream = uno::Reference < io::XStream >( - m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ), + m_xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile") ) ), uno::UNO_QUERY_THROW ); xTargetSeek = uno::Reference< io::XSeekable >( xTargetStream, uno::UNO_QUERY_THROW ); @@ -371,7 +372,7 @@ void SAL_CALL SwitchablePersistenceStream::flush( ) if ( !m_pStreamData || m_pStreamData->m_bInStreamBased ) { - OSL_ENSURE( sal_False, "flush() is not acceptable!\n" ); + OSL_FAIL( "flush() is not acceptable!\n" ); return; // in future throw exception, for now some code might call flush() on closed stream // since file ucp implementation allows it @@ -486,3 +487,4 @@ void SAL_CALL SwitchablePersistenceStream::waitForCompletion() asyncOutputMonitor->waitForCompletion(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/xstor/switchpersistencestream.hxx b/package/source/xstor/switchpersistencestream.hxx index f37d0ed892fa..a1f47b4063db 100644 --- a/package/source/xstor/switchpersistencestream.hxx +++ b/package/source/xstor/switchpersistencestream.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -118,3 +119,4 @@ public: #endif //_SPSTREAM_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/xstor/xfactory.cxx b/package/source/xstor/xfactory.cxx index 12aa89e03db0..80be2484a307 100644 --- a/package/source/xstor/xfactory.cxx +++ b/package/source/xstor/xfactory.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,15 +68,15 @@ sal_Bool CheckPackageSignature_Impl( const uno::Reference< io::XInputStream >& x uno::Sequence< ::rtl::OUString > SAL_CALL OStorageFactory::impl_staticGetSupportedServiceNames() { uno::Sequence< ::rtl::OUString > aRet(2); - aRet[0] = ::rtl::OUString::createFromAscii("com.sun.star.embed.StorageFactory"); - aRet[1] = ::rtl::OUString::createFromAscii("com.sun.star.comp.embed.StorageFactory"); + aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.StorageFactory") ); + aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.StorageFactory") ); return aRet; } //------------------------------------------------------------------------- ::rtl::OUString SAL_CALL OStorageFactory::impl_staticGetImplementationName() { - return ::rtl::OUString::createFromAscii("com.sun.star.comp.embed.StorageFactory"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.StorageFactory") ); } //------------------------------------------------------------------------- @@ -92,7 +93,7 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstance() { // TODO: reimplement TempStream service to support XStream interface uno::Reference < io::XStream > xTempStream( - m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.io.TempFile" ) ), + m_xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile") ) ), uno::UNO_QUERY ); if ( !xTempStream.is() ) @@ -133,7 +134,7 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr { if( !( aArguments[1] >>= nStorageMode ) ) { - OSL_ENSURE( sal_False, "Wrong second argument!\n" ); + OSL_FAIL( "Wrong second argument!\n" ); throw lang::IllegalArgumentException(); // TODO: } // it's allways possible to read written storage in this implementation @@ -153,19 +154,19 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr { if ( !aURL.getLength() ) { - OSL_ENSURE( sal_False, "Empty URL is provided!\n" ); + OSL_FAIL( "Empty URL is provided!\n" ); throw lang::IllegalArgumentException(); // TODO: } if ( aURL.equalsIgnoreAsciiCaseAsciiL( "vnd.sun.star.pkg", 16 ) ) { - OSL_ENSURE( sal_False, "Packages URL's are not valid for storages!\n" ); // ??? + OSL_FAIL( "Packages URL's are not valid for storages!\n" ); // ??? throw lang::IllegalArgumentException(); // TODO: } uno::Reference < ::com::sun::star::ucb::XSimpleFileAccess > xTempAccess( m_xFactory->createInstance ( - ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess") ) ), uno::UNO_QUERY ); if ( !xTempAccess.is() ) @@ -178,7 +179,7 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr } else if ( !( aArguments[0] >>= xStream ) && !( aArguments[0] >>= xInputStream ) ) { - OSL_ENSURE( sal_False, "Wrong first argument!\n" ); + OSL_FAIL( "Wrong first argument!\n" ); throw uno::Exception(); // TODO: Illegal argument } @@ -195,23 +196,23 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr if ( aURL.getLength() ) { aPropsToSet.realloc(1); - aPropsToSet[0].Name = ::rtl::OUString::createFromAscii( "URL" ); + aPropsToSet[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL") ); aPropsToSet[0].Value <<= aURL; } for ( sal_Int32 nInd = 0, nNumArgs = 1; nInd < aDescr.getLength(); nInd++ ) { - if ( aDescr[nInd].Name.equalsAscii( "InteractionHandler" ) - || aDescr[nInd].Name.equalsAscii( "Password" ) - || aDescr[nInd].Name.equalsAscii( "RepairPackage" ) - || aDescr[nInd].Name.equalsAscii( "StatusIndicator" ) ) - // || aDescr[nInd].Name.equalsAscii( "Unpacked" ) // TODO: + if ( aDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "InteractionHandler" ) ) + || aDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Password" ) ) + || aDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "RepairPackage" ) ) + || aDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StatusIndicator" ) ) ) + // || aDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Unpacked" ) ) // TODO: { aPropsToSet.realloc( ++nNumArgs ); aPropsToSet[nNumArgs-1].Name = aDescr[nInd].Name; aPropsToSet[nNumArgs-1].Value = aDescr[nInd].Value; } - else if ( aDescr[nInd].Name.equalsAscii( "StorageFormat" ) ) + else if ( aDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StorageFormat" ) ) ) { ::rtl::OUString aFormatName; sal_Int32 nFormatID = 0; @@ -239,12 +240,12 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >(), 1 ); } else - OSL_ENSURE( sal_False, "Unacceptable property, will be ignored!\n" ); + OSL_FAIL( "Unacceptable property, will be ignored!\n" ); } } else { - OSL_ENSURE( sal_False, "Wrong third argument!\n" ); + OSL_FAIL( "Wrong third argument!\n" ); throw uno::Exception(); // TODO: Illegal argument } @@ -261,7 +262,7 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr if ( !xSeekable.is() ) { // TODO: wrap stream to let it be seekable - OSL_ENSURE( sal_False, "Nonseekable streams are not supported for now!\n" ); + OSL_FAIL( "Nonseekable streams are not supported for now!\n" ); } if ( !CheckPackageSignature_Impl( xInputStream, xSeekable ) ) @@ -281,7 +282,7 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr if ( !xSeekable.is() ) { // TODO: wrap stream to let it be seekable - OSL_ENSURE( sal_False, "Nonseekable streams are not supported for now!\n" ); + OSL_FAIL( "Nonseekable streams are not supported for now!\n" ); } if ( !CheckPackageSignature_Impl( xStream->getInputStream(), xSeekable ) ) @@ -322,3 +323,4 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OStorageFactory::getSupportedServiceNa return impl_staticGetSupportedServiceNames(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/xstor/xfactory.hxx b/package/source/xstor/xfactory.hxx index cdc6c3abe584..86dca8dc264c 100644 --- a/package/source/xstor/xfactory.hxx +++ b/package/source/xstor/xfactory.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -72,3 +73,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx index e3c965e790c3..91c24e148c62 100644 --- a/package/source/xstor/xstorage.cxx +++ b/package/source/xstor/xstorage.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -228,7 +229,7 @@ OStorage_Impl::OStorage_Impl( uno::Reference< io::XInputStream > xInputStream, if ( m_nStorageMode & embed::ElementModes::WRITE ) { // check that the stream allows to write - OSL_ENSURE( sal_False, "No stream for writing is provided!\n" ); + OSL_FAIL( "No stream for writing is provided!\n" ); } } @@ -318,9 +319,9 @@ OStorage_Impl::~OStorage_Impl() try { m_pAntiImpl->InternalDispose( sal_False ); } - catch ( uno::Exception& aException ) + catch ( const uno::Exception& rException ) { - AddLog( aException.Message ); + AddLog( rException.Message ); AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Quiet exception" ) ) ); } m_pAntiImpl = NULL; @@ -334,9 +335,9 @@ OStorage_Impl::~OStorage_Impl() if ( xTmp.is() ) try { pStorageIter->m_pPointer->InternalDispose( sal_False ); - } catch( uno::Exception& aException ) + } catch( const uno::Exception& rException ) { - AddLog( aException.Message ); + AddLog( rException.Message ); AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Quiet exception" ) ) ); } } @@ -395,10 +396,10 @@ OStorage_Impl::~OStorage_Impl() m_xStream = uno::Reference< io::XStream >(); } } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Quiet exception" ) ) ); - AddLog( aException.Message ); + AddLog( rException.Message ); } } } @@ -415,7 +416,7 @@ void OStorage_Impl::AddLog( const ::rtl::OUString& aMessage ) if ( aContext.is() ) m_xLogRing.set( aContext.getSingleton( "com.sun.star.logging.DocumentIOLogRing" ), uno::UNO_QUERY_THROW ); } - catch( uno::Exception& ) + catch( const uno::Exception& ) { // No log } @@ -444,10 +445,10 @@ void OStorage_Impl::RemoveReadOnlyWrap( OStorage& aStorage ) { try { pStorageIter->m_pPointer->InternalDispose( sal_False ); - } catch( uno::Exception& aException ) + } catch( const uno::Exception& rException ) { AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Quiet exception" ) ) ); - AddLog( aException.Message ); + AddLog( rException.Message ); } OStorageList_Impl::iterator pIterToDelete( pStorageIter ); @@ -488,15 +489,15 @@ void OStorage_Impl::OpenOwnPackage() sal_Int32 nArgNum = 2; for ( sal_Int32 aInd = 0; aInd < m_xProperties.getLength(); aInd++ ) { - if ( m_xProperties[aInd].Name.equalsAscii( "RepairPackage" ) - || m_xProperties[aInd].Name.equalsAscii( "ProgressHandler" ) ) + if ( m_xProperties[aInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "RepairPackage" ) ) + || m_xProperties[aInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ProgressHandler" ) ) ) { beans::NamedValue aNamedValue( m_xProperties[aInd].Name, m_xProperties[aInd].Value ); aArguments.realloc( ++nArgNum ); aArguments[nArgNum-1] <<= aNamedValue; } - else if ( m_xProperties[aInd].Name.equalsAscii( "Password" ) ) + else if ( m_xProperties[aInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Password" ) ) ) { // TODO: implement password setting for documents // the password entry must be removed after setting @@ -619,7 +620,7 @@ void OStorage_Impl::ReadRelInfoIfNecessary() m_nRelInfoStatus = RELINFO_CHANGED_STREAM_READ; } - catch( uno::Exception ) + catch( const uno::Exception& ) { m_nRelInfoStatus = RELINFO_CHANGED_BROKEN; } @@ -655,7 +656,7 @@ void OStorage_Impl::ReadContents() if ( !xNamed.is() ) { - OSL_ENSURE( sal_False, "XNamed is not supported!\n" ); + OSL_FAIL( "XNamed is not supported!\n" ); throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); } @@ -684,12 +685,12 @@ void OStorage_Impl::ReadContents() m_aChildrenList.push_back( pNewElement ); } } - catch( container::NoSuchElementException& aNoSuchElementException ) + catch( const container::NoSuchElementException& rNoSuchElementException ) { - AddLog( aNoSuchElementException.Message ); + AddLog( rNoSuchElementException.Message ); AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "NoSuchElement" ) ) ); - OSL_ENSURE( sal_False, "hasMoreElements() implementation has problems!\n" ); + OSL_FAIL( "hasMoreElements() implementation has problems!\n" ); break; } } @@ -762,9 +763,9 @@ void OStorage_Impl::CopyToStorage( const uno::Reference< embed::XStorage >& xDes xEncr->setEncryptionAlgorithms( aAlgorithms ); } } - catch( packages::NoEncryptionException& aNoEncryptionException ) + catch( const packages::NoEncryptionException& rNoEncryptionException ) { - AddLog( aNoEncryptionException.Message ); + AddLog( rNoEncryptionException.Message ); AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "No Encryption" ) ) ); } } @@ -919,7 +920,7 @@ void OStorage_Impl::CopyStorageElement( SotElement_Impl* pElement, } else if ( m_nStorageType != embed::StorageFormats::PACKAGE ) { - OSL_ENSURE( sal_False, "Encryption is only supported in package storage!\n" ); + OSL_FAIL( "Encryption is only supported in package storage!\n" ); throw io::IOException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); } else if ( pElement->m_pStream->HasCachedEncryptionData() @@ -932,9 +933,9 @@ void OStorage_Impl::CopyStorageElement( SotElement_Impl* pElement, aCommonEncryptionData = GetCommonRootEncryptionData(); bHasCommonEncryptionData = sal_True; } - catch( packages::NoEncryptionException& aNoEncryptionException ) + catch( const packages::NoEncryptionException& rNoEncryptionException ) { - AddLog( aNoEncryptionException.Message ); + AddLog( rNoEncryptionException.Message ); AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "No Encryption" ) ) ); } @@ -987,9 +988,9 @@ void OStorage_Impl::CopyStorageElement( SotElement_Impl* pElement, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UseCommonStoragePasswordEncryption" ) ), uno::Any( (sal_Bool) sal_True ) ); } - catch( packages::WrongPasswordException& aWrongPasswordException ) + catch( const packages::WrongPasswordException& rWrongPasswordException ) { - AddLog( aWrongPasswordException.Message ); + AddLog( rWrongPasswordException.Message ); AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Handled exception" ) ) ); // If the common storage password does not allow to open the stream @@ -1283,7 +1284,7 @@ void OStorage_Impl::Commit() { xChangesBatch->commitChanges(); } - catch( lang::WrappedTargetException& r ) + catch( const lang::WrappedTargetException& r ) { // the wrapped UseBackupException means that the target medium can be corrupted embed::UseBackupException aException; @@ -1983,9 +1984,9 @@ OStorage::~OStorage() try { dispose(); } - catch( uno::RuntimeException& aRuntimeException ) + catch( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Handled exception" ) ) ); } } @@ -2049,9 +2050,9 @@ void SAL_CALL OStorage::InternalDispose( sal_Bool bNotifyImpl ) try { xTmp->dispose(); - } catch( uno::Exception& aException ) + } catch( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Quiet exception" ) ) ); } } @@ -2433,39 +2434,39 @@ void SAL_CALL OStorage::copyToStorage( const uno::Reference< embed::XStorage >& try { m_pImpl->CopyToStorage( xDest, sal_False ); } - catch( embed::InvalidStorageException& aInvalidStorageException ) + catch( const embed::InvalidStorageException& rInvalidStorageException ) { - m_pImpl->AddLog( aInvalidStorageException.Message ); + m_pImpl->AddLog( rInvalidStorageException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( lang::IllegalArgumentException& aIllegalArgumentException ) + catch( const lang::IllegalArgumentException& rIllegalArgumentException ) { - m_pImpl->AddLog( aIllegalArgumentException.Message ); + m_pImpl->AddLog( rIllegalArgumentException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( embed::StorageWrappedTargetException& aStorageWrappedTargetException ) + catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException ) { - m_pImpl->AddLog( aStorageWrappedTargetException.Message ); + m_pImpl->AddLog( rStorageWrappedTargetException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( io::IOException& aIOException ) + catch( const io::IOException& rIOException ) { - m_pImpl->AddLog( aIOException.Message ); + m_pImpl->AddLog( rIOException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::RuntimeException& aRuntimeException ) + catch( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); @@ -2524,45 +2525,45 @@ uno::Reference< io::XStream > SAL_CALL OStorage::openStreamElement( MakeLinkToSubComponent_Impl( xStreamComponent ); } } - catch( embed::InvalidStorageException& aInvalidStorageException ) + catch( const embed::InvalidStorageException& rInvalidStorageException ) { - m_pImpl->AddLog( aInvalidStorageException.Message ); + m_pImpl->AddLog( rInvalidStorageException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( lang::IllegalArgumentException& aIllegalArgumentException ) + catch( const lang::IllegalArgumentException& rIllegalArgumentException ) { - m_pImpl->AddLog( aIllegalArgumentException.Message ); + m_pImpl->AddLog( rIllegalArgumentException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( packages::WrongPasswordException& aWrongPasswordException ) + catch( const packages::WrongPasswordException& rWrongPasswordException ) { - m_pImpl->AddLog( aWrongPasswordException.Message ); + m_pImpl->AddLog( rWrongPasswordException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( embed::StorageWrappedTargetException& aStorageWrappedTargetException ) + catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException ) { - m_pImpl->AddLog( aStorageWrappedTargetException.Message ); + m_pImpl->AddLog( rStorageWrappedTargetException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( io::IOException& aIOException ) + catch( const io::IOException& rIOException ) { - m_pImpl->AddLog( aIOException.Message ); + m_pImpl->AddLog( rIOException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::RuntimeException& aRuntimeException ) + catch( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); @@ -2705,39 +2706,39 @@ uno::Reference< embed::XStorage > SAL_CALL OStorage::openStorageElement( MakeLinkToSubComponent_Impl( xStorageComponent ); } } - catch( embed::InvalidStorageException& aInvalidStorageException ) + catch( const embed::InvalidStorageException& rInvalidStorageException ) { - m_pImpl->AddLog( aInvalidStorageException.Message ); + m_pImpl->AddLog( rInvalidStorageException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( lang::IllegalArgumentException& aIllegalArgumentException ) + catch( const lang::IllegalArgumentException& rIllegalArgumentException ) { - m_pImpl->AddLog( aIllegalArgumentException.Message ); + m_pImpl->AddLog( rIllegalArgumentException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( embed::StorageWrappedTargetException& aStorageWrappedTargetException ) + catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException ) { - m_pImpl->AddLog( aStorageWrappedTargetException.Message ); + m_pImpl->AddLog( rStorageWrappedTargetException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( io::IOException& aIOException ) + catch( const io::IOException& rIOException ) { - m_pImpl->AddLog( aIOException.Message ); + m_pImpl->AddLog( rIOException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::RuntimeException& aRuntimeException ) + catch( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); @@ -2783,45 +2784,45 @@ uno::Reference< io::XStream > SAL_CALL OStorage::cloneStreamElement( const ::rtl throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); return xResult; } - catch( embed::InvalidStorageException& aInvalidStorageException ) + catch( const embed::InvalidStorageException& rInvalidStorageException ) { - m_pImpl->AddLog( aInvalidStorageException.Message ); + m_pImpl->AddLog( rInvalidStorageException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( lang::IllegalArgumentException& aIllegalArgumentException ) + catch( const lang::IllegalArgumentException& rIllegalArgumentException ) { - m_pImpl->AddLog( aIllegalArgumentException.Message ); + m_pImpl->AddLog( rIllegalArgumentException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( packages::WrongPasswordException& aWrongPasswordException ) + catch( const packages::WrongPasswordException& rWrongPasswordException ) { - m_pImpl->AddLog( aWrongPasswordException.Message ); + m_pImpl->AddLog( rWrongPasswordException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( io::IOException& aIOException ) + catch( const io::IOException& rIOException ) { - m_pImpl->AddLog( aIOException.Message ); + m_pImpl->AddLog( rIOException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( embed::StorageWrappedTargetException& aStorageWrappedTargetException ) + catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException ) { - m_pImpl->AddLog( aStorageWrappedTargetException.Message ); + m_pImpl->AddLog( rStorageWrappedTargetException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::RuntimeException& aRuntimeException ) + catch( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); @@ -2871,39 +2872,39 @@ void SAL_CALL OStorage::copyLastCommitTo( { m_pImpl->CopyLastCommitTo( xTargetStorage ); } - catch( embed::InvalidStorageException& aInvalidStorageException ) + catch( const embed::InvalidStorageException& rInvalidStorageException ) { - m_pImpl->AddLog( aInvalidStorageException.Message ); + m_pImpl->AddLog( rInvalidStorageException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( lang::IllegalArgumentException& aIllegalArgumentException ) + catch( const lang::IllegalArgumentException& rIllegalArgumentException ) { - m_pImpl->AddLog( aIllegalArgumentException.Message ); + m_pImpl->AddLog( rIllegalArgumentException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( embed::StorageWrappedTargetException& aStorageWrappedTargetException ) + catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException ) { - m_pImpl->AddLog( aStorageWrappedTargetException.Message ); + m_pImpl->AddLog( rStorageWrappedTargetException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( io::IOException& aIOException ) + catch( const io::IOException& rIOException ) { - m_pImpl->AddLog( aIOException.Message ); + m_pImpl->AddLog( rIOException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::RuntimeException& aRuntimeException ) + catch( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); @@ -2971,39 +2972,39 @@ void SAL_CALL OStorage::copyStorageElementLastCommitTo( else throw io::IOException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); // TODO: general_error } - catch( embed::InvalidStorageException& aInvalidStorageException ) + catch( const embed::InvalidStorageException& rInvalidStorageException ) { - m_pImpl->AddLog( aInvalidStorageException.Message ); + m_pImpl->AddLog( rInvalidStorageException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( lang::IllegalArgumentException& aIllegalArgumentException ) + catch( const lang::IllegalArgumentException& rIllegalArgumentException ) { - m_pImpl->AddLog( aIllegalArgumentException.Message ); + m_pImpl->AddLog( rIllegalArgumentException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( io::IOException& aIOException ) + catch( const io::IOException& rIOException ) { - m_pImpl->AddLog( aIOException.Message ); + m_pImpl->AddLog( rIOException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( embed::StorageWrappedTargetException& aStorageWrappedTargetException ) + catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException ) { - m_pImpl->AddLog( aStorageWrappedTargetException.Message ); + m_pImpl->AddLog( rStorageWrappedTargetException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::RuntimeException& aRuntimeException ) + catch( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); @@ -3041,33 +3042,33 @@ sal_Bool SAL_CALL OStorage::isStreamElement( const ::rtl::OUString& aElementName { pElement = m_pImpl->FindElement( aElementName ); } - catch( embed::InvalidStorageException& aInvalidStorageException ) + catch( const embed::InvalidStorageException& rInvalidStorageException ) { - m_pImpl->AddLog( aInvalidStorageException.Message ); + m_pImpl->AddLog( rInvalidStorageException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( lang::IllegalArgumentException& aIllegalArgumentException ) + catch( const lang::IllegalArgumentException& rIllegalArgumentException ) { - m_pImpl->AddLog( aIllegalArgumentException.Message ); + m_pImpl->AddLog( rIllegalArgumentException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( container::NoSuchElementException& aNoSuchElementException ) + catch( const container::NoSuchElementException& rNoSuchElementException ) { - m_pImpl->AddLog( aNoSuchElementException.Message ); + m_pImpl->AddLog( rNoSuchElementException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::RuntimeException& aRuntimeException ) + catch( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); @@ -3110,33 +3111,33 @@ sal_Bool SAL_CALL OStorage::isStorageElement( const ::rtl::OUString& aElementNam { pElement = m_pImpl->FindElement( aElementName ); } - catch( embed::InvalidStorageException& aInvalidStorageException ) + catch( const embed::InvalidStorageException& rInvalidStorageException ) { - m_pImpl->AddLog( aInvalidStorageException.Message ); + m_pImpl->AddLog( rInvalidStorageException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( lang::IllegalArgumentException& aIllegalArgumentException ) + catch( const lang::IllegalArgumentException& rIllegalArgumentException ) { - m_pImpl->AddLog( aIllegalArgumentException.Message ); + m_pImpl->AddLog( rIllegalArgumentException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( container::NoSuchElementException& aNoSuchElementException ) + catch( const container::NoSuchElementException& rNoSuchElementException ) { - m_pImpl->AddLog( aNoSuchElementException.Message ); + m_pImpl->AddLog( rNoSuchElementException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::RuntimeException& aRuntimeException ) + catch( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); @@ -3192,45 +3193,45 @@ void SAL_CALL OStorage::removeElement( const ::rtl::OUString& aElementName ) m_pImpl->m_bIsModified = sal_True; m_pImpl->m_bBroadcastModified = sal_True; } - catch( embed::InvalidStorageException& aInvalidStorageException ) + catch( const embed::InvalidStorageException& rInvalidStorageException ) { - m_pImpl->AddLog( aInvalidStorageException.Message ); + m_pImpl->AddLog( rInvalidStorageException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( lang::IllegalArgumentException& aIllegalArgumentException ) + catch( const lang::IllegalArgumentException& rIllegalArgumentException ) { - m_pImpl->AddLog( aIllegalArgumentException.Message ); + m_pImpl->AddLog( rIllegalArgumentException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( container::NoSuchElementException& aNoSuchElementException ) + catch( const container::NoSuchElementException& rNoSuchElementException ) { - m_pImpl->AddLog( aNoSuchElementException.Message ); + m_pImpl->AddLog( rNoSuchElementException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( io::IOException& aIOException ) + catch( const io::IOException& rIOException ) { - m_pImpl->AddLog( aIOException.Message ); + m_pImpl->AddLog( rIOException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( embed::StorageWrappedTargetException& aStorageWrappedTargetException ) + catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException ) { - m_pImpl->AddLog( aStorageWrappedTargetException.Message ); + m_pImpl->AddLog( rStorageWrappedTargetException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::RuntimeException& aRuntimeException ) + catch( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); @@ -3291,51 +3292,51 @@ void SAL_CALL OStorage::renameElement( const ::rtl::OUString& aElementName, cons m_pImpl->m_bIsModified = sal_True; m_pImpl->m_bBroadcastModified = sal_True; } - catch( embed::InvalidStorageException& aInvalidStorageException ) + catch( const embed::InvalidStorageException& rInvalidStorageException ) { - m_pImpl->AddLog( aInvalidStorageException.Message ); + m_pImpl->AddLog( rInvalidStorageException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( lang::IllegalArgumentException& aIllegalArgumentException ) + catch( const lang::IllegalArgumentException& rIllegalArgumentException ) { - m_pImpl->AddLog( aIllegalArgumentException.Message ); + m_pImpl->AddLog( rIllegalArgumentException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( container::NoSuchElementException& aNoSuchElementException ) + catch( const container::NoSuchElementException& rNoSuchElementException ) { - m_pImpl->AddLog( aNoSuchElementException.Message ); + m_pImpl->AddLog( rNoSuchElementException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( container::ElementExistException& aElementExistException ) + catch( const container::ElementExistException& rElementExistException ) { - m_pImpl->AddLog( aElementExistException.Message ); + m_pImpl->AddLog( rElementExistException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( io::IOException& aIOException ) + catch( const io::IOException& rIOException ) { - m_pImpl->AddLog( aIOException.Message ); + m_pImpl->AddLog( rIOException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( embed::StorageWrappedTargetException& aStorageWrappedTargetException ) + catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException ) { - m_pImpl->AddLog( aStorageWrappedTargetException.Message ); + m_pImpl->AddLog( rStorageWrappedTargetException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::RuntimeException& aRuntimeException ) + catch( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); @@ -3399,51 +3400,51 @@ void SAL_CALL OStorage::copyElementTo( const ::rtl::OUString& aElementName, m_pImpl->CopyStorageElement( pElement, xDest, aNewName, sal_False ); } - catch( embed::InvalidStorageException& aInvalidStorageException ) + catch( const embed::InvalidStorageException& rInvalidStorageException ) { - m_pImpl->AddLog( aInvalidStorageException.Message ); + m_pImpl->AddLog( rInvalidStorageException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( lang::IllegalArgumentException& aIllegalArgumentException ) + catch( const lang::IllegalArgumentException& rIllegalArgumentException ) { - m_pImpl->AddLog( aIllegalArgumentException.Message ); + m_pImpl->AddLog( rIllegalArgumentException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( container::NoSuchElementException& aNoSuchElementException ) + catch( const container::NoSuchElementException& rNoSuchElementException ) { - m_pImpl->AddLog( aNoSuchElementException.Message ); + m_pImpl->AddLog( rNoSuchElementException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( container::ElementExistException& aElementExistException ) + catch( const container::ElementExistException& rElementExistException ) { - m_pImpl->AddLog( aElementExistException.Message ); + m_pImpl->AddLog( rElementExistException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( embed::StorageWrappedTargetException& aStorageWrappedTargetException ) + catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException ) { - m_pImpl->AddLog( aStorageWrappedTargetException.Message ); + m_pImpl->AddLog( rStorageWrappedTargetException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( io::IOException& aIOException ) + catch( const io::IOException& rIOException ) { - m_pImpl->AddLog( aIOException.Message ); + m_pImpl->AddLog( rIOException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::RuntimeException& aRuntimeException ) + catch( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); @@ -3511,51 +3512,51 @@ void SAL_CALL OStorage::moveElementTo( const ::rtl::OUString& aElementName, m_pImpl->m_bIsModified = sal_True; m_pImpl->m_bBroadcastModified = sal_True; } - catch( embed::InvalidStorageException& aInvalidStorageException ) + catch( const embed::InvalidStorageException& rInvalidStorageException ) { - m_pImpl->AddLog( aInvalidStorageException.Message ); + m_pImpl->AddLog( rInvalidStorageException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( lang::IllegalArgumentException& aIllegalArgumentException ) + catch( const lang::IllegalArgumentException& rIllegalArgumentException ) { - m_pImpl->AddLog( aIllegalArgumentException.Message ); + m_pImpl->AddLog( rIllegalArgumentException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( container::NoSuchElementException& aNoSuchElementException ) + catch( const container::NoSuchElementException& rNoSuchElementException ) { - m_pImpl->AddLog( aNoSuchElementException.Message ); + m_pImpl->AddLog( rNoSuchElementException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( container::ElementExistException& aElementExistException ) + catch( const container::ElementExistException& rElementExistException ) { - m_pImpl->AddLog( aElementExistException.Message ); + m_pImpl->AddLog( rElementExistException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( embed::StorageWrappedTargetException& aStorageWrappedTargetException ) + catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException ) { - m_pImpl->AddLog( aStorageWrappedTargetException.Message ); + m_pImpl->AddLog( rStorageWrappedTargetException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( io::IOException& aIOException ) + catch( const io::IOException& rIOException ) { - m_pImpl->AddLog( aIOException.Message ); + m_pImpl->AddLog( rIOException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::RuntimeException& aRuntimeException ) + catch( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); @@ -3622,51 +3623,51 @@ uno::Reference< io::XStream > SAL_CALL OStorage::openEncryptedStream( MakeLinkToSubComponent_Impl( xStreamComponent ); } } - catch( embed::InvalidStorageException& aInvalidStorageException ) + catch( const embed::InvalidStorageException& rInvalidStorageException ) { - m_pImpl->AddLog( aInvalidStorageException.Message ); + m_pImpl->AddLog( rInvalidStorageException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( lang::IllegalArgumentException& aIllegalArgumentException ) + catch( const lang::IllegalArgumentException& rIllegalArgumentException ) { - m_pImpl->AddLog( aIllegalArgumentException.Message ); + m_pImpl->AddLog( rIllegalArgumentException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( packages::NoEncryptionException& aNoEncryptionException ) + catch( const packages::NoEncryptionException& rNoEncryptionException ) { - m_pImpl->AddLog( aNoEncryptionException.Message ); + m_pImpl->AddLog( rNoEncryptionException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( packages::WrongPasswordException& aWrongPasswordException ) + catch( const packages::WrongPasswordException& rWrongPasswordException ) { - m_pImpl->AddLog( aWrongPasswordException.Message ); + m_pImpl->AddLog( rWrongPasswordException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( embed::StorageWrappedTargetException& aStorageWrappedTargetException ) + catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException ) { - m_pImpl->AddLog( aStorageWrappedTargetException.Message ); + m_pImpl->AddLog( rStorageWrappedTargetException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( io::IOException& aIOException ) + catch( const io::IOException& rIOException ) { - m_pImpl->AddLog( aIOException.Message ); + m_pImpl->AddLog( rIOException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::RuntimeException& aRuntimeException ) + catch( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); @@ -3718,51 +3719,51 @@ uno::Reference< io::XStream > SAL_CALL OStorage::cloneEncryptedStream( throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); return xResult; } - catch( embed::InvalidStorageException& aInvalidStorageException ) + catch( const embed::InvalidStorageException& rInvalidStorageException ) { - m_pImpl->AddLog( aInvalidStorageException.Message ); + m_pImpl->AddLog( rInvalidStorageException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( lang::IllegalArgumentException& aIllegalArgumentException ) + catch( const lang::IllegalArgumentException& rIllegalArgumentException ) { - m_pImpl->AddLog( aIllegalArgumentException.Message ); + m_pImpl->AddLog( rIllegalArgumentException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( packages::NoEncryptionException& aNoEncryptionException ) + catch( const packages::NoEncryptionException& rNoEncryptionException ) { - m_pImpl->AddLog( aNoEncryptionException.Message ); + m_pImpl->AddLog( rNoEncryptionException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( packages::WrongPasswordException& aWrongPasswordException ) + catch( const packages::WrongPasswordException& rWrongPasswordException ) { - m_pImpl->AddLog( aWrongPasswordException.Message ); + m_pImpl->AddLog( rWrongPasswordException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( io::IOException& aIOException ) + catch( const io::IOException& rIOException ) { - m_pImpl->AddLog( aIOException.Message ); + m_pImpl->AddLog( rIOException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( embed::StorageWrappedTargetException& aStorageWrappedTargetException ) + catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException ) { - m_pImpl->AddLog( aStorageWrappedTargetException.Message ); + m_pImpl->AddLog( rStorageWrappedTargetException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::RuntimeException& aRuntimeException ) + catch( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); @@ -3836,45 +3837,45 @@ uno::Reference< io::XInputStream > SAL_CALL OStorage::getPlainRawStreamElement( xTempOut->closeOutput(); xSeek->seek( 0 ); } - catch( embed::InvalidStorageException& aInvalidStorageException ) + catch( const embed::InvalidStorageException& rInvalidStorageException ) { - m_pImpl->AddLog( aInvalidStorageException.Message ); + m_pImpl->AddLog( rInvalidStorageException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( lang::IllegalArgumentException& aIllegalArgumentException ) + catch( const lang::IllegalArgumentException& rIllegalArgumentException ) { - m_pImpl->AddLog( aIllegalArgumentException.Message ); + m_pImpl->AddLog( rIllegalArgumentException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( container::NoSuchElementException& aNoSuchElementException ) + catch( const container::NoSuchElementException& rNoSuchElementException ) { - m_pImpl->AddLog( aNoSuchElementException.Message ); + m_pImpl->AddLog( rNoSuchElementException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( embed::StorageWrappedTargetException& aStorageWrappedTargetException ) + catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException ) { - m_pImpl->AddLog( aStorageWrappedTargetException.Message ); + m_pImpl->AddLog( rStorageWrappedTargetException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( io::IOException& aIOException ) + catch( const io::IOException& rIOException ) { - m_pImpl->AddLog( aIOException.Message ); + m_pImpl->AddLog( rIOException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::RuntimeException& aRuntimeException ) + catch( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); @@ -3950,51 +3951,51 @@ uno::Reference< io::XInputStream > SAL_CALL OStorage::getRawEncrStreamElement( xSeek->seek( 0 ); } - catch( embed::InvalidStorageException& aInvalidStorageException ) + catch( const embed::InvalidStorageException& rInvalidStorageException ) { - m_pImpl->AddLog( aInvalidStorageException.Message ); + m_pImpl->AddLog( rInvalidStorageException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( lang::IllegalArgumentException& aIllegalArgumentException ) + catch( const lang::IllegalArgumentException& rIllegalArgumentException ) { - m_pImpl->AddLog( aIllegalArgumentException.Message ); + m_pImpl->AddLog( rIllegalArgumentException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( packages::NoEncryptionException& aNoEncryptionException ) + catch( const packages::NoEncryptionException& rNoEncryptionException ) { - m_pImpl->AddLog( aNoEncryptionException.Message ); + m_pImpl->AddLog( rNoEncryptionException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( container::NoSuchElementException& aNoSuchElementException ) + catch( const container::NoSuchElementException& rNoSuchElementException ) { - m_pImpl->AddLog( aNoSuchElementException.Message ); + m_pImpl->AddLog( rNoSuchElementException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( embed::StorageWrappedTargetException& aStorageWrappedTargetException ) + catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException ) { - m_pImpl->AddLog( aStorageWrappedTargetException.Message ); + m_pImpl->AddLog( rStorageWrappedTargetException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( io::IOException& aIOException ) + catch( const io::IOException& rIOException ) { - m_pImpl->AddLog( aIOException.Message ); + m_pImpl->AddLog( rIOException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::RuntimeException& aRuntimeException ) + catch( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); @@ -4047,51 +4048,51 @@ void SAL_CALL OStorage::insertRawEncrStreamElement( const ::rtl::OUString& aStre m_pImpl->InsertRawStream( aStreamName, xInStream ); } - catch( embed::InvalidStorageException& aInvalidStorageException ) + catch( const embed::InvalidStorageException& rInvalidStorageException ) { - m_pImpl->AddLog( aInvalidStorageException.Message ); + m_pImpl->AddLog( rInvalidStorageException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( lang::IllegalArgumentException& aIllegalArgumentException ) + catch( const lang::IllegalArgumentException& rIllegalArgumentException ) { - m_pImpl->AddLog( aIllegalArgumentException.Message ); + m_pImpl->AddLog( rIllegalArgumentException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( packages::NoRawFormatException& aNoRawFormatException ) + catch( const packages::NoRawFormatException& rNoRawFormatException ) { - m_pImpl->AddLog( aNoRawFormatException.Message ); + m_pImpl->AddLog( rNoRawFormatException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( container::ElementExistException& aElementExistException ) + catch( const container::ElementExistException& rElementExistException ) { - m_pImpl->AddLog( aElementExistException.Message ); + m_pImpl->AddLog( rElementExistException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( embed::StorageWrappedTargetException& aStorageWrappedTargetException ) + catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException ) { - m_pImpl->AddLog( aStorageWrappedTargetException.Message ); + m_pImpl->AddLog( rStorageWrappedTargetException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( io::IOException& aIOException ) + catch( const io::IOException& rIOException ) { - m_pImpl->AddLog( aIOException.Message ); + m_pImpl->AddLog( rIOException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::RuntimeException& aRuntimeException ) + catch( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); @@ -4135,27 +4136,27 @@ void SAL_CALL OStorage::commit() if ( m_pImpl->m_pParent && m_pImpl->m_pParent->m_pAntiImpl ) xParentModif = (util::XModifiable*)m_pImpl->m_pParent->m_pAntiImpl; } - catch( io::IOException& aIOException ) + catch( const io::IOException& rIOException ) { - m_pImpl->AddLog( aIOException.Message ); + m_pImpl->AddLog( rIOException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( embed::StorageWrappedTargetException& aStorageWrappedTargetException ) + catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException ) { - m_pImpl->AddLog( aStorageWrappedTargetException.Message ); + m_pImpl->AddLog( rStorageWrappedTargetException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::RuntimeException& aRuntimeException ) + catch( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); @@ -4209,27 +4210,27 @@ void SAL_CALL OStorage::revert() m_pImpl->m_bIsModified = sal_False; m_pImpl->m_bBroadcastModified = sal_True; } - catch( io::IOException& aIOException ) + catch( const io::IOException& rIOException ) { - m_pImpl->AddLog( aIOException.Message ); + m_pImpl->AddLog( rIOException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( embed::StorageWrappedTargetException& aStorageWrappedTargetException ) + catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException ) { - m_pImpl->AddLog( aStorageWrappedTargetException.Message ); + m_pImpl->AddLog( rStorageWrappedTargetException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::RuntimeException& aRuntimeException ) + catch( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); @@ -4404,27 +4405,27 @@ uno::Any SAL_CALL OStorage::getByName( const ::rtl::OUString& aName ) else aResult <<= openStreamElement( aName, embed::ElementModes::READ ); } - catch( container::NoSuchElementException& aNoSuchElementException ) + catch( const container::NoSuchElementException& rNoSuchElementException ) { - m_pImpl->AddLog( aNoSuchElementException.Message ); + m_pImpl->AddLog( rNoSuchElementException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( lang::WrappedTargetException& aWrappedTargetException ) + catch( const lang::WrappedTargetException& rWrappedTargetException ) { - m_pImpl->AddLog( aWrappedTargetException.Message ); + m_pImpl->AddLog( rWrappedTargetException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::RuntimeException& aRuntimeException ) + catch( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch ( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); @@ -4456,15 +4457,15 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OStorage::getElementNames() { return m_pImpl->GetElementNames(); } - catch( uno::RuntimeException& aRuntimeException ) + catch( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch ( uno::Exception& aException ) + catch ( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); @@ -4502,15 +4503,15 @@ sal_Bool SAL_CALL OStorage::hasByName( const ::rtl::OUString& aName ) { pElement = m_pImpl->FindElement( aName ); } - catch( uno::RuntimeException& aRuntimeException ) + catch( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch ( uno::Exception& aException ) + catch ( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); @@ -4559,15 +4560,15 @@ sal_Bool SAL_CALL OStorage::hasElements() { return ( m_pImpl->GetChildrenList().size() != 0 ); } - catch( uno::RuntimeException& aRuntimeException ) + catch( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch ( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); @@ -4599,15 +4600,15 @@ void SAL_CALL OStorage::dispose() { InternalDispose( sal_True ); } - catch( uno::RuntimeException& aRuntimeException ) + catch( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch ( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); @@ -4688,15 +4689,15 @@ void SAL_CALL OStorage::removeEncryption() try { m_pImpl->ReadContents(); } - catch ( uno::RuntimeException& aRuntimeException ) + catch ( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch ( uno::Exception& aException ) + catch ( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); @@ -4718,20 +4719,20 @@ void SAL_CALL OStorage::removeEncryption() m_pImpl->m_bHasCommonEncryptionData = sal_False; m_pImpl->m_aCommonEncryptionData.clear(); } - catch( uno::RuntimeException& aRException ) + catch( const uno::RuntimeException& rRException ) { - m_pImpl->AddLog( aRException.Message ); + m_pImpl->AddLog( rRException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); OSL_ENSURE( sal_False, "The call must not fail, it is pretty simple!" ); throw; } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); - OSL_ENSURE( sal_False, "The call must not fail, it is pretty simple!" ); + OSL_FAIL( "The call must not fail, it is pretty simple!" ); throw io::IOException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); } } @@ -4767,15 +4768,15 @@ void SAL_CALL OStorage::setEncryptionData( const uno::Sequence< beans::NamedValu try { m_pImpl->ReadContents(); } - catch ( uno::RuntimeException& aRuntimeException ) + catch ( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch ( uno::Exception& aException ) + catch ( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); @@ -4795,9 +4796,9 @@ void SAL_CALL OStorage::setEncryptionData( const uno::Sequence< beans::NamedValu m_pImpl->m_bHasCommonEncryptionData = sal_True; m_pImpl->m_aCommonEncryptionData = aEncryptionMap; } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw io::IOException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); @@ -4999,7 +5000,7 @@ void SAL_CALL OStorage::setPropertyValue( const ::rtl::OUString& aPropertyName, throw beans::UnknownPropertyException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); else if ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE ) { - if ( aPropertyName.equalsAscii( "MediaType" ) ) + if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) ) { aValue >>= m_pImpl->m_aMediaType; m_pImpl->m_bControlMediaType = sal_True; @@ -5007,7 +5008,7 @@ void SAL_CALL OStorage::setPropertyValue( const ::rtl::OUString& aPropertyName, m_pImpl->m_bBroadcastModified = sal_True; m_pImpl->m_bIsModified = sal_True; } - else if ( aPropertyName.equalsAscii( "Version" ) ) + else if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Version" ) ) ) { aValue >>= m_pImpl->m_aVersion; m_pImpl->m_bControlVersion = sal_True; @@ -5019,20 +5020,20 @@ void SAL_CALL OStorage::setPropertyValue( const ::rtl::OUString& aPropertyName, m_pImpl->m_bIsModified = sal_True; } } - else if ( ( m_pData->m_bIsRoot && ( aPropertyName.equalsAscii( HAS_ENCRYPTED_ENTRIES_PROPERTY ) - || aPropertyName.equalsAscii( HAS_NONENCRYPTED_ENTRIES_PROPERTY ) - || aPropertyName.equalsAscii( IS_INCONSISTENT_PROPERTY ) - || aPropertyName.equalsAscii( "URL" ) - || aPropertyName.equalsAscii( "RepairPackage" ) ) ) - || aPropertyName.equalsAscii( "IsRoot" ) - || aPropertyName.equalsAscii( MEDIATYPE_FALLBACK_USED_PROPERTY ) ) + else if ( ( m_pData->m_bIsRoot && ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( HAS_ENCRYPTED_ENTRIES_PROPERTY ) ) + || aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( HAS_NONENCRYPTED_ENTRIES_PROPERTY ) ) + || aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( IS_INCONSISTENT_PROPERTY ) ) + || aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URL" ) ) + || aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "RepairPackage" ) ) ) ) + || aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsRoot" ) ) + || aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( MEDIATYPE_FALLBACK_USED_PROPERTY ) ) ) throw beans::PropertyVetoException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); else throw beans::UnknownPropertyException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); } else if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML ) { - if ( aPropertyName.equalsAscii( "RelationsInfoStream" ) ) + if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "RelationsInfoStream" ) ) ) { uno::Reference< io::XInputStream > xInRelStream; if ( ( aValue >>= xInRelStream ) && xInRelStream.is() ) @@ -5055,7 +5056,7 @@ void SAL_CALL OStorage::setPropertyValue( const ::rtl::OUString& aPropertyName, else throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >(), 0 ); } - else if ( aPropertyName.equalsAscii( "RelationsInfo" ) ) + else if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "RelationsInfo" ) ) ) { if ( aValue >>= m_pImpl->m_aRelInfo ) { @@ -5067,9 +5068,9 @@ void SAL_CALL OStorage::setPropertyValue( const ::rtl::OUString& aPropertyName, else throw lang::IllegalArgumentException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >(), 0 ); } - else if ( ( m_pData->m_bIsRoot && ( aPropertyName.equalsAscii( "URL" ) - || aPropertyName.equalsAscii( "RepairPackage" ) ) ) - || aPropertyName.equalsAscii( "IsRoot" ) ) + else if ( ( m_pData->m_bIsRoot && ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URL" ) ) + || aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "RepairPackage" ) ) ) ) + || aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsRoot" ) ) ) throw beans::PropertyVetoException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); else throw beans::UnknownPropertyException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); @@ -5098,23 +5099,23 @@ uno::Any SAL_CALL OStorage::getPropertyValue( const ::rtl::OUString& aPropertyNa } if ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE - && ( aPropertyName.equalsAscii( "MediaType" ) - || aPropertyName.equalsAscii( MEDIATYPE_FALLBACK_USED_PROPERTY ) - || aPropertyName.equalsAscii( "Version" ) ) ) + && ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) + || aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( MEDIATYPE_FALLBACK_USED_PROPERTY ) ) + || aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Version" ) ) ) ) { try { m_pImpl->ReadContents(); } - catch ( uno::RuntimeException& aRuntimeException ) + catch ( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch ( uno::Exception& aException ) + catch ( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); @@ -5124,25 +5125,25 @@ uno::Any SAL_CALL OStorage::getPropertyValue( const ::rtl::OUString& aPropertyNa aCaught ); } - if ( aPropertyName.equalsAscii( "MediaType" ) ) + if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) ) return uno::makeAny( m_pImpl->m_aMediaType ); - else if ( aPropertyName.equalsAscii( "Version" ) ) + else if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Version" ) ) ) return uno::makeAny( m_pImpl->m_aVersion ); else return uno::makeAny( m_pImpl->m_bMTFallbackUsed ); } - else if ( aPropertyName.equalsAscii( "IsRoot" ) ) + else if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsRoot" ) ) ) { return uno::makeAny( m_pData->m_bIsRoot ); } - else if ( aPropertyName.equalsAscii( "OpenMode" ) ) + else if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OpenMode" ) ) ) { return uno::makeAny( m_pImpl->m_nStorageMode ); } else if ( m_pData->m_bIsRoot ) { - if ( aPropertyName.equalsAscii( "URL" ) - || aPropertyName.equalsAscii( "RepairPackage" ) ) + if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URL" ) ) + || aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "RepairPackage" ) ) ) { for ( sal_Int32 aInd = 0; aInd < m_pImpl->m_xProperties.getLength(); aInd++ ) { @@ -5150,15 +5151,15 @@ uno::Any SAL_CALL OStorage::getPropertyValue( const ::rtl::OUString& aPropertyNa return m_pImpl->m_xProperties[aInd].Value; } - if ( aPropertyName.equalsAscii( "URL" ) ) + if ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URL" ) ) ) return uno::makeAny( ::rtl::OUString() ); return uno::makeAny( sal_False ); // RepairPackage } else if ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE - && ( aPropertyName.equalsAscii( HAS_ENCRYPTED_ENTRIES_PROPERTY ) - || aPropertyName.equalsAscii( HAS_NONENCRYPTED_ENTRIES_PROPERTY ) - || aPropertyName.equalsAscii( IS_INCONSISTENT_PROPERTY ) ) ) + && ( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( HAS_ENCRYPTED_ENTRIES_PROPERTY ) ) + || aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( HAS_NONENCRYPTED_ENTRIES_PROPERTY ) ) + || aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( IS_INCONSISTENT_PROPERTY ) ) ) ) { try { m_pImpl->ReadContents(); @@ -5168,15 +5169,15 @@ uno::Any SAL_CALL OStorage::getPropertyValue( const ::rtl::OUString& aPropertyNa return xPackPropSet->getPropertyValue( aPropertyName ); } - catch ( uno::RuntimeException& aRuntimeException ) + catch ( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch ( uno::Exception& aException ) + catch ( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); @@ -5298,9 +5299,9 @@ sal_Bool SAL_CALL OStorage::hasByID( const ::rtl::OUString& sID ) getRelationshipByID( sID ); return sal_True; } - catch( container::NoSuchElementException& aNoSuchElementException ) + catch( const container::NoSuchElementException& rNoSuchElementException ) { - m_pImpl->AddLog( aNoSuchElementException.Message ); + m_pImpl->AddLog( rNoSuchElementException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Quiet exception" ) ) ); } @@ -5718,45 +5719,45 @@ void SAL_CALL OStorage::insertStreamElementDirect( pElement->m_pStream->InsertStreamDirectly( xInStream, aProps ); } - catch( embed::InvalidStorageException& aInvalidStorageException ) + catch( const embed::InvalidStorageException& rInvalidStorageException ) { - m_pImpl->AddLog( aInvalidStorageException.Message ); + m_pImpl->AddLog( rInvalidStorageException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( lang::IllegalArgumentException& aIllegalArgumentException ) + catch( const lang::IllegalArgumentException& rIllegalArgumentException ) { - m_pImpl->AddLog( aIllegalArgumentException.Message ); + m_pImpl->AddLog( rIllegalArgumentException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( container::ElementExistException& aElementExistException ) + catch( const container::ElementExistException& rElementExistException ) { - m_pImpl->AddLog( aElementExistException.Message ); + m_pImpl->AddLog( rElementExistException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( embed::StorageWrappedTargetException& aStorageWrappedTargetException ) + catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException ) { - m_pImpl->AddLog( aStorageWrappedTargetException.Message ); + m_pImpl->AddLog( rStorageWrappedTargetException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( io::IOException& aIOException ) + catch( const io::IOException& rIOException ) { - m_pImpl->AddLog( aIOException.Message ); + m_pImpl->AddLog( rIOException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::RuntimeException& aRuntimeException ) + catch( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); @@ -5818,51 +5819,51 @@ void SAL_CALL OStorage::copyElementDirectlyTo( uno::Reference< embed::XStorage > xStorDest( xDest, uno::UNO_QUERY_THROW ); m_pImpl->CopyStorageElement( pElement, xStorDest, aNewName, sal_True ); } - catch( embed::InvalidStorageException& aInvalidStorageException ) + catch( const embed::InvalidStorageException& rInvalidStorageException ) { - m_pImpl->AddLog( aInvalidStorageException.Message ); + m_pImpl->AddLog( rInvalidStorageException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( lang::IllegalArgumentException& aIllegalArgumentException ) + catch( const lang::IllegalArgumentException& rIllegalArgumentException ) { - m_pImpl->AddLog( aIllegalArgumentException.Message ); + m_pImpl->AddLog( rIllegalArgumentException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( container::NoSuchElementException& aNoSuchElementException ) + catch( const container::NoSuchElementException& rNoSuchElementException ) { - m_pImpl->AddLog( aNoSuchElementException.Message ); + m_pImpl->AddLog( rNoSuchElementException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( container::ElementExistException& aElementExistException ) + catch( const container::ElementExistException& rElementExistException ) { - m_pImpl->AddLog( aElementExistException.Message ); + m_pImpl->AddLog( rElementExistException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( embed::StorageWrappedTargetException& aStorageWrappedTargetException ) + catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException ) { - m_pImpl->AddLog( aStorageWrappedTargetException.Message ); + m_pImpl->AddLog( rStorageWrappedTargetException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( io::IOException& aIOException ) + catch( const io::IOException& rIOException ) { - m_pImpl->AddLog( aIOException.Message ); + m_pImpl->AddLog( rIOException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::RuntimeException& aRuntimeException ) + catch( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); @@ -5900,39 +5901,39 @@ void SAL_CALL OStorage::writeAndAttachToStream( const uno::Reference< io::XStrea { m_pImpl->m_pSwitchStream->CopyAndSwitchPersistenceTo( xStream ); } - catch( embed::InvalidStorageException& aInvalidStorageException ) + catch( const embed::InvalidStorageException& rInvalidStorageException ) { - m_pImpl->AddLog( aInvalidStorageException.Message ); + m_pImpl->AddLog( rInvalidStorageException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( lang::IllegalArgumentException& aIllegalArgumentException ) + catch( const lang::IllegalArgumentException& rIllegalArgumentException ) { - m_pImpl->AddLog( aIllegalArgumentException.Message ); + m_pImpl->AddLog( rIllegalArgumentException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( embed::StorageWrappedTargetException& aStorageWrappedTargetException ) + catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException ) { - m_pImpl->AddLog( aStorageWrappedTargetException.Message ); + m_pImpl->AddLog( rStorageWrappedTargetException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( io::IOException& aIOException ) + catch( const io::IOException& rIOException ) { - m_pImpl->AddLog( aIOException.Message ); + m_pImpl->AddLog( rIOException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::RuntimeException& aRuntimeException ) + catch( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); @@ -5986,39 +5987,39 @@ void SAL_CALL OStorage::attachToURL( const ::rtl::OUString& sURL, m_pImpl->m_pSwitchStream->SwitchPersistenceTo( xStream ); } } - catch( embed::InvalidStorageException& aInvalidStorageException ) + catch( const embed::InvalidStorageException& rInvalidStorageException ) { - m_pImpl->AddLog( aInvalidStorageException.Message ); + m_pImpl->AddLog( rInvalidStorageException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( lang::IllegalArgumentException& aIllegalArgumentException ) + catch( const lang::IllegalArgumentException& rIllegalArgumentException ) { - m_pImpl->AddLog( aIllegalArgumentException.Message ); + m_pImpl->AddLog( rIllegalArgumentException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( embed::StorageWrappedTargetException& aStorageWrappedTargetException ) + catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException ) { - m_pImpl->AddLog( aStorageWrappedTargetException.Message ); + m_pImpl->AddLog( rStorageWrappedTargetException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( io::IOException& aIOException ) + catch( const io::IOException& rIOException ) { - m_pImpl->AddLog( aIOException.Message ); + m_pImpl->AddLog( rIOException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::RuntimeException& aRuntimeException ) + catch( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); @@ -6063,7 +6064,7 @@ uno::Any SAL_CALL OStorage::getElementPropertyValue( const ::rtl::OUString& aEle throw container::NoSuchElementException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); // TODO/LATER: Currently it is only implemented for MediaType property of substorages, might be changed in future - if ( !pElement->m_bIsStorage || m_pData->m_nStorageType != embed::StorageFormats::PACKAGE || !aPropertyName.equalsAscii( "MediaType" ) ) + if ( !pElement->m_bIsStorage || m_pData->m_nStorageType != embed::StorageFormats::PACKAGE || !aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) ) throw beans::PropertyVetoException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); if ( !pElement->m_pStorage ) @@ -6075,57 +6076,57 @@ uno::Any SAL_CALL OStorage::getElementPropertyValue( const ::rtl::OUString& aEle pElement->m_pStorage->ReadContents(); return uno::makeAny( pElement->m_pStorage->m_aMediaType ); } - catch( embed::InvalidStorageException& aInvalidStorageException ) + catch( const embed::InvalidStorageException& rInvalidStorageException ) { - m_pImpl->AddLog( aInvalidStorageException.Message ); + m_pImpl->AddLog( rInvalidStorageException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( lang::IllegalArgumentException& aIllegalArgumentException ) + catch( const lang::IllegalArgumentException& rIllegalArgumentException ) { - m_pImpl->AddLog( aIllegalArgumentException.Message ); + m_pImpl->AddLog( rIllegalArgumentException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( container::NoSuchElementException& aNoSuchElementException ) + catch( const container::NoSuchElementException& rNoSuchElementException ) { - m_pImpl->AddLog( aNoSuchElementException.Message ); + m_pImpl->AddLog( rNoSuchElementException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( beans::UnknownPropertyException& aUnknownPropertyException ) + catch( const beans::UnknownPropertyException& rUnknownPropertyException ) { - m_pImpl->AddLog( aUnknownPropertyException.Message ); + m_pImpl->AddLog( rUnknownPropertyException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( beans::PropertyVetoException& aPropertyVetoException ) + catch( const beans::PropertyVetoException& rPropertyVetoException ) { - m_pImpl->AddLog( aPropertyVetoException.Message ); + m_pImpl->AddLog( rPropertyVetoException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( embed::StorageWrappedTargetException& aStorageWrappedTargetException ) + catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException ) { - m_pImpl->AddLog( aStorageWrappedTargetException.Message ); + m_pImpl->AddLog( rStorageWrappedTargetException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( io::IOException& aIOException ) + catch( const io::IOException& rIOException ) { - m_pImpl->AddLog( aIOException.Message ); + m_pImpl->AddLog( rIOException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::RuntimeException& aRuntimeException ) + catch( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); @@ -6171,45 +6172,45 @@ void SAL_CALL OStorage::copyStreamElementData( const ::rtl::OUString& aStreamNam if ( xNonconstRef != xTargetStream ) throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); // if the stream reference is set it must not be changed! } - catch( embed::InvalidStorageException& aInvalidStorageException ) + catch( const embed::InvalidStorageException& rInvalidStorageException ) { - m_pImpl->AddLog( aInvalidStorageException.Message ); + m_pImpl->AddLog( rInvalidStorageException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( lang::IllegalArgumentException& aIllegalArgumentException ) + catch( const lang::IllegalArgumentException& rIllegalArgumentException ) { - m_pImpl->AddLog( aIllegalArgumentException.Message ); + m_pImpl->AddLog( rIllegalArgumentException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( packages::WrongPasswordException& aWrongPasswordException ) + catch( const packages::WrongPasswordException& rWrongPasswordException ) { - m_pImpl->AddLog( aWrongPasswordException.Message ); + m_pImpl->AddLog( rWrongPasswordException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( io::IOException& aIOException ) + catch( const io::IOException& rIOException ) { - m_pImpl->AddLog( aIOException.Message ); + m_pImpl->AddLog( rIOException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( embed::StorageWrappedTargetException& aStorageWrappedTargetException ) + catch( const embed::StorageWrappedTargetException& rStorageWrappedTargetException ) { - m_pImpl->AddLog( aStorageWrappedTargetException.Message ); + m_pImpl->AddLog( rStorageWrappedTargetException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::RuntimeException& aRuntimeException ) + catch( const uno::RuntimeException& rRuntimeException ) { - m_pImpl->AddLog( aRuntimeException.Message ); + m_pImpl->AddLog( rRuntimeException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); throw; } - catch( uno::Exception& aException ) + catch( const uno::Exception& rException ) { - m_pImpl->AddLog( aException.Message ); + m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); uno::Any aCaught( ::cppu::getCaughtException() ); @@ -6401,3 +6402,4 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openEncrypted } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/xstor/xstorage.hxx b/package/source/xstor/xstorage.hxx index 2baba695a55f..f472444556c2 100644 --- a/package/source/xstor/xstorage.hxx +++ b/package/source/xstor/xstorage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -296,8 +297,6 @@ class OStorage : public ::com::sun::star::lang::XTypeProvider , public ::com::sun::star::embed::XTransactedObject , public ::com::sun::star::embed::XTransactionBroadcaster , public ::com::sun::star::util::XModifiable - // , public ::com::sun::star::container::XNameAccess - // , public ::com::sun::star::lang::XComponent , public ::com::sun::star::embed::XEncryptionProtectedStorage , public ::com::sun::star::beans::XPropertySet , public ::com::sun::star::embed::XOptimizedStorage @@ -858,3 +857,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/zipapi/ByteChucker.cxx b/package/source/zipapi/ByteChucker.cxx index 3b93c4696148..8ff31dc49926 100644 --- a/package/source/zipapi/ByteChucker.cxx +++ b/package/source/zipapi/ByteChucker.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -110,3 +111,5 @@ ByteChucker& ByteChucker::operator << (sal_uInt32 nuInt32) WriteBytes( a4Sequence ); return *this; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/zipapi/ByteGrabber.cxx b/package/source/zipapi/ByteGrabber.cxx index 40998c3de70d..50546707d54e 100644 --- a/package/source/zipapi/ByteGrabber.cxx +++ b/package/source/zipapi/ByteGrabber.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -189,3 +190,5 @@ ByteGrabber& ByteGrabber::operator >> (sal_uInt32& ruInt32) } return *this; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/zipapi/CRC32.cxx b/package/source/zipapi/CRC32.cxx index 2ee6b1feea1a..bea1a3382ccd 100644 --- a/package/source/zipapi/CRC32.cxx +++ b/package/source/zipapi/CRC32.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,7 +39,6 @@ #include <PackageConstants.hxx> #include <com/sun/star/io/XInputStream.hpp> -using namespace rtl; using namespace com::sun::star::uno; using namespace com::sun::star::io; @@ -94,3 +94,5 @@ sal_Int32 SAL_CALL CRC32::updateStream( Reference < XInputStream > & xStream ) return nTotal; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/zipapi/Deflater.cxx b/package/source/zipapi/Deflater.cxx index a87fa91af41e..30318ce5c520 100644 --- a/package/source/zipapi/Deflater.cxx +++ b/package/source/zipapi/Deflater.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,6 +41,7 @@ using namespace com::sun::star::packages::zip::ZipConstants; using namespace com::sun::star; +using namespace ZipUtils; /** Provides general purpose compression using the ZLIB compression * library. @@ -210,3 +212,5 @@ void SAL_CALL Deflater::end( ) } pStream = NULL; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/zipapi/Inflater.cxx b/package/source/zipapi/Inflater.cxx index 415036bd73b1..40d2bee99333 100644 --- a/package/source/zipapi/Inflater.cxx +++ b/package/source/zipapi/Inflater.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,6 +39,7 @@ #include <string.h> // for memset using namespace com::sun::star::uno; +using namespace ZipUtils; /** Provides general purpose decompression using the ZLIB library */ @@ -160,3 +162,4 @@ sal_Int32 Inflater::doInflateBytes (Sequence < sal_Int8 > &rBuffer, sal_Int32 n return 0; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/zipapi/MemoryByteGrabber.hxx b/package/source/zipapi/MemoryByteGrabber.hxx index f27eaf4826ad..77315d0689db 100644 --- a/package/source/zipapi/MemoryByteGrabber.hxx +++ b/package/source/zipapi/MemoryByteGrabber.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -175,3 +176,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/zipapi/XUnbufferedStream.cxx b/package/source/zipapi/XUnbufferedStream.cxx index e8e16329eccc..a6049fd2cbef 100644 --- a/package/source/zipapi/XUnbufferedStream.cxx +++ b/package/source/zipapi/XUnbufferedStream.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -178,10 +179,12 @@ sal_Int32 SAL_CALL XUnbufferedStream::readBytes( Sequence< sal_Int8 >& aData, sa if ( mnMyCurrent + nRequestedBytes > mnZipSize + maHeader.getLength() ) nRequestedBytes = static_cast < sal_Int32 > ( mnZipSize + maHeader.getLength() - mnMyCurrent ); - sal_Int32 nRead = 0, nLastRead = 0, nTotal = 0; + sal_Int32 nTotal = 0; aData.realloc ( nRequestedBytes ); if ( nRequestedBytes ) { + sal_Int32 nRead = 0; + sal_Int32 nLastRead = 0; if ( mbRawStream ) { sal_Int64 nDiff = mnZipEnd - mnZipCurrent; @@ -314,8 +317,8 @@ sal_Int32 SAL_CALL XUnbufferedStream::readBytes( Sequence< sal_Int8 >& aData, sa if ( 0 ) { uno::Reference< lang::XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory(); - uno::Reference< ucb::XSimpleFileAccess > xAccess( xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ), uno::UNO_QUERY ); - uno::Reference< io::XOutputStream > xOut = xAccess->openFileWrite( ::rtl::OUString::createFromAscii( "file:///d:/777/Encrypted/picture" ) ); + uno::Reference< ucb::XSimpleFileAccess > xAccess( xFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess") ) ), uno::UNO_QUERY ); + uno::Reference< io::XOutputStream > xOut = xAccess->openFileWrite(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "file:///d:/777/Encrypted/picture") ) ); xOut->writeBytes( aData ); xOut->closeOutput(); } @@ -372,3 +375,5 @@ sal_Int64 SAL_CALL XUnbufferedStream::getLength( ) return mnZipSize; } */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/zipapi/XUnbufferedStream.hxx b/package/source/zipapi/XUnbufferedStream.hxx index f8878c25979a..43a659485c24 100644 --- a/package/source/zipapi/XUnbufferedStream.hxx +++ b/package/source/zipapi/XUnbufferedStream.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,7 +28,6 @@ #ifndef _XUNBUFFERED_STREAM_HXX #define _XUNBUFFERED_STREAM_HXX -#include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/io/XSeekable.hpp> #include <com/sun/star/io/XInputStream.hpp> @@ -61,7 +61,7 @@ protected: ::rtl::Reference< EncryptionData > mxData; sal_Int32 mnBlockSize; ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XCipherContext > m_xCipherContext; - Inflater maInflater; + ZipUtils::Inflater maInflater; sal_Bool mbRawStream, mbWrappedRaw, mbFinished; sal_Int16 mnHeaderToRead; sal_Int64 mnZipCurrent, mnZipEnd, mnZipSize, mnMyCurrent; @@ -111,3 +111,5 @@ public: */ }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/zipapi/ZipEnumeration.cxx b/package/source/zipapi/ZipEnumeration.cxx index 367c29f6d4a7..767aacc92a54 100644 --- a/package/source/zipapi/ZipEnumeration.cxx +++ b/package/source/zipapi/ZipEnumeration.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -51,3 +52,5 @@ const ZipEntry* SAL_CALL ZipEnumeration::nextElement() else return NULL; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx index 4827f6879853..5151d26781b6 100644 --- a/package/source/zipapi/ZipFile.cxx +++ b/package/source/zipapi/ZipFile.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,8 +59,6 @@ #define AES_CBC_BLOCK_SIZE 16 -using namespace vos; -using namespace rtl; using namespace com::sun::star; using namespace com::sun::star::io; using namespace com::sun::star::uno; @@ -69,6 +68,8 @@ using namespace com::sun::star::packages; using namespace com::sun::star::packages::zip; using namespace com::sun::star::packages::zip::ZipConstants; +using rtl::OUString; +using ZipUtils::Inflater; /** This class is used to read entries from a zip file */ @@ -167,7 +168,7 @@ uno::Reference< xml::crypto::XCipherContext > ZipFile::StaticGetCipher( const un xEncryptionData->m_aSalt.getLength(), xEncryptionData->m_nIterationCount ) ) { - throw ZipIOException( ::rtl::OUString::createFromAscii( "Can not create derived key!\n" ), + throw ZipIOException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can not create derived key!") ), uno::Reference< XInterface >() ); } @@ -189,7 +190,7 @@ uno::Reference< xml::crypto::XCipherContext > ZipFile::StaticGetCipher( const un } else { - throw ZipIOException( ::rtl::OUString::createFromAscii( "Unknown cipher algorithm is requested!\n" ), + throw ZipIOException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown cipher algorithm is requested!") ), uno::Reference< XInterface >() ); } } @@ -390,7 +391,7 @@ uno::Reference< XInputStream > ZipFile::StaticGetDataFromRawStream( const uno::R throw ( packages::WrongPasswordException, ZipIOException, RuntimeException ) { if ( !rData.is() ) - throw ZipIOException( OUString::createFromAscii( "Encrypted stream without encryption data!\n" ), + throw ZipIOException( OUString(RTL_CONSTASCII_USTRINGPARAM( "Encrypted stream without encryption data!\n" )), uno::Reference< XInterface >() ); if ( !rData->m_aKey.getLength() ) @@ -398,7 +399,7 @@ uno::Reference< XInputStream > ZipFile::StaticGetDataFromRawStream( const uno::R uno::Reference< XSeekable > xSeek( xStream, UNO_QUERY ); if ( !xSeek.is() ) - throw ZipIOException( OUString::createFromAscii( "The stream must be seekable!\n" ), + throw ZipIOException( OUString(RTL_CONSTASCII_USTRINGPARAM( "The stream must be seekable!\n" )), uno::Reference< XInterface >() ); @@ -588,7 +589,7 @@ uno::Reference< XInputStream > SAL_CALL ZipFile::getDataStream( ZipEntry& rEntry // in case no digest is provided there is no way // to detect password correctness if ( !rData.is() ) - throw ZipException( OUString::createFromAscii( "Encrypted stream without encryption data!\n" ), + throw ZipException( OUString(RTL_CONSTASCII_USTRINGPARAM( "Encrypted stream without encryption data!\n" )), uno::Reference< XInterface >() ); // if we have a digest, then this file is an encrypted one and we should @@ -667,29 +668,38 @@ sal_Bool ZipFile::readLOC( ZipEntry &rEntry ) aGrabber >> nExtraLen; rEntry.nOffset = static_cast < sal_Int32 > (aGrabber.getPosition()) + nPathLen + nExtraLen; - // read always in UTF8, some tools seem not to set UTF8 bit - uno::Sequence < sal_Int8 > aNameBuffer( nPathLen ); - sal_Int32 nRead = aGrabber.readBytes( aNameBuffer, nPathLen ); - if ( nRead < aNameBuffer.getLength() ) - aNameBuffer.realloc( nRead ); + sal_Bool bBroken = sal_False; - ::rtl::OUString sLOCPath = rtl::OUString::intern( (sal_Char *) aNameBuffer.getArray(), - aNameBuffer.getLength(), - RTL_TEXTENCODING_UTF8 ); + try + { + // read always in UTF8, some tools seem not to set UTF8 bit + uno::Sequence < sal_Int8 > aNameBuffer( nPathLen ); + sal_Int32 nRead = aGrabber.readBytes( aNameBuffer, nPathLen ); + if ( nRead < aNameBuffer.getLength() ) + aNameBuffer.realloc( nRead ); + + ::rtl::OUString sLOCPath = rtl::OUString::intern( (sal_Char *) aNameBuffer.getArray(), + aNameBuffer.getLength(), + RTL_TEXTENCODING_UTF8 ); + + if ( rEntry.nPathLen == -1 ) // the file was created + { + rEntry.nPathLen = nPathLen; + rEntry.sPath = sLOCPath; + } - if ( rEntry.nPathLen == -1 ) // the file was created + // the method can be reset for internal use so it is not checked + bBroken = rEntry.nVersion != nVersion + || rEntry.nFlag != nFlag + || rEntry.nTime != nTime + || rEntry.nPathLen != nPathLen + || !rEntry.sPath.equals( sLOCPath ); + } + catch(::std::bad_alloc &) { - rEntry.nPathLen = nPathLen; - rEntry.sPath = sLOCPath; + bBroken = sal_True; } - // the method can be reset for internal use so it is not checked - sal_Bool bBroken = rEntry.nVersion != nVersion - || rEntry.nFlag != nFlag - || rEntry.nTime != nTime - || rEntry.nPathLen != nPathLen - || !rEntry.sPath.equals( sLOCPath ); - if ( bBroken && !bRecoveryMode ) throw ZipIOException( OUString( RTL_CONSTASCII_USTRINGPARAM( "The stream seems to be broken!" ) ), uno::Reference< XInterface >() ); @@ -873,7 +883,7 @@ sal_Int32 ZipFile::recover() // the buffer should contain at least one header, // or if it is end of the file, at least the postheader with sizes and hash while( nPos < nBufSize - 30 - || ( aBuffer.getLength() < nToRead && nPos < nBufSize - 16 ) ) + || ( nBufSize < nToRead && nPos < nBufSize - 16 ) ) { if ( nPos < nBufSize - 30 && pBuffer[nPos] == 'P' && pBuffer[nPos+1] == 'K' && pBuffer[nPos+2] == 3 && pBuffer[nPos+3] == 4 ) @@ -955,7 +965,7 @@ sal_Int32 ZipFile::recover() aMemGrabber >> nCompressedSize; aMemGrabber >> nSize; - for( EntryHash::iterator aIter = aEntries.begin(); aIter != aEntries.end(); aIter++ ) + for( EntryHash::iterator aIter = aEntries.begin(); aIter != aEntries.end(); ++aIter ) { ZipEntry aTmp = (*aIter).second; @@ -1087,3 +1097,4 @@ void ZipFile::getSizeAndCRC( sal_Int32 nOffset, sal_Int32 nCompressedSize, sal_I *nCRC = aCRC.getValue(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/zipapi/ZipOutputStream.cxx b/package/source/zipapi/ZipOutputStream.cxx index 338feb556378..b1b8ce7e2c38 100644 --- a/package/source/zipapi/ZipOutputStream.cxx +++ b/package/source/zipapi/ZipOutputStream.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,7 +42,6 @@ #include <ZipPackageStream.hxx> #include <ZipOutputStream.hxx> -using namespace rtl; using namespace com::sun::star; using namespace com::sun::star::io; using namespace com::sun::star::uno; @@ -135,18 +135,17 @@ void SAL_CALL ZipOutputStream::closeEntry( ) { if (pEntry->nSize != aDeflater.getTotalIn()) { - OSL_ENSURE(false,"Invalid entry size"); + OSL_FAIL("Invalid entry size"); } if (pEntry->nCompressedSize != aDeflater.getTotalOut()) { - //VOS_DEBUG_ONLY("Invalid entry compressed size"); // Different compression strategies make the merit of this // test somewhat dubious pEntry->nCompressedSize = aDeflater.getTotalOut(); } if (pEntry->nCrc != aCRC.getValue()) { - OSL_ENSURE(false,"Invalid entry CRC-32"); + OSL_FAIL("Invalid entry CRC-32"); } } else @@ -164,10 +163,10 @@ void SAL_CALL ZipOutputStream::closeEntry( ) break; case STORED: if (!((pEntry->nFlag & 8) == 0)) - OSL_ENSURE ( false, "Serious error, one of compressed size, size or CRC was -1 in a STORED stream"); + OSL_FAIL( "Serious error, one of compressed size, size or CRC was -1 in a STORED stream"); break; default: - OSL_ENSURE(false,"Invalid compression method"); + OSL_FAIL("Invalid compression method"); break; } @@ -241,7 +240,7 @@ void SAL_CALL ZipOutputStream::finish( ) closeEntry(); if (aZipList.size() < 1) - OSL_ENSURE(false,"Zip file must have at least one entry!\n"); + OSL_FAIL("Zip file must have at least one entry!\n"); sal_Int32 nOffset= static_cast < sal_Int32 > (aChucker.GetPosition()); for (sal_Int32 i =0, nEnd = aZipList.size(); i < nEnd; i++) @@ -450,3 +449,4 @@ void ZipOutputStream::dosDateToTMDate ( tm &rTime, sal_uInt32 nDosDate) } */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/zipapi/blowfishcontext.cxx b/package/source/zipapi/blowfishcontext.cxx index 1739bb15cde8..6459cc4e4b5e 100644 --- a/package/source/zipapi/blowfishcontext.cxx +++ b/package/source/zipapi/blowfishcontext.cxx @@ -41,7 +41,7 @@ uno::Reference< xml::crypto::XCipherContext > BlowfishCFB8CipherContext::Create( ::rtl::Reference< BlowfishCFB8CipherContext > xResult = new BlowfishCFB8CipherContext(); xResult->m_pCipher = rtl_cipher_create( rtl_Cipher_AlgorithmBF, rtl_Cipher_ModeStream ); if ( !xResult->m_pCipher ) - throw uno::RuntimeException( ::rtl::OUString::createFromAscii( "Can not create cipher!\n" ), + throw uno::RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can not create cipher!")), uno::Reference< XInterface >() ); if ( rtl_Cipher_E_None != rtl_cipher_init( @@ -52,7 +52,7 @@ uno::Reference< xml::crypto::XCipherContext > BlowfishCFB8CipherContext::Create( reinterpret_cast< const sal_uInt8* >( aInitVector.getConstArray() ), aInitVector.getLength() ) ) { - throw uno::RuntimeException( ::rtl::OUString::createFromAscii( "Can not initialize cipher!\n" ), + throw uno::RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can not initialize cipher!") ), uno::Reference< XInterface >() ); } @@ -99,7 +99,7 @@ uno::Sequence< sal_Int8 > SAL_CALL BlowfishCFB8CipherContext::convertWithCipherC if ( rtl_Cipher_E_None != nError ) { - throw uno::RuntimeException( ::rtl::OUString::createFromAscii( "Can not decrypt/encrypt with cipher!\n" ), + throw uno::RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can not decrypt/encrypt with cipher!") ), uno::Reference< uno::XInterface >() ); } diff --git a/package/source/zipapi/makefile.mk b/package/source/zipapi/makefile.mk index 79dbb0289a1c..8a07d448ddbb 100644 --- a/package/source/zipapi/makefile.mk +++ b/package/source/zipapi/makefile.mk @@ -34,13 +34,14 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/util$/package.pmk # --- Files -------------------------------------------------------- .IF "$(L10N_framework)"=="" -#CFLAGS+=/Ob0 /Od .IF "$(SYSTEM_ZLIB)" == "YES" CFLAGS+=-DSYSTEM_ZLIB .ENDIF + SLOFILES= \ $(SLO)$/CRC32.obj \ $(SLO)$/ByteChucker.obj \ diff --git a/package/source/zipapi/sha1context.cxx b/package/source/zipapi/sha1context.cxx index a71f20ad6f36..0e34fd4a9661 100644 --- a/package/source/zipapi/sha1context.cxx +++ b/package/source/zipapi/sha1context.cxx @@ -41,7 +41,7 @@ uno::Reference< xml::crypto::XDigestContext > SHA1DigestContext::Create() ::rtl::Reference< SHA1DigestContext > xResult = new SHA1DigestContext(); xResult->m_pDigest = rtl_digest_createSHA1(); if ( !xResult->m_pDigest ) - throw uno::RuntimeException( ::rtl::OUString::createFromAscii( "Can not create cipher!\n" ), + throw uno::RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can not create cipher!") ), uno::Reference< XInterface >() ); return uno::Reference< xml::crypto::XDigestContext >( xResult.get() ); diff --git a/package/source/zipapi/sha1context.hxx b/package/source/zipapi/sha1context.hxx index dbd1207ca792..c8f6068f7bbf 100644 --- a/package/source/zipapi/sha1context.hxx +++ b/package/source/zipapi/sha1context.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -53,5 +54,6 @@ public: }; -#endif // _SHA1CONTEXT_HXX +#endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file diff --git a/package/source/zippackage/ContentInfo.hxx b/package/source/zippackage/ContentInfo.hxx index 6d88d17e3780..baf5078147a2 100644 --- a/package/source/zippackage/ContentInfo.hxx +++ b/package/source/zippackage/ContentInfo.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ #define _CONTENT_INFO_HXX_ #include <com/sun/star/container/XNameContainer.hpp> -#ifndef _COM_SUN_STAR_LANG_XUNOTUNNEl_HPP_ #include <com/sun/star/lang/XUnoTunnel.hpp> -#endif #include <ZipPackageFolder.hxx> #include <ZipPackageStream.hxx> @@ -67,3 +66,5 @@ public: }; } } } } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index 41d944288d53..ed5f81ba592d 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,7 +38,6 @@ #include <ZipFile.hxx> #include <PackageConstants.hxx> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/packages/zip/ZipConstants.hpp> #include <com/sun/star/packages/manifest/XManifestReader.hpp> #include <com/sun/star/packages/manifest/XManifestWriter.hpp> @@ -87,7 +87,6 @@ #include <comphelper/documentconstants.hxx> #include <comphelper/sequenceashashmap.hxx> -using namespace rtl; using namespace std; using namespace osl; using namespace cppu; @@ -106,6 +105,9 @@ using namespace com::sun::star::packages::zip; using namespace com::sun::star::packages::manifest; using namespace com::sun::star::packages::zip::ZipConstants; +using ::rtl::OUString; +using ::rtl::OString; + #define LOGFILE_AUTHOR "mg115289" @@ -632,18 +634,18 @@ void SAL_CALL ZipPackage::initialize( const uno::Sequence< Any >& aArguments ) do { ::rtl::OUString aCommand = aParam.getToken( 0, '&', nIndex ); - if ( aCommand.equals( OUString::createFromAscii( "repairpackage" ) ) ) + if ( aCommand.equals( OUString(RTL_CONSTASCII_USTRINGPARAM( "repairpackage" )) ) ) { m_bForceRecovery = sal_True; break; } - else if ( aCommand.equals( OUString::createFromAscii( "purezip" ) ) ) + else if ( aCommand.equals( OUString(RTL_CONSTASCII_USTRINGPARAM( "purezip" )) ) ) { m_nFormat = embed::StorageFormats::ZIP; m_pRootFolder->setPackageFormat_Impl( m_nFormat ); break; } - else if ( aCommand.equals( OUString::createFromAscii( "ofopxml" ) ) ) + else if ( aCommand.equals( OUString(RTL_CONSTASCII_USTRINGPARAM( "ofopxml" )) ) ) { m_nFormat = embed::StorageFormats::OFOPXML; m_pRootFolder->setPackageFormat_Impl( m_nFormat ); @@ -656,7 +658,7 @@ void SAL_CALL ZipPackage::initialize( const uno::Sequence< Any >& aArguments ) m_aURL = aParamUrl; Content aContent ( m_aURL, uno::Reference < XCommandEnvironment >() ); - Any aAny = aContent.getPropertyValue( OUString::createFromAscii( "Size" ) ); + Any aAny = aContent.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "Size" )) ); sal_uInt64 aSize = 0; // kind of optimisation: treat empty files as nonexistent files // and write to such files directly. Note that "Size" property is optional. @@ -690,9 +692,9 @@ void SAL_CALL ZipPackage::initialize( const uno::Sequence< Any >& aArguments ) } else if ( ( aArguments[ind] >>= aNamedValue ) ) { - if ( aNamedValue.Name.equalsAscii( "RepairPackage" ) ) + if ( aNamedValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "RepairPackage" ) ) ) aNamedValue.Value >>= m_bForceRecovery; - else if ( aNamedValue.Name.equalsAscii( "PackageFormat" ) ) + else if ( aNamedValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PackageFormat" ) ) ) { // setting this argument to true means Package format // setting it to false means plain Zip format @@ -704,7 +706,7 @@ void SAL_CALL ZipPackage::initialize( const uno::Sequence< Any >& aArguments ) m_pRootFolder->setPackageFormat_Impl( m_nFormat ); } - else if ( aNamedValue.Name.equalsAscii( "StorageFormat" ) ) + else if ( aNamedValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StorageFormat" ) ) ) { ::rtl::OUString aFormatName; sal_Int32 nFormatID = 0; @@ -733,14 +735,14 @@ void SAL_CALL ZipPackage::initialize( const uno::Sequence< Any >& aArguments ) m_pRootFolder->setPackageFormat_Impl( m_nFormat ); } - else if ( aNamedValue.Name.equalsAscii( "AllowRemoveOnInsert" ) ) + else if ( aNamedValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "AllowRemoveOnInsert" ) ) ) { aNamedValue.Value >>= m_bAllowRemoveOnInsert; m_pRootFolder->setRemoveOnInsertMode_Impl( m_bAllowRemoveOnInsert ); } // for now the progress handler is not used, probably it will never be - // if ( aNamedValue.Name.equalsAscii( "ProgressHandler" ) + // if ( aNamedValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ProgressHandler" ) ) } else { @@ -1072,7 +1074,7 @@ void ZipPackage::WriteManifest( ZipOutputStream& aZipOut, const vector< uno::Seq } else { - VOS_ENSURE ( 0, "Couldn't get a ManifestWriter!" ); + OSL_FAIL( "Couldn't get a ManifestWriter!" ); IOException aException; throw WrappedTargetException( OUString( RTL_CONSTASCII_USTRINGPARAM ( OSL_LOG_PREFIX "Couldn't get a ManifestWriter!" ) ), @@ -1104,7 +1106,7 @@ void ZipPackage::WriteContentTypes( ZipOutputStream& aZipOut, const vector< uno: for ( vector< uno::Sequence< beans::PropertyValue > >::const_iterator aIter = aManList.begin(), aEnd = aManList.end(); aIter != aEnd; - aIter++ ) + ++aIter) { ::rtl::OUString aPath; ::rtl::OUString aType; @@ -1355,7 +1357,7 @@ uno::Reference< XActiveDataStreamer > ZipPackage::openOriginalForOutput() { Exception aDetect; sal_Int64 aSize = 0; - Any aAny = aOriginalContent.setPropertyValue( OUString::createFromAscii( "Size" ), makeAny( aSize ) ); + Any aAny = aOriginalContent.setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "Size" )), makeAny( aSize ) ); if( !( aAny >>= aDetect ) ) bTruncSuccess = sal_True; } @@ -1378,7 +1380,7 @@ uno::Reference< XActiveDataStreamer > ZipPackage::openOriginalForOutput() aArg.Sink = xSink; aArg.Properties = uno::Sequence< Property >( 0 ); // unused - aOriginalContent.executeCommand( OUString::createFromAscii( "open" ), makeAny( aArg ) ); + aOriginalContent.executeCommand( OUString(RTL_CONSTASCII_USTRINGPARAM( "open" )), makeAny( aArg ) ); } catch( Exception& ) { @@ -1477,7 +1479,7 @@ void SAL_CALL ZipPackage::commitChanges() { // write directly in case of local file uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess > xSimpleAccess( - m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ), + m_xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess") ) ), uno::UNO_QUERY ); OSL_ENSURE( xSimpleAccess.is(), "Can't instatiate SimpleFileAccess service!\n" ); uno::Reference< io::XTruncate > xOrigTruncate; @@ -1574,14 +1576,14 @@ void ZipPackage::DisconnectFromTargetAndThrowException_Impl( const uno::Referenc ::rtl::OUString aTempURL; try { uno::Reference< beans::XPropertySet > xTempFile( xTempStream, uno::UNO_QUERY_THROW ); - uno::Any aUrl = xTempFile->getPropertyValue( ::rtl::OUString::createFromAscii( "Uri" ) ); + uno::Any aUrl = xTempFile->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Uri") ) ); aUrl >>= aTempURL; - xTempFile->setPropertyValue( ::rtl::OUString::createFromAscii( "RemoveFile" ), + xTempFile->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RemoveFile") ), uno::makeAny( sal_False ) ); } catch ( uno::Exception& ) { - OSL_ENSURE( sal_False, "These calls are pretty simple, they should not fail!\n" ); + OSL_FAIL( "These calls are pretty simple, they should not fail!\n" ); } ::rtl::OUString aErrTxt( RTL_CONSTASCII_USTRINGPARAM ( OSL_LOG_PREFIX "This package is read only!" ) ); @@ -1884,3 +1886,5 @@ void SAL_CALL ZipPackage::removeVetoableChangeListener( const OUString& /*Proper throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/zippackage/ZipPackageBuffer.cxx b/package/source/zippackage/ZipPackageBuffer.cxx index e6468c8539f0..d6a20eb0b96c 100644 --- a/package/source/zippackage/ZipPackageBuffer.cxx +++ b/package/source/zippackage/ZipPackageBuffer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -134,3 +135,5 @@ sal_Int64 SAL_CALL ZipPackageBuffer::getLength( ) { return m_nEnd; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/zippackage/ZipPackageEntry.cxx b/package/source/zippackage/ZipPackageEntry.cxx index a1f752174dc6..0d034f6af34c 100644 --- a/package/source/zippackage/ZipPackageEntry.cxx +++ b/package/source/zippackage/ZipPackageEntry.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,7 +38,6 @@ #include <comphelper/storagehelper.hxx> -using namespace rtl; using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -45,6 +45,8 @@ using namespace com::sun::star::container; using namespace com::sun::star::packages::zip; using namespace com::sun::star::packages::zip::ZipConstants; +using rtl::OUString; + ZipPackageEntry::ZipPackageEntry ( bool bNewFolder ) : mbIsFolder ( bNewFolder ) , mbAllowRemoveOnInsert( sal_True ) @@ -134,3 +136,5 @@ void SAL_CALL ZipPackageEntry::removeVetoableChangeListener( const OUString& /*P throw(beans::UnknownPropertyException, WrappedTargetException, RuntimeException) { } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx index 0d78fe42cd34..01f8e7008e5b 100644 --- a/package/source/zippackage/ZipPackageFolder.cxx +++ b/package/source/zippackage/ZipPackageFolder.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,7 +36,7 @@ #include <ZipPackageFolderEnumeration.hxx> #include <com/sun/star/packages/zip/ZipConstants.hpp> #include <com/sun/star/embed/StorageFormats.hpp> -#include <vos/diagnose.hxx> +#include <osl/diagnose.h> #include <osl/time.h> #include <rtl/digest.h> #include <ContentInfo.hxx> @@ -57,7 +58,6 @@ using namespace com::sun::star::io; using namespace cppu; using namespace std; using namespace ::com::sun::star; -using vos::ORef; namespace { struct lcl_CachedImplId : public rtl::Static< uno::Sequence < sal_Int8 >, lcl_CachedImplId > {}; } @@ -96,7 +96,7 @@ sal_Bool ZipPackageFolder::LookForUnexpectedODF12Streams( const ::rtl::OUString& for ( ContentHash::const_iterator aCI = maContents.begin(), aEnd = maContents.end(); !bHasUnexpected && aCI != aEnd; - aCI++) + ++aCI) { const ::rtl::OUString &rShortName = (*aCI).first; const ContentInfo &rInfo = *(*aCI).second; @@ -154,7 +154,7 @@ void ZipPackageFolder::setChildStreamsTypeByExtension( const beans::StringPair& for ( ContentHash::const_iterator aCI = maContents.begin(), aEnd = maContents.end(); aCI != aEnd; - aCI++) + ++aCI) { const ::rtl::OUString &rShortName = (*aCI).first; const ContentInfo &rInfo = *(*aCI).second; @@ -400,7 +400,7 @@ bool ZipPackageFolder::saveChild( const ::rtl::OUString &rShortName, const Conte if ( !xStream.is() ) { - VOS_ENSURE( 0, "ZipPackageStream didn't have a stream associated with it, skipping!" ); + OSL_FAIL( "ZipPackageStream didn't have a stream associated with it, skipping!" ); bSuccess = false; return bSuccess; } @@ -415,7 +415,7 @@ bool ZipPackageFolder::saveChild( const ::rtl::OUString &rShortName, const Conte if ( !bToBeCompressed || bRawStream ) { // The raw stream can neither be encrypted nor connected - OSL_ENSURE( !bRawStream || !bToBeCompressed && !bToBeEncrypted, "The stream is already encrypted!\n" ); + OSL_ENSURE( !bRawStream || !(bToBeCompressed || bToBeEncrypted), "The stream is already encrypted!\n" ); xSeek->seek ( bRawStream ? rInfo.pStream->GetMagicalHackPos() : 0 ); ImplSetStoredData ( *pTempEntry, xStream ); @@ -728,8 +728,7 @@ void ZipPackageFolder::saveContents( ::rtl::OUString &rPath, std::vector < uno:: } for ( ContentHash::const_iterator aCI = maContents.begin(), aEnd = maContents.end(); - aCI != aEnd; - aCI++) + aCI != aEnd; ++aCI) { const ::rtl::OUString &rShortName = (*aCI).first; const ContentInfo &rInfo = *(*aCI).second; @@ -767,7 +766,7 @@ void ZipPackageFolder::releaseUpwardRef( void ) } clearParent(); - VOS_ENSURE ( m_refCount == 1, "Ref-count is not 1!" ); + OSL_ENSURE ( m_refCount == 1, "Ref-count is not 1!" ); #endif } @@ -853,3 +852,5 @@ sal_Bool SAL_CALL ZipPackageFolder::supportsService( ::rtl::OUString const & rSe { return rServiceName == getSupportedServiceNames()[0]; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/zippackage/ZipPackageFolderEnumeration.cxx b/package/source/zippackage/ZipPackageFolderEnumeration.cxx index 562e42d9e266..ed1bfbdf1d30 100644 --- a/package/source/zippackage/ZipPackageFolderEnumeration.cxx +++ b/package/source/zippackage/ZipPackageFolderEnumeration.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -77,3 +78,5 @@ sal_Bool SAL_CALL ZipPackageFolderEnumeration::supportsService( OUString const & { return rServiceName == getSupportedServiceNames()[0]; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/zippackage/ZipPackageFolderEnumeration.hxx b/package/source/zippackage/ZipPackageFolderEnumeration.hxx index bea038d684f3..d136faa9be49 100644 --- a/package/source/zippackage/ZipPackageFolderEnumeration.hxx +++ b/package/source/zippackage/ZipPackageFolderEnumeration.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,12 +30,8 @@ #include <cppuhelper/implbase2.hxx> // helper for implementations #include <com/sun/star/container/XEnumeration.hpp> -#ifndef _COM_SUN_STAR_LANG_XPSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif -#ifndef _HASH_MAPS_HXX #include <HashMaps.hxx> -#endif class ZipPackageFolderEnumeration : public cppu::WeakImplHelper2 < @@ -46,7 +43,7 @@ protected: ContentHash& rContents; ContentHash::const_iterator aIterator; public: - //ZipPackageFolderEnumeration (std::hash_map < rtl::OUString, com::sun::star::uno::Reference < com::sun::star::container::XNamed >, hashFunc, eqFunc > &rInput); + //ZipPackageFolderEnumeration (boost::unordered_map < rtl::OUString, com::sun::star::uno::Reference < com::sun::star::container::XNamed >, hashFunc, eqFunc > &rInput); ZipPackageFolderEnumeration (ContentHash &rInput); virtual ~ZipPackageFolderEnumeration( void ); @@ -66,3 +63,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/zippackage/ZipPackageSink.cxx b/package/source/zippackage/ZipPackageSink.cxx index 9a42138a5cb1..2f9202398493 100644 --- a/package/source/zippackage/ZipPackageSink.cxx +++ b/package/source/zippackage/ZipPackageSink.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,3 +47,5 @@ void SAL_CALL ZipPackageSink::setInputStream( const ::com::sun::star::uno::Refer { return xStream; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/zippackage/ZipPackageSink.hxx b/package/source/zippackage/ZipPackageSink.hxx index 95dac72a836b..a90d40131072 100644 --- a/package/source/zippackage/ZipPackageSink.hxx +++ b/package/source/zippackage/ZipPackageSink.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,3 +47,5 @@ public: throw(::com::sun::star::uno::RuntimeException); }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx index 79797b938f60..d63560440ccb 100644 --- a/package/source/zippackage/ZipPackageStream.cxx +++ b/package/source/zippackage/ZipPackageStream.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,7 +43,7 @@ #include <ZipPackage.hxx> #include <ZipFile.hxx> #include <EncryptedDataHeader.hxx> -#include <vos/diagnose.hxx> +#include <osl/diagnose.h> #include "wrapstreamforshare.hxx" #include <comphelper/seekableinput.hxx> @@ -58,8 +59,8 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star; using namespace cppu; -using namespace rtl; +using rtl::OUString; namespace { struct lcl_CachedImplId : public rtl::Static< Sequence < sal_Int8 >, lcl_CachedImplId > {}; } const ::com::sun::star::uno::Sequence < sal_Int8 >& ZipPackageStream::static_getImplementationId() @@ -506,12 +507,12 @@ uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getRawData() } catch ( ZipException & )//rException ) { - VOS_ENSURE( 0, "ZipException thrown" );//rException.Message ); + OSL_FAIL( "ZipException thrown" );//rException.Message); return uno::Reference < io::XInputStream > (); } catch ( Exception & ) { - VOS_ENSURE( 0, "Exception is thrown during stream wrapping!\n" ); + OSL_FAIL( "Exception is thrown during stream wrapping!\n" ); return uno::Reference < io::XInputStream > (); } } @@ -535,12 +536,12 @@ uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getInputStream() } catch ( ZipException & )//rException ) { - VOS_ENSURE( 0,"ZipException thrown" );//rException.Message ); + OSL_FAIL( "ZipException thrown" );//rException.Message); return uno::Reference < io::XInputStream > (); } catch ( Exception & ) { - VOS_ENSURE( 0, "Exception is thrown during stream wrapping!\n" ); + OSL_FAIL( "Exception is thrown during stream wrapping!\n" ); return uno::Reference < io::XInputStream > (); } } @@ -886,7 +887,7 @@ Any SAL_CALL ZipPackageStream::getPropertyValue( const OUString& PropertyName ) } else if ( PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "Encrypted" ) ) ) { - aAny <<= ( m_nStreamMode == PACKAGE_STREAM_RAW ) ? sal_True : bToBeEncrypted; + aAny <<= ((m_nStreamMode == PACKAGE_STREAM_RAW) ? sal_True : bToBeEncrypted); return aAny; } else if ( PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "WasEncrypted" ) ) ) @@ -942,3 +943,4 @@ sal_Bool SAL_CALL ZipPackageStream::supportsService( OUString const & rServiceNa return rServiceName == getSupportedServiceNames()[0]; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/zippackage/makefile.mk b/package/source/zippackage/makefile.mk index 4bab1649b491..c729b945f0df 100644 --- a/package/source/zippackage/makefile.mk +++ b/package/source/zippackage/makefile.mk @@ -36,11 +36,9 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(L10N_framework)"=="" - # --- Files -------------------------------------------------------- -# the following flag un-inlines function calls and disables optimisations -#CFLAGS+=/Ob0 /Od + +.IF "$(L10N_framework)"=="" SLOFILES= \ $(SLO)$/ZipPackage.obj \ @@ -53,9 +51,6 @@ SLOFILES= \ $(SLO)$/wrapstreamforshare.obj \ $(SLO)$/zipfileaccess.obj -# $(SLO)$/InteractionRequest.obj \ -# $(SLO)$/InteractionContinuation.obj - .ENDIF # L10N_framework # --- Targets ------------------------------------------------------ diff --git a/package/source/zippackage/wrapstreamforshare.cxx b/package/source/zippackage/wrapstreamforshare.cxx index d3d2eb84d1b7..c39bfa06edbb 100644 --- a/package/source/zippackage/wrapstreamforshare.cxx +++ b/package/source/zippackage/wrapstreamforshare.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,7 +44,7 @@ WrapStreamForShare::WrapStreamForShare( const uno::Reference< io::XInputStream > m_xSeekable = uno::Reference< io::XSeekable >( m_xInStream, uno::UNO_QUERY ); if ( !m_rMutexRef.Is() || !m_xInStream.is() || !m_xSeekable.is() ) { - OSL_ENSURE( sal_False, "Wrong initialization of wrapping stream!\n" ); + OSL_FAIL( "Wrong initialization of wrapping stream!\n" ); throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() ); } } @@ -178,3 +179,4 @@ sal_Int64 SAL_CALL WrapStreamForShare::getLength() return m_xSeekable->getLength(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/zippackage/wrapstreamforshare.hxx b/package/source/zippackage/wrapstreamforshare.hxx index c799e3ac9b92..85b03c62943c 100644 --- a/package/source/zippackage/wrapstreamforshare.hxx +++ b/package/source/zippackage/wrapstreamforshare.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -71,3 +72,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/source/zippackage/zipfileaccess.cxx b/package/source/zippackage/zipfileaccess.cxx index d93e03803204..e4b9d75b9ba3 100644 --- a/package/source/zippackage/zipfileaccess.cxx +++ b/package/source/zippackage/zipfileaccess.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_package.hxx" #include <com/sun/star/lang/DisposedException.hpp> -#ifndef _COM_SUN_STAR_LANG_INVALIDARGUMENTEXCEPTION_HPP_ #include <com/sun/star/lang/IllegalArgumentException.hpp> -#endif #include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <com/sun/star/io/XActiveDataSink.hpp> #include <com/sun/star/io/XStream.hpp> @@ -105,7 +104,7 @@ uno::Sequence< ::rtl::OUString > OZipFileAccess::GetPatternsFromString_Impl( con } else { - OSL_ENSURE( sal_False, "The backslash is not guarded!\n" ); + OSL_FAIL( "The backslash is not guarded!\n" ); aPattern[nInd] += ::rtl::OUString::valueOf( (sal_Unicode)'\\' ); } } @@ -279,11 +278,11 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OZipFileAccess::getElementNames() uno::Sequence< ::rtl::OUString > aNames( m_pZipFile->GetEntryHash().size() ); sal_Int32 nLen = 0; - for ( EntryHash::iterator aIter = m_pZipFile->GetEntryHash().begin(); aIter != m_pZipFile->GetEntryHash().end(); aIter++ ) + for ( EntryHash::iterator aIter = m_pZipFile->GetEntryHash().begin(); aIter != m_pZipFile->GetEntryHash().end(); ++aIter ) { if ( aNames.getLength() < ++nLen ) { - OSL_ENSURE( sal_False, "The size must be the same!\n" ); + OSL_FAIL( "The size must be the same!\n" ); aNames.realloc( nLen ); } @@ -292,7 +291,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OZipFileAccess::getElementNames() if ( aNames.getLength() != nLen ) { - OSL_ENSURE( sal_False, "The size must be the same!\n" ); + OSL_FAIL( "The size must be the same!\n" ); aNames.realloc( nLen ); } @@ -364,7 +363,7 @@ uno::Reference< io::XInputStream > SAL_CALL OZipFileAccess::getStreamByPattern( // Code to compare strings by patterns uno::Sequence< ::rtl::OUString > aPattern = GetPatternsFromString_Impl( aPatternString ); - for ( EntryHash::iterator aIter = m_pZipFile->GetEntryHash().begin(); aIter != m_pZipFile->GetEntryHash().end(); aIter++ ) + for ( EntryHash::iterator aIter = m_pZipFile->GetEntryHash().begin(); aIter != m_pZipFile->GetEntryHash().end(); ++aIter ) { if ( StringGoodForPattern_Impl( (*aIter).second.sPath, aPattern ) ) { @@ -446,15 +445,15 @@ void SAL_CALL OZipFileAccess::removeEventListener( const uno::Reference< lang::X uno::Sequence< ::rtl::OUString > SAL_CALL OZipFileAccess::impl_staticGetSupportedServiceNames() { uno::Sequence< ::rtl::OUString > aRet(2); - aRet[0] = ::rtl::OUString::createFromAscii("com.sun.star.packages.zip.ZipFileAccess"); - aRet[1] = ::rtl::OUString::createFromAscii("com.sun.star.comp.packages.zip.ZipFileAccess"); + aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.packages.zip.ZipFileAccess") ); + aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.packages.zip.ZipFileAccess") ); return aRet; } //------------------------------------------------------------------------- ::rtl::OUString SAL_CALL OZipFileAccess::impl_staticGetImplementationName() { - return ::rtl::OUString::createFromAscii("com.sun.star.comp.package.zip.ZipFileAccess"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.package.zip.ZipFileAccess") ); } //------------------------------------------------------------------------- @@ -491,3 +490,4 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OZipFileAccess::getSupportedServiceNam return impl_staticGetSupportedServiceNames(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/util/makefile.mk b/package/util/makefile.mk index 344b2cf1346f..0a3f0d77a076 100644 --- a/package/util/makefile.mk +++ b/package/util/makefile.mk @@ -55,7 +55,7 @@ LIB1FILES= \ SHL1TARGET=$(TARGET)$(MAJOR_VERSION) SHL1IMPLIB=i$(TARGET) -SHL1VERSIONMAP=$(SOLARENV)$/src$/component.map +SHL1USE_EXPORTS=name SHL1STDLIBS=\ $(CPPULIB) \ diff --git a/package/util/package.pmk b/package/util/package.pmk new file mode 100644 index 000000000000..7d3d412b89a0 --- /dev/null +++ b/package/util/package.pmk @@ -0,0 +1,2 @@ +VISIBILITY_HIDDEN = TRUE +CDEFS += -DDLLIMPLEMENTATION_PACKAGE
\ No newline at end of file |