bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx | 10 +++++----- bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.hxx | 8 ++++---- bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx | 10 +++++----- bridges/source/cpp_uno/gcc3_linux_intel/except.cxx | 2 +- bridges/source/cpp_uno/gcc3_linux_intel/share.hxx | 6 +++--- bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx | 10 +++++----- sot/source/sdstor/storage.cxx | 10 +++++++++- vcl/source/window/cursor.cxx | 2 +- 8 files changed, 33 insertions(+), 25 deletions(-)
New commits: commit 07c7b5441251b55be72256ae8c64138eecf6cb5f Author: Michael Stahl <[email protected]> Date: Fri Dec 8 21:53:47 2017 +0100 tdf#114243 sot: catch exceptions in SotStorage::GetFormatID() This function returns an error code so it might as well convert exceptions to that for the benefit of clients like lcl_ReadSections(). Change-Id: Iccf21bf64ee81b66dd9b9902b9b952fa48a318e5 diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx index 9d19bafafedb..ac723c28e251 100644 --- a/sot/source/sdstor/storage.cxx +++ b/sot/source/sdstor/storage.cxx @@ -762,7 +762,15 @@ SotClipboardFormatId SotStorage::GetFormatID( const css::uno::Reference < css::e return SotClipboardFormatId::NONE; OUString aMediaType; - xProps->getPropertyValue("MediaType") >>= aMediaType; + try + { + xProps->getPropertyValue("MediaType") >>= aMediaType; + } + catch (uno::Exception const& e) + { + SAL_INFO("sot", "SotStorage::GetFormatID: exception: " << e); + } + if ( !aMediaType.isEmpty() ) { css::datatransfer::DataFlavor aDataFlavor; commit 9e52685ebd80130c28bfb838ba6ec4b67334085d Author: Michael Stahl <[email protected]> Date: Fri Dec 8 21:12:18 2017 +0100 bridges: [loplugin:includeform] gcc3_linux_intel Change-Id: I0a60521e893990af63d723871edcbc564b135074 diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx index 4fe126cca49d..288aeea1e0ce 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx @@ -17,14 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sal/config.h" +#include <sal/config.h> #include <cassert> -#include "cppu/macros.hxx" -#include "sal/types.h" -#include "typelib/typeclass.h" -#include "typelib/typedescription.h" +#include <cppu/macros.hxx> +#include <sal/types.h> +#include <typelib/typeclass.h> +#include <typelib/typedescription.h> #include "callvirtualmethod.hxx" #include "share.hxx" diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.hxx b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.hxx index 924c4f898846..4098b87d8984 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.hxx @@ -20,11 +20,11 @@ #ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_INTEL_CALLVIRTUALMETHOD_HXX #define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_INTEL_CALLVIRTUALMETHOD_HXX -#include "sal/config.h" +#include <sal/config.h> -#include "cppu/macros.hxx" -#include "sal/types.h" -#include "typelib/typedescription.h" +#include <cppu/macros.hxx> +#include <sal/types.h> +#include <typelib/typedescription.h> namespace CPPU_CURRENT_NAMESPACE { diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx index 31d03151c7ad..5fb2c013959c 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx @@ -19,15 +19,15 @@ #include <com/sun/star/uno/genfunc.hxx> -#include "com/sun/star/uno/RuntimeException.hpp" +#include <com/sun/star/uno/RuntimeException.hpp> #include <sal/log.hxx> #include <uno/data.h> #include <typelib/typedescription.hxx> -#include "bridge.hxx" -#include "cppinterfaceproxy.hxx" -#include "types.hxx" -#include "vtablefactory.hxx" +#include <bridge.hxx> +#include <cppinterfaceproxy.hxx> +#include <types.hxx> +#include <vtablefactory.hxx> #include "call.hxx" #include "share.hxx" diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx index 6bbcfb2565c1..8e9ed1e0d868 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx @@ -27,7 +27,7 @@ #include <sal/log.hxx> #include <com/sun/star/uno/genfunc.hxx> -#include "com/sun/star/uno/RuntimeException.hpp" +#include <com/sun/star/uno/RuntimeException.hpp> #include <typelib/typedescription.hxx> #include <unordered_map> #include "share.hxx" diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx b/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx index d167bf25c584..7b0743eec32c 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sal/config.h" +#include <sal/config.h> #include <typeinfo> #include <exception> @@ -29,9 +29,9 @@ #endif #include <unwind.h> -#include "config_cxxabi.h" +#include <config_cxxabi.h> #include <uno/any2.h> -#include "uno/mapping.h" +#include <uno/mapping.h> namespace CPPU_CURRENT_NAMESPACE { diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx index 5b4b8fc7ad42..d9ead282e42a 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx @@ -21,13 +21,13 @@ #include <sal/alloca.h> #include <com/sun/star/uno/genfunc.hxx> -#include "com/sun/star/uno/RuntimeException.hpp" +#include <com/sun/star/uno/RuntimeException.hpp> #include <uno/data.h> -#include "bridge.hxx" -#include "types.hxx" -#include "unointerfaceproxy.hxx" -#include "vtables.hxx" +#include <bridge.hxx> +#include <types.hxx> +#include <unointerfaceproxy.hxx> +#include <vtables.hxx> #include "callvirtualmethod.hxx" #include "share.hxx" commit 2f8e69aaf2478b04e8bfd3fa4377ccd2064fe61c Author: Michael Stahl <[email protected]> Date: Fri Dec 8 21:39:56 2017 +0100 vcl: Rectangle does not name a type Change-Id: Ia90b67d80383856f0b277a86117ced3732a2ac24 diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx index d3049640d07d..9f4d4a872d07 100644 --- a/vcl/source/window/cursor.cxx +++ b/vcl/source/window/cursor.cxx @@ -235,7 +235,7 @@ void vcl::Cursor::LOKNotify( vcl::Window* pWindow, const OUString& rAction ) if (!aSize.Width()) aSize.Width() = pWindow->GetSettings().GetStyleSettings().GetCursorSize(); - const Rectangle aRect(Point(nX, nY), aSize); + const tools::Rectangle aRect(Point(nX, nY), aSize); aItems.emplace_back("rectangle", aRect.toString()); } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
