From ebc0a15515c2e29259a7e229cfbdfb5d26fc3006 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 28 May 2014 12:50:02 +0200 Subject: remove more unnecesary OUString constructor use when throwing exceptions Change-Id: I6edfb6b6745499f802b0e3c0e096a36fb7c32aac --- sdext/source/presenter/PresenterPaneBase.cxx | 18 +++++++++--------- sdext/source/presenter/PresenterPaneBorderManager.cxx | 4 ++-- sdext/source/presenter/PresenterSlidePreview.cxx | 5 ++--- 3 files changed, 13 insertions(+), 14 deletions(-) (limited to 'sdext') diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx index 3c0b103666d5..9ecd430cb487 100644 --- a/sdext/source/presenter/PresenterPaneBase.cxx +++ b/sdext/source/presenter/PresenterPaneBase.cxx @@ -171,7 +171,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence& rArguments) if ( ! mxComponentContext.is()) { throw RuntimeException( - OUString("PresenterSpritePane: missing component context"), + "PresenterSpritePane: missing component context", static_cast(this)); } @@ -183,7 +183,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence& rArguments) if ( ! (rArguments[0] >>= mxPaneId)) { throw lang::IllegalArgumentException( - OUString("PresenterPane: invalid pane id"), + "PresenterPane: invalid pane id", static_cast(this), 0); } @@ -191,7 +191,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence& rArguments) if ( ! (rArguments[1] >>= mxParentWindow)) { throw lang::IllegalArgumentException( - OUString("PresenterPane: invalid parent window"), + "PresenterPane: invalid parent window", static_cast(this), 1); } @@ -200,7 +200,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence& rArguments) if ( ! (rArguments[2] >>= xParentCanvas)) { throw lang::IllegalArgumentException( - OUString("PresenterPane: invalid parent canvas"), + "PresenterPane: invalid parent canvas", static_cast(this), 2); } @@ -208,7 +208,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence& rArguments) if ( ! (rArguments[3] >>= msTitle)) { throw lang::IllegalArgumentException( - OUString("PresenterPane: invalid title"), + "PresenterPane: invalid title", static_cast(this), 3); } @@ -216,7 +216,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence& rArguments) if ( ! (rArguments[4] >>= mxBorderPainter)) { throw lang::IllegalArgumentException( - OUString("PresenterPane: invalid border painter"), + "PresenterPane: invalid border painter", static_cast(this), 4); } @@ -225,7 +225,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence& rArguments) if (rArguments.getLength()>5 && ! (rArguments[5] >>= bIsWindowVisibleOnCreation)) { throw lang::IllegalArgumentException( - OUString("PresenterPane: invalid window visibility flag"), + "PresenterPane: invalid window visibility flag", static_cast(this), 5); } @@ -253,7 +253,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence& rArguments) else { throw RuntimeException( - OUString("PresenterSpritePane: invalid number of arguments"), + "PresenterSpritePane: invalid number of arguments", static_cast(this)); } } @@ -447,7 +447,7 @@ void PresenterPaneBase::ThrowIfDisposed (void) if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - OUString( "PresenterPane object has already been disposed"), + "PresenterPane object has already been disposed", static_cast(this)); } } diff --git a/sdext/source/presenter/PresenterPaneBorderManager.cxx b/sdext/source/presenter/PresenterPaneBorderManager.cxx index 48f9e805a71b..74a6372b8791 100644 --- a/sdext/source/presenter/PresenterPaneBorderManager.cxx +++ b/sdext/source/presenter/PresenterPaneBorderManager.cxx @@ -242,7 +242,7 @@ void SAL_CALL PresenterPaneBorderManager::initialize (const Sequence& rArgu else { throw RuntimeException( - OUString("PresenterPane: invalid number of arguments"), + "PresenterPane: invalid number of arguments", static_cast(this)); } } @@ -498,7 +498,7 @@ void PresenterPaneBorderManager::ThrowIfDisposed (void) if (rBHelper.bDisposed || rBHelper.bInDispose) { throw lang::DisposedException ( - OUString( "PresenterPaneBorderManager object has already been disposed"), + "PresenterPaneBorderManager object has already been disposed", static_cast(this)); } } diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx index 749bce9194e1..895a26587c59 100644 --- a/sdext/source/presenter/PresenterSlidePreview.cxx +++ b/sdext/source/presenter/PresenterSlidePreview.cxx @@ -68,8 +68,7 @@ PresenterSlidePreview::PresenterSlidePreview ( || ! rpPresenterController.is()) { throw RuntimeException( - OUString( - "PresenterSlidePreview can not be constructed due to empty argument"), + "PresenterSlidePreview can not be constructed due to empty argument", static_cast(this)); } @@ -393,7 +392,7 @@ void PresenterSlidePreview::ThrowIfDisposed (void) if (PresenterSlidePreviewInterfaceBase::rBHelper.bDisposed || PresenterSlidePreviewInterfaceBase::rBHelper.bInDispose) { throw lang::DisposedException ( - OUString( "PresenterSlidePreview object has already been disposed"), + "PresenterSlidePreview object has already been disposed", static_cast(this)); } } -- cgit