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

[Noel Power]

 patches/vba/vba-container-controls.diff |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit c68c61cf28714d5f4046965524cd527c2cbfbb48
Author: Noel Power <noel.power at novell.com>
Date:   Tue Jul 6 10:45:01 2010 +0100

    fix incorrect imported active page for multipage control
    
    * patches/vba/vba-container-controls.diff:

diff --git a/patches/vba/vba-container-controls.diff b/patches/vba/vba-container-controls.diff
index 860bb7a..8e612bc 100644
--- a/patches/vba/vba-container-controls.diff
+++ b/patches/vba/vba-container-controls.diff
@@ -1040,7 +1040,7 @@ index 7f75218..b5d86e3 100644
          case API_CONTROL_DIALOG:        return CREATE_OUSTRING( "com.sun.star.awt.UnoControlDialogModel" );
          default:    OSL_ENSURE( false, "ControlModelBase::getServiceName - no AWT model service supported" );
      }
-@@ -1362,7 +1369,69 @@ void AxScrollBarModel::convertProperties( PropertyMap& rPropMap, const ControlCo
+@@ -1362,7 +1369,70 @@ void AxScrollBarModel::convertProperties( PropertyMap& rPropMap, const ControlCo
  
  // ============================================================================
  
@@ -1095,7 +1095,8 @@ index 7f75218..b5d86e3 100644
 +void AxTabStripModel::convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const
 +{
 +    rPropMap.setProperty( PROP_Decoration, mnTabStyle != AX_TABSTRIP_NONE );
-+    rPropMap.setProperty( PROP_MultiPageValue, mnSelectedTab );
++    // adjust for openoffice
++    rPropMap.setProperty( PROP_MultiPageValue, mnSelectedTab + 1 );
 +    rConv.convertColor( rPropMap, PROP_BackgroundColor, mnBackColor );
 +    AxFontDataModel::convertProperties( rPropMap, rConv );
 +}