[Libreoffice-commits] .: 3 commits - scp2/source sw/source

[Michael Stahl]

 scp2/source/ooo/file_ooo.scp    |   14 ++++----------
 sw/source/filter/ww8/ww8par.cxx |    3 +--
 2 files changed, 5 insertions(+), 12 deletions(-)

New commits:
commit 9c4581a6b61c0836c3a44eaaf454b9ba560e937a
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Feb 15 13:13:29 2012 +0100

    fdo#45530: scp2: java accessibilty bridge cleanup:
    
    AFAIK java_uno_accessbridge.jar is only required on WNT.
    Also remove the duplicate old definition of gid_File_Jar_Accessbridge
    that was effectively disabled by 6fdde9acfd5aebd23400e7101c8ddff80fcdd8fa.

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index e2c0c68..4d5d771 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -379,16 +379,6 @@ File gid_File_Help_Schart_Zip
 End
 #endif
 
-#if defined SOLAR_JAVA && defined INCLUDE_JAVA_ACCESSBRIDGE && defined WNT
-
-File gid_File_Jar_Accessbridge
-    TXT_FILE_BODY;
-    Name = "java_uno_accessbridge.jar";
-    Dir = gid_Dir_Classes;
-    Styles = (PACKED,DONT_OVERWRITE);
-End
-
-#endif
 
 #ifdef SOLAR_JAVA
 #ifndef SYSTEM_LUCENE
@@ -426,6 +416,9 @@ STD_JAR_FILE( gid_File_Jar_Fax, fax )
 STD_JAR_FILE( gid_File_Jar_Agenda, agenda )
 STD_JAR_FILE( gid_File_Jar_Query, query )
 STD_JAR_FILE( gid_File_Jar_Web, web )
+#endif
+
+#if defined SOLAR_JAVA && defined WNT
 STD_JAR_FILE( gid_File_Jar_Accessbridge, java_uno_accessbridge )
 #endif
 
commit fbe60c962259ae0449acd65e74fd790530045e93
Author: Masataka Shinke <mshinke at users.sourceforge.jp>
Date:   Wed Feb 15 13:10:44 2012 +0100

    fdo#45530: Accessibility does not work on WNT

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index cae313a..e2c0c68 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -426,6 +426,7 @@ STD_JAR_FILE( gid_File_Jar_Fax, fax )
 STD_JAR_FILE( gid_File_Jar_Agenda, agenda )
 STD_JAR_FILE( gid_File_Jar_Query, query )
 STD_JAR_FILE( gid_File_Jar_Web, web )
+STD_JAR_FILE( gid_File_Jar_Accessbridge, java_uno_accessbridge )
 #endif
 
 #ifdef SOLAR_JAVA
commit c1f723fd53e8c41b80285d11a149e0044f580e2f
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Feb 14 17:47:28 2012 +0100

    sw: ww8: ~SwIndexReg assertion:
    
    Remove pointless SwPosition that triggers the assertion when
    loading bugdoc from i#87910 from wwSectionManager::InsertSegments.

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 5c74e18..ad88e98 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4118,8 +4118,7 @@ void wwSectionManager::InsertSegments()
         if (pTxtNd)
         {
             SwNodeIndex aIdx(*pTxtNd);
-            SwPosition aPos(aIdx);
-            SwPaM aTest(aPos);
+            SwPaM aTest(aIdx);
             mrReader.rDoc.DelFullPara(aTest);
             pTxtNd = 0;
         }