[ooo-build-commit] .: patches/vba

[Miklos Vajna]

 patches/vba/vba-container-controls.diff |   25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

New commits:
commit b209fe247f88b80cdfac219fcc179484b7b907c5
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Wed Aug 4 15:48:06 2010 +0200

    Fix vba-container-controls.diff to apply with newer patch
    
    * patches/vba/vba-container-controls.diff:

diff --git a/patches/vba/vba-container-controls.diff b/patches/vba/vba-container-controls.diff
index 182967d..eadac59 100644
--- a/patches/vba/vba-container-controls.diff
+++ b/patches/vba/vba-container-controls.diff
@@ -687,14 +687,7 @@ index 7f75218..b5d86e3 100644
      rConv.convertColor( rPropMap, PROP_BackgroundColor, mnBackColor );
      AxFontDataModel::convertProperties( rPropMap, rConv );
  }
-@@ -1457,14 +1536,14 @@ bool AxContainerModelBase::importClassTable( BinaryInputStream& rInStrm, AxClass
- 
- // ============================================================================
- 
- AxFrameModel::AxFrameModel() :
-     AxContainerModelBase( true )
- {
- }
+@@ -1541,7 +1541,7 @@
  
  ApiControlType AxFrameModel::getControlType() const
  {
@@ -729,7 +722,7 @@ index 17cacce..a10485c 100755
  using ::com::sun::star::io::XInputStreamProvider;
  using ::com::sun::star::lang::XMultiServiceFactory;
  using ::com::sun::star::uno::Any;
-@@ -221,15 +222,10 @@ bool VbaSiteModel::importBinaryModel( BinaryInputStream& rInStrm )
+@@ -221,17 +221,11 @@
      aReader.skipUndefinedProperty();
      aReader.readStringProperty( maToolTip );
      aReader.skipStringProperty();   // license key
@@ -745,8 +738,10 @@ index 17cacce..a10485c 100755
 -    maPos.first += rDistance.first;
 -    maPos.second += rDistance.second;
 -}
- 
+-
  bool VbaSiteModel::isVisible() const
+ {
+     return getFlag( mnFlags, VBA_SITE_VISIBLE );
 @@ -274,12 +274,12 @@ ControlModelRef VbaSiteModel::createControlModel( const AxClassTable& rClassTabl
              case VBA_SITE_TEXTBOX:          xCtrlModel.reset( new AxTextBoxModel );         break;
              case VBA_SITE_LISTBOX:          xCtrlModel.reset( new AxListBoxModel );         break;
@@ -777,17 +772,11 @@ index 17cacce..a10485c 100755
  void VbaSiteModel::convertProperties( PropertyMap& rPropMap,
          const ControlConverter& rConv, ApiControlType eCtrlType, sal_Int32 nCtrlIndex ) const
  {
-@@ -368,12 +374,13 @@ OUString VbaFormControl::getControlName() const
-     return mxSiteModel.get() ? mxSiteModel->getName() : OUString();
- }
- 
- sal_Int32 VbaFormControl::getControlId() const
- {
-     return mxSiteModel.get() ? mxSiteModel->getId() : -1;
+@@ -379,6 +379,7 @@
  }
  
  void VbaFormControl::createAndConvert( sal_Int32 nCtrlIndex,
-+         const Reference< XModel >& rxDocModel,
++        const Reference< XModel >& rxDocModel,
          const Reference< XNameContainer >& rxParentNC, const ControlConverter& rConv ) const
  {
      if( rxParentNC.is() && mxSiteModel.get() && mxCtrlModel.get() ) try