fdo#45071: Remove ENABLE_NPAPI_INTO_BROWSER left-overs

...from previous commit

Change-Id: I945faa6215f971ce817c6450fe0786da0696091f

bin/distro-install-file-lists

@@ -332,7 +332,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
             program/configimport.bin \
             program/javaldx \
             program/msfontextract \
-            program/nsplugin \
             program/oosplash.bin \
             program/pagein \
             program/pagein-calc \
@@ -495,7 +494,7 @@ else
       fi &&
       ( cd pkg/libreoffice-common/$d
         find -maxdepth 1 \
-           -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|nsplugin\|tdefilepicker\|kdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|uri-encode\)' \
+           -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|tdefilepicker\|kdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|uri-encode\)' \
            -exec mv {} $DESTDIR/pkg/libreoffice-core/$d \;
       ); \
     done

cui/Library_cui.mk

@@ -199,10 +199,4 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
     cui/source/uno/services \
 ))
 
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_exception_objects,cui,\
-    cui/source/dialogs/winpluginlib \
-))
-endif
-
 # vim: set noet sw=4 ts=4:

cui/UIConfig_cui.mk

@@ -116,7 +116,6 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
 	cui/uiconfig/ui/optappearancepage \
 	cui/uiconfig/ui/optasianpage \
 	cui/uiconfig/ui/optbasicidepage \
-	cui/uiconfig/ui/optbrowserpage \
 	cui/uiconfig/ui/optctlpage \
 	cui/uiconfig/ui/optchartcolorspage \
 	cui/uiconfig/ui/optemailpage \

cui/source/dialogs/winpluginlib.cxx

-/* -*- 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 .
- */
-
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
-#undef WB_LEFT
-#undef WB_RIGHT
-#include <windows.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
-#include <winreg.h>
-#include <shlwapi.h>
-#include <stdio.h>
-
-#define SO_PATH_SIZE        4096
-
-extern "C" {
-int lc_isInstalled(const  char* realFilePath)
-{
-    HKEY hLibreOffice;
-    char sSoPath[SO_PATH_SIZE];
-    char sPluginPath[SO_PATH_SIZE];
-
-    LONG ret;
-    ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE,  "SOFTWARE\\MozillaPlugins\\@sun.com/npsopluginmi;version=1.0",  0,  KEY_READ, &hLibreOffice);
-    if(ret != ERROR_SUCCESS){
-        ret = RegOpenKeyEx(HKEY_CURRENT_USER,  "SOFTWARE\\MozillaPlugins\\@sun.com/npsopluginmi;version=1.0",  0,  KEY_READ, &hLibreOffice);
-        if(ret != ERROR_SUCCESS){
-            return -1;
-        }
-    }
-
-    if((realFilePath == NULL) || (strlen(realFilePath) == 0) || (strlen(realFilePath) >= SO_PATH_SIZE))
-        ret = -1;
-    else{
-        sprintf(sSoPath,"%s", realFilePath);
-        ret = 0;
-    }
-
-    // GetCurrentDirectory return the char number of the string
-    if(ret == 0){
-        DWORD  dType = REG_SZ;
-        DWORD  dSize = SO_PATH_SIZE;
-        ret = RegQueryValueEx (hLibreOffice, "Path", NULL,  &dType , (LPBYTE) sPluginPath, &dSize);
-        if(ret == ERROR_SUCCESS){
-            if(strcmp(sPluginPath, sSoPath) == 0)
-                ret = 0;
-            else
-                ret = 1;
-        }
-        else
-            ret = -1;
-    }
-    else
-        ret = -1;
-    RegCloseKey(hLibreOffice);
-    return ret;
-}
-
-int lc_uninstallPlugin(const  char*)
-{
-    HKEY hKeySoftware;
-    HKEY hMozillaPlugins;
-    HKEY hStarOffice;
-
-    LONG ret;
-    ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE,  "SOFTWARE",  0,  KEY_READ|KEY_WRITE, &hKeySoftware);
-    if(ret != ERROR_SUCCESS){
-        ret = RegOpenKeyEx(HKEY_CURRENT_USER,  "SOFTWARE",  0,  KEY_READ|KEY_WRITE, &hKeySoftware);
-        if(ret != ERROR_SUCCESS){
-            return -1;
-        }
-    }
-    ret = RegOpenKeyEx(hKeySoftware,  "MozillaPlugins",  0,  KEY_READ|KEY_WRITE, &hMozillaPlugins);
-    if(ret != ERROR_SUCCESS){
-        RegCloseKey(hKeySoftware);
-        if( ret == ERROR_FILE_NOT_FOUND)
-            return 0;
-        else
-            return -1;
-    }
-
-    ret = RegOpenKeyEx(hMozillaPlugins,  "@sun.com/npsopluginmi;version=1.0",  0,  KEY_READ|KEY_WRITE, &hStarOffice);
-    if(ret != ERROR_SUCCESS){
-        RegCloseKey(hKeySoftware);
-        RegCloseKey(hMozillaPlugins);
-        if( ret == ERROR_FILE_NOT_FOUND)
-            return 0;
-        else
-            return -1;
-    }
-    RegCloseKey(hStarOffice);
-    ret = SHDeleteKey(hMozillaPlugins,  "@sun.com/npsopluginmi;version=1.0");
-    if(ret != ERROR_SUCCESS){
-        ret = -1;
-    }
-    RegFlushKey(hMozillaPlugins);
-    RegCloseKey(hMozillaPlugins);
-    RegCloseKey(hKeySoftware);
-    return ret;
-}
-
-int lc_installPlugin(const  char* realFilePath)
-{
-    HKEY hKeySoftware;
-    HKEY hMozillaPlugins;
-    HKEY hStarOffice;
-    char sSoPath[SO_PATH_SIZE];
-    DWORD  sState;
-
-    LONG ret;
-    ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE,  "SOFTWARE",  0,  KEY_READ|KEY_WRITE, &hKeySoftware);
-    if(ret != ERROR_SUCCESS){
-        ret = RegOpenKeyEx(HKEY_CURRENT_USER,  "SOFTWARE",  0,  KEY_READ|KEY_WRITE, &hKeySoftware);
-        if(ret != ERROR_SUCCESS){
-            return -1;
-        }
-    }
-    ret = RegOpenKeyEx(hKeySoftware,  "MozillaPlugins",  0,  KEY_READ|KEY_WRITE, &hMozillaPlugins);
-    if(ret != ERROR_SUCCESS){
-        RegCreateKeyEx(hKeySoftware,
-            "MozillaPlugins",
-            0,
-            NULL,
-            REG_OPTION_NON_VOLATILE,
-            KEY_READ|KEY_WRITE,
-            NULL,
-            &hMozillaPlugins,
-            &sState);
-    }
-
-    ret = RegCreateKeyEx(hMozillaPlugins,
-        "@sun.com/npsopluginmi;version=1.0",
-        0,
-        NULL,
-        REG_OPTION_NON_VOLATILE,
-        KEY_READ|KEY_WRITE,
-        NULL,
-        &hStarOffice,
-        &sState);
-    if(ret != ERROR_SUCCESS){
-        RegCloseKey(hKeySoftware);
-        RegCloseKey(hMozillaPlugins);
-        return -1;
-    }
-
-    RegFlushKey(hStarOffice);
-    RegFlushKey(hMozillaPlugins);
-
-    if((realFilePath == NULL) || (strlen(realFilePath) == 0) || (strlen(realFilePath) >= SO_PATH_SIZE))
-        ret = -1;
-    else{
-        sprintf(sSoPath,"%s", realFilePath);
-        ret = 0;
-    }
-
-    // GetCurrentDirectory return the char number of the string
-    if(ret == 0){
-        ret = RegSetValueEx( hStarOffice, "Path", 0, REG_SZ,  (LPBYTE) sSoPath, strlen(sSoPath) + 1);
-        if(ret == ERROR_SUCCESS)
-            ret = 0;
-        else
-            ret = -1;
-    }
-    else
-        ret = -1;
-    RegFlushKey(hStarOffice);
-    RegFlushKey(hMozillaPlugins);
-    RegCloseKey(hStarOffice);
-    RegCloseKey(hMozillaPlugins);
-    RegCloseKey(hKeySoftware);
-    RegFlushKey(HKEY_LOCAL_MACHINE);
-
-    return ret;
-}
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

cui/source/options/optinet2.cxx

@@ -913,202 +913,6 @@ void SvxSecurityTabPage::Reset( const SfxItemSet* )
 {
 }
 
-MozPluginTabPage::MozPluginTabPage(Window* pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "OptBrowserPage", "cui/ui/optbrowserpage.ui", &rSet)
-{
-    get(m_pWBasicCodeCB, "display");
-}
-
-MozPluginTabPage::~MozPluginTabPage()
-{
-}
-
-SfxTabPage* MozPluginTabPage::Create( Window* pParent,
-                                        const SfxItemSet* rAttrSet )
-{
-    return new MozPluginTabPage( pParent, *rAttrSet );
-}
-
-bool MozPluginTabPage::FillItemSet( SfxItemSet* )
-{
-    bool hasInstall = isInstalled();
-    bool hasChecked = m_pWBasicCodeCB->IsChecked();
-    if(hasInstall && (!hasChecked)){
-        //try to uninstall
-        uninstallPlugin();
-    }
-    else if((!hasInstall) && hasChecked){
-        //try to install
-        installPlugin();
-    }
-    else{
-        // do nothing
-    }
-    return true;
-}
-
-void MozPluginTabPage::Reset( const SfxItemSet* )
-{
-        m_pWBasicCodeCB->Check( isInstalled());
-        m_pWBasicCodeCB->SaveValue();
-}
-
-#ifdef WNT
-extern "C" {
-    int lc_isInstalled(const  char* realFilePath);
-    int lc_installPlugin(const  char* realFilePath);
-    int lc_uninstallPlugin(const  char* realFilePath);
-}
-#endif
-
-#define NPP_PATH_MAX 2048
-inline bool getDllURL(OString * path)
-{
-    OSL_ASSERT(path != NULL);
-    OUString dirPath/*dllPath, */;
-    if (osl_getExecutableFile(&dirPath.pData) != osl_Process_E_None) {
-        return false;
-    }
-    dirPath = dirPath.copy(0, dirPath.lastIndexOf('/'));
-    OUString sysDirPath;
-    osl::FileBase::getSystemPathFromFileURL(dirPath, sysDirPath);
-    *path = OUStringToOString(sysDirPath, RTL_TEXTENCODING_ASCII_US);
-    return true;
-}
-
-bool MozPluginTabPage::isInstalled()
-{
-#ifdef UNIX
-    // get the real file referred by .so lnk file
-    char lnkReferFilePath[NPP_PATH_MAX] = {0};
-    char* pHome = getpwuid(getuid())->pw_dir;
-    OString lnkFilePath(OString(pHome) + OString("/.mozilla/plugins/libnpsoplugin" SAL_DLLEXTENSION));
-
-    struct stat sBuf;
-    if (0 > lstat(lnkFilePath.getStr(), &sBuf))
-        return false;
-    if (!S_ISLNK(sBuf.st_mode))
-        return false;
-    if (0 >= readlink(lnkFilePath.getStr(), lnkReferFilePath, NPP_PATH_MAX))
-        return false;
-    // If the link is relative, then we regard it as non-standard
-    if (lnkReferFilePath[0] != '/')
-        return false;
-
-    // get the real file path
-    char realFilePath[NPP_PATH_MAX] = {0};
-    OString tempString;
-    if (!getDllURL(&tempString)) {
-        return false;
-    }
-    strncpy(realFilePath, tempString.getStr(), NPP_PATH_MAX - 1);
-    strcat(realFilePath, "/libnpsoplugin" SAL_DLLEXTENSION);
-
-    if (0 != strcmp(lnkReferFilePath, realFilePath))
-        return false;
-    return true;
-#endif
-#ifdef WNT
-    // get the value from registry
-        sal_Bool ret = true;
-    OString tempString;
-    char realFilePath[NPP_PATH_MAX] = {0};
-    if (!getDllURL(&tempString)){
-        return false;
-    }
-    strncpy(realFilePath, tempString.getStr(), NPP_PATH_MAX);
-    if(! lc_isInstalled(realFilePath))
-        ret =true;
-    else
-        ret = false;
-    return ret;
-#endif
-}
-
-bool MozPluginTabPage::installPlugin()
-{
-#ifdef UNIX
-    // get the real file referred by .so lnk file
-    char* pHome = getpwuid(getuid())->pw_dir;
-    if(!pHome)
-    {
-        return false;
-    }
-    OString lnkFilePath(OString(pHome) + OString("/.mozilla/plugins/libnpsoplugin" SAL_DLLEXTENSION));
-    (void)remove(lnkFilePath.getStr());
-
-    // create the dirs if necessary
-    struct stat buf;
-    char tmpDir[NPP_PATH_MAX] = {0};
-    snprintf(tmpDir, NPP_PATH_MAX, "%s/.mozilla", pHome);
-    if (0 > stat(lnkFilePath.getStr(), &buf))
-    {
-        if(mkdir(tmpDir, 0755))
-        {
-            return false;
-        }
-        strcat(tmpDir, "/plugins");
-        if(mkdir(tmpDir, 0755))
-        {
-            return false;
-        }
-    }
-
-    // get the real file path
-    char realFilePath[NPP_PATH_MAX] = {0};
-    OString tempString;
-    if (!getDllURL(&tempString)) {
-        return false;
-    }
-    strncpy(realFilePath, tempString.getStr(), NPP_PATH_MAX - 1);
-    strcat(realFilePath, "/libnpsoplugin" SAL_DLLEXTENSION);
-
-    // create the link
-    if (0 != symlink(realFilePath, lnkFilePath.getStr()))
-        return false;
-    return true;
-#endif
-#ifdef WNT
-    OString tempString;
-    char realFilePath[NPP_PATH_MAX] = {0};
-    if (!getDllURL(&tempString)) {
-        return false;
-    }
-    strncpy(realFilePath, tempString.getStr(), NPP_PATH_MAX);
-    if( !lc_installPlugin(realFilePath))
-        return true;
-    else
-        return false;
-#endif
-}
-
-bool MozPluginTabPage::uninstallPlugin()
-{
-#ifdef UNIX
-    // get the real file referred by .so lnk file
-    char* pHome = getpwuid(getuid())->pw_dir;
-    OString lnkFilePath(OString(pHome) + OString("/.mozilla/plugins/libnpsoplugin" SAL_DLLEXTENSION));
-
-    if(0 > remove(lnkFilePath.getStr()))
-        return false;
-    return true;
-#endif
-#ifdef WNT
-    OString tempString;
-    char realFilePath[NPP_PATH_MAX] = {0};
-    if (!getDllURL(&tempString)) {
-        return false;
-    }
-    strncpy(realFilePath, tempString.getStr(), NPP_PATH_MAX);
-    if(!lc_uninstallPlugin(realFilePath))
-        return true;
-    else
-        return false;
-#endif
-}
-
-/* -------------------------------------------------------------------------*/
-
 class MailerProgramCfg_Impl : public utl::ConfigItem
 {
     friend class SvxEMailTabPage;

cui/source/options/optinet2.hxx

@@ -177,27 +177,6 @@ public:
     virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
 };
 
-class MozPluginTabPage : public SfxTabPage
-{
-    CheckBox* m_pWBasicCodeCB;
-
-    bool isInstalled(void);
-    bool installPlugin(void);
-    bool uninstallPlugin(void);
-
-    MozPluginTabPage( Window* pParent, const SfxItemSet& rSet );
-    virtual ~MozPluginTabPage();
-
-public:
-
-    static SfxTabPage*  Create( Window* pParent,
-                                const SfxItemSet* rAttrSet );
-
-    virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
-    virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
-
-};
-
 struct SvxEMailTabPage_Impl;
 class SvxEMailTabPage : public SfxTabPage
 {

cui/uiconfig/ui/optbrowserpage.ui

-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkFrame" id="OptBrowserPage">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="hexpand">True</property>
-    <property name="border_width">6</property>
-    <property name="label_xalign">0</property>
-    <property name="shadow_type">none</property>
-    <child>
-      <object class="GtkAlignment" id="alignment1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="top_padding">6</property>
-        <property name="left_padding">12</property>
-        <child>
-          <object class="GtkCheckButton" id="display">
-            <property name="label" translatable="yes">_Display documents in browser</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="valign">start</property>
-            <property name="use_underline">True</property>
-            <property name="xalign">0</property>
-            <property name="draw_indicator">True</property>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child type="label">
-      <object class="GtkLabel" id="label1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label" translatable="yes">Browser Plug-in</property>
-        <attributes>
-          <attribute name="weight" value="bold"/>
-        </attributes>
-      </object>
-    </child>
-  </object>
-</interface>

distro-configs/OxygenOfficeLinux.conf

@@ -68,4 +68,3 @@
 --enable-ccache
 --enable-crashdump
 --enable-cairo-canvas
---enable-nsplugin

extensions/Executable_nsplugin.mk

-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-#
-# 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/.
-#
-#
-
-$(eval $(call gb_Executable_Executable,nsplugin))
-
-$(eval $(call gb_Executable_use_external,nsplugin,boost_headers))
-
-$(eval $(call gb_Executable_use_sdk_api,nsplugin))
-
-$(eval $(call gb_Executable_add_exception_objects,nsplugin,\
-	extensions/source/nsplugin/source/so_closelistener \
-	extensions/source/nsplugin/source/so_instance \
-	extensions/source/nsplugin/source/so_main \
-))
-
-$(eval $(call gb_Executable_use_static_libraries,nsplugin,\
-	npsoenv \
-))
-
-$(eval $(call gb_Executable_add_libs,nsplugin,\
-	$(if $(filter $(OS),LINUX), \
-		-ldl \
-	) \
-	$(if $(filter $(OS),SOLARIS), \
-		-lnsl \
-		-lsocket \
-	) \
-))
-
-$(eval $(call gb_Executable_use_libraries,nsplugin,\
-	comphelper \
-	cppu \
-	cppuhelper \
-	sal \
-))
-
-ifeq ($(OS),WNT)
-$(eval $(call gb_Executable_add_exception_objects,nsplugin,\
-	extensions/source/nsplugin/source/nsp_windows \
-))
-
-$(eval $(call gb_Executable_use_static_libraries,nsplugin,\
-	ooopathutils \
-))
-
-$(eval $(call gb_Executable_use_system_win32_libs,nsplugin,\
-	advapi32 \
-	comdlg32 \
-	gdi32 \
-	kernel32 \
-	ole32 \
-	oleaut32 \
-	shell32 \
-	user32 \
-	uuid \
-	winspool \
-	ws2_32 \
-))
-endif # WNT
-
-# vim:set noet sw=4 ts=4:

extensions/Library_npsoplugin.mk

-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-#
-# 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/.
-#
-#
-
-$(eval $(call gb_Library_Library,npsoplugin))
-
-$(eval $(call gb_Library_use_externals,npsoplugin,\
-    boost_headers \
-    npapi_headers \
-))
-
-$(eval $(call gb_Library_use_static_libraries,npsoplugin,\
-	npsoenv \
-	nputils \
-))
-
-ifneq ($(OS),WNT)
-
-ifeq ($(filter ANDROID DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
-$(eval $(call gb_Library_add_libs,npsoplugin,\
-	-ldl \
-))
-endif
-
-$(eval $(call gb_Library_use_external,npsoplugin,gtk))
-
-$(eval $(call gb_Library_add_defs,npsoplugin,\
-	-DMOZ_X11 \
-))
-
-ifeq ($(HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION),TRUE)
-$(eval $(call gb_Library_add_defs,npsoplugin,\
-	-DHAVE_NON_CONST_NPP_GETMIMEDESCRIPTION=1 \
-))
-endif
-
-ifeq ($(filter-out LINUX FREEBSD NETBSD OPENBSD DRAGONFLY,$(OS)),)
-$(eval $(call gb_Library_add_defs,npsoplugin,\
-	-DNP_LINUX \
-))
-endif
-
-else ifeq ($(OS),WNT)
-
-$(eval $(call gb_Library_use_static_libraries,npsoplugin,\
-	ooopathutils \
-))
-
-$(eval $(call gb_Library_use_system_win32_libs,npsoplugin,\
-	advapi32 \
-	comdlg32 \
-	gdi32 \
-	kernel32 \
-	ole32 \
-	oleaut32 \
-	shell32 \
-	user32 \
-	uuid \
-	winspool \
-	ws2_32 \
-))
-
-$(eval $(call gb_Library_add_defs,npsoplugin,\
-	-DENGLISH \
-))
-
-ifeq ($(COM),MSC)
-$(eval $(call gb_Library_add_ldflags,npsoplugin,\
-	/EXPORT:NPP_GetMIMEDescription \
-	/EXPORT:NPP_Initialize \
-	/EXPORT:NPP_Shutdown \
-	/EXPORT:NPP_New \
-	/EXPORT:NPP_Destroy \
-	/EXPORT:NPP_SetWindow \
-	/EXPORT:NPP_NewStream \
-	/EXPORT:NPP_WriteReady \
-	/EXPORT:NPP_Write \
-	/EXPORT:NPP_DestroyStream \
-	/EXPORT:NPP_StreamAsFile \
-	/EXPORT:NPP_URLNotify \
-	/EXPORT:NPP_Print \
-	/EXPORT:NP_GetEntryPoints \
-	/EXPORT:NP_Initialize \
-	/EXPORT:NP_Shutdown \
-	/EXPORT:NP_GetMIMEDescription \
-))
-endif
-
-$(eval $(call gb_Library_set_nativeres,npsoplugin,npsoplugin/npsoplugin))
-
-endif
-
-$(eval $(call gb_Library_add_exception_objects,npsoplugin,\
-	extensions/source/nsplugin/source/npshell \
-))
-
-# vim:set shiftwidth=4 softtabstop=4 noexpandtab:

extensions/StaticLibrary_npsoenv.mk

-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-#
-# 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/.
-#
-
-$(eval $(call gb_StaticLibrary_StaticLibrary,npsoenv))
-
-$(eval $(call gb_StaticLibrary_add_exception_objects,npsoenv,\
-	extensions/source/nsplugin/source/so_env \
-))
-
-# vim:set noet sw=4 ts=4:

extensions/WinResTarget_npsoplugin.mk

-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-#
-# 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/.
-#
-#
-
-$(eval $(call gb_WinResTarget_WinResTarget,npsoplugin/npsoplugin))
-
-$(eval $(call gb_WinResTarget_add_defs,npsoplugin/npsoplugin,\
-    -DVERVARIANT=$(LIBO_VERSION_PATCH) \
-    -DRES_APP_VENDOR="$(OOO_VENDOR)" \
-))
-
-$(eval $(call gb_WinResTarget_set_rcfile,npsoplugin/npsoplugin,extensions/source/nsplugin/source/nsplugin_oo))
-
-# vim:set noet sw=4 ts=4:

external/Module_external.mk

@@ -20,7 +20,6 @@ endif
 $(eval $(call gb_Module_add_moduledirs,external,\
 	accessories \
 	libxmlsec \
-	np_sdk \
 	$(call gb_Helper_optional,ABW,libabw) \
 	$(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \
 	$(call gb_Helper_optional,APR,apr) \

external/np_sdk/Makefile

-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-
-module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-
-include $(module_directory)/../../solenv/gbuild/partial_build.mk
-
-# vim: set noet sw=4 ts=4:

external/np_sdk/Module_np_sdk.mk

-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-#
-# 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/.
-#
-
-$(eval $(call gb_Module_Module,np_sdk))
-
-# vim: set noet sw=4 ts=4:

external/np_sdk/StaticLibrary_nputils.mk

-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-#
-# 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/.
-#
-
-$(eval $(call gb_StaticLibrary_StaticLibrary,nputils))
-
-$(eval $(call gb_StaticLibrary_use_externals,nputils,\
-	npapi_headers \
-))
-
-ifeq ($(OS),MACOSX)
-$(eval $(call gb_StaticLibrary_add_defs,nputils,\
-	-DNO_X11 \
-))
-endif
-
-ifeq ($(OS),WNT)
-$(eval $(call gb_StaticLibrary_add_exception_objects,nputils,\
-	external/np_sdk/npsdk/npwin \
-))
-else
-$(eval $(call gb_StaticLibrary_add_cobjects,nputils,\
-	external/np_sdk/npsdk/npunix \
-))
-endif
-
-# vim: set noet sw=4 ts=4:

external/np_sdk/npsdk/README

-This folder contains Mozilla headers and source-files related to plugin development. The original version of the files were taken from Mozilla1.0 tarball.
+This folder contains Mozilla headers related to plugin development. The original version of the files were taken from Mozilla1.0 tarball.
 

external/np_sdk/npsdk/plugin.h

-/* -*- 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_NP_SDK_MOZSRC_PLUGIN_H
-#define INCLUDED_NP_SDK_MOZSRC_PLUGIN_H
-
-#include "npapi.h"
-
-/* OpenOffice.org/LibreOffice modified the implementations of NP_Initialize and
-   NP_Shutdown in external/np_sdk/npsdk/ to call NPP_Initialize and NPP_Shutdown, resp.,
-   defined in extensions/source/nsplugin/source/npshell.cxx:
-*/
-
-#if defined __cplusplus
-extern "C" {
-#endif
-
-NPError NPP_Initialize(void);
-
-void NPP_Shutdown(void);
-
-#if defined __cplusplus
-}
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

scp2/source/ooo/common_brand.scp

@@ -72,7 +72,6 @@ Module gid_Module_Root_Brand
              gid_Brand_File_Lib_Msvcp80,
              gid_Brand_File_Lib_Msvcm80,
              gid_Brand_File_Msvcm80crt_Manifest,
-             gid_Brand_File_Lib_Npsoplugin,
              gid_Brand_File_Share_Registry_O5oo_Xcd,
              gid_Brand_File_Script_Unopkg,
              gid_Brand_File_Share_Xdg_Base,

scp2/source/ooo/module_hidden_ooo.scp

@@ -88,7 +88,6 @@ Module gid_Module_Root_Files_2
 	gid_File_Script_Gengal,
 	gid_File_Bin_Uri_Encode,
 	gid_File_Bin_UIPreviewer,
-	gid_File_Exe_Nsplugin,
 	gid_File_Txt_Pagein_Common,
 	gid_File_Txt_Pagein_Calc,
 	gid_File_Txt_Pagein_Draw,