GNOME.org
 

ooo-build r13668 - in trunk: . patches/dev300

Author: noelpwer
Date: Mon Aug 25 16:30:40 2008
New Revision: 13668
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13668&view=rev

Log:
2008-08-25  Noel Power  <noel power novell com>

        * patches/dev300/apply: split userform-activex-identify.diff into
        upstreamable bit ( and portion with slightly more unexplainable
        import magic )
        * patches/dev300/userform-activex-identify.diff: i#93111
        * patches/dev300/userform-possible-groupingtweak.diff:


Added:
   trunk/patches/dev300/userform-possible-groupingtweak.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/userform-activex-identify.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Aug 25 16:30:40 2008
@@ -1572,7 +1572,11 @@
 
 #some userform import issues including improved identification
 #of the progressbar activex control
-userform-activex-identify.diff
+userform-activex-identify.diff, i#93111
+#some unknown userform binary format tweaks for some customer documents
+#one hunk seems to be related to grouped labels in a userform
+#the other ( no idea )
+userform-possible-groupingtweak.diff
 #disable to delete or rename objectmodule name in basic ide
 basic-ide-objectmodule.diff, Fong
 # display a friendship name for objectmodule tab

Modified: trunk/patches/dev300/userform-activex-identify.diff
==============================================================================
--- trunk/patches/dev300/userform-activex-identify.diff	(original)
+++ trunk/patches/dev300/userform-activex-identify.diff	Mon Aug 25 16:30:40 2008
@@ -25,7 +25,7 @@
 index 85cabda..a771d13 100644
 --- svx/source/msfilter/msocximex.cxx
 +++ svx/source/msfilter/msocximex.cxx
-@@ -572,8 +572,145 @@ const sal_uInt16 TOGGLEBUTTON = (sal_uIn
+@@ -572,8 +572,129 @@ const sal_uInt16 TOGGLEBUTTON = (sal_uIn
  const sal_uInt16 SCROLLBAR = (sal_uInt16)0x2F;
  
  const sal_uInt16 MULTIPAGE = (sal_uInt16)0x39;
@@ -52,69 +52,53 @@
 +// Currently we only can process ( in a limited way ) the ProgressBar
 +// the other ID's are for reference ( & future )
 +
-+// RefEdit control
++// RefEdit control {00024512-0000-0000-c000-000000000046}
 +const sal_uInt8 aRefEditID[] =
 +{
 +0x12, 0x45, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46,
-+0x12, 0x1d, 0xd2, 0x8b, 0x42, 0xec, 0xce, 0x11, 0x9e, 0x0d, 0x00, 0xaa, 0x00, 0x60, 0x02, 0xf3,
-+0x18, 0x45, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46,
 +};
 +
-+// Microsoft ProgressBar Control, version 6.0
++// Microsoft ProgressBar Control, version 6.0 {35053A22-8589-11D1-B16A-00C0F0283628}
 +const sal_uInt8 aProgressID[] =
 +{
 +0x22, 0x3a, 0x05, 0x35, 0x89, 0x85, 0xd1, 0x11,  0xb1, 0x6a, 0x00, 0xc0, 0xf0, 0x28, 0x36, 0x28,
-+0x21, 0x3a, 0x05, 0x35, 0x89, 0x85, 0xd1, 0x11,  0xb1, 0x6a, 0x00, 0xc0, 0xf0, 0x28, 0x36, 0x28,
-+0x20, 0x3a, 0x05, 0x35, 0x89, 0x85, 0xd1, 0x11,  0xb1, 0x6a, 0x00, 0xc0, 0xf0, 0x28, 0x36, 0x28,
 +};
 +
-+// Calendar Control 10.0
++// Calendar Control 10.0 
 +const sal_uInt8 aCalendarID[] =
 +{
 +0x2b, 0xc9, 0x27, 0x8e, 0x64, 0x12, 0x1c, 0x10, 0x8a, 0x2f, 0x04, 0x02, 0x24, 0x00, 0x9c, 0x02,
-+0x2d, 0xc9, 0x27, 0x8e, 0x64, 0x12, 0x1c, 0x10, 0x8a, 0x2f, 0x04, 0x02, 0x24, 0x00, 0x9c, 0x02,
-+0x2c, 0xc9, 0x27, 0x8e, 0x64, 0x12, 0x1c, 0x10, 0x8a, 0x2f, 0x04, 0x02, 0x24, 0x00, 0x9c, 0x02,
 +};
 +
 +
-+// Microsoft ImageComboxBox Control, version 6.0
++// Microsoft ImageComboxBox Control, version 6.0 {DD9DA666-8594-11D1-B16A-00C0F0283628}
 +const sal_uInt8 aImageComboID[] =
 +{
 +0x66, 0xa6, 0x9d, 0xdd, 0x94, 0x85, 0xd1, 0x11, 0xb1, 0x6a, 0x00, 0xc0, 0xf0, 0x28, 0x36, 0x28,
-+0x65, 0xa6, 0x9d, 0xdd, 0x94, 0x85, 0xd1, 0x11, 0xb1, 0x6a, 0x00, 0xc0, 0xf0, 0x28, 0x36, 0x28,
-+0x64, 0xa6, 0x9d, 0xdd, 0x94, 0x85, 0xd1, 0x11, 0xb1, 0x6a, 0x00, 0xc0, 0xf0, 0x28, 0x36, 0x28,
 +};
 +
-+// Microsoft ImageList Control, version 6.0
++// Microsoft ImageList Control, version 6.0 {2C247F23-8591-11D1-B16A-00C0F0283628}
 +const sal_uInt8 aImageListID[] =
 +{
 +0x23, 0x7f, 0x24, 0x2c, 0x91, 0x85, 0xd1, 0x11, 0xb1, 0x6a, 0x00, 0xc0, 0xf0, 0x28, 0x36, 0x28,
-+0x22, 0x7f, 0x24, 0x2c, 0x91, 0x85, 0xd1, 0x11, 0xb1, 0x6a, 0x00, 0xc0, 0xf0, 0x28, 0x36, 0x28,
-+0x21, 0x7f, 0x24, 0x2c, 0x91, 0x85, 0xd1, 0x11, 0xb1, 0x6a, 0x00, 0xc0, 0xf0, 0x28, 0x36, 0x28,
 +};
 +
-+// Microsoft Slider Control, version 6.0
++// Microsoft Slider Control, version 6.0 {F08DF954-8592-11D1-B16A-00C0F0283628}
 +const sal_uInt8 aSliderID[] =
 +{
 +0x54, 0xf9, 0x8d, 0xf0, 0x92, 0x85, 0xd1, 0x11, 0xb1, 0x6a, 0x00, 0xc0, 0xf0, 0x28, 0x36, 0x28,
-+0x53, 0xf9, 0x8d, 0xf0, 0x92, 0x85, 0xd1, 0x11, 0xb1, 0x6a, 0x00, 0xc0, 0xf0, 0x28, 0x36, 0x28,
-+0x52, 0xf9, 0x8d, 0xf0, 0x92, 0x85, 0xd1, 0x11, 0xb1, 0x6a, 0x00, 0xc0, 0xf0, 0x28, 0x36, 0x28,
 +};
 +
-+// Microsoft StatusBar Control, version 6.0
++// Microsoft StatusBar Control, version 6.0 {8E3867A3-8586-11D1-B16A-00C0F0283628}
 +const sal_uInt8 aStatusBarID[] =
 +{
 +0xa3, 0x67, 0x38, 0x8e, 0x86, 0x85, 0xd1, 0x11, 0xb1, 0x6a, 0x00, 0xc0, 0xf0, 0x28, 0x36, 0x28,
-+0xa2, 0x67, 0x38, 0x8e, 0x86, 0x85, 0xd1, 0x11, 0xb1, 0x6a, 0x00, 0xc0, 0xf0, 0x28, 0x36, 0x28,
-+0xa1, 0x67, 0x38, 0x8e, 0x86, 0x85, 0xd1, 0x11, 0xb1, 0x6a, 0x00, 0xc0, 0xf0, 0x28, 0x36, 0x28,
 +};
 +
 +// Microsoft Office Chart 10.0
 +const sal_uInt8 aChartSpaceID[] =
 +{
 +0x46, 0xe5, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46,
-+0x7a, 0x9a, 0xb3, 0xf5, 0x80, 0x14, 0xd3, 0x11, 0x85, 0x49, 0x00, 0xc0, 0x4f, 0xac, 0x67, 0xd7,
-+0x82, 0x9a, 0xb3, 0xf5, 0x80, 0x14, 0xd3, 0x11, 0x85, 0x49, 0x00, 0xc0, 0x4f, 0xac, 0x67, 0xd7,
 +};
 +
 +const sal_Int16 ActiveXIDLen = 0x10; // CLSID len
@@ -145,19 +129,19 @@
 +        // as we only can process PROGRESSBAR, not much point doing that until 
 +        // we add support for at least another activex control
 +
-+        else if ( memcmp( aID, aCalendarID, 0x30 ) == 0 )
++        else if ( memcmp( aID, aCalendarID, ActiveXIDLen ) == 0 )
 +            OSL_TRACE("Found unsupported ***CALENDAR*** ActiveX control");
-+        else if ( memcmp( aID, aRefEditID, 0x30 ) == 0 )
++        else if ( memcmp( aID, aRefEditID, ActiveXIDLen ) == 0 )
 +            OSL_TRACE("Found unsupported ***REFEDIT*** ActiveX control");
-+        else if ( memcmp( aID, aImageComboID, 0x30 ) == 0 )
++        else if ( memcmp( aID, aImageComboID, ActiveXIDLen ) == 0 )
 +            OSL_TRACE("Found unsupported ***IMAGECOMBO*** ActiveX control");
-+        else if ( memcmp( aID, aImageListID, 0x30 ) == 0 )
++        else if ( memcmp( aID, aImageListID, ActiveXIDLen ) == 0 )
 +            OSL_TRACE("Found unsupported ***IMAGELIST*** ActiveX control");
-+        else if ( memcmp( aID, aChartSpaceID, 0x30 ) == 0 )
++        else if ( memcmp( aID, aChartSpaceID, ActiveXIDLen ) == 0 )
 +            OSL_TRACE("Found unsupported ***CHARTSPACE*** ActiveX control");
-+        else if ( memcmp( aID, aSliderID, 0x30 ) == 0 )
++        else if ( memcmp( aID, aSliderID, ActiveXIDLen ) == 0 )
 +            OSL_TRACE("Found unsupported ***SLIDER*** ActiveX control");
-+        else if ( memcmp( aID, aStatusBarID, 0x30 ) == 0 )
++        else if ( memcmp( aID, aStatusBarID, ActiveXIDLen ) == 0 )
 +            OSL_TRACE("Found unsupported ***STATUSBAR*** ActiveX control");
 +#endif
 +        else
@@ -171,15 +155,6 @@
  typedef std::vector< ContainerRecord > ContainerRecordList;
  
  class ContainerRecReader
-@@ -644,6 +779,8 @@ class ContainerRecReader
-             // control type
-             if( nContentFlags & 0x00000080 )
-                 *pS >> rec.nTypeIdent;
-+            if( nContentFlags & 0x00000200 )
-+                pS->SeekRel( 4 ); // Grouping?
-             // length of infotip
-             sal_uInt32 nTipLen = 0;
-             if( nContentFlags & 0x00000800 )
 @@ -750,6 +887,13 @@ class ContainerRecReader
                  pControl->pDocSh = pContainerControl->pDocSh;
                  pContainerControl->ProcessControl( pControl, pS, rec );
@@ -194,18 +169,6 @@
              else
              {
                  DBG_ERROR("Terminating import, unexpected error");
-@@ -770,6 +914,11 @@ class ContainerRecReader
-     {
-         sal_uInt8 aUnknown11[4];
-         pS->Read(aUnknown11, sizeof(aUnknown11));
-+        // discovered a dialog with value of 0xFF for aUnknown11 
-+        // needed an extra 4 bytes to offset correctly  into the control
-+        // records. Valid test or coincidence ?
-+        if ( aUnknown11[1] == 0xFF )
-+           pS->Read( aUnknown11, sizeof(aUnknown11));
-         return true;
-     }
- 
 @@ -3412,9 +3561,18 @@ OUString OCX_ContainerControl::createSub
      return buf.makeStringAndClear();
  }

Added: trunk/patches/dev300/userform-possible-groupingtweak.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/userform-possible-groupingtweak.diff	Mon Aug 25 16:30:40 2008
@@ -0,0 +1,27 @@
+diff --git svx/inc/svx/msocximex.hxx svx/inc/svx/msocximex.hxx
+index 3d52e4d..1b2b811 100644
+diff --git svx/source/msfilter/msocximex.cxx svx/source/msfilter/msocximex.cxx
+index 85cabda..a771d13 100644
+--- svx/source/msfilter/msocximex.cxx
++++ svx/source/msfilter/msocximex.cxx
+@@ -644,6 +779,8 @@ class ContainerRecReader
+             // control type
+             if( nContentFlags & 0x00000080 )
+                 *pS >> rec.nTypeIdent;
++            if( nContentFlags & 0x00000200 )
++                pS->SeekRel( 4 ); // Grouping?
+             // length of infotip
+             sal_uInt32 nTipLen = 0;
+             if( nContentFlags & 0x00000800 )
+@@ -770,6 +914,11 @@ class ContainerRecReader
+     {
+         sal_uInt8 aUnknown11[4];
+         pS->Read(aUnknown11, sizeof(aUnknown11));
++        // discovered a dialog with value of 0xFF for aUnknown11 
++        // needed an extra 4 bytes to offset correctly  into the control
++        // records. Valid test or coincidence ?
++        if ( aUnknown11[1] == 0xFF )
++           pS->Read( aUnknown11, sizeof(aUnknown11));
+         return true;
+     }
+
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]