summaryrefslogtreecommitdiff
path: root/package/source/zippackage
diff options
context:
space:
mode:
Diffstat (limited to 'package/source/zippackage')
-rw-r--r--package/source/zippackage/ZipPackage.cxx18
-rw-r--r--package/source/zippackage/ZipPackageEntry.cxx6
-rw-r--r--package/source/zippackage/ZipPackageFolder.cxx10
-rw-r--r--package/source/zippackage/ZipPackageStream.cxx12
4 files changed, 23 insertions, 23 deletions
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index 739574c2dc6c..96235ac476a2 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ZipPackage.cxx,v $
*
- * $Revision: 1.31 $
+ * $Revision: 1.32 $
*
- * last change: $Author: mtg $ $Date: 2001-03-08 12:22:40 $
+ * last change: $Author: mtg $ $Date: 2001-03-16 17:11:42 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -68,9 +68,9 @@ using namespace com::sun::star::registry;
using namespace com::sun::star::util;
using namespace com::sun::star::uno;
using namespace com::sun::star::container;
-using namespace com::sun::star::package;
+using namespace com::sun::star::packages;
using namespace com::sun::star::lang;
-using namespace com::sun::star::package::ZipConstants;
+using namespace com::sun::star::packages::ZipConstants;
ZipPackage::ZipPackage (Reference < XInputStream > &xNewInput,
const Reference < XMultiServiceFactory > &xNewFactory)
@@ -675,7 +675,7 @@ Sequence< ElementChange > SAL_CALL ZipPackage::getPendingChanges( )
return Sequence < ElementChange > ( NULL, 0 );
}
-sal_Bool ZipPackage::isZipFile(com::sun::star::package::ZipEntry &rEntry)
+sal_Bool ZipPackage::isZipFile(ZipEntry &rEntry)
{
if (rEntry.nMethod == STORED)
{
@@ -704,7 +704,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
Sequence< OUString > ZipPackage_getSupportedServiceNames()
{
Sequence< OUString > seqNames(1);
- seqNames.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.package.Package" ) );
+ seqNames.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.packages.comp.ZipPackage" ) );
return seqNames;
}
@@ -752,13 +752,13 @@ extern "C" void * SAL_CALL component_getFactory(
{
void * pRet = 0;
// which implementation is demanded?
- if (pServiceManager && !rtl_str_compare( pImplName, "com.sun.star.package.Package" ))
+ if (pServiceManager && !rtl_str_compare( pImplName, "com.sun.star.packages.comp.ZipPackage" ))
{
- OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.package.Package") );
+ OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.packages.comp.ZipPackage") );
Reference< XSingleServiceFactory > xFactory(
cppu::createSingleFactory( // helper function from cppuhelper lib
reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
- OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.package.Package") ),
+ OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.packages.comp.ZipPackage") ),
ZipPackage_create, ZipPackage_getSupportedServiceNames() ) );
if (xFactory.is())
diff --git a/package/source/zippackage/ZipPackageEntry.cxx b/package/source/zippackage/ZipPackageEntry.cxx
index ab2bafab7018..1a289ed47348 100644
--- a/package/source/zippackage/ZipPackageEntry.cxx
+++ b/package/source/zippackage/ZipPackageEntry.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ZipPackageEntry.cxx,v $
*
- * $Revision: 1.14 $
+ * $Revision: 1.15 $
*
- * last change: $Author: mtg $ $Date: 2001-02-07 10:51:26 $
+ * last change: $Author: mtg $ $Date: 2001-03-16 17:11:42 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -63,7 +63,7 @@
#endif
using namespace com::sun::star;
-using namespace com::sun::star::package::ZipConstants;
+using namespace com::sun::star::packages::ZipConstants;
using namespace rtl;
ZipPackageEntry::ZipPackageEntry (void)
diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx
index 16f730caaeba..eca8e343dc6a 100644
--- a/package/source/zippackage/ZipPackageFolder.cxx
+++ b/package/source/zippackage/ZipPackageFolder.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ZipPackageFolder.cxx,v $
*
- * $Revision: 1.33 $
+ * $Revision: 1.34 $
*
- * last change: $Author: mtg $ $Date: 2001-03-08 12:22:54 $
+ * last change: $Author: mtg $ $Date: 2001-03-16 17:11:42 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -62,7 +62,7 @@
#include "ZipPackageFolder.hxx"
#endif
-using namespace com::sun::star::package::ZipConstants;
+using namespace com::sun::star::packages::ZipConstants;
using namespace com::sun::star;
using namespace cppu;
using namespace rtl;
@@ -84,7 +84,7 @@ ZipPackageFolder::ZipPackageFolder (void)
ZipPackageFolder::~ZipPackageFolder( void )
{
}
-void ZipPackageFolder::copyZipEntry( com::sun::star::package::ZipEntry &rDest, const com::sun::star::package::ZipEntry &rSource)
+void ZipPackageFolder::copyZipEntry( com::sun::star::packages::ZipEntry &rDest, const com::sun::star::packages::ZipEntry &rSource)
{
rDest.nVersion = rSource.nVersion;
rDest.nFlag = rSource.nFlag;
@@ -413,7 +413,7 @@ void ZipPackageFolder::saveContents(rtl::OUString &rPath, std::vector < Manifest
}
rZipOut.rawCloseEntry();
}
- catch (package::ZipException&)
+ catch (packages::ZipException&)
{
}
}
diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx
index 70feba7850ea..2b589caee361 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ZipPackageStream.cxx,v $
*
- * $Revision: 1.13 $
+ * $Revision: 1.14 $
*
- * last change: $Author: mtg $ $Date: 2001-01-10 11:36:01 $
+ * last change: $Author: mtg $ $Date: 2001-03-16 17:11:42 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -83,7 +83,7 @@ ZipPackageStream::~ZipPackageStream( void )
{
}
-void ZipPackageStream::setZipEntry( const package::ZipEntry &rInEntry)
+void ZipPackageStream::setZipEntry( const packages::ZipEntry &rInEntry)
{
aEntry.nVersion = rInEntry.nVersion;
aEntry.nFlag = rInEntry.nFlag;
@@ -135,7 +135,7 @@ void SAL_CALL ZipPackageStream::setInputStream( const uno::Reference< io::XInput
aEntry.nTime = -1;
}
-uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getRawStream( com::sun::star::package::ZipEntry &rEntry )
+uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getRawStream( com::sun::star::packages::ZipEntry &rEntry )
throw(uno::RuntimeException)
{
if (bPackageMember)
@@ -144,7 +144,7 @@ uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getRawStream( com:
{
return pZipFile->getRawStream(rEntry);
}
- catch (package::ZipException &)//rException)
+ catch (packages::ZipException &)//rException)
{
VOS_ENSURE( 0, "ZipException thrown");//rException.Message);
return uno::Reference < io::XInputStream > ();
@@ -163,7 +163,7 @@ uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getInputStream( )
{
return pZipFile->getInputStream(aEntry);
}
- catch (package::ZipException &)//rException)
+ catch (packages::ZipException &)//rException)
{
VOS_ENSURE( 0,"ZipException thrown");//rException.Message);
return uno::Reference < io::XInputStream > ();
generated by cgit (git 2.34.1) at 2024-08-12 19:00:13 +0000