From 2e801b9933e318fe5e323e86758aa38b4b6a553d Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 29 Jan 2013 17:21:43 +0200 Subject: fdo#46808, remove unused header file The inline method in the header file is no longer used anywhere. Change-Id: If3ee13778e45edb619393e6adb2daa38d6cf4d35 --- unotools/source/i18n/calendarwrapper.cxx | 1 - unotools/source/i18n/instance.hxx | 60 ------------------------- unotools/source/i18n/localedatawrapper.cxx | 1 - unotools/source/i18n/transliterationwrapper.cxx | 1 - 4 files changed, 63 deletions(-) delete mode 100644 unotools/source/i18n/instance.hxx (limited to 'unotools') diff --git a/unotools/source/i18n/calendarwrapper.cxx b/unotools/source/i18n/calendarwrapper.cxx index 857065221008..f75b157d9c64 100644 --- a/unotools/source/i18n/calendarwrapper.cxx +++ b/unotools/source/i18n/calendarwrapper.cxx @@ -22,7 +22,6 @@ #include #include #include -#include #include #include diff --git a/unotools/source/i18n/instance.hxx b/unotools/source/i18n/instance.hxx deleted file mode 100644 index 074da8363e64..000000000000 --- a/unotools/source/i18n/instance.hxx +++ /dev/null @@ -1,60 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * Version: MPL 1.1 / GPLv3+ / LGPLv3+ - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License or as specified alternatively below. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * Major Contributor(s): - * Copyright (C) 2011 Novell, Inc (initial developer) - * - * All Rights Reserved. - * - * For minor contributions see the git repository. - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 3 or later (the "GPLv3+"), or - * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), - * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable - * instead of those above. - */ -#ifndef _INTL_INSTANCE_HXX -#define _INTL_INSTANCE_HXX - -#include -#include -#include - -// Helper to share code between activators with a fallback MSF. -// Potentially this may also needs to find the library the component -// is implemented inside, but at least centralises this. -inline css::uno::Reference - intl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & xOptSF, - const char *serviceName, const char *context ) -{ - css::uno::Reference xRet; - css::uno::Reference xSMgr( xOptSF ); - try - { - if (!xSMgr.is()) - xSMgr = ::comphelper::getProcessServiceFactory(); - xRet = xSMgr->createInstance( rtl::OUString::createFromAscii( serviceName ) ); - } - catch (const css::uno::Exception &e) - { - SAL_WARN( "unotools.i18n", context << "ctor:Exception caught " << e.Message ); - xRet = css::uno::Reference(); - } - return xRet; -} - -#endif // _INTL_INSTANCE_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx index 8e283b6f9d09..93c112bb62df 100644 --- a/unotools/source/i18n/localedatawrapper.cxx +++ b/unotools/source/i18n/localedatawrapper.cxx @@ -29,7 +29,6 @@ #include #include -#include "instance.hxx" #include #include #include diff --git a/unotools/source/i18n/transliterationwrapper.cxx b/unotools/source/i18n/transliterationwrapper.cxx index a2c57fe7bc64..3a41dcb976f6 100644 --- a/unotools/source/i18n/transliterationwrapper.cxx +++ b/unotools/source/i18n/transliterationwrapper.cxx @@ -22,7 +22,6 @@ #include #include -#include "instance.hxx" #include #include -- cgit