diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-05 10:59:28 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-05 10:59:45 +0100 |
commit | bcd4f99e9dafaa41fe9311b32182e73b3b554007 (patch) | |
tree | 4daae42b8e91418d8b515f0e15c750487a942b13 /sfx2 | |
parent | 0375504f7be34d857859dfbaa312501e0eaaaad1 (diff) |
Remove dead SO3_GLOBAL_CLASSID and SvObject
Change-Id: I57c1c4bf6482be7c3cf13c424972d4ed3b9a6b62
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/doc/sfxbasemodel.cxx | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 19cbdf4d3f6b..090a4552c7ac 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -3312,25 +3312,16 @@ void SAL_CALL SfxBaseModel::removePrintJobListener( const Reference< view::XPrin } } -// simple declaration of class SvObject is enough -// the corresponding <so3/iface.hxx> cannon be included because it provides -// declaration of class SvBorder that conflicts with ../../inc/viewfrm.hxx -class SvObject; sal_Int64 SAL_CALL SfxBaseModel::getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw(RuntimeException, std::exception) { SvGlobalName aName( aIdentifier ); - if ((aName == SvGlobalName( SO3_GLOBAL_CLASSID )) || - (aName == SvGlobalName( SFX_GLOBAL_CLASSID ))) + if (aName == SvGlobalName( SFX_GLOBAL_CLASSID )) { SolarMutexGuard aGuard; SfxObjectShell *const pObjectShell(GetObjectShell()); if (pObjectShell) { - // SO3_GLOBAL_CLASSID is apparently used by binfilter :( - if ( aName == SvGlobalName( SO3_GLOBAL_CLASSID ) ) - return reinterpret_cast<sal_Int64>((SvObject*) pObjectShell); - else if ( aName == SvGlobalName( SFX_GLOBAL_CLASSID ) ) - return reinterpret_cast<sal_Int64>((SfxObjectShell*) pObjectShell); + return reinterpret_cast<sal_Int64>((SfxObjectShell*) pObjectShell); } } |