[Libreoffice-commits] .: configure.in distro-configs/NovellWin32Eval.conf.in patches/dev300

Jan Holesovsky kendy at kemper.freedesktop.org
Thu Feb 17 07:47:00 PST 2011


 configure.in                                           |    1 
 distro-configs/NovellWin32Eval.conf.in                 |   10 
 patches/dev300/apply                                   |   10 
 patches/dev300/evaluation-row-limit.diff               |   26 -
 patches/dev300/novell-subscription-enable-in-menu.diff |  286 -----------------
 patches/dev300/novell-subscription.diff                |  162 ---------
 6 files changed, 495 deletions(-)

New commits:
commit f2276fea7a44de8d8bb79194e9c7d3a35d569df5
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Feb 17 16:46:27 2011 +0100

    Kill the NovellWin32Eval distro + the associated patches.

diff --git a/configure.in b/configure.in
index 8a92c81..907318e 100755
--- a/configure.in
+++ b/configure.in
@@ -1856,7 +1856,6 @@ distro-configs/Slackware.conf
 distro-configs/Mandriva.conf
 distro-configs/Mandriva64.conf
 distro-configs/NovellWin32.conf
-distro-configs/NovellWin32Eval.conf
 distro-configs/NovellWin32ISO.conf
 distro-configs/Gentoo.conf
 distro-configs/Frugalware.conf
diff --git a/distro-configs/NovellWin32Eval.conf.in b/distro-configs/NovellWin32Eval.conf.in
deleted file mode 100644
index f71e446..0000000
--- a/distro-configs/NovellWin32Eval.conf.in
+++ /dev/null
@@ -1,10 +0,0 @@
---with-intro-bitmaps=\"$TOOLSDIR/src/openintro_nld_eval.bmp\"
---with-about-bitmaps=\"$TOOLSDIR/src/openabout_nld.bmp\"
---with-vendor=\"Novell, Inc.\"
---with-java-target-version=1.5
---enable-hids
---disable-activex-component
---disable-xrender-link
---without-myspell-dicts
---without-agfa-monotype-fonts
---without-junit
diff --git a/patches/dev300/apply b/patches/dev300/apply
index fd4a3ee..f2cc604 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -113,7 +113,6 @@ NovellLikeWin32: Win32Common, NovellOnly, NovellLikeOnlyWin32, MultilanguageWin3
 	CustomUserConfig, LiberationFontsOnWindows
 # Novell
 NovellWin32: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, NovellWin32WritingAids
-NovellWin32Eval: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, NovellEvaluation
 NovellWin32ISO: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, NovellWin32WritingAids
 # go-oo.org Win32
 GoOoWin32: NovellLikeWin32, GoOoOnlyWin32, MultilanguageWin32Only, NovellWin32WritingAids, GoOoSplash
@@ -463,9 +462,6 @@ novell-palette.diff, michael
 # finally disable -fsigned-char on pcc
 solenv-really-use-unsinged-char-on-ppc.diff, i#81127, n#169875, pmladek
 
-# the possibility to add a Subscription menu
-novell-subscription.diff, jholesov
-
 [ NotDebian ]
 
 # Disable the printer properties which are unused#583
@@ -2136,12 +2132,6 @@ SectionOwner => hmth
 # make Python2 optional
 disable-python.diff
 
-[ NovellEvaluation ]
-# enable the Subscription menu
-novell-subscription-enable-in-menu.diff
-# back to the up-stream row limit
-evaluation-row-limit.diff
-
 [ Netbook ]
 vcl-netbook.diff, rodo
 
diff --git a/patches/dev300/evaluation-row-limit.diff b/patches/dev300/evaluation-row-limit.diff
deleted file mode 100644
index b47215f..0000000
--- a/patches/dev300/evaluation-row-limit.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git sc/inc/address.hxx sc/inc/address.hxx
-index 76f0d42..af36690 100644
---- sc/inc/address.hxx
-+++ sc/inc/address.hxx
-@@ -86,7 +86,7 @@ const SCSIZE   SCSIZE_MAX   = ::std::numeric_limits<SCSIZE>::max();
- 
- // The maximum values. Defines are needed for preprocessor checks in
- // bcaslot.cxx, otherwise type safe constants are preferred.
--#define MAXROWCOUNT_DEFINE 1048576
-+#define MAXROWCOUNT_DEFINE 65536
- #define MAXCOLCOUNT_DEFINE 1024
- 
- // Count values
-diff --git sc/source/ui/view/hdrcont.cxx sc/source/ui/view/hdrcont.cxx
-index 3160bee..be36c2b 100644
---- sc/source/ui/view/hdrcont.cxx
-+++ sc/source/ui/view/hdrcont.cxx
-@@ -104,7 +104,7 @@ ScHeaderControl::ScHeaderControl( Window* pParent, SelectionEngine* pSelectionEn
- 
- 	nWidth = nSmallWidth = aSize.Width();
- 	nBigWidth = LogicToPixel( Size( GetTextWidth(
--		String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("8888888")) ), 0 ) ).Width() + 5;
-+        String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("88888")) ), 0 ) ).Width() + 4;
- 
- 	SetBackground();	// sonst Probleme auf OS/2 !?!?!
- }
diff --git a/patches/dev300/novell-subscription-enable-in-menu.diff b/patches/dev300/novell-subscription-enable-in-menu.diff
deleted file mode 100644
index 5257172..0000000
--- a/patches/dev300/novell-subscription-enable-in-menu.diff
+++ /dev/null
@@ -1,286 +0,0 @@
-diff --git basctl/uiconfig/basicide/menubar/menubar.xml basctl/uiconfig/basicide/menubar/menubar.xml
-index 0ab1c50..afdc8e9 100644
---- basctl/uiconfig/basicide/menubar/menubar.xml
-+++ basctl/uiconfig/basicide/menubar/menubar.xml
-@@ -85,5 +85,10 @@
-             <menu:menuitem menu:id=".uno:About"/>
-         </menu:menupopup>
-     </menu:menu>
-+    <menu:menu menu:id=".uno:SubscriptionMenu">
-+        <menu:menupopup>
-+            <menu:menuitem menu:id=".uno:GetSubscription"/>
-+        </menu:menupopup>
-+    </menu:menu>
- </menu:menubar>
- 
-diff --git chart2/uiconfig/menubar/menubar.xml chart2/uiconfig/menubar/menubar.xml
-index 4c3c12c..04e482d 100644
---- chart2/uiconfig/menubar/menubar.xml
-+++ chart2/uiconfig/menubar/menubar.xml
-@@ -152,4 +152,9 @@
-             <menu:menuitem menu:id=".uno:About"/>
-         </menu:menupopup>
-     </menu:menu>
-+    <menu:menu menu:id=".uno:SubscriptionMenu">
-+        <menu:menupopup>
-+            <menu:menuitem menu:id=".uno:GetSubscription"/>
-+        </menu:menupopup>
-+    </menu:menu>
- </menu:menubar>
-diff --git dbaccess/uiconfig/dbapp/menubar/menubar.xml dbaccess/uiconfig/dbapp/menubar/menubar.xml
-index 3fa098d..a027459 100644
---- dbaccess/uiconfig/dbapp/menubar/menubar.xml
-+++ dbaccess/uiconfig/dbapp/menubar/menubar.xml
-@@ -137,5 +137,10 @@
-             <menu:menuitem menu:id=".uno:About"/>
-         </menu:menupopup>
-     </menu:menu>
-+    <menu:menu menu:id=".uno:SubscriptionMenu">
-+        <menu:menupopup>
-+            <menu:menuitem menu:id=".uno:GetSubscription"/>
-+        </menu:menupopup>
-+    </menu:menu>
- </menu:menubar>
- 
-diff --git dbaccess/uiconfig/dbquery/menubar/menubar.xml dbaccess/uiconfig/dbquery/menubar/menubar.xml
-index ff4ad4e..f599a1c 100644
---- dbaccess/uiconfig/dbquery/menubar/menubar.xml
-+++ dbaccess/uiconfig/dbquery/menubar/menubar.xml
-@@ -78,5 +78,10 @@
-             <menu:menuitem menu:id=".uno:About"/>
-         </menu:menupopup>
-     </menu:menu>
-+    <menu:menu menu:id=".uno:SubscriptionMenu">
-+        <menu:menupopup>
-+            <menu:menuitem menu:id=".uno:GetSubscription"/>
-+        </menu:menupopup>
-+    </menu:menu>
- </menu:menubar>
- 
-diff --git dbaccess/uiconfig/dbrelation/menubar/menubar.xml dbaccess/uiconfig/dbrelation/menubar/menubar.xml
-index 25dbf3a..8a725bd 100644
---- dbaccess/uiconfig/dbrelation/menubar/menubar.xml
-+++ dbaccess/uiconfig/dbrelation/menubar/menubar.xml
-@@ -61,5 +61,10 @@
-             <menu:menuitem menu:id=".uno:About"/>
-         </menu:menupopup>
-     </menu:menu>
-+    <menu:menu menu:id=".uno:SubscriptionMenu">
-+        <menu:menupopup>
-+            <menu:menuitem menu:id=".uno:GetSubscription"/>
-+        </menu:menupopup>
-+    </menu:menu>
- </menu:menubar>
- 
-diff --git dbaccess/uiconfig/dbtable/menubar/menubar.xml dbaccess/uiconfig/dbtable/menubar/menubar.xml
-index 2cac4db..a627afe 100644
---- dbaccess/uiconfig/dbtable/menubar/menubar.xml
-+++ dbaccess/uiconfig/dbtable/menubar/menubar.xml
-@@ -62,5 +62,10 @@
-             <menu:menuitem menu:id=".uno:About"/>
-         </menu:menupopup>
-     </menu:menu>
-+    <menu:menu menu:id=".uno:SubscriptionMenu">
-+        <menu:menupopup>
-+            <menu:menuitem menu:id=".uno:GetSubscription"/>
-+        </menu:menupopup>
-+    </menu:menu>
- </menu:menubar>
- 
-diff --git dbaccess/uiconfig/dbtdata/menubar/menubar.xml dbaccess/uiconfig/dbtdata/menubar/menubar.xml
-index a672b8d..b397bdd 100644
---- dbaccess/uiconfig/dbtdata/menubar/menubar.xml
-+++ dbaccess/uiconfig/dbtdata/menubar/menubar.xml
-@@ -71,5 +71,10 @@
-             <menu:menuitem menu:id=".uno:About"/>
-         </menu:menupopup>
-     </menu:menu>
-+    <menu:menu menu:id=".uno:SubscriptionMenu">
-+        <menu:menupopup>
-+            <menu:menuitem menu:id=".uno:GetSubscription"/>
-+        </menu:menupopup>
-+    </menu:menu>
- </menu:menubar>
- 
-diff --git extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml
-index 310e80f..21069d5 100644
---- extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml
-+++ extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml
-@@ -90,4 +90,9 @@
-             <menu:menuitem menu:id=".uno:About"/>
-         </menu:menupopup>
-     </menu:menu>
-+    <menu:menu menu:id=".uno:SubscriptionMenu">
-+        <menu:menupopup>
-+            <menu:menuitem menu:id=".uno:GetSubscription"/>
-+        </menu:menupopup>
-+    </menu:menu>
- </menu:menubar>
-diff --git framework/uiconfig/startmodule/menubar/menubar.xml framework/uiconfig/startmodule/menubar/menubar.xml
-index 40e3ba7..3a4c877 100644
---- framework/uiconfig/startmodule/menubar/menubar.xml
-+++ framework/uiconfig/startmodule/menubar/menubar.xml
-@@ -78,4 +78,9 @@
-             <menu:menuitem menu:id=".uno:About"/>
-         </menu:menupopup>
-     </menu:menu>
-+    <menu:menu menu:id=".uno:SubscriptionMenu">
-+        <menu:menupopup>
-+            <menu:menuitem menu:id=".uno:GetSubscription"/>
-+        </menu:menupopup>
-+    </menu:menu>
- </menu:menubar>
-diff --git reportdesign/uiconfig/dbreport/menubar/menubar.xml reportdesign/uiconfig/dbreport/menubar/menubar.xml
-index 95cb375..b45ba28 100644
---- reportdesign/uiconfig/dbreport/menubar/menubar.xml
-+++ reportdesign/uiconfig/dbreport/menubar/menubar.xml
-@@ -417,4 +417,9 @@
-             <menu:menuitem menu:id=".uno:About"/>
-         </menu:menupopup>
-     </menu:menu>
-+    <menu:menu menu:id=".uno:SubscriptionMenu">
-+        <menu:menupopup>
-+            <menu:menuitem menu:id=".uno:GetSubscription"/>
-+        </menu:menupopup>
-+    </menu:menu>
- </menu:menubar>
-diff --git sc/uiconfig/scalc/menubar/menubar.xml sc/uiconfig/scalc/menubar/menubar.xml
-index f6808ab..89a0d0f 100644
---- sc/uiconfig/scalc/menubar/menubar.xml
-+++ sc/uiconfig/scalc/menubar/menubar.xml
-@@ -446,4 +446,9 @@
-             <menu:menuitem menu:id=".uno:About"/>
-         </menu:menupopup>
-     </menu:menu>
-+    <menu:menu menu:id=".uno:SubscriptionMenu">
-+        <menu:menupopup>
-+            <menu:menuitem menu:id=".uno:GetSubscription"/>
-+        </menu:menupopup>
-+    </menu:menu>
- </menu:menubar>
-diff --git sd/uiconfig/sdraw/menubar/menubar.xml sd/uiconfig/sdraw/menubar/menubar.xml
-index 8fabf63..8e24e59 100644
---- sd/uiconfig/sdraw/menubar/menubar.xml
-+++ sd/uiconfig/sdraw/menubar/menubar.xml
-@@ -325,4 +325,9 @@
-             <menu:menuitem menu:id=".uno:About"/>
-         </menu:menupopup>
-     </menu:menu>
-+    <menu:menu menu:id=".uno:SubscriptionMenu">
-+        <menu:menupopup>
-+            <menu:menuitem menu:id=".uno:GetSubscription"/>
-+        </menu:menupopup>
-+    </menu:menu>
- </menu:menubar>
-diff --git sd/uiconfig/simpress/menubar/menubar.xml sd/uiconfig/simpress/menubar/menubar.xml
-index f5b6441..921e6f7 100644
---- sd/uiconfig/simpress/menubar/menubar.xml
-+++ sd/uiconfig/simpress/menubar/menubar.xml
-@@ -300,4 +300,9 @@
-             <menu:menuitem menu:id=".uno:About"/>
-         </menu:menupopup>
-     </menu:menu>
-+    <menu:menu menu:id=".uno:SubscriptionMenu">
-+        <menu:menupopup>
-+            <menu:menuitem menu:id=".uno:GetSubscription"/>
-+        </menu:menupopup>
-+    </menu:menu>
- </menu:menubar>
-diff --git starmath/uiconfig/smath/menubar/menubar.xml starmath/uiconfig/smath/menubar/menubar.xml
-index f953522..708add0 100644
---- starmath/uiconfig/smath/menubar/menubar.xml
-+++ starmath/uiconfig/smath/menubar/menubar.xml
-@@ -114,4 +114,9 @@
-             <menu:menuitem menu:id=".uno:About"/>
-         </menu:menupopup>
-     </menu:menu>
-+    <menu:menu menu:id=".uno:SubscriptionMenu">
-+        <menu:menupopup>
-+            <menu:menuitem menu:id=".uno:GetSubscription"/>
-+        </menu:menupopup>
-+    </menu:menu>
- </menu:menubar>
-diff --git sw/uiconfig/sglobal/menubar/menubar.xml sw/uiconfig/sglobal/menubar/menubar.xml
-index 250ebda..df5c44c 100644
---- sw/uiconfig/sglobal/menubar/menubar.xml
-+++ sw/uiconfig/sglobal/menubar/menubar.xml
-@@ -452,4 +452,9 @@
-             <menu:menuitem menu:id=".uno:About"/>
-         </menu:menupopup>
-     </menu:menu>
-+    <menu:menu menu:id=".uno:SubscriptionMenu">
-+        <menu:menupopup>
-+            <menu:menuitem menu:id=".uno:GetSubscription"/>
-+        </menu:menupopup>
-+    </menu:menu>
- </menu:menubar>
-diff --git sw/uiconfig/sweb/menubar/menubar.xml sw/uiconfig/sweb/menubar/menubar.xml
-index 2922d3a..8b66119 100644
---- sw/uiconfig/sweb/menubar/menubar.xml
-+++ sw/uiconfig/sweb/menubar/menubar.xml
-@@ -381,4 +381,9 @@
-             <menu:menuitem menu:id=".uno:About"/>
-         </menu:menupopup>
-     </menu:menu>
-+    <menu:menu menu:id=".uno:SubscriptionMenu">
-+        <menu:menupopup>
-+            <menu:menuitem menu:id=".uno:GetSubscription"/>
-+        </menu:menupopup>
-+    </menu:menu>
- </menu:menubar>
-diff --git sw/uiconfig/swform/menubar/menubar.xml sw/uiconfig/swform/menubar/menubar.xml
-index 5514305..106fb36 100644
---- sw/uiconfig/swform/menubar/menubar.xml
-+++ sw/uiconfig/swform/menubar/menubar.xml
-@@ -448,4 +448,9 @@
-             <menu:menuitem menu:id=".uno:About"/>
-         </menu:menupopup>
-     </menu:menu>
-+    <menu:menu menu:id=".uno:SubscriptionMenu">
-+        <menu:menupopup>
-+            <menu:menuitem menu:id=".uno:GetSubscription"/>
-+        </menu:menupopup>
-+    </menu:menu>
- </menu:menubar>
-diff --git sw/uiconfig/swreport/menubar/menubar.xml sw/uiconfig/swreport/menubar/menubar.xml
-index 3e6afcf..24762b2 100644
---- sw/uiconfig/swreport/menubar/menubar.xml
-+++ sw/uiconfig/swreport/menubar/menubar.xml
-@@ -448,4 +448,9 @@
-             <menu:menuitem menu:id=".uno:About"/>
-         </menu:menupopup>
-     </menu:menu>
-+    <menu:menu menu:id=".uno:SubscriptionMenu">
-+        <menu:menupopup>
-+            <menu:menuitem menu:id=".uno:GetSubscription"/>
-+        </menu:menupopup>
-+    </menu:menu>
- </menu:menubar>
-diff --git sw/uiconfig/swriter/menubar/menubar.xml sw/uiconfig/swriter/menubar/menubar.xml
-index 3d1b415..da65f20 100644
---- sw/uiconfig/swriter/menubar/menubar.xml
-+++ sw/uiconfig/swriter/menubar/menubar.xml
-@@ -455,4 +455,9 @@
-             <menu:menuitem menu:id=".uno:About"/>
-         </menu:menupopup>
-     </menu:menu>
-+    <menu:menu menu:id=".uno:SubscriptionMenu">
-+        <menu:menupopup>
-+            <menu:menuitem menu:id=".uno:GetSubscription"/>
-+        </menu:menupopup>
-+    </menu:menu>
- </menu:menubar>
-diff --git sw/uiconfig/swxform/menubar/menubar.xml sw/uiconfig/swxform/menubar/menubar.xml
-index 4cca673..ea776cb 100644
---- sw/uiconfig/swxform/menubar/menubar.xml
-+++ sw/uiconfig/swxform/menubar/menubar.xml
-@@ -449,4 +449,9 @@
-             <menu:menuitem menu:id=".uno:About"/>
-         </menu:menupopup>
-     </menu:menu>
-+    <menu:menu menu:id=".uno:SubscriptionMenu">
-+        <menu:menupopup>
-+            <menu:menuitem menu:id=".uno:GetSubscription"/>
-+        </menu:menupopup>
-+    </menu:menu>
- </menu:menubar>
diff --git a/patches/dev300/novell-subscription.diff b/patches/dev300/novell-subscription.diff
deleted file mode 100644
index 3d05f52..0000000
--- a/patches/dev300/novell-subscription.diff
+++ /dev/null
@@ -1,162 +0,0 @@
----
- .../org/openoffice/Office/UI/GenericCommands.xcu   |   13 +++++
- sfx2/inc/sfx2/sfxsids.hrc                          |    4 ++
- sfx2/sdi/appslots.sdi                              |    4 ++
- sfx2/sdi/sfx.sdi                                   |   50 ++++++++++++++++++++
- sfx2/source/appl/appserv.cxx                       |   17 +++++++
- 5 files changed, 88 insertions(+), 0 deletions(-)
-
-diff --git officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
-index 175867d..2eb3879 100644
---- officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
-+++ officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
-@@ -4160,6 +4160,11 @@
-                     <value xml:lang="en-US">License Information...</value>
-                 </prop>
-             </node>
-+            <node oor:name=".uno:GetSubscription" oor:op="replace">
-+                <prop oor:name="Label" oor:type="xs:string">
-+                    <value xml:lang="en-US">~Upgrade to Full Version</value>
-+                </prop>
-+            </node>
-             <node oor:name=".uno:ShowCredits" oor:op="replace">
-                 <prop oor:name="Label" oor:type="xs:string">
-                     <value xml:lang="en-US">%PRODUCTNAME Credits...</value>
-@@ -5219,6 +5224,14 @@
-       </node>
-     </node>
-         <node oor:name="Popups">
-+            <node oor:name=".uno:SubscriptionMenu" oor:op="replace">
-+                <prop oor:name="Label" oor:type="xs:string">
-+                    <value xml:lang="en-US">~Subscription</value>
-+                </prop>
-+                <prop oor:name="Properties" oor:type="xs:int">
-+                    <value>1</value>
-+                </prop>
-+            </node>
-             <node oor:name=".uno:HelpMenu" oor:op="replace">
-                 <prop oor:name="Label" oor:type="xs:string">
-                     <value xml:lang="en-US">~Help</value>
-diff --git sfx2/inc/sfx2/sfxsids.hrc sfx2/inc/sfx2/sfxsids.hrc
-index 9000359..69e8e4b 100644
---- sfx2/inc/sfx2/sfxsids.hrc
-+++ sfx2/inc/sfx2/sfxsids.hrc
-@@ -127,6 +127,11 @@
- #define SID_SHOW_CREDITS					(SID_SFX_START + 1711)
- #define SID_HELP_TUTORIALS					(SID_SFX_START + 1695)
- 
-+// default id for subscription
-+#define SID_SUBSCRIPTIONMENU  				(SID_SFX_START + 3997)
-+#define SID_SUBSCRIPTION_GET  				(SID_SFX_START + 3998)
-+#define SID_HELP_SUPPORTPAGE  				(SID_SFX_START + 3999)
-+
- // default-ids for document
- #define SID_NEWDOC                          (SID_SFX_START + 500)
- #define SID_OPENDOC                         (SID_SFX_START + 501)
-diff --git sfx2/sdi/appslots.sdi sfx2/sdi/appslots.sdi
-index a230036..064d4f5 100644
---- sfx2/sdi/appslots.sdi
-+++ sfx2/sdi/appslots.sdi
-@@ -89,6 +89,10 @@ interface Application
-         ExecMethod = MiscExec_Impl ;
-         StateMethod = MiscState_Impl ;
-     ]
-+    SID_SUBSCRIPTION_GET
-+    [
-+        ExecMethod = MiscExec_Impl ;
-+    ]
-     SID_LOADCONFIG // ole(no) api(final/play)
-     [
-         ExecMethod = MiscExec_Impl ;
-diff --git sfx2/sdi/sfx.sdi sfx2/sdi/sfx.sdi
-index d50d271..2e2d432 100644
---- sfx2/sdi/sfx.sdi
-+++ sfx2/sdi/sfx.sdi
-@@ -7414,6 +7414,56 @@ SfxVoidItem AddonHelp SID_ADDONHELP
- ]
- 
- //--------------------------------------------------------------------------
-+SfxVoidItem SubscriptionMenu SID_SUBSCRIPTIONMENU
-+()
-+[
-+    /* flags: */
-+    AutoUpdate = FALSE,
-+    Cachable = Cachable,
-+    FastCall = FALSE,
-+    HasCoreId = FALSE,
-+    HasDialog = FALSE,
-+    ReadOnlyDoc = TRUE,
-+    Toggle = FALSE,
-+    Container = FALSE,
-+    RecordAbsolute = FALSE,
-+    RecordPerSet;
-+    Synchron;
-+
-+    /* config: */
-+    AccelConfig = FALSE,
-+    MenuConfig = TRUE,
-+    StatusBarConfig = FALSE,
-+    ToolBoxConfig = FALSE,
-+    GroupId = GID_APPLICATION;
-+]
-+
-+//--------------------------------------------------------------------------
-+SfxVoidItem GetSubscription SID_SUBSCRIPTION_GET
-+()
-+[
-+    /* flags: */
-+    AutoUpdate = FALSE,
-+    Cachable = Cachable,
-+    FastCall = FALSE,
-+    HasCoreId = FALSE,
-+    HasDialog = FALSE,
-+    ReadOnlyDoc = TRUE,
-+    Toggle = FALSE,
-+    Container = FALSE,
-+    RecordAbsolute = FALSE,
-+    RecordPerSet;
-+    Synchron;
-+
-+    /* config: */
-+    AccelConfig = TRUE,
-+    MenuConfig = TRUE,
-+    StatusBarConfig = FALSE,
-+    ToolBoxConfig = TRUE,
-+    GroupId = GID_APPLICATION;
-+]
-+
-+//--------------------------------------------------------------------------
- SfxStringItem FormatMenuState SID_FORMATMENUSTATE
- [
-     /* flags: */
-diff --git sfx2/source/appl/appserv.cxx sfx2/source/appl/appserv.cxx
-index c5098be..3280dd1 100644
---- sfx2/source/appl/appserv.cxx
-+++ sfx2/source/appl/appserv.cxx
-@@ -521,6 +521,23 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
-         }
- 
-         // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-+        case SID_SUBSCRIPTION_GET:
-+        {
-+            try {
-+                Reference< com::sun::star::system::XSystemShellExecute > xSystemShell
-+                    ( ::comphelper::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.system.SystemShellExecute" ) ), UNO_QUERY );
-+                if ( xSystemShell.is()) {
-+                    rtl::OUString aURI( DEFINE_CONST_UNICODE( "http://shop.novell.com/DRHM/servlet/ControllerServlet?Action=DisplayProductDetailsPage&SiteID=novell&Locale=en_US&Env=BASE&productID=108881200" ) );
-+                    xSystemShell->execute( aURI, ::rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS );
-+                }
-+
-+                break;
-+            } catch (const ::com::sun::star::uno::Exception &) {
-+            }
-+            /* drop through on exception */
-+        }
-+
-+        // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-         case SID_ORGANIZER:
-         {
-             SfxTemplateOrganizeDlg  *pDlg =
--- 
-1.7.0.1
-


More information about the Libreoffice-commits mailing list