diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-29 16:21:54 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-04 15:18:00 +0200 |
commit | 2c05d758b2b62c9df413e2514fb3cd233d0f3ec7 (patch) | |
tree | e0a23d3da6fb17ae97d18957fc14f4a4a8de2d3f /sfx2 | |
parent | a3088b1e72ef17babe3d3664c610afd02cfe0891 (diff) |
add << operator for css::uno::Exception
Change-Id: Ia23dafd07133779144965682df3b7125a3214235
Reviewed-on: https://gerrit.libreoffice.org/43046
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/appl/appserv.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/bastyp/helper.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/control/thumbnailview.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/dialog/backingwindow.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/SfxDocumentMetaData.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/docfile.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/doc/doctemplates.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/guisaveas.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/doc/objcont.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/objxtor.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/sidebar/PanelTitleBar.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/sidebar/SidebarController.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/sidebar/Theme.cxx | 3 | ||||
-rw-r--r-- | sfx2/source/view/classificationhelper.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/view/ipclient.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/view/viewsh.cxx | 2 |
16 files changed, 29 insertions, 32 deletions
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index b0ad59f5e7c0..17b71fde7269 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -180,9 +180,7 @@ namespace } catch (Exception & e) { - SAL_INFO( - "sfx.appl", - "assuming Base to be missing; caught " << e.Message); + SAL_INFO("sfx.appl", "assuming Base to be missing; caught " << e); return false; } } @@ -207,7 +205,7 @@ namespace { SAL_INFO( "sfx.appl", - "trying to install LibreOffice Base, caught " << e.Message); + "trying to install LibreOffice Base, caught " << e); } return; } @@ -223,7 +221,7 @@ namespace catch (const Exception & e) { SAL_INFO( "sfx.appl", - "trying to load bibliography database, caught " << e.Message); + "trying to load bibliography database, caught " << e); } } } diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx index 62126dd0d6f8..51fa98d4af4e 100644 --- a/sfx2/source/bastyp/helper.cxx +++ b/sfx2/source/bastyp/helper.cxx @@ -116,7 +116,7 @@ std::vector<OUString> SfxContentHelper::GetResultSet( const OUString& rURL ) } catch( const uno::Exception& e ) { - SAL_WARN( "sfx.bastyp", "GetResultSet: Any other exception: " << e.Message ); + SAL_WARN( "sfx.bastyp", "GetResultSet: " << e ); } return aList; diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index badda16bd1a6..b79d3b02d947 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -1256,7 +1256,7 @@ BitmapEx ThumbnailView::readThumbnail(const OUString &msURL) { SAL_WARN("sfx", "caught exception while trying to access Thumbnail/thumbnail.png of " - << msURL << ": " << rException.Message); + << msURL << ": " << rException); } try @@ -1283,14 +1283,14 @@ BitmapEx ThumbnailView::readThumbnail(const OUString &msURL) { SAL_WARN("sfx", "caught exception while trying to access Thumbnails/thumbnail.png of " - << msURL << ": " << rException.Message); + << msURL << ": " << rException); } } catch (const uno::Exception& rException) { SAL_WARN("sfx", "caught exception while trying to access thumbnail of " - << msURL << ": " << rException.Message); + << msURL << ": " << rException); } // Extract the image from the stream. diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index 3ca873ed74e5..8966a27face4 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -131,7 +131,7 @@ BackingWindow::BackingWindow( vcl::Window* i_pParent ) : } catch (const Exception& e) { - SAL_WARN( "fwk", "BackingWindow - caught an exception! " << e.Message ); + SAL_WARN( "fwk", "BackingWindow - caught an exception! " << e ); } // fdo#34392: we do the layout dynamically, the layout depends on the font, diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx index f3e6c5124024..93b93eb1b5a3 100644 --- a/sfx2/source/doc/SfxDocumentMetaData.cxx +++ b/sfx2/source/doc/SfxDocumentMetaData.cxx @@ -2039,7 +2039,7 @@ void SAL_CALL SfxDocumentMetaData::setModified( sal_Bool bModified ) throw; } catch (const css::uno::Exception & e) { // ignore - SAL_WARN("sfx.doc", "setModified: exception: " << e.Message); + SAL_WARN("sfx.doc", "setModified: " << e); } } else { if (xMB.is()) { diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 7437c66ee8ed..a7dc38a6bd7c 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -2102,7 +2102,7 @@ void SfxMedium::Transfer_Impl() } catch ( css::uno::Exception & e ) { - SAL_WARN( "sfx.doc", "LOCK not working while re-issuing it. Exception message: " << e.Message ); + SAL_WARN( "sfx.doc", "LOCK not working while re-issuing it. Exception message: " << e ); } } catch ( const css::ucb::CommandAbortedException& ) @@ -3532,7 +3532,7 @@ bool SfxMedium::SignContents_Impl( bool bScriptingContent, const OUString& aODFV catch (const io::IOException& rException) { if (bODF) - SAL_WARN("sfx.doc", "ODF stream is not a zip storage: " << rException.Message); + SAL_WARN("sfx.doc", "ODF stream is not a zip storage: " << rException); } if ( !xWriteableZipStor.is() && bODF ) diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index 7181a5db9fcb..4c6eed134cb1 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -431,7 +431,7 @@ void SfxDocTplService_Impl::init_Impl() ::comphelper::getProcessComponentContext())); } catch (uno::RuntimeException const& e) { SAL_WARN("sfx.doc", "SfxDocTplService_Impl::init_Impl: " - "cannot create DocumentProperties service:" << e.Message); + "cannot create DocumentProperties service:" << e); } OUString const aService = SERVICENAME_TYPEDETECTION; diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 86a02dc5dd8f..d733ac619fe4 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -649,7 +649,7 @@ bool ModelData_Impl::ExecuteFilterDialog_Impl( const OUString& aFilterName ) } catch( const uno::Exception& e ) { - SAL_WARN("sfx.doc", "ignoring UNO exception " << e.Message); + SAL_WARN("sfx.doc", "ignoring " << e); } return bDialogUsed; @@ -1413,7 +1413,7 @@ bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >& xMo catch (const lang::IllegalArgumentException& e) { SAL_WARN("sfx.doc", "Ignoring parameters! " - "ModelData considers this illegal: " << e.Message); + "ModelData considers this illegal: " << e); aModelData.GetStorable()->store(); } } @@ -1783,7 +1783,7 @@ void SfxStoringHelper::SetDocInfoState( } catch (const uno::Exception& e) { - SAL_INFO("sfx.doc", "SetDocInfoState: caught exception: " << e.Message); + SAL_INFO("sfx.doc", "SetDocInfoState: caught " << e); } // set the modified flag back if required diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index ddbd8a9d90bc..e213dadcca68 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -444,7 +444,7 @@ void SfxObjectShell::UpdateFromTemplate_Impl( ) } catch (const Exception& e) { - SAL_INFO("sfx.doc", "caught exception" << e.Message); + SAL_INFO("sfx.doc", e); } // if modify date was read successfully diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index a9da93c3187c..738ea5e10f71 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -662,7 +662,7 @@ BasicManager* SfxObjectShell::GetBasicManager() const } catch (const css::ucb::ContentCreationException& e) { - SAL_WARN("sfx.doc", "caught exception " << e.Message); + SAL_WARN("sfx.doc", "caught " << e); } #endif return pBasMgr; @@ -729,7 +729,7 @@ Reference< XLibraryContainer > SfxObjectShell::GetDialogContainer() } catch (const css::ucb::ContentCreationException& e) { - SAL_WARN("sfx.doc", "caught exception " << e.Message); + SAL_WARN("sfx.doc", "caught " << e); } SAL_WARN("sfx.doc", "SfxObjectShell::GetDialogContainer: falling back to the application - is this really expected here?"); @@ -753,7 +753,7 @@ Reference< XLibraryContainer > SfxObjectShell::GetBasicContainer() } catch (const css::ucb::ContentCreationException& e) { - SAL_WARN("sfx.doc", "caught exception " << e.Message); + SAL_WARN("sfx.doc", "caught " << e); } } SAL_WARN("sfx.doc", "SfxObjectShell::GetBasicContainer: falling back to the application - is this really expected here?"); @@ -816,7 +816,7 @@ void SfxObjectShell::InitBasicManager_Impl() } catch (const css::ucb::ContentCreationException& e) { - SAL_WARN("sfx.doc", "caught exception " << e.Message); + SAL_WARN("sfx.doc", "caught " << e); } DBG_ASSERT( pImpl->aBasicManager.isValid(), "SfxObjectShell::InitBasicManager_Impl: did not get a BasicManager!" ); pImpl->bBasicInitialized = true; diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx index 730c7617d107..59878135319f 100644 --- a/sfx2/source/sidebar/PanelTitleBar.cxx +++ b/sfx2/source/sidebar/PanelTitleBar.cxx @@ -148,7 +148,7 @@ void PanelTitleBar::HandleToolBoxItemClick (const sal_uInt16 nItemIndex) } catch(Exception& rException) { - SAL_WARN("sfx", "caught exception: " << rException.Message); + SAL_WARN("sfx", "caught " << rException); } } } diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index a2b01d2635c3..caa2741ae324 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -857,7 +857,7 @@ Reference<ui::XUIElement> SidebarController::CreateUIElement ( } catch(const Exception& rException) { - SAL_WARN("sfx.sidebar", "Cannot create panel " << rsImplementationURL << ": " << rException.Message); + SAL_WARN("sfx.sidebar", "Cannot create panel " << rsImplementationURL << ": " << rException); return nullptr; } } diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx index 6b130d984545..315bf057d21c 100644 --- a/sfx2/source/sidebar/Theme.cxx +++ b/sfx2/source/sidebar/Theme.cxx @@ -16,6 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ + #include <sfx2/sidebar/Theme.hxx> #include <sfx2/sidebar/Paint.hxx> #include <sfx2/sidebar/Tools.hxx> @@ -336,7 +337,7 @@ void Theme::UpdateTheme() } catch(beans::UnknownPropertyException& rException) { - SAL_WARN("sfx", "unknown property: " << rException.Message); + SAL_WARN("sfx", "unknown property: " << rException); OSL_ASSERT(false); } } diff --git a/sfx2/source/view/classificationhelper.cxx b/sfx2/source/view/classificationhelper.cxx index 3cff7ae172db..aa61839c06e6 100644 --- a/sfx2/source/view/classificationhelper.cxx +++ b/sfx2/source/view/classificationhelper.cxx @@ -392,7 +392,7 @@ void SfxClassificationHelper::Impl::parsePolicy() } catch (const xml::sax::SAXParseException& rException) { - SAL_WARN("sfx.view", "parsePolicy() failed: " << rException.Message); + SAL_WARN("sfx.view", "parsePolicy() failed: " << rException); } m_aCategories = xClassificationParser->m_aCategories; m_aMarkings = xClassificationParser->m_aMarkings; @@ -450,7 +450,7 @@ void SfxClassificationHelper::Impl::pushToDocumentProperties() } catch (const uno::Exception& rException) { - SAL_WARN("sfx.view", "pushDocumentProperties() failed for property " << rLabel.first << ": " << rException.Message); + SAL_WARN("sfx.view", "pushDocumentProperties() failed for property " << rLabel.first << ": " << rException); } } } diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index f0ec0e2e7f48..78756c693762 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -954,9 +954,7 @@ ErrCode SfxInPlaceClient::DoVerb( long nVerb ) } catch (uno::Exception const& e) { - SAL_WARN("embeddedobj", "SfxInPlaceClient::DoVerb:" - " -9 fallback path: exception caught: " - << e.Message); + SAL_WARN("embeddedobj", "SfxInPlaceClient::DoVerb: -9 fallback path: " << e); nError = ERRCODE_SO_GENERALERROR; } } @@ -969,7 +967,7 @@ ErrCode SfxInPlaceClient::DoVerb( long nVerb ) catch (uno::Exception const& e) { SAL_WARN("embeddedobj", "SfxInPlaceClient::DoVerb:" - " exception caught: " << e.Message); + " exception caught: " << e); nError = ERRCODE_SO_GENERALERROR; //TODO/LATER: better error handling diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 80c91ef25b7c..f39c71d02691 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -1635,7 +1635,7 @@ void SfxViewShell::CheckIPClient_Impl( } catch (const uno::Exception& e) { - SAL_WARN("sfx.view", "SfxViewShell::CheckIPClient_Impl exception: " << e.Message); + SAL_WARN("sfx.view", "SfxViewShell::CheckIPClient_Impl: " << e); } } } |