diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-02-07 16:04:50 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-02-07 16:05:04 +0100 |
commit | 71eb11b3f78765ae1a06eeb7c94a0a38a71eab71 (patch) | |
tree | 27863ad3e297db4f2de5ba2b1054fdffe0f6e994 /xmloff/source/style | |
parent | e133940670eb1b113b445bbc1dd74547a8acd648 (diff) |
Remove dead code
Diffstat (limited to 'xmloff/source/style')
-rw-r--r-- | xmloff/source/style/xmlnumfe.cxx | 14 | ||||
-rw-r--r-- | xmloff/source/style/xmlnumfi.cxx | 36 |
2 files changed, 0 insertions, 50 deletions
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: */ |