diff options
author | Noel Grandin <noel@peralex.com> | 2013-08-28 13:13:59 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-08-29 09:30:14 +0200 |
commit | 02a3f860048b0be425106a7f5073e85a8b7edba1 (patch) | |
tree | b7e995a519f115d46108d7a490c41798c3aab45d /sfx2 | |
parent | 67b84a56841dcaefce211591b101143df6b1966e (diff) |
remove unnecessary header sfx2/source/inc/fltfnc.hxx
the only method it declares no longer exists, to inline its
includes into the places using it.
Change-Id: I1fed09835f221a34722dbdd3f33a079a373d8b36
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/appl/app.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/appl/appserv.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/bastyp/fltfnc.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/doc/docfac.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/docfile.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/docfilt.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/objcont.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/objmisc.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/doc/objstor.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/inc/fltfnc.hxx | 28 | ||||
-rw-r--r-- | sfx2/source/toolbox/tbxitem.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/view/viewfrm.cxx | 2 |
13 files changed, 6 insertions, 40 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index dc3895218943..4e5c46dea401 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -74,7 +74,6 @@ #include <sfx2/docfac.hxx> #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> -#include "fltfnc.hxx" #include <sfx2/new.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 56aa8f3cb4e9..d84fb829ed59 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -101,7 +101,6 @@ #include "sfxtypes.hxx" #include <sfx2/tabdlg.hxx> #include "arrdecl.hxx" -#include "fltfnc.hxx" #include <sfx2/sfx.hrc> #include "app.hrc" #include <sfx2/passwd.hxx> diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 28bf2416104a..1d13a3dddcfa 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -18,7 +18,6 @@ */ -#include "fltfnc.hxx" #include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/NamedValue.hpp> diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 69e3c0e9debf..08bf350dc1dd 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -52,7 +52,6 @@ #include <sfx2/sfx.hrc> #include "dialog.hrc" #include "arrdecl.hxx" -#include "fltfnc.hxx" #include <sfx2/docfilt.hxx> #include <sfx2/docfac.hxx> #include <sfx2/doctempl.hxx> diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx index 2fddca0e858b..e264cde449c6 100644 --- a/sfx2/source/doc/docfac.cxx +++ b/sfx2/source/doc/docfac.cxx @@ -37,7 +37,7 @@ #include <sfx2/docfilt.hxx> #include <sfx2/docfac.hxx> #include "sfx2/viewfac.hxx" -#include "fltfnc.hxx" +#include <sfx2/fcontnr.hxx> #include "arrdecl.hxx" #include <sfx2/app.hxx> #include <sfx2/module.hxx> diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index d92d826b8936..cfa7c67c304e 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -110,7 +110,7 @@ #include <sfx2/request.hxx> // SFX_ITEMSET_SET #include <sfx2/app.hxx> // GetFilterMatcher #include <sfx2/frame.hxx> // LoadTargetFrame -#include "fltfnc.hxx" // SfxFilterMatcher +#include <sfx2/fcontnr.hxx> // SfxFilterMatcher #include <sfx2/docfilt.hxx> // SfxFilter #include <sfx2/objsh.hxx> // CheckOpenMode #include <sfx2/docfac.hxx> // GetFilterContainer diff --git a/sfx2/source/doc/docfilt.cxx b/sfx2/source/doc/docfilt.cxx index dc9da4258282..b4d604eb56ef 100644 --- a/sfx2/source/doc/docfilt.cxx +++ b/sfx2/source/doc/docfilt.cxx @@ -30,7 +30,7 @@ #include <sfx2/docfac.hxx> #include <sfx2/docfilt.hxx> -#include "fltfnc.hxx" +#include <sfx2/fcontnr.hxx> #include <sfx2/sfxuno.hxx> #include <sfx2/objsh.hxx> diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index f16748272a02..84a17e3cfaee 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -54,7 +54,7 @@ #include "sfx2/sfxresid.hxx" #include "appdata.hxx" #include <sfx2/dinfdlg.hxx> -#include "fltfnc.hxx" +#include <sfx2/fcontnr.hxx> #include <sfx2/docfac.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/objsh.hxx> diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 6e57db81d789..3c82e7605b58 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -114,7 +114,6 @@ using namespace ::com::sun::star::container; #include <sfx2/objsh.hxx> #include "objshimp.hxx" #include <sfx2/event.hxx> -#include "fltfnc.hxx" #include <sfx2/sfx.hrc> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index eaef29f73300..8e1d8ce169f5 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -107,7 +107,7 @@ #include <sfx2/request.hxx> #include "sfx2/sfxresid.hxx" #include <sfx2/docfile.hxx> -#include "fltfnc.hxx" +#include <sfx2/fcontnr.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/docfac.hxx> #include "objshimp.hxx" diff --git a/sfx2/source/inc/fltfnc.hxx b/sfx2/source/inc/fltfnc.hxx deleted file mode 100644 index 0c2d984c6c0c..000000000000 --- a/sfx2/source/inc/fltfnc.hxx +++ /dev/null @@ -1,28 +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 _SFXFLTFNC_HXX -#define _SFXFLTFNC_HXX - -#include <sfx2/fcontnr.hxx> - -sal_Bool SfxIsHelpEntryURL( const String &rURL, const String &rExtMask ); - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index b535d0c8c8b0..ea1d3172f31b 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -72,7 +72,6 @@ #include <sfx2/tbxctrl.hxx> #include <sfx2/mnumgr.hxx> #include <sfx2/dispatch.hxx> -#include "fltfnc.hxx" #include <sfx2/msg.hxx> #include <sfx2/msgpool.hxx> #include "statcach.hxx" diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 08487f546018..a054ba4dfad4 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -128,7 +128,7 @@ using ::com::sun::star::container::XIndexContainer; #include <sfx2/objitem.hxx> #include "sfx2/viewfac.hxx" #include <sfx2/event.hxx> -#include "fltfnc.hxx" +#include <sfx2/fcontnr.hxx> #include <sfx2/docfile.hxx> #include <sfx2/module.hxx> #include <sfx2/msgpool.hxx> |