From 3d1e29c55b4322f6113842123e5c0ee43df03a16 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 18 Aug 2015 15:29:50 +0200 Subject: Remove newly unused ucbhelper/fileidentifierconverter.hxx Change-Id: I7c272383ecb115e19699ed96bf5622d979403a01 --- include/ucbhelper/fileidentifierconverter.hxx | 97 ---------------------- package/inc/pch/precompiled_package2.hxx | 1 - svl/source/fsstor/fsfactory.cxx | 1 - ucbhelper/Library_ucbhelper.mk | 1 - .../source/client/fileidentifierconverter.cxx | 77 ----------------- unotools/inc/pch/precompiled_utl.hxx | 1 - 6 files changed, 178 deletions(-) delete mode 100644 include/ucbhelper/fileidentifierconverter.hxx delete mode 100644 ucbhelper/source/client/fileidentifierconverter.cxx diff --git a/include/ucbhelper/fileidentifierconverter.hxx b/include/ucbhelper/fileidentifierconverter.hxx deleted file mode 100644 index 27e7c8e0c448..000000000000 --- a/include/ucbhelper/fileidentifierconverter.hxx +++ /dev/null @@ -1,97 +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 INCLUDED_UCBHELPER_FILEIDENTIFIERCONVERTER_HXX -#define INCLUDED_UCBHELPER_FILEIDENTIFIERCONVERTER_HXX - -#include -#include -#include -#include - -namespace com { namespace sun { namespace star { namespace ucb { - class XUniversalContentBroker; -} } } } - -namespace ucbhelper { - -/** Using a specific content provider manager, convert a file path in system - dependent notation to a (file) URL. - - @param rManager - A content provider manager. Must not be null. - - @param rBaseURL - See the corresponding parameter of - com::sun::star::ucb::XFileIdentifierConverter::getFileURLFromSystemPath(). - - @param rURL - See the corresponding parameter of - com::sun::star::ucb::XFileIdentifierConverter::getFileURLFromSystemPath(). - - @returns - a URL, if the content provider registered at the content provider manager - that is responsible for the base URL returns a URL when calling - com::sun::star::ucb::XFileIdentiferConverter::getFileURLFromSystemPath() - on it. Otherwise, an empty string is returned. - - @see - com::sun::star::ucb::XFileIdentiferConverter::getFileURLFromSystemPath(). - */ -UCBHELPER_DLLPUBLIC OUString -getFileURLFromSystemPath( - com::sun::star::uno::Reference< - com::sun::star::ucb::XUniversalContentBroker > const & - rUcb, - OUString const & rBaseURL, - OUString const & rSystemPath); - - -/** Using a specific content provider manager, convert a (file) URL to a - file path in system dependent notation. - - @param rManager - A content provider manager. Must not be null. - - @param rURL - See the corresponding parameter of - com::sun::star::ucb::XFileIdentiferConverter::getSystemPathFromFileURL(). - - @returns - a system path, if the content provider registered at the content provider - manager that is responsible for the base URL returns a system path when - calling - com::sun::star::ucb::XFileIdentiferConverter::getSystemPathFromFileURL() - on it. Otherwise, an empty string is returned. - - @see - com::sun::star::ucb::XFileIdentiferConverter::getSystemPathFromFileURL(). - */ -UCBHELPER_DLLPUBLIC OUString -getSystemPathFromFileURL( - com::sun::star::uno::Reference< - com::sun::star::ucb::XUniversalContentBroker > const & - rUcb, - OUString const & rURL); - -} - -#endif // INCLUDED_UCBHELPER_FILEIDENTIFIERCONVERTER_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/inc/pch/precompiled_package2.hxx b/package/inc/pch/precompiled_package2.hxx index 8c5fff94ce0a..4d7b85aae90e 100644 --- a/package/inc/pch/precompiled_package2.hxx +++ b/package/inc/pch/precompiled_package2.hxx @@ -94,7 +94,6 @@ #include #include #include -#include #include #include diff --git a/svl/source/fsstor/fsfactory.cxx b/svl/source/fsstor/fsfactory.cxx index 5fa5339f8ea5..c9ad983ea073 100644 --- a/svl/source/fsstor/fsfactory.cxx +++ b/svl/source/fsstor/fsfactory.cxx @@ -26,7 +26,6 @@ #include #include -#include #include #include diff --git a/ucbhelper/Library_ucbhelper.mk b/ucbhelper/Library_ucbhelper.mk index 6787db13c4a6..6c338507e5d0 100644 --- a/ucbhelper/Library_ucbhelper.mk +++ b/ucbhelper/Library_ucbhelper.mk @@ -30,7 +30,6 @@ $(eval $(call gb_Library_add_exception_objects,ucbhelper,\ ucbhelper/source/client/activedatastreamer \ ucbhelper/source/client/commandenvironment \ ucbhelper/source/client/content \ - ucbhelper/source/client/fileidentifierconverter \ ucbhelper/source/client/interceptedinteraction \ ucbhelper/source/client/proxydecider \ ucbhelper/source/provider/authenticationfallback \ diff --git a/ucbhelper/source/client/fileidentifierconverter.cxx b/ucbhelper/source/client/fileidentifierconverter.cxx deleted file mode 100644 index 49169752a5a1..000000000000 --- a/ucbhelper/source/client/fileidentifierconverter.cxx +++ /dev/null @@ -1,77 +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 . - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -using namespace com::sun::star; - -namespace ucbhelper { - -// getFileURLFromSystemPath - - - -OUString -getFileURLFromSystemPath( - uno::Reference< ucb::XUniversalContentBroker > const & rUcb, - OUString const & rBaseURL, - OUString const & rSystemPath) -{ - OSL_ASSERT(rUcb.is()); - - uno::Reference< ucb::XFileIdentifierConverter > - xConverter(rUcb->queryContentProvider(rBaseURL), uno::UNO_QUERY); - if (xConverter.is()) - return xConverter->getFileURLFromSystemPath(rBaseURL, rSystemPath); - else - return OUString(); -} - - - -// getSystemPathFromFileURL - - - -OUString -getSystemPathFromFileURL( - uno::Reference< ucb::XUniversalContentBroker > const & rUcb, - OUString const & rURL) -{ - OSL_ASSERT(rUcb.is()); - - uno::Reference< ucb::XFileIdentifierConverter > - xConverter(rUcb->queryContentProvider(rURL), uno::UNO_QUERY); - if (xConverter.is()) - return xConverter->getSystemPathFromFileURL(rURL); - else - return OUString(); -} - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/inc/pch/precompiled_utl.hxx b/unotools/inc/pch/precompiled_utl.hxx index 14761a542031..dd498fce5d32 100644 --- a/unotools/inc/pch/precompiled_utl.hxx +++ b/unotools/inc/pch/precompiled_utl.hxx @@ -189,7 +189,6 @@ #include #include #include -#include #include #include #include -- cgit