dr79: rebase to DEV300_m100

5 files changed, 181 insertions, 181 deletions

diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx
index 65fa88ea0..64844b429 100644
--- a/sc/source/ui/attrdlg/attrdlg.cxx
+++ b/sc/source/ui/attrdlg/attrdlg.cxx
@@ -78,7 +78,7 @@ ScAttrDlg::ScAttrDlg( SfxViewFrame*     pFrameP,
     AddTabPage( TP_NUMBER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), 0 ); //CHINA001 AddTabPage( TP_NUMBER,		SvxNumberFormatTabPage::Create,	0 );
 #else
     String number = rtl::OUString::createFromAscii ("Numbers");
-    AddTabPage( TP_NUMBER, number, pFact->GetTabPageCreatorFunc (RID_SVXPAGE_NUMBERFORMAT), 0, FALSE, TAB_APPEND);
+    AddTabPage( TP_NUMBER, number, pFact->GetTabPageCreatorFunc (RID_SVXPAGE_NUMBERFORMAT), 0, sal_False, TAB_APPEND);
 #endif
     DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageCreatorFunc fail!");//CHINA001
     AddTabPage( TP_FONT, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), 0 ); //CHINA001 AddTabPage( TP_FONT,		SvxCharNamePage::Create,		0 );
@@ -112,7 +112,7 @@ __EXPORT ScAttrDlg::~ScAttrDlg()
 
 // -----------------------------------------------------------------------
 
-void __EXPORT ScAttrDlg::PageCreated( USHORT nPageId, SfxTabPage& rTabPage )
+void __EXPORT ScAttrDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage )
 {
     SfxObjectShell* pDocSh = SfxObjectShell::Current();
     SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); //CHINA001
diff --git a/sc/source/ui/attrdlg/condfrmt.cxx b/sc/source/ui/attrdlg/condfrmt.cxx
index f8df8ed49..1f6185bfb 100644
--- a/sc/source/ui/attrdlg/condfrmt.cxx
+++ b/sc/source/ui/attrdlg/condfrmt.cxx
@@ -102,7 +102,7 @@ ScConditionalFormatDlg::ScConditionalFormatDlg(
         aBtnCancel			( this, ScResId( BTN_CANCEL ) ),
         aBtnHelp			( this, ScResId( BTN_HELP ) ),
         pEdActive			( NULL ),
-        bDlgLostFocus       ( FALSE ),
+        bDlgLostFocus       ( sal_False ),
 
         pDoc				( pCurDoc )
 {
@@ -187,7 +187,7 @@ ScConditionalFormatDlg::ScConditionalFormatDlg(
     aCond2Size2 = Size( aPos.X() - aCond2Pos2.X(), aCond2Size3.Height() );
     aCond2Size1 = Size( aPos.X() - aCond2Pos1.X(), aCond2Size3.Height() );
 
-    aCbxCond2.Check( FALSE );
+    aCbxCond2.Check( sal_False );
     aLbCond21.SelectEntryPos( 0 );
     aLbCond22.SelectEntryPos( 0 );
 
@@ -202,7 +202,7 @@ ScConditionalFormatDlg::ScConditionalFormatDlg(
     aCond3Size2 = Size( aPos.X() - aCond3Pos2.X(), aCond3Size3.Height() );
     aCond3Size1 = Size( aPos.X() - aCond3Pos1.X(), aCond3Size3.Height() );
 
-    aCbxCond3.Check( FALSE );
+    aCbxCond3.Check( sal_False );
     aLbCond31.SelectEntryPos( 0 );
     aLbCond32.SelectEntryPos( 0 );
 
@@ -255,7 +255,7 @@ ScConditionalFormatDlg::ScConditionalFormatDlg(
                 ;
             else									// via Werte
             {
-                aLbCond12.SelectEntryPos( sal::static_int_cast<USHORT>( eMode ) );
+                aLbCond12.SelectEntryPos( sal::static_int_cast<sal_uInt16>( eMode ) );
                 if ( ( eMode == SC_COND_BETWEEN ) || ( eMode == SC_COND_NOTBETWEEN ) )
                     aEdtCond12.SetText( pEntry->GetExpression( aCurPos, 1 ) );
             }
@@ -264,7 +264,7 @@ ScConditionalFormatDlg::ScConditionalFormatDlg(
 
         if ( pCurrentFormat->Count() > 1 )
         {
-            aCbxCond2.Check( TRUE );
+            aCbxCond2.Check( sal_True );
             pEntry= pCurrentFormat->GetEntry( 1 );
             aEdtCond21.SetText( pEntry->GetExpression( aCurPos, 0 ) );
             aLbCond2Template.SelectEntry( pEntry->GetStyle() );
@@ -279,7 +279,7 @@ ScConditionalFormatDlg::ScConditionalFormatDlg(
                 ;
             else									// via Werte
             {
-                aLbCond22.SelectEntryPos( sal::static_int_cast<USHORT>( eMode ) );
+                aLbCond22.SelectEntryPos( sal::static_int_cast<sal_uInt16>( eMode ) );
                 if ( ( eMode == SC_COND_BETWEEN ) || ( eMode == SC_COND_NOTBETWEEN ) )
                     aEdtCond22.SetText( pEntry->GetExpression( aCurPos, 1 ) );
             }
@@ -287,7 +287,7 @@ ScConditionalFormatDlg::ScConditionalFormatDlg(
 
         if ( pCurrentFormat->Count() > 2 )
         {
-            aCbxCond3.Check( TRUE );
+            aCbxCond3.Check( sal_True );
             pEntry= pCurrentFormat->GetEntry( 2 );
             aEdtCond31.SetText( pEntry->GetExpression( aCurPos, 0 ) );
             aLbCond3Template.SelectEntry( pEntry->GetStyle() );
@@ -302,7 +302,7 @@ ScConditionalFormatDlg::ScConditionalFormatDlg(
                 ;
             else									// via Werte
             {
-                aLbCond32.SelectEntryPos( sal::static_int_cast<USHORT>( eMode ) );
+                aLbCond32.SelectEntryPos( sal::static_int_cast<sal_uInt16>( eMode ) );
                 if ( ( eMode == SC_COND_BETWEEN ) || ( eMode == SC_COND_NOTBETWEEN ) )
                     aEdtCond32.SetText( pEntry->GetExpression( aCurPos, 1 ) );
             }
@@ -374,7 +374,7 @@ void ScConditionalFormatDlg::AddRefEntry()
 
 //----------------------------------------------------------------------------
 
-BOOL ScConditionalFormatDlg::IsRefInputMode() const
+sal_Bool ScConditionalFormatDlg::IsRefInputMode() const
 {
     return (pEdActive != NULL);
 }
@@ -386,7 +386,7 @@ void ScConditionalFormatDlg::SetActive()
 {
     if ( bDlgLostFocus )
     {
-        bDlgLostFocus = FALSE;
+        bDlgLostFocus = sal_False;
         if( pEdActive )
             pEdActive->GrabFocus();
     }
@@ -459,7 +459,7 @@ void ScConditionalFormatDlg::GetConditionalFormat( ScConditionalFormat& rCndFmt
 //----------------------------------------------------------------------------
 // Zerstoert den Dialog
 
-BOOL ScConditionalFormatDlg::Close()
+sal_Bool ScConditionalFormatDlg::Close()
 {
     return DoClose( ScCondFormatDlgWrapper::GetChildWindowId() );
 }
@@ -473,7 +473,7 @@ BOOL ScConditionalFormatDlg::Close()
 
 IMPL_LINK( ScConditionalFormatDlg, ClickCond1Hdl, void *, EMPTYARG )
 {
-    BOOL bChecked = aCbxCond1.IsChecked();
+    sal_Bool bChecked = aCbxCond1.IsChecked();
 
     aLbCond11.Enable( bChecked );
     aLbCond12.Enable( bChecked );
@@ -495,7 +495,7 @@ IMPL_LINK( ScConditionalFormatDlg, ClickCond1Hdl, void *, EMPTYARG )
 
 IMPL_LINK( ScConditionalFormatDlg, ChangeCond11Hdl, void *, EMPTYARG )
 {
-    USHORT nPos = aLbCond11.GetSelectEntryPos();
+    sal_uInt16 nPos = aLbCond11.GetSelectEntryPos();
 
     if( nPos == 0 ) // Zellwert
     {
@@ -525,7 +525,7 @@ IMPL_LINK( ScConditionalFormatDlg, ChangeCond12Hdl, void *, EMPTYARG )
 {
     if( aLbCond12.IsVisible() )
     {
-        USHORT nPos = aLbCond12.GetSelectEntryPos();
+        sal_uInt16 nPos = aLbCond12.GetSelectEntryPos();
 
         if( nPos == 6  || nPos == 7 ) // zwischen, n. zwischen
         {
@@ -554,7 +554,7 @@ IMPL_LINK( ScConditionalFormatDlg, ChangeCond12Hdl, void *, EMPTYARG )
 
 IMPL_LINK( ScConditionalFormatDlg, ClickCond2Hdl, void *, EMPTYARG )
 {
-    BOOL bChecked = aCbxCond2.IsChecked();
+    sal_Bool bChecked = aCbxCond2.IsChecked();
 
     aLbCond21.Enable( bChecked );
     aLbCond22.Enable( bChecked );
@@ -576,7 +576,7 @@ IMPL_LINK( ScConditionalFormatDlg, ClickCond2Hdl, void *, EMPTYARG )
 
 IMPL_LINK( ScConditionalFormatDlg, ChangeCond21Hdl, void *, EMPTYARG )
 {
-    USHORT nPos = aLbCond21.GetSelectEntryPos();
+    sal_uInt16 nPos = aLbCond21.GetSelectEntryPos();
 
     if( nPos == 0 ) // Zellwert
     {
@@ -606,7 +606,7 @@ IMPL_LINK( ScConditionalFormatDlg, ChangeCond22Hdl, void *, EMPTYARG )
 {
     if( aLbCond22.IsVisible() )
     {
-        USHORT nPos = aLbCond22.GetSelectEntryPos();
+        sal_uInt16 nPos = aLbCond22.GetSelectEntryPos();
 
         if( nPos == 6  || nPos == 7 ) // zwischen, n. zwischen
         {
@@ -635,7 +635,7 @@ IMPL_LINK( ScConditionalFormatDlg, ChangeCond22Hdl, void *, EMPTYARG )
 
 IMPL_LINK( ScConditionalFormatDlg, ClickCond3Hdl, void *, EMPTYARG )
 {
-    BOOL bChecked = aCbxCond3.IsChecked();
+    sal_Bool bChecked = aCbxCond3.IsChecked();
 
     aLbCond31.Enable( bChecked );
     aLbCond32.Enable( bChecked );
@@ -657,7 +657,7 @@ IMPL_LINK( ScConditionalFormatDlg, ClickCond3Hdl, void *, EMPTYARG )
 
 IMPL_LINK( ScConditionalFormatDlg, ChangeCond31Hdl, void *, EMPTYARG )
 {
-    USHORT nPos = aLbCond31.GetSelectEntryPos();
+    sal_uInt16 nPos = aLbCond31.GetSelectEntryPos();
 
     if( nPos == 0 ) // Zellwert
     {
@@ -687,7 +687,7 @@ IMPL_LINK( ScConditionalFormatDlg, ChangeCond32Hdl, void *, EMPTYARG )
 {
     if( aLbCond32.IsVisible() )
     {
-        USHORT nPos = aLbCond32.GetSelectEntryPos();
+        sal_uInt16 nPos = aLbCond32.GetSelectEntryPos();
 
         if( nPos == 6  || nPos == 7 ) // zwischen, n. zwischen
         {
@@ -757,7 +757,7 @@ IMPL_LINK( ScConditionalFormatDlg, BtnHdl, PushButton*, pBtn )
         GetConditionalFormat( aCondFrmt );
         ScCondFrmtItem aOutItem( FID_CONDITIONAL_FORMAT, aCondFrmt );
 
-        SetDispatcherLock( FALSE );
+        SetDispatcherLock( sal_False );
         SwitchToDocument();
         GetBindings().GetDispatcher()->Execute( FID_CONDITIONAL_FORMAT,
                                   SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD,
@@ -781,7 +781,7 @@ IMPL_LINK( ScConditionalFormatDlg, NewBtnHdl, PushButton*, pBtn )
     // unlock the dispatcher so SID_STYLE_NEW can be executed
     // (SetDispatcherLock would affect all Calc documents)
     SfxDispatcher* pDisp = GetBindings().GetDispatcher();
-    BOOL bLocked = pDisp->IsLocked();
+    sal_Bool bLocked = pDisp->IsLocked();
     if (bLocked)
         pDisp->Lock(sal_False);
 
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index 17a984ba0..b050f6dbc 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -119,7 +119,7 @@ IMPL_ABSTDLG_BASE(AbstractScTextImportOptionsDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl); //add for ScAttrDlg, ScHFEditDlg, ScStyleDlg, ScSubTotalDlg,ScCharDlg, ScParagraphDlg, ScValidationDlg, ScSortDlg
 
 // AbstractTabDialog_Impl begin
-void AbstractTabDialog_Impl::SetCurPageId( USHORT nId )
+void AbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId )
 {
     pDlg->SetCurPageId( nId );
 }
@@ -129,7 +129,7 @@ const SfxItemSet* AbstractTabDialog_Impl::GetOutputItemSet() const
     return pDlg->GetOutputItemSet();
 }
 //add by CHINA001
-const USHORT* AbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
+const sal_uInt16* AbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
 {
     return pDlg->GetInputRanges( pItem );
 }
@@ -154,7 +154,7 @@ namespace layout
 IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl); //add for ScAttrDlg, ScHFEditDlg, ScStyleDlg, ScSubTotalDlg,ScCharDlg, ScParagraphDlg, ScValidationDlg, ScSortDlg
 
 // AbstractTabDialog_Impl begin
-void AbstractTabDialog_Impl::SetCurPageId( USHORT nId )
+void AbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId )
 {
     pDlg->SetCurPageId( nId );
 }
@@ -164,7 +164,7 @@ const SfxItemSet* AbstractTabDialog_Impl::GetOutputItemSet() const
     return pDlg->GetOutputItemSet();
 }
 //add by CHINA001
-const USHORT* AbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
+const sal_uInt16* AbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
 {
     return pDlg->GetInputRanges( pItem );
 }
@@ -205,7 +205,7 @@ void AbstractScImportAsciiDlg_Impl::SaveParameters()
 // AbstractScImportAsciiDlg_Impl end
 
 //AbstractScAutoFormatDlg_Impl begin
-USHORT AbstractScAutoFormatDlg_Impl::GetIndex() const
+sal_uInt16 AbstractScAutoFormatDlg_Impl::GetIndex() const
 {
     return pDlg->GetIndex();
 }
@@ -220,11 +220,11 @@ String AbstractScAutoFormatDlg_Impl::GetCurrFormatName()
 
 
 //AbstractScColRowLabelDlg_Impl begin
-BOOL  AbstractScColRowLabelDlg_Impl::IsCol()
+sal_Bool  AbstractScColRowLabelDlg_Impl::IsCol()
 {
     return  pDlg->IsCol();
 }
-BOOL AbstractScColRowLabelDlg_Impl::IsRow()
+sal_Bool AbstractScColRowLabelDlg_Impl::IsRow()
 {
     return pDlg->IsRow();
 }
@@ -244,12 +244,12 @@ void AbstractScDataPilotDatabaseDlg_Impl::GetValues( ScImportSourceDesc& rDesc )
 
 //AbstractScDataPilotSourceTypeDlg_Impl begin
 
-BOOL AbstractScDataPilotSourceTypeDlg_Impl::IsDatabase() const
+sal_Bool AbstractScDataPilotSourceTypeDlg_Impl::IsDatabase() const
 {
     return pDlg->IsDatabase();
 }
 
-BOOL AbstractScDataPilotSourceTypeDlg_Impl::IsExternal() const
+sal_Bool AbstractScDataPilotSourceTypeDlg_Impl::IsExternal() const
 {
     return pDlg->IsExternal();
 }
@@ -294,7 +294,7 @@ void AbstractScDeleteContentsDlg_Impl::DisableObjects()
 {
     pDlg->DisableObjects();
 }
-USHORT	 AbstractScDeleteContentsDlg_Impl::GetDelContentsCmdBits() const
+sal_uInt16	 AbstractScDeleteContentsDlg_Impl::GetDelContentsCmdBits() const
 {
     return pDlg->GetDelContentsCmdBits();
 }
@@ -332,14 +332,14 @@ String	AbstractScFillSeriesDlg_Impl::GetStartStr() const
 {
     return pDlg->GetStartStr();
 }
-void	AbstractScFillSeriesDlg_Impl::SetEdStartValEnabled(BOOL bFlag)
+void	AbstractScFillSeriesDlg_Impl::SetEdStartValEnabled(sal_Bool bFlag)
 {
     pDlg->SetEdStartValEnabled(bFlag);
 }
 //add for AbstractScFillSeriesDlg_Impl end
 
 //add for AbstractScGroupDlg_Impl begin
-BOOL AbstractScGroupDlg_Impl::GetColsChecked() const
+sal_Bool AbstractScGroupDlg_Impl::GetColsChecked() const
 {
     return pDlg->GetColsChecked();
 }
@@ -356,39 +356,39 @@ InsCellCmd  AbstractScInsertCellDlg_Impl::GetInsCellCmd() const
 
 
 //add for AbstractScInsertContentsDlg_Impl begin
-USHORT AbstractScInsertContentsDlg_Impl::GetInsContentsCmdBits() const
+sal_uInt16 AbstractScInsertContentsDlg_Impl::GetInsContentsCmdBits() const
 {
     return pDlg->GetInsContentsCmdBits();
 }
 
 
-USHORT	AbstractScInsertContentsDlg_Impl::GetFormulaCmdBits() const
+sal_uInt16	AbstractScInsertContentsDlg_Impl::GetFormulaCmdBits() const
 {
     return pDlg->GetFormulaCmdBits();
 }
-BOOL	AbstractScInsertContentsDlg_Impl::IsSkipEmptyCells() const
+sal_Bool	AbstractScInsertContentsDlg_Impl::IsSkipEmptyCells() const
 {
     return pDlg->IsSkipEmptyCells();
 }
-BOOL 	AbstractScInsertContentsDlg_Impl::IsLink() const
+sal_Bool 	AbstractScInsertContentsDlg_Impl::IsLink() const
 {
     return pDlg->IsLink();
 }
-void	AbstractScInsertContentsDlg_Impl::SetFillMode( BOOL bSet )
+void	AbstractScInsertContentsDlg_Impl::SetFillMode( sal_Bool bSet )
 {
     pDlg->SetFillMode( bSet );
 }
 
-void	AbstractScInsertContentsDlg_Impl::SetOtherDoc( BOOL bSet )
+void	AbstractScInsertContentsDlg_Impl::SetOtherDoc( sal_Bool bSet )
 {
     pDlg->SetOtherDoc( bSet );
 }
 
-BOOL 	AbstractScInsertContentsDlg_Impl::IsTranspose() const
+sal_Bool 	AbstractScInsertContentsDlg_Impl::IsTranspose() const
 {
     return pDlg->IsTranspose();
 }
-void	AbstractScInsertContentsDlg_Impl::SetChangeTrack( BOOL bSet )
+void	AbstractScInsertContentsDlg_Impl::SetChangeTrack( sal_Bool bSet )
 {
     pDlg->SetChangeTrack( bSet );
 }
@@ -405,16 +405,16 @@ InsCellCmd	AbstractScInsertContentsDlg_Impl::GetMoveMode()
 
 
 //add for AbstractScInsertTableDlg_Impl begin
-BOOL AbstractScInsertTableDlg_Impl::GetTablesFromFile()
+sal_Bool AbstractScInsertTableDlg_Impl::GetTablesFromFile()
 {
     return pDlg->GetTablesFromFile();
 }
 
-BOOL	AbstractScInsertTableDlg_Impl::GetTablesAsLink()
+sal_Bool	AbstractScInsertTableDlg_Impl::GetTablesAsLink()
 {
     return pDlg->GetTablesAsLink();
 }
-const String*	AbstractScInsertTableDlg_Impl::GetFirstTable( USHORT* pN )
+const String*	AbstractScInsertTableDlg_Impl::GetFirstTable( sal_uInt16* pN )
 {
     return pDlg->GetFirstTable( pN );
 }
@@ -422,15 +422,15 @@ ScDocShell*		AbstractScInsertTableDlg_Impl::GetDocShellTables()
 {
     return pDlg->GetDocShellTables();
 }
-BOOL	AbstractScInsertTableDlg_Impl::IsTableBefore()
+sal_Bool	AbstractScInsertTableDlg_Impl::IsTableBefore()
 {
     return pDlg->IsTableBefore();
 }
-USHORT	AbstractScInsertTableDlg_Impl::GetTableCount()
+sal_uInt16	AbstractScInsertTableDlg_Impl::GetTableCount()
 {
     return pDlg->GetTableCount();
 }
-const String*	AbstractScInsertTableDlg_Impl::GetNextTable( USHORT* pN )
+const String*	AbstractScInsertTableDlg_Impl::GetNextTable( sal_uInt16* pN )
 {
     return pDlg->GetNextTable( pN );
 }
@@ -446,7 +446,7 @@ String AbstractScSelEntryDlg_Impl::GetSelectEntry() const
 //add for AbstractScLinkedAreaDlg_Impl begin
 void AbstractScLinkedAreaDlg_Impl::InitFromOldLink( const String& rFile, const String& rFilter,
                                         const String& rOptions, const String& rSource,
-                                        ULONG nRefresh )
+                                        sal_uLong nRefresh )
 {
     pDlg->InitFromOldLink( rFile, rFilter, rOptions, rSource, nRefresh);
 }
@@ -467,7 +467,7 @@ String	AbstractScLinkedAreaDlg_Impl::GetSource()
 {
     return pDlg->GetSource();
 }
-ULONG	AbstractScLinkedAreaDlg_Impl::GetRefresh()
+sal_uLong	AbstractScLinkedAreaDlg_Impl::GetRefresh()
 {
     return pDlg->GetRefresh();
 }
@@ -483,31 +483,31 @@ long AbstractScMetricInputDlg_Impl::GetInputValue( FieldUnit eUnit ) const
 //add for AbstractScMetricInputDlg_Impl end
 
 //add for AbstractScMoveTableDlg_Impl begin
-USHORT AbstractScMoveTableDlg_Impl::GetSelectedDocument() const //add for ScMoveTableDlg
+sal_uInt16 AbstractScMoveTableDlg_Impl::GetSelectedDocument() const //add for ScMoveTableDlg
 {
     return pDlg->GetSelectedDocument();
 }
 
-USHORT	AbstractScMoveTableDlg_Impl::GetSelectedTable() const
+sal_uInt16	AbstractScMoveTableDlg_Impl::GetSelectedTable() const
 {
     return pDlg->GetSelectedTable();
 }
-BOOL	AbstractScMoveTableDlg_Impl::GetCopyTable() const
+sal_Bool	AbstractScMoveTableDlg_Impl::GetCopyTable() const
 {
     return pDlg->GetCopyTable();
 }
-void	AbstractScMoveTableDlg_Impl::SetCopyTable(BOOL bFla)
+void	AbstractScMoveTableDlg_Impl::SetCopyTable(sal_Bool bFla)
 {
     return pDlg->SetCopyTable( bFla );
 }
-void	AbstractScMoveTableDlg_Impl::EnableCopyTable(BOOL bFlag)
+void	AbstractScMoveTableDlg_Impl::EnableCopyTable(sal_Bool bFlag)
 {
     return pDlg->EnableCopyTable( bFlag);
 }
 //add for AbstractScMoveTableDlg_Impl end
 
 //add for AbstractScNameCreateDlg_Impl begin
-USHORT AbstractScNameCreateDlg_Impl::GetFlags() const  //add for ScNameCreateDlg
+sal_uInt16 AbstractScNameCreateDlg_Impl::GetFlags() const  //add for ScNameCreateDlg
 {
     return pDlg->GetFlags();
 }
@@ -529,7 +529,7 @@ const ScQueryItem&	 AbstractScPivotFilterDlg_Impl::GetOutputItem()  //add for Sc
 //add for AbstractScPivotFilterDlg_Impl end
 
 //add for AbstractScDPFunctionDlg_Impl begin
-USHORT AbstractScDPFunctionDlg_Impl::GetFuncMask() const //add for ScDPFunctionDlg
+sal_uInt16 AbstractScDPFunctionDlg_Impl::GetFuncMask() const //add for ScDPFunctionDlg
 {
      return pDlg->GetFuncMask();
 }
@@ -540,7 +540,7 @@ USHORT AbstractScDPFunctionDlg_Impl::GetFuncMask() const //add for ScDPFunctionD
 //add for AbstractScDPFunctionDlg_Impl end
 
 //add for AbstractScDPSubtotalDlg_Impl begin
-USHORT AbstractScDPSubtotalDlg_Impl::GetFuncMask() const //add for ScDPSubtotalDlg
+sal_uInt16 AbstractScDPSubtotalDlg_Impl::GetFuncMask() const //add for ScDPSubtotalDlg
 {
      return pDlg->GetFuncMask();
 }
@@ -574,13 +574,13 @@ String AbstractScDPShowDetailDlg_Impl::GetDimensionName() const
 
 //add for AbstractScNewScenarioDlg_Impl begin
 void AbstractScNewScenarioDlg_Impl::SetScenarioData( const String& rName, const String& rComment,
-                            const Color& rColor, USHORT nFlags )
+                            const Color& rColor, sal_uInt16 nFlags )
 {
     pDlg->SetScenarioData(rName,rComment, rColor,nFlags);
 }
 
 void AbstractScNewScenarioDlg_Impl::GetScenarioData( String& rName, String& rComment,
-                            Color& rColor, USHORT& rFlags ) const
+                            Color& rColor, sal_uInt16& rFlags ) const
 {
     pDlg->GetScenarioData( rName,rComment,rColor,rFlags);
 }
@@ -588,12 +588,12 @@ void AbstractScNewScenarioDlg_Impl::GetScenarioData( String& rName, String& rCom
 //add for AbstractScNewScenarioDlg_Impl end
 
 //add for  AbstractScShowTabDlg_Impl begin
-void AbstractScShowTabDlg_Impl::Insert( const String& rString, BOOL bSelected )  //add for ScShowTabDlg
+void AbstractScShowTabDlg_Impl::Insert( const String& rString, sal_Bool bSelected )  //add for ScShowTabDlg
 {
     pDlg->Insert( rString, bSelected);
 }
 
-USHORT	AbstractScShowTabDlg_Impl::GetSelectEntryCount() const
+sal_uInt16	AbstractScShowTabDlg_Impl::GetSelectEntryCount() const
 {
     return pDlg->GetSelectEntryCount();
 }
@@ -603,11 +603,11 @@ void	AbstractScShowTabDlg_Impl::SetDescription(
 {
     pDlg->SetDescription( rTitle, rFixedText, sDlgHelpId, sLbHelpId );
 }
-USHORT  AbstractScShowTabDlg_Impl::GetSelectEntryPos(USHORT nPos) const
+sal_uInt16  AbstractScShowTabDlg_Impl::GetSelectEntryPos(sal_uInt16 nPos) const
 {
     return pDlg->GetSelectEntryPos( nPos);
 }
-String	 AbstractScShowTabDlg_Impl::GetSelectEntry(USHORT nPos) const
+String	 AbstractScShowTabDlg_Impl::GetSelectEntry(sal_uInt16 nPos) const
 {
         return pDlg->GetSelectEntry(nPos);
 }
@@ -713,8 +713,8 @@ AbstractScAutoFormatDlg * ScAbstractDialogFactory_Impl::CreateScAutoFormatDlg( W
 
 AbstractScColRowLabelDlg *  ScAbstractDialogFactory_Impl::CreateScColRowLabelDlg(Window* pParent, //add for ScColRowLabelDlg
                                                                 int nId,
-                                                                BOOL bCol ,
-                                                                BOOL bRow)
+                                                                sal_Bool bCol ,
+                                                                sal_Bool bRow)
 {
     ScColRowLabelDlg* pDlg=NULL;
     switch ( nId )
@@ -739,7 +739,7 @@ VclAbstractDialog *  ScAbstractDialogFactory_Impl::CreateScColOrRowDlg(Window*
                                                     const String&	rStrTitle,
                                                     const String&	rStrLabel,
                                                     int nId,
-                                                    BOOL				bColDefault)
+                                                    sal_Bool				bColDefault)
 {
     Dialog * pDlg=NULL;
     switch ( nId )
@@ -799,7 +799,7 @@ AbstractScDataPilotDatabaseDlg *  ScAbstractDialogFactory_Impl::CreateScDataPilo
 
 //add for ScDataPilotSourceTypeDlg begin
 AbstractScDataPilotSourceTypeDlg* ScAbstractDialogFactory_Impl::CreateScDataPilotSourceTypeDlg( Window* pParent,
-                                                                                               BOOL bEnableExternal,
+                                                                                               sal_Bool bEnableExternal,
                                                                                                int nId )
 {
     ScDataPilotSourceTypeDlg * pDlg=NULL;
@@ -844,7 +844,7 @@ AbstractScDataPilotServiceDlg* ScAbstractDialogFactory_Impl::CreateScDataPilotSe
 
 //add for ScDeleteCellDlg begin
 AbstractScDeleteCellDlg* ScAbstractDialogFactory_Impl::CreateScDeleteCellDlg( Window* pParent, int nId,
-                                                                             BOOL bDisallowCellMove )
+                                                                             sal_Bool bDisallowCellMove )
 {
     ScDeleteCellDlg * pDlg=NULL;
     switch ( nId )
@@ -865,7 +865,7 @@ AbstractScDeleteCellDlg* ScAbstractDialogFactory_Impl::CreateScDeleteCellDlg( Wi
 
 //add for ScDeleteContentsDlg begin
 AbstractScDeleteContentsDlg* ScAbstractDialogFactory_Impl::CreateScDeleteContentsDlg(Window* pParent,int nId, //add for ScDeleteContentsDlg
-                                                                 USHORT  nCheckDefaults )
+                                                                 sal_uInt16  nCheckDefaults )
 {
     ScDeleteContentsDlg * pDlg=NULL;
     switch ( nId )
@@ -893,7 +893,7 @@ AbstractScFillSeriesDlg* ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg( Wi
                                                             String			aStartStr,
                                                             double			fStep,
                                                             double			fMax,
-                                                            USHORT			nPossDir,
+                                                            sal_uInt16			nPossDir,
                                                             int nId)
 {
     ScFillSeriesDlg * pDlg=NULL;
@@ -915,10 +915,10 @@ AbstractScFillSeriesDlg* ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg( Wi
 
 //add for ScGroupDlg begin
 AbstractScGroupDlg* ScAbstractDialogFactory_Impl::CreateAbstractScGroupDlg( Window* pParent,
-                                                            USHORT	nResId,
+                                                            sal_uInt16	nResId,
                                                             int nId,
-                                                            BOOL	bUnGroup ,
-                                                            BOOL	bRows   )
+                                                            sal_Bool	bUnGroup ,
+                                                            sal_Bool	bRows   )
 {
     ScGroupDlg * pDlg=NULL;
     switch ( nId )
@@ -942,7 +942,7 @@ AbstractScGroupDlg* ScAbstractDialogFactory_Impl::CreateAbstractScGroupDlg( Wind
 //add for ScInsertCellDlg begin
 AbstractScInsertCellDlg * ScAbstractDialogFactory_Impl::CreateScInsertCellDlg( Window* pParent, //add for ScInsertCellDlg
                                                                 int nId,
-                                                            BOOL bDisallowCellMove )
+                                                            sal_Bool bDisallowCellMove )
 {
     ScInsertCellDlg * pDlg=NULL;
     switch ( nId )
@@ -964,7 +964,7 @@ AbstractScInsertCellDlg * ScAbstractDialogFactory_Impl::CreateScInsertCellDlg( W
 //add for ScInsertContentsDlg begin
 AbstractScInsertContentsDlg * ScAbstractDialogFactory_Impl::CreateScInsertContentsDlg( Window*		pParent,
                                                                                     int nId,
-                                                                                    USHORT  		nCheckDefaults,
+                                                                                    sal_uInt16  		nCheckDefaults,
                                                                                     const String*	pStrTitle )
 {
     ScInsertContentsDlg * pDlg=NULL;
@@ -1005,7 +1005,7 @@ AbstractScInsertTableDlg * ScAbstractDialogFactory_Impl::CreateScInsertTableDlg
 
 // add for ScSelEntryDlg begin
 AbstractScSelEntryDlg * ScAbstractDialogFactory_Impl::CreateScSelEntryDlg ( Window* pParent,
-                                                            USHORT	nResId,
+                                                            sal_uInt16	nResId,
                                                         const String& aTitle,
                                                         const String& aLbTitle,
                                                                 List& 	aEntryList,
@@ -1049,12 +1049,12 @@ AbstractScLinkedAreaDlg * ScAbstractDialogFactory_Impl::CreateScLinkedAreaDlg (
 
 //add for ScMetricInputDlg begin
 AbstractScMetricInputDlg * ScAbstractDialogFactory_Impl::CreateScMetricInputDlg (  Window*		pParent,
-                                                                USHORT		nResId,		// Ableitung fuer jeden Dialog!
+                                                                sal_uInt16		nResId,		// Ableitung fuer jeden Dialog!
                                                                 long			nCurrent,
                                                                 long			nDefault,
                                                                 int nId ,
                                                                 FieldUnit		eFUnit,
-                                                                USHORT		nDecimals,
+                                                                sal_uInt16		nDecimals,
                                                                 long			nMaximum ,
                                                                 long			nMinimum,
                                                                 long			nFirst,
@@ -1102,7 +1102,7 @@ AbstractScMoveTableDlg * ScAbstractDialogFactory_Impl::CreateScMoveTableDlg(  Wi
 
 
 //add for ScNameCreateDlg begin
-AbstractScNameCreateDlg * ScAbstractDialogFactory_Impl::CreateScNameCreateDlg ( Window * pParent, USHORT nFlags, int nId )
+AbstractScNameCreateDlg * ScAbstractDialogFactory_Impl::CreateScNameCreateDlg ( Window * pParent, sal_uInt16 nFlags, int nId )
 {
     ScNameCreateDlg * pDlg=NULL;
     switch ( nId )
@@ -1123,7 +1123,7 @@ AbstractScNameCreateDlg * ScAbstractDialogFactory_Impl::CreateScNameCreateDlg (
 
 //add for ScNamePasteDlg begin
  AbstractScNamePasteDlg * ScAbstractDialogFactory_Impl::CreateScNamePasteDlg ( Window * pParent, const ScRangeName* pList,
-                                                            int nId , BOOL bInsList )
+                                                            int nId , sal_Bool bInsList )
 {
     ScNamePasteDlg * pDlg=NULL;
     switch ( nId )
@@ -1143,7 +1143,7 @@ AbstractScNameCreateDlg * ScAbstractDialogFactory_Impl::CreateScNameCreateDlg (
 
 //add for ScPivotFilterDlg begin
 AbstractScPivotFilterDlg * ScAbstractDialogFactory_Impl::CreateScPivotFilterDlg ( Window* pParent,
-                                                                const SfxItemSet&	rArgSet, USHORT nSourceTab , int nId )
+                                                                const SfxItemSet&	rArgSet, sal_uInt16 nSourceTab , int nId )
 {
     ScPivotFilterDlg * pDlg=NULL;
     switch ( nId )
@@ -1229,7 +1229,7 @@ AbstractScDPDateGroupDlg * ScAbstractDialogFactory_Impl::CreateScDPDateGroupDlg(
 
 //add for ScDPShowDetailDlg begin
 AbstractScDPShowDetailDlg * ScAbstractDialogFactory_Impl::CreateScDPShowDetailDlg (
-        Window* pParent, int nId, ScDPObject& rDPObj, USHORT nOrient )
+        Window* pParent, int nId, ScDPObject& rDPObj, sal_uInt16 nOrient )
 {
     if( nId == RID_SCDLG_DPSHOWDETAIL )
         return new AbstractScDPShowDetailDlg_Impl( new ScDPShowDetailDlg( pParent, rDPObj, nOrient ) );
@@ -1240,7 +1240,7 @@ AbstractScDPShowDetailDlg * ScAbstractDialogFactory_Impl::CreateScDPShowDetailDl
 //add for ScNewScenarioDlg begin
 AbstractScNewScenarioDlg * ScAbstractDialogFactory_Impl::CreateScNewScenarioDlg ( Window* pParent, const String& rName,
                                                                 int nId,
-                                                                BOOL bEdit , BOOL bSheetProtected )
+                                                                sal_Bool bEdit , sal_Bool bSheetProtected )
 {
     ScNewScenarioDlg * pDlg=NULL;
     switch ( nId )
@@ -1331,12 +1331,12 @@ return 0;
 //add for ScImportOptionsDlg begin
 AbstractScImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScImportOptionsDlg ( Window* 				pParent,
                                                                     int nId,
-                                                                    BOOL                    bAscii,
+                                                                    sal_Bool                    bAscii,
                                                                     const ScImportOptions*	pOptions,
                                                                     const String*			pStrTitle,
-                                                                    BOOL                    bMultiByte,
-                                                                    BOOL                    bOnlyDbtoolsEncodings,
-                                                                    BOOL                    bImport )
+                                                                    sal_Bool                    bMultiByte,
+                                                                    sal_Bool                    bOnlyDbtoolsEncodings,
+                                                                    sal_Bool                    bImport )
 {
     ScImportOptionsDlg * pDlg=NULL;
     switch ( nId )
@@ -1389,7 +1389,7 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg( SfxViewF
                                                                         const SfxItemSet&	rCoreSet,
                                                                         const String&		rPageStyle,
                                                                         int nId,
-                                                                        USHORT				nResId )
+                                                                        sal_uInt16				nResId )
 {
     SfxTabDialog* pDlg=NULL;
     switch ( nId )
@@ -1410,7 +1410,7 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg( SfxViewF
 //add for ScStyleDlg begin
 SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScStyleDlg( Window*				pParent,
                                                                         SfxStyleSheetBase&	rStyleBase,
-                                                                        USHORT				nRscId,
+                                                                        sal_uInt16				nRscId,
                                                                         int nId)
 {
     SfxTabDialog* pDlg=NULL;
@@ -1544,7 +1544,7 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSortDlg( Window*
 
 //add for ScSortDlg end
 //------------------ Factories for TabPages--------------------
-CreateTabPage ScAbstractDialogFactory_Impl::GetTabPageCreatorFunc( USHORT nId )
+CreateTabPage ScAbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nId )
 {
     switch ( nId )
     {
@@ -1577,7 +1577,7 @@ CreateTabPage ScAbstractDialogFactory_Impl::GetTabPageCreatorFunc( USHORT nId )
     return 0;
 }
 
-GetTabPageRanges ScAbstractDialogFactory_Impl::GetTabPageRangesFunc( USHORT nId )
+GetTabPageRanges ScAbstractDialogFactory_Impl::GetTabPageRangesFunc( sal_uInt16 nId )
 {
     switch ( nId )
     {
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index ff51de359..3a628423d 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -72,7 +72,7 @@ public:												\
                      {}                             \
     virtual			~Class();               		\
     virtual short	Execute() ;
-//	virtual void	Show( BOOL bVisible = TRUE, USHORT nFlags = 0 )
+//	virtual void	Show( sal_Bool bVisible = sal_True, sal_uInt16 nFlags = 0 )
 
 #define DECL_ABSTDLG2_BASE(Class,DialogClass)        \
     DialogClass*        pDlg;                       \
@@ -124,15 +124,15 @@ class AbstractScImportAsciiDlg_Impl : public AbstractScImportAsciiDlg  //add for
 class AbstractScAutoFormatDlg_Impl : public AbstractScAutoFormatDlg  //add for ScAutoFormatDlg
 {
     DECL_ABSTDLG_BASE(AbstractScAutoFormatDlg_Impl, ScAutoFormatDlg)
-    virtual USHORT GetIndex() const;
+    virtual sal_uInt16 GetIndex() const;
     virtual String GetCurrFormatName();
 };
 
 class AbstractScColRowLabelDlg_Impl : public AbstractScColRowLabelDlg  //add for ScColRowLabelDlg
 {
     DECL_ABSTDLG_BASE(AbstractScColRowLabelDlg_Impl,ScColRowLabelDlg)
-    virtual BOOL IsCol();
-    virtual BOOL IsRow();
+    virtual sal_Bool IsCol();
+    virtual sal_Bool IsRow();
 };
 
 class AbstractScDataPilotDatabaseDlg_Impl  :public AbstractScDataPilotDatabaseDlg  //add for ScDataPilotDatabaseDlg
@@ -144,8 +144,8 @@ class AbstractScDataPilotDatabaseDlg_Impl  :public AbstractScDataPilotDatabaseDl
 class AbstractScDataPilotSourceTypeDlg_Impl  :public AbstractScDataPilotSourceTypeDlg  //add for ScDataPilotSourceTypeDlg
 {
     DECL_ABSTDLG_BASE(AbstractScDataPilotSourceTypeDlg_Impl, ScDataPilotSourceTypeDlg)
-    virtual BOOL	IsDatabase() const;
-    virtual BOOL	IsExternal() const;
+    virtual sal_Bool	IsDatabase() const;
+    virtual sal_Bool	IsExternal() const;
 };
 
 class AbstractScDataPilotServiceDlg_Impl : public AbstractScDataPilotServiceDlg  //add for ScDataPilotServiceDlg
@@ -168,7 +168,7 @@ class AbstractScDeleteContentsDlg_Impl : public AbstractScDeleteContentsDlg  //a
 {
     DECL_ABSTDLG_BASE( AbstractScDeleteContentsDlg_Impl,ScDeleteContentsDlg)
     virtual void	DisableObjects();
-    virtual USHORT	GetDelContentsCmdBits() const;
+    virtual sal_uInt16	GetDelContentsCmdBits() const;
 };
 
 class AbstractScFillSeriesDlg_Impl:public AbstractScFillSeriesDlg  //add for ScFillSeriesDlg
@@ -181,13 +181,13 @@ class AbstractScFillSeriesDlg_Impl:public AbstractScFillSeriesDlg  //add for ScF
     virtual double		GetStep() const;
     virtual double		GetMax() const;
     virtual String		GetStartStr() const;
-    virtual void		SetEdStartValEnabled(BOOL bFlag=FALSE);
+    virtual void		SetEdStartValEnabled(sal_Bool bFlag=sal_False);
 };
 
 class AbstractScGroupDlg_Impl :  public AbstractScGroupDlg  //add for ScGroupDlg
 {
     DECL_ABSTDLG_BASE( AbstractScGroupDlg_Impl, ScGroupDlg)
-    virtual BOOL GetColsChecked() const;
+    virtual sal_Bool GetColsChecked() const;
 };
 
 class AbstractScInsertCellDlg_Impl : public AbstractScInsertCellDlg  //add for ScInsertCellDlg
@@ -199,14 +199,14 @@ class AbstractScInsertCellDlg_Impl : public AbstractScInsertCellDlg  //add for S
 class AbstractScInsertContentsDlg_Impl : public AbstractScInsertContentsDlg  //add for ScInsertContentsDlg
 {
     DECL_ABSTDLG_BASE(AbstractScInsertContentsDlg_Impl, ScInsertContentsDlg)
-    virtual USHORT		GetInsContentsCmdBits() const;
-    virtual USHORT		GetFormulaCmdBits() const;
-    virtual BOOL		IsSkipEmptyCells() const;
-    virtual BOOL 		IsLink() const;
-    virtual void	SetFillMode( BOOL bSet );
-    virtual void	SetOtherDoc( BOOL bSet );
-    virtual BOOL 		IsTranspose() const;
-    virtual void	SetChangeTrack( BOOL bSet );
+    virtual sal_uInt16		GetInsContentsCmdBits() const;
+    virtual sal_uInt16		GetFormulaCmdBits() const;
+    virtual sal_Bool		IsSkipEmptyCells() const;
+    virtual sal_Bool 		IsLink() const;
+    virtual void	SetFillMode( sal_Bool bSet );
+    virtual void	SetOtherDoc( sal_Bool bSet );
+    virtual sal_Bool 		IsTranspose() const;
+    virtual void	SetChangeTrack( sal_Bool bSet );
     virtual void	SetCellShiftDisabled( int nDisable );
     virtual InsCellCmd	GetMoveMode();
 };
@@ -214,13 +214,13 @@ class AbstractScInsertContentsDlg_Impl : public AbstractScInsertContentsDlg  //a
 class AbstractScInsertTableDlg_Impl : public AbstractScInsertTableDlg  //add for ScInsertTableDlg
 {
     DECL_ABSTDLG_BASE( AbstractScInsertTableDlg_Impl, ScInsertTableDlg)
-    virtual BOOL			GetTablesFromFile();
-    virtual BOOL			GetTablesAsLink();
-    virtual const String*	GetFirstTable( USHORT* pN = NULL );
+    virtual sal_Bool			GetTablesFromFile();
+    virtual sal_Bool			GetTablesAsLink();
+    virtual const String*	GetFirstTable( sal_uInt16* pN = NULL );
     virtual ScDocShell*		GetDocShellTables();
-    virtual BOOL			IsTableBefore();
-    virtual USHORT			GetTableCount();
-    virtual const String*	GetNextTable( USHORT* pN = NULL );
+    virtual sal_Bool			IsTableBefore();
+    virtual sal_uInt16			GetTableCount();
+    virtual const String*	GetNextTable( sal_uInt16* pN = NULL );
 
 };
 
@@ -236,12 +236,12 @@ class AbstractScLinkedAreaDlg_Impl : public AbstractScLinkedAreaDlg  //add for S
 
     virtual void			InitFromOldLink( const String& rFile, const String& rFilter,
                                         const String& rOptions, const String& rSource,
-                                        ULONG nRefresh );
+                                        sal_uLong nRefresh );
     virtual String			GetURL();
     virtual String			GetFilter();		// may be empty
     virtual String			GetOptions();		// filter options
     virtual String			GetSource();		// separated by ";"
-    virtual ULONG			GetRefresh();		// 0 if disabled
+    virtual sal_uLong			GetRefresh();		// 0 if disabled
 };
 
 class AbstractScMetricInputDlg_Impl : public AbstractScMetricInputDlg  //add for ScMetricInputDlg
@@ -253,17 +253,17 @@ class AbstractScMetricInputDlg_Impl : public AbstractScMetricInputDlg  //add for
 class AbstractScMoveTableDlg_Impl : public AbstractScMoveTableDlg  //add for ScMoveTableDlg
 {
     DECL_ABSTDLG_BASE( AbstractScMoveTableDlg_Impl, ScMoveTableDlg)
-    virtual USHORT	GetSelectedDocument		() const;
-    virtual USHORT	GetSelectedTable		() const;
-    virtual BOOL	GetCopyTable			() const;
-    virtual void	SetCopyTable			(BOOL bFlag=TRUE);
-    virtual void	EnableCopyTable			(BOOL bFlag=TRUE);
+    virtual sal_uInt16	GetSelectedDocument		() const;
+    virtual sal_uInt16	GetSelectedTable		() const;
+    virtual sal_Bool	GetCopyTable			() const;
+    virtual void	SetCopyTable			(sal_Bool bFlag=sal_True);
+    virtual void	EnableCopyTable			(sal_Bool bFlag=sal_True);
 };
 
 class AbstractScNameCreateDlg_Impl : public AbstractScNameCreateDlg  //add for ScNameCreateDlg
 {
     DECL_ABSTDLG_BASE( AbstractScNameCreateDlg_Impl, ScNameCreateDlg)
-    virtual USHORT			GetFlags() const;
+    virtual sal_uInt16			GetFlags() const;
 };
 
 class AbstractScNamePasteDlg_Impl : public AbstractScNamePasteDlg  //add for ScNamePasteDlg
@@ -281,14 +281,14 @@ class AbstractScPivotFilterDlg_Impl : public AbstractScPivotFilterDlg  //add for
 class AbstractScDPFunctionDlg_Impl : public AbstractScDPFunctionDlg  //add for ScDPFunctionDlg
 {
     DECL_ABSTDLG_BASE( AbstractScDPFunctionDlg_Impl, ScDPFunctionDlg)
-    virtual USHORT GetFuncMask() const;
+    virtual sal_uInt16 GetFuncMask() const;
     virtual ::com::sun::star::sheet::DataPilotFieldReference GetFieldRef() const;
 };
 
 class AbstractScDPSubtotalDlg_Impl : public AbstractScDPSubtotalDlg  //add for ScDPSubtotalDlg
 {
     DECL_ABSTDLG_BASE( AbstractScDPSubtotalDlg_Impl, ScDPSubtotalDlg)
-    virtual USHORT GetFuncMask() const;
+    virtual sal_uInt16 GetFuncMask() const;
     virtual void FillLabelData( ScDPLabelData& rLabelData ) const;
 };
 
@@ -315,20 +315,20 @@ class AbstractScNewScenarioDlg_Impl : public AbstractScNewScenarioDlg  //add for
 {
     DECL_ABSTDLG_BASE( AbstractScNewScenarioDlg_Impl, ScNewScenarioDlg )
     virtual void SetScenarioData( const String& rName, const String& rComment,
-                            const Color& rColor, USHORT nFlags );
+                            const Color& rColor, sal_uInt16 nFlags );
 
     virtual void GetScenarioData( String& rName, String& rComment,
-                            Color& rColor, USHORT& rFlags ) const;
+                            Color& rColor, sal_uInt16& rFlags ) const;
 };
 
 class AbstractScShowTabDlg_Impl : public AbstractScShowTabDlg  //add for ScShowTabDlg
 {
     DECL_ABSTDLG_BASE(AbstractScShowTabDlg_Impl,ScShowTabDlg)
-    virtual void    Insert( const String& rString, BOOL bSelected );
-    virtual USHORT	GetSelectEntryCount() const;
+    virtual void    Insert( const String& rString, sal_Bool bSelected );
+    virtual sal_uInt16	GetSelectEntryCount() const;
     virtual void SetDescription(const String& rTitle, const String& rFixedText, const rtl::OString& sDlgHelpId, const rtl::OString& sLbHelpId );
-    virtual String	GetSelectEntry(USHORT nPos) const;
-    virtual USHORT  GetSelectEntryPos(USHORT nPos) const;
+    virtual String	GetSelectEntry(sal_uInt16 nPos) const;
+    virtual sal_uInt16  GetSelectEntryPos(sal_uInt16 nPos) const;
 };
 
 class AbstractScStringInputDlg_Impl :  public AbstractScStringInputDlg  //add for ScStringInputDlg
@@ -360,9 +360,9 @@ class AbstractScTextImportOptionsDlg_Impl : public AbstractScTextImportOptionsDl
 class AbstractTabDialog_Impl : public SfxAbstractTabDialog
 {
     DECL_ABSTDLG_BASE( AbstractTabDialog_Impl,SfxTabDialog )
-    virtual void				SetCurPageId( USHORT nId );
+    virtual void				SetCurPageId( sal_uInt16 nId );
     virtual const SfxItemSet* 	GetOutputItemSet() const;
-    virtual const USHORT*		GetInputRanges( const SfxItemPool& pItem );	//add by CHINA001
+    virtual const sal_uInt16*		GetInputRanges( const SfxItemPool& pItem );	//add by CHINA001
     virtual void				SetInputSet( const SfxItemSet* pInSet );   //add by CHINA001
         //From class Window.
     virtual void		SetText( const XubString& rStr ); //add by CHINA001
@@ -375,9 +375,9 @@ namespace layout
 class AbstractTabDialog_Impl : public SfxAbstractTabDialog
 {
     DECL_ABSTDLG_BASE( AbstractTabDialog_Impl,SfxTabDialog )
-    virtual void				SetCurPageId( USHORT nId );
+    virtual void				SetCurPageId( sal_uInt16 nId );
     virtual const SfxItemSet* 	GetOutputItemSet() const;
-    virtual const USHORT*		GetInputRanges( const SfxItemPool& pItem );	//add by CHINA001
+    virtual const sal_uInt16*		GetInputRanges( const SfxItemPool& pItem );	//add by CHINA001
     virtual void				SetInputSet( const SfxItemSet* pInSet );   //add by CHINA001
         //From class Window.
     virtual void		SetText( const XubString& rStr ); //add by CHINA001
@@ -406,29 +406,29 @@ public:
                                                                 int nId);
     virtual AbstractScColRowLabelDlg * CreateScColRowLabelDlg (Window* pParent, //add for ScColRowLabelDlg
                                                                 int nId,
-                                                                BOOL bCol = FALSE,
-                                                                BOOL bRow = FALSE);
+                                                                sal_Bool bCol = sal_False,
+                                                                sal_Bool bRow = sal_False);
 
     virtual VclAbstractDialog * CreateScColOrRowDlg( Window*			pParent, //add for ScColOrRowDlg
                                                     const String&	rStrTitle,
                                                     const String&	rStrLabel,
                                                     int nId,
-                                                    BOOL				bColDefault = TRUE );
+                                                    sal_Bool				bColDefault = sal_True );
 
     virtual VclAbstractDialog * CreateScSortWarningDlg( Window* pParent, const String& rExtendText, const String& rCurrentText, int nId );
 
     virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg (Window* pParent ,int nId ); //add for ScDataPilotDatabaseDlg
 
-    virtual AbstractScDataPilotSourceTypeDlg * CreateScDataPilotSourceTypeDlg (  Window* pParent, BOOL bEnableExternal, int nId ) ; //add for ScDataPilotSourceTypeDlg
+    virtual AbstractScDataPilotSourceTypeDlg * CreateScDataPilotSourceTypeDlg (  Window* pParent, sal_Bool bEnableExternal, int nId ) ; //add for ScDataPilotSourceTypeDlg
 
     virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( Window* pParent, //add for ScDataPilotServiceDlg
                                                                         const com::sun::star::uno::Sequence<rtl::OUString>& rServices,
                                                                         int nId );
     virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg( Window* pParent, int nId,
-                                                            BOOL bDisallowCellMove = FALSE ); //add for ScDeleteCellDlg
+                                                            sal_Bool bDisallowCellMove = sal_False ); //add for ScDeleteCellDlg
 
     virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent,int nId, //add for ScDeleteContentsDlg
-                                                                 USHORT  nCheckDefaults = 0 );
+                                                                 sal_uInt16  nCheckDefaults = 0 );
 
     virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( Window*		pParent, //add for ScFillSeriesDlg
                                                             ScDocument&	rDocument,
@@ -438,28 +438,28 @@ public:
                                                             String			aStartStr,
                                                             double			fStep,
                                                             double			fMax,
-                                                            USHORT			nPossDir,
+                                                            sal_uInt16			nPossDir,
                                                             int nId);
     virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( Window* pParent, //add for ScGroupDlg
-                                                            USHORT	nResId,
+                                                            sal_uInt16	nResId,
                                                             int nId,
-                                                            BOOL	bUnGroup = FALSE,
-                                                            BOOL	bRows    = TRUE  );
+                                                            sal_Bool	bUnGroup = sal_False,
+                                                            sal_Bool	bRows    = sal_True  );
 
     virtual AbstractScInsertCellDlg * CreateScInsertCellDlg( Window* pParent, //add for ScInsertCellDlg
                                                                 int nId,
-                                                            BOOL bDisallowCellMove = FALSE );
+                                                            sal_Bool bDisallowCellMove = sal_False );
 
     virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( Window*		pParent, //add for ScInsertContentsDlg
                                                                     int nId,
-                                                                    USHORT  		nCheckDefaults = 0,
+                                                                    sal_uInt16  		nCheckDefaults = 0,
                                                                     const String*	pStrTitle = NULL );
 
     virtual AbstractScInsertTableDlg * CreateScInsertTableDlg ( Window* pParent, ScViewData& rViewData,  //add for ScInsertTableDlg
                                                                 SCTAB nTabCount, bool bFromFile, int nId);
 
     virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( Window* pParent, // add for ScSelEntryDlg
-                                                            USHORT	nResId,
+                                                            sal_uInt16	nResId,
                                                         const String& aTitle,
                                                         const String& aLbTitle,
                                                                 List& 	aEntryList,
@@ -469,25 +469,25 @@ public:
                                                                 int nId);
 
     virtual AbstractScMetricInputDlg * CreateScMetricInputDlg (  Window*		pParent, //add for ScMetricInputDlg
-                                                                USHORT		nResId,		// Ableitung fuer jeden Dialog!
+                                                                sal_uInt16		nResId,		// Ableitung fuer jeden Dialog!
                                                                 long			nCurrent,
                                                                 long			nDefault,
                                                                 int nId ,
                                                                 FieldUnit		eFUnit	  = FUNIT_MM,
-                                                                USHORT		nDecimals = 2,
+                                                                sal_uInt16		nDecimals = 2,
                                                                 long			nMaximum  = 1000,
                                                                 long			nMinimum  = 0,
                                                                 long			nFirst	  = 1,
                                                                 long          nLast     = 100 );
 
     virtual AbstractScMoveTableDlg * CreateScMoveTableDlg(  Window* pParent, int nId ); //add for ScMoveTableDlg
-    virtual AbstractScNameCreateDlg * CreateScNameCreateDlg ( Window * pParent, USHORT nFlags, int nId ); //add for ScNameCreateDlg
+    virtual AbstractScNameCreateDlg * CreateScNameCreateDlg ( Window * pParent, sal_uInt16 nFlags, int nId ); //add for ScNameCreateDlg
 
     virtual AbstractScNamePasteDlg * CreateScNamePasteDlg ( Window * pParent, const ScRangeName* pList, //add for ScNamePasteDlg
-                                                            int nId , BOOL bInsList=TRUE );
+                                                            int nId , sal_Bool bInsList=sal_True );
 
     virtual AbstractScPivotFilterDlg * CreateScPivotFilterDlg ( Window* pParent, //add for ScPivotFilterDlg
-                                                                const SfxItemSet&	rArgSet, USHORT nSourceTab , int nId );
+                                                                const SfxItemSet&	rArgSet, sal_uInt16 nSourceTab , int nId );
 
     virtual AbstractScDPFunctionDlg * CreateScDPFunctionDlg( Window* pParent, int nId,
                                                                 const ScDPLabelDataVector& rLabelVec,
@@ -513,11 +513,11 @@ public:
 
     virtual AbstractScDPShowDetailDlg * CreateScDPShowDetailDlg( Window* pParent, int nId,
                                                                 ScDPObject& rDPObj,
-                                                                USHORT nOrient );
+                                                                sal_uInt16 nOrient );
 
     virtual AbstractScNewScenarioDlg * CreateScNewScenarioDlg ( Window* pParent, const String& rName, //add for ScNewScenarioDlg
                                                                 int nId,
-                                                                BOOL bEdit = FALSE, BOOL bSheetProtected = FALSE );
+                                                                sal_Bool bEdit = sal_False, sal_Bool bSheetProtected = sal_False );
     virtual AbstractScShowTabDlg * CreateScShowTabDlg ( Window* pParent, int nId ); //add for ScShowTabDlg
 
     virtual AbstractScStringInputDlg * CreateScStringInputDlg (  Window* pParent, //add for ScStringInputDlg
@@ -536,12 +536,12 @@ public:
 
     virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window* 				pParent, //add for ScImportOptionsDlg
                                                                     int nId,
-                                                                    BOOL                    bAscii = TRUE,
+                                                                    sal_Bool                    bAscii = sal_True,
                                                                     const ScImportOptions*	pOptions = NULL,
                                                                     const String*			pStrTitle = NULL,
-                                                                    BOOL                    bMultiByte = FALSE,
-                                                                    BOOL                    bOnlyDbtoolsEncodings = FALSE,
-                                                                    BOOL                    bImport = TRUE );
+                                                                    sal_Bool                    bMultiByte = sal_False,
+                                                                    sal_Bool                    bOnlyDbtoolsEncodings = sal_False,
+                                                                    sal_Bool                    bImport = sal_True );
     virtual SfxAbstractTabDialog * CreateScAttrDlg( SfxViewFrame*	 pFrame, //add for ScAttrDlg
                                                     Window*			 pParent,
                                                     const SfxItemSet* pCellAttrs,
@@ -552,11 +552,11 @@ public:
                                                     const SfxItemSet&	rCoreSet,
                                                     const String&		rPageStyle,
                                                     int nId,
-                                                    USHORT				nResId = RID_SCDLG_HFEDIT );
+                                                    sal_uInt16				nResId = RID_SCDLG_HFEDIT );
 
     virtual SfxAbstractTabDialog * CreateScStyleDlg( Window*				pParent,//add for ScStyleDlg
                                                     SfxStyleSheetBase&	rStyleBase,
-                                                    USHORT				nRscId,
+                                                    sal_uInt16				nRscId,
                                                     int nId);
 
     virtual SfxAbstractTabDialog * CreateScSubTotalDlg( Window*				pParent, //add for ScSubTotalDlg
@@ -577,9 +577,9 @@ public:
     virtual SfxAbstractTabDialog * CreateScSortDlg( Window*			 pParent, //add for ScSortDlg
                                                     const SfxItemSet* pArgSet,int nId );
     // For TabPage
-    virtual CreateTabPage				GetTabPageCreatorFunc( USHORT nId );
+    virtual CreateTabPage				GetTabPageCreatorFunc( sal_uInt16 nId );
 
-    virtual GetTabPageRanges			GetTabPageRangesFunc( USHORT nId );
+    virtual GetTabPageRanges			GetTabPageRangesFunc( sal_uInt16 nId );
 
 };
 
diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx
index 2783ef5be..3fc4e08a2 100644
--- a/sc/source/ui/attrdlg/tabpages.cxx
+++ b/sc/source/ui/attrdlg/tabpages.cxx
@@ -43,7 +43,7 @@
 
 // STATIC DATA -----------------------------------------------------------
 
-static USHORT pProtectionRanges[] =
+static sal_uInt16 pProtectionRanges[] =
 {
     SID_SCATTR_PROTECTION,
     SID_SCATTR_PROTECTION,
@@ -73,7 +73,7 @@ ScTabPageProtection::ScTabPageProtection( Window*			pParent,
     SetExchangeSupport();
 
     //	States werden in Reset gesetzt
-    bTriEnabled = bDontCare = bProtect = bHideForm = bHideCell = bHidePrint = FALSE;
+    bTriEnabled = bDontCare = bProtect = bHideForm = bHideCell = bHidePrint = sal_False;
 
     aBtnProtect.SetClickHdl(	 LINK( this, ScTabPageProtection, ButtonClickHdl ) );
     aBtnHideCell.SetClickHdl(	 LINK( this, ScTabPageProtection, ButtonClickHdl ) );
@@ -91,7 +91,7 @@ __EXPORT ScTabPageProtection::~ScTabPageProtection()
 
 //------------------------------------------------------------------------
 
-USHORT* __EXPORT ScTabPageProtection::GetRanges()
+sal_uInt16* __EXPORT ScTabPageProtection::GetRanges()
 {
     return pProtectionRanges;
 }
@@ -110,9 +110,9 @@ void __EXPORT ScTabPageProtection::Reset( const SfxItemSet& rCoreAttrs )
 {
     //	Variablen initialisieren
 
-    USHORT nWhich = GetWhich( SID_SCATTR_PROTECTION );
+    sal_uInt16 nWhich = GetWhich( SID_SCATTR_PROTECTION );
     const ScProtectionAttr* pProtAttr = NULL;
-    SfxItemState eItemState = rCoreAttrs.GetItemState( nWhich, FALSE,
+    SfxItemState eItemState = rCoreAttrs.GetItemState( nWhich, sal_False,
                                           (const SfxPoolItem**)&pProtAttr );
 
     // handelt es sich um ein Default-Item?
@@ -127,8 +127,8 @@ void __EXPORT ScTabPageProtection::Reset( const SfxItemSet& rCoreAttrs )
         //	Defaults, die erscheinen wenn ein TriState weggeklickt wird:
         //	(weil alles zusammen ein Attribut ist, kann auch nur alles zusammen
         //	auf DontCare stehen - #38543#)
-        bProtect = TRUE;
-        bHideForm = bHideCell = bHidePrint = FALSE;
+        bProtect = sal_True;
+        bHideForm = bHideCell = bHidePrint = sal_False;
     }
     else
     {
@@ -150,13 +150,13 @@ void __EXPORT ScTabPageProtection::Reset( const SfxItemSet& rCoreAttrs )
 
 // -----------------------------------------------------------------------
 
-BOOL __EXPORT ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs )
+sal_Bool __EXPORT ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs )
 {
-    BOOL 				bAttrsChanged	= FALSE;
-    USHORT				nWhich			= GetWhich( SID_SCATTR_PROTECTION );
+    sal_Bool 				bAttrsChanged	= sal_False;
+    sal_uInt16				nWhich			= GetWhich( SID_SCATTR_PROTECTION );
     const SfxPoolItem*	pOldItem		= GetOldItem( rCoreAttrs, SID_SCATTR_PROTECTION );
     const SfxItemSet&	rOldSet			= GetItemSet();
-    SfxItemState		eItemState		= rOldSet.GetItemState( nWhich, FALSE );
+    SfxItemState		eItemState		= rOldSet.GetItemState( nWhich, sal_False );
     ScProtectionAttr	aProtAttr;
 
     if ( !bDontCare )
@@ -167,7 +167,7 @@ BOOL __EXPORT ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs )
         aProtAttr.SetHidePrint( bHidePrint );
 
         if ( bTriEnabled )
-            bAttrsChanged = TRUE;					// DontCare -> richtiger Wert
+            bAttrsChanged = sal_True;					// DontCare -> richtiger Wert
         else
             bAttrsChanged = !pOldItem || !( aProtAttr == *(const ScProtectionAttr*)pOldItem );
     }
@@ -198,11 +198,11 @@ IMPL_LINK( ScTabPageProtection, ButtonClickHdl, TriStateBox*, pBox )
 {
     TriState eState = pBox->GetState();
     if ( eState == STATE_DONTKNOW )
-        bDontCare = TRUE;							// alles zusammen auf DontCare
+        bDontCare = sal_True;							// alles zusammen auf DontCare
     else
     {
-        bDontCare = FALSE;							// DontCare ueberall aus
-        BOOL bOn = ( eState == STATE_CHECK );		// ausgewaehlter Wert
+        bDontCare = sal_False;							// DontCare ueberall aus
+        sal_Bool bOn = ( eState == STATE_CHECK );		// ausgewaehlter Wert
 
         if ( pBox == &aBtnProtect )
             bProtect = bOn;
@@ -242,7 +242,7 @@ void ScTabPageProtection::UpdateButtons()
         aBtnHidePrint.SetState( bHidePrint ? STATE_CHECK : STATE_NOCHECK );
     }
 
-    BOOL bEnable = ( aBtnHideCell.GetState() != STATE_CHECK );
+    sal_Bool bEnable = ( aBtnHideCell.GetState() != STATE_CHECK );
     {
         aBtnProtect.Enable( bEnable );
         aBtnHideFormula.Enable( bEnable );