[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 2 commits - patches/dev300 patches/mono
Kalman "" Szalai
kami911 at kemper.freedesktop.org
Sat Dec 4 08:07:10 PST 2010
patches/dev300/speed-hash-style.diff | 12 ++--
patches/dev300/svtools-unsort-template-dialogentries.diff | 4 -
patches/mono/cli_ure-mono-bridge.diff | 6 +-
patches/mono/mono-build.diff | 40 +++++++-------
4 files changed, 31 insertions(+), 31 deletions(-)
New commits:
commit db6f7c614be83c3967d06afc03c68490f7a7c1a1
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sat Dec 4 17:06:47 2010 +0100
Update mono patches
diff --git a/patches/mono/cli_ure-mono-bridge.diff b/patches/mono/cli_ure-mono-bridge.diff
index 2f971ee..60ca390 100644
--- a/patches/mono/cli_ure-mono-bridge.diff
+++ b/patches/mono/cli_ure-mono-bridge.diff
@@ -34,14 +34,14 @@ diff --git cli_ure/prj/build.lst cli_ure/prj/build.lst
index 268240c..ea7b486 100644
--- cli_ure/prj/build.lst
+++ cli_ure/prj/build.lst
-@@ -8,6 +8,7 @@ ure cli_ure\source\climaker nmake - w,vc7 ure_source_climaker ure_source_basety
+@@ -8,5 +8,6 @@
ure cli_ure\unotypes nmake - w,vc7 ure_unotypes ure_source_version ure_source_source.w ure_source_climaker.w ure_inc NULL
ure cli_ure\source\ure nmake - w,vc7 ure_source_ure ure_source_version ure_source_source.w ure_source_basetypes.w ure_unotypes.w ure_inc NULL
ure cli_ure\source\uno_bridge nmake - w,vc7 ure_source_uno_bridge ure_source_basetypes.w ure_unotypes.w ure_source_ure.w ure_inc NULL
-+ure cli_ure\source\mono_bridge nmake - u ure_source_mono_bridge ure_unotypes ure_source_ure ure_inc NULL
++ure cli_ure\source\mono_bridge nmake - u ure_source_mono_bridge ure_unotypes ure_source_ure ure_inc NULL
ure cli_ure\source\native nmake - w,vc7 ure_source_native ure_source_version ure_source_source.w ure_source_ure.w ure_unotypes.w ure_source_uno_bridge.w ure_inc NULL
-
#ure cli_ure\util nmake - w,vc7 ure_util ure_source_ure.w ure_source_native.w NULL
+
diff --git cli_ure/source/mono_bridge/binaryuno.cs cli_ure/source/mono_bridge/binaryuno.cs
new file mode 100644
index 0000000..defe45a
diff --git a/patches/mono/mono-build.diff b/patches/mono/mono-build.diff
index 0d3b4cd..076571e 100644
--- a/patches/mono/mono-build.diff
+++ b/patches/mono/mono-build.diff
@@ -14,29 +14,29 @@ diff --git cli_ure/prj/build.lst cli_ure/prj/build.lst
index ea7b486..00f7f53 100644
--- cli_ure/prj/build.lst
+++ cli_ure/prj/build.lst
-@@ -2,13 +2,13 @@ ure cli_ure : cppu cppuhelper sal codemaker stoc udkapi bridges NULL
+@@ -2,13 +2,12 @@
ure cli_ure usr1 - all ure_mkout NULL
ure cli_ure\inc nmake - all ure_inc NULL
ure cli_ure\version nmake - all ure_source_version ure_inc NULL
--ure cli_ure\source nmake - w,vc7 ure_source_source ure_inc NULL
--ure cli_ure\source\basetypes nmake - w,vc7 ure_source_basetypes ure_source_version ure_source_source.w ure_inc NULL
--ure cli_ure\source\climaker nmake - w,vc7 ure_source_climaker ure_source_basetypes.w ure_inc NULL
--ure cli_ure\unotypes nmake - w,vc7 ure_unotypes ure_source_version ure_source_source.w ure_source_climaker.w ure_inc NULL
--ure cli_ure\source\ure nmake - w,vc7 ure_source_ure ure_source_version ure_source_source.w ure_source_basetypes.w ure_unotypes.w ure_inc NULL
--ure cli_ure\source\uno_bridge nmake - w,vc7 ure_source_uno_bridge ure_source_basetypes.w ure_unotypes.w ure_source_ure.w ure_inc NULL
-+ure cli_ure\source nmake - all ure_source_source ure_inc NULL
-+ure cli_ure\source\basetypes nmake - all ure_source_basetypes ure_source_version ure_source_source ure_inc NULL
-+ure cli_ure\source\bootstrap nmake - u ure_source_bootstrap ure_source_source ure_source_basetypes ure_inc NULL
-+ure cli_ure\source\climaker nmake - all ure_source_climaker ure_source_basetypes ure_inc NULL
-+ure cli_ure\unotypes nmake - all ure_unotypes ure_source_version ure_source_source ure_source_climaker ure_source_basetypes ure_inc NULL
-+ure cli_ure\source\ure nmake - all ure_source_ure ure_source_version ure_source_source ure_source_basetypes ure_unotypes ure_inc NULL
-+ure cli_ure\source\uno_bridge nmake - w,vc7 ure_source_uno_bridge ure_source_basetypes ure_unotypes ure_source_ure ure_inc NULL
- ure cli_ure\source\mono_bridge nmake - u ure_source_mono_bridge ure_unotypes ure_source_ure ure_inc NULL
--ure cli_ure\source\native nmake - w,vc7 ure_source_native ure_source_version ure_source_source.w ure_source_ure.w ure_unotypes.w ure_source_uno_bridge.w ure_inc NULL
--
--#ure cli_ure\util nmake - w,vc7 ure_util ure_source_ure.w ure_source_native.w NULL
-+ure cli_ure\source\native nmake - w,vc7 ure_source_native ure_source_version ure_source_source ure_source_ure ure_unotypes ure_source_uno_bridge ure_inc NULL
-+#ure cli_ure\util nmake - w,vc7 ure_util ure_source_ure ure_source_native NULL
+-ure cli_ure\source nmake - all ure_source_source ure_inc NULL
+-ure cli_ure\source\basetypes nmake - all ure_source_basetypes ure_source_version ure_source_source ure_inc NULL
+-ure cli_ure\source\bootstrap nmake - u ure_source_bootstrap ure_source_source ure_source_basetypes ure_inc NULL
+-ure cli_ure\source\climaker nmake - all ure_source_climaker ure_source_basetypes ure_inc NULL
+-ure cli_ure\unotypes nmake - all ure_unotypes ure_source_version ure_source_source ure_source_climaker ure_source_basetypes ure_inc NULL
+-ure cli_ure\source\ure nmake - all ure_source_ure ure_source_version ure_source_source ure_source_basetypes ure_unotypes ure_inc NULL
+-ure cli_ure\source\uno_bridge nmake - w,vc7 ure_source_uno_bridge ure_source_basetypes ure_unotypes ure_source_ure ure_inc NULL
+-ure cli_ure\source\mono_bridge nmake - u ure_source_mono_bridge ure_unotypes ure_source_ure ure_inc NULL
+-ure cli_ure\source\native nmake - w,vc7 ure_source_native ure_source_version ure_source_source ure_source_ure ure_unotypes ure_source_uno_bridge ure_inc NULL
+-#ure cli_ure\util nmake - w,vc7 ure_util ure_source_ure ure_source_native NULL
++ure cli_ure\source nmake - w,vc7 ure_source_source ure_inc NULL
++ure cli_ure\source\basetypes nmake - w,vc7 ure_source_basetypes ure_source_version ure_source_source.w ure_inc NULL
++ure cli_ure\source\climaker nmake - w,vc7 ure_source_climaker ure_source_basetypes.w ure_inc NULL
++ure cli_ure\unotypes nmake - w,vc7 ure_unotypes ure_source_version ure_source_source.w ure_source_climaker.w ure_inc NULL
++ure cli_ure\source\ure nmake - w,vc7 ure_source_ure ure_source_version ure_source_source.w ure_source_basetypes.w ure_unotypes.w ure_inc NULL
++ure cli_ure\source\uno_bridge nmake - w,vc7 ure_source_uno_bridge ure_source_basetypes.w ure_unotypes.w ure_source_ure.w ure_inc NULL
++ure cli_ure\source\mono_bridge nmake - u ure_source_mono_bridge ure_unotypes ure_source_ure ure_inc NULL
++ure cli_ure\source\native nmake - w,vc7 ure_source_native ure_source_version ure_source_source.w ure_source_ure.w ure_unotypes.w ure_source_uno_bridge.w ure_inc NULL
++#ure cli_ure\util nmake - w,vc7 ure_util ure_source_ure.w ure_source_native.w NULL
diff --git cli_ure/prj/d.lst cli_ure/prj/d.lst
index 261bb2c..56eab2d 100644
--- cli_ure/prj/d.lst
commit bb4791cefab05d2c562d8743d758ac3f781e08fe
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sat Dec 4 16:54:00 2010 +0100
Fix patch
diff --git a/patches/dev300/speed-hash-style.diff b/patches/dev300/speed-hash-style.diff
index 7e5b08c..2c92513 100644
--- a/patches/dev300/speed-hash-style.diff
+++ b/patches/dev300/speed-hash-style.diff
@@ -1,16 +1,16 @@
--- configure.in.old 2010-07-29 16:40:48.000000000 +0200
+++ configure.in 2010-07-29 16:48:44.000000000 +0200
@@ -1050,6 +1050,10 @@
- xulrunner, firefox, seamonkey, mozilla.]),
- WITH_SYSTEM_MOZILLA=$withval ,
- WITH_SYSTEM_MOZILLA=no)
-+
+ mozilla
+ ], WITH_SYSTEM_MOZILLA=$withval, WITH_SYSTEM_MOZILLA=no)
+
+AC_ARG_WITH(linker-hash-style,
+[ --with-linker-hash-style
+], WITH_LINKER_HASH_STYLE=$withval, WITH_LINKER_HASH_STYLE=gnu)
-
++
AC_ARG_WITH(stlport,
- AS_HELP_STRING([--with-stlport],
+ [ --with-stlport The location that STLport is installed in. The STL
+ header files are assumed to be in
@@ -1628,9 +1631,9 @@ if test "$_os" = "SunOS"; then
fi
diff --git a/patches/dev300/svtools-unsort-template-dialogentries.diff b/patches/dev300/svtools-unsort-template-dialogentries.diff
index 15d4c95..e9e82cf 100644
--- a/patches/dev300/svtools-unsort-template-dialogentries.diff
+++ b/patches/dev300/svtools-unsort-template-dialogentries.diff
@@ -104,12 +104,12 @@
// detect the image
- INetURLObject aObj( pEntry->maImageURL.getLength() ? pEntry->maImageURL : pEntry->maTargetURL );
-- pEntry->maImage = SvFileInformationManager::GetImage( aObj, FALSE );
+- pEntry->maImage = SvFileInformationManager::GetImage( aObj, FALSE, isHighContrast( mpView ) );
-
+ if( aValue != rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(aSeparatorStr) ) )
+ {
+ INetURLObject aObj( pEntry->maImageURL.getLength() ? pEntry->maImageURL : pEntry->maTargetURL );
-+ pEntry->maImage = SvFileInformationManager::GetImage( aObj, FALSE );
++ pEntry->maImage = SvFileInformationManager::GetImage( aObj, FALSE, isHighContrast( mpView ) );
+ }
maContent.push_back( pEntry );
}
More information about the Libreoffice-commits
mailing list