[ooo-build-commit] .: patches/dev300 patches/vba
Kohei Yoshida
kohei at kemper.freedesktop.org
Sat Oct 2 09:07:09 PDT 2010
patches/dev300/apply | 4
patches/dev300/disable-checkdeliver.diff | 11 -
patches/dev300/nlpsolver-build.diff | 144 -----------------------
patches/vba/cws-vbasupportdev300.diff | 6
patches/vba/fix-name-range-separator.diff | 2
patches/vba/vba-rangecell-colparam.diff | 181 ------------------------------
6 files changed, 9 insertions(+), 339 deletions(-)
New commits:
commit 03267a1fa3919f42565c6ece7ac3ecc407db8215
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Sat Oct 2 12:06:26 2010 -0400
Adjusted patches to make them apply again.
modified: patches/dev300/apply
modified: patches/dev300/disable-checkdeliver.diff
deleted: patches/dev300/nlpsolver-build.diff
modified: patches/vba/cws-vbasupportdev300.diff
modified: patches/vba/fix-name-range-separator.diff
modified: patches/vba/vba-rangecell-colparam.diff
diff --git a/patches/dev300/apply b/patches/dev300/apply
index c736a84..53a7f7a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2030,10 +2030,6 @@ scp2_extensions-gdocs_2.1.0_modified_installation.diff, pmladek
# ConvertTextToNumber extension build bits (fate#307906)
ct2n-build.diff, pmladek
-[ NLPSolverBits ]
-# Solver for Nonlinear Programming extension build bits (fate#304653)
-nlpsolver-build.diff, pmladek
-
[ OxygenOfficeDefaultSettings ]
# Always enable extended tips
i27928-extended-tips-on.diff
diff --git a/patches/dev300/disable-checkdeliver.diff b/patches/dev300/disable-checkdeliver.diff
index 19fce72..2d5d0a0 100644
--- a/patches/dev300/disable-checkdeliver.diff
+++ b/patches/dev300/disable-checkdeliver.diff
@@ -1,19 +1,12 @@
----
- postprocess/prj/build.lst | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
diff --git postprocess/prj/build.lst postprocess/prj/build.lst
-index c40d984..9a052b9 100644
+index c760129..26fb92d 100644
--- postprocess/prj/build.lst
+++ postprocess/prj/build.lst
@@ -1,7 +1,6 @@
- po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL
+ po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NLPSOLVER:nlpsolver NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
-po postprocess\checkdeliver nmake - all po_checkdlv NULL
po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL
po postprocess\packregistry nmake - all po_packregistry NULL
po postprocess\rebase nmake - w po_rebase NULL
---
-1.7.0.1
-
diff --git a/patches/dev300/nlpsolver-build.diff b/patches/dev300/nlpsolver-build.diff
deleted file mode 100644
index 986c0b1..0000000
--- a/patches/dev300/nlpsolver-build.diff
+++ /dev/null
@@ -1,144 +0,0 @@
-diff -purN nlpsolver.old/makefile.mk nlpsolver/makefile.mk
---- nlpsolver.old/makefile.mk 1970-01-01 01:00:00.000000000 +0100
-+++ nlpsolver/makefile.mk 2009-10-26 22:34:07.000000000 +0100
-@@ -0,0 +1,73 @@
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# Copyright 2008 by Sun Microsystems, Inc.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# $RCSfile: makefile.mk,v $
-+#
-+# $Revision: 1.10 $
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org. If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+
-+PRJ=.
-+
-+PRJNAME=nlpsolver
-+TARGET=nlpsolver
-+
-+.IF "$(SOLAR_JAVA)"!=""
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE : settings.mk
-+.INCLUDE : antsettings.mk
-+
-+# --- Files --------------------------------------------------------
-+
-+TARFILE_MD5=90401bca927835b6fbae4a707ed187c8
-+TARFILE_NAME=nlpsolver-0.9
-+TARFILE_ROOTDIR=nlpsolver-0.9
-+
-+#ADDITIONAL_FILES= \
-+# toolsrc/org/mozilla/javascript/tools/debugger/OfficeScriptInfo.java
-+
-+PATCH_FILES=nlpsolver-0.9.patch
-+
-+ANT_FLAGS+=-Dplatforms.JDK_1.5.home=$(JAVA_HOME) -Doffice.program.dir=$(SOLARBINDIR)
-+
-+.IF "$(JAVACISGCJ)"=="yes"
-+JAVA_HOME=
-+.EXPORT : JAVA_HOME
-+BUILD_ACTION=$(ANT) $(ANT_FLAGS) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj uno-package
-+.ELSE
-+BUILD_ACTION=$(ANT) $(ANT_FLAGS) -Dbuild.label="build-$(RSCREVISION)" -Dplatforms.JDK_1.5.home=$(JAVA_HOME) -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) uno-package
-+.ENDIF
-+
-+# --- Targets ------------------------------------------------------
-+
-+.INCLUDE : set_ext.mk
-+.INCLUDE : target.mk
-+.INCLUDE : tg_ext.mk
-+
-+.ELSE
-+all:
-+ @echo java disabled
-+.ENDIF
-diff -purN nlpsolver.old/nlpsolver-0.9.patch nlpsolver/nlpsolver-0.9.patch
---- nlpsolver.old/nlpsolver-0.9.patch 1970-01-01 01:00:00.000000000 +0100
-+++ nlpsolver/nlpsolver-0.9.patch 2009-10-26 22:32:49.000000000 +0100
-@@ -0,0 +1,51 @@
-+--- misc/nlpsolver-0.9/nbproject/build-uno-impl.xml.old 2009-03-30 18:32:00.000000000 +0200
-++++ misc/build/nlpsolver-0.9/nbproject/build-uno-impl.xml 2009-10-28 18:22:40.000000000 +0100
-+@@ -197,7 +197,7 @@
-+ <!-- enter the class path with external jars, if external jars exit and the user did not enter his own -->
-+ <target name="-do-class-path" depends="-external-jars,-check-class-path" unless="class.path.exists">
-+ <manifest file="${build.dir}/MANIFEST.MF" mode="update">
-+- <attribute name="Class-Path" value="${external.jars}"/>
-++ <attribute name="Class-Path" value="${external.jar.dir}/EvolutionarySolver.jar"/>
-+ </manifest>
-+ </target>
-+ <target name="-check-class-path">
-+--- misc/nlpsolver-0.9/nbproject/project.properties.old 2009-03-30 18:32:00.000000000 +0200
-++++ misc/build/nlpsolver-0.9/nbproject/project.properties 2009-10-28 18:09:01.000000000 +0100
-+@@ -27,8 +27,10 @@ file.reference.EvolutionarySolver.jar=Th
-+ includes=**
-+ jar.compress=false
-+ javac.classpath=\
-+- ${libs.StarOffice 9.classpath}:\
-+- ${libs.OpenOffice.org 3.0.classpath}:\
-++ ${solar.jar}/juh.jar:\
-++ ${solar.jar}/jurt.jar:\
-++ ${solar.jar}/ridl.jar:\
-++ ${solar.jar}/unoil.jar:\
-+ ${reference.EvolutionarySolver.jar}
-+ # Space-separated list of extra javac options
-+ javac.compilerargs=
-+--- misc/nlpsolver-0.9/nbproject/build-impl.xml.old 2009-03-30 18:32:00.000000000 +0200
-++++ misc/build/nlpsolver-0.9/nbproject/build-impl.xml 2009-10-28 18:19:53.000000000 +0100
-+@@ -360,6 +360,8 @@ is divided into following sections:
-+ -->
-+ <target depends="init" name="deps-jar" unless="no.deps">
-+ <ant antfile="${project.EvolutionarySolver}/build.xml" inheritall="false" target="jar"/>
-++ <mkdir dir="${dist.dir}/${external.jar.dir}"/>
-++ <copy file="${reference.EvolutionarySolver.jar}" todir="${dist.dir}/${external.jar.dir}"/>
-+ </target>
-+ <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
-+ <target depends="init" name="-check-automatic-build">
-+--- misc/nlpsolver-0.9/src/description.xml.old 2009-03-30 16:56:42.000000000 +0200
-++++ misc/build/nlpsolver-0.9/src/description.xml 2009-10-28 18:29:13.000000000 +0100
-+@@ -12,11 +12,6 @@
-+ <extension-description>
-+ <src lang="en" xlink:href="description/extensiondescription.txt"/>
-+ </extension-description>
-+- <registration>
-+- <simple-license accept-by="admin" default-license-id="en">
-+- <license-text lang="en" license-id="en" xlink:href="licenses/lgpl-3.0.txt"/>
-+- </simple-license>
-+- </registration>
-+ <dependencies>
-+ <OpenOffice.org-minimal-version xmlns:d="http://openoffice.org/extensions/description/2006" d:name="OpenOffice.org 3.0" value="3.0"/>
-+ </dependencies>
-diff -purN nlpsolver.old/prj/build.lst nlpsolver/prj/build.lst
---- nlpsolver.old/prj/build.lst 1970-01-01 01:00:00.000000000 +0100
-+++ nlpsolver/prj/build.lst 2009-10-26 20:50:12.000000000 +0100
-@@ -0,0 +1,3 @@
-+nlpsolver nlpsolver : javaunohelper unoil jurt NULL NULL
-+nlpsolver nlpsolver usr1 - all nlpsolver_mkout NULL
-+nlpsolver nlpsolver nmake - all nlpsolver_nlpsolver NULL
-diff -purN nlpsolver.old/prj/d.lst nlpsolver/prj/d.lst
---- nlpsolver.old/prj/d.lst 1970-01-01 01:00:00.000000000 +0100
-+++ nlpsolver/prj/d.lst 2009-10-26 22:12:02.000000000 +0100
-@@ -0,0 +1 @@
-+..\%__SRC%\misc\build\nlpsolver-0.9/dist\NLPSolver.oxt %_DEST%\bin%_EXT%\NLPSolver.oxt
diff --git a/patches/vba/cws-vbasupportdev300.diff b/patches/vba/cws-vbasupportdev300.diff
index fd4f0d7..32f8333 100644
--- a/patches/vba/cws-vbasupportdev300.diff
+++ b/patches/vba/cws-vbasupportdev300.diff
@@ -12222,8 +12222,8 @@ index 0fcda21..770a5cc 100644
--- sc/inc/table.hxx
+++ sc/inc/table.hxx
@@ -87,6 +87,8 @@ class ScFlatBoolRowSegments;
- class ScFlatBoolColSegments;
- struct ScSetStringParam;
+ struct ScColWidthParam;
+ struct ScColWidthParam;
+typedef std::hash_map< ::rtl::OUString, rtl::OUString, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > NameToNameMap;
+
@@ -23340,8 +23340,8 @@ index 14f0bde..50b18ba 100644
+#include <com/sun/star/table/CellAddress.hpp>
+#include "vbaquerytable.hxx" //09-09-18 add by limingl
- //#include <vbahelper/vbahelperinterface.hxx>
#include "vbaformat.hxx"
+ #include <formula/grammar.hxx>
@@ -99,6 +102,7 @@ class ScVbaRange : public ScVbaRange_BASE
sal_Bool mbIsRows;
sal_Bool mbIsColumns;
diff --git a/patches/vba/fix-name-range-separator.diff b/patches/vba/fix-name-range-separator.diff
index 9588923..0990d06 100644
--- a/patches/vba/fix-name-range-separator.diff
+++ b/patches/vba/fix-name-range-separator.diff
@@ -15,9 +15,9 @@ index d9cc4ea..2e6eae1 100644
ScDocument* pDoc = NULL;
@@ -1054,7 +1054,7 @@ getCellRangesForAddress( USHORT& rResFlags, const rtl::OUString& sAddress, ScDoc
+ pDoc = pDocSh->GetDocument();
String aString(sAddress);
USHORT nMask = SCA_VALID;
- //USHORT nParse = rCellRanges.Parse( sAddress, pDoc, nMask, formula::FormulaGrammar::CONV_XL_A1 );
- rResFlags = rCellRanges.Parse( sAddress, pDoc, nMask, eConv, 0 );
+ rResFlags = rCellRanges.Parse( sAddress, pDoc, nMask, eConv, cDelimiter );
if ( rResFlags & SCA_VALID )
diff --git a/patches/vba/vba-rangecell-colparam.diff b/patches/vba/vba-rangecell-colparam.diff
index c7baf4e..3f2a23e 100644
--- a/patches/vba/vba-rangecell-colparam.diff
+++ b/patches/vba/vba-rangecell-colparam.diff
@@ -1,8 +1,8 @@
diff --git sc/source/ui/vba/vbarange.cxx sc/source/ui/vba/vbarange.cxx
-index 1dfbc79..f05b533 100755
+index e67766e..aa7e0bc 100755
--- sc/source/ui/vba/vbarange.cxx
+++ sc/source/ui/vba/vbarange.cxx
-@@ -2187,7 +2187,7 @@ ScVbaRange::Cells( const uno::Any &nRowIndex, const uno::Any &nColumnIndex ) thr
+@@ -2185,7 +2185,7 @@ ScVbaRange::Cells( const uno::Any &nRowIndex, const uno::Any &nColumnIndex ) thr
}
catch( uno::Exception& ) {}
}
@@ -11,7 +11,7 @@ index 1dfbc79..f05b533 100755
{
uno::Reference< script::XTypeConverter > xConverter = getTypeConverter( mxContext );
uno::Any aConverted;
-@@ -2198,27 +2198,45 @@ ScVbaRange::Cells( const uno::Any &nRowIndex, const uno::Any &nColumnIndex ) thr
+@@ -2196,27 +2196,45 @@ ScVbaRange::Cells( const uno::Any &nRowIndex, const uno::Any &nColumnIndex ) thr
}
catch( uno::Exception& ) {} // silence any errors
}
@@ -73,178 +73,3 @@ index 1dfbc79..f05b533 100755
RangeHelper thisRange( mxRange );
table::CellRangeAddress thisRangeAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
uno::Reference< table::XCellRange > xSheetRange = thisRange.getCellRangeFromSheet();
-diff --git sc/source/ui/vba/vbarange.cxx.orig sc/source/ui/vba/vbarange.cxx.orig
-index ac5a183..1dfbc79 100755
---- sc/source/ui/vba/vbarange.cxx.orig
-+++ sc/source/ui/vba/vbarange.cxx.orig
-@@ -50,6 +50,7 @@
- #include <com/sun/star/sheet/XSheetCellCursor.hpp>
- #include <com/sun/star/sheet/XArrayFormulaRange.hpp>
- #include <com/sun/star/sheet/XNamedRange.hpp>
-+#include <com/sun/star/sheet/XNamedRanges.hpp>
- #include <com/sun/star/sheet/XPrintAreas.hpp>
- #include <com/sun/star/sheet/XCellRangesQuery.hpp>
- #include <com/sun/star/beans/XPropertySet.hpp>
-@@ -176,6 +177,8 @@
-
- #include "vbaglobals.hxx"
- #include "vbastyle.hxx"
-+#include "vbaname.hxx"
-+#include "vbanames.hxx"
- #include <vector>
- #include <vbahelper/vbacollectionimpl.hxx>
- // begin test includes
-@@ -1078,7 +1081,7 @@ public:
- };
-
- bool
--getCellRangesForAddress( USHORT& rResFlags, const rtl::OUString& sAddress, ScDocShell* pDocSh, ScRangeList& rCellRanges, formula::FormulaGrammar::AddressConvention& eConv )
-+getCellRangesForAddress( USHORT& rResFlags, const rtl::OUString& sAddress, ScDocShell* pDocSh, ScRangeList& rCellRanges, formula::FormulaGrammar::AddressConvention& eConv, char cDelimiter = 0 )
- {
-
- ScDocument* pDoc = NULL;
-@@ -1088,7 +1091,7 @@ getCellRangesForAddress( USHORT& rResFlags, const rtl::OUString& sAddress, ScDoc
- String aString(sAddress);
- USHORT nMask = SCA_VALID;
- //USHORT nParse = rCellRanges.Parse( sAddress, pDoc, nMask, formula::FormulaGrammar::CONV_XL_A1 );
-- rResFlags = rCellRanges.Parse( sAddress, pDoc, nMask, eConv, 0 );
-+ rResFlags = rCellRanges.Parse( sAddress, pDoc, nMask, eConv, cDelimiter );
- if ( rResFlags & SCA_VALID )
- {
- return true;
-@@ -1141,6 +1144,7 @@ bool getScRangeListForAddress( const rtl::OUString& sName, ScDocShell* pDocSh, S
- }
- }
- }
-+ char aChar = 0;
- if ( xNameAccess->hasByName( sAddress ) )
- {
- uno::Reference< sheet::XNamedRange > xNamed( xNameAccess->getByName( sAddress ), uno::UNO_QUERY_THROW );
-@@ -1148,10 +1152,11 @@ bool getScRangeListForAddress( const rtl::OUString& sName, ScDocShell* pDocSh, S
- // As the address comes from OOO, the addressing
- // style is may not be XL_A1
- eConv = pDocSh->GetDocument()->GetAddressConvention();
-+ aChar = ';';
- }
-
- USHORT nFlags = 0;
-- if ( !getCellRangesForAddress( nFlags, sAddress, pDocSh, aCellRanges, eConv ) )
-+ if ( !getCellRangesForAddress( nFlags, sAddress, pDocSh, aCellRanges, eConv, aChar ) )
- return false;
-
- bool bTabFromReferrer = !( nFlags & SCA_TAB_3D );
-@@ -1470,7 +1475,53 @@ ScVbaRange::visitArray( ArrayVisitor& visitor )
- }
- }
-
-+uno::Any SAL_CALL ScVbaRange::getName() throw (uno::RuntimeException)
-+{
-+ uno::Reference< excel::XName > xName;
-+
-+ ScDocShell* pDocShell = getScDocShell();
-+ uno::Reference< frame::XModel > xModel = pDocShell ? pDocShell->GetModel() : NULL;
-+ if ( !xModel.is() )
-+ {
-+ throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid document" ), uno::Reference< uno::XInterface >() );
-+ }
-+ uno::Reference< beans::XPropertySet > xPropertySet( xModel, uno::UNO_QUERY_THROW );
-+ uno::Reference< sheet::XNamedRanges > xNamedRanges( xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("NamedRanges")) , uno::UNO_QUERY_THROW );
-
-+ uno::Reference< excel::XNames > xNames( new ScVbaNames( uno::Reference< XHelperInterface >(), mxContext , xNamedRanges , xModel ) );
-+ sal_Int32 nCount = xNames->getCount();
-+ ScCellRangesBase* pUnoRangesBase = getCellRangesBase();
-+ if ( pUnoRangesBase && nCount > 0 )
-+ {
-+ ScRangeList aRangeList = pUnoRangesBase->GetRangeList();
-+ for ( sal_Int32 nIndex = 0; nIndex < nCount; nIndex++ )
-+ {
-+ uno::Reference< excel::XName > xTmpName( xNames->Item( uno::makeAny( nIndex + 1 ), uno::Any() ), uno::UNO_QUERY );
-+ if ( xTmpName.is() )
-+ {
-+ try
-+ {
-+ uno::Reference< excel::XRange > xRange = xTmpName->getRefersToRange();
-+ if ( xRange.is() )
-+ {
-+ ScVbaRange* pRange = dynamic_cast< ScVbaRange* >( xRange.get() );
-+ ScCellRangesBase* pCurRangesBase = pRange ? pRange->getCellRangesBase() : NULL;
-+ if ( pCurRangesBase && aRangeList == pCurRangesBase->GetRangeList() )
-+ {
-+ xName = xTmpName;
-+ break;
-+ }
-+ }
-+ }
-+ catch (const uno::Exception&)
-+ {
-+ }
-+ }
-+ }
-+ }
-+
-+ return uno::makeAny( xName );
-+}
-
- uno::Any
- ScVbaRange::getValue( ValueGetter& valueGetter) throw (uno::RuntimeException)
-@@ -2127,24 +2178,42 @@ ScVbaRange::Cells( const uno::Any &nRowIndex, const uno::Any &nColumnIndex ) thr
- // set in the Any, we should convert as appropriate
- // #FIXME - perhaps worth turning this into some sort of
- // convertion routine e.g. bSuccess = getValueFromAny( nRow, nRowIndex, getCppuType((sal_Int32*)0) )
-- if ( nRowIndex.hasValue() && !( nRowIndex >>= nRow ) )
-+ uno::Any aRowIndexAny = nRowIndex;
-+ if ( aRowIndexAny.getValueTypeClass() == uno::TypeClass_INTERFACE )
-+ {
-+ try
-+ {
-+ aRowIndexAny = getDefaultPropByIntrospection( aRowIndexAny );
-+ }
-+ catch( uno::Exception& ) {}
-+ }
-+ if ( aRowIndexAny.hasValue() && !( aRowIndexAny >>= nRow ) )
- {
- uno::Reference< script::XTypeConverter > xConverter = getTypeConverter( mxContext );
- uno::Any aConverted;
- try
- {
-- aConverted = xConverter->convertTo( nRowIndex, getCppuType((sal_Int32*)0) );
-+ aConverted = xConverter->convertTo( aRowIndexAny, getCppuType((sal_Int32*)0) );
- bIsIndex = ( aConverted >>= nRow );
- }
- catch( uno::Exception& ) {} // silence any errors
- }
-- if ( bIsColumnIndex && !( nColumnIndex >>= nColumn ) )
-+ uno::Any aColumnAny = nColumnIndex;
-+ if ( aColumnAny.getValueTypeClass() == uno::TypeClass_INTERFACE )
-+ {
-+ try
-+ {
-+ aColumnAny = getDefaultPropByIntrospection( aColumnAny );
-+ }
-+ catch( uno::Exception& ) {}
-+ }
-+ if ( bIsColumnIndex && !( aColumnAny >>= nColumn ) )
- {
- uno::Reference< script::XTypeConverter > xConverter = getTypeConverter( mxContext );
- uno::Any aConverted;
- try
- {
-- aConverted = xConverter->convertTo( nColumnIndex, getCppuType((sal_Int32*)0) );
-+ aConverted = xConverter->convertTo( aColumnAny, getCppuType((sal_Int32*)0) );
- bIsColumnIndex = ( aConverted >>= nColumn );
- }
- catch( uno::Exception& ) {} // silence any errors
-@@ -2461,9 +2530,11 @@ ScVbaRange::Copy(const ::uno::Any& Destination) throw (uno::RuntimeException)
- }
- else
- {
-+ ScRange aRange;
-+ RangeHelper thisRange( mxRange );
-+ ScUnoConversion::FillScRange( aRange, thisRange.getCellRangeAddressable()->getRangeAddress() );
- uno::Reference< frame::XModel > xModel = excel::GetModelFromRange( mxRange );
-- Select();
-- excel::implnCopy( xModel );
-+ excel::implnCopyRange( xModel, aRange );
- }
- }
-
More information about the ooo-build-commit
mailing list