[ooo-build-commit] .: patches/dev300 patches/vba
Petr Mladek
pmladek at kemper.freedesktop.org
Thu Aug 5 05:42:54 PDT 2010
patches/dev300/build-java-1.4-qadevOOo.diff | 18 +++++++++---------
patches/dev300/build-java-1.4-wizards.diff | 10 +++++-----
patches/dev300/libxmlsec-system-nss.diff | 4 ++--
patches/vba/cws-vbasupportdev300.diff | 4 +++-
patches/vba/vba-container-controls.diff | 6 +-----
5 files changed, 20 insertions(+), 22 deletions(-)
New commits:
commit 5e99f8d721455b246b08cdf1687066b2fb949cb2
Author: Petr Mladek <pmladek at walk.suse.cz>
Date: Thu Aug 5 14:28:24 2010 +0200
fix to apply on SLED10
* patches/dev300/build-java-1.4-qadevOOo.diff: update for ooo330-m2
* patches/dev300/build-java-1.4-wizards.diff: update for ooo330-m2
* patches/dev300/libxmlsec-system-nss.diff: update for ooo330-m2
* patches/vba/cws-vbasupportdev300.diff: clean up one hunk
* patches/vba/vba-container-controls.diff: clean up one hunk
diff --git a/patches/dev300/build-java-1.4-qadevOOo.diff b/patches/dev300/build-java-1.4-qadevOOo.diff
index d62fb94..bfcbdc7 100644
--- a/patches/dev300/build-java-1.4-qadevOOo.diff
+++ b/patches/dev300/build-java-1.4-qadevOOo.diff
@@ -27,21 +27,21 @@
int ugly = 0;
- int ok_status = 1; // 1=ok 2=bad 3=ugly
+ Integer ok_status = new Integer(1); // 1=ok 2=bad 3=ugly
-
+
IniFile aResultIniFile = new IniFile(sResultIniFile);
int nPages = aResultIniFile.getIntValue("global", "pages", 0);
@@ -200,12 +200,12 @@ public class JPEGComparator extends Enha
else if (nPercent <= 5)
{
- bad ++;
-- ok_status=2;
-+ ok_status= new Integer(2);
+ bad++;
+- ok_status = 2;
++ ok_status = new Integer(2);
}
else
{
- ugly ++;
-- ok_status=3;
-+ ok_status=new Integer(3);
+ ugly++;
+- ok_status = 3;
++ ok_status = new Integer(3);
}
}
@@ -54,7 +54,7 @@
- try
- {
- Object quickStarter = msf.createInstance("com.sun.star.office.Quickstart");
-- XFastPropertySet fps = (XFastPropertySet) UnoRuntime.queryInterface(XFastPropertySet.class, quickStarter);
+- XFastPropertySet fps = UnoRuntime.queryInterface(XFastPropertySet.class, quickStarter);
- fps.setFastPropertyValue(0, false);
- }
- catch (com.sun.star.uno.Exception ex)
@@ -66,7 +66,7 @@
+// try
+// {
+// Object quickStarter = msf.createInstance("com.sun.star.office.Quickstart");
-+// XFastPropertySet fps = (XFastPropertySet) UnoRuntime.queryInterface(XFastPropertySet.class, quickStarter);
++// XFastPropertySet fps = UnoRuntime.queryInterface(XFastPropertySet.class, quickStarter);
+// fps.setFastPropertyValue(0, false);
+// }
+// catch (com.sun.star.uno.Exception ex)
diff --git a/patches/dev300/build-java-1.4-wizards.diff b/patches/dev300/build-java-1.4-wizards.diff
index c18a4a3..5ee3928 100644
--- a/patches/dev300/build-java-1.4-wizards.diff
+++ b/patches/dev300/build-java-1.4-wizards.diff
@@ -77,7 +77,7 @@
- java.util.Vector<String> TableVector = new java.util.Vector<String>();
+ java.util.Vector TableVector = new java.util.Vector();
Object oTable = getTableNamesAsNameAccess().getByName(_stablename);
- XKeysSupplier xKeysSupplier = (XKeysSupplier) UnoRuntime.queryInterface(XKeysSupplier.class, oTable);
+ XKeysSupplier xKeysSupplier = UnoRuntime.queryInterface( XKeysSupplier.class, oTable );
xIndexKeys = xKeysSupplier.getKeys();
--- wizards/com/sun/star/wizards/form/FieldLinker.java.old 2009-09-10 19:49:19.000000000 +0200
+++ wizards/com/sun/star/wizards/form/FieldLinker.java 2009-10-01 20:50:58.000000000 +0200
@@ -436,10 +436,10 @@
- Integer.valueOf(13),
+ new Integer(13),
"HID:" + _firstRowHelpID++,
-- Short.valueOf(UnoDialog.getListBoxLineCount() /* 7 */) ,
+- Short.valueOf(UnoDialog.getListBoxLineCount() /* 7 */),
- Integer.valueOf(nPosX1),
- Integer.valueOf(iCompPosY + 23),
-+ new Short(UnoDialog.getListBoxLineCount() /* 7 */) ,
++ new Short(UnoDialog.getListBoxLineCount() /* 7 */),
+ new Integer(nPosX1),
+ new Integer(iCompPosY + 23),
IStep,
@@ -457,10 +457,10 @@
- Integer.valueOf(13),
+ new Integer(13),
"HID:" + _firstRowHelpID++,
-- Short.valueOf((short) sLogicOperators.length /* 7 */ ),
+- Short.valueOf((short) sLogicOperators.length /* 7 */),
- Integer.valueOf(nPosX2),
- Integer.valueOf(iCompPosY + 23),
-+ new Short((short) sLogicOperators.length /* 7 */ ),
++ new Short((short) sLogicOperators.length /* 7 */),
+ new Integer(nPosX2),
+ new Integer(iCompPosY + 23),
IStep,
diff --git a/patches/dev300/libxmlsec-system-nss.diff b/patches/dev300/libxmlsec-system-nss.diff
index 34be091..43ddd8b 100644
--- a/patches/dev300/libxmlsec-system-nss.diff
+++ b/patches/dev300/libxmlsec-system-nss.diff
@@ -30,7 +30,7 @@
--- libxmlsec/makefile.mk.old 2009-10-15 14:52:41.000000000 +0200
+++ libxmlsec/makefile.mk 2009-10-28 22:09:40.000000000 +0100
@@ -65,7 +65,8 @@ PATCH_FILES=\
- xmlsec1-nssdisablecallbacks.patch \
+ xmlsec1-nssmangleciphers.patch \
xmlsec1-noverify.patch \
xmlsec1-mingw32.patch \
- xmlsec1-mingw-keymgr-mscrypto.patch
@@ -45,6 +45,6 @@
CONFIGURE_DIR=
-CONFIGURE_ACTION=.$/configure ADDCFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)"
+CONFIGURE_ACTION=autoconf && .$/configure ADDCFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)"
- CONFIGURE_FLAGS=--with-pic --disable-shared --with-libxslt=no --with-openssl=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)"
+ CONFIGURE_FLAGS=--with-pic --disable-shared --disable-crypto-dl --with-libxslt=no --with-openssl=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)"
# system-mozilla needs pkgconfig to get the information about nss
# FIXME: This also will enable pkg-config usage for libxml2. It *seems*
diff --git a/patches/vba/cws-vbasupportdev300.diff b/patches/vba/cws-vbasupportdev300.diff
index 5f590a8..a26f8c7 100644
--- a/patches/vba/cws-vbasupportdev300.diff
+++ b/patches/vba/cws-vbasupportdev300.diff
@@ -14483,7 +14483,9 @@ index d4facf9..a0e75b1 100644
using namespace com::sun::star;
using ::rtl::OUString;
-@@ -110,4 +113,6 @@ using namespace com::sun::star;
+@@ -109,6 +109,8 @@
+ using namespace com::sun::star;
+ using ::rtl::OUString;
+// defined in docfunc.cxx ( really this needs a new name )
+script::ModuleInfo lcl_InitModuleInfo( SfxObjectShell& rDocSh, String& sModule );
diff --git a/patches/vba/vba-container-controls.diff b/patches/vba/vba-container-controls.diff
index eadac59..88f835b 100644
--- a/patches/vba/vba-container-controls.diff
+++ b/patches/vba/vba-container-controls.diff
@@ -325,7 +325,7 @@ diff --git oox/inc/oox/ole/vbacontrol.hxx oox/inc/oox/ole/vbacontrol.hxx
index 085a2f5..ddfabbf 100755
--- oox/inc/oox/ole/vbacontrol.hxx
+++ oox/inc/oox/ole/vbacontrol.hxx
-@@ -56,17 +54,13 @@ public:
+@@ -56,13 +54,9 @@ public:
void importProperty( sal_Int32 nPropId, const ::rtl::OUString& rValue );
/** Imports the site model data from the passed input stream. */
bool importBinaryModel( BinaryInputStream& rInStrm );
@@ -339,10 +339,6 @@ index 085a2f5..ddfabbf 100755
/** Returns the unique identifier of this control. */
inline sal_Int32 getId() const { return mnId; }
/** Returns true, if the control is visible. */
- bool isVisible() const;
- /** Returns true, if this control is a container control. */
- bool isContainer() const;
- /** Returns the length of the stream data for stream based controls. */
@@ -81,12 +79,14 @@ public:
ApiControlType eCtrlType,
sal_Int32 nCtrlIndex ) const;
More information about the ooo-build-commit
mailing list