diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-12-27 14:00:51 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-12-27 14:02:44 +0200 |
| commit | 17f1b0f551dbacc24fe5e2c90d5f00e5578ab9e7 (patch) | |
| tree | 33afae11f3acd4859fe5a46f60e82ee959311ed1 /ucbhelper | |
| parent | 8f6a574d4f0fdf9d113aaa073daf948a7ec1df52 (diff) | |
Using pre-cached type_infos provided by the typeid operator seems to work now
Apparently there was no problem in this after all. The reason it
seemed not to work earlier was because of the unwinding failure due to
the missing .cfi_startproc and .cfi_endproc thingies in helper.s
The hack in ucbhelper is now not needed after all.
Change-Id: If9fec5c502d4c9d0c44709ad9c2729f812e882e2
Diffstat (limited to 'ucbhelper')
| -rw-r--r-- | ucbhelper/source/provider/cancelcommandexecution.cxx | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/ucbhelper/source/provider/cancelcommandexecution.cxx b/ucbhelper/source/provider/cancelcommandexecution.cxx index 617c96c0e569..2f4e42e2c0a4 100644 --- a/ucbhelper/source/provider/cancelcommandexecution.cxx +++ b/ucbhelper/source/provider/cancelcommandexecution.cxx @@ -74,22 +74,6 @@ void cancelCommandExecution( const uno::Any & rException, } } -#if defined IOS && defined __arm64 - // No Java, Basic, or Python on iOS, so try to throw the exception - // directly. Much simpler. Especially as I haven't managed yet to - // get the C++/UNO bridge to work for arm64, and this - // cppu::throwException thing seems to be the only use for it, at - // least in the test apps... - - ucb::NameClashException aNCE; - if ( rException >>= aNCE ) - throw aNCE; - - lang::IllegalArgumentException aIAE; - if ( rException >>= aIAE ) - throw aIAE; -#endif - cppu::throwException( rException ); OSL_FAIL( "Return from cppu::throwException call!!!" ); throw uno::RuntimeException(); @@ -127,13 +111,6 @@ void cancelCommandExecution( const ucb::IOErrorCode eError, } } -#if defined IOS && defined __arm64 - // See comment above. - ucb::InteractiveAugmentedIOException aExc; - if ( xRequest->getRequest() >>= aExc ) - throw aExc; -#endif - cppu::throwException( xRequest->getRequest() ); OSL_FAIL( "Return from cppu::throwException call!!!" ); |