[ooo-build-commit] 2 commits - patches/dev300

[Tor Lillqvist]

 patches/dev300/forms-radio-button-group-names.diff |   26 ++++++++-------------
 patches/dev300/samba-hyperlinks-sc-sd.diff         |    4 +--
 2 files changed, 13 insertions(+), 17 deletions(-)

New commits:
commit 37da9536006face1488cf49bd26701ceb6d30f08
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Sep 7 12:40:04 2009 +0300

    Update forms-radio-button-group-names.diff to dev300-m57

diff --git a/patches/dev300/forms-radio-button-group-names.diff b/patches/dev300/forms-radio-button-group-names.diff
index 30d1baa..7e46cdf 100644
--- a/patches/dev300/forms-radio-button-group-names.diff
+++ b/patches/dev300/forms-radio-button-group-names.diff
@@ -77,18 +77,16 @@ index 606184e..fad672d 100644
  	PCR_CONSTASCII_STRING( PROPERTY_VALUE,					"Value");
  	PCR_CONSTASCII_STRING( PROPERTY_TEXT,					"Text");
  	PCR_CONSTASCII_STRING( PROPERTY_NAVIGATION,				"NavigationBarMode");
-diff --git extensions/util/hidother.src extensions/util/hidother.src
-index b075f8c..624ae37 100644
 --- extensions/util/hidother.src
 +++ extensions/util/hidother.src
 @@ -307,6 +307,7 @@ hidspecial HID_CHECK_FOR_UPD_DESCRIPTION        { HelpId = HID_CHECK_FOR_UPD_DES
- hidspecial HID_CHECK_FOR_UPD_CANCEL             { HelpId = HID_CHECK_FOR_UPD_CANCEL; }
- hidspecial HID_PROP_NOLABEL                     { HelpId = HID_PROP_NOLABEL; }
- hidspecial HID_PROP_INPUT_REQUIRED              { HelpId = HID_PROP_INPUT_REQUIRED; }
+ hidspecial HID_PROP_FONT                        { HelpId = HID_PROP_FONT; }
+ hidspecial HID_PROP_FORMATKEY                   { HelpId = HID_PROP_FORMATKEY; }
+ hidspecial HID_PROP_GROUPBOX                    { HelpId = HID_PROP_GROUPBOX; }
 +hidspecial HID_PROP_GROUP_NAME                  { HelpId = HID_PROP_GROUP_NAME; }
- hidspecial HID_PROP_WRITING_MODE                { HelpId = HID_PROP_WRITING_MODE; }
- hidspecial HID_PROP_ENABLE_VISIBLE              { HelpId = HID_PROP_ENABLE_VISIBLE; }
- hidspecial HID_PROP_WHEEL_BEHAVIOR              { HelpId = HID_PROP_WHEEL_BEHAVIOR; }
+ hidspecial HID_PROP_HEIGHT                      { HelpId = HID_PROP_HEIGHT; }
+ hidspecial HID_PROP_HELPTEXT                    { HelpId = HID_PROP_HELPTEXT; }
+ hidspecial HID_PROP_HELPURL                     { HelpId = HID_PROP_HELPURL; }
 diff --git forms/source/component/GroupManager.cxx forms/source/component/GroupManager.cxx
 index d831a82..f5a9ecb 100644
 --- forms/source/component/GroupManager.cxx
@@ -471,18 +469,16 @@ index 1e65e6f..1301975 100644
  };
  
  //	----------------------------------------------------
-diff --git toolkit/inc/toolkit/helper/property.hxx toolkit/inc/toolkit/helper/property.hxx
-index 238b412..2835f10 100644
 --- toolkit/inc/toolkit/helper/property.hxx
 +++ toolkit/inc/toolkit/helper/property.hxx
 @@ -192,6 +192,7 @@ namespace rtl {
- #define BASEPROPERTY_WRITING_MODE                   138
- #define BASEPROPERTY_CONTEXT_WRITING_MODE           139
- #define BASEPROPERTY_ENABLEVISIBLE                  140  // sal_Bool
-+#define BASEPROPERTY_GROUPNAME                      141  // ::rtl::OUString
+ #define BASEPROPERTY_GRID_COLUMNMODEL               143
+ #define BASEPROPERTY_GRID_SELECTIONMODE             144
+ #define BASEPROPERTY_ENABLEVISIBLE                  145  // sal_Bool
++#define BASEPROPERTY_GROUPNAME                      146  // ::rtl::OUString
+ 
  
  // Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen.
- #define BASEPROPERTY_FONTDESCRIPTORPART_START			1000
 diff --git toolkit/source/awt/vclxwindows.cxx toolkit/source/awt/vclxwindows.cxx
 index bfa828b..206280b 100644
 --- toolkit/source/awt/vclxwindows.cxx
commit 2ec1e59a5692fdc68ef723f2da60039b5b88a46e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Sep 7 12:32:45 2009 +0300

    Update samba-hyperlinks-sc-sd.diff to dev300-m57

diff --git a/patches/dev300/samba-hyperlinks-sc-sd.diff b/patches/dev300/samba-hyperlinks-sc-sd.diff
index 106f458..1f9884a 100644
--- a/patches/dev300/samba-hyperlinks-sc-sd.diff
+++ b/patches/dev300/samba-hyperlinks-sc-sd.diff
@@ -22,8 +22,8 @@
          if( !bRel )
              mnFlags |= EXC_HLINK_ABS;
          mnFlags |= EXC_HLINK_BODY;
---- sd/source/filter/pptin.cxx	2008-05-14 10:45:19.000000000 +0200
-+++ sd/source/filter/pptin.cxx	2008-05-14 10:44:43.000000000 +0200
+--- sd/source/filter/ppt/pptin.cxx
++++ sd/source/filter/ppt/pptin.cxx
 @@ -437,6 +437,11 @@ sal_Bool ImplSdPPTImport::Import()
  										aPropItem >> pHyperlink->nInfo;
  										if ( !aPropItem.Read( pHyperlink->aTarget, VT_EMPTY ) )