removetooltypes01: adjust rebase for Linux

6 files changed, 7 insertions, 11 deletions

diff --git a/sc/source/core/tool/charthelper.cxx b/sc/source/core/tool/charthelper.cxx
index 4c51d3a53..180e38114 100644
--- a/sc/source/core/tool/charthelper.cxx
+++ b/sc/source/core/tool/charthelper.cxx
@@ -318,7 +318,7 @@ void ScChartHelper::AddRangesIfProtectedChart( ScRangeListVector& rRangesVector,
                     ::rtl::OUString aChartName = pSdrOle2Obj->GetPersistName();
                     ScRange aEmptyRange;
                     ScChartListener aSearcher( aChartName, pDocument, aEmptyRange );
-                    USHORT nIndex = 0;
+                    sal_uInt16 nIndex = 0;
                     ScChartListenerCollection* pCollection = pDocument->GetChartListenerCollection();
                     if ( pCollection && pCollection->Search( &aSearcher, nIndex ) )
                     {
@@ -408,7 +408,7 @@ void ScChartHelper::CreateProtectedChartListenersAndNotify( ScDocument* pDoc, Sd
                                 {
                                     ScRange aEmptyRange;
                                     ScChartListener aSearcher( aChartName, pDoc, aEmptyRange );
-                                    USHORT nIndex = 0;
+                                    sal_uInt16 nIndex = 0;
                                     ScChartListenerCollection* pCollection = pDoc->GetChartListenerCollection();
                                     if ( pCollection && !pCollection->Search( &aSearcher, nIndex ) )
                                     {
diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx
index 67084c476..59e33b2c9 100644
--- a/sc/source/ui/drawfunc/fusel.cxx
+++ b/sc/source/ui/drawfunc/fusel.cxx
@@ -426,8 +426,8 @@ sal_Bool __EXPORT FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
                 if ( pView && pDocument )
                 {
                     const SdrMarkList& rSdrMarkList = pView->GetMarkedObjectList();
-                    ULONG nMarkCount = rSdrMarkList.GetMarkCount();
-                    for ( ULONG i = 0; i < nMarkCount; ++i )
+                    sal_uLong nMarkCount = rSdrMarkList.GetMarkCount();
+                    for ( sal_uLong i = 0; i < nMarkCount; ++i )
                     {
                         SdrMark* pMark = rSdrMarkList.GetMark( i );
                         SdrObject* pObj = ( pMark ? pMark->GetMarkedSdrObj() : NULL );
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 8543f28b6..384301fdf 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -302,7 +302,7 @@ public:
     void			DoRecalc( sal_Bool bApi );
     void			DoHardRecalc( sal_Bool bApi );
 
-    void			UpdateOle( const ScViewData* pViewData, BOOL bSnapSize = sal_False);
+    void			UpdateOle( const ScViewData* pViewData, sal_Bool bSnapSize = sal_False);
     sal_Bool		IsOle();
 
     void			DBAreaDeleted( SCTAB nTab, SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 );
diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx
index ae678a0f8..786200c2a 100644
--- a/sc/source/ui/inc/prevwsh.hxx
+++ b/sc/source/ui/inc/prevwsh.hxx
@@ -116,11 +116,7 @@ public:
 
     virtual SfxPrinter*		GetPrinter( sal_Bool bCreate = sal_False );
     virtual sal_uInt16          SetPrinter( SfxPrinter* pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false );
-    virtual PrintDialog*	CreatePrintDialog( Window* pParent );
     virtual SfxTabPage*     CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions );
-    virtual void			PreparePrint( PrintDialog* pPrintDialog = NULL );
-    virtual ErrCode         DoPrint( SfxPrinter *pPrinter, PrintDialog *pPrintDialog, sal_Bool bSilent, sal_Bool bIsAPI );
-    virtual sal_uInt16          Print( SfxProgress& rProgress, sal_Bool bIsAPI, PrintDialog* pPrintDialog = NULL );
 
     void	AddAccessibilityObject( SfxListener& rObject );
     void	RemoveAccessibilityObject( SfxListener& rObject );
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index 496163562..33151a750 100644
--- a/sc/source/ui/inc/viewfunc.hxx
+++ b/sc/source/ui/inc/viewfunc.hxx
@@ -187,7 +187,7 @@ public:
 
     const SfxStyleSheet*	GetStyleSheetFromMarked();
     void					SetStyleSheetToMarked( SfxStyleSheet* pStyleSheet,
-                                                        sal_Bool bRecord = TRUE );
+                                                        sal_Bool bRecord = sal_True );
     void                    RemoveStyleSheetInUse( const SfxStyleSheetBase* pStyleSheet );
     void                    UpdateStyleSheetInUse( const SfxStyleSheetBase* pStyleSheet );
 
diff --git a/sc/source/ui/unoobj/addruno.cxx b/sc/source/ui/unoobj/addruno.cxx
index f6e95c002..a9ab9f0bd 100644
--- a/sc/source/ui/unoobj/addruno.cxx
+++ b/sc/source/ui/unoobj/addruno.cxx
@@ -283,7 +283,7 @@ uno::Any SAL_CALL ScAddressConversionObj::getPropertyValue( const rtl::OUString&
             //  manually concatenate range so both parts always have the sheet name
             aFormatStr.Append( (sal_Unicode) ':' );
             String aSecond;
-            USHORT nFlags = SCA_VALID;
+            sal_uInt16 nFlags = SCA_VALID;
             if( eConv != ::formula::FormulaGrammar::CONV_XL_A1 )
                 nFlags |= SCA_TAB_3D;
             aRange.aEnd.Format( aSecond, nFlags, pDoc, eConv );