ooo-build r13541 - in trunk: . patches/dev300 patches/vba
- From: noelpwer svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r13541 - in trunk: . patches/dev300 patches/vba
- Date: Wed, 13 Aug 2008 14:15:13 +0000 (UTC)
Author: noelpwer
Date: Wed Aug 13 14:15:13 2008
New Revision: 13541
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13541&view=rev
Log:
2008-08-13 Noel Power <noel power novell com>
* patches/dev300/cws-npower11.diff: latest version
* patches/vba/vba-workbook-worksheet-events.diff: fixes to deal
with changes resulting from updated cws-npower11.diff
* patches/vba/vbaevents-services-sources.diff:
* patches/dev300/userform-activex-identify.diff: new patch to
identify activex controls correctly
* patches/dev300/apply: add patch above
* patches/dev300/default-autotext-and-form-name.diff: fix build failure
when building with --enable-dbgutils
Modified:
trunk/ChangeLog
trunk/patches/dev300/apply
trunk/patches/dev300/cws-npower11.diff
trunk/patches/dev300/default-autotext-and-form-name.diff
trunk/patches/dev300/userform-activex-identify.diff
trunk/patches/vba/vba-workbook-worksheet-events.diff
trunk/patches/vba/vbaevents-services-sources.diff
Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Wed Aug 13 14:15:13 2008
@@ -1511,6 +1511,9 @@
# keywords (including NAME, LINE, TEXT) can be used as variable
vba-keyword-fix.diff, n#403586, Fong
+#some userform import issues including improved identification
+#of the progressbar activex control
+userform-activex-identify.diff
[ VBAUntested ]
SectionOwner => noelpwer
vba-basic-null.diff i#85349, jjiao
Modified: trunk/patches/dev300/cws-npower11.diff
==============================================================================
--- trunk/patches/dev300/cws-npower11.diff (original)
+++ trunk/patches/dev300/cws-npower11.diff Wed Aug 13 14:15:13 2008
@@ -1,18 +1,11 @@
-cvs diff: Diffing sc
-cvs diff: Diffing sc/addin
-cvs diff: Diffing sc/addin/datefunc
-cvs diff: Diffing sc/addin/inc
-cvs diff: Diffing sc/addin/rot13
-cvs diff: Diffing sc/addin/util
-cvs diff: Diffing sc/inc
Index: sc/inc/document.hxx
===================================================================
RCS file: /cvs/sc/sc/inc/document.hxx,v
retrieving revision 1.115
-retrieving revision 1.115.22.1
-diff -u -p -b -w -B -r1.115 -r1.115.22.1
+retrieving revision 1.115.22.3
+diff -u -p -u -p -b -w -B -r1.115 -r1.115.22.3
--- sc/inc/document.hxx 8 Jul 2008 07:19:13 -0000 1.115
-+++ sc/inc/document.hxx 29 Jul 2008 06:35:39 -0000 1.115.22.1
++++ sc/inc/document.hxx 7 Aug 2008 07:40:08 -0000 1.115.22.3
@@ -703,7 +703,7 @@ SC_DLLPUBLIC ScDBCollection* GetDBCollec
BOOL HasBackgroundDraw( SCTAB nTab, const Rectangle& rMMRect );
BOOL HasAnyDraw( SCTAB nTab, const Rectangle& rMMRect );
@@ -27,7 +20,7 @@
RCS file: /cvs/sc/sc/inc/olinetab.hxx,v
retrieving revision 1.6
retrieving revision 1.6.96.1
-diff -u -p -b -w -B -r1.6 -r1.6.96.1
+diff -u -p -u -p -b -w -B -r1.6 -r1.6.96.1
--- sc/inc/olinetab.hxx 10 Apr 2008 18:41:55 -0000 1.6
+++ sc/inc/olinetab.hxx 29 Jul 2008 06:35:39 -0000 1.6.96.1
@@ -114,7 +114,7 @@ public:
@@ -39,68 +32,14 @@
BOOL GetEntryIndex( USHORT nLevel, SCCOLROW nPos, USHORT& rnIndex ) const;
BOOL GetEntryIndexInRange(
-cvs diff: Diffing sc/inc/pch
-cvs diff: Diffing sc/prj
-cvs diff: Diffing sc/qa
-cvs diff: Diffing sc/qa/complex
-cvs diff: Diffing sc/qa/complex/calcPreview
-cvs diff: Diffing sc/qa/complex/calcPreview/test_documents
-cvs diff: Diffing sc/qa/complex/cellRanges
-cvs diff: Diffing sc/qa/complex/dataPilot
-cvs diff: Diffing sc/qa/complex/dataPilot/interfaceTests
-cvs diff: Diffing sc/qa/complex/dataPilot/interfaceTests/beans
-cvs diff: Diffing sc/qa/complex/dataPilot/interfaceTests/container
-cvs diff: Diffing sc/qa/complex/dataPilot/interfaceTests/sheet
-cvs diff: Diffing sc/qa/complex/sc
-cvs diff: Diffing sc/qa/unoapi
-cvs diff: Diffing sc/qa/unoapi/testdocuments
-cvs diff: Diffing sc/sdi
-cvs diff: Diffing sc/source
-cvs diff: Diffing sc/source/core
-cvs diff: Diffing sc/source/core/data
-cvs diff: Diffing sc/source/core/inc
-cvs diff: Diffing sc/source/core/src
-cvs diff: Diffing sc/source/core/tool
-cvs diff: Diffing sc/source/filter
-cvs diff: Diffing sc/source/filter/dif
-cvs diff: Diffing sc/source/filter/excel
-cvs diff: Diffing sc/source/filter/ftools
-cvs diff: Diffing sc/source/filter/html
-cvs diff: Diffing sc/source/filter/inc
-cvs diff: Diffing sc/source/filter/lotus
-cvs diff: Diffing sc/source/filter/qpro
-cvs diff: Diffing sc/source/filter/rtf
-cvs diff: Diffing sc/source/filter/starcalc
-cvs diff: Diffing sc/source/filter/xcl97
-cvs diff: Diffing sc/source/filter/xml
-cvs diff: Diffing sc/source/ui
-cvs diff: Diffing sc/source/ui/Accessibility
-cvs diff: Diffing sc/source/ui/app
-cvs diff: Diffing sc/source/ui/attrdlg
-cvs diff: Diffing sc/source/ui/cctrl
-cvs diff: Diffing sc/source/ui/dbgui
-cvs diff: Diffing sc/source/ui/docshell
-cvs diff: Diffing sc/source/ui/drawfunc
-cvs diff: Diffing sc/source/ui/formdlg
-cvs diff: Diffing sc/source/ui/inc
-cvs diff: Diffing sc/source/ui/miscdlgs
-cvs diff: Diffing sc/source/ui/namedlg
-cvs diff: Diffing sc/source/ui/navipi
-cvs diff: Diffing sc/source/ui/optdlg
-cvs diff: Diffing sc/source/ui/pagedlg
-cvs diff: Diffing sc/source/ui/src
-cvs diff: Diffing sc/source/ui/styleui
-cvs diff: Diffing sc/source/ui/undo
-cvs diff: Diffing sc/source/ui/unoobj
-cvs diff: Diffing sc/source/ui/vba
Index: sc/source/ui/vba/makefile.mk
===================================================================
RCS file: /cvs/sc/sc/source/ui/vba/makefile.mk,v
retrieving revision 1.6
-retrieving revision 1.5.42.5
-diff -u -p -b -w -B -r1.6 -r1.5.42.5
+retrieving revision 1.5.42.7
+diff -u -p -u -p -b -w -B -r1.6 -r1.5.42.7
--- sc/source/ui/vba/makefile.mk 11 Apr 2008 00:46:57 -0000 1.6
-+++ sc/source/ui/vba/makefile.mk 29 Jul 2008 06:35:39 -0000 1.5.42.5
++++ sc/source/ui/vba/makefile.mk 4 Aug 2008 08:35:52 -0000 1.5.42.7
@@ -88,6 +88,7 @@ SLOFILES= \
$(SLO)$/vbabutton.obj \
$(SLO)$/vbalabel.obj \
@@ -109,10 +48,12 @@
$(SLO)$/vbaradiobutton.obj \
$(SLO)$/vbalistbox.obj \
$(SLO)$/vbapropvalue.obj \
-@@ -111,6 +112,24 @@ SLOFILES= \
+@@ -111,8 +112,25 @@ SLOFILES= \
$(SLO)$/vbaformatconditions.obj \
$(SLO)$/vbastyle.obj \
$(SLO)$/vbastyles.obj \
+- $(SLO)$/service.obj \
+-
+ $(SLO)$/vbaassistant.obj \
+ $(SLO)$/vbauserform.obj \
+ $(SLO)$/vbacheckbox.obj \
@@ -131,18 +72,19 @@
+ $(SLO)$/vbapagebreak.obj \
+ $(SLO)$/vbapagebreaks.obj \
+ $(SLO)$/vbaspinbutton.obj \
- $(SLO)$/service.obj \
-
++ $(SLO)$/service.obj
+
+ # --- Targets ------------------------------------------------------
Index: sc/source/ui/vba/service.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/vba/service.cxx,v
retrieving revision 1.4
-retrieving revision 1.3.42.3
-diff -u -p -b -w -B -r1.4 -r1.3.42.3
+retrieving revision 1.3.42.5
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.5
--- sc/source/ui/vba/service.cxx 11 Apr 2008 00:47:11 -0000 1.4
-+++ sc/source/ui/vba/service.cxx 29 Jul 2008 06:35:39 -0000 1.3.42.3
-@@ -53,11 +53,22 @@ namespace worksheet
++++ sc/source/ui/vba/service.cxx 7 Aug 2008 07:40:10 -0000 1.3.42.5
+@@ -53,12 +53,22 @@ namespace worksheet
{
extern sdecl::ServiceDecl const serviceDecl;
}
@@ -155,6 +97,7 @@
extern sdecl::ServiceDecl const serviceDecl;
}
-
+-
+namespace userform
+{
+extern sdecl::ServiceDecl const serviceDecl;
@@ -164,9 +107,9 @@
+extern sdecl::ServiceDecl const serviceDecl;
+}
-
extern "C"
-@@ -76,7 +87,7 @@ extern "C"
+ {
+@@ -76,7 +86,7 @@ extern "C"
// Component registration
if ( component_writeInfoHelper( pServiceManager, pRegistryKey,
@@ -175,7 +118,7 @@
{
// Singleton registration
try
-@@ -104,7 +115,7 @@ extern "C"
+@@ -104,7 +114,7 @@ extern "C"
{
OSL_TRACE("In component_getFactory for %s", pImplName );
void* pRet = component_getFactoryHelper(
@@ -189,7 +132,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/vbaapplication.cxx,v
retrieving revision 1.7
retrieving revision 1.5.42.4
-diff -u -p -b -w -B -r1.7 -r1.5.42.4
+diff -u -p -u -p -b -w -B -r1.7 -r1.5.42.4
--- sc/source/ui/vba/vbaapplication.cxx 11 Apr 2008 00:47:25 -0000 1.7
+++ sc/source/ui/vba/vbaapplication.cxx 29 Jul 2008 06:35:39 -0000 1.5.42.4
@@ -42,6 +42,7 @@
@@ -389,7 +332,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/vbaapplication.hxx,v
retrieving revision 1.4
retrieving revision 1.3.42.3
-diff -u -p -b -w -B -r1.4 -r1.3.42.3
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.3
--- sc/source/ui/vba/vbaapplication.hxx 11 Apr 2008 00:47:42 -0000 1.4
+++ sc/source/ui/vba/vbaapplication.hxx 29 Jul 2008 06:35:39 -0000 1.3.42.3
@@ -75,6 +75,8 @@ public:
@@ -651,7 +594,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/vbaaxis.cxx,v
retrieving revision 1.3
retrieving revision 1.2.42.2
-diff -u -p -b -w -B -r1.3 -r1.2.42.2
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.2
--- sc/source/ui/vba/vbaaxis.cxx 11 Apr 2008 00:48:27 -0000 1.3
+++ sc/source/ui/vba/vbaaxis.cxx 6 Jul 2008 15:31:03 -0000 1.2.42.2
@@ -42,8 +42,8 @@ using namespace ::org::openoffice::excel
@@ -694,7 +637,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/vbabutton.cxx,v
retrieving revision 1.3
retrieving revision 1.2.42.2
-diff -u -p -b -w -B -r1.3 -r1.2.42.2
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.2
--- sc/source/ui/vba/vbabutton.cxx 11 Apr 2008 00:50:02 -0000 1.3
+++ sc/source/ui/vba/vbabutton.cxx 6 Jul 2008 15:31:19 -0000 1.2.42.2
@@ -35,7 +35,7 @@ using namespace org::openoffice;
@@ -734,7 +677,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/vbabutton.hxx,v
retrieving revision 1.3
retrieving revision 1.2.42.2
-diff -u -p -b -w -B -r1.3 -r1.2.42.2
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.2
--- sc/source/ui/vba/vbabutton.hxx 11 Apr 2008 00:50:19 -0000 1.3
+++ sc/source/ui/vba/vbabutton.hxx 6 Jul 2008 15:29:34 -0000 1.2.42.2
@@ -40,10 +40,12 @@ typedef cppu::ImplInheritanceHelper1< Sc
@@ -757,7 +700,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/vbacharacters.cxx,v
retrieving revision 1.4
retrieving revision 1.3.42.2
-diff -u -p -b -w -B -r1.4 -r1.3.42.2
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.2
--- sc/source/ui/vba/vbacharacters.cxx 11 Apr 2008 00:50:34 -0000 1.4
+++ sc/source/ui/vba/vbacharacters.cxx 6 Jul 2008 15:30:46 -0000 1.3.42.2
@@ -46,7 +46,11 @@ ScVbaCharacters::ScVbaCharacters( const
@@ -959,7 +902,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/vbacombobox.cxx,v
retrieving revision 1.4
retrieving revision 1.3.42.2
-diff -u -p -b -w -B -r1.4 -r1.3.42.2
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.2
--- sc/source/ui/vba/vbacombobox.cxx 11 Apr 2008 00:55:28 -0000 1.4
+++ sc/source/ui/vba/vbacombobox.cxx 6 Jul 2008 15:29:37 -0000 1.3.42.2
@@ -34,34 +34,93 @@ using namespace com::sun::star;
@@ -1091,7 +1034,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/vbacombobox.hxx,v
retrieving revision 1.4
retrieving revision 1.3.42.2
-diff -u -p -b -w -B -r1.4 -r1.3.42.2
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.2
--- sc/source/ui/vba/vbacombobox.hxx 11 Apr 2008 00:55:42 -0000 1.4
+++ sc/source/ui/vba/vbacombobox.hxx 6 Jul 2008 15:30:26 -0000 1.3.42.2
@@ -44,22 +44,16 @@
@@ -2782,7 +2725,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/vbacontrol.cxx,v
retrieving revision 1.3
retrieving revision 1.2.42.3
-diff -u -p -b -w -B -r1.3 -r1.2.42.3
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.3
--- sc/source/ui/vba/vbacontrol.cxx 11 Apr 2008 00:57:50 -0000 1.3
+++ sc/source/ui/vba/vbacontrol.cxx 29 Jul 2008 06:35:41 -0000 1.2.42.3
@@ -44,17 +44,26 @@
@@ -3166,7 +3109,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/vbacontrol.hxx,v
retrieving revision 1.3
retrieving revision 1.2.42.2
-diff -u -p -b -w -B -r1.3 -r1.2.42.2
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.2
--- sc/source/ui/vba/vbacontrol.hxx 11 Apr 2008 00:58:09 -0000 1.3
+++ sc/source/ui/vba/vbacontrol.hxx 6 Jul 2008 15:30:36 -0000 1.2.42.2
@@ -35,40 +35,33 @@
@@ -3430,7 +3373,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/vbaglobals.cxx,v
retrieving revision 1.4
retrieving revision 1.3.42.2
-diff -u -p -b -w -B -r1.4 -r1.3.42.2
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.2
--- sc/source/ui/vba/vbaglobals.cxx 11 Apr 2008 01:02:04 -0000 1.4
+++ sc/source/ui/vba/vbaglobals.cxx 6 Jul 2008 15:29:30 -0000 1.3.42.2
@@ -153,9 +153,9 @@ ScVbaGlobals::Range( const uno::Any& Cel
@@ -3450,7 +3393,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/vbaglobals.hxx,v
retrieving revision 1.4
retrieving revision 1.3.42.2
-diff -u -p -b -w -B -r1.4 -r1.3.42.2
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.2
--- sc/source/ui/vba/vbaglobals.hxx 11 Apr 2008 01:02:19 -0000 1.4
+++ sc/source/ui/vba/vbaglobals.hxx 6 Jul 2008 15:30:20 -0000 1.3.42.2
@@ -70,6 +70,6 @@
@@ -3466,7 +3409,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/vbahelper.cxx,v
retrieving revision 1.5
retrieving revision 1.3.42.4
-diff -u -p -b -w -B -r1.5 -r1.3.42.4
+diff -u -p -u -p -b -w -B -r1.5 -r1.3.42.4
--- sc/source/ui/vba/vbahelper.cxx 11 Apr 2008 01:02:33 -0000 1.5
+++ sc/source/ui/vba/vbahelper.cxx 6 Jul 2008 15:30:59 -0000 1.3.42.4
@@ -37,6 +37,7 @@
@@ -3603,7 +3546,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/vbahelper.hxx,v
retrieving revision 1.5
retrieving revision 1.4.42.3
-diff -u -p -b -w -B -r1.5 -r1.4.42.3
+diff -u -p -u -p -b -w -B -r1.5 -r1.4.42.3
--- sc/source/ui/vba/vbahelper.hxx 11 Apr 2008 01:02:47 -0000 1.5
+++ sc/source/ui/vba/vbahelper.hxx 6 Jul 2008 15:31:23 -0000 1.4.42.3
@@ -31,14 +31,18 @@
@@ -3957,7 +3900,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/vbainterior.cxx,v
retrieving revision 1.5
retrieving revision 1.5.96.1
-diff -u -p -b -w -B -r1.5 -r1.5.96.1
+diff -u -p -u -p -b -w -B -r1.5 -r1.5.96.1
--- sc/source/ui/vba/vbainterior.cxx 11 Apr 2008 01:03:23 -0000 1.5
+++ sc/source/ui/vba/vbainterior.cxx 29 Jul 2008 06:35:41 -0000 1.5.96.1
@@ -34,8 +34,11 @@
@@ -4317,7 +4260,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/vbainterior.hxx,v
retrieving revision 1.4
retrieving revision 1.4.96.1
-diff -u -p -b -w -B -r1.4 -r1.4.96.1
+diff -u -p -u -p -b -w -B -r1.4 -r1.4.96.1
--- sc/source/ui/vba/vbainterior.hxx 11 Apr 2008 01:03:36 -0000 1.4
+++ sc/source/ui/vba/vbainterior.hxx 29 Jul 2008 06:35:41 -0000 1.4.96.1
@@ -46,8 +46,23 @@ class ScVbaInterior : public ScVbaInter
@@ -4362,7 +4305,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/vbalabel.cxx,v
retrieving revision 1.3
retrieving revision 1.2.42.2
-diff -u -p -b -w -B -r1.3 -r1.2.42.2
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.2
--- sc/source/ui/vba/vbalabel.cxx 11 Apr 2008 01:03:52 -0000 1.3
+++ sc/source/ui/vba/vbalabel.cxx 6 Jul 2008 15:30:14 -0000 1.2.42.2
@@ -35,7 +35,7 @@ using namespace org::openoffice;
@@ -4416,7 +4359,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/vbalabel.hxx,v
retrieving revision 1.3
retrieving revision 1.2.42.2
-diff -u -p -b -w -B -r1.3 -r1.2.42.2
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.2
--- sc/source/ui/vba/vbalabel.hxx 11 Apr 2008 01:04:06 -0000 1.3
+++ sc/source/ui/vba/vbalabel.hxx 6 Jul 2008 15:30:52 -0000 1.2.42.2
@@ -34,16 +34,23 @@
@@ -4451,7 +4394,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/vbalistbox.cxx,v
retrieving revision 1.4
retrieving revision 1.3.42.3
-diff -u -p -b -w -B -r1.4 -r1.3.42.3
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.3
--- sc/source/ui/vba/vbalistbox.cxx 11 Apr 2008 01:05:34 -0000 1.4
+++ sc/source/ui/vba/vbalistbox.cxx 29 Jul 2008 06:35:41 -0000 1.3.42.3
@@ -37,31 +37,49 @@
@@ -4670,7 +4613,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/vbalistbox.hxx,v
retrieving revision 1.3
retrieving revision 1.2.42.3
-diff -u -p -b -w -B -r1.3 -r1.2.42.3
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.3
--- sc/source/ui/vba/vbalistbox.hxx 11 Apr 2008 01:05:48 -0000 1.3
+++ sc/source/ui/vba/vbalistbox.hxx 29 Jul 2008 06:35:41 -0000 1.2.42.3
@@ -49,14 +49,11 @@ class ScVbaListBox : public ListBoxImpl_
@@ -4925,7 +4868,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/vbaname.cxx,v
retrieving revision 1.3
retrieving revision 1.2.42.2
-diff -u -p -b -w -B -r1.3 -r1.2.42.2
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.2
--- sc/source/ui/vba/vbaname.cxx 11 Apr 2008 01:06:07 -0000 1.3
+++ sc/source/ui/vba/vbaname.cxx 6 Jul 2008 15:31:26 -0000 1.2.42.2
@@ -31,6 +31,7 @@
@@ -5038,7 +4981,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/vbanames.cxx,v
retrieving revision 1.3
retrieving revision 1.2.42.2
-diff -u -p -b -w -B -r1.3 -r1.2.42.2
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.2
--- sc/source/ui/vba/vbanames.cxx 11 Apr 2008 01:06:56 -0000 1.3
+++ sc/source/ui/vba/vbanames.cxx 6 Jul 2008 15:29:52 -0000 1.2.42.2
@@ -70,6 +70,7 @@ ScVbaNames::ScVbaNames(const css::uno::R
@@ -6970,7 +6913,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/vbaradiobutton.cxx,v
retrieving revision 1.3
retrieving revision 1.2.42.2
-diff -u -p -b -w -B -r1.3 -r1.2.42.2
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.2
--- sc/source/ui/vba/vbaradiobutton.cxx 11 Apr 2008 01:12:55 -0000 1.3
+++ sc/source/ui/vba/vbaradiobutton.cxx 6 Jul 2008 15:31:33 -0000 1.2.42.2
@@ -36,7 +36,7 @@ using namespace org::openoffice;
@@ -7047,7 +6990,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/vbaradiobutton.hxx,v
retrieving revision 1.3
retrieving revision 1.2.42.2
-diff -u -p -b -w -B -r1.3 -r1.2.42.2
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.2
--- sc/source/ui/vba/vbaradiobutton.hxx 11 Apr 2008 01:13:09 -0000 1.3
+++ sc/source/ui/vba/vbaradiobutton.hxx 6 Jul 2008 15:30:03 -0000 1.2.42.2
@@ -29,24 +29,27 @@
@@ -7089,10 +7032,10 @@
===================================================================
RCS file: /cvs/sc/sc/source/ui/vba/vbarange.cxx,v
retrieving revision 1.9
-retrieving revision 1.5.34.11
-diff -u -p -b -w -B -r1.9 -r1.5.34.11
+retrieving revision 1.5.34.13
+diff -u -p -u -p -b -w -B -r1.9 -r1.5.34.13
--- sc/source/ui/vba/vbarange.cxx 14 May 2008 10:03:31 -0000 1.9
-+++ sc/source/ui/vba/vbarange.cxx 29 Jul 2008 09:36:01 -0000 1.5.34.11
++++ sc/source/ui/vba/vbarange.cxx 12 Aug 2008 19:39:18 -0000 1.5.34.13
@@ -115,6 +115,7 @@
#include <org/openoffice/excel/XlCellType.hpp>
#include <org/openoffice/excel/XlSpecialCellsValue.hpp>
@@ -7242,7 +7185,7 @@
RangeHelper thisRange( mxRange );
table::CellRangeAddress thisRangeAddress = thisRange.getCellRangeAddressable()->getRangeAddress();
-@@ -2686,6 +2763,166 @@ ScVbaRange::Replace( const ::rtl::OUStri
+@@ -2686,6 +2763,167 @@ ScVbaRange::Replace( const ::rtl::OUStri
return sal_True; // always
}
@@ -7390,7 +7333,8 @@
+ ScGlobal::SetSearchItem( newOptions );
+
+ uno::Reference< util::XSearchDescriptor > xSearchDescriptor( xDescriptor, uno::UNO_QUERY );
-+ uno::Reference< table::XCellRange > xCellRange( xSearch->findNext( xStartCell, xSearchDescriptor ), 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 );
+ if ( xCellRange.is() )
+ {
+ uno::Reference< excel::XRange > xResultRange = new ScVbaRange( this, mxContext, xCellRange );
@@ -7409,7 +7353,21 @@
uno::Reference< table::XCellRange > processKey( const uno::Any& Key, uno::Reference< uno::XComponentContext >& xContext, ScDocShell* pDocSh )
{
uno::Reference< excel::XRange > xKeyRange;
-@@ -3116,6 +3353,18 @@ ScVbaRange::hasElements() throw (uno::Ru
+@@ -2739,10 +2977,10 @@ void updateTableSortField( const uno::Re
+
+ // make sure that upper left poing of key range is within the
+ // parent range
+- if ( colRowKeyAddress.StartColumn >= parentRangeAddress.StartColumn &&
+- colRowKeyAddress.StartColumn <= parentRangeAddress.EndColumn &&
++ if ( ( !bIsSortColumn && colRowKeyAddress.StartColumn >= parentRangeAddress.StartColumn &&
++ colRowKeyAddress.StartColumn <= parentRangeAddress.EndColumn ) || ( bIsSortColumn &&
+ colRowKeyAddress.StartRow >= parentRangeAddress.StartRow &&
+- colRowKeyAddress.StartRow <= parentRangeAddress.EndRow )
++ colRowKeyAddress.StartRow <= parentRangeAddress.EndRow ) )
+ {
+ //determine col/row index
+ if ( bIsSortColumn )
+@@ -3116,6 +3354,18 @@ ScVbaRange::hasElements() throw (uno::Ru
uno::Reference< container::XEnumeration > SAL_CALL
ScVbaRange::createEnumeration() throw (uno::RuntimeException)
{
@@ -7428,7 +7386,7 @@
return new CellsEnumeration( mxContext, m_Areas );
}
-@@ -4119,7 +4368,7 @@ ScVbaRange::Autofit() throw (uno::Runtim
+@@ -4119,7 +4369,7 @@ ScVbaRange::Autofit() throw (uno::Runtim
// if the range is a not a row or column range autofit will
// throw an error
@@ -7437,7 +7395,7 @@
DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString());
ScDocShell* pDocShell = getDocShellFromRange( mxRange );
if ( pDocShell )
-@@ -4298,6 +4547,113 @@ void ScVbaRange::setFormulaHidden(const
+@@ -4298,6 +4548,113 @@ void ScVbaRange::setFormulaHidden(const
xProps->setPropertyValue(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CELLPRO)), uno::makeAny(rCellAttr));
}
@@ -7551,7 +7509,7 @@
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)
-@@ -4516,7 +4872,7 @@ ScVbaRange::AutoOutline( ) throw (scrip
+@@ -4516,7 +4873,7 @@ ScVbaRange::AutoOutline( ) throw (scrip
{
// #TODO #FIXME needs to check for summary row/col ( whatever they are )
// not valid for multi Area Addresses
@@ -7560,7 +7518,7 @@
DebugHelper::exception(SbERR_METHOD_FAILED, STR_ERRORMESSAGE_APPLIESTOSINGLERANGEONLY);
// So needs to either span an entire Row or a just be a single cell
// ( that contains a summary RowColumn )
-@@ -4734,6 +5090,7 @@ ScVbaRange::SpecialCells( const uno::Any
+@@ -4734,6 +5091,7 @@ ScVbaRange::SpecialCells( const uno::Any
case excel::XlCellType::xlCellTypeConstants:
case excel::XlCellType::xlCellTypeFormulas:
case excel::XlCellType::xlCellTypeVisible:
@@ -7573,7 +7531,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/vbarange.hxx,v
retrieving revision 1.6
retrieving revision 1.6.70.1
-diff -u -p -b -w -B -r1.6 -r1.6.70.1
+diff -u -p -u -p -b -w -B -r1.6 -r1.6.70.1
--- sc/source/ui/vba/vbarange.hxx 14 May 2008 10:03:47 -0000 1.6
+++ sc/source/ui/vba/vbarange.hxx 29 Jul 2008 06:35:42 -0000 1.6.70.1
@@ -171,6 +171,10 @@ public:
@@ -7827,7 +7785,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/vbashape.cxx,v
retrieving revision 1.4
retrieving revision 1.3.34.2
-diff -u -p -b -w -B -r1.4 -r1.3.34.2
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.34.2
--- sc/source/ui/vba/vbashape.cxx 11 Apr 2008 01:16:34 -0000 1.4
+++ sc/source/ui/vba/vbashape.cxx 6 Jul 2008 15:29:40 -0000 1.3.34.2
@@ -50,13 +50,13 @@ using namespace ::org::openoffice;
@@ -7851,7 +7809,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/vbashape.hxx,v
retrieving revision 1.3
retrieving revision 1.2.42.3
-diff -u -p -b -w -B -r1.3 -r1.2.42.3
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.3
--- sc/source/ui/vba/vbashape.hxx 11 Apr 2008 01:16:51 -0000 1.3
+++ sc/source/ui/vba/vbashape.hxx 6 Jul 2008 15:30:30 -0000 1.2.42.3
@@ -47,21 +47,22 @@ typedef InheritedHelperInterfaceImpl< Li
@@ -8069,7 +8027,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/vbatextbox.cxx,v
retrieving revision 1.3
retrieving revision 1.2.42.2
-diff -u -p -b -w -B -r1.3 -r1.2.42.2
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.2
--- sc/source/ui/vba/vbatextbox.cxx 11 Apr 2008 01:19:17 -0000 1.3
+++ sc/source/ui/vba/vbatextbox.cxx 6 Jul 2008 15:30:55 -0000 1.2.42.2
@@ -37,11 +37,24 @@ using namespace org::openoffice;
@@ -8141,7 +8099,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/vbatextbox.hxx,v
retrieving revision 1.3
retrieving revision 1.2.42.2
-diff -u -p -b -w -B -r1.3 -r1.2.42.2
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.42.2
--- sc/source/ui/vba/vbatextbox.hxx 11 Apr 2008 01:19:33 -0000 1.3
+++ sc/source/ui/vba/vbatextbox.hxx 6 Jul 2008 15:31:16 -0000 1.2.42.2
@@ -38,16 +38,20 @@ typedef cppu::ImplInheritanceHelper1< Sc
@@ -8814,7 +8772,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/vbawindow.cxx,v
retrieving revision 1.5
retrieving revision 1.3.42.4
-diff -u -p -b -w -B -r1.5 -r1.3.42.4
+diff -u -p -u -p -b -w -B -r1.5 -r1.3.42.4
--- sc/source/ui/vba/vbawindow.cxx 11 Apr 2008 01:21:13 -0000 1.5
+++ sc/source/ui/vba/vbawindow.cxx 29 Jul 2008 06:35:43 -0000 1.3.42.4
@@ -27,6 +27,7 @@
@@ -9092,7 +9050,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/vbawindow.hxx,v
retrieving revision 1.4
retrieving revision 1.3.42.3
-diff -u -p -b -w -B -r1.4 -r1.3.42.3
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.3
--- sc/source/ui/vba/vbawindow.hxx 11 Apr 2008 01:21:27 -0000 1.4
+++ sc/source/ui/vba/vbawindow.hxx 29 Jul 2008 06:35:43 -0000 1.3.42.3
@@ -53,14 +53,19 @@ private:
@@ -9160,7 +9118,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/vbaworkbook.cxx,v
retrieving revision 1.5
retrieving revision 1.4.42.2
-diff -u -p -b -w -B -r1.5 -r1.4.42.2
+diff -u -p -u -p -b -w -B -r1.5 -r1.4.42.2
--- sc/source/ui/vba/vbaworkbook.cxx 11 Apr 2008 01:22:11 -0000 1.5
+++ sc/source/ui/vba/vbaworkbook.cxx 6 Jul 2008 15:29:44 -0000 1.4.42.2
@@ -428,14 +428,18 @@ ScVbaWorkbook::Styles( const::uno::Any&
@@ -9188,7 +9146,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/vbaworkbook.hxx,v
retrieving revision 1.4
retrieving revision 1.3.42.2
-diff -u -p -b -w -B -r1.4 -r1.3.42.2
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.2
--- sc/source/ui/vba/vbaworkbook.hxx 11 Apr 2008 01:22:26 -0000 1.4
+++ sc/source/ui/vba/vbaworkbook.hxx 6 Jul 2008 15:30:33 -0000 1.3.42.2
@@ -75,7 +75,7 @@ public:
@@ -9205,7 +9163,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/vbaworksheet.cxx,v
retrieving revision 1.5
retrieving revision 1.3.42.5
-diff -u -p -b -w -B -r1.5 -r1.3.42.5
+diff -u -p -u -p -b -w -B -r1.5 -r1.3.42.5
--- sc/source/ui/vba/vbaworksheet.cxx 11 Apr 2008 01:23:10 -0000 1.5
+++ sc/source/ui/vba/vbaworksheet.cxx 29 Jul 2008 06:35:43 -0000 1.3.42.5
@@ -47,6 +47,7 @@
@@ -9465,7 +9423,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/vbaworksheet.hxx,v
retrieving revision 1.4
retrieving revision 1.3.42.4
-diff -u -p -b -w -B -r1.4 -r1.3.42.4
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.4
--- sc/source/ui/vba/vbaworksheet.hxx 11 Apr 2008 01:23:24 -0000 1.4
+++ sc/source/ui/vba/vbaworksheet.hxx 29 Jul 2008 06:35:43 -0000 1.3.42.4
@@ -42,6 +42,8 @@
@@ -9506,13 +9464,12 @@
// XHelperInterface
virtual rtl::OUString& getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
-cvs diff: Diffing sc/source/ui/vba/testvba
Index: sc/source/ui/vba/testvba/README
===================================================================
RCS file: /cvs/sc/sc/source/ui/vba/testvba/README,v
retrieving revision 1.2
retrieving revision 1.2.42.1
-diff -u -p -b -w -B -r1.2 -r1.2.42.1
+diff -u -p -u -p -b -w -B -r1.2 -r1.2.42.1
--- sc/source/ui/vba/testvba/README 7 Dec 2007 11:14:59 -0000 1.2
+++ sc/source/ui/vba/testvba/README 29 Jul 2008 07:22:41 -0000 1.2.42.1
@@ -1,35 +1,37 @@
@@ -9582,7 +9539,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/testvba/makefile.mk,v
retrieving revision 1.3
retrieving revision 1.3.96.2
-diff -u -p -b -w -B -r1.3 -r1.3.96.2
+diff -u -p -u -p -b -w -B -r1.3 -r1.3.96.2
--- sc/source/ui/vba/testvba/makefile.mk 11 Apr 2008 01:25:09 -0000 1.3
+++ sc/source/ui/vba/testvba/makefile.mk 29 Jul 2008 09:36:01 -0000 1.3.96.2
@@ -30,28 +30,44 @@
@@ -9958,7 +9915,7 @@
RCS file: /cvs/sc/sc/source/ui/vba/testvba/testResults.pl,v
retrieving revision 1.2
retrieving revision 1.2.42.1
-diff -u -p -b -w -B -r1.2 -r1.2.42.1
+diff -u -p -u -p -b -w -B -r1.2 -r1.2.42.1
--- sc/source/ui/vba/testvba/testResults.pl 7 Dec 2007 11:15:50 -0000 1.2
+++ sc/source/ui/vba/testvba/testResults.pl 29 Jul 2008 07:22:42 -0000 1.2.42.1
@@ -1,5 +1,5 @@
@@ -10309,124 +10266,121 @@
+ }
+
+}
-cvs diff: Diffing sc/source/ui/vba/testvba/TestDocuments
Index: sc/source/ui/vba/testvba/TestDocuments/AutoFilter.xls
===================================================================
RCS file: sc/source/ui/vba/testvba/TestDocuments/AutoFilter.xls
diff -N sc/source/ui/vba/testvba/TestDocuments/AutoFilter.xls
-Binary files /dev/null and /tmp/cvs6sa4KP differ
+Binary files /dev/null and /tmp/cvsN7lahZ differ
Index: sc/source/ui/vba/testvba/TestDocuments/MiscRangeTests.xls
===================================================================
RCS file: sc/source/ui/vba/testvba/TestDocuments/MiscRangeTests.xls
diff -N sc/source/ui/vba/testvba/TestDocuments/MiscRangeTests.xls
-Binary files /dev/null and /tmp/cvs7sa4KP differ
+Binary files /dev/null and /tmp/cvsPYP5as differ
Index: sc/source/ui/vba/testvba/TestDocuments/PageBreaks.xls
===================================================================
RCS file: sc/source/ui/vba/testvba/TestDocuments/PageBreaks.xls
diff -N sc/source/ui/vba/testvba/TestDocuments/PageBreaks.xls
-Binary files /dev/null and /tmp/cvs8sa4KP differ
+Binary files /dev/null and /tmp/cvsks0q5U differ
Index: sc/source/ui/vba/testvba/TestDocuments/PageSetup.xls
===================================================================
RCS file: sc/source/ui/vba/testvba/TestDocuments/PageSetup.xls
diff -N sc/source/ui/vba/testvba/TestDocuments/PageSetup.xls
-Binary files /dev/null and /tmp/cvs9sa4KP differ
+Binary files /dev/null and /tmp/cvsZEEZZn differ
Index: sc/source/ui/vba/testvba/TestDocuments/Ranges-2.xls
===================================================================
RCS file: sc/source/ui/vba/testvba/TestDocuments/Ranges-2.xls
diff -N sc/source/ui/vba/testvba/TestDocuments/Ranges-2.xls
-Binary files /dev/null and /tmp/cvs.sa4KP differ
+Binary files /dev/null and /tmp/cvs224MUQ differ
Index: sc/source/ui/vba/testvba/TestDocuments/Ranges-3.xls
===================================================================
RCS file: sc/source/ui/vba/testvba/TestDocuments/Ranges-3.xls
diff -N sc/source/ui/vba/testvba/TestDocuments/Ranges-3.xls
-Binary files /dev/null and /tmp/cvs_sa4KP differ
+Binary files /dev/null and /tmp/cvsdgdVZj differ
Index: sc/source/ui/vba/testvba/TestDocuments/Ranges.xls
===================================================================
RCS file: sc/source/ui/vba/testvba/TestDocuments/Ranges.xls
diff -N sc/source/ui/vba/testvba/TestDocuments/Ranges.xls
-Binary files /dev/null and /tmp/cvsata4KP differ
+Binary files /dev/null and /tmp/cvsTNdg5M differ
Index: sc/source/ui/vba/testvba/TestDocuments/Shapes.xls
===================================================================
RCS file: sc/source/ui/vba/testvba/TestDocuments/Shapes.xls
diff -N sc/source/ui/vba/testvba/TestDocuments/Shapes.xls
-Binary files /dev/null and /tmp/cvsbta4KP differ
+Binary files /dev/null and /tmp/cvskqGClg differ
Index: sc/source/ui/vba/testvba/TestDocuments/StrConv-test.xls
===================================================================
RCS file: sc/source/ui/vba/testvba/TestDocuments/StrConv-test.xls
diff -N sc/source/ui/vba/testvba/TestDocuments/StrConv-test.xls
-Binary files /dev/null and /tmp/cvscta4KP differ
+Binary files /dev/null and /tmp/cvsv0wjCJ differ
Index: sc/source/ui/vba/testvba/TestDocuments/Template.xls
===================================================================
RCS file: sc/source/ui/vba/testvba/TestDocuments/Template.xls
diff -N sc/source/ui/vba/testvba/TestDocuments/Template.xls
-Binary files /dev/null and /tmp/cvsdta4KP differ
+Binary files /dev/null and /tmp/cvsGageTc differ
Index: sc/source/ui/vba/testvba/TestDocuments/TestAddress.xls
===================================================================
RCS file: sc/source/ui/vba/testvba/TestDocuments/TestAddress.xls
diff -N sc/source/ui/vba/testvba/TestDocuments/TestAddress.xls
-Binary files /dev/null and /tmp/cvseta4KP differ
+Binary files /dev/null and /tmp/cvsgjDmaG differ
Index: sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest.xls
===================================================================
RCS file: sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest.xls
diff -N sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest.xls
-Binary files /dev/null and /tmp/cvsfta4KP differ
+Binary files /dev/null and /tmp/cvss3PGr9 differ
Index: sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest2.xls
===================================================================
RCS file: sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest2.xls
diff -N sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest2.xls
-Binary files /dev/null and /tmp/cvsgta4KP differ
+Binary files /dev/null and /tmp/cvsoRbfJC differ
Index: sc/source/ui/vba/testvba/TestDocuments/Window.xls
===================================================================
RCS file: sc/source/ui/vba/testvba/TestDocuments/Window.xls
diff -N sc/source/ui/vba/testvba/TestDocuments/Window.xls
-Binary files /dev/null and /tmp/cvshta4KP differ
+Binary files /dev/null and /tmp/cvsfSI205 differ
Index: sc/source/ui/vba/testvba/TestDocuments/bytearraystring.xls
===================================================================
RCS file: sc/source/ui/vba/testvba/TestDocuments/bytearraystring.xls
diff -N sc/source/ui/vba/testvba/TestDocuments/bytearraystring.xls
-Binary files /dev/null and /tmp/cvsita4KP differ
+Binary files /dev/null and /tmp/cvs5UQ7iz differ
Index: sc/source/ui/vba/testvba/TestDocuments/dateserial.xls
===================================================================
RCS file: sc/source/ui/vba/testvba/TestDocuments/dateserial.xls
diff -N sc/source/ui/vba/testvba/TestDocuments/dateserial.xls
-Binary files /dev/null and /tmp/cvsjta4KP differ
+Binary files /dev/null and /tmp/cvsrkxpB2 differ
Index: sc/source/ui/vba/testvba/TestDocuments/datevalue.xls
===================================================================
RCS file: sc/source/ui/vba/testvba/TestDocuments/datevalue.xls
diff -N sc/source/ui/vba/testvba/TestDocuments/datevalue.xls
-Binary files /dev/null and /tmp/cvskta4KP differ
+Binary files /dev/null and /tmp/cvs2JWSTv differ
Index: sc/source/ui/vba/testvba/TestDocuments/format.xls
===================================================================
RCS file: sc/source/ui/vba/testvba/TestDocuments/format.xls
diff -N sc/source/ui/vba/testvba/TestDocuments/format.xls
-Binary files /dev/null and /tmp/cvslta4KP differ
+Binary files /dev/null and /tmp/cvsQGszcZ differ
Index: sc/source/ui/vba/testvba/TestDocuments/partition.xls
===================================================================
RCS file: sc/source/ui/vba/testvba/TestDocuments/partition.xls
diff -N sc/source/ui/vba/testvba/TestDocuments/partition.xls
-Binary files /dev/null and /tmp/cvsmta4KP differ
+Binary files /dev/null and /tmp/cvsi7nAvs differ
Index: sc/source/ui/vba/testvba/TestDocuments/range-4.xls
===================================================================
RCS file: sc/source/ui/vba/testvba/TestDocuments/range-4.xls
diff -N sc/source/ui/vba/testvba/TestDocuments/range-4.xls
-Binary files /dev/null and /tmp/cvsnta4KP differ
+Binary files /dev/null and /tmp/cvsd9XOOV differ
Index: sc/source/ui/vba/testvba/TestDocuments/replace.xls
===================================================================
RCS file: sc/source/ui/vba/testvba/TestDocuments/replace.xls
diff -N sc/source/ui/vba/testvba/TestDocuments/replace.xls
-Binary files /dev/null and /tmp/cvsota4KP differ
+Binary files /dev/null and /tmp/cvsW7X7gp differ
Index: sc/source/ui/vba/testvba/TestDocuments/stringplusdouble.xls
===================================================================
RCS file: sc/source/ui/vba/testvba/TestDocuments/stringplusdouble.xls
diff -N sc/source/ui/vba/testvba/TestDocuments/stringplusdouble.xls
-Binary files /dev/null and /tmp/cvspta4KP differ
+Binary files /dev/null and /tmp/cvsjg5FJS differ
Index: sc/source/ui/vba/testvba/TestDocuments/window2.xls
===================================================================
RCS file: sc/source/ui/vba/testvba/TestDocuments/window2.xls
diff -N sc/source/ui/vba/testvba/TestDocuments/window2.xls
-Binary files /dev/null and /tmp/cvsqta4KP differ
-cvs diff: Diffing sc/source/ui/vba/testvba/TestDocuments/logs
-cvs diff: Diffing sc/source/ui/vba/testvba/TestDocuments/logs/excel
+Binary files /dev/null and /tmp/cvsRHptcm differ
Index: sc/source/ui/vba/testvba/TestDocuments/logs/excel/AutoFilter.log
===================================================================
RCS file: sc/source/ui/vba/testvba/TestDocuments/logs/excel/AutoFilter.log
@@ -11090,7 +11044,6 @@
+ TEST Not succesfully completed : RangeTest3
+END TestCalc
+Test run finished : 31/05/2007 11:02:12
-cvs diff: Diffing sc/source/ui/vba/testvba/TestDocuments/logs/unix
Index: sc/source/ui/vba/testvba/TestDocuments/logs/unix/AutoFilter.log
===================================================================
RCS file: sc/source/ui/vba/testvba/TestDocuments/logs/unix/AutoFilter.log
@@ -12348,7 +12301,6 @@
+ TEST OK : Test Windows.Count
+END Window2
+Test run finished : 05/29/2008 02:55:48 PM
-cvs diff: Diffing sc/source/ui/vba/testvba/TestDocuments/logs/win
Index: sc/source/ui/vba/testvba/TestDocuments/logs/win/AutoFilter.log
===================================================================
RCS file: sc/source/ui/vba/testvba/TestDocuments/logs/win/AutoFilter.log
@@ -13212,29 +13164,6 @@
+ TEST OK : Test Replace function
+END Replace
+Test run finished : 2007-11-21 11:24:04
-cvs diff: Diffing sc/source/ui/view
-cvs diff: Diffing sc/uiconfig
-cvs diff: Diffing sc/uiconfig/scalc
-cvs diff: Diffing sc/uiconfig/scalc/accelerator
-cvs diff: Diffing sc/uiconfig/scalc/accelerator/de
-cvs diff: Diffing sc/uiconfig/scalc/accelerator/en-GB
-cvs diff: Diffing sc/uiconfig/scalc/accelerator/en-US
-cvs diff: Diffing sc/uiconfig/scalc/accelerator/es
-cvs diff: Diffing sc/uiconfig/scalc/accelerator/fr
-cvs diff: Diffing sc/uiconfig/scalc/menubar
-cvs diff: Diffing sc/uiconfig/scalc/statusbar
-cvs diff: Diffing sc/uiconfig/scalc/toolbar
-cvs diff: Diffing sc/util
-cvs diff: Diffing sc/util/defs
-cvs diff: Diffing sc/workben
-cvs diff: Diffing sc/workben/celltrans
-cvs diff: Diffing sc/xml
-cvs diff: Diffing oovbaapi
-cvs diff: Diffing oovbaapi/genconstidl
-cvs diff: Diffing oovbaapi/org
-cvs diff: Diffing oovbaapi/org/openoffice
-cvs diff: Diffing oovbaapi/org/openoffice/constants
-cvs diff: Diffing oovbaapi/org/openoffice/excel
Index: oovbaapi/org/openoffice/excel/Hyperlink.idl
===================================================================
RCS file: oovbaapi/org/openoffice/excel/Hyperlink.idl
@@ -13362,7 +13291,7 @@
RCS file: /cvs/api/oovbaapi/org/openoffice/excel/XApplication.idl,v
retrieving revision 1.4
retrieving revision 1.3.4.3
-diff -u -p -b -w -B -r1.4 -r1.3.4.3
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.4.3
--- oovbaapi/org/openoffice/excel/XApplication.idl 11 Apr 2008 09:46:23 -0000 1.4
+++ oovbaapi/org/openoffice/excel/XApplication.idl 29 Jul 2008 06:27:52 -0000 1.3.4.3
@@ -38,6 +38,14 @@
@@ -13630,7 +13559,7 @@
RCS file: /cvs/api/oovbaapi/org/openoffice/excel/XInterior.idl,v
retrieving revision 1.4
retrieving revision 1.4.6.1
-diff -u -p -b -w -B -r1.4 -r1.4.6.1
+diff -u -p -u -p -b -w -B -r1.4 -r1.4.6.1
--- oovbaapi/org/openoffice/excel/XInterior.idl 11 Apr 2008 09:52:54 -0000 1.4
+++ oovbaapi/org/openoffice/excel/XInterior.idl 29 Jul 2008 06:27:52 -0000 1.4.6.1
@@ -51,6 +51,9 @@ interface XInterior
@@ -13820,7 +13749,7 @@
RCS file: /cvs/api/oovbaapi/org/openoffice/excel/XRange.idl,v
retrieving revision 1.4
retrieving revision 1.4.6.1
-diff -u -p -b -w -B -r1.4 -r1.4.6.1
+diff -u -p -u -p -b -w -B -r1.4 -r1.4.6.1
--- oovbaapi/org/openoffice/excel/XRange.idl 11 Apr 2008 09:55:48 -0000 1.4
+++ oovbaapi/org/openoffice/excel/XRange.idl 29 Jul 2008 06:27:52 -0000 1.4.6.1
@@ -103,6 +103,7 @@ interface XRange
@@ -13852,7 +13781,7 @@
RCS file: /cvs/api/oovbaapi/org/openoffice/excel/XWindow.idl,v
retrieving revision 1.4
retrieving revision 1.3.4.2
-diff -u -p -b -w -B -r1.4 -r1.3.4.2
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.4.2
--- oovbaapi/org/openoffice/excel/XWindow.idl 11 Apr 2008 09:57:44 -0000 1.4
+++ oovbaapi/org/openoffice/excel/XWindow.idl 6 Jul 2008 15:37:37 -0000 1.3.4.2
@@ -44,6 +44,8 @@ module org { module openoffice { modul
@@ -13911,7 +13840,7 @@
RCS file: /cvs/api/oovbaapi/org/openoffice/excel/XWorkbook.idl,v
retrieving revision 1.4
retrieving revision 1.3.4.2
-diff -u -p -b -w -B -r1.4 -r1.3.4.2
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.4.2
--- oovbaapi/org/openoffice/excel/XWorkbook.idl 11 Apr 2008 09:58:14 -0000 1.4
+++ oovbaapi/org/openoffice/excel/XWorkbook.idl 6 Jul 2008 15:37:43 -0000 1.3.4.2
@@ -71,7 +71,7 @@ interface XWorkbook
@@ -13928,7 +13857,7 @@
RCS file: /cvs/api/oovbaapi/org/openoffice/excel/XWorksheet.idl,v
retrieving revision 1.4
retrieving revision 1.3.4.3
-diff -u -p -b -w -B -r1.4 -r1.3.4.3
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.4.3
--- oovbaapi/org/openoffice/excel/XWorksheet.idl 11 Apr 2008 09:58:44 -0000 1.4
+++ oovbaapi/org/openoffice/excel/XWorksheet.idl 29 Jul 2008 06:27:52 -0000 1.3.4.3
@@ -51,6 +51,8 @@ module org { module openoffice { modul
@@ -13970,7 +13899,7 @@
RCS file: /cvs/api/oovbaapi/org/openoffice/excel/makefile.mk,v
retrieving revision 1.4
retrieving revision 1.4.6.1
-diff -u -p -b -w -B -r1.4 -r1.4.6.1
+diff -u -p -u -p -b -w -B -r1.4 -r1.4.6.1
--- oovbaapi/org/openoffice/excel/makefile.mk 11 Apr 2008 09:59:47 -0000 1.4
+++ oovbaapi/org/openoffice/excel/makefile.mk 29 Jul 2008 06:27:52 -0000 1.4.6.1
@@ -96,6 +96,13 @@ IDLFILES= XApplication.idl\
@@ -13987,13 +13916,12 @@
# ------------------------------------------------------------------
-cvs diff: Diffing oovbaapi/org/openoffice/msforms
Index: oovbaapi/org/openoffice/msforms/XComboBox.idl
===================================================================
RCS file: /cvs/api/oovbaapi/org/openoffice/msforms/XComboBox.idl,v
retrieving revision 1.3
retrieving revision 1.2.8.2
-diff -u -p -b -w -B -r1.3 -r1.2.8.2
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.8.2
--- oovbaapi/org/openoffice/msforms/XComboBox.idl 11 Apr 2008 10:00:49 -0000 1.3
+++ oovbaapi/org/openoffice/msforms/XComboBox.idl 6 Jul 2008 15:37:49 -0000 1.2.8.2
@@ -44,6 +44,7 @@ module org { module openoffice { modul
@@ -14009,7 +13937,7 @@
RCS file: /cvs/api/oovbaapi/org/openoffice/msforms/XControl.idl,v
retrieving revision 1.3
retrieving revision 1.2.4.2
-diff -u -p -b -w -B -r1.3 -r1.2.4.2
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.4.2
--- oovbaapi/org/openoffice/msforms/XControl.idl 11 Apr 2008 10:01:02 -0000 1.3
+++ oovbaapi/org/openoffice/msforms/XControl.idl 6 Jul 2008 15:37:58 -0000 1.2.4.2
@@ -37,12 +37,17 @@
@@ -14100,7 +14028,7 @@
RCS file: /cvs/api/oovbaapi/org/openoffice/msforms/XLabel.idl,v
retrieving revision 1.3
retrieving revision 1.2.4.2
-diff -u -p -b -w -B -r1.3 -r1.2.4.2
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.4.2
--- oovbaapi/org/openoffice/msforms/XLabel.idl 11 Apr 2008 10:01:32 -0000 1.3
+++ oovbaapi/org/openoffice/msforms/XLabel.idl 6 Jul 2008 15:38:07 -0000 1.2.4.2
@@ -41,6 +41,7 @@ module org { module openoffice { modul
@@ -14116,7 +14044,7 @@
RCS file: /cvs/api/oovbaapi/org/openoffice/msforms/XListBox.idl,v
retrieving revision 1.3
retrieving revision 1.2.4.3
-diff -u -p -b -w -B -r1.3 -r1.2.4.3
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.4.3
--- oovbaapi/org/openoffice/msforms/XListBox.idl 11 Apr 2008 10:02:04 -0000 1.3
+++ oovbaapi/org/openoffice/msforms/XListBox.idl 29 Jul 2008 06:27:52 -0000 1.2.4.3
@@ -44,8 +44,10 @@ interface XListBox: com::sun::star::uno:
@@ -14332,7 +14260,7 @@
RCS file: /cvs/api/oovbaapi/org/openoffice/msforms/XRadioButton.idl,v
retrieving revision 1.3
retrieving revision 1.2.4.2
-diff -u -p -b -w -B -r1.3 -r1.2.4.2
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.4.2
--- oovbaapi/org/openoffice/msforms/XRadioButton.idl 11 Apr 2008 10:02:36 -0000 1.3
+++ oovbaapi/org/openoffice/msforms/XRadioButton.idl 6 Jul 2008 15:38:04 -0000 1.2.4.2
@@ -41,7 +41,7 @@ module org { module openoffice { modul
@@ -14483,7 +14411,7 @@
RCS file: /cvs/api/oovbaapi/org/openoffice/msforms/XTextBox.idl,v
retrieving revision 1.3
retrieving revision 1.2.4.2
-diff -u -p -b -w -B -r1.3 -r1.2.4.2
+diff -u -p -u -p -b -w -B -r1.3 -r1.2.4.2
--- oovbaapi/org/openoffice/msforms/XTextBox.idl 11 Apr 2008 10:03:37 -0000 1.3
+++ oovbaapi/org/openoffice/msforms/XTextBox.idl 6 Jul 2008 15:38:01 -0000 1.2.4.2
@@ -41,7 +41,7 @@ module org { module openoffice { modul
@@ -14699,7 +14627,7 @@
RCS file: /cvs/api/oovbaapi/org/openoffice/msforms/makefile.mk,v
retrieving revision 1.4
retrieving revision 1.3.4.4
-diff -u -p -b -w -B -r1.4 -r1.3.4.4
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.4.4
--- oovbaapi/org/openoffice/msforms/makefile.mk 11 Apr 2008 10:03:53 -0000 1.4
+++ oovbaapi/org/openoffice/msforms/makefile.mk 29 Jul 2008 06:27:52 -0000 1.3.4.4
@@ -60,7 +60,15 @@ IDLFILES=\
@@ -14719,7 +14647,6 @@
# ------------------------------------------------------------------
-cvs diff: Diffing oovbaapi/org/openoffice/vba
Index: oovbaapi/org/openoffice/vba/XAssistant.idl
===================================================================
RCS file: oovbaapi/org/openoffice/vba/XAssistant.idl
@@ -15075,7 +15002,7 @@
RCS file: /cvs/api/oovbaapi/org/openoffice/vba/XGlobals.idl,v
retrieving revision 1.4
retrieving revision 1.3.4.2
-diff -u -p -b -w -B -r1.4 -r1.3.4.2
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.4.2
--- oovbaapi/org/openoffice/vba/XGlobals.idl 11 Apr 2008 10:05:01 -0000 1.4
+++ oovbaapi/org/openoffice/vba/XGlobals.idl 6 Jul 2008 15:37:34 -0000 1.3.4.2
@@ -57,7 +57,7 @@ interface XGlobals: com::sun::star::uno:
@@ -15092,7 +15019,7 @@
RCS file: /cvs/api/oovbaapi/org/openoffice/vba/makefile.mk,v
retrieving revision 1.4
retrieving revision 1.3.4.3
-diff -u -p -b -w -B -r1.4 -r1.3.4.3
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.4.3
--- oovbaapi/org/openoffice/vba/makefile.mk 11 Apr 2008 10:06:09 -0000 1.4
+++ oovbaapi/org/openoffice/vba/makefile.mk 29 Jul 2008 06:27:53 -0000 1.3.4.3
@@ -52,6 +52,11 @@ IDLFILES=\
@@ -15107,5 +15034,20 @@
Globals.idl\
# ------------------------------------------------------------------
-cvs diff: Diffing oovbaapi/prj
-cvs diff: Diffing oovbaapi/util
+Index: offapi/com/sun/star/document/makefile.mk
+===================================================================
+RCS file: /cvs/api/offapi/com/sun/star/document/makefile.mk,v
+retrieving revision 1.47
+retrieving revision 1.47.32.2
+diff -u -p -u -p -b -w -B -r1.47 -r1.47.32.2
+--- offapi/com/sun/star/document/makefile.mk 1 Jul 2008 12:38:47 -0000 1.47
++++ offapi/com/sun/star/document/makefile.mk 7 Aug 2008 06:23:37 -0000 1.47.32.2
+@@ -108,7 +108,7 @@ IDLFILES=\
+ LinkUpdateModes.idl\
+ XDocumentRevisionListPersistence.idl\
+ DocumentRevisionListPersistence.idl \
+- XDocumentLanguages.idl
++ XDocumentLanguages.idl \
+
+ # ------------------------------------------------------------------
+
Modified: trunk/patches/dev300/default-autotext-and-form-name.diff
==============================================================================
--- trunk/patches/dev300/default-autotext-and-form-name.diff (original)
+++ trunk/patches/dev300/default-autotext-and-form-name.diff Wed Aug 13 14:15:13 2008
@@ -32,7 +32,7 @@
+ sName = ScGlobal::GetRscString( STR_SHAPE_TEXTBOX );
+ break;
+ default:
-+ DBG_ERROR1( "XclImpDrawObjBase::ProcessSdrObject - unknown object type 0x%04hX", mnObjId );
++ DBG_ERROR1( "XclImpDrawObjBase::ProcessSdrObject - unknown object type 0x%04hX", mnObjType );
+ break;
+ }
+ if ( sName.Len() > 0 )
Modified: trunk/patches/dev300/userform-activex-identify.diff
==============================================================================
--- trunk/patches/dev300/userform-activex-identify.diff (original)
+++ trunk/patches/dev300/userform-activex-identify.diff Wed Aug 13 14:15:13 2008
@@ -117,7 +117,7 @@
+0x82, 0x9a, 0xb3, 0xf5, 0x80, 0x14, 0xd3, 0x11, 0x85, 0x49, 0x00, 0xc0, 0x4f, 0xac, 0x67, 0xd7,
+};
+
-+const sal_Int16 ActiveXIDLen = 0x30;
++const sal_Int16 ActiveXIDLen = 0x10;
+
+bool lcl_handleActiveXControl( SvStorageStream *pS, sal_uInt16& nTypeID )
+{
Modified: trunk/patches/vba/vba-workbook-worksheet-events.diff
==============================================================================
--- trunk/patches/vba/vba-workbook-worksheet-events.diff (original)
+++ trunk/patches/vba/vba-workbook-worksheet-events.diff Wed Aug 13 14:15:13 2008
@@ -2350,10 +2350,12 @@
--- /home/feng/work/ooo-build/build/dev300-m14/sc/source/ui/vba/makefile.mk 2008-06-16 21:30:17.000000000 +0800
+++ sc/source/ui/vba/makefile.mk 2008-06-05 18:11:39.000000000 +0800
-@@ -128,6 +128,7 @@ SLOFILES= \
- $(SLO)$/vbahyperlink.obj \
- $(SLO)$/vbapagesetup.obj \
- $(SLO)$/service.obj \
+@@ -128,7 +128,8 @@ SLOFILES= \
+ $(SLO)$/vbapagebreak.obj \
+ $(SLO)$/vbapagebreaks.obj \
+ $(SLO)$/vbaspinbutton.obj \
+- $(SLO)$/service.obj
++ $(SLO)$/service.obj \
+ $(SLO)$/vbaeventshelper.obj \
Modified: trunk/patches/vba/vbaevents-services-sources.diff
==============================================================================
--- trunk/patches/vba/vbaevents-services-sources.diff (original)
+++ trunk/patches/vba/vbaevents-services-sources.diff Wed Aug 13 14:15:13 2008
@@ -1523,7 +1523,7 @@
LinkUpdateModes.idl\
XDocumentRevisionListPersistence.idl\
DocumentRevisionListPersistence.idl \
-- XDocumentLanguages.idl
+- XDocumentLanguages.idl \
+ XDocumentLanguages.idl \
+ XCodeNameQuery.idl \
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
