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

[Tor Lillqvist]

 patches/dev300/apply                                     |    3 
 patches/dev300/sfx2-remove-check-update-on-fileload.diff |    6 -
 patches/dev300/typesconfig-enforce.alignment.diff        |   64 ---------------
 3 files changed, 2 insertions(+), 71 deletions(-)

New commits:
commit 25c43120aed82d400bc106ea6299a4766cf55c53
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Aug 11 13:18:00 2009 +0300

    typesconfig-enforce.alignment.diff is upstream
    
    * patches/dev300/typesconfig-enforce.alignment.diff: Delete.
    * patches/dev300/apply: Remove it.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index a8fa9be..59dba6d 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -976,9 +976,6 @@ installer-get-path-correctly.diff, pmladek
 # allow to use the prebuilt jsr173_1.0_api.jar
 build-prebuilt-stax.diff, i#93116, pmladek
 
-# enforce alignment for typesconfig (fixes e.g. IA64, ARM build)
-typesconfig-enforce.alignment.diff. i#100469
-
 # fix build with neon-0.24
 ucb-neon-0.24.diff, pmladek
 
diff --git a/patches/dev300/typesconfig-enforce.alignment.diff b/patches/dev300/typesconfig-enforce.alignment.diff
deleted file mode 100644
index 004fd93..0000000
--- a/patches/dev300/typesconfig-enforce.alignment.diff
+++ /dev/null
@@ -1,64 +0,0 @@
-Index: typesconfig/typesconfig.c
-===================================================================
---- sal/typesconfig/typesconfig.c	(.../tags/DEV300_m44/sal)	(Revision 269953)
-+++ sal/typesconfig/typesconfig.c	(.../cws/cmcfixes56/sal)	(Revision 269953)
-@@ -163,20 +163,37 @@
- |*	Letzte Aenderung
- |*
- *************************************************************************/
--static int dummy(void* unused);
-+#if defined(IA64) || defined(ARM32)
- 
-+int forceerror()
-+{
-+#if defined(ARM32)
-+// workaround for qemu-user
-+    hit = 1;
-+#else
-+    raise (SIGBUS);
-+#endif
-+    return 1;
-+}
-+
- int GetAtAddress( Type eT, void* p )
- {
--#if defined(IA64) || defined(ARM32)
-   switch ( eT )
-   {
-   case t_char:		return *((char*)p);
--  case t_short:		if ((long)p % sizeof(short)) abort(); else return *((short*)p);
--  case t_int:		if ((long)p % sizeof(int)) abort(); else return *((int*)p);
--  case t_long:		if ((long)p % sizeof(long)) abort(); else return *((long*)p);
--  case t_double:	if ((long)p % sizeof(double)) abort(); else return *((double*)p);
-+  case t_short:		if ((long)p % sizeof(short)) return forceerror(); else return *((short*)p);
-+  case t_int:		if ((long)p % sizeof(int)) return forceerror(); else return *((int*)p);
-+  case t_long:		if ((long)p % sizeof(long)) return forceerror(); else return *((long*)p);
-+  case t_double:	if ((long)p % sizeof(double)) return forceerror(); else return *((double*)p);
-   }
-+  abort();
-+}
-+
- #else
-+static int dummy(void* unused);
-+
-+int GetAtAddress( Type eT, void* p )
-+{
-   switch ( eT )
-   {
-   case t_char: { char x = *(char*)p; return dummy(&x); }
-@@ -185,7 +202,6 @@
-   case t_long: { long x = *(long*)p; return dummy(&x); }
-   case t_double: { double x = *(double*)p; return dummy(&x); }
-   }
--#endif
-   abort();
- }
- 
-@@ -195,6 +211,7 @@
-     return 0;
- }
- 
-+#endif
- /*************************************************************************
- |*
- |*	SetAtAddress()
commit cd2f0454c4a142ac0101918cd97e05995b8a03ff
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Aug 11 13:15:32 2009 +0300

    Adapt sfx2-remove-check-update-on-fileload.diff for dev300
    
    * patches/dev300/sfx2-remove-check-update-on-fileload.diff: Adapt for
      dev300-m54.

diff --git a/patches/dev300/sfx2-remove-check-update-on-fileload.diff b/patches/dev300/sfx2-remove-check-update-on-fileload.diff
index f5c4484..b89fd51 100644
--- a/patches/dev300/sfx2-remove-check-update-on-fileload.diff
+++ b/patches/dev300/sfx2-remove-check-update-on-fileload.diff
@@ -1,5 +1,3 @@
-diff --git sfx2/source/doc/objstor.cxx sfx2/source/doc/objstor.cxx
-index a92ff91..fb727a8 100644
 --- sfx2/source/doc/objstor.cxx
 +++ sfx2/source/doc/objstor.cxx
 @@ -1011,6 +1011,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed )
@@ -7,9 +5,9 @@ index a92ff91..fb727a8 100644
          }
  
 +#if 0
-         uno::Reference< XInteractionHandler > xHandler( pMedium->GetInteractionHandler() );
-         if ( xHandler.is() && !SFX_APP()->Get_Impl()->bODFVersionWarningLater )
+         if ( pMedium->HasStorage_Impl() )
          {
+             uno::Reference< XInteractionHandler > xHandler( pMedium->GetInteractionHandler() );
 @@ -1073,6 +1074,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed )
                  }
              }