RegisterBasicConstants doesn't do anything, remove it

5 files changed, 2 insertions, 148 deletions

diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index 3390c2fc99..09d9a4231b 100644
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.hxx
@@ -239,9 +239,6 @@ public:
     void                        EnterBasicCall();
     bool                        IsInBasicCall() const;
     void                        LeaveBasicCall();
-    void                        RegisterBasicConstants( const char *pPrefix,
-                                                        const SfxConstant *pConsts,
-                                                        USHORT nCount );
 
     // misc.
     BOOL                        GetOptions(SfxItemSet &);
diff --git a/sfx2/inc/sfx2/macrconf.hxx b/sfx2/inc/sfx2/macrconf.hxx
index fcbabbd10e..7514d4c511 100644
--- a/sfx2/inc/sfx2/macrconf.hxx
+++ b/sfx2/inc/sfx2/macrconf.hxx
@@ -99,10 +99,6 @@ public:
     String              GetURL() const;
 };
 
-//ASDBG obsolete >= 582
-//ASDBG class ::com::sun::star::uno::Reference< ::com::sun::star::script::XEngine > ;
-//ASDBG class ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > ;
-
 class SFX2_DLLPUBLIC SfxMacroConfig
 {
 friend class SfxEventConfiguration;
@@ -123,9 +119,6 @@ public:
     static sal_Bool				IsBasic( SbxObject*, const String&, BasicManager* );
     static ErrCode			Call( SbxObject*, const String&, BasicManager*,
                                 SbxArray *pArgs=NULL, SbxValue *pRet=NULL );
-//ASDBG obsolete >= 582
-//ASDBG 	static void	CallStarScript( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XEngine > & rxEngine, const String & rCode,
-//ASDBG     const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rSource, void *pArgs, void *pRet );
     static SbMethod*		GetMethod_Impl( const String&, BasicManager* );
 
     sal_uInt16					GetSlotId(SfxMacroInfoPtr);
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 28cc7f8560..4ea005350d 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -101,79 +101,8 @@ using namespace ::com::sun::star::script;
 
 using ::basic::BasicManagerRepository;
 
-// #ifndef STR_VERSION_ID
-// #define STR_VERSION_ID 1
-// #endif
-// #ifndef STR_VERSION_TYPE
-// #define STR_VERSION_TYPE 1
-// #endif
-
-//=========================================================================
-/*ASDBG
-const SfxConstant __FAR_DATA aConstants[] =
-{
-    SFX_USHORT_CONSTANT( "AlignBottom",      	ALIGN_BOTTOM ),
-    SFX_USHORT_CONSTANT( "AlignTop",         	ALIGN_TOP ),
-    SFX_USHORT_CONSTANT( "CharSetANSI",      	CHARSET_ANSI ),
-    SFX_USHORT_CONSTANT( "CharSetDontKnow",  	CHARSET_DONTKNOW ),
-    SFX_USHORT_CONSTANT( "CharSetIBMPC437",  	CHARSET_IBMPC_437 ),
-    SFX_USHORT_CONSTANT( "CharSetIBMPC850",  	CHARSET_IBMPC_850 ),
-    SFX_USHORT_CONSTANT( "CharSetIBMPC860",  	CHARSET_IBMPC_860 ),
-    SFX_USHORT_CONSTANT( "CharSetIBMPC861",  	CHARSET_IBMPC_861 ),
-    SFX_USHORT_CONSTANT( "CharSetIBMPC863",  	CHARSET_IBMPC_863 ),
-    SFX_USHORT_CONSTANT( "CharSetIBMPC865",  	CHARSET_IBMPC_865 ),
-    SFX_USHORT_CONSTANT( "CharSetIBMPC",     	CHARSET_IBMPC ),
-    SFX_USHORT_CONSTANT( "CharSetMac",       	CHARSET_MAC ),
-    SFX_USHORT_CONSTANT( "CharSetSymbol",    	CHARSET_SYMBOL ),
-    SFX_USHORT_CONSTANT( "CharSetSystem",    	RTL_TEXTENCODING_UTF8 ),
-    SFX_USHORT_CONSTANT( "FamilyDecorative", 	FAMILY_DECORATIVE ),
-    SFX_USHORT_CONSTANT( "FamilyDontknow",   	FAMILY_DONTKNOW ),
-    SFX_USHORT_CONSTANT( "FamilyModern",     	FAMILY_MODERN ),
-    SFX_USHORT_CONSTANT( "FamilyRoman",      	FAMILY_ROMAN ),
-    SFX_USHORT_CONSTANT( "FamilyScript",     	FAMILY_SCRIPT ),
-    SFX_USHORT_CONSTANT( "FamilySwiss",      	FAMILY_SWISS ),
-    SFX_USHORT_CONSTANT( "FamilySystem",     	FAMILY_SYSTEM ),
-    SFX_USHORT_CONSTANT( "GradientAxial",    	GRADIENT_AXIAL ),
-    SFX_USHORT_CONSTANT( "GradientElliptical", 	GRADIENT_ELLIPTICAL ),
-    SFX_USHORT_CONSTANT( "GradientLinear",   	GRADIENT_LINEAR ),
-    SFX_USHORT_CONSTANT( "GradientRadial",   	GRADIENT_RADIAL ),
-    SFX_USHORT_CONSTANT( "GradientRect",     	GRADIENT_RECT ),
-    SFX_USHORT_CONSTANT( "GradientSquare",   	GRADIENT_SQUARE ),
-    SFX_USHORT_CONSTANT( "ItalicNone",       	ITALIC_NONE ),
-    SFX_USHORT_CONSTANT( "ItalicOblique",    	ITALIC_OBLIQUE ),
-    SFX_USHORT_CONSTANT( "StrikeThroughDouble",	STRIKEOUT_DOUBLE ),
-    SFX_USHORT_CONSTANT( "StrikeThroughNone", 	STRIKEOUT_NONE ),
-    SFX_USHORT_CONSTANT( "StrikeThroughSingle", STRIKEOUT_SINGLE ),
-    SFX_USHORT_CONSTANT( "UnderlineDotted",  	UNDERLINE_DOTTED ),
-    SFX_USHORT_CONSTANT( "UnderlineDouble",  	UNDERLINE_DOUBLE ),
-    SFX_USHORT_CONSTANT( "UnderlineNone",    	UNDERLINE_NONE ),
-    SFX_USHORT_CONSTANT( "UnderlineSingle",  	UNDERLINE_SINGLE ),
-    SFX_USHORT_CONSTANT( "UnitFoot",         	FUNIT_FOOT ),
-    SFX_USHORT_CONSTANT( "UnitInch",         	FUNIT_INCH ),
-    SFX_USHORT_CONSTANT( "UnitMile",         	FUNIT_MILE ),
-    SFX_USHORT_CONSTANT( "UnitPercent",      	FUNIT_PERCENT ),
-    SFX_USHORT_CONSTANT( "UnitPoint",      		FUNIT_POINT ),
-    SFX_USHORT_CONSTANT( "UnitTwip",         	FUNIT_TWIP ),
-    SFX_USHORT_CONSTANT( "Unit_cm",          	FUNIT_CM ),
-    SFX_USHORT_CONSTANT( "Unit_m",          	FUNIT_M ),
-    SFX_USHORT_CONSTANT( "Unit_mm",          	FUNIT_MM ),
-    SFX_USHORT_CONSTANT( "WeightBlack",      	WEIGHT_BLACK ),
-    SFX_USHORT_CONSTANT( "WeightBold",       	WEIGHT_BOLD ),
-    SFX_USHORT_CONSTANT( "WeightDontKnow",   	WEIGHT_DONTKNOW ),
-    SFX_USHORT_CONSTANT( "WeightLight",      	WEIGHT_LIGHT ),
-    SFX_USHORT_CONSTANT( "WeightMedium",     	WEIGHT_MEDIUM ),
-    SFX_USHORT_CONSTANT( "WeightNormal",     	WEIGHT_NORMAL ),
-    SFX_USHORT_CONSTANT( "WeightSemibold",   	WEIGHT_SEMIBOLD ),
-    SFX_USHORT_CONSTANT( "WeightSemilight",  	WEIGHT_SEMILIGHT ),
-    SFX_USHORT_CONSTANT( "WeightThin",       	WEIGHT_THIN ),
-    SFX_USHORT_CONSTANT( "WeightUltrabold",  	WEIGHT_ULTRABOLD ),
-    SFX_USHORT_CONSTANT( "WeightUltralight", 	WEIGHT_ULTRALIGHT )
-};
-*/
-//========================================================================
-
 //------------------------------------------------------------------------
-String lcl_GetVersionString(ResMgr* /*pAppData_ImplResMgr*/)
+String lcl_GetVersionString()
 {
     ::rtl::OUString aDefault;
     String aVersion( utl::Bootstrap::getBuildIdData( aDefault ));
@@ -204,46 +133,6 @@ sal_uInt16 SfxApplication::SaveBasicAndDialogContainer() const
 
 //--------------------------------------------------------------------
 
-void SfxApplication::RegisterBasicConstants
-(
-    const char*,        // Prefix vor Konstanten-Namen
-    const SfxConstant*, // Array von <SfxConstant> Instanzen
-    sal_uInt16			// Anahl der Kontanten in pConsts
-)
-
-/*	[Beschreibung]
-
-    Diese Methode meldet Konstanten beim BASIC an. Sie sollte on-demand
-    (in GetSbxObject() der Applikation) gerufen werden. Das Array mu\s
-    alphabetisch nach den Namen sortiert sein!
-
-    Durch den Prefix kann Speicher gespart und das Suchen beschleunigt
-    werden. Im StarOffice soll der Prefix "so" verwendet werden.
-
-
-    [Beispiel]
-
-    const SfxConstant __FAR_DATA aConstants[] =
-    {
-        SFX_BOOL_CONSTANT( "False", sal_False ),
-        SFX_BOOL_CONSTANT( "True",  sal_True ),
-    };
-
-    ...
-    SFX_APP()->RegisterBasicConstants( 0, aConstants, 2 );
-    ...
-
-*/
-
-{
-//  DBG_ASSERT( pAppData_Impl->pBasicMgr, "no basic available" );
-
-//  pAppData_Impl->pBasicMgr->GetLib(0)->Insert(
-//				new SfxConstants_Impl( pPrefix, pConsts, nCount ) );
-}
-
-//--------------------------------------------------------------------
-
 SbxVariable* MakeVariable( StarBASIC *pBas, SbxObject *pObject,
            const char *pName, sal_uInt32 nSID, SbxDataType eType, SbxClassType eClassType )
 {
@@ -503,7 +392,7 @@ void SfxApplication::PropState_Impl( SfxItemSet &rSet )
 
             case SID_BUILD_VERSION:
             {
-                String aVersion = lcl_GetVersionString(pAppData_Impl->pLabelResMgr);
+                String aVersion = lcl_GetVersionString();
                 rSet.Put( SfxUInt32Item( SID_BUILD_VERSION, (sal_uInt32) aVersion.ToInt32() ) );
                 break;
             }
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 10716ab923..8ca5f20dca 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -340,28 +340,6 @@ sal_Int64 SAL_CALL SfxOfficeDispatch::getSomething( const ::com::sun::star::uno:
         return 0;
 }
 
-/* ASDBG
-void* SfxOfficeDispatch::getImplementation(Reflection *p)
-{
-    if( p == ::getCppuType((const SfxOfficeDispatch*)0) )
-        return this;
-    else
-        return ::cppu::OWeakObject::getImplementation(p);
-
-}
-
-Reflection* ::getCppuType((const SfxOfficeDispatch*)0)
-{
-    static StandardClassReflection aRefl(
-        0,
-        createStandardClass(
-            "SfxOfficeDispatch", ::cppu::OWeakObject::get::cppu::OWeakObjectIdlClass(),
-            1,
-            ::getCppuType((const ::com::sun::star::frame::XDispatch*)0) ) );
-    return &aRefl;
-}
-*/
-
 SfxOfficeDispatch::SfxOfficeDispatch( SfxBindings& rBindings, SfxDispatcher* pDispat, const SfxSlot* pSlot, const ::com::sun::star::util::URL& rURL )
 {
 //    nOfficeDispatchCount++;
diff --git a/sfx2/source/inc/tplcomp.hxx b/sfx2/source/inc/tplcomp.hxx
index a4c8e6894f..df486fc25a 100644
--- a/sfx2/source/inc/tplcomp.hxx
+++ b/sfx2/source/inc/tplcomp.hxx
@@ -30,9 +30,6 @@
 #define _TPLCOMP_HXX
 
 #include <osl/mutex.hxx>
-//ASDBG #include <usr/uno.hxx>
-//ASDBG #include <usr/iterhlp.hxx>
-//ASDBG #include <usr/services.hxx>
 #include <com/sun/star/chaos/XCommandExecutor.hpp>
 #include <com/sun/star/chaos/XStatusCallback.hpp>
 #include <com/sun/star/chaos/UnknownCommandException.hpp>