diff options
| author | Arkadiy Illarionov <qarkai@gmail.com> | 2019-09-06 00:50:24 +0300 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-09-06 11:55:50 +0200 |
| commit | f599c31fe68882f510cf3d101102e71f9bf795c8 (patch) | |
| tree | ced0a58620c5aea8420638847192f298d139297b /svl/source | |
| parent | 8811516e2e9e71dd45198081d26c748cdf4d831a (diff) | |
tdf#39593 use isUnoTunnelId
Adapt getUnoTunnelId methods where required: rename or make public.
Change-Id: I0fd2120bf9f0ff1aa690329a65ff64a154c89315
Reviewed-on: https://gerrit.libreoffice.org/78680
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'svl/source')
| -rw-r--r-- | svl/source/items/style.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index d206c17ba6bd..beeaa5610432 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -917,7 +917,7 @@ SfxUnoStyleSheet* SfxUnoStyleSheet::getUnoStyleSheet( const css::uno::Reference< { css::uno::Reference< css::lang::XUnoTunnel > xUT( xStyle, css::uno::UNO_QUERY ); if( xUT.is() ) - pRet = reinterpret_cast<SfxUnoStyleSheet*>(sal::static_int_cast<sal_uIntPtr>(xUT->getSomething( SfxUnoStyleSheet::getIdentifier()))); + pRet = reinterpret_cast<SfxUnoStyleSheet*>(sal::static_int_cast<sal_uIntPtr>(xUT->getSomething( SfxUnoStyleSheet::getUnoTunnelId()))); } return pRet; } @@ -927,14 +927,12 @@ SfxUnoStyleSheet* SfxUnoStyleSheet::getUnoStyleSheet( const css::uno::Reference< */ ::sal_Int64 SAL_CALL SfxUnoStyleSheet::getSomething( const css::uno::Sequence< ::sal_Int8 >& rId ) { - if( rId.getLength() == 16 && 0 == memcmp( getIdentifier().getConstArray(), rId.getConstArray(), 16 ) ) + if( isUnoTunnelId<SfxUnoStyleSheet>(rId) ) { return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_uIntPtr>(this)); } - else - { - return 0; - } + + return 0; } void @@ -948,7 +946,7 @@ namespace class theSfxUnoStyleSheetIdentifier : public rtl::Static< UnoTunnelIdInit, theSfxUnoStyleSheetIdentifier > {}; } -const css::uno::Sequence< ::sal_Int8 >& SfxUnoStyleSheet::getIdentifier() +const css::uno::Sequence< ::sal_Int8 >& SfxUnoStyleSheet::getUnoTunnelId() { return theSfxUnoStyleSheetIdentifier::get().getSeq(); } |