[Libreoffice-commits] .: binfilter/bf_sfx2 binfilter/inc filter/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Wed Feb 9 10:57:04 PST 2011
binfilter/bf_sfx2/source/appl/sfx2_appbas.cxx | 17 -----------------
binfilter/bf_sfx2/source/inc/tplcomp.hxx | 3 ---
binfilter/inc/bf_sfx2/macrconf.hxx | 7 -------
binfilter/inc/bf_sfx2/minstack.hxx | 1 -
binfilter/inc/bf_sfx2/objsh.hxx | 2 --
binfilter/inc/bf_sfx2/objuno.hxx | 7 -------
filter/source/flash/swfwriter1.cxx | 9 ---------
7 files changed, 46 deletions(-)
New commits:
commit 7a1dca4adfc75f5577c67d999f39dbf89d0d090a
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Feb 9 19:56:49 2011 +0100
Remove some dead code
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appbas.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appbas.cxx
index 9061828..14998b6 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appbas.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appbas.cxx
@@ -33,10 +33,7 @@
#include <bf_svtools/rectitem.hxx>
#include <bf_svtools/intitem.hxx>
#include <bf_svtools/eitem.hxx>
-
#include <bf_svtools/stritem.hxx>
-
-
#include <bf_svtools/pathoptions.hxx>
#ifdef _MSC_VER
@@ -126,22 +123,17 @@ BasicManager* SfxApplication::GetBasicManager()
( DEFINE_CONST_UNICODE( "StarBasic" ), pBasMgr );
pBasicCont->acquire(); // Hold via UNO
Reference< XLibraryContainer > xBasicCont = static_cast< XLibraryContainer* >( pBasicCont );
-// pAppData_Impl->pBasicLibContainer = pBasicCont;
pBasicCont->setBasicManager( pBasMgr );
// Dialog container
SfxDialogLibraryContainer* pDialogCont = new SfxDialogLibraryContainer( NULL );
pDialogCont->acquire(); // Hold via UNO
Reference< XLibraryContainer > xDialogCont = static_cast< XLibraryContainer* >( pDialogCont );
-// pAppData_Impl->pDialogLibContainer = pDialogCont;
LibraryContainerInfo* pInfo = new LibraryContainerInfo
( xBasicCont, xDialogCont, static_cast< OldBasicPassword* >( pBasicCont ) );
pBasMgr->SetLibraryContainerInfo( pInfo );
- // Konstanten
-//ASDBG RegisterBasicConstants( "so", aConstants, sizeof(aConstants)/sizeof(SfxConstant) );
-
// Durch MakeVariable wird das Basic modifiziert.
if ( !bBasicWasModified )
pBas->SetModified( sal_False );
@@ -159,23 +151,14 @@ BasicManager* SfxApplication::GetBasicManager()
//--------------------------------------------------------------------
-
-//--------------------------------------------------------------------
-
/*N*/ void SfxApplication::EnterBasicCall()
/*N*/ {
/*N*/ if ( 1 == ++pAppData_Impl->nBasicCallLevel )
/*N*/ {
/*N*/ DBG_TRACE( "SfxShellObject: BASIC-on-demand" );
/*N*/
-/*N*/ // das kann l"anger dauern, da Progress nicht geht, wenigstens Sanduhr
-/*N*/ //(mba)/task SfxWaitCursor aWait;
-/*N*/
/*N*/ // zuerst das BASIC laden
/*N*/ GetBasic();
-
- // Factories anmelden
-// SbxBase::AddFactory( new SfxSbxObjectFactory_Impl );
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_sfx2/source/inc/tplcomp.hxx b/binfilter/bf_sfx2/source/inc/tplcomp.hxx
index 8c9296c..65f06ed 100644
--- a/binfilter/bf_sfx2/source/inc/tplcomp.hxx
+++ b/binfilter/bf_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>
diff --git a/binfilter/inc/bf_sfx2/macrconf.hxx b/binfilter/inc/bf_sfx2/macrconf.hxx
index affa530..e121717 100644
--- a/binfilter/inc/bf_sfx2/macrconf.hxx
+++ b/binfilter/inc/bf_sfx2/macrconf.hxx
@@ -92,10 +92,6 @@ public:
{ return pSlot; }
};
-//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 SfxMacroConfig
{
friend class SfxEventConfiguration;
@@ -110,9 +106,6 @@ public:
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* );
#if _SOLAR__PRIVATE
diff --git a/binfilter/inc/bf_sfx2/minstack.hxx b/binfilter/inc/bf_sfx2/minstack.hxx
index 7f09544..e735580 100644
--- a/binfilter/inc/bf_sfx2/minstack.hxx
+++ b/binfilter/inc/bf_sfx2/minstack.hxx
@@ -28,7 +28,6 @@
#ifndef _SFXMINSTACK_HXX
#define _SFXMINSTACK_HXX
-//ASDBG #ifndef _SFXMINARRAY_HXX
namespace binfilter {
#define DECL_OBJSTACK( ARR, T, nI, nG ) \
diff --git a/binfilter/inc/bf_sfx2/objsh.hxx b/binfilter/inc/bf_sfx2/objsh.hxx
index 45c3a5b..c9ecf81 100644
--- a/binfilter/inc/bf_sfx2/objsh.hxx
+++ b/binfilter/inc/bf_sfx2/objsh.hxx
@@ -295,8 +295,6 @@ public:
SfxProgress* GetProgress() const;
void SetWaitCursor( BOOL bSet ) const;
-//(mba) virtual SotObjectRef CreateAggObj( const SotFactory* pFact );
-
// Naming Interface
void SetTitle( const String& rTitle );
String GetTitle( sal_uInt16 nMaxLen = 0 ) const;
diff --git a/binfilter/inc/bf_sfx2/objuno.hxx b/binfilter/inc/bf_sfx2/objuno.hxx
index a3c62d6..bbd408b 100644
--- a/binfilter/inc/bf_sfx2/objuno.hxx
+++ b/binfilter/inc/bf_sfx2/objuno.hxx
@@ -116,9 +116,6 @@ public:
// XInterface, XTypeProvider
SFX_DECL_XINTERFACE_XTYPEPROVIDER
-//ASDBG virtual void* getImplementation(Reflection *p)
-//ASDBG { return OWeakObject::getImplementation(p); }
-
// XComponent
virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener) throw( ::com::sun::star::uno::RuntimeException );
@@ -168,10 +165,6 @@ public:
// XInterface, XTypeProvider, XServiceInfo
SFX_DECL_XINTERFACE_XTYPEPROVIDER_XSERVICEINFO
-// ÎMPLNAME L"com.sun.star.comp.sfx2.StandaloneDocumentInfo"
-//ASDBG virtual void* getImplementation(Reflection *p)
-//ASDBG { return Sf::com::sun::star::document::XDocumentInfoObject::getImplementation(p); }
-
// ::com::sun::star::document::XDocumentInfo
virtual sal_Int16 SAL_CALL getUserFieldCount() throw( ::com::sun::star::uno::RuntimeException );
virtual ::rtl::OUString SAL_CALL getUserFieldName(sal_Int16 nIndex) throw( ::com::sun::star::uno::RuntimeException );
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index 4ad0b29..89499c6 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -883,15 +883,6 @@ sal_uInt16 Writer::defineBitmap( const BitmapEx &bmpSource, sal_Int32 nJPEGQuali
aFilterData[0].Value <<= nJPEGQualityLevel;
}
-#if 0
- // Debug code to see what we export to swf
- {
- SvFileStream aDstStm( String( RTL_CONSTASCII_USTRINGPARAM("e:\\test.jpg") ), STREAM_READ | STREAM_WRITE | STREAM_TRUNC );
- aFilter.ExportGraphic( aGraphic, String(), aDstStm,
- aFilter.GetExportFormatNumberForShortName( OUString( RTL_CONSTASCII_USTRINGPARAM( JPG_SHORTNAME ) ) ), &aFilterData );
- }
-#endif
-
if( aFilter.ExportGraphic( aGraphic, String(), aDstStm,
aFilter.GetExportFormatNumberForShortName( OUString( RTL_CONSTASCII_USTRINGPARAM( JPG_SHORTNAME ) ) ), &aFilterData ) == ERRCODE_NONE )
{
More information about the Libreoffice-commits
mailing list