diff options
| -rw-r--r-- | connectivity/source/inc/ado/APreparedStatement.hxx | 2 | ||||
| -rw-r--r-- | connectivity/source/inc/file/FPreparedStatement.hxx | 1 | ||||
| -rw-r--r-- | connectivity/source/inc/java/sql/PreparedStatement.hxx | 1 | ||||
| -rw-r--r-- | connectivity/source/inc/odbc/OFunctiondefs.hxx | 2 | ||||
| -rw-r--r-- | idl/source/objects/module.cxx | 27 | ||||
| -rw-r--r-- | oovbaapi/ooo/vba/XFileDialogSelectedItems.idl | 4 | ||||
| -rw-r--r-- | vbahelper/source/vbahelper/vbahelper.cxx | 3 | ||||
| -rw-r--r-- | xmloff/source/core/XMLEmbeddedObjectImportContext.cxx | 49 | ||||
| -rw-r--r-- | xmloff/source/core/xmluconv.cxx | 39 | ||||
| -rw-r--r-- | xmloff/source/meta/MetaExportComponent.cxx | 9 | ||||
| -rw-r--r-- | xmloff/source/style/xmlnumfe.cxx | 14 | ||||
| -rw-r--r-- | xmloff/source/style/xmlnumfi.cxx | 36 | ||||
| -rw-r--r-- | xmloff/source/text/XMLAutoTextEventExport.cxx | 12 |
13 files changed, 0 insertions, 199 deletions
diff --git a/connectivity/source/inc/ado/APreparedStatement.hxx b/connectivity/source/inc/ado/APreparedStatement.hxx index 33f504349679..585c9ff20a02 100644 --- a/connectivity/source/inc/ado/APreparedStatement.hxx +++ b/connectivity/source/inc/ado/APreparedStatement.hxx @@ -29,12 +29,10 @@ #ifndef _CONNECTIVITY_ADO_APREPAREDSTATEMENT_HXX_ #define _CONNECTIVITY_ADO_APREPAREDSTATEMENT_HXX_ - #include "ado/AStatement.hxx" #include <com/sun/star/sdbc/XPreparedStatement.hpp> #include <com/sun/star/sdbc/XParameters.hpp> #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> -// #include <com/sun/star/sdbc/XClearParameters.hpp> #include <com/sun/star/sdbc/XPreparedBatchExecution.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/connectivity/source/inc/file/FPreparedStatement.hxx b/connectivity/source/inc/file/FPreparedStatement.hxx index f6e7eee77ed9..79cfd67eda3c 100644 --- a/connectivity/source/inc/file/FPreparedStatement.hxx +++ b/connectivity/source/inc/file/FPreparedStatement.hxx @@ -34,7 +34,6 @@ #include <com/sun/star/sdbc/XPreparedStatement.hpp> #include <com/sun/star/sdbc/XParameters.hpp> #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> -// #include <com/sun/star/sdbc/XClearParameters.hpp> #include <com/sun/star/sdbc/XPreparedBatchExecution.hpp> #include <com/sun/star/io/XInputStream.hpp> #include "file/FResultSet.hxx" diff --git a/connectivity/source/inc/java/sql/PreparedStatement.hxx b/connectivity/source/inc/java/sql/PreparedStatement.hxx index 6042c3cbf7f8..749b57a1db51 100644 --- a/connectivity/source/inc/java/sql/PreparedStatement.hxx +++ b/connectivity/source/inc/java/sql/PreparedStatement.hxx @@ -31,7 +31,6 @@ #include "java/sql/JStatement.hxx" #include <com/sun/star/sdbc/XPreparedStatement.hpp> #include <com/sun/star/sdbc/XParameters.hpp> -// #include <com/sun/star/sdbc/XClearParameters.hpp> #include <com/sun/star/sdbc/XPreparedBatchExecution.hpp> #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/connectivity/source/inc/odbc/OFunctiondefs.hxx b/connectivity/source/inc/odbc/OFunctiondefs.hxx index e0ffbe91b6fc..3c8dd122275b 100644 --- a/connectivity/source/inc/odbc/OFunctiondefs.hxx +++ b/connectivity/source/inc/odbc/OFunctiondefs.hxx @@ -107,8 +107,6 @@ #define SQL_FETCH_PRIOR SQL_FETCH_PREV #define SQL_NO_TOTAL (-4) -// #include "odbc3defs.hxx" - #endif // In der ODBC.H von Watcom werden Strings als char * erwartet diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx index 7545fa0118ea..061740e0ee86 100644 --- a/idl/source/objects/module.cxx +++ b/idl/source/objects/module.cxx @@ -42,9 +42,7 @@ SV_IMPL_META_FACTORY1( SvMetaModule, SvMetaExtern ); /************************************************************************* -|* |* SvMetaModule::SvMetaModule() -|* *************************************************************************/ SvMetaModule::SvMetaModule() #ifdef IDL_COMPILER @@ -63,9 +61,7 @@ SvMetaModule::SvMetaModule( const String & rIdlFileName, BOOL bImp ) #endif /************************************************************************* -|* |* SvMetaModule::Load() -|* *************************************************************************/ #define MODULE_VER 0x0001 void SvMetaModule::Load( SvPersistStream & rStm ) @@ -102,9 +98,7 @@ void SvMetaModule::Load( SvPersistStream & rStm ) } /************************************************************************* -|* |* SvMetaModule::Save() -|* *************************************************************************/ void SvMetaModule::Save( SvPersistStream & rStm ) { @@ -138,9 +132,7 @@ void SvMetaModule::Save( SvPersistStream & rStm ) } /************************************************************************* -|* |* SvMetaModule::SetName() -|* *************************************************************************/ BOOL SvMetaModule::SetName( const ByteString & rName, SvIdlDataBase * pBase ) { @@ -155,8 +147,6 @@ BOOL SvMetaModule::SetName( const ByteString & rName, SvIdlDataBase * pBase ) #ifdef IDL_COMPILER /************************************************************************* |* SvMetaModule::GetNextName() -|* -|* Beschreibung *************************************************************************/ BOOL SvMetaModule::FillNextName( SvGlobalName * pName ) { @@ -173,8 +163,6 @@ BOOL SvMetaModule::FillNextName( SvGlobalName * pName ) /************************************************************************* |* SvMetaModule::ReadSvIdl() -|* -|* Beschreibung *************************************************************************/ void SvMetaModule::ReadAttributesSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) @@ -201,8 +189,6 @@ void SvMetaModule::ReadAttributesSvIdl( SvIdlDataBase & rBase, /************************************************************************* |* SvMetaModule::WriteAttributesSvIdl() -|* -|* Beschreibung *************************************************************************/ void SvMetaModule::WriteAttributesSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, @@ -234,8 +220,6 @@ void SvMetaModule::WriteAttributesSvIdl( SvIdlDataBase & rBase, /************************************************************************* |* SvMetaModule::ReadContextSvIdl() -|* -|* Beschreibung *************************************************************************/ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) @@ -348,8 +332,6 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase, /************************************************************************* |* SvMetaModule::WriteContextSvIdl() -|* -|* Beschreibung *************************************************************************/ void SvMetaModule::WriteContextSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, @@ -377,11 +359,7 @@ void SvMetaModule::WriteContextSvIdl( SvIdlDataBase & rBase, } /************************************************************************* -|* |* SvMetaModule::ReadSvIdl() -|* -|* Beschreibung -|* *************************************************************************/ BOOL SvMetaModule::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { @@ -425,11 +403,7 @@ BOOL SvMetaModule::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) } /************************************************************************* -|* |* SvMetaModule::WriteSvIdl() -|* -|* Beschreibung -|* *************************************************************************/ void SvMetaModule::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab ) @@ -590,7 +564,6 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm, void SvMetaModule::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm, Table * pTable ) { -// rOutStm << "#pragma CHARSET IBMPC" << endl; if( aSlotIdFile.Len() ) rOutStm << "//#include <" << aSlotIdFile.GetBuffer() << '>' << endl; for( ULONG n = 0; n < aClassList.Count(); n++ ) diff --git a/oovbaapi/ooo/vba/XFileDialogSelectedItems.idl b/oovbaapi/ooo/vba/XFileDialogSelectedItems.idl index 6ff2138de7f2..103ffac55a96 100644 --- a/oovbaapi/ooo/vba/XFileDialogSelectedItems.idl +++ b/oovbaapi/ooo/vba/XFileDialogSelectedItems.idl @@ -30,10 +30,6 @@ #ifndef __ooo_vba_excel_XFileDialogSelectedItems_idl__ #define __ooo_vba_excel_XFileDialogSelectedItems_idl__ -// #ifndef __com_sun_star_uno_XInterface_idl__ -// #include <com/sun/star/uno/XInterface.idl> -// #endif - #ifndef __ooo_vba_XCollection_idl__ #include <ooo/vba/XCollection.idl> #endif diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx index fc3e9dc3b176..cc692b0ce685 100644 --- a/vbahelper/source/vbahelper/vbahelper.cxx +++ b/vbahelper/source/vbahelper/vbahelper.cxx @@ -79,9 +79,6 @@ #include <vbahelper/vbahelper.hxx> #include <sfx2/app.hxx> -// #FIXME needs service -//#include "vbashape.hxx" -//#include "unonames.hxx" using namespace ::com::sun::star; using namespace ::ooo::vba; diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx index 50930a093cf7..c66e720c6016 100644 --- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx +++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx @@ -32,9 +32,6 @@ #include <com/sun/star/util/XModifiable.hpp> #include <com/sun/star/util/XModifiable2.hpp> #include <com/sun/star/frame/XStorable.hpp> - -// #110680# -//#include <comphelper/processfactory.hxx> #include <tools/globname.hxx> #include <sot/clsids.hxx> #include <tools/globname.hxx> @@ -166,8 +163,6 @@ sal_Bool XMLEmbeddedObjectImportContext::SetComponent( Sequence<Any> aArgs( 0 ); - // #110680# - // Reference< XMultiServiceFactory > xServiceFactory = comphelper::getProcessServiceFactory(); Reference< XMultiServiceFactory > xServiceFactory = GetImport().getServiceFactory(); xHandler = Reference < XDocumentHandler >( @@ -331,30 +326,6 @@ void XMLEmbeddedObjectImportContext::EndElement() GetPrefix(), GetLocalName() ) ); xHandler->endDocument(); - - // storing part is commented out since it should be done through the object, not the model - // TODO/LATER: probably an object should be provided here an be stored here - -// // Save the object. That's required because the object should not be -// // modified (it has been loaded just now). Setting it to unmodified -// // only does not work, because it is then assumed that it has been -// // stored. -// Reference < XStorable > xStorable( xComp, UNO_QUERY ); -// if( xStorable.is() ) -// { -// try -// { -// xStorable->store(); -// } -// catch( ::com::sun::star::beans::PropertyVetoException& ) -// { -// Sequence<OUString> aSeq( 0 ); -// GetImport().SetError( XMLERROR_FLAG_WARNING | -// XMLERROR_API, -// aSeq ); -// } -// } - try { Reference < XModifiable2 > xModifiable2( xComp, UNO_QUERY_THROW ); @@ -364,25 +335,6 @@ void XMLEmbeddedObjectImportContext::EndElement() catch( Exception& ) { } - - -// // reset modifies state for the object since it has been imported -// // completly and therfor hasn't been modified. -// Reference < XModifiable > xModifiable( xComp, UNO_QUERY ); -// if( xModifiable.is() ) -// { -// try -// { -// xModifiable->setModified( sal_False ); -// } -// catch( ::com::sun::star::beans::PropertyVetoException& e ) -// { -// Sequence<OUString> aSeq( 0 ); -// GetImport().SetError( XMLERROR_FLAG_WARNING | -// XMLERROR_API, -// aSeq ); -// } -// } } } @@ -392,5 +344,4 @@ void XMLEmbeddedObjectImportContext::Characters( const ::rtl::OUString& rChars ) xHandler->characters( rChars ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx index 6087ac79a885..5a1b0a0dba05 100644 --- a/xmloff/source/core/xmluconv.cxx +++ b/xmloff/source/core/xmluconv.cxx @@ -42,16 +42,12 @@ #ifndef _TOOLS_DATE_HXX #include <tools/date.hxx> - #include <tools/string.hxx> - #endif #include <tools/time.hxx> #include <tools/fldunit.hxx> -// #110680# -//#include <comphelper/processfactory.hxx> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/style/NumberingType.hpp> #include <com/sun/star/text/XNumberingTypeInfo.hpp> @@ -87,12 +83,6 @@ void SvXMLUnitConverter::initXMLStrings() void SvXMLUnitConverter::createNumTypeInfo() const { - // #110680# - //Reference< lang::XMultiServiceFactory > xServiceFactory = - // comphelper::getProcessServiceFactory(); - //OSL_ENSURE( xServiceFactory.is(), - // "XMLUnitConverter: got no service factory" ); - if( mxServiceFactory.is() ) { ((SvXMLUnitConverter *)this)->xNumTypeInfo = @@ -107,9 +97,6 @@ void SvXMLUnitConverter::createNumTypeInfo() const the default unit for textual measures */ -// #110680# -//SvXMLUnitConverter::SvXMLUnitConverter( MapUnit eCoreMeasureUnit, -// MapUnit eXMLMeasureUnit ) : SvXMLUnitConverter::SvXMLUnitConverter( MapUnit eCoreMeasureUnit, MapUnit eXMLMeasureUnit, @@ -147,11 +134,6 @@ MapUnit SvXMLUnitConverter::GetMapUnit(sal_Int16 nFieldUnit) case FUNIT_PICA: eUnit = MAP_POINT; break; -// case FUNIT_INCH: -// case FUNIT_FOOT: -// case FUNIT_MILE: -// eUnit = MAP_INCH; -// break; case FUNIT_100TH_MM: eUnit = MAP_100TH_MM; break; @@ -279,11 +261,6 @@ sal_Bool SvXMLUnitConverter::convertMeasure( sal_Int32& rValue, break; case sal_Unicode('e'): case sal_Unicode('E'): - // pCmp1 = sXML_unit_em; - // nToken1 = CSS1_EMS; - - // pCmp2 = sXML_unit_ex; - // nToken2 = CSS1_EMX; break; case sal_Unicode('i'): case sal_Unicode('I'): @@ -306,9 +283,6 @@ sal_Bool SvXMLUnitConverter::convertMeasure( sal_Int32& rValue, aCmpsL[1] = "pc"; aCmpsU[1] = "PC"; aScales[1] = 12.*20.; // twip - - // pCmp3 = sXML_unit_px; - // nToken3 = CSS1_PIXLENGTH; break; } } @@ -325,11 +299,6 @@ sal_Bool SvXMLUnitConverter::convertMeasure( sal_Int32& rValue, break; case sal_Unicode('e'): case sal_Unicode('E'): - // pCmp1 = sXML_unit_em; - // nToken1 = CSS1_EMS; - - // pCmp2 = sXML_unit_ex; - // nToken2 = CSS1_EMX; break; case sal_Unicode('i'): case sal_Unicode('I'): @@ -352,9 +321,6 @@ sal_Bool SvXMLUnitConverter::convertMeasure( sal_Int32& rValue, aCmpsL[1] = "pc"; aCmpsU[1] = "PC"; aScales[1] = (10.0 * nScaleFactor*2.54)/12.; // mm/100 - - // pCmp3 = sXML_unit_px; - // nToken3 = CSS1_PIXLENGTH; break; } } @@ -1361,8 +1327,6 @@ sal_Int32 SvXMLUnitConverter::indexOfComma( const OUString& rStr, return -1; } -// --- - SvXMLTokenEnumerator::SvXMLTokenEnumerator( const OUString& rString, sal_Unicode cSeperator /* = sal_Unicode(' ') */ ) : maTokenString( rString ), mnNextTokenPos(0), mcSeperator( cSeperator ) { @@ -1394,7 +1358,6 @@ sal_Bool SvXMLTokenEnumerator::getNextToken( OUString& rToken ) return sal_True; } -// --- bool lcl_getPositions(const OUString& _sValue,OUString& _rContentX,OUString& _rContentY,OUString& _rContentZ) { if(!_sValue.getLength() || _sValue[0] != '(') @@ -1778,8 +1741,6 @@ void SvXMLUnitConverter::convertNumLetterSync( OUStringBuffer& rBuffer, case NumberingType::ROMAN_LOWER: case NumberingType::ARABIC: case NumberingType::NUMBER_NONE: - // default - // eSync = XML_FALSE; break; case NumberingType::CHARS_UPPER_LETTER_N: diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx index 288857a7977c..ce5787fb5e41 100644 --- a/xmloff/source/meta/MetaExportComponent.cxx +++ b/xmloff/source/meta/MetaExportComponent.cxx @@ -34,12 +34,8 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Reference.hxx> - #include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> - -// #110680# -//#include <comphelper/processfactory.hxx> #include <comphelper/genericpropertyset.hxx> #include <rtl/ustrbuf.hxx> #include "xmlnmspe.hxx" @@ -55,7 +51,6 @@ using namespace ::com::sun::star; using namespace ::xmloff::token; -// #110680# XMLMetaExportComponent::XMLMetaExportComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, sal_uInt16 nFlags ) @@ -214,8 +209,6 @@ uno::Reference< uno::XInterface > SAL_CALL XMLMetaExportComponent_createInstance const uno::Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception ) { - // #110680# - // return (cppu::OWeakObject*)new XMLMetaExportComponent; return (cppu::OWeakObject*)new XMLMetaExportComponent(rSMgr, EXPORT_META|EXPORT_OASIS); } @@ -237,8 +230,6 @@ uno::Reference< uno::XInterface > SAL_CALL XMLMetaExportOOO_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception ) { - // #110680# - // return (cppu::OWeakObject*)new XMLMetaExportComponent; return (cppu::OWeakObject*)new XMLMetaExportComponent(rSMgr, EXPORT_META); } diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index e1e62eef0249..e44163c3ab24 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -44,9 +44,6 @@ #include <com/sun/star/lang/Locale.hpp> #include <rtl/ustrbuf.hxx> -// #110680# -//#include <comphelper/processfactory.hxx> - #include <com/sun/star/i18n/NativeNumberXmlAttributes.hpp> #include <xmloff/xmlnumfe.hxx> @@ -74,8 +71,6 @@ using namespace ::svt; //------------------------------------------------------------------------- -// 4th condition for text formats doesn't work -//#define XMLNUM_MAX_PARTS 4 #define XMLNUM_MAX_PARTS 3 //------------------------------------------------------------------------- @@ -270,9 +265,6 @@ SvXMLNumFmtExport::SvXMLNumFmtExport( { lang::Locale aLocale( MsLangId::convertLanguageToLocale( MsLangId::getSystemLanguage() ) ); - // #110680# - // pCharClass = new CharClass( ::comphelper::getProcessServiceFactory(), aLocale ); - // pLocaleData = new LocaleDataWrapper( ::comphelper::getProcessServiceFactory(), aLocale ); pCharClass = new CharClass( rExport.getServiceFactory(), aLocale ); pLocaleData = new LocaleDataWrapper( rExport.getServiceFactory(), aLocale ); } @@ -308,9 +300,6 @@ SvXMLNumFmtExport::SvXMLNumFmtExport( { lang::Locale aLocale( MsLangId::convertLanguageToLocale( MsLangId::getSystemLanguage() ) ); - // #110680# - // pCharClass = new CharClass( ::comphelper::getProcessServiceFactory(), aLocale ); - // pLocaleData = new LocaleDataWrapper( ::comphelper::getProcessServiceFactory(), aLocale ); pCharClass = new CharClass( rExport.getServiceFactory(), aLocale ); pLocaleData = new LocaleDataWrapper( rExport.getServiceFactory(), aLocale ); } @@ -815,9 +804,6 @@ sal_Bool SvXMLNumFmtExport::WriteTextWithCurrency_Impl( const OUString& rString, sal_Bool bRet = sal_False; -// pLocaleData->setLocale( rLocale ); -// String sCurString = pLocaleData->getCurrSymbol(); - LanguageType nLang = MsLangId::convertLocaleToLanguage( rLocale ); pFormatter->ChangeIntl( nLang ); String sCurString, sDummy; diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index d10251acd2f0..9cba23627df5 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -41,9 +41,6 @@ #include <tools/debug.hxx> #include <rtl/ustrbuf.hxx> -// #110680# -//#include <comphelper/processfactory.hxx> - #include <xmloff/xmlnumfi.hxx> #include <xmloff/xmltkmap.hxx> #include "xmlnmspe.hxx" @@ -103,12 +100,9 @@ class SvXMLNumImpData LocaleDataWrapper* pLocaleData; SvXMLNumFmtEntryArr aNameEntries; - // #110680# ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxServiceFactory; public: - // #110680# - // SvXMLNumImpData( SvNumberFormatter* pFmt ); SvXMLNumImpData( SvNumberFormatter* pFmt, const uno::Reference<lang::XMultiServiceFactory>& xServiceFactory ); @@ -394,8 +388,6 @@ SV_IMPL_OP_PTRARR_SORT( SvXMLEmbeddedElementArr, SvXMLEmbeddedElementPtr ); // SvXMLNumImpData // -// #110680# -// SvXMLNumImpData::SvXMLNumImpData( SvNumberFormatter* pFmt ) : SvXMLNumImpData::SvXMLNumImpData( SvNumberFormatter* pFmt, const uno::Reference<lang::XMultiServiceFactory>& xServiceFactory ) @@ -406,7 +398,6 @@ SvXMLNumImpData::SvXMLNumImpData( pStyleElemAttrTokenMap(NULL), pLocaleData(NULL), - // #110680# mxServiceFactory(xServiceFactory) { DBG_ASSERT( mxServiceFactory.is(), "got no service manager" ); @@ -615,11 +606,6 @@ const SvXMLTokenMap& SvXMLNumImpData::GetStyleElemAttrTokenMap() const LocaleDataWrapper& SvXMLNumImpData::GetLocaleData( LanguageType nLang ) { if ( !pLocaleData ) - // #110680# - //pLocaleData = new LocaleDataWrapper( - // (pFormatter ? pFormatter->GetServiceManager() : - // ::comphelper::getProcessServiceFactory()), - // MsLangId::convertLanguageToLocale( nLang ) ); pLocaleData = new LocaleDataWrapper( (pFormatter ? pFormatter->GetServiceManager() : mxServiceFactory), @@ -1093,7 +1079,6 @@ void SvXMLNumFmtElementContext::EndElement() if ( rParent.ReplaceNfKeyword( NF_KEY_NNN, NF_KEY_NNNN ) ) { - //!aContent.setLength(0); //! doesn't work, #76293# aContent = OUStringBuffer(); } @@ -1327,7 +1312,6 @@ SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport, switch (nToken) { case XML_TOK_STYLE_ATTR_NAME: -// aName = sValue; break; case XML_TOK_STYLE_ATTR_LANGUAGE: sLanguage = sValue; @@ -1709,7 +1693,6 @@ sal_Int32 SvXMLNumFormatContext::CreateAndInsert(SvNumberFormatter* pFormatter) void SvXMLNumFormatContext::Finish( sal_Bool bOverwrite ) { SvXMLStyleContext::Finish( bOverwrite ); -// AddCondition(); } const LocaleDataWrapper& SvXMLNumFormatContext::GetLocaleData() const @@ -1865,10 +1848,6 @@ void SvXMLNumFormatContext::AddCurrency( const rtl::OUString& rContent, Language OUString aSymbol = rContent; if ( aSymbol.getLength() == 0 ) { - // get currency symbol for language - - //aSymbol = pData->GetLocaleData( nFormatLang ).getCurrSymbol(); - SvNumberFormatter* pFormatter = pData->GetNumberFormatter(); if ( pFormatter ) { @@ -2185,9 +2164,6 @@ sal_Bool SvXMLNumFormatContext::IsSystemLanguage() // SvXMLNumFmtHelper // -// #110680# -//SvXMLNumFmtHelper::SvXMLNumFmtHelper( -// const uno::Reference<util::XNumberFormatsSupplier>& rSupp ) SvXMLNumFmtHelper::SvXMLNumFmtHelper( const uno::Reference<util::XNumberFormatsSupplier>& rSupp, const uno::Reference<lang::XMultiServiceFactory>& xServiceFactory ) @@ -2201,13 +2177,9 @@ SvXMLNumFmtHelper::SvXMLNumFmtHelper( if (pObj) pFormatter = pObj->GetNumberFormatter(); - // #110680# - // pData = new SvXMLNumImpData( pFormatter ); pData = new SvXMLNumImpData( pFormatter, mxServiceFactory ); } -// #110680# -// SvXMLNumFmtHelper::SvXMLNumFmtHelper( SvNumberFormatter* pNumberFormatter ) SvXMLNumFmtHelper::SvXMLNumFmtHelper( SvNumberFormatter* pNumberFormatter, const uno::Reference<lang::XMultiServiceFactory>& xServiceFactory ) @@ -2215,8 +2187,6 @@ SvXMLNumFmtHelper::SvXMLNumFmtHelper( { DBG_ASSERT( mxServiceFactory.is(), "got no service manager" ); - // #110680# - // pData = new SvXMLNumImpData( pNumberFormatter ); pData = new SvXMLNumImpData( pNumberFormatter, mxServiceFactory ); } @@ -2260,10 +2230,4 @@ const SvXMLTokenMap& SvXMLNumFmtHelper::GetStylesElemTokenMap() return pData->GetStylesElemTokenMap(); } -/*sal_uInt32 SvXMLNumFmtHelper::GetKeyForName( const rtl::OUString& rName ) -{ - return pData->GetKeyForName( rName ); -}*/ - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLAutoTextEventExport.cxx b/xmloff/source/text/XMLAutoTextEventExport.cxx index ddbe3853beba..a0f40f108abb 100644 --- a/xmloff/source/text/XMLAutoTextEventExport.cxx +++ b/xmloff/source/text/XMLAutoTextEventExport.cxx @@ -37,11 +37,7 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> - #include <com/sun/star/uno/Exception.hpp> - -// #110680# -//#include <comphelper/processfactory.hxx> #include <rtl/ustrbuf.hxx> #include "xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> @@ -53,8 +49,6 @@ using namespace ::com::sun::star; using namespace ::xmloff::token; -// #110680# -// using ::comphelper::getProcessServiceFactory; using ::rtl::OUString; using ::rtl::OUStringBuffer; using ::std::set; @@ -77,7 +71,6 @@ using ::com::sun::star::xml::sax::XDocumentHandler; const sal_Char sAPI_AutoText[] = "com.sun.star.text.AutoTextContainer"; -// #110680# XMLAutoTextEventExport::XMLAutoTextEventExport( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, sal_uInt16 nFlags @@ -88,7 +81,6 @@ XMLAutoTextEventExport::XMLAutoTextEventExport( { } -// #110680# XMLAutoTextEventExport::XMLAutoTextEventExport( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, const OUString& rFileName, @@ -262,8 +254,6 @@ Reference< XInterface > SAL_CALL XMLAutoTextEventExport_createInstance( const Reference< XMultiServiceFactory > & rSMgr) throw( Exception ) { - // #110680# - // return (cppu::OWeakObject*)new XMLAutoTextEventExport; return (cppu::OWeakObject*)new XMLAutoTextEventExport(rSMgr, EXPORT_ALL|EXPORT_OASIS); } @@ -287,8 +277,6 @@ Reference< XInterface > SAL_CALL XMLAutoTextEventExportOOO_createInstance( const Reference< XMultiServiceFactory > & rSMgr) throw( Exception ) { - // #110680# - // return (cppu::OWeakObject*)new XMLAutoTextEventExport; return (cppu::OWeakObject*)new XMLAutoTextEventExport(rSMgr,EXPORT_ALL); } |