[arch-commits] CVS update of unstable/office/openoffice-base-devel (3 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Mon Oct 15 18:44:44 UTC 2007
Date: Monday, October 15, 2007 @ 14:44:44
Author: andyrtr
Path: /home/cvs-unstable/unstable/office/openoffice-base-devel
Modified: PKGBUILD (1.1 -> 1.2)
Removed: buildfix-sc-vba_oog680_m1.diff (1.1)
fix-dba-connectivity-i80338_oog680_m1.diff (1.1)
remove unneeded patches
--------------------------------------------+
PKGBUILD | 3
buildfix-sc-vba_oog680_m1.diff | 96 ---------------------------
fix-dba-connectivity-i80338_oog680_m1.diff | 26 -------
3 files changed, 125 deletions(-)
Index: unstable/office/openoffice-base-devel/PKGBUILD
diff -u unstable/office/openoffice-base-devel/PKGBUILD:1.1 unstable/office/openoffice-base-devel/PKGBUILD:1.2
--- unstable/office/openoffice-base-devel/PKGBUILD:1.1 Sun Oct 14 20:53:39 2007
+++ unstable/office/openoffice-base-devel/PKGBUILD Mon Oct 15 14:44:44 2007
@@ -47,14 +47,11 @@
default-no-startup-wizard_oog680_m1.diff
default-system-fpicker_oog680_m1.diff
jvmfwk-gij-paths_src233.diff
- buildfix-sc-vba_oog680_m1.diff
- fix-dba-connectivity-i80338_oog680_m1.diff
internal-db-no-java_oog680_m1.diff
gstreamer-support_oog680_m1.diff
fix-font-hinting_src231.diff
fix-invisible-text.diff
gui-insensitive_oog680_m2.diff
- neon27-oog680_m3.diff
buildfix-agg_2_5_oog680_m3.diff
ucb-no-CURL_NO_OLDIES_oog_m5.diff
libxmlsec-system-nss_oog_m5.diff
Index: unstable/office/openoffice-base-devel/buildfix-sc-vba_oog680_m1.diff
diff -u unstable/office/openoffice-base-devel/buildfix-sc-vba_oog680_m1.diff:1.1 unstable/office/openoffice-base-devel/buildfix-sc-vba_oog680_m1.diff:removed
--- unstable/office/openoffice-base-devel/buildfix-sc-vba_oog680_m1.diff:1.1 Mon Oct 15 14:38:46 2007
+++ unstable/office/openoffice-base-devel/buildfix-sc-vba_oog680_m1.diff Mon Oct 15 14:44:44 2007
@@ -1,96 +0,0 @@
---- sc/source/ui/vba/vbaapplication.cxx
-+++ sc/source/ui/vba/vbaapplication.cxx
-@@ -293,7 +293,7 @@
- ScVbaApplication::setStatusBar( const uno::Any& _statusbar ) throw (uno::RuntimeException)
- {
- rtl::OUString sText;
-- sal_Bool bDefault;
-+ sal_Bool bDefault = sal_False;
- uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
- uno::Reference< task::XStatusIndicatorSupplier > xStatusIndicatorSupplier( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
- uno::Reference< task::XStatusIndicator > xStatusIndicator( xStatusIndicatorSupplier->getStatusIndicator(), uno::UNO_QUERY_THROW );
-@@ -426,7 +426,7 @@
-
- if( Scroll.hasValue() )
- {
-- sal_Bool aScroll;
-+ sal_Bool aScroll = sal_False;
- if( Scroll >>= aScroll )
- {
- bScroll = aScroll;
---- sc/source/ui/vba/vbahelper.hxx
-+++ sc/source/ui/vba/vbahelper.hxx
-@@ -38,8 +38,8 @@
- #include <com/sun/star/frame/XModel.hpp>
- #include <docsh.hxx>
-
--#define css com::sun::star
--#define oo org::openoffice
-+namespace css = ::com::sun::star;
-+
- namespace org
- {
- namespace openoffice
-@@ -69,6 +69,8 @@
- }
- }
-
-+namespace oo = org::openoffice;
-+
- #ifdef DEBUG
- # define SC_VBA_FIXME(a) OSL_TRACE( a )
- # define SC_VBA_STUB() SC_VBA_FIXME(( "%s - stubbed\n", __FUNCTION__ ))
---- sc/source/ui/vba/vbarange.cxx
-+++ sc/source/ui/vba/vbarange.cxx
-@@ -487,7 +487,7 @@
- {
- case uno::TypeClass_BOOLEAN:
- {
-- sal_Bool bState;
-+ sal_Bool bState = sal_False;
- if ( aValue >>= bState )
- {
- uno::Reference< table::XCellRange > xRange( xCell, uno::UNO_QUERY_THROW );
-@@ -2318,7 +2318,7 @@
- return;
- }
-
-- sal_Bool bHidden;
-+ sal_Bool bHidden = sal_False;
- if ( !(_hidden >>= bHidden) )
- throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Failed to extract param for Hidden property" ) ), uno::Reference< uno::XInterface >() );
-
---- sc/source/ui/vba/vbaworksheets.cxx
-+++ sc/source/ui/vba/vbaworksheets.cxx
-@@ -227,7 +227,7 @@
- void SAL_CALL
- ScVbaWorksheets::setVisible( const uno::Any& _visible ) throw (uno::RuntimeException)
- {
-- sal_Bool bState;
-+ sal_Bool bState = sal_False;
- if ( _visible >>= bState )
- {
- uno::Reference< container::XEnumeration > xEnum( createEnumeration(), uno::UNO_QUERY_THROW );
---- sc/util/makefile.mk
-+++ sc/util/makefile.mk
-@@ -266,6 +266,7 @@
-
- SHL9STDLIBS= \
- $(CPPUHELPERLIB) \
-+ $(VCLLIB) \
- $(CPPULIB) \
- $(COMPHELPERLIB) \
- $(SVLIB) \
-@@ -282,6 +283,12 @@
- SHL9DEPN=$(SHL1TARGETN) $(SHL8TARGETN)
- SHL9LIBS=$(SLB)$/$(TARGET_VBA).lib
-
-+.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
-+ LIBCOMPNAME=$(LOCAL_COMMON_OUT)$/lib/lib$(SHL9TARGET)$(DLLPOST)
-+.ELSE
-+ LIBCOMPNAME=$(COMMONBIN)$/$(SHL9TARGET)$(DLLPOST)
-+.ENDIF
-+
- .ENDIF
-
-
Index: unstable/office/openoffice-base-devel/fix-dba-connectivity-i80338_oog680_m1.diff
diff -u unstable/office/openoffice-base-devel/fix-dba-connectivity-i80338_oog680_m1.diff:1.1 unstable/office/openoffice-base-devel/fix-dba-connectivity-i80338_oog680_m1.diff:removed
--- unstable/office/openoffice-base-devel/fix-dba-connectivity-i80338_oog680_m1.diff:1.1 Mon Oct 15 14:40:06 2007
+++ unstable/office/openoffice-base-devel/fix-dba-connectivity-i80338_oog680_m1.diff Mon Oct 15 14:44:44 2007
@@ -1,26 +0,0 @@
---- connectivity/source/drivers/hsqldb/HDriver.cxx
-+++ connectivity/source/drivers/hsqldb/HDriver.cxx
-@@ -241,7 +241,11 @@
- aConvertedProperties[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JavaDriverClass"));
- aConvertedProperties[nPos++].Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.hsqldb.jdbcDriver"));
- aConvertedProperties[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JavaDriverClassPath"));
-+#ifdef SYSTEM_HSQLDB
-+ aConvertedProperties[nPos++].Value <<= (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(HSQLDB_JAR)) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" vnd.sun.star.expand:$ORIGIN/classes/sdbc_hsqldb.jar")));
-+#else
- aConvertedProperties[nPos++].Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.expand:$ORIGIN/classes/hsqldb.jar vnd.sun.star.expand:$ORIGIN/classes/sdbc_hsqldb.jar"));
-+#endif
- aConvertedProperties[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsAutoRetrievingEnabled"));
- aConvertedProperties[nPos++].Value <<= sal_True;
- aConvertedProperties[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutoRetrievingStatement"));
---- connectivity/source/drivers/hsqldb/makefile.mk
-+++ connectivity/source/drivers/hsqldb/makefile.mk
-@@ -50,6 +50,9 @@
- @echo "Not building jurt because Java is disabled"
- .ENDIF
-
-+.IF "$(SYSTEM_HSQLDB)" == "YES"
-+CDEFS+=-DSYSTEM_HSQLDB -DHSQLDB_JAR=\""file://$(HSQLDB_JAR)"\"
-+.ENDIF
- # --- Resources ---------------------------------
-
- SRS1NAME=$(TARGET)
More information about the arch-commits
mailing list