summaryrefslogtreecommitdiff
path: root/svx/source
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2005-01-14 11:05:07 +0000
committerKurt Zenker <kz@openoffice.org>2005-01-14 11:05:07 +0000
commit5b56e0bce494c440bf5cbec756efaf81088d1fc9 (patch)
treeb7fc3667390983666b0b70458e9f553da73b2814 /svx/source
parent474fc7f8b50d78a67a2ee803c2e20ce09837cf13 (diff)
INTEGRATION: CWS impress25 (1.10.54); FILE MERGED
2004/12/10 13:24:58 cl 1.10.54.1: removed not needed assertion
Diffstat (limited to 'svx/source')
-rw-r--r--svx/source/xml/xmlxtimp.cxx10
1 files changed, 7 insertions, 3 deletions
diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx
index 13e3805b7d3e..b1af7bf783a3 100644
--- a/svx/source/xml/xmlxtimp.cxx
+++ b/svx/source/xml/xmlxtimp.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: xmlxtimp.cxx,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: rt $ $Date: 2005-01-11 14:34:19 $
+ * last change: $Author: kz $ $Date: 2005-01-14 12:05:06 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -486,7 +486,11 @@ sal_Bool SvxXMLXTableImport::load( const OUString& rUrl, const Reference< XNameC
}
catch( uno::Exception& )
{
- DBG_ERROR("svx::SvxXMLXTableImport::load(), exception caught!");
+// CL: I disabled this assertion since its an error, but it happens
+// each time you load a document with property tables that are not
+// on the current machine. Maybe a better fix would be to place
+// a file exists check before importing...
+// DBG_ERROR("svx::SvxXMLXTableImport::load(), exception caught!");
bRet = sal_False;
}