Merge remote-tracking branch 'origin/integration/dev300_m101'

Conflicts:
comphelper/source/misc/servicedecl.cxx
i18npool/source/breakiterator/breakiteratorImpl.cxx
l10ntools/scripts/localize.pl
svl/source/items/itemset.cxx
svl/source/memtools/svarray.cxx
svl/source/numbers/zformat.cxx
svtools/source/brwbox/brwbox1.cxx
tools/source/stream/strmwnt.cxx
vcl/inc/vcl/graphite_adaptors.hxx
vcl/inc/vcl/graphite_layout.hxx
vcl/inc/vcl/graphite_serverfont.hxx
vcl/source/control/imgctrl.cxx
vcl/source/gdi/outdev.cxx
vcl/source/gdi/outdev3.cxx
vcl/source/glyphs/gcach_ftyp.cxx
vcl/source/glyphs/graphite_adaptors.cxx
vcl/source/glyphs/graphite_layout.cxx
vcl/source/window/winproc.cxx
vcl/unx/source/fontmanager/fontconfig.cxx

2 files changed, 54 insertions, 111 deletions

diff --git a/svl/source/memtools/makefile.mk b/svl/source/memtools/makefile.mk
deleted file mode 100644
index e19667214d13..000000000000
--- a/svl/source/memtools/makefile.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svl
-TARGET=svarray
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svl.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
-    $(SLO)$/svarray.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svl/source/memtools/svarray.cxx b/svl/source/memtools/svarray.cxx
index 7049920aa45c..6f3cc966995b 100644
--- a/svl/source/memtools/svarray.cxx
+++ b/svl/source/memtools/svarray.cxx
@@ -33,7 +33,7 @@
 
 #define _SVSTDARR_ULONGS
 #define _SVSTDARR_ULONGSSORT
-#define _SVSTDARR_USHORTS
+#define _SVSTDARR_sal_uInt16S
 #define _SVSTDARR_LONGSSORT
 #define _SVSTDARR_STRINGS
 #define _SVSTDARR_STRINGSDTOR
@@ -41,7 +41,7 @@
 #define _SVSTDARR_STRINGSSORTDTOR
 #define _SVSTDARR_STRINGSISORT
 #define _SVSTDARR_STRINGSISORTDTOR
-#define _SVSTDARR_USHORTSSORT
+#define _SVSTDARR_sal_uInt16SSORT
 
 #define _SVSTDARR_BYTESTRINGS
 #define _SVSTDARR_BYTESTRINGSDTOR
@@ -58,29 +58,18 @@
 #include <tools/debug.hxx>
 
 SV_IMPL_VARARR(SvPtrarr,VoidPtr)
-SV_IMPL_VARARR_PLAIN(SvPtrarrPlain,VoidPtr)
 
-USHORT SvPtrarr::GetPos( const VoidPtr& aElement ) const
-{   USHORT n;
+sal_uInt16 SvPtrarr::GetPos( const VoidPtr& aElement ) const
+{   sal_uInt16 n;
     for( n=0; n < nA && *(GetData()+n) != aElement; ) n++;
     return ( n >= nA ? USHRT_MAX : n );
 }
 
-USHORT SvPtrarrPlain::GetPos( const VoidPtr aElement ) const
-{   USHORT n;
-    for( n=0; n < nA && *(GetData()+n) != aElement; ) n++;
-    return ( n >= nA ? USHRT_MAX : n );
-}
+SV_IMPL_VARARR( SvULongs, sal_uLong )
+SV_IMPL_VARARR( SvUShorts, sal_uInt16 )
 
-
-SV_IMPL_VARARR( SvULongs, ULONG )
-SV_IMPL_VARARR( SvUShorts, USHORT )
-
-SV_IMPL_VARARR_SORT( SvULongsSort, ULONG )
+SV_IMPL_VARARR_SORT( SvULongsSort, sal_uLong )
 SV_IMPL_VARARR_SORT( SvLongsSort, long )
-SV_IMPL_VARARR_SORT( SvXub_StrLensSort, xub_StrLen )
-
-SV_IMPL_VARARR( SvXub_StrLens, xub_StrLen )
 
 SV_IMPL_PTRARR( SvStrings, StringPtr )
 SV_IMPL_PTRARR( SvStringsDtor, StringPtr )
@@ -98,19 +87,19 @@ SV_IMPL_OP_PTRARR_SORT( SvByteStringsSortDtor, ByteStringPtr )
 
 // Array mit anderer Seek-Methode!
 _SV_IMPL_SORTAR_ALG( SvStringsISort, StringPtr )
-void SvStringsISort::DeleteAndDestroy( USHORT nP, USHORT nL )
+void SvStringsISort::DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL )
 {
     if( nL )
     {
         DBG_ASSERT( nP < nA && nP + nL <= nA, "ERR_VAR_DEL" );
-        for( USHORT n=nP; n < nP + nL; n++ )
+        for( sal_uInt16 n=nP; n < nP + nL; n++ )
             delete *((StringPtr*)pData+n);
         SvPtrarr::Remove( nP, nL );
     }
 }
-BOOL SvStringsISort::Seek_Entry( const StringPtr aE, USHORT* pP ) const
+sal_Bool SvStringsISort::Seek_Entry( const StringPtr aE, sal_uInt16* pP ) const
 {
-    register USHORT nO  = SvStringsISort_SAR::Count(),
+    register sal_uInt16 nO  = SvStringsISort_SAR::Count(),
             nM,
             nU = 0;
     if( nO > 0 )
@@ -124,40 +113,40 @@ BOOL SvStringsISort::Seek_Entry( const StringPtr aE, USHORT* pP ) const
             if( COMPARE_EQUAL == eCmp )
             {
                 if( pP ) *pP = nM;
-                return TRUE;
+                return sal_True;
             }
             else if( COMPARE_LESS == eCmp )
                 nU = nM + 1;
             else if( nM == 0 )
             {
                 if( pP ) *pP = nU;
-                return FALSE;
+                return sal_False;
             }
             else
                 nO = nM - 1;
         }
     }
     if( pP ) *pP = nU;
-    return FALSE;
+    return sal_False;
 }
 
 // ---------------- strings -------------------------------------
 
 // Array mit anderer Seek-Methode!
 _SV_IMPL_SORTAR_ALG( SvStringsISortDtor, StringPtr )
-void SvStringsISortDtor::DeleteAndDestroy( USHORT nP, USHORT nL )
+void SvStringsISortDtor::DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL )
 {
     if( nL )
     {
         DBG_ASSERT( nP < nA && nP + nL <= nA, "ERR_VAR_DEL" );
-        for( USHORT n=nP; n < nP + nL; n++ )
+        for( sal_uInt16 n=nP; n < nP + nL; n++ )
             delete *((StringPtr*)pData+n);
         SvPtrarr::Remove( nP, nL );
     }
 }
-BOOL SvStringsISortDtor::Seek_Entry( const StringPtr aE, USHORT* pP ) const
+sal_Bool SvStringsISortDtor::Seek_Entry( const StringPtr aE, sal_uInt16* pP ) const
 {
-    register USHORT nO  = SvStringsISortDtor_SAR::Count(),
+    register sal_uInt16 nO  = SvStringsISortDtor_SAR::Count(),
             nM,
             nU = 0;
     if( nO > 0 )
@@ -171,29 +160,29 @@ BOOL SvStringsISortDtor::Seek_Entry( const StringPtr aE, USHORT* pP ) const
             if( COMPARE_EQUAL == eCmp )
             {
                 if( pP ) *pP = nM;
-                return TRUE;
+                return sal_True;
             }
             else if( COMPARE_LESS == eCmp )
                 nU = nM + 1;
             else if( nM == 0 )
             {
                 if( pP ) *pP = nU;
-                return FALSE;
+                return sal_False;
             }
             else
                 nO = nM - 1;
         }
     }
     if( pP ) *pP = nU;
-    return FALSE;
+    return sal_False;
 }
 
 // ---------------- Ushorts -------------------------------------
 
 /* SortArray fuer UShorts */
-BOOL SvUShortsSort::Seek_Entry( const USHORT aE, USHORT* pP ) const
+sal_Bool SvUShortsSort::Seek_Entry( const sal_uInt16 aE, sal_uInt16* pP ) const
 {
-    register USHORT nO  = SvUShorts::Count(),
+    register sal_uInt16 nO  = SvUShorts::Count(),
             nM,
             nU = 0;
     if( nO > 0 )
@@ -205,29 +194,29 @@ BOOL SvUShortsSort::Seek_Entry( const USHORT aE, USHORT* pP ) const
             if( *(pData + nM) == aE )
             {
                 if( pP ) *pP = nM;
-                return TRUE;
+                return sal_True;
             }
             else if( *(pData + nM) < aE )
                 nU = nM + 1;
             else if( nM == 0 )
             {
                 if( pP ) *pP = nU;
-                return FALSE;
+                return sal_False;
             }
             else
                 nO = nM - 1;
         }
     }
     if( pP ) *pP = nU;
-    return FALSE;
+    return sal_False;
 }
 
-void SvUShortsSort::Insert( const SvUShortsSort * pI, USHORT nS, USHORT nE )
+void SvUShortsSort::Insert( const SvUShortsSort * pI, sal_uInt16 nS, sal_uInt16 nE )
 {
     if( USHRT_MAX == nE )
         nE = pI->Count();
-    USHORT nP;
-    const USHORT * pIArr = pI->GetData();
+    sal_uInt16 nP;
+    const sal_uInt16 * pIArr = pI->GetData();
     for( ; nS < nE; ++nS )
     {
         if( ! Seek_Entry( *(pIArr+nS), &nP) )
@@ -240,42 +229,42 @@ void SvUShortsSort::Insert( const SvUShortsSort * pI, USHORT nS, USHORT nE )
     }
 }
 
-BOOL SvUShortsSort::Insert( const USHORT aE )
+sal_Bool SvUShortsSort::Insert( const sal_uInt16 aE )
 {
-    USHORT nP;
-    BOOL bExist = Seek_Entry( aE, &nP );
+    sal_uInt16 nP;
+    sal_Bool bExist = Seek_Entry( aE, &nP );
     if( !bExist )
         SvUShorts::Insert( aE, nP );
     return !bExist;
 }
 
-BOOL SvUShortsSort::Insert( const USHORT aE, USHORT& rP )
+sal_Bool SvUShortsSort::Insert( const sal_uInt16 aE, sal_uInt16& rP )
 {
-    BOOL bExist = Seek_Entry( aE, &rP );
+    sal_Bool bExist = Seek_Entry( aE, &rP );
     if( !bExist )
         SvUShorts::Insert( aE, rP );
     return !bExist;
 }
 
-void SvUShortsSort::Insert( const USHORT* pE, USHORT nL)
+void SvUShortsSort::Insert( const sal_uInt16* pE, sal_uInt16 nL)
 {
-    USHORT nP;
-    for( USHORT n = 0; n < nL; ++n )
+    sal_uInt16 nP;
+    for( sal_uInt16 n = 0; n < nL; ++n )
         if( ! Seek_Entry( *(pE+n), &nP ))
             SvUShorts::Insert( *(pE+n), nP );
 }
 
 // remove ab Pos
-void SvUShortsSort::RemoveAt( const USHORT nP, USHORT nL )
+void SvUShortsSort::RemoveAt( const sal_uInt16 nP, sal_uInt16 nL )
 {
     if( nL )
         SvUShorts::Remove( nP, nL);
 }
 
 // remove ab dem Eintrag
-void SvUShortsSort::Remove( const USHORT aE, USHORT nL )
+void SvUShortsSort::Remove( const sal_uInt16 aE, sal_uInt16 nL )
 {
-    USHORT nP;
+    sal_uInt16 nP;
     if( nL && Seek_Entry( aE, &nP ) )
         SvUShorts::Remove( nP, nL);
 }
@@ -284,19 +273,19 @@ void SvUShortsSort::Remove( const USHORT aE, USHORT nL )
 
 // Array mit anderer Seek-Methode!
 _SV_IMPL_SORTAR_ALG( SvByteStringsISort, ByteStringPtr )
-void SvByteStringsISort::DeleteAndDestroy( USHORT nP, USHORT nL )
+void SvByteStringsISort::DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL )
 {
     if( nL )
     {
         DBG_ASSERT( nP < nA && nP + nL <= nA, "ERR_VAR_DEL" );
-        for( USHORT n=nP; n < nP + nL; n++ )
+        for( sal_uInt16 n=nP; n < nP + nL; n++ )
             delete *((ByteStringPtr*)pData+n);
         SvPtrarr::Remove( nP, nL );
     }
 }
-BOOL SvByteStringsISort::Seek_Entry( const ByteStringPtr aE, USHORT* pP ) const
+sal_Bool SvByteStringsISort::Seek_Entry( const ByteStringPtr aE, sal_uInt16* pP ) const
 {
-    register USHORT nO  = SvByteStringsISort_SAR::Count(),
+    register sal_uInt16 nO  = SvByteStringsISort_SAR::Count(),
             nM,
             nU = 0;
     if( nO > 0 )
@@ -310,39 +299,39 @@ BOOL SvByteStringsISort::Seek_Entry( const ByteStringPtr aE, USHORT* pP ) const
             if( COMPARE_EQUAL == eCmp )
             {
                 if( pP ) *pP = nM;
-                return TRUE;
+                return sal_True;
             }
             else if( COMPARE_LESS == eCmp )
                 nU = nM + 1;
             else if( nM == 0 )
             {
                 if( pP ) *pP = nU;
-                return FALSE;
+                return sal_False;
             }
             else
                 nO = nM - 1;
         }
     }
     if( pP ) *pP = nU;
-    return FALSE;
+    return sal_False;
 }
 
 
 // Array mit anderer Seek-Methode!
 _SV_IMPL_SORTAR_ALG( SvByteStringsISortDtor, ByteStringPtr )
-void SvByteStringsISortDtor::DeleteAndDestroy( USHORT nP, USHORT nL )
+void SvByteStringsISortDtor::DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL )
 {
     if( nL )
     {
         DBG_ASSERT( nP < nA && nP + nL <= nA, "ERR_VAR_DEL" );
-        for( USHORT n=nP; n < nP + nL; n++ )
+        for( sal_uInt16 n=nP; n < nP + nL; n++ )
             delete *((ByteStringPtr*)pData+n);
         SvPtrarr::Remove( nP, nL );
     }
 }
-BOOL SvByteStringsISortDtor::Seek_Entry( const ByteStringPtr aE, USHORT* pP ) const
+sal_Bool SvByteStringsISortDtor::Seek_Entry( const ByteStringPtr aE, sal_uInt16* pP ) const
 {
-    register USHORT nO  = SvByteStringsISortDtor_SAR::Count(),
+    register sal_uInt16 nO  = SvByteStringsISortDtor_SAR::Count(),
             nM,
             nU = 0;
     if( nO > 0 )
@@ -356,21 +345,21 @@ BOOL SvByteStringsISortDtor::Seek_Entry( const ByteStringPtr aE, USHORT* pP ) co
             if( COMPARE_EQUAL == eCmp )
             {
                 if( pP ) *pP = nM;
-                return TRUE;
+                return sal_True;
             }
             else if( COMPARE_LESS == eCmp )
                 nU = nM + 1;
             else if( nM == 0 )
             {
                 if( pP ) *pP = nU;
-                return FALSE;
+                return sal_False;
             }
             else
                 nO = nM - 1;
         }
     }
     if( pP ) *pP = nU;
-    return FALSE;
+    return sal_False;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */