[Libreoffice-commits] core.git: package/inc package/source
Jelle van der Waa
jelle at vdwaa.nl
Wed Jul 31 09:26:35 PDT 2013
package/inc/PackageConstants.hxx | 1
package/inc/ZipFile.hxx | 2
package/inc/zipfileaccess.hxx | 2
package/source/manifest/ManifestExport.cxx | 2
package/source/manifest/ManifestImport.cxx | 14 -
package/source/manifest/ManifestImport.hxx | 1
package/source/manifest/UnoRegister.cxx | 1
package/source/xstor/disposelistener.cxx | 1
package/source/xstor/ocompinstream.cxx | 39 ----
package/source/xstor/ohierarchyholder.cxx | 17 --
package/source/xstor/ohierarchyholder.hxx | 1
package/source/xstor/oseekinstream.cxx | 1
package/source/xstor/owriteablestream.cxx | 121 --------------
package/source/xstor/owriteablestream.hxx | 5
package/source/xstor/register.cxx | 1
package/source/xstor/selfterminatefilestream.cxx | 12 -
package/source/xstor/switchpersistencestream.cxx | 40 ----
package/source/xstor/switchpersistencestream.hxx | 3
package/source/xstor/xfactory.cxx | 10 -
package/source/xstor/xfactory.hxx | 3
package/source/xstor/xstorage.cxx | 191 -----------------------
package/source/xstor/xstorage.hxx | 49 -----
package/source/zipapi/XUnbufferedStream.cxx | 1
package/source/zipapi/XUnbufferedStream.hxx | 1
package/source/zipapi/ZipFile.cxx | 5
package/source/zipapi/ZipOutputStream.cxx | 1
package/source/zipapi/blowfishcontext.cxx | 2
package/source/zipapi/sha1context.cxx | 2
package/source/zippackage/ZipPackage.cxx | 45 -----
package/source/zippackage/ZipPackageFolder.cxx | 2
package/source/zippackage/ZipPackageStream.cxx | 27 ---
package/source/zippackage/wrapstreamforshare.cxx | 1
package/source/zippackage/wrapstreamforshare.hxx | 1
package/source/zippackage/zipfileaccess.cxx | 21 --
34 files changed, 7 insertions(+), 619 deletions(-)
New commits:
commit 608dec14f1fd7b46b294da9341a6da6a24caef91
Author: Jelle van der Waa <jelle at vdwaa.nl>
Date: Mon Jul 29 22:22:17 2013 +0200
fdo#62475 removed pointless comments
Change-Id: Ic3743e48ef9055933ff040c180561ef41b3a2990
Reviewed-on: https://gerrit.libreoffice.org/5174
Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
Tested-by: Fridrich Strba <fridrich at documentfoundation.org>
diff --git a/package/inc/PackageConstants.hxx b/package/inc/PackageConstants.hxx
index dfa2986..358ad30 100644
--- a/package/inc/PackageConstants.hxx
+++ b/package/inc/PackageConstants.hxx
@@ -56,7 +56,6 @@ const sal_Int32 n_ConstDigestDecrypt = 1056; // 1024 + 32
#define IS_INCONSISTENT_PROPERTY "IsInconsistent"
#define MEDIATYPE_FALLBACK_USED_PROPERTY "MediaTypeFallbackUsed"
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx
index e17a0cf..c3dd7a1 100644
--- a/package/inc/ZipFile.hxx
+++ b/package/inc/ZipFile.hxx
@@ -125,7 +125,6 @@ public:
SotMutexHolderRef aMutexHolder )
throw(::com::sun::star::io::IOException, ::com::sun::star::packages::zip::ZipException, ::com::sun::star::uno::RuntimeException);
-
static ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XDigestContext > StaticGetDigestContextForChecksum(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xArgContext,
const ::rtl::Reference< EncryptionData >& xEncryptionData );
@@ -162,7 +161,6 @@ public:
const ::com::sun::star::uno::Sequence< sal_Int8 > &aReadBuffer,
const ::rtl::Reference < EncryptionData > &rData );
-
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream(
ZipEntry& rEntry,
const ::rtl::Reference < EncryptionData > &rData,
diff --git a/package/inc/zipfileaccess.hxx b/package/inc/zipfileaccess.hxx
index e84d7ac..59d2acc 100644
--- a/package/inc/zipfileaccess.hxx
+++ b/package/inc/zipfileaccess.hxx
@@ -62,7 +62,6 @@ public:
sal_Bool StringGoodForPattern_Impl( const OUString& aString,
const ::com::sun::star::uno::Sequence< OUString >& aPattern );
-
static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames();
static OUString SAL_CALL impl_staticGetImplementationName();
@@ -70,7 +69,6 @@ public:
static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMSF );
-
// XInitialization
virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
diff --git a/package/source/manifest/ManifestExport.cxx b/package/source/manifest/ManifestExport.cxx
index 1ecb093..7e55a28 100644
--- a/package/source/manifest/ManifestExport.cxx
+++ b/package/source/manifest/ManifestExport.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <com/sun/star/xml/sax/XAttributeList.hpp>
@@ -36,7 +35,6 @@
using namespace ::com::sun::star;
-
ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHandler, const uno::Sequence< uno::Sequence < beans::PropertyValue > >& rManList )
{
const OUString sFileEntryElement ( ELEMENT_FILE_ENTRY );
diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx
index 970417a..d14fdc6 100644
--- a/package/source/manifest/ManifestImport.cxx
+++ b/package/source/manifest/ManifestImport.cxx
@@ -31,8 +31,6 @@ using namespace com::sun::star::beans;
using namespace com::sun::star;
using namespace std;
-
-// ---------------------------------------------------
ManifestImport::ManifestImport( vector < Sequence < PropertyValue > > & rNewManVector )
: bIgnoreEncryptData ( sal_False )
, nDerivedKeySize( 0 )
@@ -95,18 +93,15 @@ ManifestImport::ManifestImport( vector < Sequence < PropertyValue > > & rNewManV
aStack.reserve( 10 );
}
-// ---------------------------------------------------
ManifestImport::~ManifestImport ( void )
{
}
-// ---------------------------------------------------
void SAL_CALL ManifestImport::startDocument( )
throw( xml::sax::SAXException, uno::RuntimeException )
{
}
-// ---------------------------------------------------
void SAL_CALL ManifestImport::endDocument( )
throw( xml::sax::SAXException, uno::RuntimeException )
{
@@ -273,7 +268,6 @@ void ManifestImport::doStartKeyAlg(StringHashMap &rConvertedAttribs)
bIgnoreEncryptData = sal_True;
}
-// ---------------------------------------------------
void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs )
throw( xml::sax::SAXException, uno::RuntimeException )
{
@@ -344,7 +338,6 @@ namespace
}
}
-// ---------------------------------------------------
void SAL_CALL ManifestImport::endElement( const OUString& aName )
throw( xml::sax::SAXException, uno::RuntimeException )
{
@@ -367,31 +360,26 @@ void SAL_CALL ManifestImport::endElement( const OUString& aName )
}
}
-// ---------------------------------------------------
void SAL_CALL ManifestImport::characters( const OUString& /*aChars*/ )
throw( xml::sax::SAXException, uno::RuntimeException )
{
}
-// ---------------------------------------------------
void SAL_CALL ManifestImport::ignorableWhitespace( const OUString& /*aWhitespaces*/ )
throw( xml::sax::SAXException, uno::RuntimeException )
{
}
-// ---------------------------------------------------
void SAL_CALL ManifestImport::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ )
throw( xml::sax::SAXException, uno::RuntimeException )
{
}
-// ---------------------------------------------------
void SAL_CALL ManifestImport::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& /*xLocator*/ )
throw( xml::sax::SAXException, uno::RuntimeException )
{
}
-// ---------------------------------------------------
OUString ManifestImport::PushNameAndNamespaces( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs, StringHashMap& o_aConvertedAttribs )
{
StringHashMap aNamespaces;
@@ -437,7 +425,6 @@ OUString ManifestImport::PushNameAndNamespaces( const OUString& aName, const uno
return aConvertedName;
}
-// ---------------------------------------------------
OUString ManifestImport::ConvertNameWithNamespace( const OUString& aName, const StringHashMap& aNamespaces )
{
OUString aNsAlias;
@@ -464,7 +451,6 @@ OUString ManifestImport::ConvertNameWithNamespace( const OUString& aName, const
return aResult;
}
-// ---------------------------------------------------
OUString ManifestImport::ConvertName( const OUString& aName )
{
OUString aConvertedName;
diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/manifest/ManifestImport.hxx
index 73a1b58..936a75f 100644
--- a/package/source/manifest/ManifestImport.hxx
+++ b/package/source/manifest/ManifestImport.hxx
@@ -115,7 +115,6 @@ protected:
const OUString sPBKDF2_Name;
const OUString sPBKDF2_URL;
-
OUString PushNameAndNamespaces( const OUString& aName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs,
StringHashMap& o_aConvertedAttribs );
diff --git a/package/source/manifest/UnoRegister.cxx b/package/source/manifest/UnoRegister.cxx
index e807863..b45cb4b 100644
--- a/package/source/manifest/UnoRegister.cxx
+++ b/package/source/manifest/UnoRegister.cxx
@@ -34,7 +34,6 @@ using namespace ::com::sun::star::registry;
using namespace ::com::sun::star::packages;
using namespace ::com::sun::star::packages::manifest;
-
/**
* This function is called to get service factories for an implementation.
* @param pImplName name of implementation
diff --git a/package/source/xstor/disposelistener.cxx b/package/source/xstor/disposelistener.cxx
index a0670f4..d2d5f3d 100644
--- a/package/source/xstor/disposelistener.cxx
+++ b/package/source/xstor/disposelistener.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "disposelistener.hxx"
#include "xstorage.hxx"
diff --git a/package/source/xstor/ocompinstream.cxx b/package/source/xstor/ocompinstream.cxx
index 55a7312..1b5bab7 100644
--- a/package/source/xstor/ocompinstream.cxx
+++ b/package/source/xstor/ocompinstream.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "ocompinstream.hxx"
#include <com/sun/star/embed/StorageFormats.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
@@ -28,7 +27,6 @@
using namespace ::com::sun::star;
-//-----------------------------------------------
OInputCompStream::OInputCompStream( OWriteStream_Impl& aImpl,
uno::Reference < io::XInputStream > xStream,
const uno::Sequence< beans::PropertyValue >& aProps,
@@ -48,7 +46,6 @@ OInputCompStream::OInputCompStream( OWriteStream_Impl& aImpl,
OSL_ENSURE( xStream.is(), "No stream is provided!\n" );
}
-//-----------------------------------------------
OInputCompStream::OInputCompStream( uno::Reference < io::XInputStream > xStream,
const uno::Sequence< beans::PropertyValue >& aProps,
sal_Int32 nStorageType )
@@ -63,7 +60,6 @@ OInputCompStream::OInputCompStream( uno::Reference < io::XInputStream > xStream,
OSL_ENSURE( xStream.is(), "No stream is provided!\n" );
}
-//-----------------------------------------------
OInputCompStream::~OInputCompStream()
{
{
@@ -80,7 +76,6 @@ OInputCompStream::~OInputCompStream()
}
}
-//-----------------------------------------------
uno::Any SAL_CALL OInputCompStream::queryInterface( const uno::Type& rType )
throw( uno::RuntimeException )
{
@@ -111,7 +106,6 @@ uno::Any SAL_CALL OInputCompStream::queryInterface( const uno::Type& rType )
return OWeakObject::queryInterface( rType );
}
-//-----------------------------------------------
sal_Int32 SAL_CALL OInputCompStream::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
throw ( io::NotConnectedException,
io::BufferSizeExceededException,
@@ -134,7 +128,6 @@ sal_Int32 SAL_CALL OInputCompStream::readBytes( uno::Sequence< sal_Int8 >& aData
return m_xStream->readBytes( aData, nBytesToRead );
}
-//-----------------------------------------------
sal_Int32 SAL_CALL OInputCompStream::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
throw ( io::NotConnectedException,
io::BufferSizeExceededException,
@@ -158,7 +151,6 @@ sal_Int32 SAL_CALL OInputCompStream::readSomeBytes( uno::Sequence< sal_Int8 >& a
}
-//-----------------------------------------------
void SAL_CALL OInputCompStream::skipBytes( sal_Int32 nBytesToSkip )
throw ( io::NotConnectedException,
io::BufferSizeExceededException,
@@ -182,7 +174,6 @@ void SAL_CALL OInputCompStream::skipBytes( sal_Int32 nBytesToSkip )
}
-//-----------------------------------------------
sal_Int32 SAL_CALL OInputCompStream::available( )
throw ( io::NotConnectedException,
io::IOException,
@@ -205,7 +196,6 @@ sal_Int32 SAL_CALL OInputCompStream::available( )
}
-//-----------------------------------------------
void SAL_CALL OInputCompStream::closeInput( )
throw ( io::NotConnectedException,
io::IOException,
@@ -214,7 +204,6 @@ void SAL_CALL OInputCompStream::closeInput( )
dispose();
}
-//-----------------------------------------------
uno::Reference< io::XInputStream > SAL_CALL OInputCompStream::getInputStream()
throw ( uno::RuntimeException )
{
@@ -231,7 +220,6 @@ uno::Reference< io::XInputStream > SAL_CALL OInputCompStream::getInputStream()
return uno::Reference< io::XInputStream >( static_cast< io::XInputStream* >( this ), uno::UNO_QUERY );
}
-//-----------------------------------------------
uno::Reference< io::XOutputStream > SAL_CALL OInputCompStream::getOutputStream()
throw ( uno::RuntimeException )
{
@@ -245,7 +233,6 @@ uno::Reference< io::XOutputStream > SAL_CALL OInputCompStream::getOutputStream()
return uno::Reference< io::XOutputStream >();
}
-//-----------------------------------------------
void OInputCompStream::InternalDispose()
{
// can be called only by OWriteStream_Impl
@@ -274,7 +261,6 @@ void OInputCompStream::InternalDispose()
m_bDisposed = sal_True;
}
-//-----------------------------------------------
void SAL_CALL OInputCompStream::dispose( )
throw ( uno::RuntimeException )
{
@@ -302,7 +288,6 @@ void SAL_CALL OInputCompStream::dispose( )
m_bDisposed = sal_True;
}
-//-----------------------------------------------
void SAL_CALL OInputCompStream::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
throw ( uno::RuntimeException )
{
@@ -319,7 +304,6 @@ void SAL_CALL OInputCompStream::addEventListener( const uno::Reference< lang::XE
m_pInterfaceContainer->addInterface( xListener );
}
-//-----------------------------------------------
void SAL_CALL OInputCompStream::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
throw ( uno::RuntimeException )
{
@@ -334,7 +318,6 @@ void SAL_CALL OInputCompStream::removeEventListener( const uno::Reference< lang:
m_pInterfaceContainer->removeInterface( xListener );
}
-//-----------------------------------------------
sal_Bool SAL_CALL OInputCompStream::hasByID( const OUString& sID )
throw ( io::IOException,
uno::RuntimeException )
@@ -361,7 +344,6 @@ sal_Bool SAL_CALL OInputCompStream::hasByID( const OUString& sID )
return sal_False;
}
-//-----------------------------------------------
OUString SAL_CALL OInputCompStream::getTargetByID( const OUString& sID )
throw ( container::NoSuchElementException,
io::IOException,
@@ -386,7 +368,6 @@ OUString SAL_CALL OInputCompStream::getTargetByID( const OUString& sID )
return OUString();
}
-//-----------------------------------------------
OUString SAL_CALL OInputCompStream::getTypeByID( const OUString& sID )
throw ( container::NoSuchElementException,
io::IOException,
@@ -411,7 +392,6 @@ OUString SAL_CALL OInputCompStream::getTypeByID( const OUString& sID )
return OUString();
}
-//-----------------------------------------------
uno::Sequence< beans::StringPair > SAL_CALL OInputCompStream::getRelationshipByID( const OUString& sID )
throw ( container::NoSuchElementException,
io::IOException,
@@ -442,7 +422,6 @@ uno::Sequence< beans::StringPair > SAL_CALL OInputCompStream::getRelationshipByI
throw container::NoSuchElementException();
}
-//-----------------------------------------------
uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OInputCompStream::getRelationshipsByType( const OUString& sType )
throw ( io::IOException,
uno::RuntimeException )
@@ -478,7 +457,6 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OInputCompStream::g
return aResult;
}
-//-----------------------------------------------
uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OInputCompStream::getAllRelationships()
throw (io::IOException, uno::RuntimeException)
{
@@ -507,7 +485,6 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OInputCompStream::g
throw io::IOException(); // the relations info could not be read
}
-//-----------------------------------------------
void SAL_CALL OInputCompStream::insertRelationshipByID( const OUString& /*sID*/, const uno::Sequence< beans::StringPair >& /*aEntry*/, ::sal_Bool /*bReplace*/ )
throw ( container::ElementExistException,
io::IOException,
@@ -527,7 +504,6 @@ void SAL_CALL OInputCompStream::insertRelationshipByID( const OUString& /*sID*/
throw io::IOException(); // TODO: Access denied
}
-//-----------------------------------------------
void SAL_CALL OInputCompStream::removeRelationshipByID( const OUString& /*sID*/ )
throw ( container::NoSuchElementException,
io::IOException,
@@ -547,7 +523,6 @@ void SAL_CALL OInputCompStream::removeRelationshipByID( const OUString& /*sID*/
throw io::IOException(); // TODO: Access denied
}
-//-----------------------------------------------
void SAL_CALL OInputCompStream::insertRelationships( const uno::Sequence< uno::Sequence< beans::StringPair > >& /*aEntries*/, ::sal_Bool /*bReplace*/ )
throw ( container::ElementExistException,
io::IOException,
@@ -567,7 +542,6 @@ void SAL_CALL OInputCompStream::insertRelationships( const uno::Sequence< uno::
throw io::IOException(); // TODO: Access denied
}
-//-----------------------------------------------
void SAL_CALL OInputCompStream::clearRelationships()
throw ( io::IOException,
uno::RuntimeException )
@@ -586,7 +560,6 @@ void SAL_CALL OInputCompStream::clearRelationships()
throw io::IOException(); // TODO: Access denied
}
-//-----------------------------------------------
uno::Reference< beans::XPropertySetInfo > SAL_CALL OInputCompStream::getPropertySetInfo()
throw ( uno::RuntimeException )
{
@@ -602,7 +575,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OInputCompStream::getProperty
return uno::Reference< beans::XPropertySetInfo >();
}
-//-----------------------------------------------
void SAL_CALL OInputCompStream::setPropertyValue( const OUString& aPropertyName, const uno::Any& /*aValue*/ )
throw ( beans::UnknownPropertyException,
beans::PropertyVetoException,
@@ -630,8 +602,6 @@ void SAL_CALL OInputCompStream::setPropertyValue( const OUString& aPropertyName,
throw beans::UnknownPropertyException(); // TODO
}
-
-//-----------------------------------------------
uno::Any SAL_CALL OInputCompStream::getPropertyValue( const OUString& aProp )
throw ( beans::UnknownPropertyException,
lang::WrappedTargetException,
@@ -666,8 +636,6 @@ uno::Any SAL_CALL OInputCompStream::getPropertyValue( const OUString& aProp )
throw beans::UnknownPropertyException(); // TODO
}
-
-//-----------------------------------------------
void SAL_CALL OInputCompStream::addPropertyChangeListener(
const OUString& /*aPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
@@ -686,8 +654,6 @@ void SAL_CALL OInputCompStream::addPropertyChangeListener(
//TODO:
}
-
-//-----------------------------------------------
void SAL_CALL OInputCompStream::removePropertyChangeListener(
const OUString& /*aPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ )
@@ -706,8 +672,6 @@ void SAL_CALL OInputCompStream::removePropertyChangeListener(
//TODO:
}
-
-//-----------------------------------------------
void SAL_CALL OInputCompStream::addVetoableChangeListener(
const OUString& /*PropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
@@ -726,8 +690,6 @@ void SAL_CALL OInputCompStream::addVetoableChangeListener(
//TODO:
}
-
-//-----------------------------------------------
void SAL_CALL OInputCompStream::removeVetoableChangeListener(
const OUString& /*PropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
@@ -746,5 +708,4 @@ void SAL_CALL OInputCompStream::removeVetoableChangeListener(
//TODO:
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/package/source/xstor/ohierarchyholder.cxx b/package/source/xstor/ohierarchyholder.cxx
index d4ef19b..8edec16 100644
--- a/package/source/xstor/ohierarchyholder.cxx
+++ b/package/source/xstor/ohierarchyholder.cxx
@@ -28,11 +28,8 @@
using namespace ::com::sun::star;
-//===============================================
// OHierarchyHolder_Impl
-//===============================================
-//-----------------------------------------------
uno::Reference< embed::XExtendedStorageStream > OHierarchyHolder_Impl::GetStreamHierarchically( sal_Int32 nStorageMode, OStringList_Impl& aListPath, sal_Int32 nStreamMode, const ::comphelper::SequenceAsHashMap& aEncryptionData )
{
uno::Reference< embed::XStorage > xOwnStor( m_xWeakOwnStorage.get(), uno::UNO_QUERY_THROW );
@@ -48,7 +45,6 @@ uno::Reference< embed::XExtendedStorageStream > OHierarchyHolder_Impl::GetStream
return xResult;
}
-//-----------------------------------------------
void OHierarchyHolder_Impl::RemoveStreamHierarchically( OStringList_Impl& aListPath )
{
uno::Reference< embed::XStorage > xOwnStor( m_xWeakOwnStorage.get(), uno::UNO_QUERY_THROW );
@@ -56,7 +52,6 @@ void OHierarchyHolder_Impl::RemoveStreamHierarchically( OStringList_Impl& aListP
m_xChild->RemoveStreamHierarchically( aListPath );
}
-//-----------------------------------------------
// static
OStringList_Impl OHierarchyHolder_Impl::GetListPathFromString( const OUString& aPath )
{
@@ -75,11 +70,8 @@ OStringList_Impl OHierarchyHolder_Impl::GetListPathFromString( const OUString& a
return aResult;
}
-//===============================================
// OHierarchyElement_Impl
-//===============================================
-//-----------------------------------------------
uno::Reference< embed::XExtendedStorageStream > OHierarchyElement_Impl::GetStreamHierarchically( sal_Int32 nStorageMode, OStringList_Impl& aListPath, sal_Int32 nStreamMode, const ::comphelper::SequenceAsHashMap& aEncryptionData )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -166,7 +158,6 @@ uno::Reference< embed::XExtendedStorageStream > OHierarchyElement_Impl::GetStrea
return xResult;
}
-//-----------------------------------------------
void OHierarchyElement_Impl::RemoveStreamHierarchically( OStringList_Impl& aListPath )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -217,7 +208,6 @@ void OHierarchyElement_Impl::RemoveStreamHierarchically( OStringList_Impl& aList
TestForClosing();
}
-//-----------------------------------------------
void OHierarchyElement_Impl::Commit()
{
::rtl::Reference< OHierarchyElement_Impl > aLocker( this );
@@ -239,7 +229,6 @@ void OHierarchyElement_Impl::Commit()
}
}
-//-----------------------------------------------
void OHierarchyElement_Impl::TestForClosing()
{
::rtl::Reference< OHierarchyElement_Impl > aLocker( this );
@@ -269,7 +258,6 @@ void OHierarchyElement_Impl::TestForClosing()
}
}
-//-----------------------------------------------
void SAL_CALL OHierarchyElement_Impl::disposing( const lang::EventObject& Source )
throw ( uno::RuntimeException )
{
@@ -298,7 +286,6 @@ void SAL_CALL OHierarchyElement_Impl::disposing( const lang::EventObject& Source
}
}
-//-----------------------------------------------
void OHierarchyElement_Impl::RemoveElement( const ::rtl::Reference< OHierarchyElement_Impl >& aRef )
{
{
@@ -318,13 +305,11 @@ void OHierarchyElement_Impl::RemoveElement( const ::rtl::Reference< OHierarchyEl
}
// XTransactionListener
-//-----------------------------------------------
void SAL_CALL OHierarchyElement_Impl::preCommit( const ::com::sun::star::lang::EventObject& /*aEvent*/ )
throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
{
}
-//-----------------------------------------------
void SAL_CALL OHierarchyElement_Impl::commited( const ::com::sun::star::lang::EventObject& /*aEvent*/ )
throw (::com::sun::star::uno::RuntimeException)
{
@@ -341,13 +326,11 @@ void SAL_CALL OHierarchyElement_Impl::commited( const ::com::sun::star::lang::Ev
}
}
-//-----------------------------------------------
void SAL_CALL OHierarchyElement_Impl::preRevert( const ::com::sun::star::lang::EventObject& /*aEvent*/ )
throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
{
}
-//-----------------------------------------------
void SAL_CALL OHierarchyElement_Impl::reverted( const ::com::sun::star::lang::EventObject& /*aEvent*/ )
throw (::com::sun::star::uno::RuntimeException)
{
diff --git a/package/source/xstor/ohierarchyholder.hxx b/package/source/xstor/ohierarchyholder.hxx
index 993a4d2..e26c468 100644
--- a/package/source/xstor/ohierarchyholder.hxx
+++ b/package/source/xstor/ohierarchyholder.hxx
@@ -95,7 +95,6 @@ public:
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source )
throw (::com::sun::star::uno::RuntimeException);
-
// XTransactionListener
virtual void SAL_CALL preCommit( const ::com::sun::star::lang::EventObject& aEvent )
throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
diff --git a/package/source/xstor/oseekinstream.cxx b/package/source/xstor/oseekinstream.cxx
index 5f6be02..15d06c6 100644
--- a/package/source/xstor/oseekinstream.cxx
+++ b/package/source/xstor/oseekinstream.cxx
@@ -106,7 +106,6 @@ void SAL_CALL OInputSeekStream::release()
OInputCompStream::release();
}
-
void SAL_CALL OInputSeekStream::seek( sal_Int64 location )
throw ( lang::IllegalArgumentException,
io::IOException,
diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx
index e8fa7e8..285d1b6 100644
--- a/package/source/xstor/owriteablestream.cxx
+++ b/package/source/xstor/owriteablestream.cxx
@@ -52,12 +52,11 @@
// since the copying uses 32000 blocks usually, it makes sense to have a smaller size
#define MAX_STORCACHE_SIZE 30000
-
using namespace ::com::sun::star;
namespace package
{
-//-----------------------------------------------
+
bool PackageEncryptionDatasEqual( const ::comphelper::SequenceAsHashMap& aHash1, const ::comphelper::SequenceAsHashMap& aHash2 )
{
bool bResult = ( aHash1.size() && aHash1.size() == aHash2.size() );
@@ -79,7 +78,6 @@ bool PackageEncryptionDatasEqual( const ::comphelper::SequenceAsHashMap& aHash1,
return bResult;
}
-//-----------------------------------------------
void StaticAddLog( const OUString& aMessage )
{
try
@@ -95,10 +93,9 @@ void StaticAddLog( const OUString& aMessage )
}
} // namespace package
-// ================================================================
namespace
{
-//-----------------------------------------------
+
void SetEncryptionKeyProperty_Impl( const uno::Reference< beans::XPropertySet >& xPropertySet,
const uno::Sequence< beans::NamedValue >& aKey )
{
@@ -118,7 +115,6 @@ void SetEncryptionKeyProperty_Impl( const uno::Reference< beans::XPropertySet >&
}
}
-//-----------------------------------------------
uno::Any GetEncryptionKeyProperty_Impl( const uno::Reference< beans::XPropertySet >& xPropertySet )
{
SAL_WARN_IF( !xPropertySet.is(), "package.xstor", "No property set is provided!" );
@@ -138,7 +134,6 @@ uno::Any GetEncryptionKeyProperty_Impl( const uno::Reference< beans::XPropertySe
}
}
-//-----------------------------------------------
bool SequencesEqual( const uno::Sequence< sal_Int8 >& aSequence1, const uno::Sequence< sal_Int8 >& aSequence2 )
{
if ( aSequence1.getLength() != aSequence2.getLength() )
@@ -151,7 +146,6 @@ bool SequencesEqual( const uno::Sequence< sal_Int8 >& aSequence1, const uno::Seq
return true;
}
-//-----------------------------------------------
bool SequencesEqual( const uno::Sequence< beans::NamedValue >& aSequence1, const uno::Sequence< beans::NamedValue >& aSequence2 )
{
if ( aSequence1.getLength() != aSequence2.getLength() )
@@ -200,7 +194,6 @@ bool SequencesEqual( const uno::Sequence< beans::NamedValue >& aSequence1, const
return true;
}
-//-----------------------------------------------
sal_Bool KillFile( const OUString& aURL, const uno::Reference< uno::XComponentContext >& xContext )
{
if ( !xContext.is() )
@@ -226,7 +219,6 @@ sal_Bool KillFile( const OUString& aURL, const uno::Reference< uno::XComponentCo
const sal_Int32 n_ConstBufferSize = 32000;
-//-----------------------------------------------
OUString GetNewTempFileURL( const uno::Reference< uno::XComponentContext > xContext )
{
OUString aTempURL;
@@ -252,7 +244,6 @@ OUString GetNewTempFileURL( const uno::Reference< uno::XComponentContext > xCont
return aTempURL;
}
-//-----------------------------------------------
uno::Reference< io::XStream > CreateMemoryStream( const uno::Reference< uno::XComponentContext >& xContext )
{
return uno::Reference< io::XStream >(
@@ -261,9 +252,7 @@ uno::Reference< io::XStream > CreateMemoryStream( const uno::Reference< uno::XCo
}
} // anonymous namespace
-// ================================================================
-//-----------------------------------------------
OWriteStream_Impl::OWriteStream_Impl( OStorage_Impl* pParent,
const uno::Reference< packages::XDataSinkEncrSupport >& xPackageStream,
const uno::Reference< lang::XSingleServiceFactory >& xPackage,
@@ -297,7 +286,6 @@ OWriteStream_Impl::OWriteStream_Impl( OStorage_Impl* pParent,
OSL_ENSURE( m_nStorageType == embed::StorageFormats::OFOPXML || !m_xOrigRelInfoStream.is(), "The Relations info makes sence only for OFOPXML format!\n" );
}
-//-----------------------------------------------
OWriteStream_Impl::~OWriteStream_Impl()
{
DisposeWrappers();
@@ -311,7 +299,6 @@ OWriteStream_Impl::~OWriteStream_Impl()
CleanCacheStream();
}
-//-----------------------------------------------
void OWriteStream_Impl::CleanCacheStream()
{
if ( m_xCacheStream.is() )
@@ -339,7 +326,6 @@ void OWriteStream_Impl::CleanCacheStream()
}
}
-//-----------------------------------------------
void OWriteStream_Impl::AddLog( const OUString& aMessage )
{
if ( !m_xLogRing.is() )
@@ -359,8 +345,6 @@ void OWriteStream_Impl::AddLog( const OUString& aMessage )
m_xLogRing->logString( aMessage );
}
-
-//-----------------------------------------------
void OWriteStream_Impl::InsertIntoPackageFolder( const OUString& aName,
const uno::Reference< container::XNameContainer >& xParentPackageFolder )
{
@@ -380,7 +364,6 @@ void OWriteStream_Impl::InsertIntoPackageFolder( const OUString& aName,
m_bHasInsertedStreamOptimization = sal_False;
}
}
-//-----------------------------------------------
sal_Bool OWriteStream_Impl::IsEncrypted()
{
if ( m_nStorageType != embed::StorageFormats::PACKAGE )
@@ -440,7 +423,6 @@ sal_Bool OWriteStream_Impl::IsEncrypted()
return bToBeEncr;
}
-//-----------------------------------------------
void OWriteStream_Impl::SetDecrypted()
{
SAL_WARN_IF( m_nStorageType != embed::StorageFormats::PACKAGE, "package.xstor", "The encryption is supported only for package storages!" );
@@ -465,7 +447,6 @@ void OWriteStream_Impl::SetDecrypted()
}
}
-//-----------------------------------------------
void OWriteStream_Impl::SetEncrypted( const ::comphelper::SequenceAsHashMap& aEncryptionData )
{
SAL_WARN_IF( m_nStorageType != embed::StorageFormats::PACKAGE, "package.xstor", "The encryption is supported only for package storages!" );
@@ -494,7 +475,6 @@ void OWriteStream_Impl::SetEncrypted( const ::comphelper::SequenceAsHashMap& aEn
m_aEncryptionData = aEncryptionData;
}
-//-----------------------------------------------
void OWriteStream_Impl::DisposeWrappers()
{
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
@@ -529,7 +509,6 @@ void OWriteStream_Impl::DisposeWrappers()
}
}
-//-----------------------------------------------
OUString OWriteStream_Impl::GetFilledTempFileIfNo( const uno::Reference< io::XInputStream >& xStream )
{
if ( !m_aTempURL.getLength() )
@@ -579,7 +558,6 @@ OUString OWriteStream_Impl::GetFilledTempFileIfNo( const uno::Reference< io::XIn
return m_aTempURL;
}
-//-----------------------------------------------
OUString OWriteStream_Impl::FillTempGetFileName()
{
// should try to create cache first, if the amount of contents is too big, the temp file should be taken
@@ -659,7 +637,6 @@ OUString OWriteStream_Impl::FillTempGetFileName()
return m_aTempURL;
}
-//-----------------------------------------------
uno::Reference< io::XStream > OWriteStream_Impl::GetTempFileAsStream()
{
uno::Reference< io::XStream > xTempStream;
@@ -698,7 +675,6 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetTempFileAsStream()
return xTempStream;
}
-//-----------------------------------------------
uno::Reference< io::XInputStream > OWriteStream_Impl::GetTempFileAsInputStream()
{
uno::Reference< io::XInputStream > xInputStream;
@@ -737,9 +713,6 @@ uno::Reference< io::XInputStream > OWriteStream_Impl::GetTempFileAsInputStream()
return xInputStream;
}
-// =================================================================================================
-
-//-----------------------------------------------
void OWriteStream_Impl::InsertStreamDirectly( const uno::Reference< io::XInputStream >& xInStream,
const uno::Sequence< beans::PropertyValue >& aProps )
{
@@ -824,7 +797,6 @@ void OWriteStream_Impl::InsertStreamDirectly( const uno::Reference< io::XInputSt
m_bHasInsertedStreamOptimization = sal_True;
}
-//-----------------------------------------------
void OWriteStream_Impl::Commit()
{
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ) ;
@@ -931,7 +903,6 @@ void OWriteStream_Impl::Commit()
m_bFlushed = sal_True; // will allow to use transaction on stream level if will need it
}
-//-----------------------------------------------
void OWriteStream_Impl::Revert()
{
// can be called only from parent storage
@@ -986,7 +957,6 @@ void OWriteStream_Impl::Revert()
}
}
-//-----------------------------------------------
uno::Sequence< beans::PropertyValue > OWriteStream_Impl::GetStreamProperties()
{
if ( !m_aProps.getLength() )
@@ -995,7 +965,6 @@ uno::Sequence< beans::PropertyValue > OWriteStream_Impl::GetStreamProperties()
return m_aProps;
}
-//-----------------------------------------------
uno::Sequence< beans::PropertyValue > OWriteStream_Impl::InsertOwnProps(
const uno::Sequence< beans::PropertyValue >& aProps,
sal_Bool bUseCommonEncryption )
@@ -1044,7 +1013,6 @@ uno::Sequence< beans::PropertyValue > OWriteStream_Impl::InsertOwnProps(
return aResult;
}
-//-----------------------------------------------
sal_Bool OWriteStream_Impl::IsTransacted()
{
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ) ;
@@ -1102,7 +1070,6 @@ void OWriteStream_Impl::ReadRelInfoIfNecessary()
}
}
-//-----------------------------------------------
uno::Sequence< beans::PropertyValue > OWriteStream_Impl::ReadPackageStreamProperties()
{
sal_Int32 nPropNum = 0;
@@ -1160,7 +1127,6 @@ uno::Sequence< beans::PropertyValue > OWriteStream_Impl::ReadPackageStreamProper
return aResult;
}
-//-----------------------------------------------
void OWriteStream_Impl::CopyInternallyTo_Impl( const uno::Reference< io::XStream >& xDestStream,
const ::comphelper::SequenceAsHashMap& aEncryptionData )
{
@@ -1189,7 +1155,6 @@ void OWriteStream_Impl::CopyInternallyTo_Impl( const uno::Reference< io::XStream
xEncr->setEncryptionData( aEncryptionData.getAsConstNamedValueList() );
}
-//-----------------------------------------------
uno::Sequence< uno::Sequence< beans::StringPair > > OWriteStream_Impl::GetAllRelationshipsIfAny()
{
if ( m_nStorageType != embed::StorageFormats::OFOPXML )
@@ -1206,7 +1171,6 @@ uno::Sequence< uno::Sequence< beans::StringPair > > OWriteStream_Impl::GetAllRel
uno::Reference< uno::XInterface >() );
}
-//-----------------------------------------------
void OWriteStream_Impl::CopyInternallyTo_Impl( const uno::Reference< io::XStream >& xDestStream )
{
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ) ;
@@ -1225,7 +1189,6 @@ void OWriteStream_Impl::CopyInternallyTo_Impl( const uno::Reference< io::XStream
}
}
-//-----------------------------------------------
uno::Reference< io::XStream > OWriteStream_Impl::GetStream( sal_Int32 nStreamMode, const ::comphelper::SequenceAsHashMap& aEncryptionData, sal_Bool bHierarchyAccess )
{
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ) ;
@@ -1286,7 +1249,6 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetStream( sal_Int32 nStreamMod
return xResultStream;
}
-//-----------------------------------------------
uno::Reference< io::XStream > OWriteStream_Impl::GetStream( sal_Int32 nStreamMode, sal_Bool bHierarchyAccess )
{
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ) ;
@@ -1321,7 +1283,6 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetStream( sal_Int32 nStreamMod
return xResultStream;
}
-//-----------------------------------------------
uno::Reference< io::XStream > OWriteStream_Impl::GetStream_Impl( sal_Int32 nStreamMode, sal_Bool bHierarchyAccess )
{
// private method, no mutex is used
@@ -1435,7 +1396,6 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetStream_Impl( sal_Int32 nStre
throw lang::IllegalArgumentException(); // TODO
}
-//-----------------------------------------------
uno::Reference< io::XInputStream > OWriteStream_Impl::GetPlainRawInStream()
{
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ) ;
@@ -1449,7 +1409,6 @@ uno::Reference< io::XInputStream > OWriteStream_Impl::GetPlainRawInStream()
return m_xPackageStream->getPlainRawStream();
}
-//-----------------------------------------------
uno::Reference< io::XInputStream > OWriteStream_Impl::GetRawInStream()
{
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ) ;
@@ -1466,7 +1425,6 @@ uno::Reference< io::XInputStream > OWriteStream_Impl::GetRawInStream()
return m_xPackageStream->getRawStream();
}
-//-----------------------------------------------
::comphelper::SequenceAsHashMap OWriteStream_Impl::GetCommonRootEncryptionData()
throw ( packages::NoEncryptionException )
{
@@ -1478,14 +1436,12 @@ uno::Reference< io::XInputStream > OWriteStream_Impl::GetRawInStream()
return m_pParent->GetCommonRootEncryptionData();
}
-//-----------------------------------------------
void OWriteStream_Impl::InputStreamDisposed( OInputCompStream* pStream )
{
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
m_aInputStreamsList.remove( pStream );
}
-//-----------------------------------------------
void OWriteStream_Impl::CreateReadonlyCopyBasedOnData( const uno::Reference< io::XInputStream >& xDataToCopy, const uno::Sequence< beans::PropertyValue >& aProps, sal_Bool, uno::Reference< io::XStream >& xTargetStream )
{
uno::Reference < io::XStream > xTempFile;
@@ -1522,7 +1478,6 @@ void OWriteStream_Impl::CreateReadonlyCopyBasedOnData( const uno::Reference< io:
uno::UNO_QUERY_THROW );
}
-//-----------------------------------------------
void OWriteStream_Impl::GetCopyOfLastCommit( uno::Reference< io::XStream >& xTargetStream )
{
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
@@ -1561,7 +1516,6 @@ void OWriteStream_Impl::GetCopyOfLastCommit( uno::Reference< io::XStream >& xTar
}
}
-//-----------------------------------------------
void OWriteStream_Impl::GetCopyOfLastCommit( uno::Reference< io::XStream >& xTargetStream, const ::comphelper::SequenceAsHashMap& aEncryptionData )
{
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
@@ -1630,7 +1584,6 @@ void OWriteStream_Impl::GetCopyOfLastCommit( uno::Reference< io::XStream >& xTar
CreateReadonlyCopyBasedOnData( xDataToCopy, m_aProps, m_bUseCommonEncryption, xTargetStream );
}
-//-----------------------------------------------
void OWriteStream_Impl::CommitStreamRelInfo( const uno::Reference< embed::XStorage >& xRelStorage, const OUString& aOrigStreamName, const OUString& aNewStreamName )
{
// at this point of time the old stream must be already cleaned
@@ -1731,11 +1684,8 @@ void OWriteStream_Impl::CommitStreamRelInfo( const uno::Reference< embed::XStora
}
}
-//===============================================
// OWriteStream implementation
-//===============================================
-//-----------------------------------------------
OWriteStream::OWriteStream( OWriteStream_Impl* pImpl, sal_Bool bTransacted )
: m_pImpl( pImpl )
, m_bInStreamDisconnected( sal_False )
@@ -1752,7 +1702,6 @@ OWriteStream::OWriteStream( OWriteStream_Impl* pImpl, sal_Bool bTransacted )
m_pData = new WSInternalData_Impl( pImpl->m_rMutexRef, m_pImpl->m_nStorageType );
}
-//-----------------------------------------------
OWriteStream::OWriteStream( OWriteStream_Impl* pImpl, uno::Reference< io::XStream > xStream, sal_Bool bTransacted )
: m_pImpl( pImpl )
, m_bInStreamDisconnected( sal_False )
@@ -1777,7 +1726,6 @@ OWriteStream::OWriteStream( OWriteStream_Impl* pImpl, uno::Reference< io::XStrea
}
}
-//-----------------------------------------------
OWriteStream::~OWriteStream()
{
{
@@ -1803,7 +1751,6 @@ OWriteStream::~OWriteStream()
delete m_pData;
}
-//-----------------------------------------------
void OWriteStream::DeInit()
{
if ( !m_pImpl )
@@ -1818,7 +1765,6 @@ void OWriteStream::DeInit()
m_bInitOnDemand = sal_True;
}
-//-----------------------------------------------
void OWriteStream::CheckInitOnDemand()
{
if ( !m_pImpl )
@@ -1844,7 +1790,6 @@ void OWriteStream::CheckInitOnDemand()
}
}
-//-----------------------------------------------
void OWriteStream::CopyToStreamInternally_Impl( const uno::Reference< io::XStream >& xDest )
{
::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
@@ -1914,7 +1859,6 @@ void OWriteStream::CopyToStreamInternally_Impl( const uno::Reference< io::XStrea
}
}
-//-----------------------------------------------
void OWriteStream::ModifyParentUnlockMutex_Impl( ::osl::ResettableMutexGuard& aGuard )
{
if ( m_pImpl->m_pParent )
@@ -1930,7 +1874,6 @@ void OWriteStream::ModifyParentUnlockMutex_Impl( ::osl::ResettableMutexGuard& aG
}
}
-//-----------------------------------------------
uno::Any SAL_CALL OWriteStream::queryInterface( const uno::Type& rType )
throw( uno::RuntimeException )
{
@@ -1983,19 +1926,16 @@ uno::Any SAL_CALL OWriteStream::queryInterface( const uno::Type& rType )
return OWeakObject::queryInterface( rType );
}
-//-----------------------------------------------
void SAL_CALL OWriteStream::acquire() throw()
{
OWeakObject::acquire();
}
-//-----------------------------------------------
void SAL_CALL OWriteStream::release() throw()
{
OWeakObject::release();
}
-//-----------------------------------------------
uno::Sequence< uno::Type > SAL_CALL OWriteStream::getTypes()
throw( uno::RuntimeException )
{
@@ -2109,7 +2049,6 @@ uno::Sequence< uno::Type > SAL_CALL OWriteStream::getTypes()
namespace { struct lcl_ImplId : public rtl::Static< ::cppu::OImplementationId, lcl_ImplId > {}; }
-//-----------------------------------------------
uno::Sequence< sal_Int8 > SAL_CALL OWriteStream::getImplementationId()
throw( uno::RuntimeException )
{
@@ -2117,7 +2056,6 @@ uno::Sequence< sal_Int8 > SAL_CALL OWriteStream::getImplementationId()
return rId.getImplementationId();
}
-//-----------------------------------------------
sal_Int32 SAL_CALL OWriteStream::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
throw ( io::NotConnectedException,
io::BufferSizeExceededException,
@@ -2140,7 +2078,6 @@ sal_Int32 SAL_CALL OWriteStream::readBytes( uno::Sequence< sal_Int8 >& aData, sa
return m_xInStream->readBytes( aData, nBytesToRead );
}
-//-----------------------------------------------
sal_Int32 SAL_CALL OWriteStream::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
throw ( io::NotConnectedException,
io::BufferSizeExceededException,
@@ -2163,7 +2100,6 @@ sal_Int32 SAL_CALL OWriteStream::readSomeBytes( uno::Sequence< sal_Int8 >& aData
return m_xInStream->readSomeBytes( aData, nMaxBytesToRead );
}
-//-----------------------------------------------
void SAL_CALL OWriteStream::skipBytes( sal_Int32 nBytesToSkip )
throw ( io::NotConnectedException,
io::BufferSizeExceededException,
@@ -2186,7 +2122,6 @@ void SAL_CALL OWriteStream::skipBytes( sal_Int32 nBytesToSkip )
m_xInStream->skipBytes( nBytesToSkip );
}
-//-----------------------------------------------
sal_Int32 SAL_CALL OWriteStream::available( )
throw ( io::NotConnectedException,
io::IOException,
@@ -2209,7 +2144,6 @@ sal_Int32 SAL_CALL OWriteStream::available( )
}
-//-----------------------------------------------
void SAL_CALL OWriteStream::closeInput( )
throw ( io::NotConnectedException,
io::IOException,
@@ -2236,7 +2170,6 @@ void SAL_CALL OWriteStream::closeInput( )
dispose();
}
-//-----------------------------------------------
uno::Reference< io::XInputStream > SAL_CALL OWriteStream::getInputStream()
throw ( uno::RuntimeException )
{
@@ -2254,7 +2187,6 @@ uno::Reference< io::XInputStream > SAL_CALL OWriteStream::getInputStream()
return uno::Reference< io::XInputStream >( static_cast< io::XInputStream* >( this ), uno::UNO_QUERY );
}
-//-----------------------------------------------
uno::Reference< io::XOutputStream > SAL_CALL OWriteStream::getOutputStream()
throw ( uno::RuntimeException )
{
@@ -2274,7 +2206,6 @@ uno::Reference< io::XOutputStream > SAL_CALL OWriteStream::getOutputStream()
return uno::Reference< io::XOutputStream >( static_cast< io::XOutputStream* >( this ), uno::UNO_QUERY );
}
-//-----------------------------------------------
void SAL_CALL OWriteStream::writeBytes( const uno::Sequence< sal_Int8 >& aData )
throw ( io::NotConnectedException,
io::BufferSizeExceededException,
@@ -2333,7 +2264,6 @@ void SAL_CALL OWriteStream::writeBytes( const uno::Sequence< sal_Int8 >& aData )
}
}
-
if ( !m_xOutStream.is() )
throw io::NotConnectedException();
@@ -2343,7 +2273,6 @@ void SAL_CALL OWriteStream::writeBytes( const uno::Sequence< sal_Int8 >& aData )
ModifyParentUnlockMutex_Impl( aGuard );
}
-//-----------------------------------------------
void SAL_CALL OWriteStream::flush()
throw ( io::NotConnectedException,
io::BufferSizeExceededException,
@@ -2373,7 +2302,6 @@ void SAL_CALL OWriteStream::flush()
}
}
-//-----------------------------------------------
void OWriteStream::CloseOutput_Impl()
{
// all the checks must be done in calling method
@@ -2396,7 +2324,6 @@ void OWriteStream::CloseOutput_Impl()
}
}
-//-----------------------------------------------
void SAL_CALL OWriteStream::closeOutput()
throw ( io::NotConnectedException,
io::BufferSizeExceededException,
@@ -2422,7 +2349,6 @@ void SAL_CALL OWriteStream::closeOutput()
dispose();
}
-//-----------------------------------------------
void SAL_CALL OWriteStream::seek( sal_Int64 location )
throw ( lang::IllegalArgumentException,
io::IOException,
@@ -2444,7 +2370,6 @@ void SAL_CALL OWriteStream::seek( sal_Int64 location )
m_xSeekable->seek( location );
}
-//-----------------------------------------------
sal_Int64 SAL_CALL OWriteStream::getPosition()
throw ( io::IOException,
uno::RuntimeException)
@@ -2465,7 +2390,6 @@ sal_Int64 SAL_CALL OWriteStream::getPosition()
return m_xSeekable->getPosition();
}
-//-----------------------------------------------
sal_Int64 SAL_CALL OWriteStream::getLength()
throw ( io::IOException,
uno::RuntimeException )
@@ -2486,7 +2410,6 @@ sal_Int64 SAL_CALL OWriteStream::getLength()
return m_xSeekable->getLength();
}
-//-----------------------------------------------
void SAL_CALL OWriteStream::truncate()
throw ( io::IOException,
uno::RuntimeException )
@@ -2519,7 +2442,6 @@ void SAL_CALL OWriteStream::truncate()
ModifyParentUnlockMutex_Impl( aGuard );
}
-//-----------------------------------------------
void SAL_CALL OWriteStream::dispose()
throw ( uno::RuntimeException )
{
@@ -2584,7 +2506,6 @@ void SAL_CALL OWriteStream::dispose()
m_pData->m_aListenersContainer.disposeAndClear( aSource );
}
-//-----------------------------------------------
void SAL_CALL OWriteStream::addEventListener(
const uno::Reference< lang::XEventListener >& xListener )
throw ( uno::RuntimeException )
@@ -2601,7 +2522,6 @@ void SAL_CALL OWriteStream::addEventListener(
xListener );
}
-//-----------------------------------------------
void SAL_CALL OWriteStream::removeEventListener(
const uno::Reference< lang::XEventListener >& xListener )
throw ( uno::RuntimeException )
@@ -2618,7 +2538,6 @@ void SAL_CALL OWriteStream::removeEventListener(
xListener );
}
-//-----------------------------------------------
void SAL_CALL OWriteStream::setEncryptionPassword( const OUString& aPass )
throw ( uno::RuntimeException,
io::IOException )
@@ -2640,7 +2559,6 @@ void SAL_CALL OWriteStream::setEncryptionPassword( const OUString& aPass )
ModifyParentUnlockMutex_Impl( aGuard );
}
-//-----------------------------------------------
void SAL_CALL OWriteStream::removeEncryption()
throw ( uno::RuntimeException,
io::IOException )
@@ -2662,7 +2580,6 @@ void SAL_CALL OWriteStream::removeEncryption()
ModifyParentUnlockMutex_Impl( aGuard );
}
-//-----------------------------------------------
void SAL_CALL OWriteStream::setEncryptionData( const uno::Sequence< beans::NamedValue >& aEncryptionData )
throw (io::IOException, uno::RuntimeException)
{
@@ -2683,7 +2600,6 @@ void SAL_CALL OWriteStream::setEncryptionData( const uno::Sequence< beans::Named
ModifyParentUnlockMutex_Impl( aGuard );
}
-//-----------------------------------------------
sal_Bool SAL_CALL OWriteStream::hasEncryptionData()
throw (uno::RuntimeException)
{
@@ -2700,7 +2616,6 @@ sal_Bool SAL_CALL OWriteStream::hasEncryptionData()
return bRet;
}
-//-----------------------------------------------
sal_Bool SAL_CALL OWriteStream::hasByID( const OUString& sID )
throw ( io::IOException,
uno::RuntimeException )
@@ -2730,7 +2645,6 @@ sal_Bool SAL_CALL OWriteStream::hasByID( const OUString& sID )
return sal_False;
}
-//-----------------------------------------------
OUString SAL_CALL OWriteStream::getTargetByID( const OUString& sID )
throw ( container::NoSuchElementException,
io::IOException,
@@ -2755,7 +2669,6 @@ OUString SAL_CALL OWriteStream::getTargetByID( const OUString& sID )
return OUString();
}
-//-----------------------------------------------
OUString SAL_CALL OWriteStream::getTypeByID( const OUString& sID )
throw ( container::NoSuchElementException,
io::IOException,
@@ -2780,7 +2693,6 @@ OUString SAL_CALL OWriteStream::getTypeByID( const OUString& sID )
return OUString();
}
-//-----------------------------------------------
uno::Sequence< beans::StringPair > SAL_CALL OWriteStream::getRelationshipByID( const OUString& sID )
throw ( container::NoSuchElementException,
io::IOException,
@@ -2811,7 +2723,6 @@ uno::Sequence< beans::StringPair > SAL_CALL OWriteStream::getRelationshipByID(
throw container::NoSuchElementException();
}
-//-----------------------------------------------
uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OWriteStream::getRelationshipsByType( const OUString& sType )
throw ( io::IOException,
uno::RuntimeException )
@@ -2847,7 +2758,6 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OWriteStream::getRe
return aResult;
}
-//-----------------------------------------------
uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OWriteStream::getAllRelationships()
throw (io::IOException, uno::RuntimeException)
{
@@ -2865,7 +2775,6 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OWriteStream::getAl
return m_pImpl->GetAllRelationshipsIfAny();
}
-//-----------------------------------------------
void SAL_CALL OWriteStream::insertRelationshipByID( const OUString& sID, const uno::Sequence< beans::StringPair >& aEntry, ::sal_Bool bReplace )
throw ( container::ElementExistException,
io::IOException,
@@ -2924,13 +2833,11 @@ void SAL_CALL OWriteStream::insertRelationshipByID( const OUString& sID, const
else
throw container::ElementExistException(); // TODO
-
m_pImpl->m_aNewRelInfo = aSeq;
m_pImpl->m_xNewRelInfoStream = uno::Reference< io::XInputStream >();
m_pImpl->m_nRelInfoStatus = RELINFO_CHANGED;
}
-//-----------------------------------------------
void SAL_CALL OWriteStream::removeRelationshipByID( const OUString& sID )
throw ( container::NoSuchElementException,
io::IOException,
@@ -2972,7 +2879,6 @@ void SAL_CALL OWriteStream::removeRelationshipByID( const OUString& sID )
throw container::NoSuchElementException();
}
-//-----------------------------------------------
void SAL_CALL OWriteStream::insertRelationships( const uno::Sequence< uno::Sequence< beans::StringPair > >& aEntries, ::sal_Bool bReplace )
throw ( container::ElementExistException,
io::IOException,
@@ -3055,7 +2961,6 @@ void SAL_CALL OWriteStream::insertRelationships( const uno::Sequence< uno::Sequ
m_pImpl->m_nRelInfoStatus = RELINFO_CHANGED;
}
-//-----------------------------------------------
void SAL_CALL OWriteStream::clearRelationships()
throw ( io::IOException,
uno::RuntimeException )
@@ -3076,7 +2981,6 @@ void SAL_CALL OWriteStream::clearRelationships()
m_pImpl->m_nRelInfoStatus = RELINFO_CHANGED;
}
-//-----------------------------------------------
uno::Reference< beans::XPropertySetInfo > SAL_CALL OWriteStream::getPropertySetInfo()
throw ( uno::RuntimeException )
{
@@ -3086,7 +2990,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OWriteStream::getPropertySetI
return uno::Reference< beans::XPropertySetInfo >();
}
-//-----------------------------------------------
void SAL_CALL OWriteStream::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
throw ( beans::UnknownPropertyException,
beans::PropertyVetoException,
@@ -3210,8 +3113,6 @@ void SAL_CALL OWriteStream::setPropertyValue( const OUString& aPropertyName, con
ModifyParentUnlockMutex_Impl( aGuard );
}
-
-//-----------------------------------------------
uno::Any SAL_CALL OWriteStream::getPropertyValue( const OUString& aProp )
throw ( beans::UnknownPropertyException,
lang::WrappedTargetException,
@@ -3265,8 +3166,6 @@ uno::Any SAL_CALL OWriteStream::getPropertyValue( const OUString& aProp )
throw beans::UnknownPropertyException(); // TODO
}
-
-//-----------------------------------------------
void SAL_CALL OWriteStream::addPropertyChangeListener(
const OUString& /*aPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
@@ -3285,8 +3184,6 @@ void SAL_CALL OWriteStream::addPropertyChangeListener(
//TODO:
}
-
-//-----------------------------------------------
void SAL_CALL OWriteStream::removePropertyChangeListener(
const OUString& /*aPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ )
@@ -3305,8 +3202,6 @@ void SAL_CALL OWriteStream::removePropertyChangeListener(
//TODO:
}
-
-//-----------------------------------------------
void SAL_CALL OWriteStream::addVetoableChangeListener(
const OUString& /*PropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
@@ -3325,8 +3220,6 @@ void SAL_CALL OWriteStream::addVetoableChangeListener(
//TODO:
}
-
-//-----------------------------------------------
void SAL_CALL OWriteStream::removeVetoableChangeListener(
const OUString& /*PropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
@@ -3345,11 +3238,8 @@ void SAL_CALL OWriteStream::removeVetoableChangeListener(
//TODO:
}
-//____________________________________________________________________________________________________
// XTransactedObject
-//____________________________________________________________________________________________________
-//-----------------------------------------------
void OWriteStream::BroadcastTransaction( sal_Int8 nMessage )
/*
1 - preCommit
@@ -3395,7 +3285,6 @@ void OWriteStream::BroadcastTransaction( sal_Int8 nMessage )
}
}
}
-//-----------------------------------------------
void SAL_CALL OWriteStream::commit()
throw ( io::IOException,
embed::StorageWrappedTargetException,
@@ -3460,7 +3349,6 @@ void SAL_CALL OWriteStream::commit()
BroadcastTransaction( STOR_MESS_COMMITED );
}
-//-----------------------------------------------
void SAL_CALL OWriteStream::revert()
throw ( io::IOException,
embed::StorageWrappedTargetException,
@@ -3526,11 +3414,8 @@ void SAL_CALL OWriteStream::revert()
BroadcastTransaction( STOR_MESS_REVERTED );
}
-//____________________________________________________________________________________________________
// XTransactionBroadcaster
-//____________________________________________________________________________________________________
-//-----------------------------------------------
void SAL_CALL OWriteStream::addTransactionListener( const uno::Reference< embed::XTransactionListener >& aListener )
throw ( uno::RuntimeException )
{
@@ -3549,7 +3434,6 @@ void SAL_CALL OWriteStream::addTransactionListener( const uno::Reference< embed:
aListener );
}
-//-----------------------------------------------
void SAL_CALL OWriteStream::removeTransactionListener( const uno::Reference< embed::XTransactionListener >& aListener )
throw ( uno::RuntimeException )
{
@@ -3568,5 +3452,4 @@ void SAL_CALL OWriteStream::removeTransactionListener( const uno::Reference< emb
aListener );
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/package/source/xstor/owriteablestream.hxx b/package/source/xstor/owriteablestream.hxx
index 12d6f78..22fcb3f 100644
--- a/package/source/xstor/owriteablestream.hxx
+++ b/package/source/xstor/owriteablestream.hxx
@@ -40,7 +40,6 @@
#include <com/sun/star/beans/StringPair.hpp>
#include <com/sun/star/logging/XSimpleLogRing.hpp>
-
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/weak.hxx>
#include <cppuhelper/interfacecontainer.h>
@@ -52,7 +51,6 @@
#include "ocompinstream.hxx"
#include "mutexholder.hxx"
-
struct PreCreationStruct
{
SotMutexHolderRef m_rMutexRef;
@@ -143,7 +141,6 @@ struct OWriteStream_Impl : public PreCreationStruct
sal_Int16 m_nRelInfoStatus;
sal_Int32 m_nRelId;
-
private:
OUString GetFilledTempFileIfNo( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xStream );
OUString FillTempGetFileName();
@@ -231,7 +228,6 @@ public:
sal_Int32 nStreamMode,
sal_Bool bHierarchyAccess );
-
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetRawInStream();
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetPlainRawInStream();
@@ -248,7 +244,6 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xTargetStream,
const ::comphelper::SequenceAsHashMap& aEncryptionData );
-
void CommitStreamRelInfo(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xRelStorage,
const OUString& aOrigStreamName,
diff --git a/package/source/xstor/register.cxx b/package/source/xstor/register.cxx
index e542b3e..bf57fc7 100644
--- a/package/source/xstor/register.cxx
+++ b/package/source/xstor/register.cxx
@@ -25,7 +25,6 @@
using namespace ::com::sun::star;
-
extern "C" {
SAL_DLLPUBLIC_EXPORT void * SAL_CALL xstor_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
diff --git a/package/source/xstor/selfterminatefilestream.cxx b/package/source/xstor/selfterminatefilestream.cxx
index 1617a9b..fe21e3b 100644
--- a/package/source/xstor/selfterminatefilestream.cxx
+++ b/package/source/xstor/selfterminatefilestream.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <com/sun/star/ucb/SimpleFileAccess.hpp>
#include "selfterminatefilestream.hxx"
@@ -25,7 +24,6 @@
using namespace ::com::sun::star;
-//-----------------------------------------------
OSelfTerminateFileStream::OSelfTerminateFileStream( const uno::Reference< uno::XComponentContext > xContext, const OUString& aURL )
: m_aURL( aURL )
{
@@ -42,13 +40,11 @@ OSelfTerminateFileStream::OSelfTerminateFileStream( const uno::Reference< uno::X
m_xSeekable.set( m_xInputStream, uno::UNO_QUERY_THROW );
}
-//-----------------------------------------------
OSelfTerminateFileStream::~OSelfTerminateFileStream()
{
CloseStreamDeleteFile();
}
-//-----------------------------------------------
void OSelfTerminateFileStream::CloseStreamDeleteFile()
{
try
@@ -66,7 +62,6 @@ void OSelfTerminateFileStream::CloseStreamDeleteFile()
{}
}
-//-----------------------------------------------
sal_Int32 SAL_CALL OSelfTerminateFileStream::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
throw ( io::NotConnectedException,
io::BufferSizeExceededException,
@@ -76,7 +71,6 @@ sal_Int32 SAL_CALL OSelfTerminateFileStream::readBytes( uno::Sequence< sal_Int8
return m_xInputStream->readBytes( aData, nBytesToRead );
}
-//-----------------------------------------------
sal_Int32 SAL_CALL OSelfTerminateFileStream::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
throw ( io::NotConnectedException,
io::BufferSizeExceededException,
@@ -86,7 +80,6 @@ sal_Int32 SAL_CALL OSelfTerminateFileStream::readSomeBytes( uno::Sequence< sal_I
return m_xInputStream->readSomeBytes( aData, nMaxBytesToRead );
}
-//-----------------------------------------------
void SAL_CALL OSelfTerminateFileStream::skipBytes( sal_Int32 nBytesToSkip )
throw ( io::NotConnectedException,
io::BufferSizeExceededException,
@@ -96,7 +89,6 @@ void SAL_CALL OSelfTerminateFileStream::skipBytes( sal_Int32 nBytesToSkip )
return m_xInputStream->skipBytes( nBytesToSkip );
}
-//-----------------------------------------------
sal_Int32 SAL_CALL OSelfTerminateFileStream::available( )
throw ( io::NotConnectedException,
io::IOException,
@@ -105,7 +97,6 @@ sal_Int32 SAL_CALL OSelfTerminateFileStream::available( )
return m_xInputStream->available();
}
-//-----------------------------------------------
void SAL_CALL OSelfTerminateFileStream::closeInput( )
throw ( io::NotConnectedException,
io::IOException,
@@ -114,7 +105,6 @@ void SAL_CALL OSelfTerminateFileStream::closeInput( )
CloseStreamDeleteFile();
}
-//-----------------------------------------------
void SAL_CALL OSelfTerminateFileStream::seek( sal_Int64 location )
throw ( lang::IllegalArgumentException,
io::IOException,
@@ -123,7 +113,6 @@ void SAL_CALL OSelfTerminateFileStream::seek( sal_Int64 location )
m_xSeekable->seek( location );
}
-//-----------------------------------------------
sal_Int64 SAL_CALL OSelfTerminateFileStream::getPosition()
throw ( io::IOException,
uno::RuntimeException)
@@ -131,7 +120,6 @@ sal_Int64 SAL_CALL OSelfTerminateFileStream::getPosition()
return m_xSeekable->getPosition();
}
-//-----------------------------------------------
sal_Int64 SAL_CALL OSelfTerminateFileStream::getLength()
throw ( io::IOException,
uno::RuntimeException )
diff --git a/package/source/xstor/switchpersistencestream.cxx b/package/source/xstor/switchpersistencestream.cxx
index b4700dd..be48470 100644
--- a/package/source/xstor/switchpersistencestream.cxx
+++ b/package/source/xstor/switchpersistencestream.cxx
@@ -26,7 +26,6 @@
using namespace ::com::sun::star;
-// ========================================================================
struct SPStreamData_Impl
{
sal_Bool m_bInStreamBased;
@@ -43,7 +42,6 @@ struct SPStreamData_Impl
sal_Bool m_bInOpen;
sal_Bool m_bOutOpen;
-
SPStreamData_Impl(
sal_Bool bInStreamBased,
const uno::Reference< io::XStream >& xOrigStream,
@@ -65,8 +63,6 @@ struct SPStreamData_Impl
}
};
-// ========================================================================
-// ------------------------------------------------------------------------
SwitchablePersistenceStream::SwitchablePersistenceStream(
const uno::Reference< uno::XComponentContext >& xContext,
const uno::Reference< io::XStream >& xStream )
@@ -76,7 +72,6 @@ SwitchablePersistenceStream::SwitchablePersistenceStream(
SwitchPersistenceTo( xStream );
}
-// ------------------------------------------------------------------------
SwitchablePersistenceStream::SwitchablePersistenceStream(
const uno::Reference< uno::XComponentContext >& xContext,
const uno::Reference< io::XInputStream >& xInputStream )
@@ -86,13 +81,11 @@ SwitchablePersistenceStream::SwitchablePersistenceStream(
SwitchPersistenceTo( xInputStream );
}
-// ------------------------------------------------------------------------
SwitchablePersistenceStream::~SwitchablePersistenceStream()
{
CloseAll_Impl();
}
-// ------------------------------------------------------------------------
void SwitchablePersistenceStream::SwitchPersistenceTo( const uno::Reference< io::XStream >& xStream )
{
uno::Reference< io::XTruncate > xNewTruncate( xStream, uno::UNO_QUERY_THROW );
@@ -127,7 +120,6 @@ void SwitchablePersistenceStream::SwitchPersistenceTo( const uno::Reference< io:
bInOpen, bOutOpen );
}
-// ------------------------------------------------------------------------
void SwitchablePersistenceStream::SwitchPersistenceTo( const uno::Reference< io::XInputStream >& xInputStream )
{
uno::Reference< io::XStream > xNewStream;
@@ -163,7 +155,6 @@ void SwitchablePersistenceStream::SwitchPersistenceTo( const uno::Reference< io:
}
-// ------------------------------------------------------------------------
void SwitchablePersistenceStream::CopyAndSwitchPersistenceTo( const uno::Reference< io::XStream >& xStream )
{
uno::Reference< io::XStream > xTargetStream = xStream;
@@ -210,7 +201,6 @@ void SwitchablePersistenceStream::CopyAndSwitchPersistenceTo( const uno::Referen
bInOpen, bOutOpen );
}
-// ------------------------------------------------------------------------
void SwitchablePersistenceStream::CloseAll_Impl()
{
if ( m_pStreamData )
@@ -221,7 +211,6 @@ void SwitchablePersistenceStream::CloseAll_Impl()
}
// com::sun::star::io::XStream
-// ------------------------------------------------------------------------
uno::Reference< io::XInputStream > SAL_CALL SwitchablePersistenceStream::getInputStream( )
throw (uno::RuntimeException)
{
@@ -232,8 +221,6 @@ uno::Reference< io::XInputStream > SAL_CALL SwitchablePersistenceStream::getInpu
return static_cast< io::XInputStream* >( this );
}
-
-// ------------------------------------------------------------------------
uno::Reference< io::XOutputStream > SAL_CALL SwitchablePersistenceStream::getOutputStream( )
throw (uno::RuntimeException)
{
@@ -244,10 +231,7 @@ uno::Reference< io::XOutputStream > SAL_CALL SwitchablePersistenceStream::getOut
return static_cast< io::XOutputStream* >( this );
}
-
-
// com::sun::star::io::XInputStream
-// ------------------------------------------------------------------------
::sal_Int32 SAL_CALL SwitchablePersistenceStream::readBytes( uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nBytesToRead )
throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException)
{
@@ -263,8 +247,6 @@ uno::Reference< io::XOutputStream > SAL_CALL SwitchablePersistenceStream::getOut
return m_pStreamData->m_xOrigInStream->readBytes( aData, nBytesToRead );
}
-
-// ------------------------------------------------------------------------
::sal_Int32 SAL_CALL SwitchablePersistenceStream::readSomeBytes( uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nMaxBytesToRead )
throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException)
{
@@ -280,7 +262,6 @@ uno::Reference< io::XOutputStream > SAL_CALL SwitchablePersistenceStream::getOut
return m_pStreamData->m_xOrigInStream->readBytes( aData, nMaxBytesToRead );
}
-// ------------------------------------------------------------------------
void SAL_CALL SwitchablePersistenceStream::skipBytes( ::sal_Int32 nBytesToSkip )
throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException)
{
@@ -296,8 +277,6 @@ void SAL_CALL SwitchablePersistenceStream::skipBytes( ::sal_Int32 nBytesToSkip )
m_pStreamData->m_xOrigInStream->skipBytes( nBytesToSkip );
}
-
-// ------------------------------------------------------------------------
::sal_Int32 SAL_CALL SwitchablePersistenceStream::available( )
throw (io::NotConnectedException, io::IOException, uno::RuntimeException)
{
@@ -313,8 +292,6 @@ void SAL_CALL SwitchablePersistenceStream::skipBytes( ::sal_Int32 nBytesToSkip )
return m_pStreamData->m_xOrigInStream->available();
}
-
-// ------------------------------------------------------------------------
void SAL_CALL SwitchablePersistenceStream::closeInput()
throw (io::NotConnectedException, io::IOException, uno::RuntimeException)
{
@@ -328,10 +305,7 @@ void SAL_CALL SwitchablePersistenceStream::closeInput()
CloseAll_Impl();
}
-
-
// com::sun::star::io::XOutputStream
-// ------------------------------------------------------------------------
void SAL_CALL SwitchablePersistenceStream::writeBytes( const uno::Sequence< ::sal_Int8 >& aData )
throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException)
{
@@ -350,8 +324,6 @@ void SAL_CALL SwitchablePersistenceStream::writeBytes( const uno::Sequence< ::sa
m_pStreamData->m_xOrigOutStream->writeBytes( aData );
}
-
-// ------------------------------------------------------------------------
void SAL_CALL SwitchablePersistenceStream::flush( )
throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException)
{
@@ -373,8 +345,6 @@ void SAL_CALL SwitchablePersistenceStream::flush( )
m_pStreamData->m_xOrigOutStream->flush();
}
-
-// ------------------------------------------------------------------------
void SAL_CALL SwitchablePersistenceStream::closeOutput( )
throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException)
{
@@ -388,10 +358,7 @@ void SAL_CALL SwitchablePersistenceStream::closeOutput( )
CloseAll_Impl();
}
-
-
// com::sun::star::io::XTruncate
-// ------------------------------------------------------------------------
void SAL_CALL SwitchablePersistenceStream::truncate( )
throw (io::IOException, uno::RuntimeException)
{
@@ -410,9 +377,7 @@ void SAL_CALL SwitchablePersistenceStream::truncate( )
m_pStreamData->m_xOrigTruncate->truncate();
}
-
// com::sun::star::io::XSeekable
-// ------------------------------------------------------------------------
void SAL_CALL SwitchablePersistenceStream::seek( ::sal_Int64 location )
throw (lang::IllegalArgumentException, io::IOException, uno::RuntimeException)
{
@@ -428,8 +393,6 @@ void SAL_CALL SwitchablePersistenceStream::seek( ::sal_Int64 location )
m_pStreamData->m_xOrigSeekable->seek( location );
}
-
-// ------------------------------------------------------------------------
::sal_Int64 SAL_CALL SwitchablePersistenceStream::getPosition( )
throw (io::IOException, uno::RuntimeException)
{
@@ -445,8 +408,6 @@ void SAL_CALL SwitchablePersistenceStream::seek( ::sal_Int64 location )
return m_pStreamData->m_xOrigSeekable->getPosition();
}
-
-// ------------------------------------------------------------------------
::sal_Int64 SAL_CALL SwitchablePersistenceStream::getLength( )
throw (io::IOException, uno::RuntimeException)
{
@@ -462,7 +423,6 @@ void SAL_CALL SwitchablePersistenceStream::seek( ::sal_Int64 location )
return m_pStreamData->m_xOrigSeekable->getLength();
}
-// ------------------------------------------------------------------------
void SAL_CALL SwitchablePersistenceStream::waitForCompletion()
throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
{
diff --git a/package/source/xstor/switchpersistencestream.hxx b/package/source/xstor/switchpersistencestream.hxx
index 82d591e..0007fbd 100644
--- a/package/source/xstor/switchpersistencestream.hxx
+++ b/package/source/xstor/switchpersistencestream.hxx
@@ -34,13 +34,11 @@
#include <osl/mutex.hxx>
#include <cppuhelper/implbase6.hxx>
-//==================================================================
// SwitchablePersistenceStream
//
// Allows to switch the stream persistence on the fly. The target
// stream ( if not filled by the implementation ) MUST have the same
// size as the original one!
-//==================================================================
struct SPStreamData_Impl;
class SwitchablePersistenceStream
@@ -109,5 +107,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 11fb074..2aed9f7 100644
--- a/package/source/xstor/xfactory.cxx
+++ b/package/source/xstor/xfactory.cxx
@@ -30,10 +30,8 @@
#include "xfactory.hxx"
#include "xstorage.hxx"
-
using namespace ::com::sun::star;
-//-------------------------------------------------------------------------
sal_Bool CheckPackageSignature_Impl( const uno::Reference< io::XInputStream >& xInputStream,
const uno::Reference< io::XSeekable >& xSeekable )
{
@@ -55,7 +53,6 @@ sal_Bool CheckPackageSignature_Impl( const uno::Reference< io::XInputStream >& x
return sal_True; // allow to create a storage based on empty stream
}
-//-------------------------------------------------------------------------
uno::Sequence< OUString > SAL_CALL OStorageFactory::impl_staticGetSupportedServiceNames()
{
uno::Sequence< OUString > aRet(2);
@@ -64,20 +61,17 @@ uno::Sequence< OUString > SAL_CALL OStorageFactory::impl_staticGetSupportedServi
return aRet;
}
-//-------------------------------------------------------------------------
OUString SAL_CALL OStorageFactory::impl_staticGetImplementationName()
{
return OUString("com.sun.star.comp.embed.StorageFactory");
}
-//-------------------------------------------------------------------------
uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::impl_staticCreateSelfInstance(
const uno::Reference< lang::XMultiServiceFactory >& xServiceManager )
{
return uno::Reference< uno::XInterface >( *new OStorageFactory( comphelper::getComponentContext(xServiceManager) ) );
}
-//-------------------------------------------------------------------------
uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstance()
throw ( uno::Exception,
uno::RuntimeException )
@@ -96,7 +90,6 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstance()
uno::UNO_QUERY );
}
-//-------------------------------------------------------------------------
uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithArguments(
const uno::Sequence< uno::Any >& aArguments )
throw ( uno::Exception,
@@ -280,14 +273,12 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr
throw uno::Exception(); // general error during creation
}
-//-------------------------------------------------------------------------
OUString SAL_CALL OStorageFactory::getImplementationName()
throw ( uno::RuntimeException )
{
return impl_staticGetImplementationName();
}
-//-------------------------------------------------------------------------
sal_Bool SAL_CALL OStorageFactory::supportsService( const OUString& ServiceName )
throw ( uno::RuntimeException )
{
@@ -300,7 +291,6 @@ sal_Bool SAL_CALL OStorageFactory::supportsService( const OUString& ServiceName
return sal_False;
}
-//-------------------------------------------------------------------------
uno::Sequence< OUString > SAL_CALL OStorageFactory::getSupportedServiceNames()
throw ( uno::RuntimeException )
{
diff --git a/package/source/xstor/xfactory.hxx b/package/source/xstor/xfactory.hxx
index 1d3b199..bf23bf1 100644
--- a/package/source/xstor/xfactory.hxx
+++ b/package/source/xstor/xfactory.hxx
@@ -23,10 +23,8 @@
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-
#include <cppuhelper/implbase2.hxx>
-
class OStorageFactory : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XSingleServiceFactory,
::com::sun::star::lang::XServiceInfo >
{
@@ -48,7 +46,6 @@ public:
impl_staticCreateSelfInstance(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
-
// XSingleServiceFactory
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index ee1850c..2d63850 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -31,7 +31,6 @@
#include <com/sun/star/util/XChangesBatch.hpp>
#include <com/sun/star/util/XCloneable.hpp>
-
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
@@ -56,8 +55,6 @@
using namespace ::com::sun::star;
-//=========================================================
-
typedef ::std::list< uno::WeakReference< lang::XComponent > > WeakComponentList;
struct StorInternalData_Impl
@@ -89,7 +86,6 @@ struct StorInternalData_Impl
~StorInternalData_Impl();
};
-//=========================================================
OUString GetNewTempFileURL( const uno::Reference< uno::XComponentContext > xContext );
// static
@@ -161,7 +157,6 @@ StorInternalData_Impl::~StorInternalData_Impl()
delete m_pTypeCollection;
}
-
SotElement_Impl::SotElement_Impl( const OUString& rName, sal_Bool bStor, sal_Bool bNew )
: m_aName( rName )
, m_aOriginalName( rName )
@@ -182,7 +177,6 @@ SotElement_Impl::~SotElement_Impl()
delete m_pStream;
}
-//-----------------------------------------------
// most of properties are holt by the storage but are not used
OStorage_Impl::OStorage_Impl( uno::Reference< io::XInputStream > xInputStream,
sal_Int32 nMode,
@@ -222,7 +216,6 @@ OStorage_Impl::OStorage_Impl( uno::Reference< io::XInputStream > xInputStream,
}
}
-//-----------------------------------------------
// most of properties are holt by the storage but are not used
OStorage_Impl::OStorage_Impl( uno::Reference< io::XStream > xStream,
sal_Int32 nMode,
@@ -265,7 +258,6 @@ OStorage_Impl::OStorage_Impl( uno::Reference< io::XStream > xStream,
}
}
-//-----------------------------------------------
OStorage_Impl::OStorage_Impl( OStorage_Impl* pParent,
sal_Int32 nMode,
uno::Reference< container::XNameContainer > xPackageFolder,
@@ -296,7 +288,6 @@ OStorage_Impl::OStorage_Impl( OStorage_Impl* pParent,
SAL_WARN_IF( !xPackageFolder.is(), "package.xstor", "No package folder!" );
}
-//-----------------------------------------------
OStorage_Impl::~OStorage_Impl()
{
{
@@ -394,7 +385,6 @@ OStorage_Impl::~OStorage_Impl()
}
}
-//-----------------------------------------------
void OStorage_Impl::AddLog( const OUString& aMessage )
{
if ( !m_xLogRing.is() )
@@ -414,7 +404,6 @@ void OStorage_Impl::AddLog( const OUString& aMessage )
m_xLogRing->logString( aMessage );
}
-//-----------------------------------------------
void OStorage_Impl::SetReadOnlyWrap( OStorage& aStorage )
{
// Weak reference is used inside the holder so the refcount must not be zero at this point
@@ -422,7 +411,6 @@ void OStorage_Impl::SetReadOnlyWrap( OStorage& aStorage )
m_aReadOnlyWrapList.push_back( StorageHolder_Impl( &aStorage ) );
}
-//-----------------------------------------------
void OStorage_Impl::RemoveReadOnlyWrap( OStorage& aStorage )
{
for ( OStorageList_Impl::iterator pStorageIter = m_aReadOnlyWrapList.begin();
@@ -448,7 +436,6 @@ void OStorage_Impl::RemoveReadOnlyWrap( OStorage& aStorage )
}
}
-//-----------------------------------------------
void OStorage_Impl::OpenOwnPackage()
{
SAL_WARN_IF( !m_bIsRoot, "package.xstor", "Opening of the package has no sence!" );
@@ -532,7 +519,6 @@ void OStorage_Impl::OpenOwnPackage()
throw embed::InvalidStorageException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() );
}
-//-----------------------------------------------
uno::Reference< uno::XComponentContext > OStorage_Impl::GetComponentContext()
{
if ( m_xContext.is() )
@@ -541,7 +527,6 @@ uno::Reference< uno::XComponentContext > OStorage_Impl::GetComponentContext()
return ::comphelper::getProcessComponentContext();
}
-//-----------------------------------------------
SotElementList_Impl& OStorage_Impl::GetChildrenList()
{
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
@@ -550,7 +535,6 @@ SotElementList_Impl& OStorage_Impl::GetChildrenList()
return m_aChildrenList;
}
-//-----------------------------------------------
void OStorage_Impl::GetStorageProperties()
{
if ( m_nStorageType == embed::StorageFormats::PACKAGE )
@@ -576,7 +560,6 @@ void OStorage_Impl::GetStorageProperties()
// the properties of OFOPXML will be handled directly
}
-//-----------------------------------------------
void OStorage_Impl::ReadRelInfoIfNecessary()
{
if ( m_nStorageType != embed::StorageFormats::OFOPXML )
@@ -614,7 +597,6 @@ void OStorage_Impl::ReadRelInfoIfNecessary()
}
}
-//-----------------------------------------------
void OStorage_Impl::ReadContents()
{
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
@@ -693,7 +675,6 @@ void OStorage_Impl::ReadContents()
GetStorageProperties();
}
-//-----------------------------------------------
void OStorage_Impl::CopyToStorage( const uno::Reference< embed::XStorage >& xDest, sal_Bool bDirect )
{
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
@@ -784,7 +765,6 @@ void OStorage_Impl::CopyToStorage( const uno::Reference< embed::XStorage >& xDes
xObjToCommit->commit();
}
-//-----------------------------------------------
void OStorage_Impl::CopyStorageElement( SotElement_Impl* pElement,
uno::Reference< embed::XStorage > xDest,
OUString aName,
@@ -991,7 +971,6 @@ void OStorage_Impl::CopyStorageElement( SotElement_Impl* pElement,
}
}
-//-----------------------------------------------
uno::Sequence< uno::Sequence< beans::StringPair > > OStorage_Impl::GetAllRelationshipsIfAny()
{
if ( m_nStorageType != embed::StorageFormats::OFOPXML )
@@ -1007,7 +986,6 @@ uno::Sequence< uno::Sequence< beans::StringPair > > OStorage_Impl::GetAllRelatio
uno::Reference< uno::XInterface >() );
}
-//-----------------------------------------------
void OStorage_Impl::CopyLastCommitTo( const uno::Reference< embed::XStorage >& xNewStor )
{
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
@@ -1027,7 +1005,6 @@ void OStorage_Impl::CopyLastCommitTo( const uno::Reference< embed::XStorage >& x
aTempRepresent.CopyToStorage( xNewStor, sal_False );
}
-//-----------------------------------------------
void OStorage_Impl::InsertIntoPackageFolder( const OUString& aName,
const uno::Reference< container::XNameContainer >& xParentPackageFolder )
{
@@ -1043,7 +1020,6 @@ void OStorage_Impl::InsertIntoPackageFolder( const OUString& aName,
m_bCommited = sal_False;
}
-//-----------------------------------------------
void OStorage_Impl::Commit()
{
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
@@ -1296,7 +1272,6 @@ void OStorage_Impl::Commit()
m_bMTFallbackUsed = sal_False;
}
-//-----------------------------------------------
void OStorage_Impl::Revert()
{
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
@@ -1358,7 +1333,6 @@ void OStorage_Impl::Revert()
}
}
-//-----------------------------------------------
::comphelper::SequenceAsHashMap OStorage_Impl::GetCommonRootEncryptionData()
throw ( packages::NoEncryptionException )
{
@@ -1383,7 +1357,6 @@ void OStorage_Impl::Revert()
}
}
-//-----------------------------------------------
SotElement_Impl* OStorage_Impl::FindElement( const OUString& rName )
{
SAL_WARN_IF( rName.isEmpty(), "package.xstor", "Name is empty!" );
@@ -1402,7 +1375,6 @@ SotElement_Impl* OStorage_Impl::FindElement( const OUString& rName )
return NULL;
}
-//-----------------------------------------------
SotElement_Impl* OStorage_Impl::InsertStream( OUString aName, sal_Bool bEncr )
{
SAL_WARN_IF( !m_xPackage.is(), "package.xstor", "Not possible to refer to package as to factory!" );
@@ -1437,7 +1409,6 @@ SotElement_Impl* OStorage_Impl::InsertStream( OUString aName, sal_Bool bEncr )
return pNewElement;
}
-//-----------------------------------------------
SotElement_Impl* OStorage_Impl::InsertRawStream( OUString aName, const uno::Reference< io::XInputStream >& xInStream )
{
// insert of raw stream means insert and commit
@@ -1480,7 +1451,6 @@ SotElement_Impl* OStorage_Impl::InsertRawStream( OUString aName, const uno::Refe
return pNewElement;
}
-//-----------------------------------------------
OStorage_Impl* OStorage_Impl::CreateNewStorageImpl( sal_Int32 nStorageMode )
{
SAL_WARN_IF( !m_xPackage.is(), "package.xstor", "Not possible to refer to package as to factory!" );
@@ -1507,7 +1477,6 @@ OStorage_Impl* OStorage_Impl::CreateNewStorageImpl( sal_Int32 nStorageMode )
return pResult;
}
-//-----------------------------------------------
SotElement_Impl* OStorage_Impl::InsertStorage( OUString aName, sal_Int32 nStorageMode )
{
SotElement_Impl* pNewElement = InsertElement( aName, sal_True );
@@ -1519,7 +1488,6 @@ SotElement_Impl* OStorage_Impl::InsertStorage( OUString aName, sal_Int32 nStorag
return pNewElement;
}
-//-----------------------------------------------
SotElement_Impl* OStorage_Impl::InsertElement( OUString aName, sal_Bool bIsStorage )
{
OSL_ENSURE( FindElement( aName ) == NULL, "Should not try to insert existing element" );
@@ -1558,7 +1526,6 @@ SotElement_Impl* OStorage_Impl::InsertElement( OUString aName, sal_Bool bIsStora
return new SotElement_Impl( aName, bIsStorage, sal_True );
}
-//-----------------------------------------------
void OStorage_Impl::OpenSubStorage( SotElement_Impl* pElement, sal_Int32 nStorageMode )
{
SAL_WARN_IF( !pElement, "package.xstor", "pElement is not set!" );
@@ -1586,7 +1553,6 @@ void OStorage_Impl::OpenSubStorage( SotElement_Impl* pElement, sal_Int32 nStorag
}
}
-//-----------------------------------------------
void OStorage_Impl::OpenSubStream( SotElement_Impl* pElement )
{
SAL_WARN_IF( !pElement, "package.xstor", "pElement is not set!" );
@@ -1612,7 +1578,6 @@ void OStorage_Impl::OpenSubStream( SotElement_Impl* pElement )
}
}
-//-----------------------------------------------
uno::Sequence< OUString > OStorage_Impl::GetElementNames()
{
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
@@ -1634,7 +1599,6 @@ uno::Sequence< OUString > OStorage_Impl::GetElementNames()
return aElementNames;
}
-//-----------------------------------------------
void OStorage_Impl::RemoveElement( SotElement_Impl* pElement )
{
SAL_WARN_IF( !pElement, "package.xstor", "Element must be provided!" );
@@ -1660,7 +1624,6 @@ void OStorage_Impl::RemoveElement( SotElement_Impl* pElement )
// TODO/OFOPXML: the rel stream should be removed as well
}
-//-----------------------------------------------
void OStorage_Impl::ClearElement( SotElement_Impl* pElement )
{
if ( pElement->m_pStorage )
@@ -1676,7 +1639,6 @@ void OStorage_Impl::ClearElement( SotElement_Impl* pElement )
}
}
-//-----------------------------------------------
void OStorage_Impl::CloneStreamElement( const OUString& aStreamName,
sal_Bool bEncryptionDataProvided,
const ::comphelper::SequenceAsHashMap& aEncryptionData,
@@ -1720,7 +1682,6 @@ void OStorage_Impl::CloneStreamElement( const OUString& aStreamName,
throw io::IOException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() ); // TODO: general_error
}
-//-----------------------------------------------
void OStorage_Impl::RemoveStreamRelInfo( const OUString& aOriginalName )
{
// this method should be used only in OStorage_Impl::Commit() method
@@ -1736,7 +1697,6 @@ void OStorage_Impl::RemoveStreamRelInfo( const OUString& aOriginalName )
}
}
-//-----------------------------------------------
void OStorage_Impl::CreateRelStorage()
{
if ( m_nStorageType != embed::StorageFormats::OFOPXML )
@@ -1763,7 +1723,6 @@ void OStorage_Impl::CreateRelStorage()
}
}
-//-----------------------------------------------
void OStorage_Impl::CommitStreamRelInfo( SotElement_Impl* pStreamElement )
{
// this method should be used only in OStorage_Impl::Commit() method
@@ -1786,7 +1745,6 @@ void OStorage_Impl::CommitStreamRelInfo( SotElement_Impl* pStreamElement )
}
}
-//-----------------------------------------------
uno::Reference< io::XInputStream > OStorage_Impl::GetRelInfoStreamForName( const OUString& aName )
{
if ( m_nStorageType == embed::StorageFormats::OFOPXML )
@@ -1808,7 +1766,6 @@ uno::Reference< io::XInputStream > OStorage_Impl::GetRelInfoStreamForName( const
return uno::Reference< io::XInputStream >();
}
-//-----------------------------------------------
void OStorage_Impl::CommitRelInfo( const uno::Reference< container::XNameContainer >& xNewPackageFolder )
{
// this method should be used only in OStorage_Impl::Commit() method
@@ -1912,11 +1869,8 @@ void OStorage_Impl::CommitRelInfo( const uno::Reference< container::XNameContain
}
}
-//=====================================================
// OStorage implementation
-//=====================================================
-//-----------------------------------------------
OStorage::OStorage( uno::Reference< io::XInputStream > xInputStream,
sal_Int32 nMode,
uno::Sequence< beans::PropertyValue > xProperties,
@@ -1928,7 +1882,6 @@ OStorage::OStorage( uno::Reference< io::XInputStream > xInputStream,
m_pData = new StorInternalData_Impl( m_pImpl->m_rMutexRef, m_pImpl->m_bIsRoot, m_pImpl->m_nStorageType, sal_False );
}
-//-----------------------------------------------
OStorage::OStorage( uno::Reference< io::XStream > xStream,
sal_Int32 nMode,
uno::Sequence< beans::PropertyValue > xProperties,
@@ -1940,7 +1893,6 @@ OStorage::OStorage( uno::Reference< io::XStream > xStream,
m_pData = new StorInternalData_Impl( m_pImpl->m_rMutexRef, m_pImpl->m_bIsRoot, m_pImpl->m_nStorageType, sal_False );
}
-//-----------------------------------------------
OStorage::OStorage( OStorage_Impl* pImpl, sal_Bool bReadOnlyWrap )
: m_pImpl( pImpl )
{
@@ -1957,7 +1909,6 @@ OStorage::OStorage( OStorage_Impl* pImpl, sal_Bool bReadOnlyWrap )
m_pImpl->m_pAntiImpl = this;
}
-//-----------------------------------------------
OStorage::~OStorage()
{
{
@@ -1994,7 +1945,6 @@ OStorage::~OStorage()
}
}
-//-----------------------------------------------
void SAL_CALL OStorage::InternalDispose( sal_Bool bNotifyImpl )
{
SAL_INFO( "package.xstor", "package (mv76033) OStorage::InternalDispose" );
@@ -2068,7 +2018,6 @@ void SAL_CALL OStorage::InternalDispose( sal_Bool bNotifyImpl )
m_pImpl = NULL;
}
-//-----------------------------------------------
void OStorage::ChildIsDisposed( const uno::Reference< uno::XInterface >& xChild )
{
// this method can only be called by child disposing listener
@@ -2094,7 +2043,6 @@ void OStorage::ChildIsDisposed( const uno::Reference< uno::XInterface >& xChild
}
}
-//-----------------------------------------------
void OStorage::BroadcastModifiedIfNecessary()
{
// no need to lock mutex here for the checking of m_pImpl, and m_pData is alive until the object is destructed
@@ -2126,7 +2074,6 @@ void OStorage::BroadcastModifiedIfNecessary()
}
}
-//-----------------------------------------------
void OStorage::BroadcastTransaction( sal_Int8 nMessage )
/*
1 - preCommit
@@ -2175,7 +2122,6 @@ void OStorage::BroadcastTransaction( sal_Int8 nMessage )
}
}
-//-----------------------------------------------
SotElement_Impl* OStorage::OpenStreamElement_Impl( const OUString& aStreamName, sal_Int32 nOpenMode, sal_Bool bEncr )
{
::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
@@ -2211,7 +2157,6 @@ SotElement_Impl* OStorage::OpenStreamElement_Impl( const OUString& aStreamName,
return pElement;
}
-//-----------------------------------------------
void OStorage::MakeLinkToSubComponent_Impl( const uno::Reference< lang::XComponent >& xComponent )
{
if ( !xComponent.is() )
@@ -2229,11 +2174,8 @@ void OStorage::MakeLinkToSubComponent_Impl( const uno::Reference< lang::XCompone
m_pData->m_aOpenSubComponentsList.push_back( xComponent );
}
-//____________________________________________________________________________________________________
// XInterface
-//____________________________________________________________________________________________________
-//-----------------------------------------------
uno::Any SAL_CALL OStorage::queryInterface( const uno::Type& rType )
throw( uno::RuntimeException )
{
@@ -2296,23 +2238,17 @@ uno::Any SAL_CALL OStorage::queryInterface( const uno::Type& rType )
return OWeakObject::queryInterface( rType );
}
-//-----------------------------------------------
void SAL_CALL OStorage::acquire() throw()
{
OWeakObject::acquire();
}
-//-----------------------------------------------
void SAL_CALL OStorage::release() throw()
{
OWeakObject::release();
}
-//____________________________________________________________________________________________________
// XTypeProvider
-//____________________________________________________________________________________________________
-
-//-----------------------------------------------
uno::Sequence< uno::Type > SAL_CALL OStorage::getTypes()
throw( uno::RuntimeException )
{
@@ -2381,7 +2317,6 @@ uno::Sequence< uno::Type > SAL_CALL OStorage::getTypes()
namespace { struct lcl_ImplId : public rtl::Static< ::cppu::OImplementationId, lcl_ImplId > {}; }
-//-----------------------------------------------
uno::Sequence< sal_Int8 > SAL_CALL OStorage::getImplementationId()
throw( uno::RuntimeException )
{
@@ -2389,12 +2324,7 @@ uno::Sequence< sal_Int8 > SAL_CALL OStorage::getImplementationId()
return rID.getImplementationId();
}
-//____________________________________________________________________________________________________
// XStorage
-//____________________________________________________________________________________________________
-
-
-//-----------------------------------------------
void SAL_CALL OStorage::copyToStorage( const uno::Reference< embed::XStorage >& xDest )
throw ( embed::InvalidStorageException,
io::IOException,
@@ -2460,7 +2390,6 @@ void SAL_CALL OStorage::copyToStorage( const uno::Reference< embed::XStorage >&
}
}
-//-----------------------------------------------
uno::Reference< io::XStream > SAL_CALL OStorage::openStreamElement(
const OUString& aStreamName, sal_Int32 nOpenMode )
throw ( embed::InvalidStorageException,
@@ -2562,7 +2491,6 @@ uno::Reference< io::XStream > SAL_CALL OStorage::openStreamElement(
return xResult;
}
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list