summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--automation/source/testtool/comm_bas.cxx3
-rw-r--r--basic/source/app/processw.cxx2
-rw-r--r--basic/source/classes/sbunoobj.cxx14
-rw-r--r--basic/source/sample/object.cxx2
-rw-r--r--basic/source/uno/scriptcont.cxx2
5 files changed, 0 insertions, 23 deletions
diff --git a/automation/source/testtool/comm_bas.cxx b/automation/source/testtool/comm_bas.cxx
index 7d52c681eb0b..5279a49b2d4c 100644
--- a/automation/source/testtool/comm_bas.cxx
+++ b/automation/source/testtool/comm_bas.cxx
@@ -84,9 +84,6 @@
#define _RWPROP 0x2300 // mask Read/Write-Property
#define _COLLPROP 0x4100 // mask Read-Collection-Element
-#define COLLNAME "Elements" // the collection's name, here wired hard
-
-
CommunicationWrapper::Methods CommunicationWrapper::aManagerMethods[] = {
diff --git a/basic/source/app/processw.cxx b/basic/source/app/processw.cxx
index 59da8f7b91c4..33a13627d21d 100644
--- a/basic/source/app/processw.cxx
+++ b/basic/source/app/processw.cxx
@@ -74,8 +74,6 @@
#define _RWPROP 0x2300 // Mask Read/Write-Property
#define _COLLPROP 0x4100 // Mask Read-Collection-Element
-#define COLLNAME "Elements" // Name of the collection, hard coded
-
ProcessWrapper::Methods ProcessWrapper::aProcessMethods[] = {
// Imagefile of the Executable
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 2b6eae69fb32..5f979e89b3d3 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -109,10 +109,6 @@ TYPEINIT1(SbUnoSingleton,SbxObject)
typedef WeakImplHelper1< XAllListener > BasicAllListenerHelper;
-// Flag to go via invocation
-//#define INVOCATION_ONLY
-
-
// Identifiers for creating the strings for dbg_Properties
static char const ID_DBG_SUPPORTEDINTERFACES[] = "Dbg_SupportedInterfaces";
static char const ID_DBG_PROPERTIES[] = "Dbg_Properties";
@@ -2345,11 +2341,6 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
}
-#ifdef INVOCATION_ONLY
-// From USR
-Reference< XInvocation > createDynamicInvocationFor( const Any& aAny );
-#endif
-
SbUnoObject::SbUnoObject( const rtl::OUString& aName_, const Any& aUnoObj_ )
: SbxObject( aName_ )
, bNeedIntrospection( sal_True )
@@ -2373,15 +2364,10 @@ SbUnoObject::SbUnoObject( const rtl::OUString& aName_, const Any& aUnoObj_ )
}
Reference< XTypeProvider > xTypeProvider;
-#ifdef INVOCATION_ONLY
- // get the invocation
- mxInvocation = createDynamicInvocationFor( aUnoObj_ );
-#else
// Did the object have an invocation itself?
mxInvocation = Reference< XInvocation >( x, UNO_QUERY );
xTypeProvider = Reference< XTypeProvider >( x, UNO_QUERY );
-#endif
if( mxInvocation.is() )
{
diff --git a/basic/source/sample/object.cxx b/basic/source/sample/object.cxx
index 3e24725cffdc..3d001624b967 100644
--- a/basic/source/sample/object.cxx
+++ b/basic/source/sample/object.cxx
@@ -79,8 +79,6 @@
#define _RWPROP 0x2300 // mask Read/Write-Property
#define _COLLPROP 0x4100 // mask Read-Collection-Element
-#define COLLNAME "Elements" // the collection's name, wired hard here
-
SampleObject::Methods SampleObject::aMethods[] = {
// a sample-method (the return value is SbxNULL)
{ "Display", SbxEMPTY, &SampleObject::Display, 1 | _FUNCTION },
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index e64b29665d14..977f6bd0df24 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -82,8 +82,6 @@ using namespace osl;
using ::rtl::OUString;
-using ::rtl::OUString;
-
//============================================================================
// Implementation class SfxScriptLibraryContainer