summaryrefslogtreecommitdiff
path: root/comphelper/inc
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-04-15 13:22:08 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-04-15 13:22:08 +0000
commitd7c3c8537e8a1fb1610f23ce7ad20fb6b51f32b3 (patch)
tree7407f4c2739b7692695d32732d0a8014bd689019 /comphelper/inc
parent59a60f289235e5aee13144ccaf6a339f1b056cf1 (diff)
INTEGRATION: CWS calcshare2 (1.12.78); FILE MERGED
2008/03/14 19:36:21 mav 1.12.78.1: #i85794# new file locking prototype
Diffstat (limited to 'comphelper/inc')
-rw-r--r--comphelper/inc/comphelper/mediadescriptor.hxx17
1 files changed, 14 insertions, 3 deletions
diff --git a/comphelper/inc/comphelper/mediadescriptor.hxx b/comphelper/inc/comphelper/mediadescriptor.hxx
index 0cd9cb147826..3e10fae98c24 100644
--- a/comphelper/inc/comphelper/mediadescriptor.hxx
+++ b/comphelper/inc/comphelper/mediadescriptor.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: mediadescriptor.hxx,v $
- * $Revision: 1.13 $
+ * $Revision: 1.14 $
*
* This file is part of OpenOffice.org.
*
@@ -149,10 +149,16 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
A might existing InteractionHandler will be used automaticly,
to solve problems!
+ @param bLockFile
+ specifies whether the file should be locked
+
@return TRUE, if the stream was already part of the descriptor or could
be created as new item. FALSE otherwhise.
*/
+ // HACK: IT SHOULD BE ONLY ONE METHOD, THE TEMPORARY SOLUTION ALLOWS TO AVOID INCOMPATIBLE BUILD
+ sal_Bool addInputStream_Impl( sal_Bool bLockFile );
sal_Bool addInputStream();
+ sal_Bool addInputStreamNoLock();
//---------------------------------------
/** @short it checks if the descriptor describes a readonly stream.
@@ -215,14 +221,19 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
@param sURL
the URL for open.
+ @param bLockFile
+ specifies whether the file should be locked
+
@return TRUE if the stream could be added successfully.
Note: If FALSE is returned, the error was already handled inside!
@throw [css::uno::RuntimeException]
if the MediaDescriptor seems to be invalid!
*/
- COMPHELPER_DLLPRIVATE sal_Bool impl_openStreamWithURL(const ::rtl::OUString& sURL)
- throw(::com::sun::star::uno::RuntimeException);
+ COMPHELPER_DLLPRIVATE sal_Bool impl_openStreamWithURL(
+ const ::rtl::OUString& sURL,
+ sal_Bool bLockFile
+ ) throw(::com::sun::star::uno::RuntimeException);
//---------------------------------------
/** @short some URL parts can make trouble for opening streams (e.g. jumpmarks.)