summaryrefslogtreecommitdiff
path: root/embedserv/source/inc/docholder.hxx
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-01-29 14:26:20 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-01-29 14:26:20 +0000
commitafc173a6528bdd5c9e268d2ff22befc75f86f686 (patch)
tree7f8505d1a8a15789187eb61b04735f6fbca5d748 /embedserv/source/inc/docholder.hxx
parent5f5171f1db85db9ef4a5bccb820e29b4227812a9 (diff)
INTEGRATION: CWS fwk80_SRC680 (1.19.14); FILE MERGED
2008/01/02 12:24:04 mav 1.19.14.1: #i84941# use the MediaDescriptor only to handle the macro execution
Diffstat (limited to 'embedserv/source/inc/docholder.hxx')
-rw-r--r--embedserv/source/inc/docholder.hxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/embedserv/source/inc/docholder.hxx b/embedserv/source/inc/docholder.hxx
index 8a97e45936ce..bf81c12a0868 100644
--- a/embedserv/source/inc/docholder.hxx
+++ b/embedserv/source/inc/docholder.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: docholder.hxx,v $
*
- * $Revision: 1.19 $
+ * $Revision: 1.20 $
*
- * last change: $Author: vg $ $Date: 2007-03-26 14:49:50 $
+ * last change: $Author: rt $ $Date: 2008-01-29 15:26:20 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -114,6 +114,7 @@ private:
::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel > m_xDocument;
+ sal_Int16 m_nMacroExecMode;
::com::sun::star::uno::Reference<
::com::sun::star::frame::XLayoutManager> m_xLayoutManager;
@@ -138,6 +139,7 @@ private:
void ClearInterceptorInternally();
+ void LoadDocInFrame( sal_Bool bPluginMode );
public: