diff options
| author | Frank Schönheit <fs@openoffice.org> | 2002-04-10 06:58:39 +0000 |
|---|---|---|
| committer | Frank Schönheit <fs@openoffice.org> | 2002-04-10 06:58:39 +0000 |
| commit | 113e19e0e21dc8720801775ee985c633c1982595 (patch) | |
| tree | b5b97787c46613dbb9f80994341af1f09796eca8 /xmloff | |
| parent | 8e409f615debd1fa52fc3f1cb4b6c5e992f9b298 (diff) | |
#98553# allow for empty document model - happens when copy'n'pasting form controls between documents
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/forms/officeforms.cxx | 41 |
1 files changed, 25 insertions, 16 deletions
diff --git a/xmloff/source/forms/officeforms.cxx b/xmloff/source/forms/officeforms.cxx index 0ddc9c4a9c0a..22c97ffe5c80 100644 --- a/xmloff/source/forms/officeforms.cxx +++ b/xmloff/source/forms/officeforms.cxx @@ -2,9 +2,9 @@ * * $RCSfile: officeforms.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mtg $ $Date: 2001-07-10 17:07:05 $ + * last change: $Author: fs $ $Date: 2002-04-10 07:58:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -148,13 +148,16 @@ namespace xmloff try { Reference< XPropertySet > xDocProperties(GetImport().GetModel(), UNO_QUERY); - OSL_ENSURE(xDocProperties.is(), "OFormsRootImport::StartElement: invalid document model!"); - Reference< XPropertySetInfo > xDocPropInfo; - if (xDocProperties.is()) - xDocPropInfo = xDocProperties->getPropertySetInfo(); - - implImportBool(_rxAttrList, ofaAutomaticFocus, xDocProperties, xDocPropInfo, PROPERTY_AUTOCONTROLFOCUS, sal_False); - implImportBool(_rxAttrList, ofaApplyDesignMode, xDocProperties, xDocPropInfo, PROPERTY_APPLYDESIGNMODE, sal_True); + if ( xDocProperties.is() ) + { // an empty model is allowed: when doing a copy'n'paste from e.g. Writer to Calc, + // this is done via streaming the controls as XML. + Reference< XPropertySetInfo > xDocPropInfo; + if (xDocProperties.is()) + xDocPropInfo = xDocProperties->getPropertySetInfo(); + + implImportBool(_rxAttrList, ofaAutomaticFocus, xDocProperties, xDocPropInfo, PROPERTY_AUTOCONTROLFOCUS, sal_False); + implImportBool(_rxAttrList, ofaApplyDesignMode, xDocProperties, xDocPropInfo, PROPERTY_APPLYDESIGNMODE, sal_True); + } } catch(Exception&) { @@ -207,13 +210,16 @@ namespace xmloff try { Reference< XPropertySet > xDocProperties(_rExp.GetModel(), UNO_QUERY); - OSL_ENSURE(xDocProperties.is(), "OFormsRootExport::addModelAttributes: invalid document model!"); - Reference< XPropertySetInfo > xDocPropInfo; - if (xDocProperties.is()) - xDocPropInfo = xDocProperties->getPropertySetInfo(); - - implExportBool(_rExp, ofaAutomaticFocus, xDocProperties, xDocPropInfo, PROPERTY_AUTOCONTROLFOCUS, sal_False); - implExportBool(_rExp, ofaApplyDesignMode, xDocProperties, xDocPropInfo, PROPERTY_APPLYDESIGNMODE, sal_True); + if ( xDocProperties.is() ) + { // an empty model is allowed: when doing a copy'n'paste from e.g. Writer to Calc, + // this is done via streaming the controls as XML. + Reference< XPropertySetInfo > xDocPropInfo; + if (xDocProperties.is()) + xDocPropInfo = xDocProperties->getPropertySetInfo(); + + implExportBool(_rExp, ofaAutomaticFocus, xDocProperties, xDocPropInfo, PROPERTY_AUTOCONTROLFOCUS, sal_False); + implExportBool(_rExp, ofaApplyDesignMode, xDocProperties, xDocPropInfo, PROPERTY_APPLYDESIGNMODE, sal_True); + } } catch(Exception&) { @@ -228,6 +234,9 @@ namespace xmloff /************************************************************************* * history: * $Log: not supported by cvs2svn $ + * Revision 1.3 2001/07/10 17:07:05 mtg + * updated namespace handling + * * Revision 1.2 2001/06/29 21:07:14 dvo * #86004# changes sXML_* strings to XML_* tokens * |