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

From: noelpwer svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r13732 - in trunk: . patches/dev300
Date: Fri, 29 Aug 2008 15:42:08 +0000 (UTC)
Author: noelpwer
Date: Fri Aug 29 15:42:08 2008
New Revision: 13732
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13732&view=rev

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

        * patches/dev300/dialog-groupname-persist.diff: fix silly mistake
        which broke ole groupname import


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/dialog-groupname-persist.diff

Modified: trunk/patches/dev300/dialog-groupname-persist.diff
==============================================================================
--- trunk/patches/dev300/dialog-groupname-persist.diff	(original)
+++ trunk/patches/dev300/dialog-groupname-persist.diff	Fri Aug 29 15:42:08 2008
@@ -1,49 +1,8 @@
-Index: xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
-===================================================================
-RCS file: /cvs/script/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx,v
-retrieving revision 1.38
-diff -u -p -r1.38 xmldlg_expmodels.cxx
---- xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx	11 Apr 2008 12:33:44 -0000	1.38
-+++ xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx	24 Jun 2008 15:57:23 -0000
-@@ -388,6 +388,8 @@ void ElementDescriptor::readRadioButtonM
-                            OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":image-position") ) );
-     readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("MultiLine") ),
-                   OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":multiline") ) );
-+    readStringAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("GroupName") ),
-+                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":group-name") ) );
- 
-     sal_Int16 nState = 0;
-     if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("State") ) ) >>= nState)
-Index: xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
-===================================================================
-RCS file: /cvs/script/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx,v
-retrieving revision 1.44
-diff -u -p -r1.44 xmldlg_impmodels.cxx
---- xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx	11 Apr 2008 12:34:21 -0000	1.44
-+++ xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx	24 Jun 2008 15:57:23 -0000
-@@ -1377,6 +1377,9 @@ void TitledBoxElement::endElement()
-         ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("MultiLine") ),
-                                    OUString( RTL_CONSTASCII_USTRINGPARAM("multiline") ),
-                                    xAttributes );
-+        ctx.importStringProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("GroupName") ),
-+                                  OUString( RTL_CONSTASCII_USTRINGPARAM("group-name") ),
-+                                  xAttributes );
- 		
- 		sal_Int16 nVal = 0;
- 		sal_Bool bChecked = sal_False;
-@@ -1505,6 +1508,9 @@ void RadioGroupElement::endElement()
-         ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("MultiLine") ),
-                                    OUString( RTL_CONSTASCII_USTRINGPARAM("multiline") ),
-                                    xAttributes );
-+        ctx.importStringProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("GroupName") ),
-+                                  OUString( RTL_CONSTASCII_USTRINGPARAM("group-name") ),
-+                                  xAttributes );
- 		sal_Int16 nVal = 0;
- 		sal_Bool bChecked = sal_False;
- 		if (getBoolAttr( &bChecked,
---- svx/inc/svx/msocximex.hxx	2008-06-25 11:20:54.000000000 +0100
-+++ svx/inc/svx/msocximex.hxx	2008-06-25 11:21:19.000000000 +0100
-@@ -289,6 +289,7 @@ public:
+diff --git svx/inc/svx/msocximex.hxx svx/inc/svx/msocximex.hxx
+index f3bda14..c94eaeb 100644
+--- svx/inc/svx/msocximex.hxx
++++ svx/inc/svx/msocximex.hxx
+@@ -290,6 +290,7 @@ public:
          sal_uInt16 mnTabPos;
  	UniString sName;
  	UniString msToolTip;
@@ -51,7 +10,7 @@
  	OCX_FontData aFontData;
          SfxObjectShell *pDocSh;
  protected:
-@@ -500,54 +501,8 @@ typedef std::vector<OCX_Control*>::itera
+@@ -506,54 +507,8 @@ typedef std::vector<OCX_Control*>::iterator CtrlIterator;
  typedef std::vector<OCX_Control*>::const_iterator CtrlIteratorConst;
  typedef std::vector<OCX_Control*>  CtrlList;
  
@@ -106,7 +65,7 @@
  class OCX_ContainerControl : public OCX_Control
  {
  public:
-@@ -586,7 +541,6 @@ protected:
+@@ -593,7 +548,6 @@ protected:
              OCX_Control* pParent = NULL );
          rtl::OUString createSubStreamName( const sal_uInt32& subStorageID );
  
@@ -114,9 +73,11 @@
          com::sun::star::uno::Reference<
                  com::sun::star::container::XNameContainer > mxParent;
  	std::vector<OCX_Control*> mpControls;
---- svx/source/msfilter/msocximex.cxx	2008-06-25 11:20:54.000000000 +0100
-+++ svx/source/msfilter/msocximex.cxx	2008-06-25 11:23:05.000000000 +0100
-@@ -825,176 +825,6 @@ class ContainerRecordReaderFac
+diff --git svx/source/msfilter/msocximex.cxx svx/source/msfilter/msocximex.cxx
+index ef7ca77..530a5ce 100644
+--- svx/source/msfilter/msocximex.cxx
++++ svx/source/msfilter/msocximex.cxx
+@@ -908,176 +908,6 @@ class ContainerRecordReaderFac
  
  // ============================================================================
  
@@ -293,17 +254,14 @@
  class OCX_UserFormLabel : public OCX_Label
  {
  public:
-@@ -1709,9 +1539,26 @@ sal_Bool OCX_OptionButton::Import(com::s
+@@ -1854,9 +1684,27 @@ sal_Bool OCX_OptionButton::Import(com::sun::star::uno::Reference<
      aTmp <<= ::com::sun::star::style::VerticalAlignment_MIDDLE;
      rPropSet->setPropertyValue( WW8_ASCII2STR("VerticalAlign"), aTmp );
  
 -    if ( pGroupName )
--    {
--        aTmp <<= lclCreateOUString( pGroupName, nGroupNameLen );
 +    // If this is a dialog control then we need to  set a groupname *always*
-+    // well actually pGroupName should *only* be set if this is a dialog control, 
-+    // but.. you can't be too careful
-+    if ( pGroupName && GetInDialog() )
++    rtl::OUString sGroupName = lclCreateOUString( pGroupName, nGroupNameLen );
++    if ( GetInDialog() ) // Userform/Dialog
 +    {
 +        // By default groupnames are not set in Excel, it's not unusual to have
 +        // a number of groups of radiobuttons located inside frame ( or other container
@@ -316,14 +274,17 @@
 +        // that a suitable groupname is applied. 
 +        // Because controlNames are unique even across different containers we can use the
 +        // controls container (e.g. parent) name as a prefix for a group name
-+        rtl::OUString sGroupName = msParentName;
-+        if ( pGroupName )
-+            sGroupName = sGroupName.concat( C2U( ":" ) ).concat( lclCreateOUString( pGroupName, nGroupNameLen ) );
++	rtl::OUString sParentName = msParentName;
++        sGroupName = sParentName.concat( C2U( ":" ) ).concat( sGroupName );
++    }
++    if ( sGroupName.getLength() > 0 )
+     {
+-        aTmp <<= lclCreateOUString( pGroupName, nGroupNameLen );
 +        aTmp <<= sGroupName;
          rPropSet->setPropertyValue( WW8_ASCII2STR("GroupName"), aTmp);
      }
- 
-@@ -3416,7 +3263,7 @@ OCX_ContainerControl::OCX_ContainerContr
+ 	uno::Reference< frame::XModel > xModel ( pDocSh ? pDocSh->GetModel() : NULL );
+@@ -3566,7 +3414,7 @@ OCX_ContainerControl::OCX_ContainerControl( SotStorageRef& parent,
              const ::rtl::OUString& sN,
              const uno::Reference< container::XNameContainer >  &rParent,
              OCX_Control* pParent ) :
@@ -332,7 +293,7 @@
  {
  
      mContainerStorage = parent->OpenSotStorage(storageName,
-@@ -3627,6 +3474,7 @@ void OCX_ContainerControl::ProcessContro
+@@ -3800,6 +3648,7 @@ void OCX_ContainerControl::ProcessControl(OCX_Control* pControl,SvStorageStream*
              // applied to all containees
              pControl->mnStep = mnStep;
          }
@@ -340,7 +301,7 @@
  
          // #117490# DR: container records provide size of substream, use it here...
  
-@@ -3637,17 +3485,7 @@ void OCX_ContainerControl::ProcessContro
+@@ -3810,17 +3659,7 @@ void OCX_ContainerControl::ProcessControl(OCX_Control* pControl,SvStorageStream*
          // set stream to position behind substream of this control
          oStream->Seek( nStrmPos + rec.nSubStreamLen );
  
@@ -359,7 +320,7 @@
      }
  }
  
-@@ -3670,7 +3508,6 @@ sal_Bool OCX_ContainerControl::Read(SvSt
+@@ -3843,7 +3682,6 @@ sal_Bool OCX_ContainerControl::Read(SvStorageStream *pS)
      // this ensures that the default tab index created by Star/Open office
      // reflects the "flattened" ms tab order.
      ::std::sort( mpControls.begin(), mpControls.end(), SortOrderByTabPos() );
@@ -367,3 +328,40 @@
  	return true;
  }
  
+diff --git xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
+index ac4444e..7488f94 100644
+--- xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
++++ xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
+@@ -452,6 +452,8 @@ void ElementDescriptor::readRadioButtonModel( StyleBag * all_styles, Reference<
+                            OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":image-position") ) );
+     readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("MultiLine") ),
+                   OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":multiline") ) );
++    readStringAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("GroupName") ),
++                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":group-name") ) );
+ 
+     sal_Int16 nState = 0;
+     if (readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("State") ) ) >>= nState)
+diff --git xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
+index e47c033..310b3a6 100644
+--- xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
++++ xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
+@@ -1521,6 +1521,9 @@ void TitledBoxElement::endElement()
+         ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("MultiLine") ),
+                                    OUString( RTL_CONSTASCII_USTRINGPARAM("multiline") ),
+                                    xAttributes );
++        ctx.importStringProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("GroupName") ),
++                                  OUString( RTL_CONSTASCII_USTRINGPARAM("group-name") ),
++                                  xAttributes );
+ 		
+ 		sal_Int16 nVal = 0;
+ 		sal_Bool bChecked = sal_False;
+@@ -1662,6 +1665,9 @@ void RadioGroupElement::endElement()
+         ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("MultiLine") ),
+                                    OUString( RTL_CONSTASCII_USTRINGPARAM("multiline") ),
+                                    xAttributes );
++        ctx.importStringProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("GroupName") ),
++                                  OUString( RTL_CONSTASCII_USTRINGPARAM("group-name") ),
++                                  xAttributes );
+ 		sal_Int16 nVal = 0;
+ 		sal_Bool bChecked = sal_False;
+ 		if (getBoolAttr( &bChecked,
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]