diff options
Diffstat (limited to 'cui/source')
| -rw-r--r-- | cui/source/options/optinet2.cxx | 2 | ||||
| -rw-r--r-- | cui/source/options/optinet2.hxx | 5 | ||||
| -rwxr-xr-x | cui/source/options/optinet2.src | 4 | ||||
| -rw-r--r-- | cui/source/options/treeopt.cxx | 2 |
4 files changed, 2 insertions, 11 deletions
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 6917a0d5229e..f94ea15edf0a 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -1532,7 +1532,6 @@ void SvxSecurityTabPage::Reset( const SfxItemSet& ) } } -//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 ) ), @@ -1722,7 +1721,6 @@ BOOL MozPluginTabPage::uninstallPlugin() return false; #endif } -//added by jmeng end /* -------------------------------------------------------------------------*/ diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index 8c41db2ee4f3..8a6c62637624 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -200,7 +200,7 @@ private: virtual void ActivatePage( const SfxItemSet& rSet ); virtual int DeactivatePage( SfxItemSet* pSet = 0 ); - BOOL ConfirmLeave( const String& rStringSelection ); //add by BerryJia for fixing Bug102610 Time:2002-8-29 11:00 (China Standard Time GMT+08:00) + BOOL ConfirmLeave( const String& rStringSelection ); SvxSearchTabPage( Window* pParent, const SfxItemSet& rSet ); virtual ~SvxSearchTabPage(); @@ -278,7 +278,6 @@ public: virtual void Reset( const SfxItemSet& rSet ); }; -//added by jmeng begin class MozPluginTabPage : public SfxTabPage { FixedLine aMSWordGB; @@ -300,7 +299,7 @@ public: virtual void Reset( const SfxItemSet& rSet ); }; -//added by jmeng end + #endif #ifdef WNT diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src index 9023dfa52394..fbf2146c390e 100755 --- a/cui/source/options/optinet2.src +++ b/cui/source/options/optinet2.src @@ -37,8 +37,6 @@ /* */ /************************************************************************/ -// added by jmeng begin - TabPage RID_SVXPAGE_INET_MOZPLUGIN { OutputSize = TRUE ; @@ -61,8 +59,6 @@ TabPage RID_SVXPAGE_INET_MOZPLUGIN }; }; -//added by jmeng end - TabPage RID_SVXPAGE_INET_PROXY { HelpId = HID_OPTIONS_PROXY ; diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 0fb8a89b667f..5af0beee0230 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -359,9 +359,7 @@ SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, Window* pParent, const SfxItem 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; |