ooo-build r12899 - trunk/patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Mon Jun 16 16:17:07 2008
New Revision: 12899
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12899&view=rev

Log:
fix

Modified:
   trunk/patches/dev300/no-mozilla-plug-in-option.diff

Modified: trunk/patches/dev300/no-mozilla-plug-in-option.diff
==============================================================================
--- trunk/patches/dev300/no-mozilla-plug-in-option.diff	(original)
+++ trunk/patches/dev300/no-mozilla-plug-in-option.diff	Mon Jun 16 16:17:07 2008
@@ -200,3 +200,114 @@
  /* -------------------------------------------------------------------------*/
  
  class MailerProgramCfg_Impl : public utl::ConfigItem
+--- svx/source/dialog/optinet2.hxx	10 Apr 2008 23:34:00 -0000	1.16
++++ svx/source/dialog/optinet2.hxx	16 Jun 2008 16:09:22 -0000
+@@ -293,29 +293,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/options/optinet2.src	11 Apr 2008 02:13:50 -0000	1.97
++++ svx/source/options/optinet2.src	16 Jun 2008 16:11:20 -0000
+@@ -40,32 +40,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 ;
+--- svx/source/dialog/treeopt.src	11 Apr 2008 00:17:12 -0000	1.21
++++ svx/source/dialog/treeopt.src	16 Jun 2008 16:12:27 -0000
+@@ -186,7 +186,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/inc/svx/dialogs.hrc	4 Jun 2008 11:21:07 -0000	1.14
++++ svx/inc/svx/dialogs.hrc	16 Jun 2008 16:14:30 -0000
+@@ -258,11 +258,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/treeopt.cxx	11 Apr 2008 00:16:21 -0000	1.56
++++ svx/source/dialog/treeopt.cxx	16 Jun 2008 16:04:13 -0000
+@@ -368,9 +368,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;
+@@ -370,7 +367,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 },