sb118: merged in DEV300_m69

12 files changed, 50 insertions, 97 deletions

diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index 76e297c3de8a..84dc21a1321a 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -495,8 +495,6 @@ void TestToolObj::LoadIniFile()             // Laden der IniEinstellungen, die d
     abGP.Append( "04" );
 #elif defined SOLARIS && defined INTEL
     abGP.Append( "05" );  // Solaris x86
-#elif defined IRIX
-    abGP.Append( "06" );
 #elif defined HPUX
     abGP.Append( "07" );
 #elif defined FREEBSD
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 08626f051f82..9dd722d0d7ed 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -46,7 +46,6 @@
 #include "tabline.hrc"
 #include "helpid.hrc"
 #include <svx/dialmgr.hxx>
-
 #include <svx/svdobj.hxx>
 #include <svx/svdopath.hxx>
 #include "svx/drawitem.hxx"
@@ -61,6 +60,7 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <svx/dialogs.hrc>
 
 #define DLGWIN this->GetParent()->GetParent()
@@ -456,9 +456,8 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
         basegfx::B2DRange aNewRange(basegfx::tools::getRange(aNewPolyPolygon));
 
         // Normalisieren
-        basegfx::B2DHomMatrix aMatrix;
-        aMatrix.translate(-aNewRange.getMinX(), -aNewRange.getMinY());
-        aNewPolyPolygon.transform(aMatrix);
+        aNewPolyPolygon.transform(basegfx::tools::createTranslateB2DHomMatrix(
+            -aNewRange.getMinX(), -aNewRange.getMinY()));
 
         // Loeschen des angelegten PolyObjektes
         SdrObject::Free( pConvPolyObj );
diff --git a/extensions/source/plugin/unx/makefile.mk b/extensions/source/plugin/unx/makefile.mk
index 902348f0cb7d..5280272af543 100644
--- a/extensions/source/plugin/unx/makefile.mk
+++ b/extensions/source/plugin/unx/makefile.mk
@@ -77,7 +77,7 @@ APP1STDLIBS=\
     $(VOSLIB)					\
     $(SALLIB)
 .IF "$(OS)"=="SOLARIS" || "$(OS)"=="SCO" || "$(OS)"=="HPUX"
-APP1STDLIBS+=-lXm -lXt -lXext -lX11 -ldl
+APP1STDLIBS+=-lXm -lXt $(X11LINK_DYNAMIC) -ldl
 .ELSE
 .IF "$(DISABLE_XAW)" != "TRUE"
 APP1STDLIBS+=-lXaw 
@@ -85,7 +85,7 @@ APP1STDLIBS+=-lXaw
 .IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
 APP1STDLIBS+= -lXt -lXext -lX11
 .ELSE
-APP1STDLIBS+= -lXt -lXext -lX11 -ldl
+APP1STDLIBS+= -lXt $(X11LINK_DYNAMIC) -ldl
 .ENDIF
 .ENDIF
 
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
index 8f43530c5a3a..7ebd9a7b66f3 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
@@ -65,6 +65,7 @@
 #include "dictmgr.hxx"
 
 #include <stdio.h>
+#include <string.h>
 
 #include <list>
 #include <set>
@@ -544,10 +545,10 @@ Reference< XPossibleHyphens > SAL_CALL
   char *lcword;
   int k;
 
-  PropertyHelper_Hyphen & rHelper = GetPropHelper();

-  rHelper.SetTmpPropVals(aProperties);

-  sal_Int16 minTrail = rHelper.GetMinTrailing();

-  sal_Int16 minLead = rHelper.GetMinLeading();

+  PropertyHelper_Hyphen & rHelper = GetPropHelper();
+  rHelper.SetTmpPropVals(aProperties);
+  sal_Int16 minTrail = rHelper.GetMinTrailing();
+  sal_Int16 minLead = rHelper.GetMinLeading();
 
   HyphenDict *dict = NULL;
   rtl_TextEncoding aEnc = 0;
@@ -621,9 +622,9 @@ Reference< XPossibleHyphens > SAL_CALL
       wordlen = encWord.getLength();
       lcword = new char[wordlen+1];
       hyphens = new char[wordlen+5];
-      char ** rep = NULL; // replacements of discretionary hyphenation

-      int * pos = NULL; // array of [hyphenation point] minus [deletion position] 

-      int * cut = NULL; // length of deletions in original word

+      char ** rep = NULL; // replacements of discretionary hyphenation
+      int * pos = NULL; // array of [hyphenation point] minus [deletion position]
+      int * cut = NULL; // length of deletions in original word
 
       // copy converted word into simple char buffer
       strcpy(lcword,encWord.getStr());
@@ -634,21 +635,21 @@ Reference< XPossibleHyphens > SAL_CALL
       n++;
       // fprintf(stderr,"hyphenate... %s\n",lcword); fflush(stderr);
       if (n > 0) {
-         if (hnj_hyphen_hyphenate3(dict, lcword, n, hyphens, NULL, &rep, &pos, &cut,

-            minLead, minTrail, Max(dict->clhmin, Max(dict->clhmin, 2) + Max(0, minLead - Max(dict->lhmin, 2))),

-            Max(dict->crhmin, Max(dict->crhmin, 2) + Max(0, minTrail - Max(dict->rhmin, 2)))))

+         if (hnj_hyphen_hyphenate3(dict, lcword, n, hyphens, NULL, &rep, &pos, &cut,
+            minLead, minTrail, Max(dict->clhmin, Max(dict->clhmin, 2) + Max(0, minLead - Max(dict->lhmin, 2))),
+            Max(dict->crhmin, Max(dict->crhmin, 2) + Max(0, minTrail - Max(dict->rhmin, 2)))))
          {
              delete[] hyphens;
              delete[] lcword;
-

-             if (rep) {

-                 for(int j = 0; j < n; j++) {

-                     if (rep[j]) free(rep[j]);

-                 }

-                 free(rep);

-             }

-             if (pos) free(pos);

-             if (cut) free(cut);

+
+             if (rep) {
+                 for(int j = 0; j < n; j++) {
+                     if (rep[j]) free(rep[j]);
+                 }
+                 free(rep);
+             }
+             if (pos) free(pos);
+             if (cut) free(cut);
 
              return NULL;
          }
@@ -662,7 +663,7 @@ Reference< XPossibleHyphens > SAL_CALL
       INT16 i;
 
       for ( i = 0; i < encWord.getLength(); i++)
-        if (hyphens[i]&1 && (!rep || !rep[i]))

+        if (hyphens[i]&1 && (!rep || !rep[i]))
           nHyphCount++;
 
       Sequence< INT16 > aHyphPos(nHyphCount);
@@ -671,14 +672,14 @@ Reference< XPossibleHyphens > SAL_CALL
       OUString hyphenatedWord;
       nHyphCount = 0;
 
-      for (i = 0; i < nWord.getLength(); i++) {

+      for (i = 0; i < nWord.getLength(); i++) {
           hyphenatedWordBuffer.append(aWord[i]);
-          // hyphenation position (not alternative)

-          if (hyphens[i]&1 && (!rep || !rep[i])) {

-              pPos[nHyphCount] = i;

-              hyphenatedWordBuffer.append(sal_Unicode('='));

-              nHyphCount++;

-          }

+          // hyphenation position (not alternative)
+          if (hyphens[i]&1 && (!rep || !rep[i])) {
+              pPos[nHyphCount] = i;
+              hyphenatedWordBuffer.append(sal_Unicode('='));
+              nHyphCount++;
+          }
       }
 
       hyphenatedWord = hyphenatedWordBuffer.makeStringAndClear();
@@ -690,15 +691,15 @@ Reference< XPossibleHyphens > SAL_CALL
 
       delete[] hyphens;
       delete[] lcword;
-

-      if (rep) {

-          for(int j = 0; j < n; j++) {

-              if (rep[j]) free(rep[j]);

-          }

-          free(rep);

-      }

-      if (pos) free(pos);

-      if (cut) free(cut);

+
+      if (rep) {
+          for(int j = 0; j < n; j++) {
+              if (rep[j]) free(rep[j]);
+          }
+          free(rep);
+      }
+      if (pos) free(pos);
+      if (cut) free(cut);
 
       return xRes;
   }
diff --git a/lingucomponent/source/lingutil/lingutil.cxx b/lingucomponent/source/lingutil/lingutil.cxx
index 2e00035628bc..5e9b0c8fa592 100644
--- a/lingucomponent/source/lingutil/lingutil.cxx
+++ b/lingucomponent/source/lingutil/lingutil.cxx
@@ -57,11 +57,14 @@
 
 #include <set>
 #include <vector>
+#include <string.h>
 
 #include <lingutil.hxx>
 #include <dictmgr.hxx>
 
 
+
+
 using ::com::sun::star::lang::Locale;
 using namespace ::com::sun::star;
 
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index 1a92db58a4dc..bcb09c5ac16d 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -60,7 +60,7 @@
 
 #include <list>
 #include <set>
-
+#include <string.h>
 
 using namespace utl;
 using namespace osl;
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
index c526d2b07444..a92c5926c8b4 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
@@ -54,6 +54,7 @@
 
 #include <list>
 #include <set>
+#include <string.h>
 
 // values asigned to capitalization types
 #define CAPTYPE_UNKNOWN 0
diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx
index f6dafac4cb6a..9934caa0c066 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -880,8 +880,8 @@ sal_Int32 ZipFile::recover()
                             if ( aEntry.nExtraLen < 0 ) aEntry.nExtraLen = 0x7FFF;
                             // End of quick fix
 
-
-                            sal_Int32 nBlockLength = aEntry.nSize + aEntry.nPathLen + aEntry.nExtraLen + 30 + nDescrLength;
+                            sal_Int32 nDataSize = ( aEntry.nMethod == DEFLATED ) ? aEntry.nCompressedSize : aEntry.nSize;
+                            sal_Int32 nBlockLength = nDataSize + aEntry.nPathLen + aEntry.nExtraLen + 30 + nDescrLength;
                             if ( aEntry.nPathLen <= ZIP_MAXNAMELEN && aEntry.nExtraLen < ZIP_MAXEXTRA
                                 && ( nGenPos + nPos + nBlockLength ) <= nLength )
                             {
diff --git a/setup_native/scripts/admin.pl b/setup_native/scripts/admin.pl
index ebb16d0ef008..f737a6392f13 100644
--- a/setup_native/scripts/admin.pl
+++ b/setup_native/scripts/admin.pl
@@ -1164,6 +1164,7 @@ sub get_sis_time_string
     my $day = (localtime())[3];
     my $month = (localtime())[4];
     my $year = 1900 + (localtime())[5];
+    $month++;
 
     if ( $second < 10 ) { $second = "0" . $second; }
     if ( $minute < 10 ) { $minute = "0" . $minute; }
diff --git a/wizards/source/launcher/FontOOo.xba b/wizards/source/launcher/FontOOo.xba
deleted file mode 100644
index c05e0c11bb2c..000000000000
--- a/wizards/source/launcher/FontOOo.xba
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="FontOOo" script:language="StarBasic">Option Explicit
-
-Sub StartFontOOo
-
-Dim ThePath as string
-Dim aService as object
-Dim MyFontOOo as string
-dim TheDoc as object 
-dim args(1) as new com.sun.star.beans.PropertyValue
-
-on error resume next
-
-&apos; Find path
-aService = CreateUnoService(&quot;com.sun.star.util.PathSubstitution&quot;)
-ThePath =ConvertToURL(aService.substituteVariables(&quot;$(prog)&quot;, true))
-ThePath=ThePath &amp; &quot;/../share/dict/ooo&quot;
-
-if  fileExists(ThePath &amp; &quot;/FontOOo.lst&quot;) then
-&apos;read FontOOo.lst file
-        Open ThePath &amp; &quot;/FontOOo.lst&quot; for input as #1
-                line input #1, MyFontOOo
-        close #1
-else
-&apos;create default FontOOo.lst file
-        Open ThePath &amp; &quot;/FontOOo.lst&quot; for output as #1
-                MyFontOOo=ThePath &amp; &quot;/FontOOo.sxw&quot;
-                print #1, MyFontOOo
-        close #1
-endif
-
-&apos;security
-if Not fileExists(MyFontOOo) then
-        MyFontOOo= ThePath &amp; &quot;/FontOOo.sxw&quot;
-endif
-MyFontOOo=ConvertToURL(MyFontOOo) 
-
-&apos;Opens FontOOo main file
-args(0).name=&quot;InteractionHandler&quot;
-args(0).value=&quot;&quot;
-args(1).name=&quot;MacroExecutionMode&quot;
-args(1).value=com.sun.star.document.MacroExecMode.ALWAYS_EXECUTE_NO_WARN &apos;4
-TheDoc=StarDesktop.loadComponentFromURL(MyFontOOo,&quot;_blank&quot;,0,args())
-
-End Sub</script:module>
diff --git a/wizards/source/launcher/makefile.mk b/wizards/source/launcher/makefile.mk
index d20cc073f39a..6efbcc54792e 100644
--- a/wizards/source/launcher/makefile.mk
+++ b/wizards/source/launcher/makefile.mk
@@ -42,9 +42,6 @@ TARGET=launcher
 
 ZIP1TARGET      = $(LAUNCHER_ALL_TARGET)
 XBAFILES	= DicOOo.xba
-.IF "$(WITH_FONTOOO)" == "YES"
-XBAFILES	+= FontOOo.xba
-.ENDIF
 ZIP1LIST        = *.xdl $(XBAFILES) *.xlb
 
 # --- Targets ------------------------------------------------------
diff --git a/wizards/source/launcher/script.xlb b/wizards/source/launcher/script.xlb
index 88a6e68b5aad..55310d9fb286 100644
--- a/wizards/source/launcher/script.xlb
+++ b/wizards/source/launcher/script.xlb
@@ -2,5 +2,4 @@
 <!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd">
 <library:library xmlns:library="http://openoffice.org/2000/library" library:name="Launcher" library:readonly="true" library:passwordprotected="false">
  <library:element library:name="DicOOo"/>
- <library:element library:name="FontOOo"/>
 </library:library>