diff options
| author | Daniel Rentz <dr@openoffice.org> | 2010-03-03 19:22:59 +0100 |
|---|---|---|
| committer | Daniel Rentz <dr@openoffice.org> | 2010-03-03 19:22:59 +0100 |
| commit | 486048c8e9cdee3730e087c537398816ea0343b1 (patch) | |
| tree | 5d1d893450ba094bfa4097fb620d7f49867451a7 /oox/source/xls | |
| parent | d1e7561aa828518dcbbbf78226877b4d564af2dd (diff) | |
tl78: #i109779# password2modify: preparations in oox, import from xlsx
Diffstat (limited to 'oox/source/xls')
| -rw-r--r-- | oox/source/xls/biffdetector.cxx | 3 | ||||
| -rw-r--r-- | oox/source/xls/workbooksettings.cxx | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/oox/source/xls/biffdetector.cxx b/oox/source/xls/biffdetector.cxx index c7c466f067e6..c4d125fe20e0 100644 --- a/oox/source/xls/biffdetector.cxx +++ b/oox/source/xls/biffdetector.cxx @@ -32,8 +32,8 @@ #include <algorithm> #include <rtl/strbuf.hxx> #include <com/sun/star/io/XInputStream.hpp> -#include <comphelper/mediadescriptor.hxx> #include "oox/helper/binaryinputstream.hxx" +#include "oox/helper/mediadescriptor.hxx" #include "oox/helper/olestorage.hxx" using ::rtl::OUString; @@ -47,7 +47,6 @@ using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::lang::XMultiServiceFactory; using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::io::XInputStream; -using ::comphelper::MediaDescriptor; namespace oox { namespace xls { diff --git a/oox/source/xls/workbooksettings.cxx b/oox/source/xls/workbooksettings.cxx index 3473dbcc330e..c734a5850451 100644 --- a/oox/source/xls/workbooksettings.cxx +++ b/oox/source/xls/workbooksettings.cxx @@ -32,9 +32,9 @@ #include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/sheet/XCalculatable.hpp> -#include <comphelper/mediadescriptor.hxx> #include "properties.hxx" #include "oox/helper/attributelist.hxx" +#include "oox/helper/mediadescriptor.hxx" #include "oox/helper/propertyset.hxx" #include "oox/helper/recordinputstream.hxx" #include "oox/core/filterbase.hxx" @@ -42,6 +42,7 @@ #include "oox/xls/unitconverter.hxx" using ::rtl::OUString; +using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::util::Date; @@ -299,7 +300,7 @@ void WorkbookSettings::finalizeImport() if( maFileSharing.mbRecommendReadOnly || (maFileSharing.mnPasswordHash != 0) ) getBaseFilter().getMediaDescriptor()[ CREATE_OUSTRING( "ReadOnly" ) ] <<= true; if( maFileSharing.mnPasswordHash != 0 ) - aPropSet.setProperty( PROP_WriteProtectionPassword, static_cast< sal_Int32 >( maFileSharing.mnPasswordHash ) ); + getBaseFilter().getMediaDescriptor().setComponentDataEntry( CREATE_OUSTRING( "ModifyPasswordHash" ), Any( static_cast< sal_Int32 >( maFileSharing.mnPasswordHash ) ) ); // calculation settings Date aNullDate = getNullDate(); |