diff options
| author | Douglas Mencken <dougmencken@gmail.com> | 2016-04-06 05:09:27 -0400 |
|---|---|---|
| committer | Douglas Mencken <dougmencken@gmail.com> | 2017-01-12 06:35:54 -0500 |
| commit | 8ced75f20d4fca1c033cd1ed36552b9d8c4eb020 (patch) | |
| tree | 4567a53832ff5758269b120b716920e83981bf46 | |
| parent | c3ba01091ea71a40ef5f2305fa56f39050b03058 (diff) | |
sc.filter: deal with warnings in xml/xmlwrap.cxx
bin SCWARN_IMPORT_FEATURES_LOST
Change-Id: I7bc38c15d15d541002443e26e2b0cd57b35c345d
| -rw-r--r-- | sc/inc/scerrors.hxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/xml/xmlwrap.cxx | 25 | ||||
| -rw-r--r-- | sc/source/ui/src/scerrors.src | 4 |
3 files changed, 14 insertions, 17 deletions
diff --git a/sc/inc/scerrors.hxx b/sc/inc/scerrors.hxx index 69a00d613e48..4aafab019e79 100644 --- a/sc/inc/scerrors.hxx +++ b/sc/inc/scerrors.hxx @@ -57,7 +57,7 @@ #define SCWARN_IMPORT_COLUMN_OVERFLOW ( 3 | ERRCODE_CLASS_IMPORT | ERRCODE_WARNING_MASK | ERRCODE_AREA_SC ) #define SCWARN_IMPORT_SHEET_OVERFLOW ( 4 | ERRCODE_CLASS_IMPORT | ERRCODE_WARNING_MASK | ERRCODE_AREA_SC ) #define SCWARN_IMPORT_CELL_OVERFLOW ( 5 | ERRCODE_CLASS_IMPORT | ERRCODE_WARNING_MASK | ERRCODE_AREA_SC ) -#define SCWARN_IMPORT_FEATURES_LOST ( 6 | ERRCODE_CLASS_IMPORT | ERRCODE_WARNING_MASK | ERRCODE_AREA_SC ) +/*#define SCWARN_IMPORT_FEATURES_LOST ( 6 | ERRCODE_CLASS_IMPORT | ERRCODE_WARNING_MASK | ERRCODE_AREA_SC )*/ // ERRCODE_CLASS_EXPORT - does not display "Write-Error" in MsgBox #define SCWARN_EXPORT_NONCONVERTIBLE_CHARS ( 1 | ERRCODE_CLASS_EXPORT | ERRCODE_WARNING_MASK | ERRCODE_AREA_SC ) diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index c6b8be184ed3..add230c91d9a 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -379,29 +379,30 @@ bool ScXMLImportWrapper::Import( ImportFlags nMode, ErrCode& rError ) // RDF metadata: ODF >= 1.2 try { - const uno::Reference< rdf::XDocumentMetadataAccess > xDMA( - xModel, uno::UNO_QUERY_THROW ); - const uno::Reference< rdf::XURI > xBaseURI( - ::sfx2::createBaseURI( xContext, xStorage, aBaseURL, aName ) ); - uno::Reference<task::XInteractionHandler> xHandler = - mrDocShell.GetMedium()->GetInteractionHandler(); - xDMA->loadMetadataFromStorage( xStorage, xBaseURI, xHandler ); + const uno::Reference< rdf::XDocumentMetadataAccess > xDMA( xModel, uno::UNO_QUERY ); + if ( xDMA.is() ) + { + const uno::Reference< rdf::XURI > xBaseURI( ::sfx2::createBaseURI( xContext, xStorage, aBaseURL, aName ) ); + uno::Reference<task::XInteractionHandler> xHandler = mrDocShell.GetMedium()->GetInteractionHandler(); + xDMA->loadMetadataFromStorage( xStorage, xBaseURI, xHandler ); + } + else + SAL_WARN( "sc.filter", "XDocumentMetadataAccess is nil, some features may be lost" ); } catch ( const lang::WrappedTargetException & e) { ucb::InteractiveAugmentedIOException iaioe; if ( e.TargetException >>= iaioe ) { + SAL_WARN( "sc.filter", "caught ucb::InteractiveAugmentedIOException" ); rError = SCERR_IMPORT_UNKNOWN; } else - { - rError = SCWARN_IMPORT_FEATURES_LOST; - } + SAL_WARN( "sc.filter", "Not all attributes could be read, some features are lost" ); } - catch ( const uno::Exception &) + catch ( ... ) { - rError = SCWARN_IMPORT_FEATURES_LOST; + SAL_WARN( "sc.filter", "caught exception" ); } } diff --git a/sc/source/ui/src/scerrors.src b/sc/source/ui/src/scerrors.src index 593ac86bfe33..e90d5527afd5 100644 --- a/sc/source/ui/src/scerrors.src +++ b/sc/source/ui/src/scerrors.src @@ -170,10 +170,6 @@ Resource RID_ERRHDLSC { Text [ en-US ] = "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(row,col)."; }; - String SCWARN_IMPORT_FEATURES_LOST & ERRCODE_RES_MASK - { - Text [ en-US] = "Not all attributes could be read." ; - }; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |