INTEGRATION: CWS mbapp3 (1.20.12); FILE MERGED

2006/04/24 10:34:46 mav 1.20.12.1: #i64599# NoAutoSave argument
This commit is contained in:
Jens-Heiner Rechtien
2006-05-08 13:44:29 +00:00
parent 4df8331a9d
commit 2e7e9b0634

View File

@@ -4,9 +4,9 @@
*
* $RCSfile: docholder.cxx,v $
*
* $Revision: 1.21 $
* $Revision: 1.22 $
*
* last change: $Author: rt $ $Date: 2006-05-05 09:55:27 $
* last change: $Author: hr $ $Date: 2006-05-08 14:44:29 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -449,7 +449,7 @@ HRESULT DocumentHolder::InPlaceActivate(
if(xComponentLoader.is())
{
uno::Any aAny;
uno::Sequence<beans::PropertyValue> aSeq(3);
uno::Sequence<beans::PropertyValue> aSeq(4);
aAny <<= uno::Reference<uno::XInterface>(
GetDocument(),uno::UNO_QUERY);
@@ -476,6 +476,14 @@ HRESULT DocumentHolder::InPlaceActivate(
aAny,
beans::PropertyState_DIRECT_VALUE);
aAny <<= (sal_Bool) sal_True;
aSeq[3] = beans::PropertyValue(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("NoAutoSave")),
-1,
aAny,
beans::PropertyState_DIRECT_VALUE);
xComponentLoader->loadComponentFromURL(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("private:object")),
@@ -912,7 +920,7 @@ void DocumentHolder::show()
if(xComponentLoader.is())
{
uno::Sequence<beans::PropertyValue> aSeq(2);
uno::Sequence<beans::PropertyValue> aSeq(3);
uno::Any aAny;
aAny <<= uno::Reference<uno::XInterface>(
@@ -932,6 +940,15 @@ void DocumentHolder::show()
aAny,
beans::PropertyState_DIRECT_VALUE);
aAny <<= (sal_Bool) sal_True;
aSeq[2] = beans::PropertyValue(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("NoAutoSave")),
-1,
aAny,
beans::PropertyState_DIRECT_VALUE);
xComponentLoader->loadComponentFromURL(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("private:object")),