removetooltypes01: #i112600# Remove tools types from padmin

1 files changed, 32 insertions, 32 deletions

diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx
index 8165b8015403..2ec2707a2bcc 100644
--- a/padmin/source/prtsetup.cxx
+++ b/padmin/source/prtsetup.cxx
@@ -47,7 +47,7 @@ void RTSDialog::insertAllPPDValues( ListBox& rBox, const PPDParser* pParser, con
         return;
 
     const PPDValue* pValue = NULL;
-    USHORT nPos = 0;
+    sal_uInt16 nPos = 0;
     String aOptionText;
 
     for( int i = 0; i < pKey->countValues(); i++ )
@@ -150,7 +150,7 @@ IMPL_LINK( RTSDialog, ActivatePage, TabControl*, pTabCtrl )
     if( pTabCtrl != &m_aTabControl )
         return 0;
 
-    USHORT nId = m_aTabControl.GetCurPageId();
+    sal_uInt16 nId = m_aTabControl.GetCurPageId();
 
     if ( ! m_aTabControl.GetTabPage( nId ) )
     {
@@ -242,7 +242,7 @@ RTSPaperPage::RTSPaperPage( RTSDialog* pParent ) :
 
     FreeResource();
 
-    USHORT nPos = 0;
+    sal_uInt16 nPos = 0;
 
     m_aOrientBox.InsertEntry( PORTRAIT_STRING );
     m_aOrientBox.InsertEntry( LSCAPE_STRING );
@@ -284,8 +284,8 @@ void RTSPaperPage::update()
     }
     else
     {
-        m_aDuplexText.Enable( FALSE );
-        m_aDuplexBox.Enable( FALSE );
+        m_aDuplexText.Enable( sal_False );
+        m_aDuplexBox.Enable( sal_False );
     }
 
     // paper
@@ -296,8 +296,8 @@ void RTSPaperPage::update()
     }
     else
     {
-        m_aPaperText.Enable( FALSE );
-        m_aPaperBox.Enable( FALSE );
+        m_aPaperText.Enable( sal_False );
+        m_aPaperBox.Enable( sal_False );
     }
 
     // input slots
@@ -308,8 +308,8 @@ void RTSPaperPage::update()
     }
     else
     {
-        m_aSlotText.Enable( FALSE );
-        m_aSlotBox.Enable( FALSE );
+        m_aSlotText.Enable( sal_False );
+        m_aSlotBox.Enable( sal_False );
     }
 }
 
@@ -386,14 +386,14 @@ RTSDevicePage::RTSDevicePage( RTSDialog* pParent ) :
         case  1: m_aSpaceBox.SelectEntry( m_aSpaceColor );break;
     }
 
-    ULONG nLevelEntryData = 0;
+    sal_uLong nLevelEntryData = 0;
     if( m_pParent->m_aJobData.m_nPDFDevice > 0 )
         nLevelEntryData = 10;
     else
         nLevelEntryData = m_pParent->m_aJobData.m_nPSLevel+1;
-    for( USHORT i = 0; i < m_aLevelBox.GetEntryCount(); i++ )
+    for( sal_uInt16 i = 0; i < m_aLevelBox.GetEntryCount(); i++ )
     {
-        if( (ULONG)m_aLevelBox.GetEntryData( i ) == nLevelEntryData )
+        if( (sal_uLong)m_aLevelBox.GetEntryData( i ) == nLevelEntryData )
         {
             m_aLevelBox.SelectEntryPos( i );
             break;
@@ -416,7 +416,7 @@ RTSDevicePage::RTSDevicePage( RTSDialog* pParent ) :
                 )
             {
                 String aEntry( m_pParent->m_aJobData.m_pParser->translateKey( pKey->getKey() ) );
-                USHORT nPos = m_aPPDKeyBox.InsertEntry( aEntry );
+                sal_uInt16 nPos = m_aPPDKeyBox.InsertEntry( aEntry );
                 m_aPPDKeyBox.SetEntryData( nPos, (void*)pKey );
             }
         }
@@ -437,17 +437,17 @@ void RTSDevicePage::update()
 
 // ------------------------------------------------------------------
 
-ULONG RTSDevicePage::getLevel()
+sal_uLong RTSDevicePage::getLevel()
 {
-    ULONG nLevel = (ULONG)m_aLevelBox.GetEntryData( m_aLevelBox.GetSelectEntryPos() );
+    sal_uLong nLevel = (sal_uLong)m_aLevelBox.GetEntryData( m_aLevelBox.GetSelectEntryPos() );
     return nLevel < 10 ? nLevel-1 : 0;
 }
 
 // ------------------------------------------------------------------
 
-ULONG RTSDevicePage::getPDFDevice()
+sal_uLong RTSDevicePage::getPDFDevice()
 {
-    ULONG nLevel = (ULONG)m_aLevelBox.GetEntryData( m_aLevelBox.GetSelectEntryPos() );
+    sal_uLong nLevel = (sal_uLong)m_aLevelBox.GetEntryData( m_aLevelBox.GetSelectEntryPos() );
     return nLevel > 9 ? 1 : 0;
 }
 
@@ -490,7 +490,7 @@ void RTSDevicePage::FillValueBox( const PPDKey* pKey )
             m_pParent->m_aJobData.m_pParser )
         {
             String aEntry( m_pParent->m_aJobData.m_pParser->translateOption( pKey->getKey(), pValue->m_aOption ) );
-            USHORT nPos = m_aPPDValueBox.InsertEntry( aEntry );
+            sal_uInt16 nPos = m_aPPDValueBox.InsertEntry( aEntry );
             m_aPPDValueBox.SetEntryData( nPos, (void*)pValue );
         }
     }
@@ -521,10 +521,10 @@ RTSOtherPage::RTSOtherPage( RTSDialog* pParent ) :
 {
     FreeResource();
 
-    m_aTopLB.EnableEmptyFieldValue( TRUE );
-    m_aBottomLB.EnableEmptyFieldValue( TRUE );
-    m_aLeftLB.EnableEmptyFieldValue( TRUE );
-    m_aRightLB.EnableEmptyFieldValue( TRUE );
+    m_aTopLB.EnableEmptyFieldValue( sal_True );
+    m_aBottomLB.EnableEmptyFieldValue( sal_True );
+    m_aLeftLB.EnableEmptyFieldValue( sal_True );
+    m_aRightLB.EnableEmptyFieldValue( sal_True );
 
     m_aDefaultBtn.SetClickHdl( LINK( this, RTSOtherPage, ClickBtnHdl ) );
 
@@ -658,16 +658,16 @@ RTSFontSubstPage::RTSFontSubstPage( RTSDialog* pParent ) :
     }
 
     m_aEnableBox.Check( m_pParent->m_aJobData.m_bPerformFontSubstitution );
-    m_aRemoveButton.Enable( FALSE );
+    m_aRemoveButton.Enable( sal_False );
     if( ! m_pParent->m_aJobData.m_bPerformFontSubstitution )
     {
-        m_aSubstitutionsBox.Enable( FALSE );
-        m_aSubstitutionsText.Enable( FALSE );
-        m_aAddButton.Enable( FALSE );
-        m_aToFontBox.Enable( FALSE );
-        m_aToFontText.Enable( FALSE );
-        m_aFromFontBox.Enable( FALSE );
-        m_aFromFontText.Enable( FALSE );
+        m_aSubstitutionsBox.Enable( sal_False );
+        m_aSubstitutionsText.Enable( sal_False );
+        m_aAddButton.Enable( sal_False );
+        m_aToFontBox.Enable( sal_False );
+        m_aToFontText.Enable( sal_False );
+        m_aFromFontBox.Enable( sal_False );
+        m_aFromFontText.Enable( sal_False );
     }
 
     update();
@@ -686,7 +686,7 @@ RTSFontSubstPage::~RTSFontSubstPage()
 void RTSFontSubstPage::update()
 {
     m_aSubstitutionsBox.Clear();
-    m_aRemoveButton.Enable( FALSE );
+    m_aRemoveButton.Enable( sal_False );
     // fill substitutions box
     ::std::hash_map< OUString, OUString, OUStringHash >::const_iterator it;
     for( it = m_pParent->m_aJobData.m_aFontSubstitutes.begin();
@@ -728,7 +728,7 @@ IMPL_LINK( RTSFontSubstPage, ClickBtnHdl, Button*, pButton )
         for( int i = 0; i < m_aSubstitutionsBox.GetSelectEntryCount(); i++ )
         {
             String aEntry( m_aSubstitutionsBox.GetSelectEntry( i ) );
-            USHORT nPos = aEntry.SearchAscii( " -> " );
+            sal_uInt16 nPos = aEntry.SearchAscii( " -> " );
             aEntry.Erase( nPos );
             m_pParent->m_aJobData.m_aFontSubstitutes.erase( aEntry );
         }