GNOME.org
 

ooo-build r13851 - in trunk: . patches/vba

Author: noelpwer
Date: Mon Sep  8 19:25:58 2008
New Revision: 13851
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13851&view=rev

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

        * patches/vba/enhanced-form-userform-controls.diff: fix link
        problem


Modified:
   trunk/ChangeLog
   trunk/patches/vba/enhanced-form-userform-controls.diff

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	Mon Sep  8 19:25:58 2008
@@ -2,7 +2,7 @@
 index 1865b94..12c8e0c 100644
 --- basctl/source/basicide/baside3.cxx
 +++ basctl/source/basicide/baside3.cxx
-@@ -112,7 +112,7 @@ DialogWindow::DialogWindow( Window* pPar
+@@ -112,7 +112,7 @@ DialogWindow::DialogWindow( Window* pParent, const ScriptDocument& rDocument, St
  {
  	InitSettings( TRUE, TRUE, TRUE );
  
@@ -33,7 +33,7 @@
 index b211eb3..e562ecb 100644
 --- basctl/source/basicide/basides3.cxx
 +++ basctl/source/basicide/basides3.cxx
-@@ -98,7 +98,7 @@ DialogWindow* BasicIDEShell::CreateDlgWi
+@@ -98,7 +98,7 @@ DialogWindow* BasicIDEShell::CreateDlgWin( const ScriptDocument& rDocument, cons
                  Reference< beans::XPropertySet > xProps( xMSF, UNO_QUERY );
                  OSL_ASSERT( xProps.is() );
                  OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
@@ -46,7 +46,7 @@
 index a5b41e7..cd2c032 100644
 --- basctl/source/basicide/moduldlg.cxx
 +++ basctl/source/basicide/moduldlg.cxx
-@@ -315,7 +315,7 @@ void BasicIDEShell::CopyDialogResources(
+@@ -315,7 +315,7 @@ void BasicIDEShell::CopyDialogResources( Reference< io::XInputStreamProvider >&
      Reference< beans::XPropertySet > xProps( xMSF, UNO_QUERY );
      OSL_ASSERT( xProps.is() );
      OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
@@ -55,7 +55,7 @@
  
  	if( xDialogModel.is() )
  	{
-@@ -332,7 +332,7 @@ void BasicIDEShell::CopyDialogResources(
+@@ -332,7 +332,7 @@ void BasicIDEShell::CopyDialogResources( Reference< io::XInputStreamProvider >&
  		{
  			LocalizationMgr::setResourceIDsForDialog( xDialogModel, xDestMgr );
  		}
@@ -184,7 +184,7 @@
  //==================================================================================================
  
  #include <xmlscript/xmldlg_imexp.hxx>
-@@ -458,6 +461,43 @@ Any implFindDialogLibForDialog( const An
+@@ -458,6 +461,43 @@ Any implFindDialogLibForDialog( const Any& rDlgAny, SbxObject* pBasic )
  	return aRetDlgLibAny;
  }
  
@@ -228,7 +228,7 @@
  static ::rtl::OUString aDecorationPropName =
  	::rtl::OUString::createFromAscii( "Decoration" );
  static ::rtl::OUString aTitlePropName =
-@@ -537,39 +577,51 @@ void RTL_Impl_CreateUnoDialog( StarBASIC
+@@ -537,39 +577,51 @@ void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, BOOL bWrite )
  		{}
  	}
  
@@ -312,7 +312,7 @@
 index e010d24..31f6757 100644
 --- basic/source/uno/dlgcont.cxx
 +++ basic/source/uno/dlgcont.cxx
-@@ -322,7 +322,7 @@ Any SAL_CALL SfxDialogLibraryContainer::
+@@ -322,7 +322,7 @@ Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement
  	
  	try {
  		// start parsing 
@@ -321,7 +321,7 @@
  		xParser->parseStream( source );
  	}
  	catch( Exception& )
-@@ -336,7 +336,7 @@ Any SAL_CALL SfxDialogLibraryContainer::
+@@ -336,7 +336,7 @@ Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement
  
  	// Create InputStream, TODO: Implement own InputStreamProvider
  	// to avoid creating the DialogModel here!
@@ -369,10 +369,10 @@
  
  // --> PB 2004-08-23 #i33095# Security Options
 diff --git sc/source/ui/unoobj/addruno.cxx sc/source/ui/unoobj/addruno.cxx
-index b417b7e..c279a7b 100644
+index b417b7e..6495b02 100644
 --- sc/source/ui/unoobj/addruno.cxx
 +++ sc/source/ui/unoobj/addruno.cxx
-@@ -72,7 +72,7 @@ void ScAddressConversionObj::Notify( Sfx
+@@ -72,7 +72,7 @@ void ScAddressConversionObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
      }
  }
  
@@ -381,7 +381,7 @@
  {
      if (!pDocShell)
          return sal_False;
-@@ -81,7 +81,7 @@ sal_Bool ScAddressConversionObj::ParseUI
+@@ -81,7 +81,7 @@ sal_Bool ScAddressConversionObj::ParseUIString( const String& rUIString )
      sal_Bool bSuccess = sal_False;
      if ( bIsRange )
      {
@@ -390,7 +390,7 @@
          if ( nResult & SCA_VALID )
          {
              if ( ( nResult & SCA_TAB_3D ) == 0 )
-@@ -95,7 +95,7 @@ sal_Bool ScAddressConversionObj::ParseUI
+@@ -95,7 +95,7 @@ sal_Bool ScAddressConversionObj::ParseUIString( const String& rUIString )
      }
      else
      {
@@ -399,7 +399,7 @@
          if ( nResult & SCA_VALID )
          {
              if ( ( nResult & SCA_TAB_3D ) == 0 )
-@@ -119,6 +119,7 @@ uno::Reference<beans::XPropertySetInfo> 
+@@ -119,6 +119,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAddressConversionObj::getProp
          {
              {MAP_CHAR_LEN(SC_UNONAME_ADDRESS),  0,  &getCppuType((table::CellRangeAddress*)0), 0, 0 },
              {MAP_CHAR_LEN(SC_UNONAME_PERSREPR), 0,  &getCppuType((rtl::OUString*)0),    0, 0 },
@@ -407,7 +407,7 @@
              {MAP_CHAR_LEN(SC_UNONAME_REFSHEET), 0,  &getCppuType((sal_Int32*)0),        0, 0 },
              {MAP_CHAR_LEN(SC_UNONAME_UIREPR),   0,  &getCppuType((rtl::OUString*)0),    0, 0 },
              {0,0,0,0,0,0}
-@@ -132,6 +133,7 @@ uno::Reference<beans::XPropertySetInfo> 
+@@ -132,6 +133,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAddressConversionObj::getProp
          {
              {MAP_CHAR_LEN(SC_UNONAME_ADDRESS),  0,  &getCppuType((table::CellAddress*)0), 0, 0 },
              {MAP_CHAR_LEN(SC_UNONAME_PERSREPR), 0,  &getCppuType((rtl::OUString*)0),    0, 0 },
@@ -415,7 +415,7 @@
              {MAP_CHAR_LEN(SC_UNONAME_REFSHEET), 0,  &getCppuType((sal_Int32*)0),        0, 0 },
              {MAP_CHAR_LEN(SC_UNONAME_UIREPR),   0,  &getCppuType((rtl::OUString*)0),    0, 0 },
              {0,0,0,0,0,0}
-@@ -193,8 +195,11 @@ void SAL_CALL ScAddressConversionObj::se
+@@ -193,8 +195,11 @@ void SAL_CALL ScAddressConversionObj::setPropertyValue( const rtl::OUString& aPr
              bSuccess = ParseUIString( aUIString );
          }
      }
@@ -428,7 +428,7 @@
          //  parse the file format string
          rtl::OUString sRepresentation;
          if (aValue >>= sRepresentation)
-@@ -215,7 +220,7 @@ void SAL_CALL ScAddressConversionObj::se
+@@ -215,7 +220,7 @@ void SAL_CALL ScAddressConversionObj::setPropertyValue( const rtl::OUString& aPr
              }
  
              //  parse the rest like a UI string
@@ -437,7 +437,7 @@
          }
      }
      else
-@@ -268,17 +273,24 @@ uno::Any SAL_CALL ScAddressConversionObj
+@@ -268,17 +273,24 @@ uno::Any SAL_CALL ScAddressConversionObj::getPropertyValue( const rtl::OUString&
              aRange.aStart.Format( aFormatStr, nFlags, pDoc );
          aRet <<= rtl::OUString( aFormatStr );
      }
@@ -509,7 +509,7 @@
 index 58533b2..0d7ded2 100644
 --- scripting/source/dlgprov/dlgprov.cxx
 +++ scripting/source/dlgprov/dlgprov.cxx
-@@ -196,7 +196,15 @@ static ::rtl::OUString aResourceResolver
+@@ -196,7 +196,15 @@ static ::rtl::OUString aResourceResolverPropName = ::rtl::OUString::createFromAs
  		Reference< beans::XPropertySet > xDlgPropSet( xDialogModel, UNO_QUERY );
  		xDlgPropSet->setPropertyValue( aDlgSrcUrlPropName, aDialogSourceURL );
  
@@ -526,7 +526,7 @@
          // Set resource property
          if( xStringResourceManager.is() )
          {
-@@ -658,7 +666,10 @@ static ::rtl::OUString aResourceResolver
+@@ -658,7 +666,10 @@ static ::rtl::OUString aResourceResolverPropName = ::rtl::OUString::createFromAs
              aArguments[0] >>= m_xModel;
              m_BasicInfo.reset( new BasicRTLParams() );
              m_BasicInfo->mxInput.set( aArguments[ 1 ], UNO_QUERY_THROW );
@@ -826,7 +826,7 @@
          mnBackColor = 0x80000005L;
          mnForeColor = 0x80000008L;
          aFontData.SetHasAlign(TRUE);
-@@ -1019,7 +1024,7 @@ class OCX_ComboBox : public OCX_ModernCo
+@@ -1019,7 +1024,7 @@ class OCX_ComboBox : public OCX_ModernControl
  public:
  	OCX_ComboBox() : OCX_ModernControl(rtl::OUString::createFromAscii("ComboBox")){
  		msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.ComboBox");
@@ -835,7 +835,7 @@
  		mnBackColor = 0x80000005;
  		mnForeColor = 0x80000008;
  		nBorderColor = 0x80000006;
-@@ -1044,7 +1049,8 @@ class OCX_ListBox : public OCX_ModernCon
+@@ -1044,7 +1049,8 @@ class OCX_ListBox : public OCX_ModernControl
  public:
  	OCX_ListBox() : OCX_ModernControl(rtl::OUString::createFromAscii("ListBox")){
  		msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.ListBox");
@@ -846,7 +846,7 @@
  		mnForeColor = 0x80000008;
  		nBorderColor = 0x80000006;
 diff --git svx/source/msfilter/msocximex.cxx svx/source/msfilter/msocximex.cxx
-index b30665a..0ba055d 100644
+index ddca2be..b03f644 100644
 --- svx/source/msfilter/msocximex.cxx
 +++ svx/source/msfilter/msocximex.cxx
 @@ -49,6 +49,10 @@
@@ -900,7 +900,7 @@
              }
  
              // seek to end of data
-@@ -1560,6 +1580,99 @@ sal_Bool OCX_ImageButton::Export(SvStora
+@@ -1560,6 +1580,99 @@ sal_Bool OCX_ImageButton::Export(SvStorageRef &rObj,
  	return WriteContents(xContents,rPropSet,rSize);
  }
  
@@ -1000,7 +1000,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::s
+@@ -1592,11 +1705,20 @@ sal_Bool OCX_OptionButton::Import(com::sun::star::uno::Reference<
      aTmp <<= ImportSpecEffect( nSpecialEffect );
      rPropSet->setPropertyValue( WW8_ASCII2STR("VisualEffect"), aTmp);
  
@@ -1023,7 +1023,7 @@
  	}
  
  	if (pCaption)
-@@ -1632,7 +1754,8 @@ sal_Bool OCX_OptionButton::Import(com::s
+@@ -1632,7 +1754,8 @@ sal_Bool OCX_OptionButton::Import(com::sun::star::uno::Reference<
          aTmp <<= sGroupName;
          rPropSet->setPropertyValue( WW8_ASCII2STR("GroupName"), aTmp);
      }
@@ -1033,7 +1033,7 @@
  	aFontData.Import(rPropSet);
  
      if ( sImageUrl.getLength() )
-@@ -2535,6 +2658,9 @@ sal_Bool OCX_ComboBox::Import(com::sun::
+@@ -2535,6 +2658,9 @@ sal_Bool OCX_ComboBox::Import(com::sun::star::uno::Reference<
  	aTmp <<= nTmp;
  	rPropSet->setPropertyValue( WW8_ASCII2STR("MaxTextLen"), aTmp);
  
@@ -1043,7 +1043,7 @@
  	aFontData.Import(rPropSet);
  	return sal_True;
  }
-@@ -2755,7 +2881,8 @@ sal_Bool OCX_ListBox::Import(com::sun::s
+@@ -2755,7 +2881,8 @@ sal_Bool OCX_ListBox::Import(com::sun::star::uno::Reference<
  
      aTmp <<= ImportColor( nBorderColor );
      rPropSet->setPropertyValue( WW8_ASCII2STR("BorderColor"), aTmp);
@@ -1053,7 +1053,7 @@
  	aFontData.Import(rPropSet);
  	return sal_True;
  }
-@@ -3552,15 +3679,29 @@ void OCX_ContainerControl::ProcessContro
+@@ -3553,15 +3680,29 @@ void OCX_ContainerControl::ProcessControl(OCX_Control* pControl,SvStorageStream*
      {
          // A container control needs to read the f stream in
          // the folder ( substorage ) associated with this control
@@ -1090,7 +1090,7 @@
          pControl->sName = rec.cName;
          pControl->msToolTip = rec.controlTip;
          // Position of controls is relative to the container
-@@ -4199,7 +4340,7 @@ sal_Bool OCX_UserForm::Import(
+@@ -4200,7 +4341,7 @@ sal_Bool OCX_UserForm::Import(
      OCX_ContainerControl::Import( xPropSet );
  
      uno::Reference<io::XInputStreamProvider> xSource =
@@ -1099,7 +1099,7 @@
      uno::Any aSourceAny(uno::makeAny(xSource));
      if (rLib->hasByName(sName))
          rLib->replaceByName(sName, aSourceAny);
-@@ -4742,11 +4883,14 @@ sal_Bool OCX_CheckBox::Import(com::sun::
+@@ -4743,11 +4884,14 @@ sal_Bool OCX_CheckBox::Import(com::sun::star::uno::Reference<
      aTmp <<= ImportSpecEffect( nSpecialEffect );
      rPropSet->setPropertyValue( WW8_ASCII2STR("VisualEffect"), aTmp);
  
@@ -1148,8 +1148,20 @@
  
  	void implNotifyTabModelChange( const ::rtl::OUString& _rAccessor );
  
+diff --git toolkit/inc/toolkit/controls/unocontrols.hxx toolkit/inc/toolkit/controls/unocontrols.hxx
+index 2743f2e..29ef91a 100644
+--- toolkit/inc/toolkit/controls/unocontrols.hxx
++++ toolkit/inc/toolkit/controls/unocontrols.hxx
+@@ -225,7 +225,6 @@ private:
+     bool                                                                                    mbAdjustingGraphic;
+     
+     ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > mxGrfObj;
+-    ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > getGraphicFromURL_nothrow( const ::rtl::OUString& _rURL );
+ protected:
+     ImageProducerControlModel() : mbAdjustingImagePosition( false ), mbAdjustingGraphic( false ) { }
+     ImageProducerControlModel( const ImageProducerControlModel& _rSource ) : com::sun::star::awt::XImageProducer(), UnoControlModel( _rSource ), mbAdjustingImagePosition( false ), mbAdjustingGraphic( false ) { }
 diff --git toolkit/source/controls/dialogcontrol.cxx toolkit/source/controls/dialogcontrol.cxx
-index 3fd5723..7e717ae 100644
+index 3fd5723..be06bbb 100644
 --- toolkit/source/controls/dialogcontrol.cxx
 +++ toolkit/source/controls/dialogcontrol.cxx
 @@ -90,6 +90,8 @@ using namespace toolkit;
@@ -1271,7 +1283,7 @@
              break;
          }
      }
-@@ -2120,10 +2120,17 @@ throw (RuntimeException)
+@@ -2120,10 +2153,17 @@ throw (RuntimeException)
  
  	if ( url.getLength() > 0 )
  	{
@@ -1293,6 +1305,41 @@
  	}
  
  	return ret;
+diff --git toolkit/source/controls/unocontrols.cxx toolkit/source/controls/unocontrols.cxx
+index 1e5661b..616118e 100644
+--- toolkit/source/controls/unocontrols.cxx
++++ toolkit/source/controls/unocontrols.cxx
+@@ -577,7 +577,7 @@ uno::Any ImageProducerControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) co
+ 
+     return UnoControlModel::ImplGetDefaultValue( nPropId );
+ }
+-    uno::Reference< graphic::XGraphic > ImageProducerControlModel::getGraphicFromURL_nothrow( const ::rtl::OUString& _rURL )
++    uno::Reference< graphic::XGraphic > getGraphicFromURL_nothrow( uno::Reference< graphic::XGraphicObject >& rxGrfObj, const ::rtl::OUString& _rURL )
+     {
+         uno::Reference< graphic::XGraphic > xGraphic;
+ 
+@@ -587,10 +587,10 @@ uno::Any ImageProducerControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) co
+             rtl::OUString sID = _rURL.copy( sizeof( UNO_NAME_GRAPHOBJ_URLPREFIX ) - 1 );
+             // get the DefaultContext
+             ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
+-            mxGrfObj = graphic::GraphicObject::createWithId( aContext.getUNOContext(), sID );
++            rxGrfObj = graphic::GraphicObject::createWithId( aContext.getUNOContext(), sID );
+         }
+         else // linked
+-            mxGrfObj = NULL; // release the GraphicObject
++            rxGrfObj = NULL; // release the GraphicObject
+ 
+         if ( !_rURL.getLength() )
+             return xGraphic;
+@@ -631,7 +631,7 @@ void SAL_CALL ImageProducerControlModel::setFastPropertyValue_NoBroadcast( sal_I
+                 mbAdjustingGraphic = true;
+                 ::rtl::OUString sImageURL;
+                 OSL_VERIFY( rValue >>= sImageURL );
+-                setPropertyValue( GetPropertyName( BASEPROPERTY_GRAPHIC ), uno::makeAny( getGraphicFromURL_nothrow( sImageURL ) ) );
++                setPropertyValue( GetPropertyName( BASEPROPERTY_GRAPHIC ), uno::makeAny( getGraphicFromURL_nothrow( mxGrfObj, sImageURL ) ) );
+                 mbAdjustingGraphic = false;
+             }
+             break;
 diff --git xmlscript/inc/xmlscript/xmldlg_imexp.hxx xmlscript/inc/xmlscript/xmldlg_imexp.hxx
 index ea5b591..4549fa9 100644
 --- xmlscript/inc/xmlscript/xmldlg_imexp.hxx
@@ -1351,7 +1398,7 @@
  
  }
 diff --git xmlscript/source/xmldlg_imexp/exp_share.hxx xmlscript/source/xmldlg_imexp/exp_share.hxx
-index 80019af..08e5aa6 100644
+index c87538f..db2aa1c 100644
 --- xmlscript/source/xmldlg_imexp/exp_share.hxx
 +++ xmlscript/source/xmldlg_imexp/exp_share.hxx
 @@ -180,9 +180,9 @@ public:
@@ -1379,7 +1426,7 @@
      void readNumericFieldModel( StyleBag * all_styles )
          SAL_THROW( (css::uno::Exception) );
 diff --git xmlscript/source/xmldlg_imexp/imp_share.hxx xmlscript/source/xmldlg_imexp/imp_share.hxx
-index e9225c8..fac87f4 100644
+index c53e325..e5263ad 100644
 --- xmlscript/source/xmldlg_imexp/imp_share.hxx
 +++ xmlscript/source/xmldlg_imexp/imp_share.hxx
 @@ -131,6 +131,7 @@ struct DialogImport
@@ -1423,7 +1470,7 @@
  
  namespace xmlscript
  {
-@@ -73,7 +74,8 @@ Reference< io::XInputStream > InputStrea
+@@ -73,7 +74,8 @@ Reference< io::XInputStream > InputStreamProvider::createInputStream()
  //==================================================================================================
  Reference< io::XInputStreamProvider > SAL_CALL exportDialogModel(
      Reference< container::XNameContainer > const & xDialogModel,
@@ -1433,7 +1480,7 @@
  	SAL_THROW( (Exception) )
  {
  	Reference< lang::XMultiComponentFactory > xSMgr( xContext->getServiceManager() );
-@@ -98,7 +100,7 @@ Reference< io::XInputStreamProvider > SA
+@@ -98,7 +100,7 @@ Reference< io::XInputStreamProvider > SAL_CALL exportDialogModel(
  	
  	Reference< io::XActiveDataSource > xSource( xHandler, UNO_QUERY );
  	xSource->setOutputStream( createOutputStream( &aBytes ) );
@@ -1442,7 +1489,7 @@
  	
  	return new InputStreamProvider( aBytes );
  }
-@@ -107,7 +109,8 @@ Reference< io::XInputStreamProvider > SA
+@@ -107,7 +109,8 @@ Reference< io::XInputStreamProvider > SAL_CALL exportDialogModel(
  void SAL_CALL importDialogModel(
  	Reference< io::XInputStream > xInput,
  	Reference< container::XNameContainer > const & xDialogModel,
@@ -1462,7 +1509,7 @@
  	xml::sax::InputSource source;
  	source.aInputStream = xInput;
 diff --git xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
-index b1e8538..faae647 100644
+index 3d744be..7488f94 100644
 --- xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
 +++ xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
 @@ -32,7 +32,16 @@
@@ -1543,7 +1590,7 @@
  static inline bool readBorderProps(
      ElementDescriptor * element, Style & style )
  {
-@@ -209,7 +272,7 @@ void ElementDescriptor::readCheckBoxMode
+@@ -209,7 +272,7 @@ void ElementDescriptor::readCheckBoxModel( StyleBag * all_styles )
      readEvents();
  }
  //__________________________________________________________________________________________________
@@ -1552,7 +1599,7 @@
      SAL_THROW( (Exception) )
  {
      // collect styles
-@@ -250,7 +313,8 @@ void ElementDescriptor::readComboBoxMode
+@@ -250,7 +313,8 @@ void ElementDescriptor::readComboBoxModel( StyleBag * all_styles )
                     OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":maxlength") ) );
      readShortAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("LineCount") ),
                     OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":linecount") ) );
@@ -1562,7 +1609,7 @@
      // string item list
      Sequence< OUString > itemValues;
      if ((readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("StringItemList") ) ) >>= itemValues) &&
-@@ -276,7 +340,7 @@ void ElementDescriptor::readComboBoxMode
+@@ -276,7 +340,7 @@ void ElementDescriptor::readComboBoxModel( StyleBag * all_styles )
      readEvents();
  }
  //__________________________________________________________________________________________________
@@ -1571,7 +1618,7 @@
      SAL_THROW( (Exception) )
  {
      // collect styles
-@@ -311,7 +375,7 @@ void ElementDescriptor::readListBoxModel
+@@ -311,7 +375,7 @@ void ElementDescriptor::readListBoxModel( StyleBag * all_styles )
                     OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":linecount") ) );
      readAlignAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Align") ),
                     OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":align") ) );
@@ -1580,7 +1627,7 @@
      // string item list
      Sequence< OUString > itemValues;
      if ((readProp( OUString( RTL_CONSTASCII_USTRINGPARAM("StringItemList") ) ) >>= itemValues) &&
-@@ -351,7 +415,7 @@ void ElementDescriptor::readListBoxModel
+@@ -351,7 +415,7 @@ void ElementDescriptor::readListBoxModel( StyleBag * all_styles )
      readEvents();
  }
  //__________________________________________________________________________________________________
@@ -1589,7 +1636,7 @@
      SAL_THROW( (Exception) )
  {
      // collect styles
-@@ -409,6 +473,7 @@ void ElementDescriptor::readRadioButtonM
+@@ -409,6 +473,7 @@ void ElementDescriptor::readRadioButtonModel( StyleBag * all_styles )
              break;
          }
      }
@@ -1597,7 +1644,7 @@
      readEvents();
  }
  //__________________________________________________________________________________________________
-@@ -581,7 +646,7 @@ void ElementDescriptor::readEditModel( S
+@@ -581,7 +646,7 @@ void ElementDescriptor::readEditModel( StyleBag * all_styles )
      readEvents();
  }
  //__________________________________________________________________________________________________
@@ -1606,7 +1653,7 @@
      SAL_THROW( (Exception) )
  {
      // collect styles
-@@ -600,8 +665,31 @@ void ElementDescriptor::readImageControl
+@@ -600,8 +665,31 @@ void ElementDescriptor::readImageControlModel( StyleBag * all_styles )
      readDefaults();
      readBoolAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ScaleImage") ),
                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":scale-image") ) );
@@ -1641,10 +1688,10 @@
                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":tabstop") ) );
      readEvents();
 diff --git xmlscript/source/xmldlg_imexp/xmldlg_export.cxx xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
-index 72b31c5..cbe9698 100644
+index 999f899..2e4729e 100644
 --- xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
 +++ xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
-@@ -1309,7 +1309,8 @@ void StyleBag::dump( Reference< xml::sax
+@@ -1309,7 +1309,8 @@ void StyleBag::dump( Reference< xml::sax::XExtendedDocumentHandler > const & xOu
  //==================================================================================================
  void SAL_CALL exportDialogModel(
      Reference< xml::sax::XExtendedDocumentHandler > const & xOut,
@@ -1691,7 +1738,7 @@
              else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFileControlModel") ) ) )
              {
 diff --git xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
-index d82be30..42099fa 100644
+index ee1d824..310b3a6 100644
 --- xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
 +++ xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
 @@ -31,11 +31,19 @@
@@ -1817,7 +1864,7 @@
  // progessmeter
  //__________________________________________________________________________________________________
  Reference< xml::input::XElement > ProgressBarElement::startChildElement(
-@@ -1073,9 +1175,37 @@ void ImageControlElement::endElement()
+@@ -1003,9 +1105,37 @@ void ImageControlElement::endElement()
  	ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ScaleImage") ),
  							   OUString( RTL_CONSTASCII_USTRINGPARAM("scale-image") ),
  							   _xAttributes );
@@ -1858,7 +1905,7 @@
      ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("Tabstop") ),
                                 OUString( RTL_CONSTASCII_USTRINGPARAM("tabstop") ),
                                 _xAttributes );
-@@ -1408,10 +1538,24 @@ void TitledBoxElement::endElement()
+@@ -1338,10 +1468,24 @@ void TitledBoxElement::endElement()
  		Reference< xml::input::XElement > xRadio( _radios[ nPos ] );
  		Reference< xml::input::XAttributes > xAttributes(
              xRadio->getAttributes() );
@@ -1884,7 +1931,7 @@
  		Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() );
  		
  		Reference< xml::input::XElement > xStyle( getStyle( xAttributes ) );
-@@ -1463,7 +1607,7 @@ void TitledBoxElement::endElement()
+@@ -1393,7 +1537,7 @@ void TitledBoxElement::endElement()
  		}
  		xControlModel->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("State") ),
  										 makeAny( nVal ) );
@@ -1893,7 +1940,7 @@
          ::std::vector< Reference< xml::input::XElement > > * radioEvents =
              static_cast< RadioElement * >( xRadio.get() )->getEvents();
  		ctx.importEvents( *radioEvents );
-@@ -1539,10 +1683,23 @@ void RadioGroupElement::endElement()
+@@ -1469,10 +1613,23 @@ void RadioGroupElement::endElement()
  		Reference< xml::input::XElement > xRadio( _radios[ nPos ] );
  		Reference< xml::input::XAttributes > xAttributes(
              xRadio->getAttributes() );
@@ -1918,7 +1965,7 @@
  		Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() );
  		
  		Reference< xml::input::XElement > xStyle( getStyle( xAttributes ) );
-@@ -1594,6 +1751,7 @@ void RadioGroupElement::endElement()
+@@ -1524,6 +1681,7 @@ void RadioGroupElement::endElement()
  		xControlModel->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("State") ),
  										 makeAny( nVal ) );
  		
@@ -1926,7 +1973,7 @@
          ::std::vector< Reference< xml::input::XElement > > * radioEvents =
              static_cast< RadioElement * >( xRadio.get() )->getEvents();
  		ctx.importEvents( *radioEvents );
-@@ -1714,9 +1872,26 @@ Reference< xml::input::XElement > MenuLi
+@@ -1644,9 +1802,26 @@ Reference< xml::input::XElement > MenuListElement::startChildElement(
  void MenuListElement::endElement()
  	throw (xml::sax::SAXException, RuntimeException)
  {
@@ -1954,7 +2001,7 @@
  	Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() );
  	
  	Reference< xml::input::XElement > xStyle( getStyle( _xAttributes ) );
-@@ -1749,13 +1924,16 @@ void MenuListElement::endElement()
+@@ -1679,13 +1854,16 @@ void MenuListElement::endElement()
  	ctx.importAlignProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("Align") ),
                               OUString( RTL_CONSTASCII_USTRINGPARAM("align") ),
                               _xAttributes );
@@ -1974,7 +2021,7 @@
  										 makeAny( p->getSelectedItems() ) );
  	}
  	ctx.importEvents( _events );
-@@ -1801,9 +1979,26 @@ Reference< xml::input::XElement > ComboB
+@@ -1731,9 +1909,26 @@ Reference< xml::input::XElement > ComboBoxElement::startChildElement(
  void ComboBoxElement::endElement()
  	throw (xml::sax::SAXException, RuntimeException)
  {
@@ -2002,7 +2049,7 @@
  	Reference< beans::XPropertySet > xControlModel( ctx.getControlModel() );
  	
  	Reference< xml::input::XElement > xStyle( getStyle( _xAttributes ) );
-@@ -1845,8 +2040,10 @@ void ComboBoxElement::endElement()
+@@ -1775,8 +1970,10 @@ void ComboBoxElement::endElement()
  	ctx.importAlignProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("Align") ),
                               OUString( RTL_CONSTASCII_USTRINGPARAM("align") ),
                               _xAttributes );
@@ -2026,7 +2073,7 @@
  using ::rtl::OUString;
  
  namespace xmlscript
-@@ -1879,12 +1880,13 @@ Reference< xml::input::XElement > Dialog
+@@ -1879,12 +1880,13 @@ Reference< xml::input::XElement > DialogImport::getStyle(
  //==================================================================================================
  Reference< xml::sax::XDocumentHandler > SAL_CALL importDialogModel(
      Reference< container::XNameContainer > const & xDialogModel,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]