fix misc merge issues breaking the build

16 files changed, 44 insertions, 56 deletions

diff --git a/sc/inc/funcdesc.hxx b/sc/inc/funcdesc.hxx
index 8a2404d4a..6ce243d04 100644
--- a/sc/inc/funcdesc.hxx
+++ b/sc/inc/funcdesc.hxx
@@ -108,7 +108,7 @@ public:
 
       @return   help id of the function
     */
-    virtual long getHelpId() const ;
+    virtual ::rtl::OString getHelpId() const ;
 
     /**
       Returns number of arguments
@@ -215,7 +215,7 @@ public:
     sal_uInt16            nFIndex;                /**< Unique function index */
     sal_uInt16            nCategory;              /**< Function category */
     sal_uInt16            nArgCount;              /**< All parameter count, suppressed and unsuppressed */
-    sal_uInt16            nHelpId;                /**< HelpId of function */
+    rtl::OString          sHelpId;                /**< HelpId of function */
     bool                  bIncomplete         :1; /**< Incomplete argument info (set for add-in info from configuration) */
     bool                  bHasSuppressedArgs  :1; /**< Whether there is any suppressed parameter. */
 };
diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx
index ab89bf9c6..46c04569a 100644
--- a/sc/inc/pivot.hxx
+++ b/sc/inc/pivot.hxx
@@ -109,7 +109,7 @@ struct ScPivotParam
     ~ScPivotParam();
 
     ScPivotParam&   operator=       ( const ScPivotParam& r );
-    sal_Bool            operator==      ( const ScPivotParam& r ) const;
+    bool            operator==      ( const ScPivotParam& r ) const;
     void            ClearPivotArrays();
     void            SetLabelData    (const ::std::vector<ScDPLabelDataRef>& r);
 };
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 605de71e6..45b2267ed 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -962,7 +962,7 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos,
 
         if ( !bResultsOnly )
         {
-            BOOL bNamesLost = false;
+            sal_Bool bNamesLost = false;
             // array containing range names which might need update of indices.
             // The instances inserted into this vector are managed by the
             // range name container of this document, so no need to delete
@@ -980,7 +980,7 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos,
             ScRangeName::const_iterator itr = pSrcDoc->pRangeName->begin(), itrEnd = pSrcDoc->pRangeName->end();
             for (; itr != itrEnd; ++itr)		//! DB-Bereiche Pivot-Bereiche auch !!!
             {
-                USHORT nOldIndex = itr->GetIndex();
+                sal_uInt16 nOldIndex = itr->GetIndex();
                 bool bInUse = ( aUsedNames.find(nOldIndex) != aUsedNames.end() );
                 if (bInUse)
                 {
@@ -991,7 +991,7 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos,
                         // -> use the existing name, but show a warning
                         // (when refreshing links, the existing name is used and the warning not shown)
 
-                        USHORT nExistingIndex = pExistingData->GetIndex();
+                        sal_uInt16 nExistingIndex = pExistingData->GetIndex();
 
                         // don't modify the named range
                         aSrcRangeMap.insert(
@@ -1014,7 +1014,7 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos,
                         {
                             pData->TransferTabRef( nSrcPos, nDestPos );
                             aSrcRangeNames.push_back(pData);
-                            USHORT nNewIndex = pData->GetIndex();
+                            sal_uInt16 nNewIndex = pData->GetIndex();
                             aSrcRangeMap.insert(
                                 ScRangeData::IndexMap::value_type(nOldIndex, nNewIndex));
                             if ( !bRangeNameReplace )
@@ -1124,7 +1124,7 @@ void ScDocument::SetError( SCCOL nCol, SCROW nRow, SCTAB nTab, const sal_uInt16
 
 namespace {
 
-bool eraseUnusedSharedName(ScRangeName* pRangeName, ScTable* pTab[], USHORT nLevel)
+bool eraseUnusedSharedName(ScRangeName* pRangeName, ScTable* pTab[], sal_uInt16 nLevel)
 {
     ScRangeName::iterator itr = pRangeName->begin(), itrEnd = pRangeName->end();
     for (; itr != itrEnd; ++itr)
@@ -1135,11 +1135,11 @@ bool eraseUnusedSharedName(ScRangeName* pRangeName, ScTable* pTab[], USHORT nLev
         String aName;
         itr->GetName(aName);
         aName.Erase(0, 6);						// !!! vgl. Table4, FillFormula !!
-        USHORT nInd = static_cast<USHORT>(aName.ToInt32());
+        sal_uInt16 nInd = static_cast<sal_uInt16>(aName.ToInt32());
         if (nInd > nLevel)
             continue;
 
-        USHORT nIndex = itr->GetIndex();
+        sal_uInt16 nIndex = itr->GetIndex();
 
         bool bInUse = false;
         for (SCTAB j = 0; !bInUse && (j <= MAXTAB); ++j)
@@ -1158,7 +1158,7 @@ bool eraseUnusedSharedName(ScRangeName* pRangeName, ScTable* pTab[], USHORT nLev
 
 }
 
-void ScDocument::EraseNonUsedSharedNames(USHORT nLevel)
+void ScDocument::EraseNonUsedSharedNames(sal_uInt16 nLevel)
 {
     while (eraseUnusedSharedName(pRangeName, pTab, nLevel))
         ;
diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index 1c9642bd9..6b9da8a5a 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -566,7 +566,7 @@ void ScDPSaveDimension::WriteToSource( const uno::Reference<uno::XInterface>& xD
 
         if ( nUsedHierarchy >= 0 )
         {
-            aAny <<= (INT32)nUsedHierarchy;
+            aAny <<= (sal_Int32)nUsedHierarchy;
             xDimProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_USEDHIERARCHY)), aAny );
         }
 
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 36c77bb0d..9cb01925f 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -1664,7 +1664,7 @@ void ScDrawLayer::EnsureGraphicNames()
 
 namespace
 {
-    SdrObjUserData* GetFirstUserDataOfType(const SdrObject *pObj, UINT16 nId)
+    SdrObjUserData* GetFirstUserDataOfType(const SdrObject *pObj, sal_uInt16 nId)
     {
         sal_uInt16 nCount = pObj ? pObj->GetUserDataCount() : 0;
         for( sal_uInt16 i = 0; i < nCount; i++ )
@@ -1676,7 +1676,7 @@ namespace
         return NULL;
     }
 
-    void DeleteFirstUserDataOfType(SdrObject *pObj, UINT16 nId)
+    void DeleteFirstUserDataOfType(SdrObject *pObj, sal_uInt16 nId)
     {
         sal_uInt16 nCount = pObj ? pObj->GetUserDataCount() : 0;
         for( sal_uInt16 i = nCount; i > 0; i-- )
diff --git a/sc/source/core/data/global2.cxx b/sc/source/core/data/global2.cxx
index 7935eee27..ef249d4b2 100644
--- a/sc/source/core/data/global2.cxx
+++ b/sc/source/core/data/global2.cxx
@@ -647,7 +647,7 @@ ScPivotParam& ScPivotParam::operator=( const ScPivotParam& r )
 
 //------------------------------------------------------------------------
 
-sal_Bool ScPivotParam::operator==( const ScPivotParam& r ) const
+bool ScPivotParam::operator==( const ScPivotParam& r ) const
 {
     sal_Bool bEqual = 	(nCol		== r.nCol)
                  &&	(nRow		== r.nRow)
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index f940bc230..1021a9998 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -2027,7 +2027,7 @@ void ScTable::StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, sal_Bool
 
 
 bool ScTable::ApplyFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
-                                    INT16 nFlags )
+                          sal_Int16 nFlags )
 {
     bool bChanged = false;
     if (ValidColRow(nStartCol, nStartRow) && ValidColRow(nEndCol, nEndRow))
@@ -2038,7 +2038,7 @@ bool ScTable::ApplyFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW
 
 
 bool ScTable::RemoveFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
-                                    INT16 nFlags )
+                           sal_Int16 nFlags )
 {
     bool bChanged = false;
     if (ValidColRow(nStartCol, nStartRow) && ValidColRow(nEndCol, nEndRow))
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 17d789b0e..c32e76e64 100755
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -391,9 +391,9 @@ double ScInterpreter::ConvertStringToValue( const String& rStr )
                                     ::rtl::math::pow10Exp( nUnit[fraction],
                                         static_cast<int>( -ceil( log10( static_cast<double>( nUnit[fraction]))))));
                             fValue = (bDate ? GetDateSerial(
-                                        sal::static_int_cast<INT16>(nUnit[year]),
-                                        sal::static_int_cast<INT16>(nUnit[month]),
-                                        sal::static_int_cast<INT16>(nUnit[day]),
+                                        sal::static_int_cast<sal_Int16>(nUnit[year]),
+                                        sal::static_int_cast<sal_Int16>(nUnit[month]),
+                                        sal::static_int_cast<sal_Int16>(nUnit[day]),
                                         true) : 0.0);
                             fValue += ((nUnit[hour] * 3600) + (nUnit[minute] * 60) + nUnit[second] + fFraction) / 86400.0;
                         }
@@ -3151,7 +3151,7 @@ void ScInterpreter::ScMacro()
                         for( SCROW nRow = nRow1; bOk && nRow <= nRow2; nRow++ )
                         {
                             aAdr.SetRow( nRow );
-                            INT32 nIdx[ 2 ];
+                            sal_Int32 nIdx[ 2 ];
                             nIdx[ 0 ] = nRow-nRow1+1;
                             for( SCCOL nCol = nCol1; bOk && nCol <= nCol2; nCol++ )
                             {
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 3e80861ef..673c5cc36 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -455,7 +455,7 @@ ScToken::~ScToken()
 }
 
 //  TextEqual: if same formula entered (for optimization in sort)
-sal_Bool ScToken::TextEqual( const FormulaToken& _rToken ) const
+bool ScToken::TextEqual( const FormulaToken& _rToken ) const
 {
     if ( eType == svSingleRef || eType == svDoubleRef )
     {
@@ -503,7 +503,7 @@ sal_Bool ScToken::TextEqual( const FormulaToken& _rToken ) const
 }
 
 
-sal_Bool ScToken::Is3DRef() const
+bool ScToken::Is3DRef() const
 {
     switch ( eType )
     {
@@ -744,7 +744,7 @@ void                    ScSingleRefToken::CalcAbsIfRel( const ScAddress& rPos )
                             { aSingleRef.CalcAbsIfRel( rPos ); }
 void                    ScSingleRefToken::CalcRelFromAbs( const ScAddress& rPos )
                             { aSingleRef.CalcRelFromAbs( rPos ); }
-sal_Bool ScSingleRefToken::operator==( const FormulaToken& r ) const
+bool ScSingleRefToken::operator==( const FormulaToken& r ) const
 {
     return FormulaToken::operator==( r ) && aSingleRef == static_cast<const ScToken&>(r).GetSingleRef();
 }
@@ -760,7 +760,7 @@ void                    ScDoubleRefToken::CalcAbsIfRel( const ScAddress& rPos )
                             { aDoubleRef.CalcAbsIfRel( rPos ); }
 void                    ScDoubleRefToken::CalcRelFromAbs( const ScAddress& rPos )
                             { aDoubleRef.CalcRelFromAbs( rPos ); }
-sal_Bool ScDoubleRefToken::operator==( const FormulaToken& r ) const
+bool ScDoubleRefToken::operator==( const FormulaToken& r ) const
 {
     return FormulaToken::operator==( r ) && aDoubleRef == static_cast<const ScToken&>(r).GetDoubleRef();
 }
@@ -778,7 +778,7 @@ void                    ScRefListToken::CalcRelFromAbs( const ScAddress& rPos )
     for (ScRefList::iterator it( aRefList.begin()); it != aRefList.end(); ++it)
         (*it).CalcRelFromAbs( rPos);
 }
-sal_Bool ScRefListToken::operator==( const FormulaToken& r ) const
+bool ScRefListToken::operator==( const FormulaToken& r ) const
 {
     return FormulaToken::operator==( r ) && &aRefList == static_cast<const ScToken&>(r).GetRefList();
 }
@@ -786,7 +786,7 @@ sal_Bool ScRefListToken::operator==( const FormulaToken& r ) const
 
 const ScMatrix* ScMatrixToken::GetMatrix() const        { return pMatrix.get(); }
 ScMatrix*       ScMatrixToken::GetMatrix()              { return pMatrix.get(); }
-sal_Bool ScMatrixToken::operator==( const FormulaToken& r ) const
+bool ScMatrixToken::operator==( const FormulaToken& r ) const
 {
     return FormulaToken::operator==( r ) && pMatrix == static_cast<const ScToken&>(r).GetMatrix();
 }
@@ -843,7 +843,7 @@ void ScExternalSingleRefToken::CalcRelFromAbs( const ScAddress& rPos )
     maSingleRef.CalcRelFromAbs( rPos );
 }
 
-sal_Bool ScExternalSingleRefToken::operator ==( const FormulaToken& r ) const
+bool ScExternalSingleRefToken::operator ==( const FormulaToken& r ) const
 {
     if (!FormulaToken::operator==(r))
         return false;
@@ -929,7 +929,7 @@ void ScExternalDoubleRefToken::CalcRelFromAbs( const ScAddress& rPos )
     maDoubleRef.CalcRelFromAbs( rPos );
 }
 
-sal_Bool ScExternalDoubleRefToken::operator ==( const FormulaToken& r ) const
+bool ScExternalDoubleRefToken::operator ==( const FormulaToken& r ) const
 {
     if (!ScToken::operator==(r))
         return false;
@@ -1012,7 +1012,7 @@ const String &  ScEmptyCellToken::GetString() const
     static  String              aDummyString;
     return aDummyString; 
 }
-sal_Bool ScEmptyCellToken::operator==( const FormulaToken& r ) const
+bool ScEmptyCellToken::operator==( const FormulaToken& r ) const
 {
     return FormulaToken::operator==( r ) &&
         bInherited == static_cast< const ScEmptyCellToken & >(r).IsInherited() &&
@@ -1029,7 +1029,7 @@ ScMatrix* ScMatrixCellResultToken::GetMatrix()
 {
     return const_cast<ScMatrix*>(xMatrix.operator->());
 }
-sal_Bool ScMatrixCellResultToken::operator==( const FormulaToken& r ) const
+bool ScMatrixCellResultToken::operator==( const FormulaToken& r ) const
 {
     return FormulaToken::operator==( r ) &&
         xUpperLeft == static_cast<const ScMatrixCellResultToken &>(r).xUpperLeft &&
@@ -1037,7 +1037,7 @@ sal_Bool ScMatrixCellResultToken::operator==( const FormulaToken& r ) const
 }
 
 
-sal_Bool ScMatrixFormulaCellToken::operator==( const FormulaToken& r ) const
+bool ScMatrixFormulaCellToken::operator==( const FormulaToken& r ) const
 {
     const ScMatrixFormulaCellToken* p = dynamic_cast<const ScMatrixFormulaCellToken*>(&r);
     return p && ScMatrixCellResultToken::operator==( r ) &&
@@ -1089,7 +1089,7 @@ void ScMatrixFormulaCellToken::SetUpperLeftDouble( double f )
 
 double          ScHybridCellToken::GetDouble() const    { return fDouble; }
 const String &  ScHybridCellToken::GetString() const    { return aString; }
-sal_Bool ScHybridCellToken::operator==( const FormulaToken& r ) const
+bool ScHybridCellToken::operator==( const FormulaToken& r ) const
 {
     return FormulaToken::operator==( r ) &&
         fDouble == r.GetDouble() && aString == r.GetString() &&
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index 0953b7cb1..cd00c2cea 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -29,7 +29,7 @@
 #ifndef SC_ANYREFDG_HXX
 #define SC_ANYREFDG_HXX
 
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/accel.hxx>
 #include <sfx2/basedlgs.hxx>
diff --git a/sc/source/ui/inc/datafdlg.hxx b/sc/source/ui/inc/datafdlg.hxx
index 5742e7ac8..fea9e132f 100644
--- a/sc/source/ui/inc/datafdlg.hxx
+++ b/sc/source/ui/inc/datafdlg.hxx
@@ -29,19 +29,9 @@
 #ifndef SC_DATAFDLG_HXX
 #define SC_DATAFDLG_HXX
 
-
-#ifndef _SV_DIALOG_HXX //autogen
 #include <vcl/dialog.hxx>
-#endif
-
-#ifndef _SV_BUTTON_HXX //autogen
-#include <vcl/imagebtn.hxx>
-#endif
-
-#ifndef _SV_FIXED_HXX //autogen
+#include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
-#endif
-
 
 #include "global.hxx"
 
diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx
index 96d47c7c5..52c989e2f 100644
--- a/sc/source/ui/inc/dwfunctr.hxx
+++ b/sc/source/ui/inc/dwfunctr.hxx
@@ -34,9 +34,7 @@
 #include <svtools/stdctrl.hxx>
 
 #include <vcl/lstbox.hxx>
-
-#include <vcl/imagebtn.hxx>
-
+#include <vcl/button.hxx>
 #include <vcl/combobox.hxx>
 #include "anyrefdg.hxx"
 #include "global.hxx"		// ScAddress
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index d86b638f9..564f8c117 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -698,8 +698,8 @@ void SAL_CALL ScRecentFunctionsObj::setRecentFunctionIds(
                                     throw(uno::RuntimeException)
 {
     SolarMutexGuard aGuard;
-    sal_uInt16 nCount = (sal_uInt16) Min( aRecentFunctionIds.getLength(), (INT32) LRU_MAX );
-    const INT32* pAry = aRecentFunctionIds.getConstArray();
+    sal_uInt16 nCount = (sal_uInt16) Min( aRecentFunctionIds.getLength(), (sal_Int32) LRU_MAX );
+    const sal_Int32* pAry = aRecentFunctionIds.getConstArray();
 
     sal_uInt16* pFuncs = nCount ? new sal_uInt16[nCount] : NULL;
     for (sal_uInt16 i=0; i<nCount; i++)
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 3e38347ca..936022336 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -3993,7 +3993,7 @@ sal_Int32 SAL_CALL ScCellRangesBase::replaceAll( const uno::Reference<util::XSea
                                                 throw(uno::RuntimeException)
 {
     SolarMutexGuard aGuard;
-    INT32 nReplaced = 0;
+    sal_Int32 nReplaced = 0;
     if ( pDocShell && xDesc.is() )
     {
         ScCellSearchObj* pSearch = ScCellSearchObj::getImplementation( xDesc );
diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx
index 6cd32c027..40b2392db 100644
--- a/sc/source/ui/unoobj/chartuno.cxx
+++ b/sc/source/ui/unoobj/chartuno.cxx
@@ -336,7 +336,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScChartsObj::createEnumeration(
 sal_Int32 SAL_CALL ScChartsObj::getCount() throw(uno::RuntimeException)
 {
     SolarMutexGuard aGuard;
-    INT32 nCount = 0;
+    sal_Int32 nCount = 0;
     if ( pDocShell )
     {
         ScDocument* pDoc = pDocShell->GetDocument();
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index 80f4ee910..b1c4b4cfc 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -417,8 +417,8 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b
             uno::Sequence<table::TableSortField> aNewSeq;
             if ( rProp.Value >>= aSeq )
             {
-                INT32 nCount = aSeq.getLength();
-                INT32 i;
+                sal_Int32 nCount = aSeq.getLength();
+                sal_Int32 i;
                 if ( nCount > MAXSORT )
                 {
                     OSL_FAIL("Zu viele Sortierfelder");
@@ -438,8 +438,8 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b
             }
             else if ( rProp.Value >>= aNewSeq )
             {
-                INT32 nCount = aNewSeq.getLength();
-                INT32 i;
+                sal_Int32 nCount = aNewSeq.getLength();
+                sal_Int32 i;
                 if ( nCount > MAXSORT )
                 {
                     OSL_FAIL("Zu viele Sortierfelder");