accfixes: merged to m100

1 files changed, 23 insertions, 23 deletions

diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index f42d67fdee11..7c61d05ed8f4 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -302,14 +302,14 @@ void SvxLineDefTabPage::CheckChanges_Impl()
 
             case RET_CANCEL:
             break;
-            // return( TRUE ); // Abbruch
+            // return( sal_True ); // Abbruch
         }
         delete aMessDlg; //add by CHINA001
     }
 
 
 
-    USHORT nPos = aLbLineStyles.GetSelectEntryPos();
+    sal_uInt16 nPos = aLbLineStyles.GetSelectEntryPos();
     if( nPos != LISTBOX_ENTRY_NOTFOUND )
     {
         *pPosDashLb = nPos;
@@ -318,7 +318,7 @@ void SvxLineDefTabPage::CheckChanges_Impl()
 
 // -----------------------------------------------------------------------
 
-BOOL SvxLineDefTabPage::FillItemSet( SfxItemSet& rAttrs )
+sal_Bool SvxLineDefTabPage::FillItemSet( SfxItemSet& rAttrs )
 {
     if( *pDlgType == 0 ) // Linien-Dialog
     {
@@ -333,7 +333,7 @@ BOOL SvxLineDefTabPage::FillItemSet( SfxItemSet& rAttrs )
             rAttrs.Put( XLineDashItem( aString, aDash ) );
         }
     }
-    return( TRUE );
+    return( sal_True );
 }
 
 // -----------------------------------------------------------------------
@@ -590,40 +590,40 @@ IMPL_LINK( SvxLineDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
 
     long nCount = pDashList->Count();
     long j = 1;
-    BOOL bDifferent = FALSE;
+    sal_Bool bDifferent = sal_False;
 
     while ( !bDifferent )
     {
         aName = aNewName;
         aName += sal_Unicode(' ');
         aName += UniString::CreateFromInt32( j++ );
-        bDifferent = TRUE;
+        bDifferent = sal_True;
 
         for ( long i = 0; i < nCount && bDifferent; i++ )
             if ( aName == pDashList->GetDash( i )->GetName() )
-                bDifferent = FALSE;
+                bDifferent = sal_False;
     }
 
     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
     DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
     AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc );
     DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
-    BOOL bLoop = TRUE;
+    sal_Bool bLoop = sal_True;
 
     while ( bLoop && pDlg->Execute() == RET_OK )
     {
         pDlg->GetName( aName );
-        bDifferent = TRUE;
+        bDifferent = sal_True;
 
         for( long i = 0; i < nCount && bDifferent; i++ )
         {
             if( aName == pDashList->GetDash( i )->GetName() )
-                bDifferent = FALSE;
+                bDifferent = sal_False;
         }
 
         if( bDifferent )
         {
-            bLoop = FALSE;
+            bLoop = sal_False;
             FillDash_Impl();
 
             pEntry = new XDashEntry( aDash, aName );
@@ -672,7 +672,7 @@ IMPL_LINK( SvxLineDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
 
 IMPL_LINK( SvxLineDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
 {
-    USHORT nPos = aLbLineStyles.GetSelectEntryPos();
+    sal_uInt16 nPos = aLbLineStyles.GetSelectEntryPos();
 
     if( nPos != LISTBOX_ENTRY_NOTFOUND )
     {
@@ -688,24 +688,24 @@ IMPL_LINK( SvxLineDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
         DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
 
         long nCount = pDashList->Count();
-        BOOL bDifferent = FALSE;
-        BOOL bLoop = TRUE;
+        sal_Bool bDifferent = sal_False;
+        sal_Bool bLoop = sal_True;
 
         while ( bLoop && pDlg->Execute() == RET_OK )
         {
             pDlg->GetName( aName );
-            bDifferent = TRUE;
+            bDifferent = sal_True;
 
             for( long i = 0; i < nCount && bDifferent; i++ )
             {
                 if( aName == pDashList->GetDash( i )->GetName() &&
                     aName != aOldName )
-                    bDifferent = FALSE;
+                    bDifferent = sal_False;
             }
 
             if ( bDifferent )
             {
-                bLoop = FALSE;
+                bLoop = sal_False;
                 FillDash_Impl();
 
                 XDashEntry* pEntry = new XDashEntry( aDash, aName );
@@ -746,7 +746,7 @@ IMPL_LINK( SvxLineDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
 
 IMPL_LINK( SvxLineDefTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG )
 {
-    USHORT nPos = aLbLineStyles.GetSelectEntryPos();
+    sal_uInt16 nPos = aLbLineStyles.GetSelectEntryPos();
 
     if ( nPos != LISTBOX_ENTRY_NOTFOUND )
     {
@@ -784,7 +784,7 @@ IMPL_LINK( SvxLineDefTabPage, ClickDeleteHdl_Impl, void *, EMPTYARG )
 IMPL_LINK( SvxLineDefTabPage, ClickLoadHdl_Impl, void *, EMPTYARG )
 {
     ResMgr& rMgr = CUI_MGR();
-    USHORT nReturn = RET_YES;
+    sal_uInt16 nReturn = RET_YES;
 
     if ( *pnDashListState & CT_MODIFIED )
     {
@@ -962,10 +962,10 @@ void SvxLineDefTabPage::FillDash_Impl()
         eXDS = XDASH_RECT;
 
     aDash.SetDashStyle( eXDS );
-    aDash.SetDots( (BYTE) aNumFldNumber1.GetValue() );
+    aDash.SetDots( (sal_uInt8) aNumFldNumber1.GetValue() );
     aDash.SetDotLen( aLbType1.GetSelectEntryPos() == 0 ? 0 :
                                 GetCoreValue( aMtrLength1, ePoolUnit ) );
-    aDash.SetDashes( (BYTE) aNumFldNumber2.GetValue() );
+    aDash.SetDashes( (sal_uInt8) aNumFldNumber2.GetValue() );
     aDash.SetDashLen( aLbType2.GetSelectEntryPos() == 0 ? 0 :
                                 GetCoreValue( aMtrLength2, ePoolUnit ) );
     aDash.SetDistance( GetCoreValue( aMtrDistance, ePoolUnit ) );
@@ -984,7 +984,7 @@ void SvxLineDefTabPage::FillDialog_Impl()
     if( eXDS == XDASH_RECTRELATIVE )
         aCbxSynchronize.Check();
     else
-        aCbxSynchronize.Check( FALSE );
+        aCbxSynchronize.Check( sal_False );
 
     aNumFldNumber1.SetValue( aDash.GetDots() );
     //aMtrLength1.SetValue( aDash.GetDotLen() );
@@ -1016,7 +1016,7 @@ void SvxLineDefTabPage::DataChanged( const DataChangedEvent& rDCEvt )
 
     if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) )
     {
-        USHORT nOldSelect = aLbLineStyles.GetSelectEntryPos();
+        sal_uInt16 nOldSelect = aLbLineStyles.GetSelectEntryPos();
         aLbLineStyles.Clear();
         aLbLineStyles.Fill( pDashList );
         aLbLineStyles.SelectEntryPos( nOldSelect );