[Libreoffice-commits] .: binfilter/bf_basic binfilter/bf_forms binfilter/bf_sc binfilter/bf_sfx2 binfilter/bf_svx binfilter/bf_xmloff binfilter/filter
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Nov 19 02:07:39 PST 2010
binfilter/bf_basic/source/comp/sbcomp.cxx | 57 -------------
binfilter/bf_forms/source/component/forms_DatabaseForm.cxx | 1
binfilter/bf_sc/source/filter/xml/sc_xmlwrap.cxx | 26 -----
binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx | 6 -
binfilter/bf_svx/source/form/svx_fmdmod.cxx | 42 ---------
binfilter/bf_xmloff/source/chart/xmloff_SchXMLExport.cxx | 20 ----
binfilter/filter/source/bf_migrate/bf_migratefilter.cxx | 14 ---
7 files changed, 5 insertions(+), 161 deletions(-)
New commits:
commit f82832b56e583d631e9a2973491a04ad99d7f5e2
Author: Kevin Hunter <hunteke at earlham.edu>
Date: Thu Nov 18 17:57:06 2010 -0500
Remove some commented out code: we have Git!
diff --git a/binfilter/bf_basic/source/comp/sbcomp.cxx b/binfilter/bf_basic/source/comp/sbcomp.cxx
index 1d703ba..f4beb81 100644
--- a/binfilter/bf_basic/source/comp/sbcomp.cxx
+++ b/binfilter/bf_basic/source/comp/sbcomp.cxx
@@ -42,63 +42,6 @@
namespace binfilter {
-/*?*/ // #ifdef DBG_SAVE_DISASSEMBLY
-/*?*/ // static bool dbg_bDisassemble = true;
-/*?*/ //
-/*?*/ // using namespace comphelper;
-/*?*/ // using namespace rtl;
-/*?*/ // using namespace com::sun::star::uno;
-/*?*/ // using namespace com::sun::star::lang;
-/*?*/ // using namespace com::sun::star::ucb;
-/*?*/ // using namespace com::sun::star::io;
-/*?*/ //
-/*?*/ // void dbg_SaveDisassembly( SbModule* pModule )
-/*?*/ // {
-/*?*/ // bool bDisassemble = dbg_bDisassemble;
-/*?*/ // if( bDisassemble )
-/*?*/ // {
-/*?*/ // Reference< XSimpleFileAccess3 > xSFI;
-/*?*/ // Reference< XTextOutputStream > xTextOut;
-/*?*/ // Reference< XOutputStream > xOut;
-/*?*/ // Reference< XMultiServiceFactory > xSMgr = getProcessServiceFactory();
-/*?*/ // if( xSMgr.is() )
-/*?*/ // {
-/*?*/ // Reference< XSimpleFileAccess3 > xSFI = Reference< XSimpleFileAccess3 >( xSMgr->createInstance
-/*?*/ // ( OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ), UNO_QUERY );
-/*?*/ // if( xSFI.is() )
-/*?*/ // {
-/*?*/ // String aFile( RTL_CONSTASCII_USTRINGPARAM("file:///d:/BasicAsm_") );
-/*?*/ // StarBASIC* pBasic = (StarBASIC*)pModule->GetParent();
-/*?*/ // if( pBasic )
-/*?*/ // {
-/*?*/ // aFile += pBasic->GetName();
-/*?*/ // aFile.AppendAscii( "_" );
-/*?*/ // }
-/*?*/ // aFile += pModule->GetName();
-/*?*/ // aFile.AppendAscii( ".txt" );
-/*?*/ //
-/*?*/ // // String aFile( RTL_CONSTASCII_USTRINGPARAM("file:///d:/BasicAsm.txt") );
-/*?*/ // if( xSFI->exists( aFile ) )
-/*?*/ // xSFI->kill( aFile );
-/*?*/ // xOut = xSFI->openFileWrite( aFile );
-/*?*/ // Reference< XInterface > x = xSMgr->createInstance( OUString::createFromAscii( "com.sun.star.io.TextOutputStream" ) );
-/*?*/ // Reference< XActiveDataSource > xADS( x, UNO_QUERY );
-/*?*/ // xADS->setOutputStream( xOut );
-/*?*/ // xTextOut = Reference< XTextOutputStream >( x, UNO_QUERY );
-/*?*/ // }
-/*?*/ // }
-/*?*/ //
-/*?*/ // if( xTextOut.is() )
-/*?*/ // {
-/*?*/ // String aDisassemblyStr;
-/*?*/ // pModule->Disassemble( aDisassemblyStr );
-/*?*/ // xTextOut->writeString( aDisassemblyStr );
-/*?*/ // }
-/*?*/ // xOut->closeOutput();
-/*?*/ // }
-/*?*/ // }
-/*?*/ // #endif
-
// Diese Routine ist hier definiert, damit der Compiler als eigenes Segment
// geladen werden kann.
diff --git a/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx b/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
index 138bb5e..ccbf7a8 100644
--- a/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
+++ b/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
@@ -418,7 +418,6 @@ ODatabaseForm::ODatabaseForm(const Reference<XMultiServiceFactory>& _rxFactory)
{
m_xAggregate = Reference<XAggregation>(m_xServiceFactory->createInstance(SRV_SDB_ROWSET), UNO_QUERY);
- // m_xAggregate = Reference<XAggregation>(m_xServiceFactory->createInstance(rtl::OUString::createFromAscii("com.sun.star.sdb.dbaccess.ORowSet")), UNO_QUERY);
DBG_ASSERT(m_xAggregate.is(), "ODatabaseForm::ODatabaseForm : could not instantiate an SDB rowset !");
m_xAggregateAsRowSet = Reference<XRowSet> (m_xAggregate,UNO_QUERY);
setAggregation(m_xAggregate);
diff --git a/binfilter/bf_sc/source/filter/xml/sc_xmlwrap.cxx b/binfilter/bf_sc/source/filter/xml/sc_xmlwrap.cxx
index 7e37c7a..eef47bd 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_xmlwrap.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_xmlwrap.cxx
@@ -173,32 +173,6 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe
aAny.getValueType() == ::getBooleanCppuType() &&
*(sal_Bool *)aAny.getValue();
}
- // #99667#; no longer necessary
-/* else if ( pMedium )
- {
- // if there is a medium and if this medium has a load environment,
- // we get an active data source from the medium.
- pMedium->GetInStream()->Seek( 0 );
- xSource = pMedium->GetDataSource();
- DBG_ASSERT( xSource.is(), "got no data source from medium" );
- if( !xSource.is() )
- return sal_False;
-
- // get a pipe for connecting the data source to the parser
- xPipe = xServiceFactory->createInstance(
- OUString::createFromAscii("com.sun.star.io.Pipe") );
- DBG_ASSERT( xPipe.is(),
- "XMLReader::Read: com.sun.star.io.Pipe service missing" );
- if( !xPipe.is() )
- return sal_False;
-
- // connect pipe's output stream to the data source
- uno::Reference<io::XOutputStream> xPipeOutput( xPipe, uno::UNO_QUERY );
- xSource->setOutputStream( xPipeOutput );
-
- aParserInput.aInputStream =
- uno::Reference< io::XInputStream >( xPipe, uno::UNO_QUERY );
- }*/
else
return SCERR_IMPORT_UNKNOWN;
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx b/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
index 8efdb32..4e55234 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
@@ -1020,13 +1020,7 @@ void SfxLibraryContainer_Impl::implStoreLibraryIndexFile( SfxLibrary_Impl* pLib,
/*N*/ }
/*N*/ catch( Exception& e )
/*N*/ {
-/*N*/ // throw WrappedTargetException( OUString::createFromAscii( "parsing error!\n" ),
-/*N*/ // Reference< XInterface >(),
-/*N*/ // makeAny( e ) );
/*N*/ OSL_ENSURE( 0, "Parsing error\n" );
-//*N*/ SfxErrorContext aEc( ERRCTX_SFX_LOADBASIC, aLibInfoPath );
-//*N*/ ULONG nErrorCode = ERRCODE_IO_GENERAL;
-//*N*/ ErrorHandler::HandleError( nErrorCode );
/*N*/ return sal_False;
/*N*/ }
/*N*/
diff --git a/binfilter/bf_svx/source/form/svx_fmdmod.cxx b/binfilter/bf_svx/source/form/svx_fmdmod.cxx
index 8db43b2..d8c4aa1 100644
--- a/binfilter/bf_svx/source/form/svx_fmdmod.cxx
+++ b/binfilter/bf_svx/source/form/svx_fmdmod.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -35,10 +35,10 @@
#include <fmobj.hxx>
#include <unoshape.hxx>
#include "fmglob.hxx"
-#include <legacysmgr/legacy_binfilters_smgr.hxx> //STRIP002
+#include <legacysmgr/legacy_binfilters_smgr.hxx>
namespace binfilter {
-using namespace ::binfilter::svxform;//STRIP008 using namespace ::svxform;
+using namespace ::binfilter::svxform;
//-----------------------------------------------------------------------------
/*N*/ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvxFmMSFactory::createInstance(const ::rtl::OUString& ServiceSpecifier) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException )
@@ -58,42 +58,6 @@ using namespace ::binfilter::svxform;//STRIP008 using namespace ::svxform;
/*N*/ return xRet;
/*N*/ }
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-
-/*
-// XServiceManager
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SvxFmDrawModel::createInstance(const ::rtl::OUString& ServiceName)
- const throw( ::com::sun::star::lang::ServiceNotRegisteredException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException )
-{
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xRet;
- sal_uInt16 nTokenCount = ServiceName.getTokenCount('.');
- if (nTokenCount == 5 &&
- ServiceName.getToken( 0, '.' ) == ::rtl::OUString::createFromAscii("stardiv") &&
- ServiceName.getToken( 1, '.' ) == ::rtl::OUString::createFromAscii("one") &&
- ServiceName.getToken( 2, '.' ) == ::rtl::OUString::createFromAscii("form") &&
- ServiceName.getToken( 3, '.' ) == ::rtl::OUString::createFromAscii("component"))
- {
- xRet = ::legacy_binfilters::getLegacyProcessServiceFactory()->createInstance(ServiceName);
- }
- else
- if (nTokenCount == 4 &&
- ServiceName.getToken( 0, '.' ) == ::rtl::OUString::createFromAscii("stardiv") &&
- ServiceName.getToken( 1, '.' ) == ::rtl::OUString::createFromAscii("one") &&
- ServiceName.getToken( 2, '.' ) == ::rtl::OUString::createFromAscii("drawing") &&
- ServiceName.getToken( 3, '.' ) == ::rtl::OUString::createFromAscii("ControlShape"))
- {
- SdrObject* pObj = new FmFormObj();
- xRet = *new SvxShapeControl(pObj);
- }
- if (!xRet.is())
- xRet = SvxUnoDrawModel::createInstance(ServiceName);
- return xRet;
-}
-*/
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLExport.cxx b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLExport.cxx
index b56b7e2..0a4a3ff 100644
--- a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLExport.cxx
+++ b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLExport.cxx
@@ -676,26 +676,6 @@ void SchXMLExportHelper::parseDocument( uno::Reference< chart::XChartDocument >&
if( bExportContent )
{
// #85929# always export table, otherwise clipboard may loose data
-// sal_Bool bExportTable = bIncludeTable;
-// // check for clipboard flag on document => export Table
-// if( xDocPropSet.is() &&
-// ! bExportTable )
-// {
-// uno::Any aAny;
-// try
-// {
-// aAny = xDocPropSet->getPropertyValue( ::rtl::OUString::createFromAscii( "ExportData" ));
-// aAny >>= bExportTable;
-// }
-// catch( uno::Exception )
-// {
-// DBG_ERROR( "Property ExportData not found" );
-// }
-// }
-
- // export of table element
-// if( bExportTable )
-
exportTable( xData );
}
diff --git a/binfilter/filter/source/bf_migrate/bf_migratefilter.cxx b/binfilter/filter/source/bf_migrate/bf_migratefilter.cxx
index 0a21a3c..1fde905 100644
--- a/binfilter/filter/source/bf_migrate/bf_migratefilter.cxx
+++ b/binfilter/filter/source/bf_migrate/bf_migratefilter.cxx
@@ -309,18 +309,8 @@ sal_Bool bf_MigrateFilter::importImpl(const Sequence< ::com::sun::star::beans::P
// calc document
aFilterName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StarOffice XML (Calc)" ));
}
-/*
- else if(rStrippedServiceInfo->supportsService(sServiceNameChartDocument))
- {
- // chart document
- aFilterName = ::rtl::OUString::createFromAscii("StarOffice XML (Chart)");
- }
- else if(rStrippedServiceInfo->supportsService(sServiceNameFormulaProperties))
- {
- // formula document
- aFilterName = ::rtl::OUString::createFromAscii("StarOffice XML (Math)");
- }
-*/
+
+
if ( aFilterName.getLength() && !bInserting )
{
uno::Reference < io::XStream > xTempFile(
More information about the Libreoffice-commits
mailing list