include/comphelper/classids.hxx | 4 ----
include/sot/object.hxx | 1 -
sfx2/source/doc/sfxbasemodel.cxx | 13 ++-----------
3 files changed, 2 insertions(+), 16 deletions(-)
New commits:
commit bcd4f99e9dafaa41fe9311b32182e73b3b554007
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Dec 5 10:59:28 2014 +0100
Remove dead SO3_GLOBAL_CLASSID and SvObject
Change-Id: I57c1c4bf6482be7c3cf13c424972d4ed3b9a6b62
diff --git a/include/comphelper/classids.hxx b/include/comphelper/classids.hxx
index 635f51f..7cc708f 100644
--- a/include/comphelper/classids.hxx
+++ b/include/comphelper/classids.hxx
@@ -376,10 +376,6 @@
0x1a8a6701, 0xde58, 0x11cf, \
0x89, 0xca, 0x0, 0x80, 0x29, 0xe4, 0xb0, 0xb1
-#define SO3_GLOBAL_CLASSID \
- 0x475198a8, 0x694c, 0x4bd8, \
- 0xb0, 0x2f, 0xd9, 0xb7, 0x6b, 0xcf, 0x31, 0x28
-
#define SO3_RPT_CLASSID_90 \
0xd7896d52, 0xb7af, 0x4820, \
0x9d, 0xfe, 0xd4, 0x04, 0xd0, 0x15, 0x96, 0x0f
diff --git a/include/sot/object.hxx b/include/sot/object.hxx
index 4ee7297..0bcfdc7 100644
--- a/include/sot/object.hxx
+++ b/include/sot/object.hxx
@@ -94,7 +94,6 @@ struct IUnknown;
class SOT_DLLPUBLIC SotObject : virtual public SvRefBase
{
friend class SotFactory;
-friend class SvObject;
sal_uInt16 nOwnerLockCount;
bool bOwner;
bool bSVObject; // Ist Proxy, dann TRUE wenn andere Seite SV
ist
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 19cbdf4..090a455 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);
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
