[ooo-build-commit] patches/dev300 patches/vba

[Pei Feng Lin]

 patches/dev300/apply                |    2 ++
 patches/vba/vba-styles-add-fix.diff |   34 ++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)

New commits:
commit 44d0235fd9b94e8ad84741f8f86d98bacb35be79
Author: Fong Lin <pflin at novell.com>
Date:   Mon Aug 3 17:22:22 2009 +0800

    fix for the issue in Styles.Add in Calc
    
    * patches/dev300/apply:
    * patches/vba/vba-styles-add-fix.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index b271d2f..d4cd132 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1906,6 +1906,8 @@ vba-automation-set-fix.diff, n#507501, iz#103859
 # toolbar control isn't displayed if the macro isn't resolved, 
 # added classed for excel toolbar import ( disabled )
 tool-menu-bar-improvements.diff
+# fix for the issue in Styles.Add in Calc
+vba-styles-add-fix.diff, Fong
 [VBAUntested]
 SectionOwner => noelpwer
 # doesn't work
diff --git a/patches/vba/vba-styles-add-fix.diff b/patches/vba/vba-styles-add-fix.diff
new file mode 100644
index 0000000..301b74a
--- /dev/null
+++ b/patches/vba/vba-styles-add-fix.diff
@@ -0,0 +1,34 @@
+diff --git sc/source/ui/vba/vbarange.cxx sc/source/ui/vba/vbarange.cxx
+index a3907a7..61d2f35 100644
+--- sc/source/ui/vba/vbarange.cxx
++++ sc/source/ui/vba/vbarange.cxx
+@@ -5054,6 +5054,7 @@ ScVbaRange::getStyle() throw (uno::RuntimeException)
+ 	}
+ 	uno::Reference< beans::XPropertySet > xProps( mxRange, uno::UNO_QUERY_THROW );
+ 	rtl::OUString sStyleName;
++    xProps->getPropertyValue(CELLSTYLE) >>= sStyleName;
+ 	ScDocShell* pShell = getScDocShell();
+ 	uno::Reference< frame::XModel > xModel( pShell->GetModel() ); 
+ 	uno::Reference< excel::XStyle > xStyle = new ScVbaStyle( this, mxContext,  sStyleName, xModel );
+diff --git sc/source/ui/vba/vbastyle.cxx sc/source/ui/vba/vbastyle.cxx
+index 5081858..7c6e677 100644
+--- sc/source/ui/vba/vbastyle.cxx
++++ sc/source/ui/vba/vbastyle.cxx
+@@ -71,7 +71,7 @@ void ScVbaStyle::initialise() throw ( uno::RuntimeException )
+ 
+ }
+ 
+-ScVbaStyle::ScVbaStyle( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const rtl::OUString& sStyleName, const uno::Reference< frame::XModel >& _xModel ) throw ( script::BasicErrorException, uno::RuntimeException ) :  ScVbaStyle_BASE( xParent, xContext, lcl_getStyleProps( sStyleName, _xModel ), _xModel, false )
++ScVbaStyle::ScVbaStyle( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const rtl::OUString& sStyleName, const uno::Reference< frame::XModel >& _xModel ) throw ( script::BasicErrorException, uno::RuntimeException ) :  ScVbaStyle_BASE( xParent, xContext, lcl_getStyleProps( sStyleName, _xModel ), _xModel, false ), mxModel( _xModel )
+ {
+ 	try
+ 	{
+@@ -83,7 +83,7 @@ ScVbaStyle::ScVbaStyle( const uno::Reference< ov::XHelperInterface >& xParent, c
+ 	}
+ }
+ 
+-ScVbaStyle::ScVbaStyle( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet, const uno::Reference< frame::XModel >& _xModel ) throw ( script::BasicErrorException, uno::RuntimeException ) : ScVbaStyle_BASE( xParent, xContext, _xPropertySet, _xModel, false )
++ScVbaStyle::ScVbaStyle( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet, const uno::Reference< frame::XModel >& _xModel ) throw ( script::BasicErrorException, uno::RuntimeException ) : ScVbaStyle_BASE( xParent, xContext, _xPropertySet, _xModel, false ),  mxModel( _xModel )
+ {
+ 	try
+ 	{