[ooo-build-commit] 3 commits - configure.in download.in patches/dev300
René Engelhard
rene at kemper.freedesktop.org
Fri Oct 9 07:07:31 PDT 2009
configure.in | 16 +-
download.in | 2
patches/dev300/apply | 33 ----
patches/dev300/buildfix-system-lucene.diff | 25 ---
patches/dev300/calc-status-bar-func.diff | 63 --------
patches/dev300/kde4-configure2.diff | 74 ----------
patches/dev300/kde4-fpicker-fix-toOUString.diff | 13 -
patches/dev300/link-with-uno-cppu.diff | 12 -
patches/dev300/postset-add-ro.diff | 10 -
patches/dev300/prevent-multiple-window-resize-calls-when-maximised.diff | 43 -----
10 files changed, 17 insertions(+), 274 deletions(-)
New commits:
commit 70abd7fb1c0dd86ee4097a14bc5e1763645d82af
Author: Rene Engelhard <rene at debian.org>
Date: Fri Oct 9 16:07:00 2009 +0200
support OOo-Dev upstream tarballs
diff --git a/configure.in b/configure.in
index 60d13af..0b8f0ba 100644
--- a/configure.in
+++ b/configure.in
@@ -507,7 +507,7 @@ else
GREP=grep
fi
-if echo "$with_tag" | $GREP -E ['^(src680-m2[4-9][0-9]|dev300|beb300|BEB300|ooo300|OOO300|ooo310|OOO310)'] >/dev/null 2>/dev/null ; then
+if echo "$with_tag" | $GREP -E ['^(dev300|ooo320|OOO320)'] >/dev/null 2>/dev/null ; then
APPLY_DIR="$TOOLSDIR/patches/dev300"
else
APPLY_DIR="$TOOLSDIR/patches/$with_tag"
@@ -1373,6 +1373,8 @@ elif test "$with_tag" = "OOO310_m11" ; then
UPSTREAM_VERSION=3.1.0
elif test "$with_tag" = "OOO310_m18" ; then
UPSTREAM_VERSION=3.1.1
+else
+ UPSTREAM_TAG=$with_tag
fi
if test -n "$UPSTREAM_VERSION"; then
UPSTREAM_NAME="OOo_${UPSTREAM_VERSION}_src"
@@ -1382,7 +1384,17 @@ if test -n "$UPSTREAM_VERSION"; then
UPSTREAM_URI=
else
SOURCE_TYPE="UPSTREAM"
- UPSTREAM_URI="http://openoffice.bouncer.osuosl.org/?product=OpenOffice.org&os=src_bzip&version=${UPSTREAM_VERSION}"
+ UPSTREAM_URI="http://download.services.openoffice.org/files/stable/${UPSTREAM_VERSION}/"
+ fi
+fi
+if test -n "$UPSTREAM_TAG"; then
+ UPSTREAM_NAME="OOo-Dev_${UPSTREAM_TAG}_src"
+ if test "z$with_mirror" != "z" ; then
+ SOURCE_TYPE="MIRROR"
+ UPSTREAM_URI=
+ else
+ SOURCE_TYPE="UPSTREAM"
+ UPSTREAM_URI="http://download.services.openoffice.org/files/extended/developer/{UPSTREAM_TAG}/"
fi
fi
AC_SUBST(UPSTREAM_NAME)
diff --git a/download.in b/download.in
index a86f2d7..caf829f 100755
--- a/download.in
+++ b/download.in
@@ -176,7 +176,7 @@ sub source_file_ooo($)
}
elsif ( '@SOURCE_TYPE@' eq "UPSTREAM" ) {
die "Up-stream doesn't have a package split" if ($SPLIT);
- source_file( '@UPSTREAM_URI@' . "&lang=$upstream_what", '@UPSTREAM_NAME@' . "_$upstream_what.tar.bz2" );
+ source_file( '@UPSTREAM_URI@' . '@UPSTREAM_NAME@' . "_$upstream_what.tar.bz2" );
}
elsif ( '@SOURCE_TYPE@' eq "MIRROR" ) {
source_file( '@UPSTREAM_NAME@' . "_$upstream_what.tar.bz2" );
commit 93ca3094a480d4d0dca6aea83a815b1f94e55227
Author: Rene Engelhard <rene at debian.org>
Date: Fri Oct 9 15:55:21 2009 +0200
remove some more obsoleted patches
* patches/dev300/apply: remove < m60 patches which are skipped on m60 but not on m1
* patches/dev300/buildfix-system-lucene.diff: remove
* patches/dev300/postset-add-ro.diff: remove
* patches/dev300/prevent-multiple-window-resize-calls-when-maximised.diff: remove
* patches/dev300/kde4-configure2.diff: remove
* patches/dev300/kde4-fpicker-fix-toOUString.diff: remove
* patches/dev300/link-with-uno-cppu.diff: remove
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 94431c7..589d3d5 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1112,10 +1112,9 @@ installer-get-path-correctly.diff, pmladek
# allow to use the prebuilt jsr173_1.0_api.jar
build-prebuilt-stax.diff, i#93116, pmladek
-[ BuildBits < dev300-m60 ]
# fix build with neon-0.24
# FIXME: this no longer applies against dev300-m60.
-ucb-neon-0.24.diff, pmladek
+#ucb-neon-0.24.diff, pmladek
[ BuildBits ]
# don't break dmake with environment variables containing space in the name
@@ -1127,18 +1126,10 @@ armeabi-softfp-buildfix.diff, i#105302, doko
# support db4.8
db4.8.diff, rengelha
-[ BuildBits == dev300-m60 ]
-# fix build with system-lucene
-buildfix-system-lucene.diff, i#105433, rengelha
-
[ BuildBits >= dev300-m60 < ooo320-m1 ]
instsetoo-native-fix-system-python.diff, i#105663, rengelha
-[ BuildBits < dev300-m60 ]
-# add ro
-postset-add-ro.diff
-
-[ Gcc44 >= dev300-m60 ]
+[ Gcc44 ]
oox-tokenmap.string.h.diff, i#105219
[ Java14 ]
@@ -1403,9 +1394,6 @@ psprint-postscript-page-setup.diff, i#65491, n#80448, jholesov
# enable vcl to load bitmaps when height it negative
vcl-bitmap2-negative-height.diff
-[ VCL < dev300-m60 ]
-prevent-multiple-window-resize-calls-when-maximised.diff, i#104469
-
[ SystemBits ]
# use getopt() and readdir_r() from system glibc
#FIXME src680: system-libc.diff, i#69033, rengelha
@@ -2112,11 +2100,6 @@ kde4-buildfix-connectivity.diff
kde4-oxygen-icons.diff, i#103482
-[ KDE4 < dev300-m60 ]
-kde4-fpicker-fix-toOUString.diff, i#104526
-kde4-configure2.diff, i#105127, bnc#539035, pmladek
-
-[ KDE4 ]
# Further fixes on top of existing kde4 support
kde4_fpicker_fixes.diff
# FIXME. Needs update for DEV300, --rengelhard
@@ -3241,13 +3224,6 @@ edit-links-decode-unicode-uri.diff, i#104166, kohei
# cache fontconfig's pre-substitution result for better rendering performance.
fontconfig-cache-pre-substitution.diff, n#529532, kohei
-[ Fixes < dev300-m60 ]
-# FIXME: 2009-09-03: For some reason need to link with $(CPPULIB),
-# i.e. -luno_cppu in vcl/util, otherwise get undefined refs. Remove
-# this if some way to fix the root cause of the problem is found.
-# FIXME: 2009-09-28: Seems to be fixed in m60, --rengelhard
-link-with-uno-cppu.diff, tml
-
[ OOXML ]
oox-pptx-import-fix-placeholder-text-style.diff, n#479834, rodo
diff --git a/patches/dev300/buildfix-system-lucene.diff b/patches/dev300/buildfix-system-lucene.diff
deleted file mode 100644
index d21f260..0000000
--- a/patches/dev300/buildfix-system-lucene.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- transex3/prj/build.lst-old 2009-09-29 00:42:03.000000000 +0200
-+++ transex3/prj/build.lst 2009-09-29 00:40:57.000000000 +0200
-@@ -1,4 +1,4 @@
--tr transex3 : tools libxslt berkeleydb lucene NULL
-+tr transex3 : tools libxslt berkeleydb LUCENE:lucene NULL
- tr transex3 usr1 - all tr_mkout NULL
- tr transex3\inc nmake - all tr_inc NULL
- tr transex3\source nmake - all tr_src tr_inc NULL
---- transex3/source/help/makefile.mk-old 2009-09-29 01:34:53.000000000 +0200
-+++ transex3/source/help/makefile.mk 2009-09-29 01:31:23.000000000 +0200
-@@ -112,7 +112,7 @@
-
- #JARFILES = ridl.jar jurt.jar unoil.jar juh.jar
- .IF "$(SYSTEM_LUCENE)" == "YES"
--XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR)
-+CLASSPATH!:=$(CLASSPATH)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR)
- COMP=fix_system_lucene
- .ELSE
- JARFILES += lucene-core-2.3.jar lucene-analyzers-2.3.jar
-@@ -136,4 +136,4 @@
- fix_system_lucene:
- @echo "Fix Java Class-Path entry for Lucene libraries from system."
- @$(SED) -r -e "s#^(Class-Path:).*#\1 file://$(LUCENE_CORE_JAR) file://$(LUCENE_ANALYZERS_JAR)#" \
-- -i ../../../../../$(INPATH)/class/HelpLinker/META-INF/MANIFEST.MF
-+ -i ../../$(INPATH)/class/HelpLinker/META-INF/MANIFEST.MF
diff --git a/patches/dev300/kde4-configure2.diff b/patches/dev300/kde4-configure2.diff
deleted file mode 100644
index fde4098..0000000
--- a/patches/dev300/kde4-configure2.diff
+++ /dev/null
@@ -1,74 +0,0 @@
---- configure.in.old 2009-08-26 12:25:16.000000000 +0200
-+++ configure.in 2009-09-15 14:09:26.000000000 +0200
-@@ -6158,8 +6158,8 @@ KDE4_CFLAGS=""
- KDE4_LIBS=""
- MOC4="moc"
- if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
-- qt_incdirs="$QTINC $QTDIR /usr/include/qt4 /usr/include $x_includes"
-- qt_libdirs="$QTLIB /usr/lib $x_libraries"
-+ qt_incdirs="$QT4INC $QT4DIR $QTINC $QTDIR /usr/include/qt4 /usr/include $x_includes"
-+ qt_libdirs="$QT4LIB $QTLIB /usr/lib $x_libraries"
-
- kde_incdirs="/usr/include $x_includes"
- kde_libdirs="/usr/lib $x_libraries"
-@@ -6169,6 +6169,15 @@ if test "$test_kde4" = "yes" -a "$ENABLE
- kde_libdirs="$kde_libdirs /usr/lib64 /usr/lib64/kde4"
- fi
-
-+ if test -n "$KDE4DIR" ; then
-+ kde_incdirs="$KDE4DIR/include $kde_incdirs"
-+ if test "$build_cpu" != "x86_64" ; then
-+ kde_libdirs="$KDE4DIR/lib $kde_libdirs"
-+ else
-+ kde_libdirs="$KDE4DIR/lib64 $KDE4DIR/lib $kde_libdirs"
-+ fi
-+ fi
-+
- qt_test_include="Qt/qobject.h"
- qt_test_library="libQtCore.so"
- kde_test_include="ksharedptr.h"
-@@ -6185,7 +6194,7 @@ if test "$test_kde4" = "yes" -a "$ENABLE
-
- AC_MSG_RESULT([$qt_header_dir])
- if test "x$qt_header_dir" = "xno" ; then
-- AC_MSG_ERROR([Qt4 headers not found. Please specify the root of your Qt4 installation by exporting QTDIR before running "configure".])
-+ AC_MSG_ERROR([Qt4 headers not found. Please specify the root of your Qt4 installation by exporting QT4DIR before running "configure".])
- fi
-
- AC_MSG_CHECKING([for Qt4 libraries])
-@@ -6200,14 +6209,14 @@ if test "$test_kde4" = "yes" -a "$ENABLE
- AC_MSG_RESULT([$qt_lib_dir])
-
- if test "x$qt_lib_dir" = "xno" ; then
-- AC_MSG_ERROR([Qt4 libraries not found. Please specify the root of your Qt4 installation by exporting QTDIR before running "configure".])
-+ AC_MSG_ERROR([Qt4 libraries not found. Please specify the root of your Qt4 installation by exporting QT4DIR before running "configure".])
- fi
-
- dnl Check for Meta Object Compiler
-- AC_PATH_PROG( MOC4, moc, no, [$PATH:$QTDIR/bin] )
-+ AC_PATH_PROG( MOC4, moc, no, [$PATH:$QT4DIR/bin] )
- if test "$MOC4" = "no" ; then
- AC_MSG_ERROR([Qt Meta Object Compiler not found. Please specify
--the root of your Qt installation by exporting QTDIR before running "configure".])
-+the root of your Qt installation by exporting QT4DIR before running "configure".])
- fi
-
- dnl Check for KDE4 headers
-@@ -6221,7 +6230,7 @@ the root of your Qt installation by expo
- done
- AC_MSG_RESULT([$kde_incdir])
- if test "x$kde_incdir" = "xno" ; then
-- AC_MSG_ERROR([KDE4 headers not found. Please specify the root of your KDE4 installation by exporting KDEDIR before running "configure".])
-+ AC_MSG_ERROR([KDE4 headers not found. Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".])
- fi
-
- dnl Check for KDE4 libraries
-@@ -6236,7 +6245,7 @@ the root of your Qt installation by expo
-
- AC_MSG_RESULT([$kde_libdir])
- if test "x$kde_libdir" = "xno" ; then
-- AC_MSG_ERROR([KDE4 libraries not found. Please specify the root of your KDE4 installation by exporting KDEDIR before running "configure".])
-+ AC_MSG_ERROR([KDE4 libraries not found. Please specify the root of your KDE4 installation by exporting KDE4DIR before running "configure".])
- fi
-
- KDE4_CFLAGS="`pkg-config --cflags QtCore` `pkg-config --cflags QtGui` -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
diff --git a/patches/dev300/kde4-fpicker-fix-toOUString.diff b/patches/dev300/kde4-fpicker-fix-toOUString.diff
deleted file mode 100644
index 71487d5..0000000
--- a/patches/dev300/kde4-fpicker-fix-toOUString.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: source/unx/kde4/KDE4FilePicker.cxx
-===================================================================
---- fpicker/source/unx/kde4/KDE4FilePicker.cxx (Revision 275397)
-+++ fpicker/source/unx/kde4/KDE4FilePicker.cxx (Arbeitskopie)
-@@ -136,7 +136,7 @@
-
- rtl::OUString toOUString(const QString& s)
- {
-- return rtl::OUString(s.toUtf8().data(), s.length(), RTL_TEXTENCODING_UTF8);
-+ return rtl::OUString(s.toUtf8().data(), s.toUtf8().length(), RTL_TEXTENCODING_UTF8);
- }
-
- QString toQString(const rtl::OUString& s)
diff --git a/patches/dev300/link-with-uno-cppu.diff b/patches/dev300/link-with-uno-cppu.diff
deleted file mode 100644
index 6e8d472..0000000
--- a/patches/dev300/link-with-uno-cppu.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- vcl/util/makefile.mk
-+++ vcl/util/makefile.mk
-@@ -287,7 +287,8 @@
- $(TOOLSLIB) \
- $(VOSLIB) \
- $(BASEGFXLIB) \
-- $(SALLIB)
-+ $(SALLIB) \
-+ $(CPPULIB)
-
- # prepare linking of Xinerama
- .IF "$(USE_XINERAMA)" != "NO"
diff --git a/patches/dev300/postset-add-ro.diff b/patches/dev300/postset-add-ro.diff
deleted file mode 100644
index 341fcf3..0000000
--- a/patches/dev300/postset-add-ro.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- solenv/inc/postset.mk-old 2009-04-02 21:01:45.000000000 +0200
-+++ solenv/inc/postset.mk 2009-04-02 21:05:39.000000000 +0200
-@@ -35,6 +35,6 @@
- defaultlangiso=en-US
-
- # Complete list of all supported ISO codes
--completelangiso=af ar as-IN be-BY bg br brx bn bn-BD bn-IN bs by ca cs cy da de dgo dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gd gl gu gu-IN he hi-IN hr hu it ja ka kk km kn ko kok ks ku lo lt lv mai mk mn mni ms ml-IN mr-IN my ne nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR ru rw sat sa-IN sc sd sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk uz ve vi xh zh-CN zh-TW zu
-+completelangiso=af ar as-IN be-BY bg br brx bn bn-BD bn-IN bs by ca cs cy da de dgo dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gd gl gu gu-IN he hi-IN hr hu it ja ka kk km kn ko kok ks ku lo lt lv mai mk mn mni ms ml-IN mr-IN my ne nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR ro ru rw sat sa-IN sc sd sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk uz ve vi xh zh-CN zh-TW zu
-
- alllangiso=$(strip $(defaultlangiso) $(subst,$(defaultlangiso), $(uniq $(subst,ALL,$(completelangiso) $(WITH_LANG)))))
diff --git a/patches/dev300/prevent-multiple-window-resize-calls-when-maximised.diff b/patches/dev300/prevent-multiple-window-resize-calls-when-maximised.diff
deleted file mode 100644
index 565c109..0000000
--- a/patches/dev300/prevent-multiple-window-resize-calls-when-maximised.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-From bd0d9d4ac9148211e14eb1548ad54829af465aed Mon Sep 17 00:00:00 2001
-From: Chris Halls <halls at debian.org>
-Date: Mon, 24 Aug 2009 16:44:15 +0100
-Subject: [PATCH] Prevent multiple window resize calls when maximised
-
-See http://bugs.debian.org/542387.
-
-Problem introduced as part of fix to IZ#44325.
-
-If KDE Window manager receives a window move after a window has already been
-maximised, it assumes the window should be restored to original size. Under
-Gnome it will stay maximised.
-
-This fix disables further window resize calls once the window state has been
-set to maximised.
----
- unx/gtk/window/gtkframe.cxx | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git vcl/unx/gtk/window/gtkframe.cxx b/unx/gtk/window/gtkframe.cxx
-index c1fbbc5..d5e514a 100644
---- vcl.old/unx/gtk/window/gtkframe.cxx
-+++ vcl/unx/gtk/window/gtkframe.cxx
-@@ -1501,7 +1501,7 @@ void GtkSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, USHOR
-
- if( isChild( false, true ) )
- gtk_widget_set_size_request( m_pWindow, nWidth, nHeight );
-- else
-+ else if( ! ( m_nState & GDK_WINDOW_STATE_MAXIMIZED ) )
- gtk_window_resize( GTK_WINDOW(m_pWindow), nWidth, nHeight );
- setMinMaxSize();
- }
-@@ -1603,6 +1603,7 @@ void GtkSalFrame::SetWindowState( const SalFrameState* pState )
- SAL_FRAMESTATE_MASK_MAXIMIZED_WIDTH | SAL_FRAMESTATE_MASK_MAXIMIZED_HEIGHT;
-
- if( (pState->mnMask & SAL_FRAMESTATE_MASK_STATE) &&
-+ ! ( m_nState & GDK_WINDOW_STATE_MAXIMIZED ) &&
- (pState->mnState & SAL_FRAMESTATE_MAXIMIZED) &&
- (pState->mnMask & nMaxGeometryMask) == nMaxGeometryMask )
- {
---
-1.6.3.3
-
commit 45497e0afb647ef504a2b70cbb733b140dd4c1c5
Author: Rene Engelhard <rene at debian.org>
Date: Fri Oct 9 15:41:48 2009 +0200
remove one missed obsolete patch
* patches/dev300/calc-status-bar-func.diff: remove
* patches/dev300/apply: remove above
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3b6bf34..94431c7 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -725,11 +725,6 @@ sc-fit-to-width-height-skip-breaks.diff, n#404232, n#404563, i#94698, kohei
# Don't use pShapeContext after deleting the instance. Fixes SEGFAULT.
calc-filter-xml-free-context.diff, n#467536, jonp
-[ CalcFixes < dev300-m59 ]
-# show COUNT and COUNTA results even if current range contains an error.
-calc-status-bar-func.diff, n#430655, i#94618, kohei
-
-[ CalcFixes ]
# default output to new sheet, instead of current sheet.
calc-dp-default-new-sheet.diff, i#50886, kohei
diff --git a/patches/dev300/calc-status-bar-func.diff b/patches/dev300/calc-status-bar-func.diff
deleted file mode 100644
index e940380..0000000
--- a/patches/dev300/calc-status-bar-func.diff
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git sc/source/ui/inc/tabvwsh.hxx sc/source/ui/inc/tabvwsh.hxx
-index 6074c60..e7fa0ec 100644
---- sc/source/ui/inc/tabvwsh.hxx
-+++ sc/source/ui/inc/tabvwsh.hxx
-@@ -406,7 +406,7 @@ public:
-
- void ExecuteCellFormatDlg ( SfxRequest& rReq, USHORT nTabPage = 0xffff );
-
-- BOOL GetFunction( String& rFuncStr );
-+ BOOL GetFunction( String& rFuncStr, sal_uInt16 nErrCode = 0 );
-
- void StartSimpleRefDialog( const String& rTitle, const String& rInitVal,
- BOOL bCloseOnButtonUp, BOOL bSingleCell, BOOL bMultiSelection );
-diff --git sc/source/ui/view/cellsh.cxx sc/source/ui/view/cellsh.cxx
-index bda4829..28e88df 100644
---- sc/source/ui/view/cellsh.cxx
-+++ sc/source/ui/view/cellsh.cxx
-@@ -691,15 +691,9 @@ void ScCellShell::GetState(SfxItemSet &rSet)
- nErrCode = pFCell->GetErrCode();
- }
-
-- if ( nErrCode > 0 )
-- rSet.Put( SfxStringItem( nWhich,
-- ScGlobal::GetLongErrorString( nErrCode ) ) );
-- else
-- {
-- String aFuncStr;
-- if ( pTabViewShell->GetFunction( aFuncStr ) )
-- rSet.Put( SfxStringItem( nWhich, aFuncStr ) );
-- }
-+ String aFuncStr;
-+ if ( pTabViewShell->GetFunction( aFuncStr, nErrCode ) )
-+ rSet.Put( SfxStringItem( nWhich, aFuncStr ) );
- }
- }
- break;
-diff --git sc/source/ui/view/tabvwsha.cxx sc/source/ui/view/tabvwsha.cxx
-index ab3c2e7..0b83147 100644
---- sc/source/ui/view/tabvwsha.cxx
-+++ sc/source/ui/view/tabvwsha.cxx
-@@ -71,12 +71,21 @@
- #include "compiler.hxx"
-
-
--BOOL ScTabViewShell::GetFunction( String& rFuncStr )
-+BOOL ScTabViewShell::GetFunction( String& rFuncStr, sal_uInt16 nErrCode )
- {
- String aStr;
-
- ScSubTotalFunc eFunc = (ScSubTotalFunc) SC_MOD()->GetAppOptions().GetStatusFunc();
-
-+ if (eFunc == SUBTOTAL_FUNC_CNT || eFunc == SUBTOTAL_FUNC_CNT2)
-+ nErrCode = 0;
-+
-+ if (nErrCode)
-+ {
-+ rFuncStr = ScGlobal::GetLongErrorString(nErrCode);
-+ return true;
-+ }
-+
- USHORT nGlobStrId = 0;
- switch (eFunc)
- {
More information about the ooo-build-commit
mailing list