[Libreoffice-commits] .: Branch 'libreoffice-3-3' - patches/dev300

[Tor Lillqvist]

 patches/dev300/cli-component.diff |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 86162fcd86299cbe2fb65b58c91e8886d737d6ca
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Dec 7 15:45:31 2010 +0200

    Make cli-component.diff apply again

diff --git a/patches/dev300/cli-component.diff b/patches/dev300/cli-component.diff
index 9dd61fa..1fdb20f 100644
--- a/patches/dev300/cli-component.diff
+++ b/patches/dev300/cli-component.diff
@@ -8,7 +8,7 @@ index 268240c..c5aac81 100644
  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
-@@ -6,7 +6,9 @@ ure	cli_ure\source				nmake   -   w,vc7   ure_source_source ure_inc NULL
+@@ -6,6 +6,8 @@ ure	cli_ure\source				nmake   -   w,vc7   ure_source_source 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
@@ -17,7 +17,6 @@ index 268240c..c5aac81 100644
 +ure	cli_ure\source\uno_bridge	nmake	-	w,vc7	ure_source_uno_bridge ure_source_cli_callback.w ure_source_basetypes.w ure_unotypes.w ure_source_ure.w ure_inc NULL
 +ure	cli_ure\source\cli_loader	nmake	-	all	ure_source_uno_loader ure_source_uno_bridge.w ure_source_basetypes.w ure_unotypes.w ure_source_ure.w 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/cli_callback/cli_callback.cxx cli_ure/source/cli_callback/cli_callback.cxx
 new file mode 100644