[arch-commits] CVS update of extra/office/openoffice-base (1 file)
andyrtr at archlinux.org
andyrtr at archlinux.org
Sat Aug 25 11:20:38 UTC 2007
Date: Saturday, August 25, 2007 @ 07:20:38
Author: andyrtr
Path: /home/cvs-extra/extra/office/openoffice-base
Added: no-mozilla-plug-in-option_oog680_m1.diff (1.1)
updatepkg 2.3.0 prerelease oog680_m2
------------------------------------------+
no-mozilla-plug-in-option_oog680_m1.diff | 302 +++++++++++++++++++++++++++++
1 file changed, 302 insertions(+)
Index: extra/office/openoffice-base/no-mozilla-plug-in-option_oog680_m1.diff
diff -u /dev/null extra/office/openoffice-base/no-mozilla-plug-in-option_oog680_m1.diff:1.1
--- /dev/null Sat Aug 25 07:20:37 2007
+++ extra/office/openoffice-base/no-mozilla-plug-in-option_oog680_m1.diff Sat Aug 25 07:20:37 2007
@@ -0,0 +1,302 @@
+--- svx/inc/svx/dialogs.hrc
++++ svx/inc/svx/dialogs.hrc
+@@ -256,11 +256,6 @@
+ #define RID_SVXPAGE_INET_CACHE (RID_SVX_START + 158)
+ #define RID_SVXPAGE_INET_TYPE (RID_SVX_START + 159)
+ #define RID_SVXPAGE_INET_SEARCH (RID_SVX_START + 160)
+-//added by jmeng begin
+-#define RID_SVXPAGE_INET_MOZPLUGIN (RID_SVX_START + 2161)
+-#define GB_MOZPLUGIN 1
+-#define CB_MOZPLUGIN_CODE 2
+-//added by jmeng end
+ #define RID_SVXPAGE_INET_SECURITY (RID_SVX_START + 200)
+
+ #define RID_SVXPAGE_BROWSER_OTHER (RID_SVX_START + 202)
+--- svx/source/dialog/optinet2.cxx
++++ svx/source/dialog/optinet2.cxx
+@@ -1737,188 +1737,6 @@
+ maProtectRecordsPB.SetText( sNewText );
+ }
+
+-//added by jmeng begin
+-MozPluginTabPage::MozPluginTabPage(Window* pParent, const SfxItemSet& rSet)
+- : SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_INET_MOZPLUGIN ), rSet ),
+- aMSWordGB ( this, SVX_RES( GB_MOZPLUGIN ) ),
+- aWBasicCodeCB ( this, SVX_RES( CB_MOZPLUGIN_CODE ) )
+-{
+- FreeResource();
+-}
+-
+-MozPluginTabPage::~MozPluginTabPage()
+-{
+-}
+-
+-SfxTabPage* MozPluginTabPage::Create( Window* pParent,
+- const SfxItemSet& rAttrSet )
+-{
+- return new MozPluginTabPage( pParent, rAttrSet );
+-}
+-BOOL MozPluginTabPage::FillItemSet( SfxItemSet& )
+-{
+- BOOL hasInstall = isInstalled();
+- BOOL hasChecked = aWBasicCodeCB.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& )
+-{
+- 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 ::rtl::OString getDllURL( void )
+-{
+-// ::rtl::OUString libPath(rtl::OUString::createFromAscii("libcui680li.so"));
+- ::rtl::OUString dirPath/*dllPath, */;
+- osl::Module::getUrlFromAddress(reinterpret_cast< oslGenericFunction >(getDllURL), dirPath);
+- dirPath = dirPath.copy(0, dirPath.lastIndexOf('/'));
+-// osl::FileBase::getAbsoluteFileURL(dirPath, libPath, dllPath);
+- ::rtl::OUString sysDirPath;
+- osl::FileBase::getSystemPathFromFileURL(dirPath, sysDirPath);
+- ::rtl::OString oSysDirPath;
+- oSysDirPath = OUStringToOString(sysDirPath, RTL_TEXTENCODING_ASCII_US);
+- return oSysDirPath;
+-}
+-
+-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;
+- tempString = getDllURL();
+- 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
+- BOOL ret = true;
+- ::rtl::OString tempString;
+- char realFilePath[NPP_PATH_MAX] = {0};
+- tempString = getDllURL();
+- 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 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;
+- tempString = getDllURL();
+- 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};
+- tempString = getDllURL();
+- 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 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};
+- tempString = getDllURL();
+- 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
+--- svx/source/dialog/optinet2.hxx
++++ svx/source/dialog/optinet2.hxx
+@@ -307,29 +307,6 @@
+ virtual void Reset( const SfxItemSet& rSet );
+ };
+
+-//added by jmeng begin
+-class MozPluginTabPage : public SfxTabPage
+-{
+- FixedLine aMSWordGB;
+- CheckBox aWBasicCodeCB;
+-
+- 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 );
+- virtual void Reset( const SfxItemSet& rSet );
+-
+-};
+-//added by jmeng end
+ #endif
+
+ /* -----------------------------20.06.01 16:32--------------------------------
+--- svx/source/dialog/treeopt.cxx
++++ svx/source/dialog/treeopt.cxx
+@@ -478,9 +478,6 @@
+ 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;
+@@ -526,7 +523,6 @@
+ { "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 },
+--- svx/source/dialog/treeopt.src
++++ svx/source/dialog/treeopt.src
+@@ -191,7 +191,6 @@
+ < "Proxy" ; RID_SVXPAGE_INET_PROXY; > ;
+ < "Search" ; RID_SVXPAGE_INET_SEARCH; > ;
+ < "E-mail" ; RID_SVXPAGE_INET_MAIL; > ;
+- < "Mozilla Plug-in" ; RID_SVXPAGE_INET_MOZPLUGIN; > ;
+ };
+ //modified by jmeng end
+ };
+--- svx/source/options/optinet2.src
++++ svx/source/options/optinet2.src
+@@ -45,32 +45,6 @@
+ /* */
+ /************************************************************************/
+
+-// added by jmeng begin
+-
+-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 ] = "Mozilla Plug-in";
+- };
+- CheckBox CB_MOZPLUGIN_CODE
+- {
+- Pos = MAP_APPFONT ( 12 , 14 ) ;
+- Size = MAP_APPFONT ( 236 , 10 ) ;
+- TabStop = TRUE ;
+- Text [ en-US ] = "~Enable" ;
+- };
+-};
+-
+-//added by jmeng end
+-
+ TabPage RID_SVXPAGE_INET_PROXY
+ {
+ HelpId = HID_OPTIONS_PROXY ;
More information about the arch-commits
mailing list