[ooo-build-commit] .: 3 commits - patches/dev300 patches/vba
Noel Power
noelp at kemper.freedesktop.org
Fri Aug 6 08:33:59 PDT 2010
patches/dev300/apply | 4
patches/vba/cws-vbasupportdev300.diff | 1514 ++++++++++++-----------------
patches/vba/oox-insert-module-bug.diff | 17
patches/vba/vba-misc-tweakupstream-m2.diff | 36
4 files changed, 690 insertions(+), 881 deletions(-)
New commits:
commit 34b0268c12ad559346127a8c64b17f5703593357
Author: Noel Power <noel.power at novell.com>
Date: Fri Aug 6 15:41:41 2010 +0100
fix some failed patch applies ( that screwed up generating this patch )
* patches/vba/cws-vbasupportdev300.diff:
diff --git a/patches/vba/cws-vbasupportdev300.diff b/patches/vba/cws-vbasupportdev300.diff
index 22f7349..cd9248b 100644
--- a/patches/vba/cws-vbasupportdev300.diff
+++ b/patches/vba/cws-vbasupportdev300.diff
@@ -14441,7 +14441,7 @@ diff --git sc/source/filter/excel/excimp8.cxx sc/source/filter/excel/excimp8.cxx
index 3101922..b6d5e5e 100644
--- sc/source/filter/excel/excimp8.cxx
+++ sc/source/filter/excel/excimp8.cxx
-@@ -96,11 +96,14 @@
+@@ -100,15 +100,20 @@
#include "stlpool.hxx"
#include "stlsheet.hxx"
#include "detfunc.hxx"
@@ -14456,9 +14456,6 @@ index 3101922..b6d5e5e 100644
using namespace com::sun::star;
using ::rtl::OUString;
-@@ -109,6 +109,8 @@
- using namespace com::sun::star;
- using ::rtl::OUString;
+// defined in docfunc.cxx ( really this needs a new name )
+script::ModuleInfo lcl_InitModuleInfo( SfxObjectShell& rDocSh, String& sModule );
@@ -18241,7 +18238,7 @@ index 4bea38e..fa1d4ee 100644
}
aRet <<= rtl::OUString( aFormatStr );
diff --git sc/source/ui/unoobj/docuno.cxx sc/source/ui/unoobj/docuno.cxx
-index ea2f8f4..34f7688 100644
+index ea2f8f4..1299abd 100644
--- sc/source/ui/unoobj/docuno.cxx
+++ sc/source/ui/unoobj/docuno.cxx
@@ -104,7 +104,12 @@
@@ -18332,28 +18329,14 @@ index ea2f8f4..34f7688 100644
// XServiceInfo
rtl::OUString SAL_CALL ScModelObj::getImplementationName() throw(uno::RuntimeException)
-diff --git sc/source/ui/unoobj/docuno.cxx.rej sc/source/ui/unoobj/docuno.cxx.rej
-new file mode 100644
-index 0000000..3ca37b4
---- /dev/null
-+++ sc/source/ui/unoobj/docuno.cxx.rej
-@@ -0,0 +1,16 @@
-+*************** sal_Int64 SAL_CALL ScModelObj::getSomething(
-+*** 2085,2091 ****
-+ {
-+ return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(pDocShell ));
-+ }
-+-
-+ // aggregated number formats supplier has XUnoTunnel, too
-+ // interface from aggregated object must be obtained via queryAggregation
-+
-+--- 2137,2142 ----
-+ {
-+ return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(pDocShell ));
-+ }
-+ // aggregated number formats supplier has XUnoTunnel, too
-+ // interface from aggregated object must be obtained via queryAggregation
-+
+@@ -2085,7 +2137,6 @@ sal_Int64 SAL_CALL ScModelObj::getSomething(
+ {
+ return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(pDocShell ));
+ }
+-
+ // aggregated number formats supplier has XUnoTunnel, too
+ // interface from aggregated object must be obtained via queryAggregation
+
diff --git sc/source/ui/unoobj/servuno.cxx sc/source/ui/unoobj/servuno.cxx
index b28c401..d6cb431 100644
--- sc/source/ui/unoobj/servuno.cxx
@@ -19080,7 +19063,7 @@ index ce6ba35..0f82c27 100644
}
#endif
diff --git sc/source/ui/vba/makefile.mk sc/source/ui/vba/makefile.mk
-index 0b29e05..e6b7bc5 100644
+index 0b29e05..2a692b9 100644
--- sc/source/ui/vba/makefile.mk
+++ sc/source/ui/vba/makefile.mk
@@ -31,7 +31,7 @@ PRJNAME=sc
@@ -19108,66 +19091,39 @@ index 0b29e05..e6b7bc5 100644
$(SLO)$/vbachart.obj\
$(SLO)$/vbachartobject.obj\
$(SLO)$/vbachartobjects.obj\
-diff --git sc/source/ui/vba/makefile.mk.rej sc/source/ui/vba/makefile.mk.rej
-new file mode 100644
-index 0000000..5990846
---- /dev/null
-+++ sc/source/ui/vba/makefile.mk.rej
-@@ -0,0 +1,54 @@
-+*************** SLOFILES= \
-+*** 81,86 ****
-+ $(SLO)$/vbaoleobject.obj \
-+ $(SLO)$/vbaoleobjects.obj \
-+ $(SLO)$/vbatextboxshape.obj \
-+ $(SLO)$/vbapane.obj \
-+ $(SLO)$/vbatextframe.obj \
-+ $(SLO)$/vbacharttitle.obj \
-+--- 83,89 ----
-+ $(SLO)$/vbaoleobject.obj \
-+ $(SLO)$/vbaoleobjects.obj \
-+ $(SLO)$/vbatextboxshape.obj \
-++ $(SLO)$/vbacommentshape.obj \
-+ $(SLO)$/vbapane.obj \
-+ $(SLO)$/vbatextframe.obj \
-+ $(SLO)$/vbacharttitle.obj \
-+*************** SLOFILES= \
-+*** 95,106 ****
-+ $(SLO)$/vbastyle.obj \
-+ $(SLO)$/vbastyles.obj \
-+ $(SLO)$/vbaassistant.obj \
-+ $(SLO)$/vbahyperlink.obj \
-+ $(SLO)$/vbahyperlinks.obj \
-+ $(SLO)$/vbapagesetup.obj \
-+ $(SLO)$/vbapagebreak.obj \
-+ $(SLO)$/vbapagebreaks.obj \
-+- $(SLO)$/service.obj
-+ .ENDIF
-+ # --- Targets ------------------------------------------------------
-+
-+--- 98,120 ----
-+ $(SLO)$/vbastyle.obj \
-+ $(SLO)$/vbastyles.obj \
-+ $(SLO)$/vbaassistant.obj \
-++ $(SLO)$/vbafilesearch.obj \
-++ $(SLO)$/vbafoundfiles.obj \
-+ $(SLO)$/vbahyperlink.obj \
-+ $(SLO)$/vbahyperlinks.obj \
-+ $(SLO)$/vbapagesetup.obj \
-+ $(SLO)$/vbapagebreak.obj \
-+ $(SLO)$/vbapagebreaks.obj \
-++ $(SLO)$/service.obj \
-++ $(SLO)$/vbaeventshelper.obj \
-++ $(SLO)$/vbamenubar.obj \
-++ $(SLO)$/vbamenubars.obj \
-++ $(SLO)$/vbamenu.obj \
-++ $(SLO)$/vbamenus.obj \
-++ $(SLO)$/vbamenuitem.obj \
-++ $(SLO)$/vbamenuitems.obj \
-++ $(SLO)$/vbafiledialogselecteditems.obj \
-++
-+ .ENDIF
-+ # --- Targets ------------------------------------------------------
-+
+@@ -83,6 +85,7 @@ SLOFILES= \
+ $(SLO)$/vbaoleobject.obj \
+ $(SLO)$/vbaoleobjects.obj \
+ $(SLO)$/vbatextboxshape.obj \
++ $(SLO)$/vbacommentshape.obj \
+ $(SLO)$/vbapane.obj \
+ $(SLO)$/vbatextframe.obj \
+ $(SLO)$/vbacharttitle.obj \
+@@ -97,12 +100,23 @@ SLOFILES= \
+ $(SLO)$/vbastyle.obj \
+ $(SLO)$/vbastyles.obj \
+ $(SLO)$/vbaassistant.obj \
++ $(SLO)$/vbafilesearch.obj \
++ $(SLO)$/vbafoundfiles.obj \
+ $(SLO)$/vbahyperlink.obj \
+ $(SLO)$/vbahyperlinks.obj \
+ $(SLO)$/vbapagesetup.obj \
+ $(SLO)$/vbapagebreak.obj \
+ $(SLO)$/vbapagebreaks.obj \
+- $(SLO)$/service.obj
++ $(SLO)$/service.obj \
++ $(SLO)$/vbaeventshelper.obj \
++ $(SLO)$/vbamenubar.obj \
++ $(SLO)$/vbamenubars.obj \
++ $(SLO)$/vbamenu.obj \
++ $(SLO)$/vbamenus.obj \
++ $(SLO)$/vbamenuitem.obj \
++ $(SLO)$/vbamenuitems.obj \
++ $(SLO)$/vbafiledialogselecteditems.obj \
++
+ .ENDIF
+ # --- Targets ------------------------------------------------------
+
diff --git sc/source/ui/vba/service.cxx sc/source/ui/vba/service.cxx
index ab09d2c..22d3329 100644
--- sc/source/ui/vba/service.cxx
@@ -25240,7 +25196,7 @@ index 0000000..9c05e9a
+
+#endif
diff --git sc/source/ui/vba/vbarange.cxx sc/source/ui/vba/vbarange.cxx
-index ef4bb43..fb9fe6d 100644
+index ef4bb43..e2abbf3 100644
--- sc/source/ui/vba/vbarange.cxx
+++ sc/source/ui/vba/vbarange.cxx
@@ -43,7 +43,6 @@
@@ -25539,7 +25495,21 @@ index ef4bb43..fb9fe6d 100644
else
isExtracted = false;
break;
-@@ -1088,11 +1063,10 @@ public:
+@@ -840,9 +815,10 @@ protected:
+ double aDblValue = 0.0;
+ if ( aValue >>= sFormula )
+ {
+- // convert to CONV_OOO style formula string because XCell::setFormula
+- // always compile it in CONV_OOO style. Perhaps css.sheet.FormulaParser
+- // should be used in future to directly pass formula tokens.
++ // convert to GRAM_PODF_A1 style grammar because XCell::setFormula
++ // always compile it in that grammar. Perhaps
++ // css.sheet.FormulaParser should be used in future to directly
++ // pass formula tokens when that API stabilizes.
+ if ( m_eGrammar != formula::FormulaGrammar::GRAM_PODF_A1 && ( sFormula.trim().indexOf('=') == 0 ) )
+ {
+ uno::Reference< uno::XInterface > xIf( xCell, uno::UNO_QUERY_THROW );
+@@ -1088,11 +1064,10 @@ public:
return uno::Reference< sheet::XSheetCellCursor >( getSpreadSheet()->createCursorByRange( getSheetCellRange() ), uno::UNO_QUERY_THROW );
}
@@ -25555,7 +25525,7 @@ index ef4bb43..fb9fe6d 100644
xRange->getCellRangeByPosition(
xCellRangeAddressable->getRangeAddress().StartColumn + nStartColOffset,
xCellRangeAddressable->getRangeAddress().StartRow + nStartRowOffset,
-@@ -1148,6 +1122,24 @@ bool getScRangeListForAddress( const rtl::OUString& sName, ScDocShell* pDocSh, S
+@@ -1148,6 +1123,24 @@ bool getScRangeListForAddress( const rtl::OUString& sName, ScDocShell* pDocSh, S
formula::FormulaGrammar::AddressConvention eConv = aConv;
// spaces are illegal ( but the user of course can enter them )
rtl::OUString sAddress = (*it).trim();
@@ -25580,7 +25550,7 @@ index ef4bb43..fb9fe6d 100644
if ( xNameAccess->hasByName( sAddress ) )
{
uno::Reference< sheet::XNamedRange > xNamed( xNameAccess->getByName( sAddress ), uno::UNO_QUERY_THROW );
-@@ -1241,7 +1233,7 @@ uno::Reference< sheet::XSheetCellRangeContainer > lclExpandToMerged( const uno::
+@@ -1241,7 +1234,7 @@ uno::Reference< sheet::XSheetCellRangeContainer > lclExpandToMerged( const uno::
ScUnoConversion::FillScRange( aScRange, aRangeAddr );
aScRanges.Append( aScRange );
}
@@ -25589,7 +25559,7 @@ index ef4bb43..fb9fe6d 100644
}
void lclExpandAndMerge( const uno::Reference< table::XCellRange >& rxCellRange, bool bMerge ) throw (uno::RuntimeException)
-@@ -1275,7 +1267,7 @@ util::TriState lclGetMergedState( const uno::Reference< table::XCellRange >& rxC
+@@ -1275,7 +1268,7 @@ util::TriState lclGetMergedState( const uno::Reference< table::XCellRange >& rxC
of a merged range is part of this range are not covered. */
ScRange aScRange;
ScUnoConversion::FillScRange( aScRange, aRangeAddr );
@@ -25598,7 +25568,7 @@ index ef4bb43..fb9fe6d 100644
return bHasMerged ? util::TriState_INDETERMINATE : util::TriState_NO;
}
-@@ -1292,6 +1284,28 @@ ScVbaRange::getRangeObjectForName( const css::uno::Reference< ov::XHelperInterfa
+@@ -1292,6 +1285,28 @@ ScVbaRange::getRangeObjectForName( const css::uno::Reference< ov::XHelperInterfa
return getRangeForName( xParent, xContext, sRangeName, pDocSh, refAddr, eConv );
}
@@ -25627,7 +25597,7 @@ index ef4bb43..fb9fe6d 100644
table::CellRangeAddress getCellRangeAddressForVBARange( const uno::Any& aParam, ScDocShell* pDocSh, formula::FormulaGrammar::AddressConvention aConv = formula::FormulaGrammar::CONV_XL_A1) throw ( uno::RuntimeException )
{
-@@ -1319,7 +1333,14 @@ table::CellRangeAddress getCellRangeAddressForVBARange( const uno::Any& aParam,
+@@ -1319,7 +1334,14 @@ table::CellRangeAddress getCellRangeAddressForVBARange( const uno::Any& aParam,
uno::Reference< excel::XRange > xRange;
aParam >>= xRange;
if ( xRange.is() )
@@ -25642,7 +25612,7 @@ index ef4bb43..fb9fe6d 100644
break;
}
default:
-@@ -1332,7 +1353,7 @@ uno::Reference< XCollection >
+@@ -1332,7 +1354,7 @@ uno::Reference< XCollection >
lcl_setupBorders( const uno::Reference< excel::XRange >& xParentRange, const uno::Reference<uno::XComponentContext>& xContext, const uno::Reference< table::XCellRange >& xRange ) throw( uno::RuntimeException )
{
uno::Reference< XHelperInterface > xParent( xParentRange, uno::UNO_QUERY_THROW );
@@ -25651,7 +25621,7 @@ index ef4bb43..fb9fe6d 100644
if ( !pDoc )
throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Failed to access document from shell" ) ), uno::Reference< uno::XInterface >() );
ScVbaPalette aPalette( pDoc->GetDocumentShell() );
-@@ -1340,25 +1361,38 @@ lcl_setupBorders( const uno::Reference< excel::XRange >& xParentRange, const uno
+@@ -1340,25 +1362,38 @@ lcl_setupBorders( const uno::Reference< excel::XRange >& xParentRange, const uno
return borders;
}
@@ -25694,7 +25664,7 @@ index ef4bb43..fb9fe6d 100644
mbIsRows( bIsRows ),
mbIsColumns( bIsColumns )
{
-@@ -1367,17 +1401,17 @@ ScVbaRange::ScVbaRange( const uno::Reference< XHelperInterface >& xParent, const
+@@ -1367,17 +1402,17 @@ ScVbaRange::ScVbaRange( const uno::Reference< XHelperInterface >& xParent, const
if ( !xRange.is() )
throw lang::IllegalArgumentException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "range is not set " ) ), uno::Reference< uno::XInterface >() , 1 );
@@ -25716,7 +25686,7 @@ index ef4bb43..fb9fe6d 100644
}
-@@ -1502,6 +1536,9 @@ ScVbaRange::setValue( const uno::Any &aValue ) throw (uno::RuntimeException)
+@@ -1502,6 +1537,9 @@ ScVbaRange::setValue( const uno::Any &aValue ) throw (uno::RuntimeException)
}
CellValueSetter valueSetter( aValue );
setValue( aValue, valueSetter );
@@ -25726,7 +25696,7 @@ index ef4bb43..fb9fe6d 100644
}
void
-@@ -1509,6 +1546,9 @@ ScVbaRange::Clear() throw (uno::RuntimeException)
+@@ -1509,6 +1547,9 @@ ScVbaRange::Clear() throw (uno::RuntimeException)
{
sal_Int32 nFlags = sheet::CellFlags::VALUE | sheet::CellFlags::STRING | sheet::CellFlags::HARDATTR | sheet::CellFlags::FORMATTED | sheet::CellFlags::EDITATTR | sheet::CellFlags::FORMULA;
ClearContents( nFlags );
@@ -25736,7 +25706,7 @@ index ef4bb43..fb9fe6d 100644
}
//helper ClearContent
-@@ -1549,6 +1589,9 @@ ScVbaRange::ClearContents() throw (uno::RuntimeException)
+@@ -1549,6 +1590,9 @@ ScVbaRange::ClearContents() throw (uno::RuntimeException)
sheet::CellFlags::STRING | sheet::CellFlags::DATETIME |
sheet::CellFlags::FORMULA );
ClearContents( nClearFlags );
@@ -25746,7 +25716,7 @@ index ef4bb43..fb9fe6d 100644
}
void
-@@ -1557,6 +1600,9 @@ ScVbaRange::ClearFormats() throw (uno::RuntimeException)
+@@ -1557,6 +1601,9 @@ ScVbaRange::ClearFormats() throw (uno::RuntimeException)
//FIXME: need to check if we need to combine sheet::CellFlags::FORMATTED
sal_Int32 nClearFlags = sheet::CellFlags::HARDATTR | sheet::CellFlags::FORMATTED | sheet::CellFlags::EDITATTR;
ClearContents( nClearFlags );
@@ -25756,7 +25726,7 @@ index ef4bb43..fb9fe6d 100644
}
void
-@@ -1572,6 +1618,9 @@ ScVbaRange::setFormulaValue( const uno::Any& rFormula, formula::FormulaGrammar::
+@@ -1572,6 +1619,9 @@ ScVbaRange::setFormulaValue( const uno::Any& rFormula, formula::FormulaGrammar::
}
CellFormulaValueSetter formulaValueSetter( rFormula, getScDocument(), eGram );
setValue( rFormula, formulaValueSetter );
@@ -25766,7 +25736,7 @@ index ef4bb43..fb9fe6d 100644
}
uno::Any
-@@ -1731,6 +1780,9 @@ ScVbaRange::fillSeries( sheet::FillDirection nFillDirection, sheet::FillMode nFi
+@@ -1731,6 +1781,9 @@ ScVbaRange::fillSeries( sheet::FillDirection nFillDirection, sheet::FillMode nFi
uno::Reference< sheet::XCellSeries > xCellSeries(mxRange, uno::UNO_QUERY_THROW );
xCellSeries->fillSeries( nFillDirection, nFillMode, nFillDateMode, fStep, fEndValue );
@@ -25776,7 +25746,7 @@ index ef4bb43..fb9fe6d 100644
}
void
-@@ -1806,11 +1858,11 @@ ScVbaRange::Offset( const ::uno::Any &nRowOff, const uno::Any &nColOff ) throw (
+@@ -1806,11 +1859,11 @@ ScVbaRange::Offset( const ::uno::Any &nRowOff, const uno::Any &nColOff ) throw (
if ( aCellRanges.Count() > 1 ) // Multi-Area
{
uno::Reference< sheet::XSheetCellRangeContainer > xRanges( new ScCellRangesObj( pUnoRangesBase->GetDocShell(), aCellRanges ) );
@@ -25790,7 +25760,7 @@ index ef4bb43..fb9fe6d 100644
}
uno::Reference< excel::XRange >
-@@ -1831,7 +1883,7 @@ ScVbaRange::CurrentRegion() throw (uno::RuntimeException)
+@@ -1831,7 +1884,7 @@ ScVbaRange::CurrentRegion() throw (uno::RuntimeException)
helper.getSheetCellCursor();
xSheetCellCursor->collapseToCurrentRegion();
uno::Reference< sheet::XCellRangeAddressable > xCellRangeAddressable(xSheetCellCursor, uno::UNO_QUERY_THROW);
@@ -25799,7 +25769,7 @@ index ef4bb43..fb9fe6d 100644
}
uno::Reference< excel::XRange >
-@@ -1851,7 +1903,7 @@ ScVbaRange::CurrentArray() throw (uno::RuntimeException)
+@@ -1851,7 +1904,7 @@ ScVbaRange::CurrentArray() throw (uno::RuntimeException)
helper.getSheetCellCursor();
xSheetCellCursor->collapseToCurrentArray();
uno::Reference< sheet::XCellRangeAddressable > xCellRangeAddressable(xSheetCellCursor, uno::UNO_QUERY_THROW);
@@ -25808,7 +25778,7 @@ index ef4bb43..fb9fe6d 100644
}
uno::Any
-@@ -1870,7 +1922,16 @@ ScVbaRange::getFormulaArray() throw (uno::RuntimeException)
+@@ -1870,7 +1923,16 @@ ScVbaRange::getFormulaArray() throw (uno::RuntimeException)
uno::Reference< sheet::XCellRangeFormula> xCellRangeFormula( mxRange, uno::UNO_QUERY_THROW );
uno::Reference< script::XTypeConverter > xConverter = getTypeConverter( mxContext );
uno::Any aMatrix;
@@ -25826,7 +25796,7 @@ index ef4bb43..fb9fe6d 100644
return aMatrix;
}
-@@ -2069,7 +2130,7 @@ ScVbaRange::Cells( const uno::Any &nRowIndex, const uno::Any &nColumnIndex ) thr
+@@ -2069,7 +2131,7 @@ ScVbaRange::Cells( const uno::Any &nRowIndex, const uno::Any &nColumnIndex ) thr
uno::Reference< table::XCellRange > xSheetRange = thisRange.getCellRangeFromSheet();
if( !bIsIndex && !bIsColumnIndex ) // .Cells
// #FIXE needs proper parent ( Worksheet )
@@ -25835,7 +25805,7 @@ index ef4bb43..fb9fe6d 100644
sal_Int32 nIndex = --nRow;
if( bIsIndex && !bIsColumnIndex ) // .Cells(n)
-@@ -2087,7 +2148,7 @@ ScVbaRange::Cells( const uno::Any &nRowIndex, const uno::Any &nColumnIndex ) thr
+@@ -2087,7 +2149,7 @@ ScVbaRange::Cells( const uno::Any &nRowIndex, const uno::Any &nColumnIndex ) thr
--nColumn;
nRow = nRow + thisRangeAddress.StartRow;
nColumn = nColumn + thisRangeAddress.StartColumn;
@@ -25844,7 +25814,7 @@ index ef4bb43..fb9fe6d 100644
}
void
-@@ -2225,7 +2286,7 @@ ScVbaRange::Rows(const uno::Any& aIndex ) throw (uno::RuntimeException)
+@@ -2225,7 +2287,7 @@ ScVbaRange::Rows(const uno::Any& aIndex ) throw (uno::RuntimeException)
{
ScAddress::Details dDetails( formula::FormulaGrammar::CONV_XL_A1, 0, 0 );
ScRange tmpRange;
@@ -25853,7 +25823,7 @@ index ef4bb43..fb9fe6d 100644
nStartRow = tmpRange.aStart.Row();
nEndRow = tmpRange.aEnd.Row();
-@@ -2239,12 +2300,12 @@ ScVbaRange::Rows(const uno::Any& aIndex ) throw (uno::RuntimeException)
+@@ -2239,12 +2301,12 @@ ScVbaRange::Rows(const uno::Any& aIndex ) throw (uno::RuntimeException)
throw uno::RuntimeException( rtl::OUString::createFromAscii("Internal failure, illegal param"), uno::Reference< uno::XInterface >() );
// return a normal range ( even for multi-selection
uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( pUnoRangesBase->GetDocShell(), aRange ) );
@@ -25869,7 +25839,7 @@ index ef4bb43..fb9fe6d 100644
}
uno::Reference< excel::XRange >
-@@ -2272,7 +2333,7 @@ ScVbaRange::Columns(const uno::Any& aIndex ) throw (uno::RuntimeException)
+@@ -2272,7 +2334,7 @@ ScVbaRange::Columns(const uno::Any& aIndex ) throw (uno::RuntimeException)
{
ScAddress::Details dDetails( formula::FormulaGrammar::CONV_XL_A1, 0, 0 );
ScRange tmpRange;
@@ -25878,7 +25848,7 @@ index ef4bb43..fb9fe6d 100644
nStartCol = tmpRange.aStart.Col();
nEndCol = tmpRange.aEnd.Col();
-@@ -2286,9 +2347,8 @@ ScVbaRange::Columns(const uno::Any& aIndex ) throw (uno::RuntimeException)
+@@ -2286,9 +2348,8 @@ ScVbaRange::Columns(const uno::Any& aIndex ) throw (uno::RuntimeException)
throw uno::RuntimeException( rtl::OUString::createFromAscii("Internal failure, illegal param"), uno::Reference< uno::XInterface >() );
}
// Columns() - no params
@@ -25889,7 +25859,7 @@ index ef4bb43..fb9fe6d 100644
}
void
-@@ -2377,7 +2437,7 @@ ScVbaRange::Copy(const ::uno::Any& Destination) throw (uno::RuntimeException)
+@@ -2377,7 +2438,7 @@ ScVbaRange::Copy(const ::uno::Any& Destination) throw (uno::RuntimeException)
}
else
{
@@ -25898,7 +25868,7 @@ index ef4bb43..fb9fe6d 100644
Select();
excel::implnCopy( xModel );
}
-@@ -2401,8 +2461,9 @@ ScVbaRange::Cut(const ::uno::Any& Destination) throw (uno::RuntimeException)
+@@ -2401,8 +2462,9 @@ ScVbaRange::Cut(const ::uno::Any& Destination) throw (uno::RuntimeException)
uno::Reference< sheet::XCellRangeAddressable > xSource( mxRange, uno::UNO_QUERY);
xMover->moveRange( xDestination->getCellAddress(), xSource->getRangeAddress() );
}
@@ -25910,7 +25880,7 @@ index ef4bb43..fb9fe6d 100644
Select();
excel::implnCut( xModel );
}
-@@ -2473,7 +2534,7 @@ ScVbaRange::Resize( const uno::Any &RowSize, const uno::Any &ColumnSize ) throw
+@@ -2473,7 +2535,7 @@ ScVbaRange::Resize( const uno::Any &RowSize, const uno::Any &ColumnSize ) throw
xCursor->collapseToSize( nColumnSize, nRowSize );
uno::Reference< sheet::XCellRangeAddressable > xCellRangeAddressable(xCursor, ::uno::UNO_QUERY_THROW );
uno::Reference< table::XCellRange > xRange( xSheetRange->getSpreadsheet(), ::uno::UNO_QUERY_THROW );
@@ -25919,7 +25889,7 @@ index ef4bb43..fb9fe6d 100644
xCellRangeAddressable->getRangeAddress().StartColumn,
xCellRangeAddressable->getRangeAddress().StartRow,
xCellRangeAddressable->getRangeAddress().EndColumn,
-@@ -2637,7 +2698,7 @@ ScVbaRange::Range( const uno::Any &Cell1, const uno::Any &Cell2, bool bForceUseI
+@@ -2637,7 +2699,7 @@ ScVbaRange::Range( const uno::Any &Cell1, const uno::Any &Cell2, bool bForceUseI
}
}
@@ -25928,7 +25898,7 @@ index ef4bb43..fb9fe6d 100644
}
-@@ -2722,8 +2783,6 @@ ScVbaRange::PasteSpecial( const uno::Any& Paste, const uno::Any& Operation, cons
+@@ -2722,8 +2784,6 @@ ScVbaRange::PasteSpecial( const uno::Any& Paste, const uno::Any& Operation, cons
uno::Reference< frame::XModel > xModel( ( pShell ? pShell->GetModel() : NULL ), uno::UNO_QUERY_THROW );
uno::Reference< view::XSelectionSupplier > xSelection( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
@@ -25937,7 +25907,7 @@ index ef4bb43..fb9fe6d 100644
// select this range
xSelection->select( uno::makeAny( mxRange ) );
// set up defaults
-@@ -2744,8 +2803,6 @@ ScVbaRange::PasteSpecial( const uno::Any& Paste, const uno::Any& Operation, cons
+@@ -2744,8 +2804,6 @@ ScVbaRange::PasteSpecial( const uno::Any& Paste, const uno::Any& Operation, cons
USHORT nFlags = getPasteFlags(nPaste);
USHORT nFormulaBits = getPasteFormulaBits(nOperation);
excel::implnPasteSpecial(pShell->GetModel(), nFlags,nFormulaBits,bSkipBlanks,bTranspose);
@@ -25946,7 +25916,7 @@ index ef4bb43..fb9fe6d 100644
}
uno::Reference< excel::XRange >
-@@ -2772,10 +2829,10 @@ ScVbaRange::getEntireColumnOrRow( bool bColumn ) throw (uno::RuntimeException)
+@@ -2772,10 +2830,10 @@ ScVbaRange::getEntireColumnOrRow( bool bColumn ) throw (uno::RuntimeException)
{
uno::Reference< sheet::XSheetCellRangeContainer > xRanges( new ScCellRangesObj( pUnoRangesBase->GetDocShell(), aCellRanges ) );
@@ -25959,7 +25929,7 @@ index ef4bb43..fb9fe6d 100644
}
uno::Reference< excel::XRange > SAL_CALL
-@@ -2968,7 +3025,16 @@ ScVbaRange::Replace( const ::rtl::OUString& What, const ::rtl::OUString& Replace
+@@ -2968,7 +3026,16 @@ ScVbaRange::Replace( const ::rtl::OUString& What, const ::rtl::OUString& Replace
// OOo.org afaik
uno::Reference< util::XSearchDescriptor > xSearch( xDescriptor, uno::UNO_QUERY );
@@ -25976,7 +25946,7 @@ index ef4bb43..fb9fe6d 100644
}
return sal_True; // always
}
-@@ -3119,9 +3185,16 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L
+@@ -3119,9 +3186,16 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L
uno::Reference< util::XSearchDescriptor > xSearchDescriptor( xDescriptor, uno::UNO_QUERY );
uno::Reference< uno::XInterface > xInterface = xStartCell.is() ? xSearch->findNext( xStartCell, xSearchDescriptor) : xSearch->findFirst( xSearchDescriptor );
uno::Reference< table::XCellRange > xCellRange( xInterface, uno::UNO_QUERY );
@@ -25994,7 +25964,7 @@ index ef4bb43..fb9fe6d 100644
if( xResultRange.is() )
{
xResultRange->Select();
-@@ -3412,76 +3485,45 @@ ScVbaRange::End( ::sal_Int32 Direction ) throw (uno::RuntimeException)
+@@ -3412,76 +3486,45 @@ ScVbaRange::End( ::sal_Int32 Direction ) throw (uno::RuntimeException)
return xRange->End( Direction );
}
@@ -26110,7 +26080,7 @@ index ef4bb43..fb9fe6d 100644
}
bool
-@@ -3499,7 +3541,7 @@ ScVbaRange::characters( const uno::Any& Start, const uno::Any& Length ) throw (u
+@@ -3499,7 +3542,7 @@ ScVbaRange::characters( const uno::Any& Start, const uno::Any& Length ) throw (u
if ( !isSingleCellRange() )
throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Can't create Characters property for multicell range ") ), uno::Reference< uno::XInterface >() );
uno::Reference< text::XSimpleText > xSimple(mxRange->getCellByPosition(0,0) , uno::UNO_QUERY_THROW );
@@ -26119,7 +26089,7 @@ index ef4bb43..fb9fe6d 100644
if ( !pDoc )
throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Failed to access document from shell" ) ), uno::Reference< uno::XInterface >() );
-@@ -3582,7 +3624,7 @@ ScVbaRange::createEnumeration() throw (uno::RuntimeException)
+@@ -3582,7 +3625,7 @@ ScVbaRange::createEnumeration() throw (uno::RuntimeException)
return new ColumnsRowEnumeration( mxContext, xRange, nElems );
}
@@ -26128,7 +26098,7 @@ index ef4bb43..fb9fe6d 100644
}
::rtl::OUString SAL_CALL
-@@ -3616,7 +3658,7 @@ ScVbaRange::getCalcColWidth( const table::CellRangeAddress& rAddress) throw (uno
+@@ -3616,7 +3659,7 @@ ScVbaRange::getCalcColWidth( const table::CellRangeAddress& rAddress) throw (uno
double
ScVbaRange::getCalcRowHeight( const table::CellRangeAddress& rAddress ) throw (uno::RuntimeException)
{
@@ -26137,7 +26107,7 @@ index ef4bb43..fb9fe6d 100644
USHORT nWidth = pDoc->GetOriginalHeight( rAddress.StartRow, rAddress.Sheet );
double nPoints = lcl_TwipsToPoints( nWidth );
nPoints = lcl_Round2DecPlaces( nPoints );
-@@ -3878,7 +3920,7 @@ ScVbaRange::setRowHeight( const uno::Any& _rowheight) throw (uno::RuntimeExcepti
+@@ -3878,7 +3921,7 @@ ScVbaRange::setRowHeight( const uno::Any& _rowheight) throw (uno::RuntimeExcepti
table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
USHORT nTwips = lcl_pointsToTwips( nHeight );
@@ -26146,7 +26116,7 @@ index ef4bb43..fb9fe6d 100644
ScDocFunc aFunc(*pDocShell);
SCCOLROW nRowArr[2];
nRowArr[0] = thisAddress.StartRow;
-@@ -3891,7 +3933,7 @@ uno::Any SAL_CALL
+@@ -3891,7 +3934,7 @@ uno::Any SAL_CALL
ScVbaRange::getPageBreak() throw (uno::RuntimeException)
{
sal_Int32 nPageBreak = excel::XlPageBreak::xlPageBreakNone;
@@ -26155,7 +26125,7 @@ index ef4bb43..fb9fe6d 100644
if ( pShell )
{
RangeHelper thisRange( mxRange );
-@@ -3904,7 +3946,7 @@ ScVbaRange::getPageBreak() throw (uno::RuntimeException)
+@@ -3904,7 +3947,7 @@ ScVbaRange::getPageBreak() throw (uno::RuntimeException)
uno::Reference< frame::XModel > xModel = pShell->GetModel();
if ( xModel.is() )
{
@@ -26164,7 +26134,7 @@ index ef4bb43..fb9fe6d 100644
ScBreakType nBreak = BREAK_NONE;
if ( !bColumn )
-@@ -3929,7 +3971,7 @@ ScVbaRange::setPageBreak( const uno::Any& _pagebreak) throw (uno::RuntimeExcepti
+@@ -3929,7 +3972,7 @@ ScVbaRange::setPageBreak( const uno::Any& _pagebreak) throw (uno::RuntimeExcepti
sal_Int32 nPageBreak = 0;
_pagebreak >>= nPageBreak;
@@ -26173,7 +26143,7 @@ index ef4bb43..fb9fe6d 100644
if ( pShell )
{
RangeHelper thisRange( mxRange );
-@@ -4023,7 +4065,7 @@ ScVbaRange::getWorksheet() throw (uno::RuntimeException)
+@@ -4023,7 +4066,7 @@ ScVbaRange::getWorksheet() throw (uno::RuntimeException)
uno::Reference< container::XIndexAccess > xIndex( mxRanges, uno::UNO_QUERY_THROW );
xRange.set( xIndex->getByIndex( 0 ), uno::UNO_QUERY_THROW );
}
@@ -26182,7 +26152,7 @@ index ef4bb43..fb9fe6d 100644
RangeHelper rHelper(xRange);
// parent should be Thisworkbook
xSheet.set( new ScVbaWorksheet( uno::Reference< XHelperInterface >(), mxContext,rHelper.getSpreadSheet(),pDocShell->GetModel()) );
-@@ -4073,69 +4115,49 @@ ScVbaRange::ApplicationRange( const uno::Reference< uno::XComponentContext >& xC
+@@ -4073,69 +4116,49 @@ ScVbaRange::ApplicationRange( const uno::Reference< uno::XComponentContext >& xC
uno::Reference< table::XCellRange > xRange = xReferrer->getReferredCells();
if ( xRange.is() )
{
@@ -26282,7 +26252,7 @@ index ef4bb43..fb9fe6d 100644
OSL_TRACE("lcl_GetDBData_Impl got autofilter range %s for sheet %d",
rtl::OUStringToOString( sName, RTL_TEXTENCODING_UTF8 ).getStr() , nSheet );
ScDBData* pRet = NULL;
-@@ -4302,7 +4324,7 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const
+@@ -4302,7 +4325,7 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const
ScDocShell* pShell = getScDocShell();
sal_Bool bHasAuto = sal_False;
rtl::OUString sAutofiltRangeName;
@@ -26291,7 +26261,7 @@ index ef4bb43..fb9fe6d 100644
if ( xDataBaseRange.is() )
bHasAuto = true;
-@@ -4335,7 +4357,7 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const
+@@ -4335,7 +4358,7 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const
autoFiltAddress = multiCellRange.getCellRangeAddressable()->getRangeAddress();
}
@@ -26300,7 +26270,7 @@ index ef4bb43..fb9fe6d 100644
if ( xDBRanges.is() )
{
rtl::OUString sGenName( RTL_CONSTASCII_USTRINGPARAM("VBA_Autofilter_") );
-@@ -4388,8 +4410,21 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const
+@@ -4388,8 +4411,21 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const
// Use the normal uno api, sometimes e.g. when you want to use ALL as the filter
// we can't use refresh as the uno interface doesn't have a concept of ALL
// in this case we just call the core calc functionality -
@@ -26324,7 +26294,7 @@ index ef4bb43..fb9fe6d 100644
{
uno::Reference< sheet::XSheetFilterDescriptor2 > xDesc(
xDataBaseRange->getFilterDescriptor(), uno::UNO_QUERY );
-@@ -4420,7 +4455,19 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const
+@@ -4420,7 +4456,19 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const
bAll = true;
// not sure what the relationship between Criteria1 and Operator is,
// e.g. can you have a Operator without a Criteria ? in openoffice it
@@ -26345,7 +26315,7 @@ index ef4bb43..fb9fe6d 100644
{
// if its a bottom/top Ten(Percent/Value) and there
// is no value specified for critera1 set it to 10
-@@ -4568,8 +4615,8 @@ ScVbaRange::Insert( const uno::Any& Shift, const uno::Any& CopyOrigin ) throw (u
+@@ -4568,8 +4616,8 @@ ScVbaRange::Insert( const uno::Any& Shift, const uno::Any& CopyOrigin ) throw (u
{
// After the insert ( this range ) actually has moved
ScRange aRange( static_cast< SCCOL >( thisAddress.StartColumn ), static_cast< SCROW >( thisAddress.StartRow ), static_cast< SCTAB >( thisAddress.Sheet ), static_cast< SCCOL >( thisAddress.EndColumn ), static_cast< SCROW >( thisAddress.EndRow ), static_cast< SCTAB >( thisAddress.Sheet ) );
@@ -26356,7 +26326,7 @@ index ef4bb43..fb9fe6d 100644
xVbaRange->PasteSpecial( uno::Any(), uno::Any(), uno::Any(), uno::Any() );
}
}
-@@ -4592,7 +4639,7 @@ ScVbaRange::Autofit() throw (uno::RuntimeException)
+@@ -4592,7 +4640,7 @@ ScVbaRange::Autofit() throw (uno::RuntimeException)
if ( !( mbIsColumns || mbIsRows ) )
DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString());
@@ -26365,7 +26335,7 @@ index ef4bb43..fb9fe6d 100644
if ( pDocShell )
{
RangeHelper thisRange( mxRange );
-@@ -4624,8 +4671,8 @@ ScVbaRange::Autofit() throw (uno::RuntimeException)
+@@ -4624,8 +4672,8 @@ ScVbaRange::Autofit() throw (uno::RuntimeException)
***************************************************************************************/
void SAL_CALL
ScVbaRange::TextToColumns( const css::uno::Any& Destination, const css::uno::Any& DataType, const css::uno::Any& TextQualifier,
@@ -26376,7 +26346,7 @@ index ef4bb43..fb9fe6d 100644
const css::uno::Any& DecimalSeparator, const css::uno::Any& ThousandsSeparator, const css::uno::Any& /*TrailingMinusNumbers*/ ) throw (css::uno::RuntimeException)
{
uno::Reference< excel::XRange > xRange;
-@@ -4662,13 +4709,13 @@ ScVbaRange::TextToColumns( const css::uno::Any& Destination, const css::uno::Any
+@@ -4662,13 +4710,13 @@ ScVbaRange::TextToColumns( const css::uno::Any& Destination, const css::uno::Any
OSL_TRACE("set TextQualifier\n");
}
@@ -26395,7 +26365,7 @@ index ef4bb43..fb9fe6d 100644
}
sal_Bool bTab = sal_False;
-@@ -4720,7 +4767,13 @@ ScVbaRange::TextToColumns( const css::uno::Any& Destination, const css::uno::Any
+@@ -4720,7 +4768,13 @@ ScVbaRange::TextToColumns( const css::uno::Any& Destination, const css::uno::Any
throw uno::RuntimeException( rtl::OUString::createFromAscii( "Other parameter should be a True" ),
uno::Reference< uno::XInterface >() );
}
@@ -26410,7 +26380,7 @@ index ef4bb43..fb9fe6d 100644
rtl::OUString sDecimalSeparator;
if( DecimalSeparator.hasValue() )
-@@ -4738,7 +4791,106 @@ ScVbaRange::TextToColumns( const css::uno::Any& Destination, const css::uno::Any
+@@ -4738,7 +4792,106 @@ ScVbaRange::TextToColumns( const css::uno::Any& Destination, const css::uno::Any
uno::Reference< uno::XInterface >() );
OSL_TRACE("set ThousandsSpeparator\n" );
}
@@ -26518,7 +26488,7 @@ index ef4bb43..fb9fe6d 100644
}
uno::Any SAL_CALL
-@@ -4883,7 +5035,7 @@ uno::Any ScVbaRange::getShowDetail() throw ( css::uno::RuntimeException)
+@@ -4883,7 +5036,7 @@ uno::Any ScVbaRange::getShowDetail() throw ( css::uno::RuntimeException)
(thisAddress.StartColumn == thisAddress.EndColumn && thisAddress.EndColumn == aOutlineAddress.EndColumn ))
{
sal_Bool bColumn =thisAddress.StartRow == thisAddress.EndRow ? sal_False:sal_True;
@@ -26527,7 +26497,7 @@ index ef4bb43..fb9fe6d 100644
ScOutlineTable* pOutlineTable = pDoc->GetOutlineTable(static_cast<SCTAB>(thisAddress.Sheet), sal_True);
const ScOutlineArray* pOutlineArray = bColumn ? pOutlineTable->GetColArray(): pOutlineTable->GetRowArray();
if( pOutlineArray )
-@@ -4940,6 +5092,24 @@ void ScVbaRange::setShowDetail(const uno::Any& aShowDetail) throw ( css::uno::Ru
+@@ -4940,6 +5093,24 @@ void ScVbaRange::setShowDetail(const uno::Any& aShowDetail) throw ( css::uno::Ru
}
}
@@ -26552,7 +26522,7 @@ index ef4bb43..fb9fe6d 100644
uno::Reference< excel::XRange > SAL_CALL
ScVbaRange::MergeArea() throw (script::BasicErrorException, uno::RuntimeException)
{
-@@ -4955,20 +5125,132 @@ ScVbaRange::MergeArea() throw (script::BasicErrorException, uno::RuntimeExceptio
+@@ -4955,20 +5126,132 @@ ScVbaRange::MergeArea() throw (script::BasicErrorException, uno::RuntimeExceptio
if( aCellAddress.StartColumn ==0 && aCellAddress.EndColumn==0 &&
aCellAddress.StartRow==0 && aCellAddress.EndRow==0)
{
@@ -26690,7 +26660,7 @@ index ef4bb43..fb9fe6d 100644
void SAL_CALL
ScVbaRange::PrintOut( const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& ActivePrinter, const uno::Any& PrintToFile, const uno::Any& Collate, const uno::Any& PrToFileName ) throw (uno::RuntimeException)
{
-@@ -4987,7 +5269,7 @@ ScVbaRange::PrintOut( const uno::Any& From, const uno::Any& To, const uno::Any&
+@@ -4987,7 +5270,7 @@ ScVbaRange::PrintOut( const uno::Any& From, const uno::Any& To, const uno::Any&
{
ScVbaRange* pRange = getImplementation( xRange );
// initialise the doc shell and the printareas
@@ -26699,7 +26669,7 @@ index ef4bb43..fb9fe6d 100644
xPrintAreas.set( thisRange.getSpreadSheet(), uno::UNO_QUERY_THROW );
}
printAreas[ index - 1 ] = rangeAddress;
-@@ -5073,7 +5355,7 @@ ScVbaRange::AutoFill( const uno::Reference< excel::XRange >& Destination, const
+@@ -5073,7 +5356,7 @@ ScVbaRange::AutoFill( const uno::Reference< excel::XRange >& Destination, const
}
}
}
@@ -26708,7 +26678,7 @@ index ef4bb43..fb9fe6d 100644
FillCmd eCmd = FILL_AUTO;
FillDateCmd eDateCmd = FILL_DAY;
-@@ -5196,13 +5478,8 @@ ScVbaRange::AutoOutline( ) throw (script::BasicErrorException, uno::RuntimeExce
+@@ -5196,13 +5479,8 @@ ScVbaRange::AutoOutline( ) throw (script::BasicErrorException, uno::RuntimeExce
RangeHelper thisRange( mxRange );
table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
@@ -26724,7 +26694,7 @@ index ef4bb43..fb9fe6d 100644
}
void SAL_CALL
-@@ -5229,9 +5506,9 @@ ScVbaRange::groupUnGroup( bool bUnGroup ) throw ( script::BasicErrorException, u
+@@ -5229,9 +5507,9 @@ ScVbaRange::groupUnGroup( bool bUnGroup ) throw ( script::BasicErrorException, u
{
if ( m_Areas->getCount() > 1 )
DebugHelper::exception(SbERR_METHOD_FAILED, STR_ERRORMESSAGE_APPLIESTOSINGLERANGEONLY);
@@ -26737,7 +26707,7 @@ index ef4bb43..fb9fe6d 100644
RangeHelper thisRange( mxRange );
table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
uno::Reference< sheet::XSheetOutline > xSheetOutline( thisRange.getSpreadSheet(), uno::UNO_QUERY_THROW );
-@@ -5359,7 +5636,7 @@ ScVbaRange::PreviousNext( bool bIsPrevious )
+@@ -5359,7 +5637,7 @@ ScVbaRange::PreviousNext( bool bIsPrevious )
uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( getScDocShell() , refRange ) );
@@ -26746,7 +26716,7 @@ index ef4bb43..fb9fe6d 100644
}
uno::Reference< excel::XRange > SAL_CALL
-@@ -5390,6 +5667,7 @@ ScVbaRange::SpecialCells( const uno::Any& _oType, const uno::Any& _oValue) throw
+@@ -5390,6 +5668,7 @@ ScVbaRange::SpecialCells( const uno::Any& _oType, const uno::Any& _oValue) throw
bool bIsSingleCell = isSingleCellRange();
bool bIsMultiArea = ( m_Areas->getCount() > 1 );
ScVbaRange* pRangeToUse = this;
@@ -26754,7 +26724,7 @@ index ef4bb43..fb9fe6d 100644
sal_Int32 nType = 0;
if ( !( _oType >>= nType ) )
DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() );
-@@ -5442,17 +5720,14 @@ ScVbaRange::SpecialCells( const uno::Any& _oType, const uno::Any& _oValue) throw
+@@ -5442,17 +5721,14 @@ ScVbaRange::SpecialCells( const uno::Any& _oType, const uno::Any& _oValue) throw
if ( aCellRanges.First() == aCellRanges.Last() )
{
uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( getScDocShell(), *aCellRanges.First() ) );
@@ -26774,7 +26744,7 @@ index ef4bb43..fb9fe6d 100644
pRangeToUse = static_cast< ScVbaRange* >( xUsedRange.get() );
}
-@@ -5627,6 +5902,183 @@ ScVbaRange::Subtotal( ::sal_Int32 _nGroupBy, ::sal_Int32 _nFunction, const uno::
+@@ -5627,6 +5903,183 @@ ScVbaRange::Subtotal( ::sal_Int32 _nGroupBy, ::sal_Int32 _nFunction, const uno::
}
}
@@ -26958,7 +26928,7 @@ index ef4bb43..fb9fe6d 100644
rtl::OUString&
ScVbaRange::getServiceImplName()
{
-@@ -5646,6 +6098,25 @@ ScVbaRange::getServiceNames()
+@@ -5646,6 +6099,25 @@ ScVbaRange::getServiceNames()
return aServiceNames;
}
@@ -26984,34 +26954,6 @@ index ef4bb43..fb9fe6d 100644
namespace range
{
namespace sdecl = comphelper::service_decl;
-diff --git sc/source/ui/vba/vbarange.cxx.rej sc/source/ui/vba/vbarange.cxx.rej
-new file mode 100644
-index 0000000..d5ef3b8
---- /dev/null
-+++ sc/source/ui/vba/vbarange.cxx.rej
-@@ -0,0 +1,22 @@
-+*************** protected:
-+*** 840,848 ****
-+ double aDblValue = 0.0;
-+ if ( aValue >>= sFormula )
-+ {
-+- // convert to CONV_OOO style formula string because XCell::setFormula
-+- // always compile it in CONV_OOO style. Perhaps css.sheet.FormulaParser
-+- // should be used in future to directly pass formula tokens.
-+ if ( m_eGrammar != formula::FormulaGrammar::GRAM_PODF_A1 && ( sFormula.trim().indexOf('=') == 0 ) )
-+ {
-+ uno::Reference< uno::XInterface > xIf( xCell, uno::UNO_QUERY_THROW );
-+--- 823,832 ----
-+ double aDblValue = 0.0;
-+ if ( aValue >>= sFormula )
-+ {
-++ // convert to GRAM_PODF_A1 style grammar because XCell::setFormula
-++ // always compile it in that grammar. Perhaps
-++ // css.sheet.FormulaParser should be used in future to directly
-++ // pass formula tokens when that API stabilizes.
-+ if ( m_eGrammar != formula::FormulaGrammar::GRAM_PODF_A1 && ( sFormula.trim().indexOf('=') == 0 ) )
-+ {
-+ uno::Reference< uno::XInterface > xIf( xCell, uno::UNO_QUERY_THROW );
diff --git sc/source/ui/vba/vbarange.hxx sc/source/ui/vba/vbarange.hxx
index bf8c545..9e25042 100644
--- sc/source/ui/vba/vbarange.hxx
@@ -31165,7 +31107,7 @@ index 228b489..6a98b97 100644
const SwPropNameLen& SwGetPropName( USHORT nId )
diff --git sw/source/filter/ww8/makefile.mk sw/source/filter/ww8/makefile.mk
-index b25887e..c30c10b 100644
+index a1d1242..80f8278 100644
--- sw/source/filter/ww8/makefile.mk
+++ sw/source/filter/ww8/makefile.mk
@@ -67,6 +67,7 @@ EXCEPTIONSFILES = \
commit e8ee96393565e6d184b260220f1701625e868e55
Author: Noel Power <noel.power at novell.com>
Date: Fri Aug 6 15:11:49 2010 +0100
fix bad hunk from merge ( I guess thats where it came from )
* patches/vba/cws-vbasupportdev300.diff:
diff --git a/patches/vba/cws-vbasupportdev300.diff b/patches/vba/cws-vbasupportdev300.diff
index bb19e52..22f7349 100644
--- a/patches/vba/cws-vbasupportdev300.diff
+++ b/patches/vba/cws-vbasupportdev300.diff
@@ -14441,7 +14441,7 @@ diff --git sc/source/filter/excel/excimp8.cxx sc/source/filter/excel/excimp8.cxx
index 3101922..b6d5e5e 100644
--- sc/source/filter/excel/excimp8.cxx
+++ sc/source/filter/excel/excimp8.cxx
-@@ -100,15 +100,20 @@
+@@ -96,11 +96,14 @@
#include "stlpool.hxx"
#include "stlsheet.hxx"
#include "detfunc.hxx"
commit 39b74b42f822590e6fc76c5065919854bd35d85b
Author: Noel Power <noel.power at novell.com>
Date: Fri Aug 6 14:09:03 2010 +0100
further tweakage to get vba working on m2
* patches/dev300/apply:
* patches/vba/cws-vbasupportdev300.diff:
* patches/vba/oox-insert-module-bug.diff:
* patches/vba/vba-misc-tweakupstream-m2.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index a4dc8ef..9f8e367 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1558,6 +1558,8 @@ vba-enable-fieldrelatedbits.diff
vba-container-controls.diff
# need to adapt ooo-build wrt the changes intorduced into container_controls
oox-projectname-oobuild-specifix.diff
+# fix problem with inserting imported modules with oox
+oox-insert-module-bug.diff
# tweak oox filter to handle any passed generated code names
# there is a strange scenario with one cust doc where a code module is missing
vba-oox-autocodename.diff, n#507768
@@ -1568,6 +1570,8 @@ vba-oox-olenameoverride.diff, n#359933, n#403974
fix-name-range-separator.diff, n#597351
# remove dependency of vbahelper on oox ( added by container_controls.diff )
vbahelper-no-oox.diff
+# misc changes to modify strange upstream changes
+vba-misc-tweakupstream-m2.diff
[ VBAUntested ]
SectionOwner => noelpwer
# KEEP - unfinished autotext stuff
diff --git a/patches/vba/cws-vbasupportdev300.diff b/patches/vba/cws-vbasupportdev300.diff
index df9e914..bb19e52 100644
--- a/patches/vba/cws-vbasupportdev300.diff
+++ b/patches/vba/cws-vbasupportdev300.diff
@@ -115,7 +115,7 @@ index e2a2377..b00acdd 100644
}
diff --git basctl/source/basicide/scriptdocument.cxx basctl/source/basicide/scriptdocument.cxx
-index b85ac92..faf47ad 100644
+index 5fc34d9..a35e58e 100644
--- basctl/source/basicide/scriptdocument.cxx
+++ basctl/source/basicide/scriptdocument.cxx
@@ -453,14 +453,12 @@ namespace basctl
@@ -360,7 +360,7 @@ index 38319ac..89f88da 100644
};
diff --git basic/inc/basic/sbmod.hxx basic/inc/basic/sbmod.hxx
-index 9681149..59017f2 100644
+index 7f401ef..d818589 100644
--- basic/inc/basic/sbmod.hxx
+++ basic/inc/basic/sbmod.hxx
@@ -28,10 +28,12 @@
@@ -376,7 +376,7 @@ index 9681149..59017f2 100644
class SbMethod;
class SbProperty;
-@@ -54,8 +56,12 @@ class SbModule : public SbxObject
+@@ -55,8 +57,12 @@ class SbModule : public SbxObject
friend class SbClassModuleObject;
SbModuleImpl* mpSbModuleImpl; // Impl data
@@ -389,7 +389,7 @@ index 9681149..59017f2 100644
::rtl::OUString aOUSource;
String aComment;
SbiImage* pImage; // the Image
-@@ -125,12 +131,16 @@ public:
+@@ -126,12 +132,16 @@ public:
BOOL LoadBinaryData( SvStream& );
BOOL ExceedsLegacyModuleSize();
void fixUpMethodStart( bool bCvtToLegacy, SbiImage* pImg = NULL ) const;
@@ -419,7 +419,7 @@ index 27fe320..c5e0209 100644
::com::sun::star::uno::Any sbxToUnoValue( SbxVariable* pVar );
diff --git basic/source/basmgr/basmgr.cxx basic/source/basmgr/basmgr.cxx
-index a18b9bb..bebcc4f 100644
+index 247a833..d674dd4 100644
--- basic/source/basmgr/basmgr.cxx
+++ basic/source/basmgr/basmgr.cxx
@@ -1139,6 +1139,25 @@ void BasicManager::LegacyDeleteBasicManager( BasicManager*& _rpManager )
@@ -449,10 +449,10 @@ index a18b9bb..bebcc4f 100644
{
DBG_CHKTHIS( BasicManager, 0 );
diff --git basic/source/classes/sb.cxx basic/source/classes/sb.cxx
-index a7d1c50..0131057 100755
+index 9be441e..ce29137 100755
--- basic/source/classes/sb.cxx
+++ basic/source/classes/sb.cxx
-@@ -531,72 +531,7 @@ SbClassModuleObject::~SbClassModuleObject()
+@@ -584,72 +584,7 @@ SbClassModuleObject::~SbClassModuleObject()
void SbClassModuleObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType )
{
@@ -526,7 +526,7 @@ index a7d1c50..0131057 100755
}
SbxVariable* SbClassModuleObject::Find( const XubString& rName, SbxClassType t )
-@@ -1022,7 +957,6 @@ SbxVariable* StarBASIC::Find( const String& rName, SbxClassType t )
+@@ -1079,7 +1014,6 @@ SbxVariable* StarBASIC::Find( const String& rName, SbxClassType t )
INT32 nType = p->GetModuleType();
if ( nType == ModuleType::DOCUMENT || nType == ModuleType::FORM )
continue;
@@ -535,10 +535,10 @@ index a7d1c50..0131057 100755
// unset GBLSEARCH-Flag (due to Rekursion)
USHORT nGblFlag = p->GetFlags() & SBX_GBLSEARCH;
diff --git basic/source/classes/sbunoobj.cxx basic/source/classes/sbunoobj.cxx
-index f80e5e0..907474d 100644
+index 291aaa4..b66e9f4 100755
--- basic/source/classes/sbunoobj.cxx
+++ basic/source/classes/sbunoobj.cxx
-@@ -60,6 +60,7 @@
+@@ -61,6 +61,7 @@
#include <com/sun/star/script/XInvocationAdapterFactory.hpp>
#include <com/sun/star/script/XTypeConverter.hpp>
#include <com/sun/star/script/XDefaultProperty.hpp>
@@ -546,7 +546,7 @@ index f80e5e0..907474d 100644
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <com/sun/star/reflection/XIdlArray.hpp>
-@@ -70,7 +71,7 @@
+@@ -71,7 +72,7 @@
#include <com/sun/star/bridge/oleautomation/Date.hpp>
#include <com/sun/star/bridge/oleautomation/Decimal.hpp>
#include <com/sun/star/bridge/oleautomation/Currency.hpp>
@@ -555,7 +555,7 @@ index f80e5e0..907474d 100644
using com::sun::star::uno::Reference;
using namespace com::sun::star::uno;
-@@ -156,6 +157,21 @@ SbxVariable* getDefaultProp( SbxVariable* pRef )
+@@ -157,6 +158,21 @@ SbxVariable* getDefaultProp( SbxVariable* pRef )
return pDefaultProp;
}
@@ -577,7 +577,7 @@ index f80e5e0..907474d 100644
Reference< XComponentContext > getComponentContext_Impl( void )
{
static Reference< XComponentContext > xContext;
-@@ -452,6 +468,32 @@ void implHandleWrappedTargetException( const Any& _rWrappedTargetException )
+@@ -453,6 +469,32 @@ void implHandleWrappedTargetException( const Any& _rWrappedTargetException )
SbError nError( ERRCODE_BASIC_EXCEPTION );
::rtl::OUStringBuffer aMessageBuf;
@@ -610,7 +610,7 @@ index f80e5e0..907474d 100644
// strip any other WrappedTargetException instances, but this time preserve the error messages.
WrappedTargetException aWrapped;
sal_Int32 nLevel = 0;
-@@ -1490,6 +1532,103 @@ Any sbxToUnoValue( SbxVariable* pVar, const Type& rType, Property* pUnoProperty
+@@ -1502,6 +1544,103 @@ Any sbxToUnoValue( SbxVariable* pVar, const Type& rType, Property* pUnoProperty
return aRetVal;
}
@@ -714,7 +714,7 @@ index f80e5e0..907474d 100644
// Dbg-Hilfsmethode zum Auslesen der in einem Object implementierten Interfaces
String Impl_GetInterfaceInfo( const Reference< XInterface >& x, const Reference< XIdlClass >& xClass, USHORT nRekLevel )
{
-@@ -1990,11 +2129,26 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
+@@ -2008,11 +2147,26 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
{
try
{
@@ -743,7 +743,7 @@ index f80e5e0..907474d 100644
}
catch( const Exception& )
{
-@@ -2119,52 +2273,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
+@@ -2137,52 +2291,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
else if( bInvocation && pParams && mxInvocation.is() )
{
bool bOLEAutomation = true;
@@ -797,7 +797,7 @@ index f80e5e0..907474d 100644
}
// Methode callen
-@@ -2199,26 +2308,8 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
+@@ -2217,26 +2326,8 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
}
else if( bInvocation && mxInvocation.is() )
{
@@ -825,7 +825,7 @@ index f80e5e0..907474d 100644
}
// #55460, Parameter hier weghauen, da das in unoToSbxValue()
-@@ -3147,11 +3238,16 @@ getTypeDescriptorEnumeration( const ::rtl::OUString& sSearchRoot,
+@@ -3165,11 +3256,16 @@ getTypeDescriptorEnumeration( const ::rtl::OUString& sSearchRoot,
typedef std::hash_map< ::rtl::OUString, Any, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > VBAConstantsHash;
@@ -846,7 +846,7 @@ index f80e5e0..907474d 100644
if ( !isInited )
{
Sequence< TypeClass > types(1);
-@@ -3159,39 +3255,77 @@ SbxVariable* getVBAConstant( const String& rName )
+@@ -3177,39 +3273,77 @@ SbxVariable* getVBAConstant( const String& rName )
Reference< XTypeDescriptionEnumeration > xEnum = getTypeDescriptorEnumeration( defaultNameSpace, types, TypeDescriptionSearchDepth_INFINITE );
if ( !xEnum.is() )
@@ -932,7 +932,7 @@ index f80e5e0..907474d 100644
}
diff --git basic/source/classes/sbxmod.cxx basic/source/classes/sbxmod.cxx
-index 8c3ef89..df3838b 100644
+index 79ab207..6e8e724 100644
--- basic/source/classes/sbxmod.cxx
+++ basic/source/classes/sbxmod.cxx
@@ -85,6 +85,361 @@ using namespace com::sun::star;
@@ -1314,7 +1314,7 @@ index 8c3ef89..df3838b 100644
/////////////////////////////////////////////////////////////////////////////
// Ein BASIC-Modul hat EXTSEARCH gesetzt, damit die im Modul enthaltenen
-@@ -194,14 +548,25 @@ SbModule::SbModule( const String& rName, BOOL bVBACompat )
+@@ -199,14 +553,25 @@ SbModule::SbModule( const String& rName, BOOL bVBACompat )
SbModule::~SbModule()
{
@@ -1340,7 +1340,7 @@ index 8c3ef89..df3838b 100644
BOOL SbModule::IsCompiled() const
{
return BOOL( pImage != 0 );
-@@ -429,6 +794,64 @@ void SbModule::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
+@@ -434,6 +799,64 @@ void SbModule::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
SbxVariable* pVar = pHint->GetVar();
SbProperty* pProp = PTR_CAST(SbProperty,pVar);
SbMethod* pMeth = PTR_CAST(SbMethod,pVar);
@@ -1405,7 +1405,7 @@ index 8c3ef89..df3838b 100644
if( pProp )
{
if( pProp->GetModule() != this )
-@@ -471,6 +906,7 @@ void SbModule::SetSource32( const ::rtl::OUString& r )
+@@ -488,6 +911,7 @@ void SbModule::SetSource32( const ::rtl::OUString& r )
aOUSource = r;
StartDefinitions();
SbiTokenizer aTok( r );
@@ -1413,7 +1413,7 @@ index 8c3ef89..df3838b 100644
while( !aTok.IsEof() )
{
SbiToken eEndTok = NIL;
-@@ -658,12 +1094,14 @@ void SbModule::SetVBACompat( BOOL bCompat )
+@@ -675,12 +1099,14 @@ void SbModule::SetVBACompat( BOOL bCompat )
// Ausfuehren eines BASIC-Unterprogramms
USHORT SbModule::Run( SbMethod* pMeth )
{
@@ -1428,7 +1428,7 @@ index 8c3ef89..df3838b 100644
StarBASICRef xBasic;
if( bDelInst )
{
-@@ -783,6 +1221,15 @@ USHORT SbModule::Run( SbMethod* pMeth )
+@@ -800,6 +1226,15 @@ USHORT SbModule::Run( SbMethod* pMeth )
delete pRt;
pMOD = pOldMod;
@@ -1444,7 +1444,7 @@ index 8c3ef89..df3838b 100644
if( bDelInst )
{
// #57841 Uno-Objekte, die in RTL-Funktionen gehalten werden,
-@@ -810,10 +1257,8 @@ USHORT SbModule::Run( SbMethod* pMeth )
+@@ -827,10 +1262,8 @@ USHORT SbModule::Run( SbMethod* pMeth )
// VBA always ensure screenupdating is enabled after completing
StarBASIC* pBasic = PTR_CAST(StarBASIC,GetParent());
@@ -1455,7 +1455,7 @@ index 8c3ef89..df3838b 100644
if( bDelInst )
{
// #57841 Uno-Objekte, die in RTL-Funktionen gehalten werden,
-@@ -824,6 +1269,8 @@ USHORT SbModule::Run( SbMethod* pMeth )
+@@ -841,6 +1274,8 @@ USHORT SbModule::Run( SbMethod* pMeth )
pINST = NULL;
}
if ( pBasic && pBasic->IsDocBasic() && pBasic->IsQuitApplication() && !pINST )
@@ -1464,7 +1464,7 @@ index 8c3ef89..df3838b 100644
{
Application::PostUserEvent( LINK( &AsyncQuitHandler::instance(), AsyncQuitHandler, OnAsyncQuit ), NULL );
}
-@@ -867,6 +1314,33 @@ void SbModule::RunInit()
+@@ -884,6 +1319,33 @@ void SbModule::RunInit()
}
// Mit private/dim deklarierte Variablen loeschen
@@ -1498,7 +1498,7 @@ index 8c3ef89..df3838b 100644
void SbModule::ClearPrivateVars()
{
for( USHORT i = 0 ; i < pProps->Count() ; i++ )
-@@ -1247,6 +1721,48 @@ BOOL SbModule::ExceedsLegacyModuleSize()
+@@ -1264,6 +1726,48 @@ BOOL SbModule::ExceedsLegacyModuleSize()
return false;
}
@@ -1547,7 +1547,7 @@ index 8c3ef89..df3838b 100644
// Store only image, no source
BOOL SbModule::StoreBinaryData( SvStream& rStrm )
-@@ -1296,7 +1812,6 @@ BOOL SbModule::LoadBinaryData( SvStream& rStrm )
+@@ -1313,7 +1817,6 @@ BOOL SbModule::LoadBinaryData( SvStream& rStrm )
return bRet;
}
@@ -1555,7 +1555,7 @@ index 8c3ef89..df3838b 100644
BOOL SbModule::LoadCompleted()
{
SbxArray* p = GetMethods();
-@@ -1364,6 +1879,7 @@ SbMethod::SbMethod( const String& r, SbxDataType t, SbModule* p )
+@@ -1381,6 +1884,7 @@ SbMethod::SbMethod( const String& r, SbxDataType t, SbModule* p )
nLine1 =
nLine2 = 0;
refStatics = new SbxArray;
@@ -1563,7 +1563,7 @@ index 8c3ef89..df3838b 100644
// AB: 2.7.1996: HACK wegen 'Referenz kann nicht gesichert werden'
SetFlag( SBX_NO_MODIFY );
}
-@@ -1378,6 +1894,7 @@ SbMethod::SbMethod( const SbMethod& r )
+@@ -1395,6 +1899,7 @@ SbMethod::SbMethod( const SbMethod& r )
nLine1 = r.nLine1;
nLine2 = r.nLine2;
refStatics = r.refStatics;
@@ -1571,7 +1571,7 @@ index 8c3ef89..df3838b 100644
SetFlag( SBX_NO_MODIFY );
}
-@@ -1446,8 +1963,13 @@ SbxInfo* SbMethod::GetInfo()
+@@ -1463,8 +1968,13 @@ SbxInfo* SbMethod::GetInfo()
// Schnittstelle zum Ausfuehren einer Methode aus den Applikationen
// #34191# Mit speziellem RefCounting, damit das Basic nicht durch CloseDocument()
// abgeschossen werden kann. Rueckgabewert wird als String geliefert.
@@ -1586,7 +1586,7 @@ index 8c3ef89..df3838b 100644
// RefCount vom Modul hochzaehlen
SbModule* pMod_ = (SbModule*)GetParent();
pMod_->AddRef();
-@@ -1475,7 +1997,7 @@ ErrCode SbMethod::Call( SbxValue* pRet )
+@@ -1492,7 +2002,7 @@ ErrCode SbMethod::Call( SbxValue* pRet )
// Objekte freigeben
pMod_->ReleaseRef();
pBasic->ReleaseRef();
@@ -1595,7 +1595,7 @@ index 8c3ef89..df3838b 100644
return nErr;
}
-@@ -1640,9 +2162,8 @@ public:
+@@ -1657,9 +2167,8 @@ public:
}
//liuchen 2009-7-21, support Excel VBA Form_QueryClose event
@@ -1606,7 +1606,7 @@ index 8c3ef89..df3838b 100644
uno::Reference< awt::XDialog > xDialog( e.Source, uno::UNO_QUERY );
if ( xDialog.is() )
{
-@@ -1670,7 +2191,6 @@ public:
+@@ -1687,7 +2196,6 @@ public:
}
mpUserForm->triggerMethod( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Userform_QueryClose") ) );
@@ -1614,7 +1614,7 @@ index 8c3ef89..df3838b 100644
}
//liuchen 2009-7-21
-@@ -1730,14 +2250,13 @@ void SbUserFormModule::triggerMethod( const String& aMethodToRun )
+@@ -1749,14 +2257,13 @@ void SbUserFormModule::triggerMethod( const String& aMethodToRun )
Sequence< Any > aArguments;
triggerMethod( aMethodToRun, aArguments );
}
@@ -1630,7 +1630,7 @@ index 8c3ef89..df3838b 100644
//liuchen 2009-7-21, support Excel VBA UserForm_QueryClose event with parameters
if ( aArguments.getLength() > 0 ) // Setup parameters
{
-@@ -1767,7 +2286,6 @@ void SbUserFormModule::triggerMethod( const String& aMethodToRun, Sequence< Any
+@@ -1786,7 +2293,6 @@ void SbUserFormModule::triggerMethod( const String& aMethodToRun, Sequence< Any
}
else
//liuchen 2009-7-21
@@ -1638,7 +1638,7 @@ index 8c3ef89..df3838b 100644
{
SbxValues aVals;
pMeth->Get( aVals );
-@@ -1893,7 +2411,7 @@ void SbUserFormModule::InitObject()
+@@ -1939,7 +2445,7 @@ void SbUserFormModule::InitObject()
aArgs[ 0 ] = uno::Any();
aArgs[ 1 ] <<= m_xDialog;
aArgs[ 2 ] <<= m_xModel;
@@ -1670,7 +1670,7 @@ index c7e8f11..be7c357 100644
}
if( nPass == 1 )
diff --git basic/source/comp/dim.cxx basic/source/comp/dim.cxx
-index 36bbb8d..23a8692 100644
+index b5131c9..19d9d38 100644
--- basic/source/comp/dim.cxx
+++ basic/source/comp/dim.cxx
@@ -29,6 +29,8 @@
@@ -1682,7 +1682,7 @@ index 36bbb8d..23a8692 100644
SbxObject* cloneTypeObjectImpl( const SbxObject& rTypeObj );
-@@ -141,7 +143,7 @@ void SbiParser::TypeDecl( SbiSymDef& rDef, BOOL bAsNewAlreadyParsed )
+@@ -153,7 +155,7 @@ void SbiParser::TypeDecl( SbiSymDef& rDef, BOOL bAsNewAlreadyParsed )
}
}
}
@@ -1691,7 +1691,7 @@ index 36bbb8d..23a8692 100644
{
eType = SbxLONG;
break;
-@@ -398,7 +400,10 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
+@@ -423,7 +425,10 @@ void SbiParser::DefVar( SbiOpcode eOp, BOOL bStatic )
aExpr.Gen();
SbiOpcode eOp_ = pDef->IsNew() ? _CREATE : _TCREATE;
aGen.Gen( eOp_, pDef->GetId(), pDef->GetTypeId() );
@@ -1703,7 +1703,7 @@ index 36bbb8d..23a8692 100644
}
}
else
-@@ -944,6 +949,24 @@ void SbiParser::DefDeclare( BOOL bPrivate )
+@@ -975,6 +980,24 @@ void SbiParser::DefDeclare( BOOL bPrivate )
}
}
@@ -1729,10 +1729,10 @@ index 36bbb8d..23a8692 100644
void SbiParser::Call()
diff --git basic/source/comp/exprtree.cxx basic/source/comp/exprtree.cxx
-index eafe38d..6eb2a59 100644
+index 604ac61..658c9bf 100644
--- basic/source/comp/exprtree.cxx
+++ basic/source/comp/exprtree.cxx
-@@ -375,8 +376,12 @@ SbiExprNode* SbiExpression::Term( void )
+@@ -382,8 +382,12 @@ SbiExprNode* SbiExpression::Term( const KeywordSymbolInfo* pKeywordSymbolInfo )
// Typ SbxOBJECT sein
if( pDef->GetType() != SbxOBJECT && pDef->GetType() != SbxVARIANT )
{
@@ -1747,7 +1747,7 @@ index eafe38d..6eb2a59 100644
}
if( !bError )
pNd->aVar.pNext = ObjTerm( *pDef );
-@@ -567,7 +572,11 @@ SbiExprNode* SbiExpression::Unary()
+@@ -589,7 +593,11 @@ SbiExprNode* SbiExpression::Unary()
eTok = NEG;
case NOT:
pParser->Next();
@@ -1760,7 +1760,7 @@ index eafe38d..6eb2a59 100644
break;
case PLUS:
pParser->Next();
-@@ -713,7 +722,7 @@ SbiExprNode* SbiExpression::Like()
+@@ -745,7 +753,7 @@ SbiExprNode* SbiExpression::Like()
pNd = new SbiExprNode( pParser, pNd, eTok, Comp() ), nCount++;
}
// Mehrere Operatoren hintereinander gehen nicht
@@ -1770,7 +1770,7 @@ index eafe38d..6eb2a59 100644
pParser->Error( SbERR_SYNTAX );
bError = TRUE;
diff --git basic/source/comp/parser.cxx basic/source/comp/parser.cxx
-index eecc229..a366ac8 100644
+index 83e7bbd..81fd9d6 100644
--- basic/source/comp/parser.cxx
+++ basic/source/comp/parser.cxx
@@ -49,6 +49,7 @@ struct SbiStatement {
@@ -1781,7 +1781,7 @@ index eecc229..a366ac8 100644
{ CALL, &SbiParser::Call, N, Y, }, // CALL
{ CLOSE, &SbiParser::Close, N, Y, }, // CLOSE
{ _CONST_, &SbiParser::Dim, Y, Y, }, // CONST
-@@ -381,6 +383,18 @@ BOOL SbiParser::Parse()
+@@ -387,6 +388,18 @@ BOOL SbiParser::Parse()
Next(); return TRUE;
}
@@ -1800,7 +1800,7 @@ index eecc229..a366ac8 100644
// Kommt ein Symbol, ist es entweder eine Variable( LET )
// oder eine SUB-Prozedur( CALL ohne Klammern )
// DOT fuer Zuweisungen im WITH-Block: .A=5
-@@ -759,7 +777,7 @@ void SbiParser::Option()
+@@ -795,7 +808,7 @@ void SbiParser::Option()
bClassModule = TRUE;
aGen.GetModule().SetModuleType( com::sun::star::script::ModuleType::CLASS );
break;
@@ -1822,7 +1822,7 @@ index c91624d..5bec939 100644
for( USHORT i = 0; i < pMethods->Count(); i++ )
{
diff --git basic/source/comp/token.cxx basic/source/comp/token.cxx
-index a41944c..44b7b3e 100644
+index 0069079..25dd885 100644
--- basic/source/comp/token.cxx
+++ basic/source/comp/token.cxx
@@ -58,6 +58,7 @@ static TokenTable aTokTable_Basic [] = { // Token-Tabelle:
@@ -1834,10 +1834,10 @@ index a41944c..44b7b3e 100644
{ BINARY, "Binary" },
{ TBOOLEAN, "Boolean" },
diff --git basic/source/inc/dlgcont.hxx basic/source/inc/dlgcont.hxx
-index b5387ce..6162398 100644
+index 7d22f4d..fe70a45 100644
--- basic/source/inc/dlgcont.hxx
+++ basic/source/inc/dlgcont.hxx
-@@ -93,7 +93,9 @@ public:
+@@ -96,7 +96,9 @@ public:
throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( )
throw (::com::sun::star::uno::RuntimeException);
@@ -1849,7 +1849,7 @@ index b5387ce..6162398 100644
static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static();
static ::rtl::OUString getImplementationName_static();
diff --git basic/source/inc/namecont.hxx basic/source/inc/namecont.hxx
-index 7bbe896..4cd5ce1 100644
+index 6db0b96..196b3d1 100644
--- basic/source/inc/namecont.hxx
+++ basic/source/inc/namecont.hxx
@@ -35,6 +35,7 @@
@@ -1860,7 +1860,7 @@ index 7bbe896..4cd5ce1 100644
#include <com/sun/star/script/XLibraryContainer3.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/container/XContainer.hpp>
-@@ -60,6 +60,7 @@
+@@ -59,6 +60,7 @@
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/compbase8.hxx>
@@ -1885,10 +1885,10 @@ index 7bbe896..4cd5ce1 100644
::com::sun::star::lang::XServiceInfo > LibraryContainerHelper;
diff --git basic/source/inc/parser.hxx basic/source/inc/parser.hxx
-index 04c0269..e35cc03 100644
+index 4fb7b18..f9a159d 100644
--- basic/source/inc/parser.hxx
+++ basic/source/inc/parser.hxx
-@@ -106,6 +106,7 @@
+@@ -106,6 +106,7 @@ public:
void BadSyntax(); // Falsches SbiToken
void NoIf(); // ELSE/ELSE IF ohne IF
void Assign(); // LET
@@ -1897,7 +1897,7 @@ index 04c0269..e35cc03 100644
void Close(); // CLOSE
void Declare(); // DECLARE
diff --git basic/source/inc/runtime.hxx basic/source/inc/runtime.hxx
-index 64ecac2..5844f3a 100644
+index 96de7e5..b95b13c 100644
--- basic/source/inc/runtime.hxx
+++ basic/source/inc/runtime.hxx
@@ -203,7 +203,6 @@ class SbiInstance
@@ -1918,7 +1918,7 @@ index 64ecac2..5844f3a 100644
SbiArgvStack* pArgvStk; // ARGV-Stack
SbiGosubStack* pGosubStk; // GOSUB stack
SbiForStack* pForStk; // FOR/NEXT-Stack
-@@ -461,6 +462,7 @@ public:
+@@ -462,6 +463,7 @@ public:
SbMethod* GetCaller();
SbxArray* GetLocals();
SbxArray* GetParams();
@@ -1966,10 +1966,10 @@ index b8993c1..edbe260 100644
diff --git basic/source/inc/scriptcont.hxx basic/source/inc/scriptcont.hxx
-index b1abdcd..e8a8b17 100644
+index 2c71183..2fdd79c 100644
--- basic/source/inc/scriptcont.hxx
+++ basic/source/inc/scriptcont.hxx
-@@ -119,7 +119,9 @@ public:
+@@ -122,7 +122,9 @@ public:
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::container::NoSuchElementException,
::com::sun::star::uno::RuntimeException);
@@ -1981,7 +1981,7 @@ index b1abdcd..e8a8b17 100644
virtual ::rtl::OUString SAL_CALL getImplementationName( )
throw (::com::sun::star::uno::RuntimeException);
diff --git basic/source/inc/token.hxx basic/source/inc/token.hxx
-index 737075a..422379c 100644
+index 7c3ff75..068a107 100644
--- basic/source/inc/token.hxx
+++ basic/source/inc/token.hxx
@@ -72,7 +72,7 @@ enum SbiToken {
@@ -1994,7 +1994,7 @@ index 737075a..422379c 100644
REDIM, REM, RESUME, RETURN, RSET,
SELECT, SET, SHARED, STATIC, STEP, STOP, SUB,
diff --git basic/source/runtime/methods.cxx basic/source/runtime/methods.cxx
-index 41e7df4..cd38296 100644
+index 41e7df4..105e885 100644
--- basic/source/runtime/methods.cxx
+++ basic/source/runtime/methods.cxx
@@ -48,6 +48,7 @@
@@ -2080,25 +2080,7 @@ index 41e7df4..cd38296 100644
xSFI->createFolder( getFullPath( aPath ) );
}
catch( Exception & )
-# FIXME ooo330-m2: there is another implementation in the upstream sources (in basic/source/runtime/methods1.cxx)
-# the other implementation does not call rPar.Get(0)->PutInteger( 0 ); !!!!
-#@@ -858,6 +898,15 @@ RTLFUNC(SendKeys) // JSM
-# StarBASIC::Error(SbERR_NOT_IMPLEMENTED);
-# }
-#
-#+// Stub, basic already yields by default
-#+RTLFUNC(DoEvents)
-#+{
-#+ (void)pBasic;
-#+ (void)bWrite;
-#+
-#+ rPar.Get(0)->PutInteger( 0 );
-#+}
-#+
-# RTLFUNC(Exp)
-# {
-# (void)pBasic;
-@@ -940,6 +989,26 @@ RTLFUNC(Hex)
+@@ -940,6 +980,26 @@ RTLFUNC(Hex)
}
}
@@ -2125,7 +2107,7 @@ index 41e7df4..cd38296 100644
// InStr( [start],string,string,[compare] )
RTLFUNC(InStr)
-@@ -2411,7 +2480,18 @@ RTLFUNC(IsEmpty)
+@@ -2411,7 +2471,18 @@ RTLFUNC(IsEmpty)
if ( rPar.Count() < 2 )
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
@@ -2145,7 +2127,7 @@ index 41e7df4..cd38296 100644
}
RTLFUNC(IsError)
-@@ -2422,7 +2502,22 @@ RTLFUNC(IsError)
+@@ -2422,7 +2493,22 @@ RTLFUNC(IsError)
if ( rPar.Count() < 2 )
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
@@ -2169,7 +2151,7 @@ index 41e7df4..cd38296 100644
}
RTLFUNC(IsNull)
-@@ -3542,6 +3637,13 @@ RTLFUNC(Shell)
+@@ -3542,6 +3628,13 @@ RTLFUNC(Shell)
NAMESPACE_VOS(OArgumentList) aArgList( pArgumentList, nParamCount );
bSucc = pApp->execute( eOptions, aArgList ) == NAMESPACE_VOS(OProcess)::E_None;
}
@@ -2183,7 +2165,7 @@ index 41e7df4..cd38296 100644
/*
if( nParamCount == 0 )
-@@ -3556,7 +3658,7 @@ RTLFUNC(Shell)
+@@ -3556,7 +3649,7 @@ RTLFUNC(Shell)
if( !bSucc )
StarBASIC::Error( SbERR_FILE_NOT_FOUND );
else
@@ -2192,7 +2174,7 @@ index 41e7df4..cd38296 100644
}
}
-@@ -3627,6 +3729,65 @@ String getBasicTypeName( SbxDataType eType )
+@@ -3627,6 +3720,65 @@ String getBasicTypeName( SbxDataType eType )
return aRetStr;
}
@@ -2258,7 +2240,7 @@ index 41e7df4..cd38296 100644
RTLFUNC(TypeName)
{
(void)pBasic;
-@@ -3638,7 +3799,12 @@ RTLFUNC(TypeName)
+@@ -3638,7 +3790,12 @@ RTLFUNC(TypeName)
{
SbxDataType eType = rPar.Get(1)->GetType();
BOOL bIsArray = ( ( eType & SbxARRAY ) != 0 );
@@ -2273,7 +2255,7 @@ index 41e7df4..cd38296 100644
aRetStr.AppendAscii( "()" );
rPar.Get(0)->PutString( aRetStr );
diff --git basic/source/runtime/methods1.cxx basic/source/runtime/methods1.cxx
-index 69c6713..21aba9a 100644
+index f22a52c..9d3b51a 100644
--- basic/source/runtime/methods1.cxx
+++ basic/source/runtime/methods1.cxx
@@ -78,11 +78,15 @@
@@ -2292,7 +2274,7 @@ index 69c6713..21aba9a 100644
static Reference< XCalendar > getLocaleCalendar( void )
{
-@@ -2507,6 +2511,546 @@ RTLFUNC(Round)
+@@ -2518,6 +2522,546 @@ RTLFUNC(Round)
rPar.Get(0)->PutDouble( dRes );
}
@@ -2840,7 +2822,7 @@ index 69c6713..21aba9a 100644
{
(void)pBasic;
diff --git basic/source/runtime/rtlproto.hxx basic/source/runtime/rtlproto.hxx
-index 485abe4..d3cf77d 100644
+index 13485d7..236c1c2 100644
--- basic/source/runtime/rtlproto.hxx
+++ basic/source/runtime/rtlproto.hxx
@@ -164,29 +164,41 @@ extern RTLFUNC(Kill); // JSM
@@ -2885,7 +2867,7 @@ index 485abe4..d3cf77d 100644
extern RTLFUNC(Space);
extern RTLFUNC(Split);
extern RTLFUNC(Sqr);
-@@ -193,6 +206,7 @@ extern RTLFUNC(Str);
+@@ -194,6 +206,7 @@ extern RTLFUNC(Str);
extern RTLFUNC(StrComp);
extern RTLFUNC(String);
extern RTLFUNC(StrReverse);
@@ -2893,7 +2875,7 @@ index 485abe4..d3cf77d 100644
extern RTLFUNC(Tan);
extern RTLFUNC(UCase);
extern RTLFUNC(Val);
-@@ -295,6 +309,7 @@ extern RTLFUNC(Switch);
+@@ -296,6 +309,7 @@ extern RTLFUNC(Switch);
extern RTLFUNC(Wait);
//i#64882# add new WaitUntil
extern RTLFUNC(WaitUntil);
@@ -2902,7 +2884,7 @@ index 485abe4..d3cf77d 100644
extern RTLFUNC(GetGUIVersion);
extern RTLFUNC(Choose);
diff --git basic/source/runtime/runtime.cxx basic/source/runtime/runtime.cxx
-index c7d2d4e..2cff5d9 100755
+index b274950..5430964 100755
--- basic/source/runtime/runtime.cxx
+++ basic/source/runtime/runtime.cxx
@@ -45,6 +45,8 @@
@@ -2914,7 +2896,7 @@ index c7d2d4e..2cff5d9 100755
using namespace ::com::sun::star;
bool SbiRuntime::isVBAEnabled()
-@@ -542,7 +544,7 @@ SbxArray* SbiInstance::GetLocals( SbMethod* pMeth )
+@@ -543,7 +545,7 @@ SbxArray* SbiInstance::GetLocals( SbMethod* pMeth )
SbiRuntime::SbiRuntime( SbModule* pm, SbMethod* pe, UINT32 nStart )
: rBasic( *(StarBASIC*)pm->pParent ), pInst( pINST ),
@@ -2923,7 +2905,7 @@ index c7d2d4e..2cff5d9 100755
{
nFlags = pe ? pe->GetDebugFlags() : 0;
pIosys = pInst->pIosys;
-@@ -599,6 +601,13 @@ SbiRuntime::~SbiRuntime()
+@@ -600,6 +602,13 @@ SbiRuntime::~SbiRuntime()
void SbiRuntime::SetVBAEnabled(bool bEnabled )
{
bVBAEnabled = bEnabled;
@@ -2937,7 +2919,7 @@ index c7d2d4e..2cff5d9 100755
}
// Aufbau der Parameterliste. Alle ByRef-Parameter werden direkt
-@@ -1009,7 +1018,25 @@ SbxVariable* SbiRuntime::GetTOS( short n )
+@@ -1010,7 +1019,25 @@ SbxVariable* SbiRuntime::GetTOS( short n )
void SbiRuntime::TOSMakeTemp()
{
SbxVariable* p = refExprStk->Get( nExprLvl - 1 );
@@ -2964,7 +2946,7 @@ index c7d2d4e..2cff5d9 100755
{
SbxVariable* pNew = new SbxVariable( *p );
pNew->SetFlag( SBX_READWRITE );
-@@ -1018,7 +1045,6 @@ void SbiRuntime::TOSMakeTemp()
+@@ -1019,7 +1046,6 @@ void SbiRuntime::TOSMakeTemp()
}
// Der GOSUB-Stack nimmt Returnadressen fuer GOSUBs auf
@@ -2973,7 +2955,7 @@ index c7d2d4e..2cff5d9 100755
{
if( ++nGosubLvl > MAXRECURSION )
diff --git basic/source/runtime/stdobj.cxx basic/source/runtime/stdobj.cxx
-index c9baf95..55f88fd 100644
+index a4a7f7f..38b995d 100644
--- basic/source/runtime/stdobj.cxx
+++ basic/source/runtime/stdobj.cxx
@@ -33,7 +33,7 @@
@@ -3045,7 +3027,7 @@ index c9baf95..55f88fd 100644
{ "Date", SbxDATE, _LFUNCTION,RTLNAME(Date),0 },
{ "DateAdd", SbxDATE, 3 | _FUNCTION, RTLNAME(DateAdd),0 },
{ "Interval", SbxSTRING, 0,NULL,0 },
-@@ -269,6 +313,12 @@ static Methods aMethods[] = {
+@@ -270,6 +314,12 @@ static Methods aMethods[] = {
{ "FreeLibrary", SbxNULL, 1 | _FUNCTION, RTLNAME(FreeLibrary),0 },
{ "Modulename", SbxSTRING, 0,NULL,0 },
@@ -3058,7 +3040,7 @@ index c9baf95..55f88fd 100644
{ "Get", SbxNULL, 3 | _FUNCTION, RTLNAME(Get),0 },
{ "filenumber", SbxINTEGER, 0,NULL,0 },
{ "recordnumber", SbxLONG, 0,NULL,0 },
-@@ -329,6 +379,16 @@ static Methods aMethods[] = {
+@@ -330,6 +380,16 @@ static Methods aMethods[] = {
{ "Compare", SbxINTEGER, _OPT, NULL,0 },
{ "Int", SbxDOUBLE, 1 | _FUNCTION, RTLNAME(Int),0 },
{ "number", SbxDOUBLE, 0,NULL,0 },
@@ -3075,7 +3057,7 @@ index c9baf95..55f88fd 100644
{ "IsArray", SbxBOOL, 1 | _FUNCTION, RTLNAME(IsArray),0 },
{ "Variant", SbxVARIANT, 0,NULL,0 },
{ "IsDate", SbxBOOL, 1 | _FUNCTION, RTLNAME(IsDate),0 },
-@@ -397,6 +457,10 @@ static Methods aMethods[] = {
+@@ -400,6 +460,10 @@ static Methods aMethods[] = {
{ "Length", SbxLONG, _OPT, NULL,0 },
{ "Minute", SbxINTEGER, 1 | _FUNCTION, RTLNAME(Minute),0 },
{ "Date", SbxDATE, 0,NULL,0 },
@@ -3086,7 +3068,7 @@ index c9baf95..55f88fd 100644
{ "MkDir", SbxNULL, 1 | _FUNCTION, RTLNAME(MkDir),0 },
{ "pathname", SbxSTRING, 0,NULL,0 },
{ "Month", SbxINTEGER, 1 | _FUNCTION, RTLNAME(Month),0 },
-@@ -413,6 +477,15 @@ static Methods aMethods[] = {
+@@ -416,6 +480,15 @@ static Methods aMethods[] = {
{ "Nothing", SbxOBJECT, _CPROP, RTLNAME(Nothing),0 },
{ "Now", SbxDATE, _FUNCTION, RTLNAME(Now),0 },
@@ -3102,7 +3084,7 @@ index c9baf95..55f88fd 100644
{ "Null", SbxNULL, _CPROP, RTLNAME(Null),0 },
{ "Oct", SbxSTRING, 1 | _FUNCTION, RTLNAME(Oct),0 },
-@@ -424,16 +497,46 @@ static Methods aMethods[] = {
+@@ -427,16 +500,46 @@ static Methods aMethods[] = {
{ "stop", SbxLONG, 0,NULL,0 },
{ "interval", SbxLONG, 0,NULL,0 },
{ "Pi", SbxDOUBLE, _CPROP, RTLNAME(PI),0 },
@@ -3149,16 +3131,7 @@ index c9baf95..55f88fd 100644
{ "Red", SbxINTEGER, 1 | _FUNCTION, RTLNAME(Red),0 },
{ "RGB-Value", SbxLONG, 0,NULL,0 },
{ "Reset", SbxNULL, 0 | _FUNCTION, RTLNAME(Reset),0 },
-# FIXME ooo330-m2: there is another implementation in the upstream sources (in basic/source/runtime/methods1.cxx)
-#@@ -474,6 +577,7 @@ static Methods aMethods[] = {
-# { "SendKeys", SbxNULL, 2 | _FUNCTION, RTLNAME(SendKeys),0 },
-# { "String", SbxSTRING, 0,NULL,0 },
-# { "Wait", SbxBOOL, _OPT, NULL,0 },
-#+{ "DoEvents", SbxINTEGER, 0 | _FUNCTION, RTLNAME(DoEvents),0 },
-# { "SetAttr", SbxNULL, 2 | _FUNCTION, RTLNAME(SetAttr),0 },
-# { "File" , SbxSTRING, 0,NULL,0 },
-# { "Attributes", SbxINTEGER, 0,NULL,0 },
-@@ -487,6 +591,15 @@ static Methods aMethods[] = {
+@@ -490,6 +593,15 @@ static Methods aMethods[] = {
{ "WindowStyle", SbxINTEGER, _OPT, NULL,0 },
{ "Sin", SbxDOUBLE, 1 | _FUNCTION, RTLNAME(Sin),0 },
{ "number", SbxDOUBLE, 0,NULL,0 },
@@ -3174,7 +3147,7 @@ index c9baf95..55f88fd 100644
{ "Space", SbxSTRING, 1 | _FUNCTION, RTLNAME(Space),0 },
{ "string", SbxLONG, 0,NULL,0 },
{ "Spc", SbxSTRING, 1 | _FUNCTION, RTLNAME(Spc),0 },
-@@ -601,6 +714,7 @@ static Methods aMethods[] = {
+@@ -604,6 +716,7 @@ static Methods aMethods[] = {
{ "Wait", SbxNULL, 1 | _FUNCTION, RTLNAME(Wait),0 },
{ "Milliseconds", SbxLONG, 0,NULL,0 },
@@ -3182,7 +3155,7 @@ index c9baf95..55f88fd 100644
//#i64882#
{ "WaitUntil", SbxNULL, 1 | _FUNCTION, RTLNAME(WaitUntil),0 },
{ "Date", SbxDOUBLE, 0,NULL,0 },
-@@ -675,13 +793,15 @@ SbxVariable* SbiStdObject::Find( const String& rName, SbxClassType t )
+@@ -682,13 +795,15 @@ SbxVariable* SbiStdObject::Find( const String& rName, SbxClassType t )
&& ( p->nHash == nHash_ )
&& ( rName.EqualsIgnoreCaseAscii( p->pName ) ) )
{
@@ -3200,10 +3173,10 @@ index c9baf95..55f88fd 100644
}
nIndex += ( p->nArgs & _ARGSMASK ) + 1;
diff --git basic/source/runtime/step0.cxx basic/source/runtime/step0.cxx
-index 96a3e80..92c9e11 100644
+index 2c576e0..c675632 100644
--- basic/source/runtime/step0.cxx
+++ basic/source/runtime/step0.cxx
-@@ -45,6 +45,11 @@
+@@ -48,6 +48,11 @@ Reference< XInterface > createComListener( const Any& aControlAny, const ::rtl::
#include <algorithm>
@@ -3215,7 +3188,7 @@ index 96a3e80..92c9e11 100644
SbxVariable* getDefaultProp( SbxVariable* pRef );
void SbiRuntime::StepNOP()
-@@ -56,34 +61,6 @@ void SbiRuntime::StepArith( SbxOperator eOp )
+@@ -59,34 +64,6 @@ void SbiRuntime::StepArith( SbxOperator eOp )
TOSMakeTemp();
SbxVariable* p2 = GetTOS();
@@ -3250,7 +3223,7 @@ index 96a3e80..92c9e11 100644
p2->ResetFlag( SBX_FIXED );
p2->Compute( eOp, *p1 );
-@@ -106,19 +83,24 @@ void SbiRuntime::StepCompare( SbxOperator eOp )
+@@ -109,19 +86,24 @@ void SbiRuntime::StepCompare( SbxOperator eOp )
// values ( and type ) set as appropriate
SbxDataType p1Type = p1->GetType();
SbxDataType p2Type = p2->GetType();
@@ -3281,7 +3254,7 @@ index 96a3e80..92c9e11 100644
{
SbxVariable* pDflt = getDefaultProp( p1 );
if ( pDflt )
-@@ -138,8 +120,21 @@ void SbiRuntime::StepCompare( SbxOperator eOp )
+@@ -141,8 +123,21 @@ void SbiRuntime::StepCompare( SbxOperator eOp )
#ifndef WIN
static SbxVariable* pTRUE = NULL;
static SbxVariable* pFALSE = NULL;
@@ -3305,7 +3278,7 @@ index 96a3e80..92c9e11 100644
{
if( !pTRUE )
{
-@@ -160,9 +155,14 @@ void SbiRuntime::StepCompare( SbxOperator eOp )
+@@ -163,9 +158,14 @@ void SbiRuntime::StepCompare( SbxOperator eOp )
PushVar( pFALSE );
}
#else
@@ -3322,7 +3295,7 @@ index 96a3e80..92c9e11 100644
PushVar( pRes );
#endif
}
-@@ -639,6 +639,17 @@ void SbiRuntime::StepDIM()
+@@ -663,6 +663,17 @@ void SbiRuntime::StepDIM()
// #56204 DIM-Funktionalitaet in Hilfsmethode auslagern (step0.cxx)
void SbiRuntime::DimImpl( SbxVariableRef refVar )
{
@@ -3340,7 +3313,7 @@ index 96a3e80..92c9e11 100644
SbxArray* pDims = refVar->GetParameters();
// Muss eine gerade Anzahl Argumente haben
// Man denke daran, dass Arg[0] nicht zaehlt!
-@@ -804,6 +815,7 @@ void SbiRuntime::StepREDIMP()
+@@ -828,6 +839,7 @@ void SbiRuntime::StepREDIMP()
void SbiRuntime::StepREDIMP_ERASE()
{
SbxVariableRef refVar = PopVar();
@@ -3348,7 +3321,7 @@ index 96a3e80..92c9e11 100644
SbxDataType eType = refVar->GetType();
if( eType & SbxARRAY )
{
-@@ -814,12 +826,6 @@ void SbiRuntime::StepREDIMP_ERASE()
+@@ -838,12 +850,6 @@ void SbiRuntime::StepREDIMP_ERASE()
refRedimpArray = pDimArray;
}
@@ -3361,7 +3334,7 @@ index 96a3e80..92c9e11 100644
}
else
if( refVar->IsFixed() )
-@@ -892,10 +898,7 @@ void SbiRuntime::StepERASE()
+@@ -916,10 +922,7 @@ void SbiRuntime::StepERASE()
void SbiRuntime::StepERASE_CLEAR()
{
@@ -3374,7 +3347,7 @@ index 96a3e80..92c9e11 100644
void SbiRuntime::StepARRAYACCESS()
diff --git basic/source/runtime/step1.cxx basic/source/runtime/step1.cxx
-index cfbea24..fc8e952 100644
+index f448f79..0e564f0 100644
--- basic/source/runtime/step1.cxx
+++ basic/source/runtime/step1.cxx
@@ -93,6 +93,15 @@ void SbiRuntime::StepARGN( UINT32 nOp1 )
@@ -3405,7 +3378,7 @@ index cfbea24..fc8e952 100644
}
diff --git basic/source/runtime/step2.cxx basic/source/runtime/step2.cxx
-index fb79d2f..3693aff 100644
+index 48a0a0d..89e894e 100644
--- basic/source/runtime/step2.cxx
+++ basic/source/runtime/step2.cxx
@@ -141,7 +141,7 @@ SbxVariable* SbiRuntime::FindElement
@@ -3475,7 +3448,7 @@ index fb79d2f..3693aff 100644
}
SetupArgs( p, nOp1 );
PushVar( CheckArray( p ) );
-@@ -1132,16 +1136,26 @@ void SbiRuntime::StepGLOBAL( UINT32 nOp1, UINT32 nOp2 )
+@@ -1156,16 +1160,26 @@ void SbiRuntime::StepGLOBAL( UINT32 nOp1, UINT32 nOp2 )
if( pImg->GetFlag( SBIMG_CLASSMODULE ) )
StepPUBLIC_Impl( nOp1, nOp2, true );
@@ -3546,10 +3519,10 @@ index 34ca872..f535925 100644
aL.nLong = ~aL.nLong;
break;
diff --git basic/source/uno/dlgcont.cxx basic/source/uno/dlgcont.cxx
-index 4bbcb31..4985e35 100644
+index aee3d18..e0611ab 100644
--- basic/source/uno/dlgcont.cxx
+++ basic/source/uno/dlgcont.cxx
-@@ -318,8 +318,8 @@ Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement
+@@ -321,8 +321,8 @@ Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement
source.sSystemId = aFile;
try {
@@ -3560,7 +3533,7 @@ index 4bbcb31..4985e35 100644
xParser->parseStream( source );
}
catch( Exception& )
-@@ -333,7 +333,7 @@ Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement
+@@ -336,7 +336,7 @@ Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement
// Create InputStream, TODO: Implement own InputStreamProvider
// to avoid creating the DialogModel here!
@@ -3569,7 +3542,7 @@ index 4bbcb31..4985e35 100644
aRetAny <<= xISP;
return aRetAny;
}
-@@ -481,7 +481,11 @@ void SfxDialogLibraryContainer::onNewRootStorage()
+@@ -484,7 +484,11 @@ void SfxDialogLibraryContainer::onNewRootStorage()
}
}
@@ -3583,10 +3556,10 @@ index 4bbcb31..4985e35 100644
// Service
diff --git basic/source/uno/scriptcont.cxx basic/source/uno/scriptcont.cxx
-index c490571..025aeca 100644
+index 2bc4787..e1a18c9 100644
--- basic/source/uno/scriptcont.cxx
+++ basic/source/uno/scriptcont.cxx
-@@ -64,7 +64,8 @@
+@@ -66,7 +66,8 @@
#include <xmlscript/xmlmod_imexp.hxx>
#include <cppuhelper/factory.hxx>
#include <com/sun/star/util/VetoException.hpp>
@@ -3596,7 +3569,7 @@ index c490571..025aeca 100644
namespace basic
{
-@@ -135,7 +136,6 @@ sal_Bool SfxScriptLibraryContainer::hasLibraryPassword( const String& rLibraryNa
+@@ -137,7 +138,6 @@ sal_Bool SfxScriptLibraryContainer::hasLibraryPassword( const String& rLibraryNa
return pImplLib->mbPasswordProtected;
}
@@ -3604,7 +3577,7 @@ index c490571..025aeca 100644
// Ctor for service
SfxScriptLibraryContainer::SfxScriptLibraryContainer( void )
:maScriptLanguage( RTL_CONSTASCII_USTRINGPARAM( "StarBasic" ) )
-@@ -1047,6 +1047,17 @@ void SfxScriptLibraryContainer::onNewRootStorage()
+@@ -1167,6 +1167,17 @@ void SfxScriptLibraryContainer::onNewRootStorage()
{
}
@@ -3731,7 +3704,7 @@ index 8014281..0fb4aee 100644
public:
diff --git cui/source/options/optfltr.src cui/source/options/optfltr.src
-index 56d7897..cf00150 100644
+index e24da54..d9ff1c8 100644
--- cui/source/options/optfltr.src
+++ cui/source/options/optfltr.src
@@ -51,9 +51,16 @@ TabPage RID_OFAPAGE_MSFILTEROPT
@@ -7312,7 +7285,7 @@ index 0000000..eead43c
+}
+
diff --git filter/source/msfilter/msvbahelper.cxx filter/source/msfilter/msvbahelper.cxx
-index d1d40dc..ddd3528 100644
+index 2767e70..27e959b 100644
--- filter/source/msfilter/msvbahelper.cxx
+++ filter/source/msfilter/msvbahelper.cxx
@@ -38,6 +38,7 @@
@@ -7323,7 +7296,7 @@ index d1d40dc..ddd3528 100644
using namespace ::com::sun::star;
-@@ -97,7 +98,24 @@ SfxObjectShell* findShellForUrl( const rtl::OUString& sMacroURLOrPath )
+@@ -108,7 +109,24 @@ SfxObjectShell* findShellForUrl( const rtl::OUString& sMacroURLOrPath )
}
else
{
@@ -7349,7 +7322,7 @@ index d1d40dc..ddd3528 100644
{
pFoundShell = pShell;
break;
-@@ -204,9 +222,19 @@ VBAMacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const rtl::OUStrin
+@@ -221,9 +239,19 @@ VBAMacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const rtl::OUStrin
String sDocUrlOrPath = sMacroUrl.copy( 0, nDocSepIndex );
sMacroUrl = sMacroUrl.copy( nDocSepIndex + 1 );
OSL_TRACE("doc search, current shell is 0x%x", pShell );
@@ -7371,7 +7344,7 @@ index d1d40dc..ddd3528 100644
}
else
{
-@@ -320,14 +348,14 @@ VBAMacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const rtl::OUStrin
+@@ -337,14 +365,14 @@ VBAMacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const rtl::OUStrin
break;
}
}
@@ -7388,7 +7361,7 @@ index d1d40dc..ddd3528 100644
{
sal_Bool bRes = sal_False;
if ( !pShell )
-@@ -338,40 +366,23 @@ sal_Bool executeMacro( SfxObjectShell* pShell, const String& sMacroName, uno::Se
+@@ -355,40 +383,23 @@ sal_Bool executeMacro( SfxObjectShell* pShell, const String& sMacroName, uno::Se
uno::Sequence< uno::Any > aOutArgs;
try
@@ -7444,7 +7417,7 @@ index d1d40dc..ddd3528 100644
catch ( uno::Exception& e )
{
diff --git filter/source/msfilter/msvbasic.cxx filter/source/msfilter/msvbasic.cxx
-index f616d39..51af70b 100644
+index 33a76ac..bcd021a 100644
--- filter/source/msfilter/msvbasic.cxx
+++ filter/source/msfilter/msvbasic.cxx
@@ -37,11 +37,804 @@
@@ -8275,7 +8248,7 @@ index f616d39..51af70b 100644
if( !xVBAProject.Is() || SVSTREAM_OK != xVBAProject->GetError() )
{
DBG_WARNING("Not able to find vba project, cannot find macros");
-@@ -454,6 +1261,7 @@ bool VBA_Impl::Open( const String &rToplevel, const String &rSublevel )
+@@ -415,6 +1222,7 @@ bool VBA_Impl::Open( const String &rToplevel, const String &rSublevel )
if( !xMacros.Is() || SVSTREAM_OK != xMacros->GetError() )
{
DBG_WARNING("No Macros Storage");
@@ -8283,7 +8256,7 @@ index f616d39..51af70b 100644
}
else
{
-@@ -463,6 +1271,7 @@ bool VBA_Impl::Open( const String &rToplevel, const String &rSublevel )
+@@ -424,6 +1232,7 @@ bool VBA_Impl::Open( const String &rToplevel, const String &rSublevel )
if( !xVBA.Is() || SVSTREAM_OK != xVBA->GetError() )
{
DBG_WARNING("No Visual Basic in Storage");
@@ -8291,7 +8264,7 @@ index f616d39..51af70b 100644
}
else
{
-@@ -477,6 +1286,7 @@ bool VBA_Impl::Open( const String &rToplevel, const String &rSublevel )
+@@ -438,6 +1247,7 @@ bool VBA_Impl::Open( const String &rToplevel, const String &rSublevel )
* ( value ) is either a Class Module, Form Module or a plain VB Module. */
SvStorageStreamRef xProject = xMacros->OpenSotStream(
String( RTL_CONSTASCII_USTRINGPARAM( "PROJECT" ) ) );
@@ -8337,7 +8310,7 @@ index b163662..f35e3c8 100644
#endif
diff --git filter/source/msfilter/svxmsbas.cxx filter/source/msfilter/svxmsbas.cxx
-index 23ebeac..f98c1be 100644
+index 467c7f0..2db1522 100644
--- filter/source/msfilter/svxmsbas.cxx
+++ filter/source/msfilter/svxmsbas.cxx
@@ -65,26 +65,47 @@ using rtl::OUString;
@@ -8514,7 +8487,7 @@ index 23ebeac..f98c1be 100644
if( xLibContainer.is() && nStreamCount )
{
if( !xLibContainer->hasByName( aLibName ) )
-@@ -409,7 +507,11 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( const String& rStorageName,
+@@ -408,7 +506,11 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( const String& rStorageName,
if( nEnd == STRING_NOTFOUND )
pStr->Erase();
else
@@ -8526,7 +8499,7 @@ index 23ebeac..f98c1be 100644
}
}
if( aDecompressed.Get(j)->Len() )
-@@ -488,7 +590,6 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( const String& rStorageName,
+@@ -487,7 +589,6 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( const String& rStorageName,
bRet = true;
}
SFX_APP()->LeaveBasicCall();
@@ -8924,7 +8897,7 @@ index 47fefb3..1f40d74 100644
static const String& GetNativeSymbol( OpCode eOp );
diff --git formula/source/core/api/FormulaCompiler.cxx formula/source/core/api/FormulaCompiler.cxx
-index e54ac6a..4c2ab61 100644
+index fed0aab..fca0dc4 100644
--- formula/source/core/api/FormulaCompiler.cxx
+++ formula/source/core/api/FormulaCompiler.cxx
@@ -741,6 +741,30 @@ OpCode FormulaCompiler::GetEnglishOpCode( const String& rName ) const
@@ -9530,10 +9503,10 @@ index 0000000..48dbfaa
+
+#endif
diff --git offapi/com/sun/star/script/makefile.mk offapi/com/sun/star/script/makefile.mk
-index b694a75..c6c6416 100644
+index 24d5fcc..0282816 100644
--- offapi/com/sun/star/script/makefile.mk
+++ offapi/com/sun/star/script/makefile.mk
-@@ -47,6 +47,7 @@ IDLFILES=\
+@@ -48,6 +48,7 @@ IDLFILES=\
XLibraryContainerExport.idl\
XPersistentLibraryContainer.idl\
XStorageBasedLibraryContainer.idl\
@@ -9600,10 +9573,10 @@ index 0000000..b08a58c
+
+#endif
diff --git offapi/com/sun/star/sheet/makefile.mk offapi/com/sun/star/sheet/makefile.mk
-index dc1935b..212383c 100644
+index 0163781..fcc1c3e 100644
--- offapi/com/sun/star/sheet/makefile.mk
+++ offapi/com/sun/star/sheet/makefile.mk
-@@ -194,6 +194,7 @@ IDLFILES=\
+@@ -195,6 +195,7 @@ IDLFILES=\
Spreadsheet.idl\
SpreadsheetDocument.idl\
SpreadsheetDocumentSettings.idl\
@@ -9763,10 +9736,10 @@ index 33e28e2..972e8b3 100644
if( $module eq "vba" ) {
diff --git oovbaapi/ooo/vba/XApplicationBase.idl oovbaapi/ooo/vba/XApplicationBase.idl
-index bfcc75e..644a60f 100644
+index 6157d38..e69bf2b 100644
--- oovbaapi/ooo/vba/XApplicationBase.idl
+++ oovbaapi/ooo/vba/XApplicationBase.idl
-@@ -49,7 +49,7 @@ interface XApplicationBase
+@@ -55,7 +55,7 @@ interface XApplicationBase
void Quit();
any CommandBars( [in] any aIndex );
@@ -9789,10 +9762,10 @@ index ee5c833..48fa3d8 100644
}; };
diff --git oovbaapi/ooo/vba/XDocumentBase.idl oovbaapi/ooo/vba/XDocumentBase.idl
-index 5845d8b..5eabfb5 100644
+index bb45caf..04181bb 100644
--- oovbaapi/ooo/vba/XDocumentBase.idl
+++ oovbaapi/ooo/vba/XDocumentBase.idl
-@@ -50,7 +50,6 @@ interface XDocumentBase
+@@ -53,7 +53,6 @@ interface XDocumentBase
void Close([in] any SaveChanges, [in] any FileName, [in] any RouteWorkBook);
void Save();
void Activate();
@@ -10046,10 +10019,10 @@ index 0000000..ce6dba1
+
+#endif
diff --git oovbaapi/ooo/vba/excel/XApplication.idl oovbaapi/ooo/vba/excel/XApplication.idl
-index cae978d..1ab317d 100644
+index e7b9aee..0daf7f6 100644
--- oovbaapi/ooo/vba/excel/XApplication.idl
+++ oovbaapi/ooo/vba/excel/XApplication.idl
-@@ -39,6 +39,14 @@
+@@ -32,6 +32,14 @@
#include <ooo/vba/XHelperInterface.idl>
#include <ooo/vba/XAssistant.idl>
@@ -10064,7 +10037,7 @@ index cae978d..1ab317d 100644
module ooo { module vba { module excel {
interface XRange;
-@@ -48,6 +56,8 @@ interface XWorksheets;
+@@ -41,6 +49,8 @@ interface XWorksheets;
interface XWorksheetFunction;
interface XWindow;
interface XWorksheet;
@@ -10073,7 +10046,7 @@ index cae978d..1ab317d 100644
interface XApplication
{
-@@ -60,19 +70,27 @@ interface XApplication : com::sun::star::uno::XInterface
+@@ -56,19 +66,27 @@ interface XApplication
[attribute, readonly] XWindow ActiveWindow;
[attribute, readonly] XWorksheet ActiveSheet;
[attribute, readonly] ooo::vba::XAssistant Assistant;
@@ -10101,7 +10074,7 @@ index cae978d..1ab317d 100644
string LibraryPath() raises(com::sun::star::script::BasicErrorException);
string TemplatesPath() raises(com::sun::star::script::BasicErrorException);
string PathSeparator() raises(com::sun::star::script::BasicErrorException);
-@@ -95,8 +113,14 @@ interface XApplication : com::sun::star::uno::XInterface
+@@ -90,8 +108,14 @@ interface XApplication
XRange Union([in] XRange Arg1, [in] XRange Arg2, [in] /*Optional*/ any Arg3, [in] /*Optional*/ any Arg4, [in] /*Optional*/ any Arg5, [in] /*Optional*/ any Arg6, [in] /*Optional*/ any Arg7, [in] /*Optional*/ any Arg8, [in] /*Optional*/ any Arg9, [in] /*Optional*/ any Arg10, [in] /*Optional*/ any Arg11, [in] /*Optional*/ any Arg12, [in] /*Optional*/ any Arg13, [in] /*Optional*/ any Arg14, [in] /*Optional*/ any Arg15, [in] /*Optional*/ any Arg16, [in] /*Optional*/ any Arg17, [in] /*Optional*/ any Arg18, [in] /*Optional*/ any Arg19, [in] /*Optional*/ any Arg20, [in] /*Optional*/ any Arg21, [in] /*Optional*/ any Arg22, [in] /*Optional*/ any Arg23, [in] /*Optional*/ any Arg24, [in] /*Optional*/ any Arg25, [in] /*Optional*/ any Arg26, [in] /*Optional*/ any Arg27, [in] /*Optional*/ any Arg28, [in] /*Optional*/ any Arg29, [in] /*Optional*/ any Arg30)
raises(com::sun::star::script::BasicErrorException);
void Volatile([in] any Volatile);
@@ -10643,7 +10616,7 @@ index 0000000..c1a2442
+#endif
+
diff --git oovbaapi/ooo/vba/excel/XRange.idl oovbaapi/ooo/vba/excel/XRange.idl
-index afb1de6..772b87a 100644
+index 5d59a3b..4ed6fc4 100644
--- oovbaapi/ooo/vba/excel/XRange.idl
+++ oovbaapi/ooo/vba/excel/XRange.idl
@@ -42,6 +42,9 @@
@@ -10671,7 +10644,7 @@ index afb1de6..772b87a 100644
interface ::ooo::vba::excel::XFormat;
//interface ::ooo::vba::XHelperInterface;
-@@ -101,6 +107,7 @@ interface XRange
+@@ -102,6 +108,7 @@ interface XRange
[attribute] any Style;
[attribute] any AddIndent;
[attribute] any ShowDetail;
@@ -10679,7 +10652,7 @@ index afb1de6..772b87a 100644
XComment AddComment( [in] any Text );
void Clear();
-@@ -164,6 +171,11 @@ interface XRange
+@@ -166,6 +173,11 @@ interface XRange
void Subtotal( [in] long GroupBy, [in] long Function, [in] /*Optional*/ sequence<long> TotalList, [in] /*Optional*/ any Replace, [in] /*Optional*/ any PageBreaks, [in] any SummaryBelowData ) raises ( com::sun::star::script::BasicErrorException );
XRange MergeArea( ) raises ( com::sun::star::script::BasicErrorException );
any Hyperlinks( [in] any aIndex );
@@ -10715,7 +10688,7 @@ index e35b661..1a9807c 100644
}; }; };
diff --git oovbaapi/ooo/vba/excel/XWorksheet.idl oovbaapi/ooo/vba/excel/XWorksheet.idl
-index fb133ab..16c7f30 100644
+index f59c9eb..d23a40a 100644
--- oovbaapi/ooo/vba/excel/XWorksheet.idl
+++ oovbaapi/ooo/vba/excel/XWorksheet.idl
@@ -38,6 +38,7 @@
@@ -10746,10 +10719,10 @@ index fb133ab..16c7f30 100644
void Copy([in] any Before,[in] any After );
void Paste([in] any Destination,[in] any Link);
diff --git oovbaapi/ooo/vba/excel/makefile.mk oovbaapi/ooo/vba/excel/makefile.mk
-index 01e26d4..fd5c451 100644
+index 12dcf02..fba21db 100644
--- oovbaapi/ooo/vba/excel/makefile.mk
+++ oovbaapi/ooo/vba/excel/makefile.mk
-@@ -99,7 +99,13 @@ IDLFILES= XGlobals.idl\
+@@ -102,7 +102,13 @@ IDLFILES= XGlobals.idl\
XVPageBreak.idl \
XVPageBreaks.idl \
TextFrame.idl \
@@ -10765,7 +10738,7 @@ index 01e26d4..fd5c451 100644
# ------------------------------------------------------------------
diff --git oovbaapi/ooo/vba/makefile.mk oovbaapi/ooo/vba/makefile.mk
-index 7fc7030..a40ba1b 100644
+index 75f6465..d149f07 100644
--- oovbaapi/ooo/vba/makefile.mk
+++ oovbaapi/ooo/vba/makefile.mk
@@ -61,9 +61,13 @@ IDLFILES=\
@@ -10887,10 +10860,10 @@ index 8581392..49e4320 100644
//=============================================================================
diff --git oovbaapi/ooo/vba/msforms/XControl.idl oovbaapi/ooo/vba/msforms/XControl.idl
-index c3a050b..a3ce60d 100644
+index 50d15db..48f178e 100644
--- oovbaapi/ooo/vba/msforms/XControl.idl
+++ oovbaapi/ooo/vba/msforms/XControl.idl
-@@ -59,6 +59,7 @@ interface XControl
+@@ -63,6 +63,7 @@ interface XControl
[attribute] string Name;
[attribute] string ControlTipText;
[attribute] string Tag;
@@ -12976,7 +12949,7 @@ index e3a19e6..454a890 100644
# ------------------------------------------------------------------
diff --git oox/inc/oox/ole/vbacontrol.hxx oox/inc/oox/ole/vbacontrol.hxx
-index bc57d00..085a2f5 100755
+index 71f3a70..730d46d 100755
--- oox/inc/oox/ole/vbacontrol.hxx
+++ oox/inc/oox/ole/vbacontrol.hxx
@@ -29,6 +29,7 @@
@@ -12987,7 +12960,7 @@ index bc57d00..085a2f5 100755
namespace com { namespace sun { namespace star {
namespace container { class XNameContainer; }
-@@ -188,6 +189,7 @@ public:
+@@ -192,6 +193,7 @@ public:
/** Imports the form and its embedded controls, and inserts the form with
all its controls into the passed dialog library. */
void importForm(
@@ -12996,7 +12969,7 @@ index bc57d00..085a2f5 100755
StorageBase& rVbaFormStrg,
const ::rtl::OUString& rModuleName,
diff --git oox/source/ole/vbacontrol.cxx oox/source/ole/vbacontrol.cxx
-index 16e18b2..17cacce 100755
... etc. - the rest is truncated
More information about the ooo-build-commit
mailing list