From cab5583c4dbf8a4fda776ddcd16ed1e370a5b3ed Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Wed, 1 Nov 2006 15:22:21 +0000 Subject: INTEGRATION: CWS npower3 (1.113.10); FILE MERGED 2006/10/09 09:24:59 mav 1.113.10.7: #i64377# move the warning handling in central place 2006/10/05 10:00:29 npower 1.113.10.6: #i64377# fixup some added/removed lines to make diffs more pleasant 2006/10/05 08:04:48 npower 1.113.10.5: #i64377# move ModuleSizeExceeded implementation into its own source file 2006/10/04 18:22:32 npower 1.113.10.4: #i64377# reflect changes to css::script::ModuleSizeExceededRequest also remove definition of ModuleSizeExceeded from sfxbasemodule 2006/09/29 10:26:39 npower 1.113.10.3: #i64377# oops logic error, normal processing and my code should not be mixed 2006/09/28 22:54:26 npower 1.113.10.2: RESYNC: (1.113-1.116); FILE MERGED 2006/09/28 16:28:17 npower 1.113.10.1: #i64377# added check to raise warning via interaction handler to sfxbasemodel::storeSelf & sfxbasemodel::impl_store for pasword protected libraries --- sfx2/source/doc/sfxbasemodel.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sfx2') diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 829ea82e6084..0045b48d0730 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -4,9 +4,9 @@ * * $RCSfile: sfxbasemodel.cxx,v $ * - * $Revision: 1.117 $ + * $Revision: 1.118 $ * - * last change: $Author: obo $ $Date: 2006-10-12 15:56:47 $ + * last change: $Author: vg $ $Date: 2006-11-01 16:22:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -3417,6 +3417,7 @@ void SfxBaseModel::impl_store( const OUSTRING& sURL TransformParameters( SID_SAVEASDOC, seqArguments, *aParams ); SFX_ITEMSET_ARG( aParams, pCopyStreamItem, SfxBoolItem, SID_COPY_STREAM_IF_POSSIBLE, sal_False ); + if ( pCopyStreamItem && pCopyStreamItem->GetValue() && !bSaveTo ) throw ILLEGALARGUMENTIOEXCEPTION( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CopyStreamIfPossible parameter is not acceptable for storeAsURL() call!") ), -- cgit