cui/source/dialogs/insdlg.cxx                               |    1 
 cui/source/dialogs/plfilter.cxx                             |  117 ------------
 cui/source/dialogs/plfilter.hxx                             |   34 ---
 include/svx/pfiledlg.hxx                                    |   51 -----
 officecfg/registry/data/org/openoffice/Office/Embedding.xcu |   14 -
 sc/source/ui/drawfunc/fuins2.cxx                            |    1 
 sc/source/ui/view/tabvwshb.cxx                              |    2 
 sd/source/ui/func/fuinsert.cxx                              |    2 
 sd/source/ui/view/drviews7.cxx                              |    1 
 sfx2/util/sfx.component                                     |    4 
 slideshow/source/engine/shapes/shapeimporter.cxx            |   18 -
 sw/source/uibase/shells/textsh.cxx                          |    1 
 vbahelper/inc/pch/precompiled_msforms.hxx                   |    1 
 13 files changed, 2 insertions(+), 245 deletions(-)

New commits:
commit 42645fe67cac22e9a96bc4b34c4f85c09185d9d2
Author: Thorsten Behrens <thorsten.behr...@cib.de>
Date:   Fri Dec 18 02:30:18 2015 +0100

    related tdf#96398 pull out more NPAPI-related code
    
    Fixup windows PCH plus pulling out more code now unused due to NPAPI
    removal. Follow-up to 4c18af27bf95b332ee2006cfc0bbf469fb1a84d4.
    
    Change-Id: I8ad42a28139ceeab0cae1f608d55beb28c159db3
    Reviewed-on: https://gerrit.libreoffice.org/20783
    Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
    Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>

diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index c85e392..3d8466d 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -33,7 +33,6 @@
 #include <comphelper/processfactory.hxx>
 
 #include "insdlg.hxx"
-#include <plfilter.hxx>
 #include <dialmgr.hxx>
 #include <svtools/sores.hxx>
 
diff --git a/cui/source/dialogs/plfilter.cxx b/cui/source/dialogs/plfilter.cxx
deleted file mode 100644
index cdb606f..0000000
--- a/cui/source/dialogs/plfilter.cxx
+++ /dev/null
@@ -1,117 +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 <set>
-#include <map>
-#include <comphelper/processfactory.hxx>
-
-#include <vcl/stdtext.hxx>
-
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/plugin/PluginDescription.hpp>
-#include <com/sun/star/plugin/PluginManager.hpp>
-#include <com/sun/star/plugin/XPluginManager.hpp>
-
-#include <plfilter.hxx>
-
-using namespace std;
-using namespace com::sun::star::uno;
-using namespace com::sun::star::lang;
-using namespace com::sun::star::plugin;
-
-struct ltstr
-{
-    bool operator()( const OUString& s1, const OUString& s2 ) const
-    {
-        return s1.compareTo( s2 ) < 0;
-    }
-};
-
-typedef set< OUString, ltstr > StrSet;
-typedef map< OUString, StrSet, ltstr > FilterMap;
-
-
-
-void fillNetscapePluginFilters( Sequence< OUString >& rPluginNames, Sequence< 
OUString >& rPluginTypes )
-{
-    Reference< XComponentContext > xContext = 
comphelper::getProcessComponentContext();
-    Reference< XPluginManager > xPMgr( PluginManager::create(xContext) );
-
-    FilterMap aMap;
-
-    // sum up the mimetypes: one description, multiple extensions
-
-    Sequence<PluginDescription > aDescriptions( xPMgr->getPluginDescriptions() 
);
-    const PluginDescription * pDescriptions = aDescriptions.getConstArray();
-    for ( sal_uInt32 nPos = aDescriptions.getLength(); nPos--; )
-    {
-        const PluginDescription & rDescr = pDescriptions[nPos];
-
-        // consistency check for the do {} while loop below
-        if (rDescr.Extension.isEmpty())
-            continue;
-
-        StrSet& rTypes = aMap[ rDescr.Description ];
-        OUString aExtension( rDescr.Extension );
-
-        sal_Int32 nIndex = 0;
-        do
-        {
-            // no default plugins anymore
-            const OUString aExt( aExtension.getToken( 0, ';', nIndex ) );
-            if ( aExt != "*.*" )
-                rTypes.insert( aExt );
-        }
-        while ( nIndex >= 0 );
-    }
-
-    rPluginNames = Sequence< OUString >( aMap.size() );
-    rPluginTypes = Sequence< OUString >( aMap.size() );
-    OUString* pPluginNames = rPluginNames.getArray();
-    OUString* pPluginTypes = rPluginTypes.getArray();
-    int nIndex = 0;
-    for ( FilterMap::iterator iPos = aMap.begin(); iPos != aMap.end(); ++iPos )
-    {
-        OUString aText( (*iPos).first );
-        OUString aType;
-        StrSet& rTypes = (*iPos).second;
-        StrSet::iterator i = rTypes.begin();
-        while ( i != rTypes.end() )
-        {
-            aType += (*i);
-            ++i;
-            if ( i != rTypes.end() )
-                aType += ";";
-        }
-
-        if ( !aType.isEmpty() )
-        {
-            aText += " (";
-            aText += aType;
-            aText += ")";
-            pPluginNames[nIndex] = aText;
-            pPluginTypes[nIndex] = aType;
-            nIndex++;
-        }
-    }
-    rPluginNames.realloc( nIndex );
-    rPluginTypes.realloc( nIndex );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/plfilter.hxx b/cui/source/dialogs/plfilter.hxx
deleted file mode 100644
index f982fe0..0000000
--- a/cui/source/dialogs/plfilter.hxx
+++ /dev/null
@@ -1,34 +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_CUI_SOURCE_DIALOGS_PLFILTER_HXX
-#define INCLUDED_CUI_SOURCE_DIALOGS_PLFILTER_HXX
-
-#include <sal/config.h>
-
-#include <com/sun/star/uno/Sequence.hxx>
-#include <rtl/ustring.hxx>
-
-void fillNetscapePluginFilters(
-    css::uno::Sequence<OUString> & rNames,
-    css::uno::Sequence<OUString> & rTypes);
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/pfiledlg.hxx b/include/svx/pfiledlg.hxx
deleted file mode 100644
index 0b4e52c..0000000
--- a/include/svx/pfiledlg.hxx
+++ /dev/null
@@ -1,51 +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_SVX_PFILEDLG_HXX
-#define INCLUDED_SVX_PFILEDLG_HXX
-
-#include <sfx2/filedlghelper.hxx>
-#include <svx/svxdllapi.h>
-
-/*************************************************************************
-|*
-|* Filedialog to insert Plugin-Fileformats
-|*
-\************************************************************************/
-
-class SVX_DLLPUBLIC SvxPluginFileDlg
-{
-private:
-    sfx2::FileDialogHelper          maFileDlg;
-
-public:
-    // with nKind = SID_INSERT_SOUND    or
-    //      nKind = SID_INSERT_VIDEO
-    SvxPluginFileDlg (vcl::Window *pParent, sal_uInt16 nKind );
-    ~SvxPluginFileDlg ();
-
-    ErrCode                  Execute();
-    OUString                 GetPath() const;
-
-    void                    SetContext( sfx2::FileDialogHelper::Context 
eNewContext );
-};
-
-#endif // INCLUDED_SVX_PFILEDLG_HXX
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/officecfg/registry/data/org/openoffice/Office/Embedding.xcu 
b/officecfg/registry/data/org/openoffice/Office/Embedding.xcu
index 2352f41..c3623ff 100644
--- a/officecfg/registry/data/org/openoffice/Office/Embedding.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Embedding.xcu
@@ -151,20 +151,6 @@
         <value>PRIMARY SHOW IPACTIVATE PROPERTIES</value>
       </prop>
     </node>
-    <node oor:name="4CAA7761-6B8B-11CF-89CA-008029E4B0B1" oor:op="replace">
-      <prop oor:name="ObjectFactory">
-        <value>com.sun.star.embed.OOoSpecialEmbeddedObjectFactory</value>
-      </prop>
-      <prop oor:name="ObjectDocumentServiceName">
-        <value>com.sun.star.comp.sfx2.PluginObject</value>
-      </prop>
-      <prop oor:name="ObjectMiscStatus">
-        <value>2432</value>
-      </prop>
-      <prop oor:name="ObjectVerbs">
-        <value>PRIMARY SHOW IPACTIVATE PROPERTIES</value>
-      </prop>
-    </node>
     <node oor:name="1A8A6701-DE58-11CF-89CA-008029E4B0B1" oor:op="replace">
       <prop oor:name="ObjectFactory">
         <value>com.sun.star.embed.OOoSpecialEmbeddedObjectFactory</value>
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index 6c7899f..c89b0c8 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -28,7 +28,6 @@
 #include <sfx2/docfile.hxx>
 #include <svl/stritem.hxx>
 #include <svx/svdoole2.hxx>
-#include <svx/pfiledlg.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/syschild.hxx>
diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index 2864c7b..36fd74a 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -26,7 +26,6 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <svx/svxdlg.hxx>
 #include <svx/dataaccessdescriptor.hxx>
-#include <svx/pfiledlg.hxx>
 #include <svx/svditer.hxx>
 #include <svx/svdmark.hxx>
 #include <svx/svdograf.hxx>
@@ -39,6 +38,7 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
+#include <sfx2/filedlghelper.hxx>
 #include <svtools/soerr.hxx>
 #include <svl/rectitem.hxx>
 #include <svl/slstitm.hxx>
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index e93fa84..fab2f7e 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -35,6 +35,7 @@
 #include <svl/urihelper.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/msgpool.hxx>
+#include <sfx2/filedlghelper.hxx>
 #include <svtools/sores.hxx>
 #include <svtools/insdlg.hxx>
 #include <sfx2/request.hxx>
@@ -42,7 +43,6 @@
 #include <unotools/pathoptions.hxx>
 #include <svtools/miscopt.hxx>
 #include <svtools/embedhlp.hxx>
-#include <svx/pfiledlg.hxx>
 #include <svx/dialogs.hrc>
 #include <sfx2/linkmgr.hxx>
 #include <svx/linkwarn.hxx>
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 1740fa6..2f38a30 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -56,7 +56,6 @@
 #include <comphelper/processfactory.hxx>
 #include <sfx2/request.hxx>
 
-#include <svx/pfiledlg.hxx>
 #include <svx/grafctrl.hxx>
 #include <svtools/cliplistener.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/sfx2/util/sfx.component b/sfx2/util/sfx.component
index 91002da..dde8aa0 100644
--- a/sfx2/util/sfx.component
+++ b/sfx2/util/sfx.component
@@ -78,10 +78,6 @@
       constructor="com_sun_star_comp_sfx2_IFrameObject_get_implementation">
     <service name="com.sun.star.frame.SpecialEmbeddedObject"/>
   </implementation>
-  <implementation name="com.sun.star.comp.sfx2.PluginObject"
-      constructor="com_sun_star_comp_sfx2_PluginObject_get_implementation">
-    <service name="com.sun.star.frame.SpecialEmbeddedObject"/>
-  </implementation>
   <implementation name="com.sun.star.comp.sfx2.SfxMacroLoader"
       constructor="com_sun_star_comp_sfx2_SfxMacroLoader_get_implementation">
     <service name="com.sun.star.frame.ProtocolHandler"/>
diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx 
b/slideshow/source/engine/shapes/shapeimporter.cxx
index 732e9f3..fc247ca 100644
--- a/slideshow/source/engine/shapes/shapeimporter.cxx
+++ b/slideshow/source/engine/shapes/shapeimporter.cxx
@@ -277,24 +277,6 @@ ShapeSharedPtr ShapeImporter::createShape(
                                 mnAscendingPrio,
                                 mrContext);
     }
-    else if( shapeType == "com.sun.star.drawing.PluginShape" )
-    {
-        // PropertyValues to copy from XShape to plugin
-        static const char* aPropertyValues[] =
-            {
-                "PluginURL",
-                "PluginMimeType",
-                "PluginCommands"
-            };
-
-        // (Netscape)Plugin shape. This is a special object
-        return createAppletShape( xCurrShape,
-                                  mnAscendingPrio,
-                                  "com.sun.star.comp.sfx2.PluginObject",
-                                  aPropertyValues,
-                                  SAL_N_ELEMENTS(aPropertyValues),
-                                  mrContext );
-    }
     else if( shapeType == "com.sun.star.drawing.AppletShape" )
     {
         // PropertyValues to copy from XShape to applet
diff --git a/sw/source/uibase/shells/textsh.cxx 
b/sw/source/uibase/shells/textsh.cxx
index d30838e..a587aff 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -51,7 +51,6 @@
 #include <editeng/scripttypeitem.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <sfx2/htmlmode.hxx>
-#include <svx/pfiledlg.hxx>
 #include <svtools/htmlcfg.hxx>
 #include <com/sun/star/i18n/TransliterationModules.hpp>
 #include <com/sun/star/i18n/TransliterationModulesExtra.hpp>
diff --git a/vbahelper/inc/pch/precompiled_msforms.hxx 
b/vbahelper/inc/pch/precompiled_msforms.hxx
index a495c80..633d06d 100644
--- a/vbahelper/inc/pch/precompiled_msforms.hxx
+++ b/vbahelper/inc/pch/precompiled_msforms.hxx
@@ -225,7 +225,6 @@
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/plugin/PluginDescription.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/script/BasicErrorException.hpp>
 #include <com/sun/star/script/ModuleInfo.hpp>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to