diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-26 10:58:42 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-28 19:44:08 +0200 |
| commit | ef513fd4b049b214a03fbe6e62a5ea43680a7a9b (patch) | |
| tree | 82f2ce93bc8e5fde6dce8685b633c3d643c9f069 /include | |
| parent | rdm#2247 enable Upper Sorbian for languagepack/UI (diff) | |
| download | core-ef513fd4b049b214a03fbe6e62a5ea43680a7a9b.tar.gz core-ef513fd4b049b214a03fbe6e62a5ea43680a7a9b.zip | |
remove unnecessary use of OString::getStr
Change-Id: I0490efedf459190521f4339854b3394d57765fdb
Reviewed-on: https://gerrit.libreoffice.org/38058
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sal/log-areas.dox | 4 | ||||
| -rw-r--r-- | include/toolkit/helper/macros.hxx | 4 | ||||
| -rw-r--r-- | include/vcl/builder.hxx | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox index 8acbf3f62a0f..4a8c692e061d 100644 --- a/include/sal/log-areas.dox +++ b/include/sal/log-areas.dox @@ -193,6 +193,7 @@ certain functionality. @li @c extensions.config @li @c extensions.dbpilots @li @c extensions.evoab +@li @c extensions.logging @li @c extensions.olebridge - OLE automation bridge @li @c extensions.plugin @li @c extensions.propctrlr @@ -234,6 +235,7 @@ certain functionality. @li @c forms.misc @li @c forms.richtext @li @c forms.runtime +@li @c forms.xforms @section formula @@ -562,6 +564,7 @@ certain functionality. @li @c drawinglayer @li @c dtrans @li @c helpcompiler +@li @c idl @li @c javaunohelper @li @c jvmaccess @li @c lingucomponent @@ -581,6 +584,7 @@ certain functionality. @li @c stoc @li @c store @li @c svg +@li @c svgio @li @c test @li @c ucbhelper @li @c unodevtools diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx index 8df7340912b2..ab9b0f4b3739 100644 --- a/include/toolkit/helper/macros.hxx +++ b/include/toolkit/helper/macros.hxx @@ -126,9 +126,7 @@ void ClassName::disposing( const css::lang::EventObject& ) \ #if OSL_DEBUG_LEVEL > 0 #define DISPLAY_EXCEPTION( ClassName, MethodName, e ) \ - OString sMessage( #ClassName "::" #MethodName ": caught an exception!\n" ); \ - sMessage += OString( e.Message.getStr(), e.Message.getLength(), RTL_TEXTENCODING_ASCII_US ); \ - OSL_FAIL( sMessage.getStr() ); + SAL_WARN( "toolkit", #ClassName "::" #MethodName ": caught an exception! " << e.Message); #else #define DISPLAY_EXCEPTION( ClassName, MethodName, e ) (void)e; #endif diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx index 0695af5cd25a..248dc5d4689a 100644 --- a/include/vcl/builder.hxx +++ b/include/vcl/builder.hxx @@ -412,9 +412,9 @@ template <typename T> inline T* VclBuilder::get(VclPtr<T>& ret, const OString& sID) { vcl::Window *w = get_by_name(sID); - SAL_WARN_IF(!w, "vcl.layout", "widget \"" << sID.getStr() << "\" not found in .ui"); + SAL_WARN_IF(!w, "vcl.layout", "widget \"" << sID << "\" not found in .ui"); SAL_WARN_IF(!dynamic_cast<T*>(w), - "vcl.layout", ".ui widget \"" << sID.getStr() << "\" needs to correspond to vcl type " << typeid(T).name()); + "vcl.layout", ".ui widget \"" << sID << "\" needs to correspond to vcl type " << typeid(T).name()); assert(w); assert(dynamic_cast<T*>(w)); ret = static_cast<T*>(w); @@ -427,7 +427,7 @@ inline T* VclBuilder::get(const OString& sID) { vcl::Window *w = get_by_name(sID); SAL_WARN_IF(w && !dynamic_cast<T*>(w), - "vcl.layout", ".ui widget \"" << sID.getStr() << "\" needs to correspond to vcl type " << typeid(T).name()); + "vcl.layout", ".ui widget \"" << sID << "\" needs to correspond to vcl type " << typeid(T).name()); assert(!w || dynamic_cast<T*>(w)); return static_cast<T*>(w); } |