You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2012/08/28 02:56:19 UTC
svn commit: r1377930 - in /incubator/ooo/trunk/main: cui/source/options/
extensions/prj/ helpcontent2/source/text/shared/guide/
helpcontent2/source/text/shared/optionen/ helpcontent2/util/sbasic/
helpcontent2/util/scalc/ helpcontent2/util/schart/ helpc...
Author: arielch
Date: Tue Aug 28 00:56:18 2012
New Revision: 1377930
URL: http://svn.apache.org/viewvc?rev=1377930&view=rev
Log:
#i120518# - Remove the "Browser Plug-in" tab page
Removed:
incubator/ooo/trunk/main/helpcontent2/source/text/shared/optionen/01020400.xhp
Modified:
incubator/ooo/trunk/main/cui/source/options/optinet2.cxx
incubator/ooo/trunk/main/cui/source/options/optinet2.hrc
incubator/ooo/trunk/main/cui/source/options/optinet2.hxx
incubator/ooo/trunk/main/cui/source/options/optinet2.src
incubator/ooo/trunk/main/cui/source/options/treeopt.cxx
incubator/ooo/trunk/main/cui/source/options/treeopt.src
incubator/ooo/trunk/main/extensions/prj/d.lst
incubator/ooo/trunk/main/helpcontent2/source/text/shared/guide/activex.xhp
incubator/ooo/trunk/main/helpcontent2/source/text/shared/optionen/01030000.xhp
incubator/ooo/trunk/main/helpcontent2/source/text/shared/optionen/makefile.mk
incubator/ooo/trunk/main/helpcontent2/util/sbasic/makefile.mk
incubator/ooo/trunk/main/helpcontent2/util/scalc/makefile.mk
incubator/ooo/trunk/main/helpcontent2/util/schart/makefile.mk
incubator/ooo/trunk/main/helpcontent2/util/sdatabase/makefile.mk
incubator/ooo/trunk/main/helpcontent2/util/sdraw/makefile.mk
incubator/ooo/trunk/main/helpcontent2/util/simpress/makefile.mk
incubator/ooo/trunk/main/helpcontent2/util/smath/makefile.mk
incubator/ooo/trunk/main/helpcontent2/util/swriter/makefile.mk
Modified: incubator/ooo/trunk/main/cui/source/options/optinet2.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/cui/source/options/optinet2.cxx?rev=1377930&r1=1377929&r2=1377930&view=diff
==============================================================================
--- incubator/ooo/trunk/main/cui/source/options/optinet2.cxx (original)
+++ incubator/ooo/trunk/main/cui/source/options/optinet2.cxx Tue Aug 28 00:56:18 2012
@@ -1505,199 +1505,6 @@ void SvxSecurityTabPage::Reset( const Sf
}
}
-//added by jmeng begin
-MozPluginTabPage::MozPluginTabPage(Window* pParent, const SfxItemSet& rSet)
- : SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_INET_MOZPLUGIN ), rSet ),
- aMSWordGB ( this, CUI_RES( GB_MOZPLUGIN ) ),
- aWBasicCodeCB ( this, CUI_RES( CB_MOZPLUGIN_CODE ) )
-{
- FreeResource();
-}
-
-MozPluginTabPage::~MozPluginTabPage()
-{
-}
-
-SfxTabPage* MozPluginTabPage::Create( Window* pParent,
- const SfxItemSet& rAttrSet )
-{
- return new MozPluginTabPage( pParent, rAttrSet );
-}
-sal_Bool MozPluginTabPage::FillItemSet( SfxItemSet& )
-{
- sal_Bool hasInstall = isInstalled();
- sal_Bool hasChecked = aWBasicCodeCB.IsChecked();
- if(hasInstall && (!hasChecked)){
- //try to uninstall
- uninstallPlugin();
- }
- else if((!hasInstall) && hasChecked){
- //try to install
- installPlugin();
- }
- else{
- // do nothing
- }
- return sal_True;
-}
-void MozPluginTabPage::Reset( const SfxItemSet& )
-{
- aWBasicCodeCB.Check( isInstalled());
- aWBasicCodeCB.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(rtl::OString * path)
-{
- OSL_ASSERT(path != NULL);
- ::rtl::OUString dirPath/*dllPath, */;
- if (osl_getExecutableFile(&dirPath.pData) != osl_Process_E_None) {
- return false;
- }
- dirPath = dirPath.copy(0, dirPath.lastIndexOf('/'));
-// osl::FileBase::getAbsoluteFileURL(dirPath, libPath, dllPath);
- ::rtl::OUString sysDirPath;
- osl::FileBase::getSystemPathFromFileURL(dirPath, sysDirPath);
- *path = OUStringToOString(sysDirPath, RTL_TEXTENCODING_ASCII_US);
- return true;
-}
-
-sal_Bool MozPluginTabPage::isInstalled()
-{
-#ifdef UNIX
- // get the real file referred by .so lnk file
- char lnkFilePath[NPP_PATH_MAX] = {0};
- char lnkReferFilePath[NPP_PATH_MAX] = {0};
- char* pHome = getpwuid(getuid())->pw_dir;
- strcat(lnkFilePath, pHome);
- strcat(lnkFilePath, "/.mozilla/plugins/libnpsoplugin" SAL_DLLEXTENSION);
-
- struct stat sBuf;
- if (0 > lstat(lnkFilePath, &sBuf))
- return false;
- if (!S_ISLNK(sBuf.st_mode))
- return false;
- if (0 >= readlink(lnkFilePath, 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};
- ::rtl::OString tempString;
- if (!getDllURL(&tempString)) {
- return false;
- }
- strncpy(realFilePath, tempString.getStr(), NPP_PATH_MAX);
- 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;
- ::rtl::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
-}
-
-sal_Bool MozPluginTabPage::installPlugin()
-{
-#ifdef UNIX
- // get the real file referred by .so lnk file
- char lnkFilePath[NPP_PATH_MAX] = {0};
- char* pHome = getpwuid(getuid())->pw_dir;
- strcat(lnkFilePath, pHome);
- strcat(lnkFilePath, "/.mozilla/plugins/libnpsoplugin" SAL_DLLEXTENSION);
- remove(lnkFilePath);
-
- // create the dirs if necessary
- struct stat buf;
- char tmpDir[NPP_PATH_MAX] = {0};
- sprintf(tmpDir, "%s/.mozilla", pHome);
- if (0 > stat(lnkFilePath, &buf))
- {
- mkdir(tmpDir, 0755);
- strcat(tmpDir, "/plugins");
- mkdir(tmpDir, 0755);
- }
-
- // get the real file path
- char realFilePath[NPP_PATH_MAX] = {0};
- ::rtl::OString tempString;
- if (!getDllURL(&tempString)) {
- return false;
- }
- strncpy(realFilePath, tempString.getStr(), NPP_PATH_MAX);
- strcat(realFilePath, "/libnpsoplugin" SAL_DLLEXTENSION);
-
- // create the link
- if (0 != symlink(realFilePath, lnkFilePath))
- return false;
- return true;
-#endif
-#ifdef WNT
- ::rtl::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
-}
-
-sal_Bool MozPluginTabPage::uninstallPlugin()
-{
-#ifdef UNIX
- // get the real file referred by .so lnk file
- char lnkFilePath[NPP_PATH_MAX] = {0};
- char* pHome = getpwuid(getuid())->pw_dir;
- strcat(lnkFilePath, pHome);
- strcat(lnkFilePath, "/.mozilla/plugins/libnpsoplugin" SAL_DLLEXTENSION);
-
- if(0 > remove(lnkFilePath))
- return false;
- return true;
-#endif
-#ifdef WNT
- ::rtl::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
-}
-//added by jmeng end
-
/* -------------------------------------------------------------------------*/
class MailerProgramCfg_Impl : public utl::ConfigItem
Modified: incubator/ooo/trunk/main/cui/source/options/optinet2.hrc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/cui/source/options/optinet2.hrc?rev=1377930&r1=1377929&r2=1377930&view=diff
==============================================================================
--- incubator/ooo/trunk/main/cui/source/options/optinet2.hrc (original)
+++ incubator/ooo/trunk/main/cui/source/options/optinet2.hrc Tue Aug 28 00:56:18 2012
@@ -156,11 +156,6 @@
#define PB_MAILERURL 5
#define STR_DEFAULT_FILENAME 6
-// plugin
-#define GB_MOZPLUGIN 1
-#define CB_MOZPLUGIN_CODE 2
-
-
#endif // #ifndef _SVX_OPTINET_HRC
// ******************************************************************* EOF
Modified: incubator/ooo/trunk/main/cui/source/options/optinet2.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/cui/source/options/optinet2.hxx?rev=1377930&r1=1377929&r2=1377930&view=diff
==============================================================================
--- incubator/ooo/trunk/main/cui/source/options/optinet2.hxx (original)
+++ incubator/ooo/trunk/main/cui/source/options/optinet2.hxx Tue Aug 28 00:56:18 2012
@@ -273,29 +273,6 @@ public:
virtual void Reset( const SfxItemSet& rSet );
};
-//added by jmeng begin
-class MozPluginTabPage : public SfxTabPage
-{
- FixedLine aMSWordGB;
- CheckBox aWBasicCodeCB;
-
- sal_Bool isInstalled(void);
- sal_Bool installPlugin(void);
- sal_Bool uninstallPlugin(void);
-
- MozPluginTabPage( Window* pParent, const SfxItemSet& rSet );
- virtual ~MozPluginTabPage();
-
-public:
-
- static SfxTabPage* Create( Window* pParent,
- const SfxItemSet& rAttrSet );
-
- virtual sal_Bool FillItemSet( SfxItemSet& rSet );
- virtual void Reset( const SfxItemSet& rSet );
-
-};
-//added by jmeng end
#endif
/* -----------------------------20.06.01 16:32--------------------------------
Modified: incubator/ooo/trunk/main/cui/source/options/optinet2.src
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/cui/source/options/optinet2.src?rev=1377930&r1=1377929&r2=1377930&view=diff
==============================================================================
--- incubator/ooo/trunk/main/cui/source/options/optinet2.src (original)
+++ incubator/ooo/trunk/main/cui/source/options/optinet2.src Tue Aug 28 00:56:18 2012
@@ -33,34 +33,6 @@
/* */
/************************************************************************/
-// added by jmeng begin
-
-TabPage RID_SVXPAGE_INET_MOZPLUGIN
-{
- HelpID = "cui:TabPage:RID_SVXPAGE_INET_MOZPLUGIN";
- OutputSize = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
- SVLook = TRUE ;
- Hide = TRUE ;
-
- FixedLine GB_MOZPLUGIN
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
- Text[ en-US ] = "Browser Plug-in";
- };
- CheckBox CB_MOZPLUGIN_CODE
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_INET_MOZPLUGIN:CB_MOZPLUGIN_CODE";
- Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 236 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "~Display documents in browser" ;
- };
-};
-
-//added by jmeng end
-
TabPage RID_SVXPAGE_INET_PROXY
{
HelpId = HID_OPTIONS_PROXY ;
Modified: incubator/ooo/trunk/main/cui/source/options/treeopt.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/cui/source/options/treeopt.cxx?rev=1377930&r1=1377929&r2=1377930&view=diff
==============================================================================
--- incubator/ooo/trunk/main/cui/source/options/treeopt.cxx (original)
+++ incubator/ooo/trunk/main/cui/source/options/treeopt.cxx Tue Aug 28 00:56:18 2012
@@ -363,9 +363,6 @@ SfxTabPage* CreateGeneralTabPage( sal_uI
case RID_SVXPAGE_ACCESSIBILITYCONFIG: fnCreate = &SvxAccessibilityOptionsTabPage::Create; break;
case RID_SVXPAGE_SSO: fnCreate = GetSSOCreator(); break;
case RID_SVXPAGE_OPTIONS_CTL: fnCreate = &SvxCTLOptionsPage::Create ; break;
- //added by jmeng begin
- case RID_SVXPAGE_INET_MOZPLUGIN: fnCreate = &MozPluginTabPage::Create; break;
- //added by jmeng end
case RID_SVXPAGE_OPTIONS_JAVA: fnCreate = &SvxJavaOptionsPage::Create ; break;
case RID_SVXPAGE_ONLINEUPDATE: fnCreate = &SvxOnlineUpdateTabPage::Create; break;
case RID_OPTPAGE_CHART_DEFCOLORS: fnCreate = &SvxDefaultColorOptPage::Create; break;
@@ -413,7 +410,6 @@ static OptionsMapping_Impl __READONLY_DA
{ "Internet", "Proxy", RID_SVXPAGE_INET_PROXY },
{ "Internet", "Search", RID_SVXPAGE_INET_SEARCH },
{ "Internet", "Email", RID_SVXPAGE_INET_MAIL },
- { "Internet", "MozillaPlugin", RID_SVXPAGE_INET_MOZPLUGIN },
{ "LoadSave", NULL, SID_FILTER_DLG },
{ "LoadSave", "General", RID_SFXPAGE_SAVE },
{ "LoadSave", "VBAProperties", SID_OPTFILTER_MSOFFICE },
@@ -2178,33 +2174,6 @@ void OfaTreeOptionsDialog::Initialize( c
if ( nPageId == RID_SVXPAGE_INET_MAIL )
continue;
#endif
-#if defined MACOSX
- // Disable Mozilla Plug-in tab-page on Mac
- if ( nPageId == RID_SVXPAGE_INET_MOZPLUGIN )
- continue;
-#endif
-#ifdef LINUX
- // Disable Mozilla Plug-in tab-page on Linux if we find a
- // globally installed plugin
- if ( nPageId == RID_SVXPAGE_INET_MOZPLUGIN ) {
- struct stat sb;
- char *p;
- bool bHaveSystemWidePlugin = false;
- char mozpaths[]="/usr/lib/mozilla/plugins/libnpsoplugin.so:/usr/lib/firefox/plugins/libnpsoplugin.so:/usr/lib/mozilla-firefox/plugins/libnpsoplugin.so:/usr/lib/iceweasel/plugins/libnpsoplugin.so:/usr/lib/iceape/plugins/libnpsoplugin.so:/usr/lib/browser-plugins/libnpsoplugin.so:/usr/lib64/browser-plugins/libnpsoplugin.so";
-
- p = strtok(mozpaths, ":");
- while (p != NULL) {
- if (stat(p, &sb) != -1) {
- bHaveSystemWidePlugin = true;
- break;
- }
- p = strtok(NULL, ":");
- }
-
- if (bHaveSystemWidePlugin == true)
- continue;
- }
-#endif
AddTabPage( nPageId, rInetArray.GetString(i), nGroup );
}
}
Modified: incubator/ooo/trunk/main/cui/source/options/treeopt.src
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/cui/source/options/treeopt.src?rev=1377930&r1=1377929&r2=1377930&view=diff
==============================================================================
--- incubator/ooo/trunk/main/cui/source/options/treeopt.src (original)
+++ incubator/ooo/trunk/main/cui/source/options/treeopt.src Tue Aug 28 00:56:18 2012
@@ -182,7 +182,6 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES
< "Proxy" ; RID_SVXPAGE_INET_PROXY; > ;
< "Search" ; RID_SVXPAGE_INET_SEARCH; > ;
< "E-mail" ; RID_SVXPAGE_INET_MAIL; > ;
- < "Browser Plug-in" ; RID_SVXPAGE_INET_MOZPLUGIN; > ;
};
//modified by jmeng end
};
Modified: incubator/ooo/trunk/main/extensions/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/extensions/prj/d.lst?rev=1377930&r1=1377929&r2=1377930&view=diff
==============================================================================
--- incubator/ooo/trunk/main/extensions/prj/d.lst (original)
+++ incubator/ooo/trunk/main/extensions/prj/d.lst Tue Aug 28 00:56:18 2012
@@ -14,12 +14,7 @@ mkdir: %_DEST%\bin%_EXT%\so
..\%__SRC%\lib\updatefeed.uno.so %_DEST%\lib%_EXT%\updatefeed.uno.so
..\%__SRC%\bin\oleautobridge2.uno.dll %_DEST%\bin%_EXT%\odf4ms\oleautobridge.uno.dll
..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\bin\pluginapp.bin %_DEST%\bin%_EXT%\pluginapp.bin
..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
-..\%__SRC%\bin\nsplugin.exe %_DEST%\bin%_EXT%\nsplugin.exe
-..\%__SRC%\bin\nsplugin %_DEST%\bin%_EXT%\nsplugin
-..\%__SRC%\bin\npsoplugin.dll %_DEST%\bin%_EXT%\npsoplugin.dll
-..\%__SRC%\bin\npsoplugin_so.dll %_DEST%\bin%_EXT%\so\npsoplugin.dll
..\%__SRC%\bin\x64\so_activex.dll %_DEST%\bin%_EXT%\so_activex_x64.dll
..\%__SRC%\bin\mdibundle.zip %_DEST%\bin%_EXT%\mdibundle.zip
..\%__SRC%\misc\oleautobridge.component %_DEST%\xml%_EXT%\oleautobridge.component
Modified: incubator/ooo/trunk/main/helpcontent2/source/text/shared/guide/activex.xhp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/helpcontent2/source/text/shared/guide/activex.xhp?rev=1377930&r1=1377929&r2=1377930&view=diff
==============================================================================
--- incubator/ooo/trunk/main/helpcontent2/source/text/shared/guide/activex.xhp (original)
+++ incubator/ooo/trunk/main/helpcontent2/source/text/shared/guide/activex.xhp Tue Aug 28 00:56:18 2012
@@ -89,7 +89,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"/>
Modified: incubator/ooo/trunk/main/helpcontent2/source/text/shared/optionen/01030000.xhp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/helpcontent2/source/text/shared/optionen/01030000.xhp?rev=1377930&r1=1377929&r2=1377930&view=diff
==============================================================================
--- incubator/ooo/trunk/main/helpcontent2/source/text/shared/optionen/01030000.xhp (original)
+++ incubator/ooo/trunk/main/helpcontent2/source/text/shared/optionen/01030000.xhp Tue Aug 28 00:56:18 2012
@@ -46,8 +46,6 @@
<case select="MAC"><embed href="text/shared/optionen/01020300.xhp#email"/>
</case>
</switch>
-
-<embed href="text/shared/optionen/01020400.xhp#mozilla"/>
<embed href="text/shared/00/00000001.xhp#zurueck"/>
</body>
</helpdocument>
\ No newline at end of file
Modified: incubator/ooo/trunk/main/helpcontent2/source/text/shared/optionen/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/helpcontent2/source/text/shared/optionen/makefile.mk?rev=1377930&r1=1377929&r2=1377930&view=diff
==============================================================================
--- incubator/ooo/trunk/main/helpcontent2/source/text/shared/optionen/makefile.mk (original)
+++ incubator/ooo/trunk/main/helpcontent2/source/text/shared/optionen/makefile.mk Tue Aug 28 00:56:18 2012
@@ -62,7 +62,6 @@ XHPFILES = \
01020100.xhp \
01020200.xhp \
01020300.xhp \
- 01020400.xhp \
01030000.xhp \
01030300.xhp \
01030500.xhp \
Modified: incubator/ooo/trunk/main/helpcontent2/util/sbasic/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/helpcontent2/util/sbasic/makefile.mk?rev=1377930&r1=1377929&r2=1377930&view=diff
==============================================================================
--- incubator/ooo/trunk/main/helpcontent2/util/sbasic/makefile.mk (original)
+++ incubator/ooo/trunk/main/helpcontent2/util/sbasic/makefile.mk Tue Aug 28 00:56:18 2012
@@ -1184,7 +1184,6 @@ LINKLINKFILES= \
text$/shared$/optionen$/01020100.xhp \
text$/shared$/optionen$/01020200.xhp \
text$/shared$/optionen$/01020300.xhp \
- text$/shared$/optionen$/01020400.xhp \
text$/shared$/optionen$/01030000.xhp \
text$/shared$/optionen$/01030300.xhp \
text$/shared$/optionen$/01030500.xhp \
Modified: incubator/ooo/trunk/main/helpcontent2/util/scalc/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/helpcontent2/util/scalc/makefile.mk?rev=1377930&r1=1377929&r2=1377930&view=diff
==============================================================================
--- incubator/ooo/trunk/main/helpcontent2/util/scalc/makefile.mk (original)
+++ incubator/ooo/trunk/main/helpcontent2/util/scalc/makefile.mk Tue Aug 28 00:56:18 2012
@@ -1197,7 +1197,6 @@ LINKLINKFILES= \
text$/shared$/optionen$/01020100.xhp \
text$/shared$/optionen$/01020200.xhp \
text$/shared$/optionen$/01020300.xhp \
- text$/shared$/optionen$/01020400.xhp \
text$/shared$/optionen$/01030000.xhp \
text$/shared$/optionen$/01030300.xhp \
text$/shared$/optionen$/01030500.xhp \
Modified: incubator/ooo/trunk/main/helpcontent2/util/schart/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/helpcontent2/util/schart/makefile.mk?rev=1377930&r1=1377929&r2=1377930&view=diff
==============================================================================
--- incubator/ooo/trunk/main/helpcontent2/util/schart/makefile.mk (original)
+++ incubator/ooo/trunk/main/helpcontent2/util/schart/makefile.mk Tue Aug 28 00:56:18 2012
@@ -885,7 +885,6 @@ LINKLINKFILES= \
text$/shared$/optionen$/01020100.xhp \
text$/shared$/optionen$/01020200.xhp \
text$/shared$/optionen$/01020300.xhp \
- text$/shared$/optionen$/01020400.xhp \
text$/shared$/optionen$/01030000.xhp \
text$/shared$/optionen$/01030300.xhp \
text$/shared$/optionen$/01030500.xhp \
Modified: incubator/ooo/trunk/main/helpcontent2/util/sdatabase/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/helpcontent2/util/sdatabase/makefile.mk?rev=1377930&r1=1377929&r2=1377930&view=diff
==============================================================================
--- incubator/ooo/trunk/main/helpcontent2/util/sdatabase/makefile.mk (original)
+++ incubator/ooo/trunk/main/helpcontent2/util/sdatabase/makefile.mk Tue Aug 28 00:56:18 2012
@@ -883,7 +883,6 @@ LINKLINKFILES= \
text$/shared$/optionen$/01020100.xhp \
text$/shared$/optionen$/01020200.xhp \
text$/shared$/optionen$/01020300.xhp \
- text$/shared$/optionen$/01020400.xhp \
text$/shared$/optionen$/01030000.xhp \
text$/shared$/optionen$/01030300.xhp \
text$/shared$/optionen$/01030500.xhp \
Modified: incubator/ooo/trunk/main/helpcontent2/util/sdraw/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/helpcontent2/util/sdraw/makefile.mk?rev=1377930&r1=1377929&r2=1377930&view=diff
==============================================================================
--- incubator/ooo/trunk/main/helpcontent2/util/sdraw/makefile.mk (original)
+++ incubator/ooo/trunk/main/helpcontent2/util/sdraw/makefile.mk Tue Aug 28 00:56:18 2012
@@ -1118,7 +1118,6 @@ LINKLINKFILES= \
text$/shared$/optionen$/01020100.xhp \
text$/shared$/optionen$/01020200.xhp \
text$/shared$/optionen$/01020300.xhp \
- text$/shared$/optionen$/01020400.xhp \
text$/shared$/optionen$/01030000.xhp \
text$/shared$/optionen$/01030300.xhp \
text$/shared$/optionen$/01030500.xhp \
Modified: incubator/ooo/trunk/main/helpcontent2/util/simpress/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/helpcontent2/util/simpress/makefile.mk?rev=1377930&r1=1377929&r2=1377930&view=diff
==============================================================================
--- incubator/ooo/trunk/main/helpcontent2/util/simpress/makefile.mk (original)
+++ incubator/ooo/trunk/main/helpcontent2/util/simpress/makefile.mk Tue Aug 28 00:56:18 2012
@@ -1120,7 +1120,6 @@ LINKLINKFILES= \
text$/shared$/optionen$/01020100.xhp \
text$/shared$/optionen$/01020200.xhp \
text$/shared$/optionen$/01020300.xhp \
- text$/shared$/optionen$/01020400.xhp \
text$/shared$/optionen$/01030000.xhp \
text$/shared$/optionen$/01030300.xhp \
text$/shared$/optionen$/01030500.xhp \
Modified: incubator/ooo/trunk/main/helpcontent2/util/smath/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/helpcontent2/util/smath/makefile.mk?rev=1377930&r1=1377929&r2=1377930&view=diff
==============================================================================
--- incubator/ooo/trunk/main/helpcontent2/util/smath/makefile.mk (original)
+++ incubator/ooo/trunk/main/helpcontent2/util/smath/makefile.mk Tue Aug 28 00:56:18 2012
@@ -963,7 +963,6 @@ LINKLINKFILES= \
text$/shared$/optionen$/01020100.xhp \
text$/shared$/optionen$/01020200.xhp \
text$/shared$/optionen$/01020300.xhp \
- text$/shared$/optionen$/01020400.xhp \
text$/shared$/optionen$/01030000.xhp \
text$/shared$/optionen$/01030300.xhp \
text$/shared$/optionen$/01030500.xhp \
Modified: incubator/ooo/trunk/main/helpcontent2/util/swriter/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/helpcontent2/util/swriter/makefile.mk?rev=1377930&r1=1377929&r2=1377930&view=diff
==============================================================================
--- incubator/ooo/trunk/main/helpcontent2/util/swriter/makefile.mk (original)
+++ incubator/ooo/trunk/main/helpcontent2/util/swriter/makefile.mk Tue Aug 28 00:56:18 2012
@@ -1275,7 +1275,6 @@ LINKLINKFILES= \
text$/shared$/optionen$/01020100.xhp \
text$/shared$/optionen$/01020200.xhp \
text$/shared$/optionen$/01020300.xhp \
- text$/shared$/optionen$/01020400.xhp \
text$/shared$/optionen$/01030000.xhp \
text$/shared$/optionen$/01030300.xhp \
text$/shared$/optionen$/01030500.xhp \