[ooo-build-commit] .: 3 commits - bin/g configure.in patches/dev300 patches/vba
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Sep 8 08:38:25 PDT 2010
bin/g | 9
configure.in | 2
patches/dev300/apply | 14
patches/dev300/calc-string-number.diff | 2
patches/dev300/docx-export-enable.diff | 3
patches/dev300/editeng.dont-freeze-in-autocorr.diff | 46 ---
patches/dev300/fixup-graphite-layout-stl-type.diff | 11
patches/dev300/localize-pl-cygwin-paths.diff | 2
patches/dev300/sd-ppt-fix-document-summary-reading.diff | 4
patches/dev300/solenv-installer-unopkg-call.diff | 13
patches/dev300/solenv-subsequenttest-fix.diff | 14
patches/dev300/unxsplash-rework.diff | 52 +--
patches/vba/cws-vbasupportdev300.diff | 226 +++++-----------
patches/vba/vba-container-controls.diff | 22 -
patches/vba/vba-misc-tweakupstream.diff | 14
15 files changed, 145 insertions(+), 289 deletions(-)
New commits:
commit 8f54b36deb15e5e2942846cfa4d41abeab4c39fc
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Sep 8 16:23:00 2010 +0200
Git repos merged with ooo330-m7, update accordingly.
diff --git a/configure.in b/configure.in
index 2a84807..e81a8cb 100644
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@ AC_PREFIX_DEFAULT(/usr)
# ooo-build tag needed to get OOo sources from ooo-build git
DEFAULT_TAG=ooo-build-3.2.98.0
# ooo tag to get external sources from http://hg.services.openoffice.org
-DEFAULT_OOO_TAG=ooo330-m6
+DEFAULT_OOO_TAG=ooo330-m7
# For the upstream packages it is like:
# DEFAULT_TAG=OOO320_m1
diff --git a/patches/dev300/apply b/patches/dev300/apply
index c0265a6..09081ec 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -7,7 +7,7 @@
PATCHPATH=.:../evo2:../vba:../mono:../64bit:../cairo:../gstreamer:../ooxml:../postgresql:../emf+:../unittesting:../lwp
# might be space separated list to support more MWS
-OLDEST_SUPPORTED=ooo330-m6 ooo-build-3.2.98.0
+OLDEST_SUPPORTED=ooo330-m7 ooo-build-3.2.98.0
# -------- Functional sub-sets --------
Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \
diff --git a/patches/dev300/sd-ppt-fix-document-summary-reading.diff b/patches/dev300/sd-ppt-fix-document-summary-reading.diff
index 525ebf0..daebffa 100644
--- a/patches/dev300/sd-ppt-fix-document-summary-reading.diff
+++ b/patches/dev300/sd-ppt-fix-document-summary-reading.diff
@@ -24,8 +24,8 @@ index ae64ac4..7b9f508 100644
case VT_BLOB :
case VT_CF :
@@ -501,6 +503,9 @@ void Section::Read( SvStorageStream *pStrm )
- if ( nPropSize )
- {
+ break;
+ }
pStrm->Seek( nPropOfs + nSecOfs );
+ // make sure we don't overflow the section size
+ if( nPropSize > nSecSize - nSecOfs )
commit 4bdac68f56e580deb9567c34df302f6115b7eaec
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Sep 8 11:16:45 2010 +0200
Git repos merged with ooo330-m6, update accordingly.
diff --git a/configure.in b/configure.in
index 4678dcb..2a84807 100644
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@ AC_PREFIX_DEFAULT(/usr)
# ooo-build tag needed to get OOo sources from ooo-build git
DEFAULT_TAG=ooo-build-3.2.98.0
# ooo tag to get external sources from http://hg.services.openoffice.org
-DEFAULT_OOO_TAG=ooo330-m4
+DEFAULT_OOO_TAG=ooo330-m6
# For the upstream packages it is like:
# DEFAULT_TAG=OOO320_m1
diff --git a/patches/dev300/apply b/patches/dev300/apply
index b9be6ef..c0265a6 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -7,7 +7,7 @@
PATCHPATH=.:../evo2:../vba:../mono:../64bit:../cairo:../gstreamer:../ooxml:../postgresql:../emf+:../unittesting:../lwp
# might be space separated list to support more MWS
-OLDEST_SUPPORTED=ooo330-m4 ooo-build-3.2.98.0
+OLDEST_SUPPORTED=ooo330-m6 ooo-build-3.2.98.0
# -------- Functional sub-sets --------
Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \
@@ -787,6 +787,9 @@ calc-find-replace-skip-filtered-sc.diff, n#539282, n#580408, i#108087, kohei
calc-combo-listbox-export-fix.diff, n#540566, noelp
# Excel compatibility for handling of "string numbers".
+# FIXME: Please check, there was some change in this between OOO330_m4 and m6;
+# I have just updated the patch to apply again, but maybe it is not necessary
+# any more? -- kendy
calc-string-number.diff, kohei
# Set reference edge to bottom when importing cells with slanted text.
@@ -1522,7 +1525,8 @@ vba-misc-tweakupstream.diff
# FIXME cause build problems with m4; some stuff is missing
vba-msvbahelper-splitbuilt.diff
# fix upstream introduced Application::Intersection problem
-vba-fix-interesection.diff
+# FIXME The problem seems to be gone, but double-check.
+#vba-fix-interesection.diff
# use oox filter exclusively for import of controls ( excel/word )
vba-use-ooxfilter-forcontrols.diff
# fix hlink & macro import/export for autoshapes and pictures
@@ -2351,9 +2355,6 @@ statusbar-fancy-modified-status-starmath.diff, i#103862, kohei
statusbar-fancy-modified-status-svx.diff, i#103862, kohei
statusbar-fancy-modified-status-sw.diff, i#103862, kohei
-[ Fixes ]
-editeng.dont-freeze-in-autocorr.diff, i#113461
-
[ UnitTesting ]
SectionOwner => jholesov
SectionIssue => i#87469
@@ -3134,9 +3135,6 @@ system-lpsolve-link-with-colamd.diff, rengelha
win32-dont-attempt-restart.diff, n#524250, tml
[ SystemBitsWithSTLport ]
-# FIXME: most likely get integrated in ooo330-m5
-fixup-graphite-layout-stl-type.diff, i#113563, cmc
-[ SystemBitsWithSTLport ]
system-cppunit-with-stlport-ooo.diff, i#113503, cmc
[ GnomeSessionManagement ]
diff --git a/patches/dev300/calc-string-number.diff b/patches/dev300/calc-string-number.diff
index 3b7391b..f15fcae 100644
--- a/patches/dev300/calc-string-number.diff
+++ b/patches/dev300/calc-string-number.diff
@@ -22,7 +22,7 @@ index e7651e5..9fe8b53 100644
+#else
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ConvertStringToValue" );
double fValue = 0.0;
- ::rtl::OUString aStr( rStr);
+ if (mnStringNoValueError == errCellNoValue)
@@ -392,6 +402,7 @@ double ScInterpreter::ConvertStringToValue( const String& rStr )
fValue = 0.0;
}
diff --git a/patches/dev300/docx-export-enable.diff b/patches/dev300/docx-export-enable.diff
index 1c764f0..037f0ff 100644
--- a/patches/dev300/docx-export-enable.diff
+++ b/patches/dev300/docx-export-enable.diff
@@ -71,14 +71,13 @@ index 482a270..97ebba2 100644
mkdir: %_DEST%\inc%_EXT%\oox\ole
mkdir: %_DEST%\inc%_EXT%\oox\vml
mkdir: %_DEST%\inc%_EXT%\oox\xls
-@@ -34,9 +35,11 @@ mkdir: %_DEST%\inc%_EXT%\oox\xls
+@@ -34,8 +35,10 @@ mkdir: %_DEST%\inc%_EXT%\oox\xls
..\inc\oox\drawingml\chart\chartconverter.hxx %_DEST%\inc%_EXT%\oox\drawingml\chart\chartconverter.hxx
..\inc\oox\drawingml\table\tablestylelist.hxx %_DEST%\inc%_EXT%\oox\drawingml\table\tablestylelist.hxx
..\inc\oox\ole\vbaproject.hxx %_DEST%\inc%_EXT%\oox\ole\vbaproject.hxx
+..\inc\oox\ole\oleobjecthelper.hxx %_DEST%\inc%_EXT%\oox\ole\oleobjecthelper.hxx
..\inc\oox\vml\vmldrawing.hxx %_DEST%\inc%_EXT%\oox\vml\vmldrawing.hxx
..\inc\oox\vml\vmlshape.hxx %_DEST%\inc%_EXT%\oox\vml\vmlshape.hxx
- ..\inc\oox\xls\excelvbaproject.hxx %_DEST%\inc%_EXT%\oox\xls\excelvbaproject.hxx
+..\inc\oox\export\*.hxx %_DEST%\inc%_EXT%\oox\export\*.hxx
dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"
diff --git a/patches/dev300/editeng.dont-freeze-in-autocorr.diff b/patches/dev300/editeng.dont-freeze-in-autocorr.diff
deleted file mode 100644
index 289505e..0000000
--- a/patches/dev300/editeng.dont-freeze-in-autocorr.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-# HG changeset patch
-# Parent f08e0746219b133571e5903b94a77d2fe71b7db1
-#i113461# do not freeze after erasing non-breaking space inserted by French AutoCorrection
-
-diff -r f08e0746219b -r 80209fb60358 editeng/source/misc/svxacorr.cxx
---- editeng/source/misc/svxacorr.cxx Wed Jul 28 13:18:57 2010 +0200
-+++ editeng/source/misc/svxacorr.cxx Wed Jul 28 13:19:27 2010 +0200
-@@ -1243,27 +1243,25 @@
- else if ( bIsNextRun && !IsAutoCorrectChar( cChar ) )
- {
- // Remove the NBSP if it wasn't an autocorrection
-- if ( NeedsHardspaceAutocorr( rTxt.GetChar( nInsPos - 1 ) ) &&
-+ if ( nInsPos != 0 && NeedsHardspaceAutocorr( rTxt.GetChar( nInsPos - 1 ) ) &&
- cChar != ' ' && cChar != '\t' && cChar != CHAR_HARDBLANK )
- {
- // Look for the last HARD_SPACE
- xub_StrLen nPos = nInsPos - 1;
-- bool bFound = false;
-- while ( nPos != STRING_NOTFOUND && !bFound )
-+ bool bContinue = true;
-+ while ( bContinue )
- {
-- sal_Unicode cTmpChar = rTxt.GetChar( nPos );
-+ const sal_Unicode cTmpChar = rTxt.GetChar( nPos );
- if ( cTmpChar == CHAR_HARDBLANK )
-- bFound = true;
-- else if ( !NeedsHardspaceAutocorr( cTmpChar ) )
-- nPos = STRING_NOTFOUND;
-+ {
-+ rDoc.Delete( nPos, nPos + 1 );
-+ nRet = AddNonBrkSpace;
-+ bContinue = false;
-+ }
-+ else if ( !NeedsHardspaceAutocorr( cTmpChar ) || nPos == 0 )
-+ bContinue = false;
- nPos--;
- }
--
-- if ( bFound && nPos != STRING_NOTFOUND )
-- {
-- rDoc.Delete( nPos + 1, nPos + 2 );
-- nRet = AddNonBrkSpace;
-- }
- }
- }
- }
diff --git a/patches/dev300/fixup-graphite-layout-stl-type.diff b/patches/dev300/fixup-graphite-layout-stl-type.diff
deleted file mode 100644
index 4491f11..0000000
--- a/patches/dev300/fixup-graphite-layout-stl-type.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- vcl/source/glyphs/graphite_layout.cxx 2010-07-30 10:08:56.000000000 +0100
-+++ vcl/source/glyphs/graphite_layout.cxx 2010-07-30 10:10:10.000000000 +0100
-@@ -659,7 +659,7 @@
- return hash;
- };
- protected:
-- virtual void UniqueCacheInfo(std::wstring & stuFace, bool & fBold, bool & fItalic)
-+ virtual void UniqueCacheInfo(ext_std::wstring & stuFace, bool & fBold, bool & fItalic)
- {
- #ifdef WIN32
- dynamic_cast<GraphiteWinFont&>(mrRealFont).UniqueCacheInfo(stuFace, fBold, fItalic);
diff --git a/patches/dev300/localize-pl-cygwin-paths.diff b/patches/dev300/localize-pl-cygwin-paths.diff
index 3469e2f..8731408 100644
--- a/patches/dev300/localize-pl-cygwin-paths.diff
+++ b/patches/dev300/localize-pl-cygwin-paths.diff
@@ -20,7 +20,7 @@ index 8310435..78b6b6e 100644
@@ -492,7 +493,7 @@ sub collectfiles{
# if ( -x $command ){
if( $command ){
- if( !$bVerbose ){ $args .= " -QQ "; }
+ if( !$bVerbose ){ $args .= " "; }
- $args .= " -e -f $localizeSDF -l ";
+ $args .= " -e -f ".fix_cygwin_path($localizeSDF)." -l ";
my $bFlag="";
diff --git a/patches/dev300/solenv-installer-unopkg-call.diff b/patches/dev300/solenv-installer-unopkg-call.diff
index 6165531..f698685 100644
--- a/patches/dev300/solenv-installer-unopkg-call.diff
+++ b/patches/dev300/solenv-installer-unopkg-call.diff
@@ -7,14 +7,15 @@ index 1251966..6a56f0b 100644
--- solenv/bin/modules/installer/simplepackage.pm
+++ solenv/bin/modules/installer/simplepackage.pm
@@ -131,7 +131,7 @@ sub register_extensions
- $localtemppath =~ s/\\/\//g;
- $localtemppath = "/".$localtemppath;
- }
-- my $systemcall = $unopkgfile . " add --shared --suppress-license --verbose " . $oneextension . " -env:UserInstallation=file://" . $localtemppath . " 2\>\&1 |";
-+ my $systemcall = "JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1 " . $unopkgfile . " add --shared --suppress-license --verbose " . $oneextension . " -env:UserInstallation=file://" . $localtemppath . " 2\>\&1 |";
- print "... $systemcall ...\n";
+ $preregdir =~ s/\/\s*$//g;
+- my $systemcall = $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=\"file://" . $slash . $preregdir . "\"" . " -env:UserInstallation=file://" . $slash . $localtemppath . " 2\>\&1 |";
++ my $systemcall = "JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1 " . $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=\"file://" . $slash . $preregdir . "\"" . " -env:UserInstallation=file://" . $slash . $localtemppath . " 2\>\&1 |";
+
+ print "... $systemcall ...\n";
+
+
--
1.7.0.1
diff --git a/patches/dev300/solenv-subsequenttest-fix.diff b/patches/dev300/solenv-subsequenttest-fix.diff
index 1002a08..b3849a5 100644
--- a/patches/dev300/solenv-subsequenttest-fix.diff
+++ b/patches/dev300/solenv-subsequenttest-fix.diff
@@ -5,24 +5,10 @@ From: Thorsten Behrens <thb at openoffice.org>
---
- solenv/bin/subsequenttests | 2 +-
solenv/inc/installationtest.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
-diff --git solenv/bin/subsequenttests solenv/bin/subsequenttests
-index 34e6b80..3caa842 100755
---- solenv/bin/subsequenttests
-+++ solenv/bin/subsequenttests
-@@ -47,7 +47,7 @@ while (@ARGV) {
- }
-
- my @testpaths = ();
--my $sc = SourceConfig->new();
-+my $sc = SourceConfig->new($ENV{'SOLARSRC'});
- my $module;
- foreach $module ($sc->get_active_modules()) {
- my $buildlst = $sc->get_module_build_list($module);
diff --git solenv/inc/installationtest.mk solenv/inc/installationtest.mk
index 6806e15..322ba4d 100644
--- solenv/inc/installationtest.mk
diff --git a/patches/dev300/unxsplash-rework.diff b/patches/dev300/unxsplash-rework.diff
index f5753b2..ad65190 100644
--- a/patches/dev300/unxsplash-rework.diff
+++ b/patches/dev300/unxsplash-rework.diff
@@ -165,23 +165,23 @@ index 1cbb890..4be2222 100644
// SetSplashScreenProgress(45);
RTL_LOGFILE_CONTEXT_TRACE( aLog, "} create SvtPathOptions and SvtLanguageOptions" );
@@ -1479,7 +1487,7 @@ void Desktop::Main()
- OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ))), UNO_QUERY );
- if (xDesktopFrame.is())
- {
--// SetSplashScreenProgress(60);
-+ SetSplashScreenProgress(60);
- Reference< XFrame > xBackingFrame;
- Reference< ::com::sun::star::awt::XWindow > xContainerWindow;
-
+ OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ))), UNO_QUERY );
+ if (xDesktopFrame.is())
+ {
+- // SetSplashScreenProgress(60);
++ SetSplashScreenProgress(60);
+ Reference< XFrame > xBackingFrame;
+ Reference< ::com::sun::star::awt::XWindow > xContainerWindow;
+
@@ -1502,7 +1510,7 @@ void Desktop::Main()
- Reference< XController > xBackingComp(
- xSMgr->createInstanceWithArguments(OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.StartModule") ), lArgs),
- UNO_QUERY);
--// SetSplashScreenProgress(80);
-+ SetSplashScreenProgress(80);
- if (xBackingComp.is())
- {
- Reference< ::com::sun::star::awt::XWindow > xBackingWin(xBackingComp, UNO_QUERY);
+ Reference< XController > xBackingComp(
+ xSMgr->createInstanceWithArguments(OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.StartModule") ), lArgs),
+ UNO_QUERY);
+- // SetSplashScreenProgress(80);
++ SetSplashScreenProgress(80);
+ if (xBackingComp.is())
+ {
+ Reference< ::com::sun::star::awt::XWindow > xBackingWin(xBackingComp, UNO_QUERY);
@@ -1541,7 +1549,7 @@ void Desktop::Main()
return;
}
@@ -198,17 +198,17 @@ index 1cbb890..4be2222 100644
-// SetSplashScreenProgress(60);
+ SetSplashScreenProgress(60);
- Application::SetFilterHdl( LINK( this, Desktop, ImplInitFilterHdl ) );
-
+ if ( !bRestartRequested )
+ {
@@ -1573,7 +1581,7 @@ void Desktop::Main()
- // use system window dialogs
- Application::SetSystemWindowMode( SYSTEMWINDOW_MODE_DIALOG );
-
--// SetSplashScreenProgress(80);
-+ SetSplashScreenProgress(80);
-
- if ( !bTerminateRequested && !pCmdLineArgs->IsInvisible() &&
- !pCmdLineArgs->IsNoQuickstart() )
+ // use system window dialogs
+ Application::SetSystemWindowMode( SYSTEMWINDOW_MODE_DIALOG );
+
+- // SetSplashScreenProgress(80);
++ SetSplashScreenProgress(80);
+
+ if ( !bTerminateRequested && !pCmdLineArgs->IsInvisible() &&
+ !pCmdLineArgs->IsNoQuickstart() )
@@ -2910,14 +2918,18 @@ void Desktop::OpenSplashScreen()
else if ( pCmdLine->IsWeb() )
aAppName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "web" ));
diff --git a/patches/vba/cws-vbasupportdev300.diff b/patches/vba/cws-vbasupportdev300.diff
index eb6a4dd..dd4221c 100644
--- a/patches/vba/cws-vbasupportdev300.diff
+++ b/patches/vba/cws-vbasupportdev300.diff
@@ -4,12 +4,12 @@ index 1c9e37a..8d474c6 100644
+++ basctl/source/basicide/baside2.cxx
@@ -367,8 +367,9 @@ BOOL ModulWindow::BasicExecute()
}
- else if ( !pMethod || ( nStart < nCurMethodStart ) )
+ else if ( !pMethod || ( nStart < nCurMethodStart && !pM->IsHidden() ) )
{
-+ nCurMethodStart = nStart;
++ nCurMethodStart = nStart;
pMethod = pM;
- nCurMethodStart = nStart;
-+ break;
++ break;
}
}
if ( !pMethod )
@@ -542,9 +542,9 @@ index 1a9e046..dfc8dfd 100755
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <com/sun/star/reflection/XIdlArray.hpp>
@@ -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>
+ #include <com/sun/star/bridge/oleautomation/XAutomationObject.hpp>
-
+#include <com/sun/star/script/XAutomationInvocation.hpp>
@@ -1251,9 +1251,9 @@ index c7e8f11..be7c357 100644
--- basic/source/comp/codegen.cxx
+++ basic/source/comp/codegen.cxx
@@ -161,8 +161,6 @@ void SbiCodeGen::Save()
- rMod.mnType = com::sun::star::script::ModuleType::NORMAL;
rMod.bIsProxyModule = false;
}
+
- if( pParser->bText )
- p->SetFlag( SBIMG_COMPARETEXT );
// GlobalCode-Flag
@@ -9552,13 +9552,12 @@ index 07e9f23..c476bf4 100644
#ifndef __com_sun_star_container_XNamed_idl__
#include <com/sun/star/container/XNamed.idl>
-@@ -60,7 +61,8 @@ interface XWorksheet
+@@ -60,7 +61,7 @@ interface XWorksheet
interface ::com::sun::star::script::XInvocation;
interface ::com::sun::star::container::XNamed;
- [attribute] boolean Visible;
-+ [attribute] long Visible;
-+ [attribute] boolean AutoFilterMode;
++ [attribute] long Visible;
[attribute, readonly] long StandardHeight;
[attribute, readonly] long StandardWidth;
[attribute, readonly] boolean ProtectionMode;
@@ -17249,54 +17248,44 @@ index 4cb7e3e..9974665 100644
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
-@@ -50,6 +50,7 @@ SLOFILES= \
- $(SLO)$/vbaglobals.obj \
- $(SLO)$/vbaworkbook.obj \
- $(SLO)$/vbaworksheets.obj \
-+ $(SLO)$/vbafiledialog.obj \
- $(SLO)$/vbaapplication.obj \
- $(SLO)$/vbarange.obj \
- $(SLO)$/vbaname.obj \
-@@ -64,6 +65,7 @@ SLOFILES= \
- $(SLO)$/vbainterior.obj\
- $(SLO)$/vbawsfunction.obj\
- $(SLO)$/vbawindow.obj\
-+ $(SLO)$/vbaquerytable.obj \
- $(SLO)$/vbachart.obj\
- $(SLO)$/vbachartobject.obj\
- $(SLO)$/vbachartobjects.obj\
-@@ -83,6 +85,7 @@ SLOFILES= \
- $(SLO)$/vbaoleobject.obj \
- $(SLO)$/vbaoleobjects.obj \
- $(SLO)$/vbatextboxshape.obj \
-+ $(SLO)$/vbacommentshape.obj \
- $(SLO)$/vbapane.obj \
- $(SLO)$/vbatextframe.obj \
+@@ -63,18 +63,29 @@ SLOFILES= \
$(SLO)$/vbacharttitle.obj \
-@@ -97,13 +100,22 @@ SLOFILES= \
- $(SLO)$/vbastyle.obj \
- $(SLO)$/vbastyles.obj \
- $(SLO)$/vbaassistant.obj \
-+ $(SLO)$/vbafilesearch.obj \
-+ $(SLO)$/vbafoundfiles.obj \
+ $(SLO)$/vbacomment.obj \
+ $(SLO)$/vbacomments.obj \
++ $(SLO)$/vbacommentshape.obj \
+ $(SLO)$/vbacondition.obj \
+ $(SLO)$/vbadialog.obj \
+ $(SLO)$/vbadialogs.obj \
+ $(SLO)$/vbaeventshelper.obj \
++ $(SLO)$/vbafiledialog.obj \
++ $(SLO)$/vbafiledialogselecteditems.obj \
++ $(SLO)$/vbafilesearch.obj \
+ $(SLO)$/vbafont.obj \
+ $(SLO)$/vbaformat.obj \
+ $(SLO)$/vbaformatcondition.obj \
+ $(SLO)$/vbaformatconditions.obj \
++ $(SLO)$/vbafoundfiles.obj \
+ $(SLO)$/vbaglobals.obj \
$(SLO)$/vbahyperlink.obj \
$(SLO)$/vbahyperlinks.obj \
- $(SLO)$/vbapagesetup.obj \
- $(SLO)$/vbapagebreak.obj \
- $(SLO)$/vbapagebreaks.obj \
- $(SLO)$/vbaeventshelper.obj \
-- $(SLO)$/service.obj
-+ $(SLO)$/service.obj \
-+ $(SLO)$/vbamenubar.obj \
-+ $(SLO)$/vbamenubars.obj \
-+ $(SLO)$/vbamenu.obj \
-+ $(SLO)$/vbamenus.obj \
-+ $(SLO)$/vbamenuitem.obj \
-+ $(SLO)$/vbamenuitems.obj \
-+ $(SLO)$/vbafiledialogselecteditems.obj \
-
- .ENDIF
- # --- Targets ------------------------------------------------------
+ $(SLO)$/vbainterior.obj \
++ $(SLO)$/vbamenubar.obj \
++ $(SLO)$/vbamenubars.obj \
++ $(SLO)$/vbamenu.obj \
++ $(SLO)$/vbamenus.obj \
++ $(SLO)$/vbamenuitem.obj \
++ $(SLO)$/vbamenuitems.obj \
+ $(SLO)$/vbaname.obj \
+ $(SLO)$/vbanames.obj \
+ $(SLO)$/vbaoleobject.obj \
+@@ -88,6 +90,7 @@ SLOFILES= \
+ $(SLO)$/vbapivotcache.obj \
+ $(SLO)$/vbapivottable.obj \
+ $(SLO)$/vbapivottables.obj \
++ $(SLO)$/vbaquerytable.obj \
+ $(SLO)$/vbarange.obj \
+ $(SLO)$/vbaseriescollection.obj \
+ $(SLO)$/vbasheetobject.obj \
diff --git sc/source/ui/vba/testvba/testvba.cxx sc/source/ui/vba/testvba/testvba.cxx
index 990a37a..058c874 100644
--- sc/source/ui/vba/testvba/testvba.cxx
@@ -17306,17 +17295,17 @@ index 990a37a..058c874 100644
try
{
- xScript = xProv->getScript( rtl::OUString::createFromAscii( "vnd.sun.star.script:Standard.TestMacros.Main?language=Basic&location=document" ));
-+ xScript = xProv->getScript( rtl::OUString::createFromAscii( "vnd.sun.star.script:VBAProject.TestMacros.Main?language=Basic&location=document" ));
++ xScript = xProv->getScript( rtl::OUString::createFromAscii( "vnd.sun.star.script:VBAProject.TestMacros.Main?language=Basic&location=document" ));
} catch ( uno::Exception& e )
{
try
{
- xScript = xProv->getScript( rtl::OUString::createFromAscii( "vnd.sun.star.script:Standard.testMacro.Main?language=Basic&location=document" ));
-+ xScript = xProv->getScript( rtl::OUString::createFromAscii( "vnd.sun.star.script:VBAProject.testMacro.Main?language=Basic&location=document" ));
++ xScript = xProv->getScript( rtl::OUString::createFromAscii( "vnd.sun.star.script:VBAProject.testMacro.Main?language=Basic&location=document" ));
} catch ( uno::Exception& e2 )
{
- xScript = xProv->getScript( rtl::OUString::createFromAscii( "vnd.sun.star.script:Standard.testMain.Main?language=Basic&location=document" ));
-+ xScript = xProv->getScript( rtl::OUString::createFromAscii( "vnd.sun.star.script:VBAProject.testMain.Main?language=Basic&location=document" ));
++ xScript = xProv->getScript( rtl::OUString::createFromAscii( "vnd.sun.star.script:VBAProject.testMain.Main?language=Basic&location=document" ));
}
}
OSL_TRACE("Got script for doc %s", rtl::OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() );
@@ -17426,8 +17415,8 @@ index 63db284..d4a6ed5 100644
+using ::com::sun::star::uno::UNO_QUERY;
+using ::rtl::OUString;
- // Enable our own join detection for Intersection and Union
- // should be more efficient than using ScRangeList::Join ( because
+ // #TODO is this defined somewhere else?
+ #if ( defined UNX ) || ( defined OS2 ) //unix
@@ -243,16 +285,49 @@ ScVbaApplication::getAssistant() throw (uno::RuntimeException)
return uno::Reference< XAssistant >( new ScVbaAssistant( this, mxContext ) );
}
@@ -19570,7 +19559,7 @@ index d937784..2cd8b79 100644
--- sc/source/ui/vba/vbaglobals.cxx
+++ sc/source/ui/vba/vbaglobals.cxx
@@ -219,6 +219,12 @@ ScVbaGlobals::Rows( const uno::Any& aIndex ) throw (uno::RuntimeException)
-
+ return uno::Any();
}
+uno::Any SAL_CALL
@@ -19586,12 +19575,11 @@ diff --git sc/source/ui/vba/vbaglobals.hxx sc/source/ui/vba/vbaglobals.hxx
index 38a51f2..f06acb4 100644
--- sc/source/ui/vba/vbaglobals.hxx
+++ sc/source/ui/vba/vbaglobals.hxx
-@@ -83,6 +83,8 @@ typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::excel::XGlobals > Sc
- virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErro
rException, css::uno::RuntimeException);
+@@ -83,6 +83,7 @@ typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::excel::XGlobals > Sc
virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorExc
eption, css::uno::RuntimeException);
-
+ virtual css::uno::Reference< ov::excel::XApplication > SAL_CALL getExcel() throw (css::uno::RuntimeException);
+ virtual css::uno::Any SAL_CALL getDebug() throw (css::uno::RuntimeException);
+ virtual css::uno::Any SAL_CALL MenuBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
-+
// XMultiServiceFactory
@@ -22256,12 +22244,12 @@ index 8fcfcd5..dd93063 100755
void
@@ -1510,6 +1550,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;
+ using namespace ::com::sun::star::sheet::CellFlags;
+ sal_Int32 nFlags = VALUE | DATETIME | STRING | FORMULA | HARDATTR | EDITATTR | FORMATTED;
ClearContents( nFlags );
+
-+ // Fires the range change event.
-+ lcl_NotifyRangeChanges( getScDocShell()->GetModel(), getCellRangesBase() );
++ // Fires the range change event.
++ lcl_NotifyRangeChanges( getScDocShell()->GetModel(), getCellRangesBase() );
}
//helper ClearContent
@@ -22398,14 +22386,14 @@ index 8fcfcd5..dd93063 100755
return sal_True; // always
}
@@ -3118,6 +3188,13 @@ 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< uno::XInterface > xInterface = xStartCell.is() ? xSearch->findNext( xStartCell, xDescriptor) : xSearch->findFirst( xDescriptor );
uno::Reference< table::XCellRange > xCellRange( xInterface, uno::UNO_QUERY );
+ // if we are searching from a starting cell and failed to find a match
+ // then try from the begining
+ if ( !xCellRange.is() && xStartCell.is() )
+ {
-+ xInterface = xSearch->findFirst( xSearchDescriptor );
++ xInterface = xSearch->findFirst( xDescriptor );
+ xCellRange.set( xInterface, uno::UNO_QUERY );
+ }
if ( xCellRange.is() )
@@ -23689,19 +23677,19 @@ index c09e229..60b7bf6 100644
sal_Bool
ScVbaWorksheet::getProtectDrawingObjects() throw (uno::RuntimeException)
{
-+ SCTAB nTab = 0;
-+ rtl::OUString aSheetName = getName();
-+ uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( getModel(), uno::UNO_QUERY_THROW );
-+ bool bSheetExists = ScVbaWorksheets::nameExists (xSpreadDoc, aSheetName, nTab);
-+ if ( bSheetExists )
-+ {
-+ uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
-+ ScDocument* pDoc = excel::getDocShell( xModel )->GetDocument();
-+ ScTableProtection* pProtect = pDoc->GetTabProtection(nTab);
-+ if ( pProtect )
-+ return pProtect->isOptionEnabled( ScTableProtection::OBJECTS );
-+ }
- return false;
++ SCTAB nTab = 0;
++ rtl::OUString aSheetName = getName();
++ uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( getModel(), uno::UNO_QUERY_THROW );
++ bool bSheetExists = ScVbaWorksheets::nameExists (xSpreadDoc, aSheetName, nTab);
++ if ( bSheetExists )
++ {
++ uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
++ ScDocument* pDoc = excel::getDocShell( xModel )->GetDocument();
++ ScTableProtection* pProtect = pDoc->GetTabProtection(nTab);
++ if ( pProtect )
++ return pProtect->isOptionEnabled( ScTableProtection::OBJECTS );
++ }
+ return sal_False;
}
@@ -403,10 +437,30 @@ ScVbaWorksheet::Activate() throw (uno::RuntimeException)
@@ -23832,57 +23820,6 @@ index c09e229..60b7bf6 100644
return xAddressable->getRangeAddress().Sheet;
}
-@@ -967,6 +1057,50 @@ ScVbaWorksheet::PrintOut( const uno::Any& From, const uno::Any& To, const uno::A
- PrintOutHelper( excel::getBestViewShell( xModel ), From, To, Copies, Preview, ActivePrinter, PrintToFile, Collate, PrToFileName, bSelection );
- }
-
-+uno::Reference< sheet::XDatabaseRange > lcl_getXDatabase( const uno::Reference< frame::XModel >& xModel, const rtl::OUString& aSheetName ) throw ( uno::RuntimeException)
-+
-+{
-+ uno::Reference< sheet::XDatabaseRange > xDBRange;
-+ uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( xModel, uno::UNO_QUERY_THROW );
-+ SCTAB nTab(0);
-+ bool bSheetExists = ScVbaWorksheets::nameExists (xSpreadDoc, aSheetName, nTab);
-+ if ( bSheetExists )
-+ {
-+ rtl::OUString sAutofilterRngName;
-+ ScDocShell* pShell = excel::getDocShell( xModel );
-+
-+ xDBRange = excel::GetAutoFiltRange( pShell, static_cast< sal_Int16 >( nTab ), sAutofilterRngName );
-+
-+ }
-+ return xDBRange;
-+}
-+
-+::sal_Bool SAL_CALL
-+ScVbaWorksheet::getAutoFilterMode() throw (uno::RuntimeException)
-+{
-+ if ( lcl_getXDatabase( getModel(), getName() ).is() )
-+ return sal_True;
-+ return sal_False;
-+}
-+
-+void SAL_CALL
-+ScVbaWorksheet::setAutoFilterMode( ::sal_Bool _autofiltermode ) throw (uno::RuntimeException)
-+{
-+ if ( !_autofiltermode )
-+ {
-+ uno::Reference< sheet::XDatabaseRange >xAutoFilt = lcl_getXDatabase( getModel(), getName() );
-+
-+ if ( xAutoFilt.is() )
-+ {
-+ uno::Reference< beans::XPropertySet > xProps( xAutoFilt, uno::UNO_QUERY_THROW );
-+ xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("AutoFilter") ), uno::makeAny( sal_False ) );
-+ }
-+ }
-+ // Not possible to set to true
-+ else
-+ throw uno::RuntimeException();
-+}
-+
- namespace worksheet
- {
- namespace sdecl = comphelper::service_decl;
diff --git sc/source/ui/vba/vbaworksheet.hxx sc/source/ui/vba/vbaworksheet.hxx
index 4c730ab..cfa88cd 100644
--- sc/source/ui/vba/vbaworksheet.hxx
@@ -23895,21 +23832,14 @@ index 4c730ab..cfa88cd 100644
#include <vbahelper/vbahelperinterface.hxx>
#include "address.hxx"
-@@ -85,11 +86,14 @@ public:
- virtual css::uno::Reference< css::sheet::XSpreadsheet > getSheet()
- { return mxSheet; }
-
-- // Attributes
-+ // Attributes
-+ virtual ::sal_Bool SAL_CALL getAutoFilterMode() throw (::com::sun::star::uno::RuntimeException);
-+ virtual void SAL_CALL setAutoFilterMode( ::sal_Bool _autofiltermode ) throw (::com::sun::star::uno::RuntimeException);
-+
+@@ -85,8 +86,8 @@ public:
+ // Attributes
virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
virtual void SAL_CALL setName( const ::rtl::OUString &rName ) throw (css::uno::RuntimeException);
- virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
- virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw (css::uno::RuntimeException);
-+ virtual ::sal_Int32 SAL_CALL getVisible() throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL setVisible( ::sal_Int32 _Visible ) throw (css::uno::RuntimeException);
++ virtual ::sal_Int32 SAL_CALL getVisible() throw (css::uno::RuntimeException);
++ virtual void SAL_CALL setVisible( ::sal_Int32 _Visible ) throw (css::uno::RuntimeException);
virtual ::sal_Int32 SAL_CALL getStandardWidth() throw (css::uno::RuntimeException);
virtual ::sal_Int32 SAL_CALL getStandardHeight() throw (css::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL getProtectionMode() throw (css::uno::RuntimeException);
@@ -23918,7 +23848,7 @@ index 4c730ab..cfa88cd 100644
// Methods
virtual void SAL_CALL Activate() throw (css::uno::RuntimeException);
- virtual void SAL_CALL Select() throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL Select(const css::uno::Any& aReplace) throw (css::uno::RuntimeException); //liuchen 2009-9-2, add the input parameter to support expand selection
++ virtual void SAL_CALL Select(const css::uno::Any& aReplace) throw (css::uno::RuntimeException); //liuchen 2009-9-2, add the input parameter to support expand selection
virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Range( const css::uno::Any& Cell1, const css::uno::Any& Cell2 ) throw (css::uno::RuntimeException);
virtual void SAL_CALL Move( const css::uno::Any& Before, const css::uno::Any& After ) throw (css::uno::RuntimeException) ;
virtual void SAL_CALL Copy( const css::uno::Any& Before, const css::uno::Any& After ) throw (css::uno::RuntimeException);
@@ -42417,8 +42347,8 @@ index 12422bc..5218610 100644
pControl->setGeometryHelper( new UserFormGeometryHelper( mxContext, xControl ) );
+ if ( m_sLibName.getLength() )
+ pControl->setLibraryAndCodeName( m_sLibName.concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "." ) ) ).concat( getName() ) );
- return uno::makeAny( xVBAControl );
- }
+ aResult = uno::makeAny( xVBAControl );
+ }
diff --git vbahelper/source/msforms/vbauserform.hxx vbahelper/source/msforms/vbauserform.hxx
index 463a3cb..fc55bb3 100644
diff --git a/patches/vba/vba-container-controls.diff b/patches/vba/vba-container-controls.diff
index e35b070..a05e388 100644
--- a/patches/vba/vba-container-controls.diff
+++ b/patches/vba/vba-container-controls.diff
@@ -5103,8 +5103,8 @@ index 5218610..e5c678a 100644
#include <basic/sbx.hxx>
#include <basic/sbstar.hxx>
#include <basic/sbmeth.hxx>
-@@ -166,12 +166,38 @@ ScVbaUserForm::setValue( const ::rtl::OUString& aPropertyName, const uno::Any& a
- xPropSet->setPropertyValue( aDfltPropName, aValue );
+@@ -166,6 +166,30 @@ ScVbaUserForm::setValue( const ::rtl::OUString& aPropertyName, const uno::Any& a
+ }
}
+uno::Reference< awt::XControl >
@@ -5134,15 +5134,17 @@ index 5218610..e5c678a 100644
uno::Any SAL_CALL
ScVbaUserForm::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException)
{
- uno::Reference< awt::XControl > xDialogControl( m_xDialog, uno::UNO_QUERY_THROW );
- uno::Reference< awt::XControlContainer > xContainer( m_xDialog, uno::UNO_QUERY_THROW );
-- uno::Reference< awt::XControl > xControl = xContainer->getControl( aPropertyName );
+@@ -181,7 +181,9 @@ ScVbaUserForm::setValue( const ::rtl::OUString& aPropertyName, const uno::Any& a
+ {
+ uno::Reference< awt::XControl > xDialogControl( m_xDialog, uno::UNO_QUERY_THROW );
+ uno::Reference< awt::XControlContainer > xContainer( m_xDialog, uno::UNO_QUERY_THROW );
+- uno::Reference< awt::XControl > xControl = xContainer->getControl( aPropertyName );
+
-+ uno::Reference< awt::XControl > xControl = nestedSearch( aPropertyName, xContainer );
-+xContainer->getControl( aPropertyName );
- ScVbaControlFactory aFac( mxContext, xControl, m_xModel );
- uno::Reference< msforms::XControl > xVBAControl( aFac.createControl( xDialogControl->getModel() ) );
- ScVbaControl* pControl = dynamic_cast< ScVbaControl* >( xVBAControl.get() );
++ uno::Reference< awt::XControl > xControl = nestedSearch( aPropertyName, xContainer );
++ xContainer->getControl( aPropertyName );
+ ScVbaControlFactory aFac( mxContext, xControl, m_xModel );
+ uno::Reference< msforms::XControl > xVBAControl( aFac.createControl( xDialogControl->getModel() ) );
+ ScVbaControl* pControl = dynamic_cast< ScVbaControl* >( xVBAControl.get() );
@@ -202,14 +228,19 @@ ScVbaUserForm::Controls( const uno::Any& index ) throw (uno::RuntimeException)
ScVbaUserForm::hasProperty( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
{
diff --git a/patches/vba/vba-misc-tweakupstream.diff b/patches/vba/vba-misc-tweakupstream.diff
index 3b325b2..46a01d8 100644
--- a/patches/vba/vba-misc-tweakupstream.diff
+++ b/patches/vba/vba-misc-tweakupstream.diff
@@ -18,7 +18,7 @@ diff --git basic/source/runtime/methods1.cxx basic/source/runtime/methods1.cxx
index 9d3b51a..e429217 100644
--- basic/source/runtime/methods1.cxx
+++ basic/source/runtime/methods1.cxx
-@@ -532,11 +532,18 @@ RTLFUNC(DoEvents)
+@@ -532,13 +532,20 @@ RTLFUNC(DoEvents)
(void)pBasic;
(void)bWrite;
(void)rPar;
@@ -26,11 +26,13 @@ index 9d3b51a..e429217 100644
+// we already process application events etc. in between
+// basic runtime pcode ( on a timed basis )
+#if 0
- Timer aTimer;
- aTimer.SetTimeout( 1 );
- aTimer.Start();
- while ( aTimer.IsActive() )
- Application::Yield();
+ // Dummy implementation as the following code leads
+ // to performance problems for unknown reasons
+ //Timer aTimer;
+ //aTimer.SetTimeout( 1 );
+ //aTimer.Start();
+ //while ( aTimer.IsActive() )
+ // Application::Reschedule();
+#endif
+ // always return 0
+ rPar.Get(0)->PutInteger( 0 );
commit d0b013bdfc72279d62efb866ec78af82ee8b8f74
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue Sep 7 10:12:48 2010 +0200
Let be anything that couldn't be absolutized.
It seems there is no reason to special case each and every command that can
take other things than files as params; in case of trouble, it will fail later
anyway ;-)
diff --git a/bin/g b/bin/g
index ade9f56..60b1e4d 100755
--- a/bin/g
+++ b/bin/g
@@ -72,13 +72,8 @@ while shift ; do
# make the paths absolute
FILES[$FILESNUM]=`readlink -n -e "$PARAM"`
if [ -z "${FILES[$FILESNUM]}" ] ; then
- # commands that take params other than files
- if [ "$COMMAND" = "checkout" -o "$COMMAND" = "tag" ] ; then
- FILES[$FILESNUM]="$PARAM"
- else
- echo "'$PARAM' not found in `pwd`."
- exit 1
- fi
+ # it is probably not a file, but a tag name, or something
+ FILES[$FILESNUM]="$PARAM"
fi
FILESNUM=$(($FILESNUM+1))
fi
More information about the ooo-build-commit
mailing list