summaryrefslogtreecommitdiff
path: root/package/inc
diff options
context:
space:
mode:
authorMikhail Voytenko <mav@openoffice.org>2010-04-13 10:20:02 +0200
committerMikhail Voytenko <mav@openoffice.org>2010-04-13 10:20:02 +0200
commit8d92fa14a00c9bf63a6fd39f58a7bc49aff3a05b (patch)
tree9810009cf7b2c317c3651b3bbc0444c3fccba946 /package/inc
parentad157a9cb3ecfb54147834a5f2592636ae6cac32 (diff)
fwk138: #i87496# Use the UNO constants
Diffstat (limited to 'package/inc')
-rw-r--r--package/inc/PackageConstants.hxx4
-rw-r--r--package/inc/ZipPackage.hxx2
2 files changed, 1 insertions, 5 deletions
diff --git a/package/inc/PackageConstants.hxx b/package/inc/PackageConstants.hxx
index e088dceef126..a23a22fcb888 100644
--- a/package/inc/PackageConstants.hxx
+++ b/package/inc/PackageConstants.hxx
@@ -33,10 +33,6 @@ const sal_Int32 n_ConstBufferSize = 32768;
const sal_Int32 n_ConstMaxMemoryStreamSize = 20480;
const sal_Int32 n_ConstDigestLength = 1024;
-#define PACKAGE_FORMAT 1
-#define ZIP_FORMAT 2
-#define OFOPXML_FORMAT 3
-
// the constants related to the manifest.xml entries
#define PKG_MNFST_MEDIATYPE 0
#define PKG_MNFST_VERSION 1
diff --git a/package/inc/ZipPackage.hxx b/package/inc/ZipPackage.hxx
index 367bd1d80de5..b46fc46b7b2f 100644
--- a/package/inc/ZipPackage.hxx
+++ b/package/inc/ZipPackage.hxx
@@ -93,7 +93,7 @@ protected:
sal_Bool m_bForceRecovery;
sal_Bool m_bMediaTypeFallbackUsed;
- sal_Int16 m_nFormat;
+ sal_Int32 m_nFormat;
sal_Bool m_bAllowRemoveOnInsert;
InitialisationMode m_eMode;