ooo-build r14767 - in trunk: . patches/dev300 patches/vba

[noelpwer svn gnome org]

Author: noelpwer
Date: Sun Dec  7 10:27:14 2008
New Revision: 14767
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14767&view=rev

Log:
2008-12-07  Noel Power  <noel power novell com>

        * patches/dev300/controls-with-images-import.diff: patches seem to
        fail with sled10 ( but pass on opensuse11 ) ( msocximex.cxx & 
        elementimport.cxx ) fix fuzziness.
        * patches/dev300/dialog-groupname-persist.diff:
        * patches/dev300/controls-with-images-in-document.diff:
        * patches/vba/enhanced-form-userform-controls.diff:


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/controls-with-images-import.diff
   trunk/patches/dev300/controls-with-images-in-document.diff
   trunk/patches/dev300/dialog-groupname-persist.diff
   trunk/patches/vba/enhanced-form-userform-controls.diff

Modified: trunk/patches/dev300/controls-with-images-import.diff
==============================================================================
--- trunk/patches/dev300/controls-with-images-import.diff	(original)
+++ trunk/patches/dev300/controls-with-images-import.diff	Sun Dec  7 10:27:14 2008
@@ -293,21 +293,19 @@
  	return sal_True;
  }
  
-@@ -1564,8 +1599,14 @@ sal_Bool OCX_OptionButton::Import(com::s
-     rPropSet->setPropertyValue( WW8_ASCII2STR("VerticalAlign"), aTmp );
- 
- 	aFontData.Import(rPropSet);
-+
+@@ -1564,7 +1599,11 @@ sal_Bool OCX_OptionButton::Import(com::s
+         aTmp <<= lclCreateOUString( pGroupName, nGroupNameLen );
+         rPropSet->setPropertyValue( WW8_ASCII2STR("GroupName"), aTmp);
+     }
+-
 +    if ( sImageUrl.getLength() )
 +    {
 +        aTmp <<= sImageUrl;
 +        rPropSet->setPropertyValue( WW8_ASCII2STR("ImageURL"), aTmp);
 +    }
+ 	aFontData.Import(rPropSet);
  	return sal_True;
  }
- 
- sal_Bool OCX_OptionButton::WriteContents(SvStorageStreamRef &rContents,
- 	const uno::Reference< beans::XPropertySet > &
 @@ -2198,6 +2139,12 @@ sal_Bool OCX_ToggleButton::Import(com::s
  	}
  

Modified: trunk/patches/dev300/controls-with-images-in-document.diff
==============================================================================
--- trunk/patches/dev300/controls-with-images-in-document.diff	(original)
+++ trunk/patches/dev300/controls-with-images-in-document.diff	Sun Dec  7 10:27:14 2008
@@ -1071,7 +1071,7 @@
 index edc0c77..71d70ab 100644
 --- xmloff/source/forms/elementimport.cxx
 +++ xmloff/source/forms/elementimport.cxx
-@@ -1133,9 +1133,17 @@ namespace xmloff
+@@ -1133,10 +1133,17 @@ namespace xmloff
  					)
  				);
  
@@ -1088,7 +1088,7 @@
 +				sAdjustedValue = m_rContext.getGlobalContext().ResolveGraphicObjectURL( _rValue, FALSE );
 +			else
 +				 sAdjustedValue = m_rContext.getGlobalContext().GetAbsoluteReference( _rValue );
-+				OImagePositionImport::handleAttribute( _nNamespaceKey, _rLocalName, sAdjustedValue );
+ 			OImagePositionImport::handleAttribute( _nNamespaceKey, _rLocalName, sAdjustedValue );
  	}
  		else
 diff --git xmloff/source/forms/propertyexport.cxx xmloff/source/forms/propertyexport.cxx

Modified: trunk/patches/dev300/dialog-groupname-persist.diff
==============================================================================
--- trunk/patches/dev300/dialog-groupname-persist.diff	(original)
+++ trunk/patches/dev300/dialog-groupname-persist.diff	Sun Dec  7 10:27:14 2008
@@ -77,7 +77,7 @@
 index 2aba883..617caf8 100644
 --- svx/source/msfilter/msocximex.cxx
 +++ svx/source/msfilter/msocximex.cxx
-@@ -909,176 +909,6 @@ class ContainerRecordReaderFac
+@@ -825,176 +825,6 @@ class ContainerRecordReaderFac
  
  // ============================================================================
  
@@ -254,8 +254,7 @@
  class OCX_UserFormLabel : public OCX_Label
  {
  public:
-@@ -1913,7 +1743,37 @@ sal_Bool OCX_OptionButton::Import(com::sun::star::uno::Reference<
- 		INT16 nTmp = pValue[0]-0x30;
+@@ -1698,6 +1528,36 @@ sal_Bool OCX_OptionButton::Import(com::s
  		aTmp <<= nTmp;
  		rPropSet->setPropertyValue( WW8_ASCII2STR("DefaultState"), aTmp);
  	}
@@ -292,7 +291,7 @@
  
  	if (pCaption)
  	{
-@@ -3656,7 +3516,7 @@ OCX_ContainerControl::OCX_ContainerControl( SotStorageRef& parent,
+@@ -3416,7 +3276,7 @@ OCX_ContainerControl::OCX_ContainerContr
              const ::rtl::OUString& sN,
              const uno::Reference< container::XNameContainer >  &rParent,
              OCX_Control* pParent ) :
@@ -301,7 +300,7 @@
  {
  
      mContainerStorage = parent->OpenSotStorage(storageName,
-@@ -3887,6 +3747,7 @@ void OCX_ContainerControl::ProcessControl(OCX_Control* pControl,SvStorageStream*
+@@ -3627,6 +3487,7 @@ void OCX_ContainerControl::ProcessContro
              // applied to all containees
              pControl->mnStep = mnStep;
          }
@@ -309,7 +308,7 @@
  
          // #117490# DR: container records provide size of substream, use it here...
  
-@@ -3897,17 +3758,7 @@ void OCX_ContainerControl::ProcessControl(OCX_Control* pControl,SvStorageStream*
+@@ -3637,17 +3498,7 @@ void OCX_ContainerControl::ProcessContro
          // set stream to position behind substream of this control
          oStream->Seek( nStrmPos + rec.nSubStreamLen );
  
@@ -328,7 +327,7 @@
      }
  }
  
-@@ -3930,7 +3781,6 @@ sal_Bool OCX_ContainerControl::Read(SvStorageStream *pS)
+@@ -3670,7 +3521,6 @@ sal_Bool OCX_ContainerControl::Read(SvSt
      // 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() );

Modified: trunk/patches/vba/enhanced-form-userform-controls.diff
==============================================================================
--- trunk/patches/vba/enhanced-form-userform-controls.diff	(original)
+++ trunk/patches/vba/enhanced-form-userform-controls.diff	Sun Dec  7 10:27:14 2008
@@ -880,7 +880,7 @@
  #ifndef C2S
  #define C2S(cChar)	String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(cChar))
  #endif
-@@ -759,14 +771,22 @@ class ContainerRecReader
+@@ -636,14 +648,22 @@ class ContainerRecReader
              if( nCtrlSrcBufSize > 0 )
              {
                  ReadAlign( pS, pS->Tell() - nStartPos, 4 );
@@ -905,7 +905,7 @@
              }
  
              // seek to end of data
-@@ -1560,6 +1580,99 @@ sal_Bool OCX_ImageButton::Export(SvStorageRef &rObj,
+@@ -1425,6 +1445,99 @@ sal_Bool OCX_ImageButton::Export(SvStora
  	return WriteContents(xContents,rPropSet,rSize);
  }
  
@@ -1005,7 +1005,7 @@
  
  sal_Bool OCX_OptionButton::Import(com::sun::star::uno::Reference<
          com::sun::star::beans::XPropertySet> &rPropSet)
-@@ -1592,11 +1705,20 @@ sal_Bool OCX_OptionButton::Import(com::sun::star::uno::Reference<
+@@ -1457,11 +1570,20 @@ sal_Bool OCX_OptionButton::Import(com::s
      aTmp <<= ImportSpecEffect( nSpecialEffect );
      rPropSet->setPropertyValue( WW8_ASCII2STR("VisualEffect"), aTmp);
  
@@ -1026,29 +1026,24 @@
 +				rPropSet->setPropertyValue( WW8_ASCII2STR("State"), aTmp);
 +		}
  	}
- 
- 	if (pCaption)
-@@ -1632,7 +1754,8 @@ sal_Bool OCX_OptionButton::Import(com::sun::star::uno::Reference<
-         aTmp <<= sGroupName;
+     // If this is a dialog control then we need to  set a groupname *always*
+     rtl::OUString sGroupName = lclCreateOUString( pGroupName, nGroupNameLen );
+@@ -1509,11 +1631,14 @@ sal_Bool OCX_OptionButton::Import(com::s
+         aTmp <<= lclCreateOUString( pGroupName, nGroupNameLen );
          rPropSet->setPropertyValue( WW8_ASCII2STR("GroupName"), aTmp);
      }
--
 +	uno::Reference< frame::XModel > xModel ( pDocSh ? pDocSh->GetModel() : NULL );
 +	lcl_ApplyListSourceAndBindableStuff( xModel, rPropSet, msCtrlSource, msRowSource );
- 	aFontData.Import(rPropSet);
- 
      if ( sImageUrl.getLength() )
-@@ -2535,6 +2658,9 @@ sal_Bool OCX_ComboBox::Import(com::sun::star::uno::Reference<
- 	aTmp <<= nTmp;
- 	rPropSet->setPropertyValue( WW8_ASCII2STR("MaxTextLen"), aTmp);
- 
-+	uno::Reference< frame::XModel > xModel ( pDocSh ? pDocSh->GetModel() : NULL );
-+	lcl_ApplyListSourceAndBindableStuff( xModel, rPropSet, msCtrlSource, msRowSource );
+     {
+         aTmp <<= sImageUrl;
+         rPropSet->setPropertyValue( WW8_ASCII2STR("ImageURL"), aTmp);
+     }
 +
  	aFontData.Import(rPropSet);
  	return sal_True;
  }
-@@ -2755,7 +2881,8 @@ sal_Bool OCX_ListBox::Import(com::sun::star::uno::Reference<
+@@ -2630,7 +2755,8 @@ sal_Bool OCX_ListBox::Import(com::sun::s
  
      aTmp <<= ImportColor( nBorderColor );
      rPropSet->setPropertyValue( WW8_ASCII2STR("BorderColor"), aTmp);
@@ -1058,7 +1053,7 @@
  	aFontData.Import(rPropSet);
  	return sal_True;
  }
-@@ -3553,15 +3680,29 @@ void OCX_ContainerControl::ProcessControl(OCX_Control* pControl,SvStorageStream*
+@@ -3419,15 +3545,29 @@ void OCX_ContainerControl::ProcessContro
      {
          // A container control needs to read the f stream in
          // the folder ( substorage ) associated with this control
@@ -1095,7 +1090,7 @@
          pControl->sName = rec.cName;
          pControl->msToolTip = rec.controlTip;
          // Position of controls is relative to the container
-@@ -4200,7 +4341,7 @@ sal_Bool OCX_UserForm::Import(
+@@ -4062,7 +4202,7 @@ sal_Bool OCX_UserForm::Import(
      OCX_ContainerControl::Import( xPropSet );
  
      uno::Reference<io::XInputStreamProvider> xSource =
@@ -1104,7 +1099,7 @@
      uno::Any aSourceAny(uno::makeAny(xSource));
      if (rLib->hasByName(sName))
          rLib->replaceByName(sName, aSourceAny);
-@@ -4743,11 +4884,14 @@ sal_Bool OCX_CheckBox::Import(com::sun::star::uno::Reference<
+@@ -4605,11 +4745,14 @@ sal_Bool OCX_CheckBox::Import(com::sun::
      aTmp <<= ImportSpecEffect( nSpecialEffect );
      rPropSet->setPropertyValue( WW8_ASCII2STR("VisualEffect"), aTmp);