diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-09 15:21:55 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-09 15:21:55 +0200 |
| commit | 70fc0dc34e884699f250091bebe4b9e2e858063f (patch) | |
| tree | 0ce56f33afd20205335227eeb46c5249032c024d /source/text/shared | |
| parent | 8b3f1eb34638d512b8dbe3e426e28bbf50439e90 (diff) | |
fdo#45071: Remove ENABLE_NPAPI_INTO_BROWSER left-overs
...from previous commit 496bc3cd6c037360632c33471c4622a095cdcadd "fdo#45071
Remove Libreoffice browser plugin"
Change-Id: Iad66c80c5f54be8e5199ed633a7a884a44f7e989
Diffstat (limited to 'source/text/shared')
| -rw-r--r-- | source/text/shared/guide/activex.xhp | 1 | ||||
| -rw-r--r-- | source/text/shared/optionen/01020400.xhp | 59 | ||||
| -rw-r--r-- | source/text/shared/optionen/01030000.xhp | 2 |
3 files changed, 1 insertions, 61 deletions
diff --git a/source/text/shared/guide/activex.xhp b/source/text/shared/guide/activex.xhp index 7239c13af2..0abef31e46 100644 --- a/source/text/shared/guide/activex.xhp +++ b/source/text/shared/guide/activex.xhp @@ -84,7 +84,6 @@ </listitem> </list> <section id="relatedtopics"> -<embed href="text/shared/optionen/01020400.xhp#mozilla"/> <embed href="text/shared/guide/ms_import_export_limitations.xhp#about"/> <embed href="text/shared/guide/doc_open.xhp#doc_open"/> <embed href="text/shared/guide/import_ms.xhp#import_ms"/> diff --git a/source/text/shared/optionen/01020400.xhp b/source/text/shared/optionen/01020400.xhp deleted file mode 100644 index a0391061eb..0000000000 --- a/source/text/shared/optionen/01020400.xhp +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<helpdocument version="1.0"> - -<!-- - * 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 . - --> - - -<meta> - <topic id="textsharedoptionen01020400xhp" indexer="include" status="PUBLISH"> - <title xml-lang="en-US" id="tit">Browser Plug-in</title> - <filename>/text/shared/optionen/01020400.xhp</filename> - </topic> - </meta> - <body> - <section id="mozilla"> - <bookmark xml-lang="en-US" branch="hid/cui/ui/optbrowserpage/OptBrowserPage" id="bm_id337230" localize="false"/> - <paragraph xml-lang="en-US" id="par_idN105B7" role="heading" level="1" l10n="CHG"><link href="text/shared/optionen/01020400.xhp" name="Browser Plugin">Browser Plug-in</link></paragraph> - <paragraph xml-lang="en-US" id="par_idN105D5" role="paragraph" l10n="NEW">Specifies to use the Mozilla plug-in to show %PRODUCTNAME documents.</paragraph> - </section> - <paragraph xml-lang="en-US" id="par_idN105D8" role="paragraph" l10n="CHG">When you click any %PRODUCTNAME document hyperlink in your Mozilla or Netscape browser, one of the following can happen:</paragraph> - <list type="ordered"> - <listitem> - <paragraph xml-lang="en-US" id="par_idN105DE" role="paragraph" l10n="CHG">The browser asks you whether you want to save the document on your disk, or whether you want to use an application to open the document. This request dialog appears by default when you click any %PRODUCTNAME document hyperlink the first time and you did not enable the Browser Plug-in.</paragraph> - </listitem> - <listitem> - <paragraph xml-lang="en-US" id="par_idN105E2" role="paragraph" l10n="NEW">The browser downloads the document to a temporary folder, then tells your system to run %PRODUCTNAME and open the document in %PRODUCTNAME. This is the default when you did not enable the Browser Plug-in and chose to open the document with %PRODUCTNAME when you were first asked.</paragraph> - </listitem> - <listitem> - <paragraph xml-lang="en-US" id="par_idN105E6" role="paragraph" l10n="NEW">The browser opens a new browser window that shows some of the %PRODUCTNAME icons, and displays the document in the browser window. This is the default when you enable the Browser Plug-in. When you click the <emph>Edit File</emph> icon, a copy of the document is downloaded to a temporary folder on your disk, then %PRODUCTNAME starts and loads the copy for editing.</paragraph> - </listitem> - </list> -<bookmark xml-lang="en-US" branch="hid/cui/ui/optbrowserpage/display" id="bm_id337229" localize="false"/> -<paragraph xml-lang="en-US" id="par_idN105F5" role="heading" level="2" l10n="CHG">Display documents in browser</paragraph> - <paragraph xml-lang="en-US" id="par_idN105F9" role="paragraph" l10n="CHG"><ahelp hid="cui/ui/optbrowserpage/display">Enables the Browser Plug-in to show %PRODUCTNAME documents in a browser window. Select, click OK, then restart your browser. Then, in the browser window, click any %PRODUCTNAME document hyperlink.</ahelp></paragraph> - <paragraph xml-lang="en-US" id="par_idN10655" role="paragraph" l10n="CHG">The plug-in needs a version of Mozilla, Netscape, or Firefox installed on your system.</paragraph> -<switch select="sys"> -<case select="WIN"> -<section id="relatedtopics"> - <embed href="text/shared/guide/activex.xhp#activex"/> - </section> -</case> -</switch> -</body> -</helpdocument> diff --git a/source/text/shared/optionen/01030000.xhp b/source/text/shared/optionen/01030000.xhp index f8b321a14c..0f051c51fe 100644 --- a/source/text/shared/optionen/01030000.xhp +++ b/source/text/shared/optionen/01030000.xhp @@ -41,7 +41,7 @@ </case> <default> </default> -</switch><embed href="text/shared/optionen/01020400.xhp#mozilla"/> +</switch> <embed href="text/shared/00/00000001.xhp#zurueck"/> </body> </helpdocument> |