summaryrefslogtreecommitdiff
path: root/UnoControls/source
diff options
context:
space:
mode:
Diffstat (limited to 'UnoControls/source')
-rw-r--r--UnoControls/source/base/makefile.mk28
-rw-r--r--UnoControls/source/base/multiplexer.cxx9
-rw-r--r--UnoControls/source/base/registercontrols.cxx51
3 files changed, 3 insertions, 85 deletions
diff --git a/UnoControls/source/base/makefile.mk b/UnoControls/source/base/makefile.mk
index be1fcbf5c8c2..66b87395abfe 100644
--- a/UnoControls/source/base/makefile.mk
+++ b/UnoControls/source/base/makefile.mk
@@ -29,40 +29,18 @@ PRJ=..$/..
PRJNAME=UnoControls
TARGET=base
ENABLE_EXCEPTIONS=TRUE
-#LIBTARGET=NO
-#USE_LDUMP2=TRUE
-#USE_DEFFILE=TRUE
# --- Settings -----------------------------------------------------
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
# --- Files --------------------------------------------------------
+
SLOFILES= $(SLO)$/multiplexer.obj \
$(SLO)$/basecontrol.obj \
$(SLO)$/basecontainercontrol.obj \
$(SLO)$/registercontrols.obj
-#LIB1TARGET= $(SLB)$/$(TARGET).lib
-#LIB1OBJFILES= $(SLOFILES)
-
-#SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-
-#SHL1STDLIBS=\
-# $(ONELIB) \
-# $(USRLIB) \
-# $(UNOLIB) \
-# $(OSLLIB) \
-# $(TOOLSLIB) \
-# $(RTLLIB)
-
-#SHL1DEPN= makefile.mk
-#SHL1LIBS= $(LIB1TARGET)
-#SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
-#DEF1NAME= $(SHL1TARGET)
-#DEF1EXPORTFILE= exports.dxp
-
# --- Targets ------------------------------------------------------
+
.INCLUDE : target.mk
-#.INCLUDE : $(PRJ)$/util$/target.pmk
diff --git a/UnoControls/source/base/multiplexer.cxx b/UnoControls/source/base/multiplexer.cxx
index 4ac7156eb2ae..27ef124b5e41 100644
--- a/UnoControls/source/base/multiplexer.cxx
+++ b/UnoControls/source/base/multiplexer.cxx
@@ -173,15 +173,6 @@ OMRCListenerMultiplexerHelper::operator Reference< XInterface >() const
}
//____________________________________________________________________________________________________________
-// operator
-//____________________________________________________________________________________________________________
-
-//OMRCListenerMultiplexerHelper& OMRCListenerMultiplexerHelper::operator= ( const OMRCListenerMultiplexerHelper& aCopyInstance )
-//{
-// return this ;
-//}
-
-//____________________________________________________________________________________________________________
// container method
//____________________________________________________________________________________________________________
diff --git a/UnoControls/source/base/registercontrols.cxx b/UnoControls/source/base/registercontrols.cxx
index 62e2e23ccc16..637c401df35f 100644
--- a/UnoControls/source/base/registercontrols.cxx
+++ b/UnoControls/source/base/registercontrols.cxx
@@ -52,15 +52,6 @@
//=============================================================================
//______________________________________________________________________________________________________________
-// defines
-//______________________________________________________________________________________________________________
-
-// If you will debug macros of this file ... you must define follow constant!
-// Ths switch on another macro AS_DBG_OUT(...), which will print text to "stdout".
-
-//#define AS_DBG_SWITCH
-
-//______________________________________________________________________________________________________________
// namespaces
//______________________________________________________________________________________________________________
@@ -77,26 +68,16 @@ using namespace ::com::sun::star::registry ;
//______________________________________________________________________________________________________________
//******************************************************************************************************************************
-// See AS_DBG_SWITCH below !!!
-#ifdef AS_DBG_SWITCH
- #define AS_DBG_OUT(OUTPUT) printf( OUTPUT );
-#else
- #define AS_DBG_OUT(OUTPUT)
-#endif
-
-//******************************************************************************************************************************
#define CREATEINSTANCE(CLASS) \
\
static Reference< XInterface > SAL_CALL CLASS##_createInstance ( const Reference< XMultiServiceFactory >& rServiceManager ) throw ( Exception ) \
{ \
- AS_DBG_OUT ( "\tCREATEINSTANCE():\tOK\n" ) \
return Reference< XInterface >( *(OWeakObject*)(new CLASS( rServiceManager )) ); \
}
//******************************************************************************************************************************
#define COMPONENT_INFO(CLASS) \
\
- AS_DBG_OUT ( "\tCOMPONENT_INFO():\t[start]\n" ) \
try \
{ \
/* Set default result of follow operations !!! */ \
@@ -105,7 +86,6 @@ using namespace ::com::sun::star::registry ;
/* Do the follow only, if given key is valid ! */ \
if ( xKey.is () ) \
{ \
- AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\txkey is valid ...\n" ) \
/* Build new keyname */ \
sKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/")) ; \
sKeyName += CLASS::impl_getStaticImplementationName() ; \
@@ -117,39 +97,31 @@ using namespace ::com::sun::star::registry ;
/* If this new key valid ... */ \
if ( xNewKey.is () ) \
{ \
- AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\txNewkey is valid ...\n" ) \
/* Get information about supported services. */ \
seqServiceNames = CLASS::impl_getStaticSupportedServiceNames() ; \
pArray = seqServiceNames.getArray() ; \
nLength = seqServiceNames.getLength() ; \
nCounter = 0 ; \
\
- AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\tloop ..." ) \
/* Then set this information on this key. */ \
for ( nCounter = 0; nCounter < nLength; ++nCounter ) \
{ \
xNewKey->createKey( pArray [nCounter] ); \
} \
- AS_DBG_OUT ( " OK\n" ) \
\
/* Result of this operations = OK. */ \
bReturn = sal_True ; \
} \
- AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\t... leave xNewKey\n" ) \
} \
- AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\t... leave xKey\n" ) \
} \
catch( InvalidRegistryException& ) \
{ \
- AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\tInvalidRegistryException detected!!!\n" ) \
bReturn = sal_False ; \
} \
- AS_DBG_OUT ( "\tCOMPONENT_INFO():\t[end]\n" )
//******************************************************************************************************************************
#define CREATEFACTORY_ONEINSTANCE(CLASS) \
\
- AS_DBG_OUT ( "\tCREATEFACTORY_ONEINSTANCE():\t[start]\n" ) \
/* Create right factory ... */ \
xFactory = Reference< XSingleServiceFactory > \
( \
@@ -158,12 +130,10 @@ using namespace ::com::sun::star::registry ;
CLASS##_createInstance , \
CLASS::impl_getStaticSupportedServiceNames () ) \
) ; \
- AS_DBG_OUT ( "\tCREATEFACTORY_ONEINSTANCE():\t[end]\n" )
//******************************************************************************************************************************
#define CREATEFACTORY_SINGLE(CLASS) \
\
- AS_DBG_OUT ( "\tCREATEFACTORY_SINGLE():\t[start]\n" ) \
/* Create right factory ... */ \
xFactory = Reference< XSingleServiceFactory > \
( \
@@ -172,14 +142,12 @@ using namespace ::com::sun::star::registry ;
CLASS##_createInstance , \
CLASS::impl_getStaticSupportedServiceNames () ) \
) ; \
- AS_DBG_OUT ( "\tCREATEFACTORY_SINGLE():\t[end]\n" )
//******************************************************************************************************************************
#define IF_NAME_CREATECOMPONENTFACTORY_ONEINSTANCE(CLASS) \
\
if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) ) \
{ \
- AS_DBG_OUT ( "\tIF_NAME_CREATECOMPONENTFACTORY_ONEINSTANCE():\timplementationname found\n" ) \
CREATEFACTORY_ONEINSTANCE ( CLASS ) \
}
@@ -188,7 +156,6 @@ using namespace ::com::sun::star::registry ;
\
if ( CLASS::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) ) \
{ \
- AS_DBG_OUT ( "\tIF_NAME_CREATECOMPONENTFACTORY_SINGLE():\timplementationname found\n" ) \
CREATEFACTORY_SINGLE ( CLASS ) \
}
@@ -225,15 +192,11 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_
extern "C" sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/ ,
void* pRegistryKey )
{
- AS_DBG_OUT ( "component_writeInfo():\t[start]\n" )
-
// Set default return value for this operation - if it failed.
sal_Bool bReturn = sal_False ;
if ( pRegistryKey != NULL )
{
- AS_DBG_OUT ( "component_writeInfo():\t\tpRegistryKey is valid ... enter scope\n" )
-
// Define variables for following macros!
// bReturn is set automaticly.
Reference< XRegistryKey > xKey( reinterpret_cast< XRegistryKey* >( pRegistryKey ) ) ;
@@ -255,12 +218,8 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/
COMPONENT_INFO ( ProgressMonitor )
COMPONENT_INFO ( StatusIndicator )
//=============================================================================
-
- AS_DBG_OUT ( "component_writeInfo():\t\t... leave pRegistryKey scope\n" )
}
- AS_DBG_OUT ( "component_writeInfo():\t[end]\n" )
-
// Return with result of this operation.
return bReturn ;
}
@@ -273,8 +232,6 @@ extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplementat
void* pServiceManager ,
void* /*pRegistryKey*/ )
{
- AS_DBG_OUT( "component_getFactory():\t[start]\n" )
-
// Set default return value for this operation - if it failed.
void* pReturn = NULL ;
@@ -283,8 +240,6 @@ extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplementat
( pServiceManager != NULL )
)
{
- AS_DBG_OUT( "component_getFactory():\t\t... enter scope - pointer are valid\n" )
-
// Define variables which are used in following macros.
Reference< XSingleServiceFactory > xFactory ;
Reference< XMultiServiceFactory > xServiceManager( reinterpret_cast< XMultiServiceFactory* >( pServiceManager ) ) ;
@@ -307,17 +262,11 @@ extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplementat
// Factory is valid - service was found.
if ( xFactory.is() )
{
- AS_DBG_OUT( "component_getFactory():\t\t\t... xFactory valid - service was found\n" )
-
xFactory->acquire();
pReturn = xFactory.get();
}
-
- AS_DBG_OUT( "component_getFactory():\t\t... leave scope\n" )
}
- AS_DBG_OUT ( "component_getFactory():\t[end]\n" )
-
// Return with result of this operation.
return pReturn ;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 15:41:27 +0000