summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bf_sc/source/core/data/sc_global.cxx2
-rw-r--r--bf_sw/source/core/bastyp/sw_init.cxx4
-rw-r--r--inc/bf_svtools/ondemand.hxx3
-rw-r--r--inc/bf_sw/swcalwrp.hxx48
4 files changed, 3 insertions, 54 deletions
diff --git a/bf_sc/source/core/data/sc_global.cxx b/bf_sc/source/core/data/sc_global.cxx
index bc6a4e35e..eabcd5577 100644
--- a/bf_sc/source/core/data/sc_global.cxx
+++ b/bf_sc/source/core/data/sc_global.cxx
@@ -396,7 +396,7 @@ void global_InitAppOptions();
/*N*/ pSysLocale = new SvtSysLocale;
/*N*/ pCharClass = pSysLocale->GetCharClassPtr();
/*N*/ pLocaleData = pSysLocale->GetLocaleDataPtr();
-/*N*/ pCalendar = new CalendarWrapper( ::legacy_binfilters::getLegacyProcessServiceFactory() );
+/*N*/ pCalendar = new CalendarWrapper( comphelper::getComponentContext( ::legacy_binfilters::getLegacyProcessServiceFactory() ) );
/*N*/ pCalendar->loadDefaultCalendar( *pLocale );
/*N*/ pCollator = new CollatorWrapper( ::legacy_binfilters::getLegacyProcessServiceFactory() );
/*N*/ pCollator->loadDefaultCollator( *pLocale, SC_COLLATOR_IGNORES );
diff --git a/bf_sw/source/core/bastyp/sw_init.cxx b/bf_sw/source/core/bastyp/sw_init.cxx
index 1b5506f8b..e645ab673 100644
--- a/bf_sw/source/core/bastyp/sw_init.cxx
+++ b/bf_sw/source/core/bastyp/sw_init.cxx
@@ -124,7 +124,6 @@
#include <breakit.hxx>
#include <checkit.hxx>
-#include <swcalwrp.hxx>
#include <SwStyleNameMapper.hxx>
#include <legacysmgr/legacy_binfilters_smgr.hxx>
namespace binfilter {
@@ -403,7 +402,6 @@ SvPtrarr *pGlobalOLEExcludeList = 0;
SwBreakIt* pBreakIt = 0;
SwCheckIt* pCheckIt = 0;
CharClass* pAppCharClass = 0;
-SwCalendarWrapper* pCalendarWrapper = 0;
CollatorWrapper* pCollator = 0, *pCaseCollator = 0;
::utl::TransliterationWrapper* pTransWrp = 0;
@@ -698,7 +696,6 @@ public:
/*N*/ ::com::sun::star::lang::XMultiServiceFactory > xMSF =
/*N*/ ::legacy_binfilters::getLegacyProcessServiceFactory();
/*N*/ pAppCharClass = new CharClass( xMSF, rLcl );
-/*N*/ pCalendarWrapper = new SwCalendarWrapper( xMSF );
/*N*/
/*N*/ _FrmInit();
/*N*/ _TextInit();
@@ -726,7 +723,6 @@ public:
/*N*/ delete pBreakIt;
/*M*/ delete pCheckIt;
/*N*/ delete pAppCharClass;
-/*N*/ delete pCalendarWrapper;
/*N*/ delete pCollator;
/*N*/ delete pCaseCollator;
/*N*/
diff --git a/inc/bf_svtools/ondemand.hxx b/inc/bf_svtools/ondemand.hxx
index 3721fe53a..007891b6f 100644
--- a/inc/bf_svtools/ondemand.hxx
+++ b/inc/bf_svtools/ondemand.hxx
@@ -28,6 +28,7 @@
#include <unotools/calendarwrapper.hxx>
#include <unotools/collatorwrapper.hxx>
#include <com/sun/star/i18n/CollatorOptions.hpp>
+#include <comphelper/processfactory.hxx>
#include <unotools/transliterationwrapper.hxx>
#include <com/sun/star/i18n/TransliterationModules.hpp>
#include <unotools/nativenumberwrapper.hxx>
@@ -226,7 +227,7 @@ public:
if ( !bValid )
{
if ( !pPtr )
- pPtr = new CalendarWrapper( xSMgr );
+ pPtr = new CalendarWrapper( comphelper::getComponentContext( xSMgr ) );
pPtr->loadDefaultCalendar( aLocale );
bValid = true;
}
diff --git a/inc/bf_sw/swcalwrp.hxx b/inc/bf_sw/swcalwrp.hxx
deleted file mode 100644
index 8cc4c16be..000000000
--- a/inc/bf_sw/swcalwrp.hxx
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _SWCALWRP_HXX
-#define _SWCALWRP_HXX
-
-#include <i18npool/lang.h>
-#include <bf_tools/string.hxx>
-#include <unotools/calendarwrapper.hxx>
-namespace binfilter {
-
-class SwCalendarWrapper : public CalendarWrapper
-{
- String sUniqueId;
- USHORT nLang;
-
-public:
- SwCalendarWrapper( const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XMultiServiceFactory > & xMSF )
- : CalendarWrapper( xMSF ), nLang( LANGUAGE_SYSTEM )
- {}
-
-};
-
-
-extern SwCalendarWrapper* pCalendarWrapper;
-
-
-} //namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */