fix up merging issues, so it compiles

5 files changed, 15 insertions, 14 deletions

diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx
index 25e06a9237e2..783fce26bec9 100644
--- a/svl/inc/svl/zforlist.hxx
+++ b/svl/inc/svl/zforlist.hxx
@@ -425,7 +425,7 @@ public:
     /** Same as <method>PutEntry</method> but the format code string is
          considered to be of language/country eLnge and is converted to
         language/country eNewLnge */
-    sal_Bool PutandConvertEntry( String& rString, xub_StrLen& nCheckPos,
+    bool PutandConvertEntry( String& rString, xub_StrLen& nCheckPos,
                              short& nType, sal_uInt32& nKey,
                              LanguageType eLnge, LanguageType eNewLnge );
 
@@ -433,7 +433,7 @@ public:
          is considered to be of the System language/country eLnge and is
         converted to another System language/country eNewLnge. In this case
          the automatic currency is converted too. */
-    sal_Bool PutandConvertEntrySystem( String& rString, xub_StrLen& nCheckPos,
+    bool PutandConvertEntrySystem( String& rString, xub_StrLen& nCheckPos,
                              short& nType, sal_uInt32& nKey,
                              LanguageType eLnge, LanguageType eNewLnge );
 
diff --git a/svl/prj/build.lst b/svl/prj/build.lst
index c47d11227077..1b88fab32810 100644
--- a/svl/prj/build.lst
+++ b/svl/prj/build.lst
@@ -1,3 +1,3 @@
 sl	svl	:	L10N:l10n rsc offuh ucbhelper unotools cppu cppuhelper comphelper sal sot  LIBXSLT:libxslt NULL
 sl	svl\prj	nmake	-	all	svl_prj NULL
-sl	svl\qa\unit	nmake	-	all	svl_qa_cppunit svl_util NULL
+# sl	svl\qa\unit	nmake	-	all	svl_qa_cppunit svl_util NULL
diff --git a/svl/source/memtools/svarray.cxx b/svl/source/memtools/svarray.cxx
index e94d00242de2..53b47c7e872a 100644
--- a/svl/source/memtools/svarray.cxx
+++ b/svl/source/memtools/svarray.cxx
@@ -67,6 +67,7 @@ sal_uInt16 SvPtrarr::GetPos( const VoidPtr& aElement ) const
 }
 
 SV_IMPL_VARARR( SvULongs, sal_uLong )
+SV_IMPL_VARARR( SvUShorts, sal_uInt16 )
 SV_IMPL_VARARR( SvLongs, long)
 
 SV_IMPL_VARARR_SORT( SvULongsSort, sal_uLong )
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index ec6f2c399f5c..f3a2f18c7630 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -573,7 +573,7 @@ bool SvNumberFormatter::PutandConvertEntry(String& rString,
 }
 
 
-sal_Bool SvNumberFormatter::PutandConvertEntrySystem(String& rString,
+bool SvNumberFormatter::PutandConvertEntrySystem(String& rString,
                                            xub_StrLen& nCheckPos,
                                            short& nType,
                                            sal_uInt32& nKey,
@@ -2755,7 +2755,7 @@ void SvNumberFormatter::GenerateFormat(String& sString,
     const String& rThSep = GetNumThousandSep();
 
     SvNumberformat* pFormat = (SvNumberformat*) aFTable.Get(nIndex);
-    BOOL insertBrackets = pFormat->IsNegativeInBracket();
+    sal_Bool insertBrackets = pFormat->IsNegativeInBracket();
 
     if (nAnzLeading == 0)
     {
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index f4db791770b7..579c494424b8 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -2052,9 +2052,9 @@ void lcl_GetOutputStringScientific(
         fNumber, rtl_math_StringFormat_E, nPrec, rFormatter.GetNumDecimalSep().GetChar(0));
 }
 
-sal_Int32 lcl_GetForcedDenominator(ImpSvNumberformatInfo &rInfo, USHORT nAnz)
+sal_Int32 lcl_GetForcedDenominator(ImpSvNumberformatInfo &rInfo, sal_uInt16 nAnz)
 {
-    USHORT i;
+    sal_uInt16 i;
     rtl::OUString aDiv;
     for( i = 0; i < nAnz; i++ )
     {
@@ -2065,11 +2065,11 @@ sal_Int32 lcl_GetForcedDenominator(ImpSvNumberformatInfo &rInfo, USHORT nAnz)
 }
 
 // TODO: More optimizations?
-void lcl_ForcedDenominator(ULONG &nFrac, ULONG &nDiv, ULONG nForcedDiv)
+void lcl_ForcedDenominator(sal_uLong &nFrac, sal_uLong &nDiv, sal_uLong nForcedDiv)
 {
     double fFrac = (double)nFrac / (double)nDiv;
     double fMultiplier = (double)nForcedDiv / (double)nDiv;
-    nFrac = (ULONG)( (double)nFrac * fMultiplier );
+    nFrac = (sal_uLong)( (double)nFrac * fMultiplier );
 
     double fFracNew = (double)nFrac / (double)nForcedDiv;
     double fFracNew1 = (double)(nFrac + 1) / (double)nForcedDiv;
@@ -4114,19 +4114,19 @@ sal_Bool SvNumberformat::IsNegativeWithoutSign() const
     return sal_False;
 }
 
-BOOL SvNumberformat::IsNegativeInBracket() const
+sal_Bool SvNumberformat::IsNegativeInBracket() const
 {
-    USHORT nAnz = NumFor[1].GetCount();
+    sal_uInt16 nAnz = NumFor[1].GetCount();
     if (!nAnz)
-        return FALSE;
+        return sal_False;
 
     String *tmpStr = NumFor[1].Info().sStrArray;
     return (tmpStr[0] == '(' && tmpStr[nAnz-1] == ')' );
 }
 
-BOOL SvNumberformat::HasPositiveBracketPlaceholder() const
+sal_Bool SvNumberformat::HasPositiveBracketPlaceholder() const
 {
-    USHORT nAnz = NumFor[0].GetCount();
+    sal_uInt16 nAnz = NumFor[0].GetCount();
     String *tmpStr = NumFor[0].Info().sStrArray;
     return (tmpStr[nAnz-1].EqualsAscii( "_)" ));
 }