summaryrefslogtreecommitdiff
path: root/comphelper/inc/comphelper
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-08-23 08:33:10 +0200
committerStephan Bergmann <sbergman@redhat.com>2012-08-23 09:58:25 +0200
commitfcd990f208be4430157dca2d6093337f21cb079b (patch)
tree8b132e4081b8f4d9cc4f8aa71f6d937d4f65ef03 /comphelper/inc/comphelper
parent3e7990faa4dda6022c63aebb2ac8f12b2bbc0731 (diff)
Some clean up after previous commit
Change-Id: Ie419c769c5d661d51c1b43b9808791dcf9e1725c
Diffstat (limited to 'comphelper/inc/comphelper')
-rw-r--r--comphelper/inc/comphelper/storagehelper.hxx21
1 files changed, 13 insertions, 8 deletions
diff --git a/comphelper/inc/comphelper/storagehelper.hxx b/comphelper/inc/comphelper/storagehelper.hxx
index f255dc842fb5..f26f997cc2f3 100644
--- a/comphelper/inc/comphelper/storagehelper.hxx
+++ b/comphelper/inc/comphelper/storagehelper.hxx
@@ -24,13 +24,7 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/embed/XStorage.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
-#include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/io/XStream.hpp>
#include "comphelper/comphelperdllapi.h"
@@ -42,6 +36,18 @@
#define PACKAGE_ENCRYPTIONDATA_SHA1UTF8 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PackageSHA1UTF8EncryptionKey" ) )
#define PACKAGE_ENCRYPTIONDATA_SHA1MS1252 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PackageSHA1MS1252EncryptionKey" ) )
+namespace com { namespace sun { namespace star {
+ namespace beans { struct NamedValue; }
+ namespace embed { class XStorage; }
+ namespace io {
+ class XInputStream;
+ class XOutputStream;
+ class XStream;
+ }
+ namespace lang { class XSingleServiceFactory; }
+ namespace uno { class XComponentContext; }
+} } }
+
namespace comphelper {
// Unfortunately - the impl.s of XStorage like to invalidate all
@@ -123,8 +129,7 @@ public:
static ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
GetInputStreamFromURL(
const ::rtl::OUString& aURL,
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory
- = ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >() )
+ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& context )
throw ( ::com::sun::star::uno::Exception );
static void SetCommonStorageEncryptionData(