[ooo-build-commit] 2 commits - patches/dev300 patches/unittesting

[Tor Lillqvist]

 patches/dev300/novell-win32-odma.diff    |   30 +++++++++++++++---------------
 patches/unittesting/unittesting-ucb.diff |    4 +---
 2 files changed, 16 insertions(+), 18 deletions(-)

New commits:
commit d69cd63ef09af5cb4636485444768e365fcd5209
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Aug 13 15:23:16 2009 +0300

    Adapt novell-win32-odma.diff for dev300-m54
    
    * patches/dev300/novell-win32-odma.diff: Adapt for dev300-m54.

diff --git a/patches/dev300/novell-win32-odma.diff b/patches/dev300/novell-win32-odma.diff
index b521335..6a5c25b 100644
--- a/patches/dev300/novell-win32-odma.diff
+++ b/patches/dev300/novell-win32-odma.diff
@@ -514,8 +514,8 @@
              <!-- We want the Provider to be the final fallback provider -->
              <node oor:name="Provider999" oor:op="replace" install:module="gio">
                <prop oor:name="ServiceName">
---- scp2/source/ooo/file_library_ooo.scp.old	2009-04-06 16:42:09.000000000 +0000
-+++ scp2/source/ooo/file_library_ooo.scp	2009-04-06 16:42:16.000000000 +0000
+--- scp2/source/ooo/file_library_ooo.scp
++++ scp2/source/ooo/file_library_ooo.scp
 @@ -661,6 +661,10 @@ End
  #endif
  #endif
@@ -537,7 +537,7 @@
 +
  File gid_File_Lib_Lnth
      TXT_FILE_BODY;
-     Styles = (PACKED,UNO_COMPONENT);
+     Styles = (PACKED,UNO_COMPONENT,PATCH);
 --- desktop/source/app/cmdlineargs.cxx.old	2009-04-06 16:41:47.000000000 +0000
 +++ desktop/source/app/cmdlineargs.cxx	2009-04-06 16:42:16.000000000 +0000
 @@ -297,6 +297,15 @@ void CommandLineArgs::ParseCommandLine_I
@@ -2139,8 +2139,8 @@
  			<prop oor:name="SymbolSet" oor:type="xs:short">
  				<!-- UIHints: Tools  Options General View -->
  				<info>
---- svx/source/dialog/optgdlg.src.old	2009-04-02 11:03:28.000000000 +0000
-+++ svx/source/dialog/optgdlg.src	2009-04-06 16:42:16.000000000 +0000
+--- svx/source/cui/optgdlg.src
++++ svx/source/cui/optgdlg.src
 @@ -115,34 +115,41 @@ TabPage OFA_TP_MISC
  		Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
  		Text [ en-US ] = "~Use %PRODUCTNAME dialogs";
@@ -2197,8 +2197,8 @@
  		Size = MAP_APPFONT( WHOLE_WIDTH - COL6, RSC_CD_FIXEDTEXT_HEIGHT );
  		Text [ en-US ] = "and " ;
  	};
---- svx/source/dialog/optgdlg.hrc.old	2009-04-02 11:03:28.000000000 +0000
-+++ svx/source/dialog/optgdlg.hrc	2009-04-06 16:42:16.000000000 +0000
+--- svx/source/cui/optgdlg.hrc
++++ svx/source/cui/optgdlg.hrc
 @@ -56,9 +56,10 @@
  #define ROW6                    (ROW5+RSC_CD_DROPDOWN_HEIGHT+ROWSPACE)
  #define ROW7					(ROW6+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
@@ -2221,8 +2221,8 @@
  #endif // #ifndef _SVX_OPTGDLG_HRC
  
  // ******************************************************************* EOF
---- svx/source/dialog/optgdlg.hxx.old	2009-04-02 11:03:28.000000000 +0000
-+++ svx/source/dialog/optgdlg.hxx	2009-04-06 16:42:16.000000000 +0000
+--- svx/source/cui/optgdlg.hxx
++++ svx/source/cui/optgdlg.hxx
 @@ -59,6 +59,7 @@ private:
      FixedLine           aFileDlgFL;
      ReadOnlyImage       aFileDlgROImage;
@@ -2241,8 +2241,8 @@
  protected:
  	virtual int         DeactivatePage( SfxItemSet* pSet = NULL );
  
---- svx/source/dialog/optgdlg.cxx.old	2009-04-06 16:41:56.000000000 +0000
-+++ svx/source/dialog/optgdlg.cxx	2009-04-06 16:42:16.000000000 +0000
+--- svx/source/cui/optgdlg.cxx
++++ svx/source/cui/optgdlg.cxx
 @@ -198,6 +198,7 @@ OfaMiscTabPage::OfaMiscTabPage(Window* p
  	aFileDlgFL			( this, SVX_RES( FL_FILEDLG ) ),
      aFileDlgROImage     ( this, SVX_RES( FI_FILEDLG_RO ) ),
@@ -2424,11 +2424,11 @@
  #endif
  
  #ifdef UNX
---- framework/prj/build.lst.old	2009-04-02 10:56:31.000000000 +0000
-+++ framework/prj/build.lst	2009-04-06 16:42:16.000000000 +0000
+--- framework/prj/build.lst
++++ framework/prj/build.lst
 @@ -1,4 +1,4 @@
--fr	framework	:	svtools NULL
-+fr	framework	:	svtools ucb NULL
+-fr	framework	:    l10n svtools NULL
++fr	framework	:    l10n svtools ucb NULL
  fr	framework								usr1	-	all	fr_mkout NULL
  fr  framework\inc			        	    nmake   -   all fr_inc NULL
  fr  framework\source\constant               nmake   -   all fr_constant fr_inc NULL
commit 0b9ecd3d5b63159e0bfae1f06e978a7424bd641d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Aug 13 15:19:08 2009 +0300

    Adapt unittesting-ucb.diff for dev300-m54
    
    * patches/unittesting/unittesting-ucb.diff: Adapt for dev300-m54.

diff --git a/patches/unittesting/unittesting-ucb.diff b/patches/unittesting/unittesting-ucb.diff
index 26ccf6b..f5b438c 100644
--- a/patches/unittesting/unittesting-ucb.diff
+++ b/patches/unittesting/unittesting-ucb.diff
@@ -1,9 +1,7 @@
-diff --git ucb/prj/build.lst ucb/prj/build.lst
-index f0eb0da..dd90fe9 100644
 --- ucb/prj/build.lst
 +++ ucb/prj/build.lst
 @@ -1,4 +1,4 @@
--uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 offapi sal salhelper ucbhelper udkapi comphelper NULL
+-uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 offapi sal salhelper ucbhelper udkapi comphelper vcl NULL
 +uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 offapi sal salhelper ucbhelper udkapi comphelper vcl tools NULL
  uc	ucb							usr1	-	all	uc_mkout NULL
  uc	ucb\inc					    nmake	-	all	uc_inc NULL