removetooltypes01: #i112600# resync to DEV300_m92; remove tooltypes from xmloff, linguistic, vcl, svtools, accessibility, fpicker, uui and framework

5 files changed, 42 insertions, 37 deletions

diff --git a/svtools/workben/browser.cxx b/svtools/workben/browser.cxx
index c3e924624780..98d3534b587c 100644
--- a/svtools/workben/browser.cxx
+++ b/svtools/workben/browser.cxx
@@ -112,12 +112,12 @@ class Browser: public BrowseBox
 friend class AppWindow;
 
     DataList        aRows;
-    BOOL            bInverse;
+    sal_Bool            bInverse;
     Edit*           pEdit;
 
 protected:
     virtual long    GetRowCount() const;
-    virtual BOOL    SeekRow( long nRow );
+    virtual sal_Bool    SeekRow( long nRow );
     virtual void    PaintField( OutputDevice& rDev, const Rectangle& rRect,
                                 sal_uInt16 nColumnId ) const;
 
@@ -128,7 +128,7 @@ protected:
     virtual void    EndScroll();
     virtual void    Command( const CommandEvent &eEvt );
 
-    virtual BOOL    StartDragging( Pointer& rMovePtr,
+    virtual sal_Bool    StartDragging( Pointer& rMovePtr,
                                    Pointer& rCopyPtr );
     virtual void    EndDragging( const DropAction &rAction );
     virtual void    MouseButtonDown( const BrowserMouseEvent &rEvt );
@@ -137,7 +137,7 @@ public:
                     Browser( AppWindow* pParent, BrowserMode eMode );
                     ~Browser();
 
-    void            SetInverseSelection( BOOL bInverseSel )
+    void            SetInverseSelection( sal_Bool bInverseSel )
                     { bInverse = bInverseSel; }
 };
 
@@ -151,7 +151,7 @@ class AppWindow: public WorkWindow
     Browser         aBrowser;
     BrowserMode     eCurMode;
     FloatingWindow *pEventView;
-    ULONG           nNewRowNo;
+    sal_uIntPtr           nNewRowNo;
 
 private:
     DECL_LINK( Modify, void * );
@@ -341,7 +341,7 @@ BrowserMode BrowseModeDialog::GetMode() const
 
 Browser::Browser( AppWindow* pParent, BrowserMode eMode ):
     BrowseBox( pParent, WinBits(WB_DRAG), eMode ),
-    bInverse(FALSE),
+    bInverse(sal_False),
     pEdit( 0 )
 {
     for ( long n = 0; n < 100; ++n )
@@ -369,11 +369,11 @@ Browser::~Browser()
 
 //------------------------------------------------------------------
 
-BOOL Browser::StartDragging( Pointer& rMovePtr, Pointer& rCopyPtr )
+sal_Bool Browser::StartDragging( Pointer& rMovePtr, Pointer& rCopyPtr )
 {
     rMovePtr = Pointer( POINTER_MOVEDATA );
     rCopyPtr = Pointer( POINTER_COPYDATA );
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------
@@ -469,9 +469,9 @@ void Browser::CursorMoved()
     aEvent += String( ":", RTL_TEXTENCODING_IBM_850 );
     aEvent += String( GetCurColumnId() );
     ( (AppWindow*) GetParent() )->Event( aEvent );
-    if ( IsFieldVisible( GetCurRow(), GetCurColumnId(), TRUE ) )
+    if ( IsFieldVisible( GetCurRow(), GetCurColumnId(), sal_True ) )
         ( (AppWindow*) GetParent() )->Event( String( "completely visible", RTL_TEXTENCODING_IBM_850 ) );
-    else if ( IsFieldVisible( 1, GetCurColumnId(), FALSE) )
+    else if ( IsFieldVisible( 1, GetCurColumnId(), sal_False) )
         ( (AppWindow*) GetParent() )->Event( String( "partly visible", RTL_TEXTENCODING_IBM_850 ) );
     else
         ( (AppWindow*) GetParent() )->Event( String( "not visible", RTL_TEXTENCODING_IBM_850 ) );
@@ -488,14 +488,14 @@ long Browser::GetRowCount() const
 
 //------------------------------------------------------------------
 
-BOOL Browser::SeekRow( long nRow )
+sal_Bool Browser::SeekRow( long nRow )
 {
     if ( nRow >= 0 && nRow < (long) aRows.Count() )
     {
         aRows.Seek(nRow);
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
 //------------------------------------------------------------------
@@ -583,7 +583,7 @@ IMPL_LINK_INLINE_START( AppWindow, Modify, void *, pCaller )
     aBrowser.GoToRow( pEdit->GetText().ToInt32() );
     aBrowser.GrabFocus();
 
-    return TRUE;
+    return sal_True;
 }
 IMPL_LINK_INLINE_END( AppWindow, Modify, void *, pCaller )
 
@@ -591,7 +591,7 @@ IMPL_LINK_INLINE_END( AppWindow, Modify, void *, pCaller )
 
 IMPL_LINK( AppWindow, MenuSelect, Menu *, pMenu )
 {
-    ULONG nPos;
+    sal_uIntPtr nPos;
 
     switch ( pMenu->GetCurItemId() )
     {
@@ -726,7 +726,7 @@ IMPL_LINK( AppWindow, MenuSelect, Menu *, pMenu )
 
         case MID_INVERSE:
         {
-            BOOL bChecked = pMenu->IsItemChecked( MID_INVERSE );
+            sal_Bool bChecked = pMenu->IsItemChecked( MID_INVERSE );
             pMenu->CheckItem( MID_INVERSE, !bChecked );
             aBrowser.SetInverseSelection( !bChecked );
             break;
@@ -739,14 +739,14 @@ IMPL_LINK( AppWindow, MenuSelect, Menu *, pMenu )
         case MID_STARMONEY_1:
         {
             nPos = aBrowser.GetCurRow();
-            aBrowser.SelectRow( nPos + 1, TRUE );
+            aBrowser.SelectRow( nPos + 1, sal_True );
             aBrowser.aRows.Remove( nPos );
             aBrowser.RowRemoved( nPos );
             break;
         }
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------
diff --git a/svtools/workben/stest.cxx b/svtools/workben/stest.cxx
index c788eb67c28e..ca6c8a757734 100644
--- a/svtools/workben/stest.cxx
+++ b/svtools/workben/stest.cxx
@@ -124,7 +124,7 @@ IMPL_LINK( SearchWindow, ClickHdl, Button *, pButton )
 /*      InfoBox( this, String( "T: " ) + sText +
                        String( "\nS: " ) + sSrch ).Execute();
 */
-        BOOL bRet = FALSE;
+        sal_Bool bRet = sal_False;
         sal_uInt16 nStt = 0, nEnd = sText.Len();
 
         {
@@ -132,7 +132,7 @@ IMPL_LINK( SearchWindow, ClickHdl, Button *, pButton )
             SearchText aSrchText( aParam, GetpApp()->GetAppInternational() );
             bRet = aSrchText.SearchFrwrd( sText, &nStt, &nEnd );
 
-//          BOOL SearchBkwrd( const String &rStr, sal_uInt16* pStart, sal_uInt16* pEnde );
+//          sal_Bool SearchBkwrd( const String &rStr, sal_uInt16* pStart, sal_uInt16* pEnde );
         }
 
         String sFound( "gefunden" );
diff --git a/svtools/workben/svdem.cxx b/svtools/workben/svdem.cxx
index 4dadea4f78a4..fe3afcc20ea5 100644
--- a/svtools/workben/svdem.cxx
+++ b/svtools/workben/svdem.cxx
@@ -78,7 +78,7 @@ public:
                     ShowBitmap( Window* pParent, const Bitmap& rBmp );
 
     virtual void    Paint( const Rectangle& );
-    virtual BOOL    Close();
+    virtual sal_Bool    Close();
 };
 
 // -----------------------------------------------------------------------
@@ -282,11 +282,11 @@ void ShowBitmap::Paint( const Rectangle& )
 
 // -----------------------------------------------------------------------
 
-BOOL ShowBitmap::Close()
+sal_Bool ShowBitmap::Close()
 {
     Hide();
     delete this;
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------
@@ -352,8 +352,8 @@ MyFontDialog::MyFontDialog( Window* pParent ) :
 {
     pList = NULL;
 
-    aFontBox.EnableWYSIWYG( TRUE );
-    aFontBox.EnableSymbols( TRUE );
+    aFontBox.EnableWYSIWYG( sal_True );
+    aFontBox.EnableSymbols( sal_True );
     aFontBox.SetPosSizePixel( Point( 10, 10 ), Size( 140, 140 ) );
     aFontBox.SetSelectHdl( LINK( this, MyFontDialog, SelectFont ) );
     aFontBox.SetLoseFocusHdl( LINK( this, MyFontDialog, SelectFont ) );
@@ -421,7 +421,7 @@ MyFontDialog::MyFontDialog( Window* pParent ) :
     {
     aColorBox.SetPosSizePixel( Point( 15, 305 ), Size( 130, 100 ) );
     aColorBox.SetSelectHdl( LINK( this, MyFontDialog, AttrHdl ) );
-    aColorBox.SetUpdateMode( FALSE );
+    aColorBox.SetUpdateMode( sal_False );
     aColorBox.InsertEntry( Color( COL_BLACK ),         XubString( RTL_CONSTASCII_USTRINGPARAM( "Black" ) ) );
     aColorBox.InsertEntry( Color( COL_BLUE ),          XubString( RTL_CONSTASCII_USTRINGPARAM( "Blue" ) ) );
     aColorBox.InsertEntry( Color( COL_GREEN ),         XubString( RTL_CONSTASCII_USTRINGPARAM( "Green" ) ) );
@@ -438,7 +438,7 @@ MyFontDialog::MyFontDialog( Window* pParent ) :
     aColorBox.InsertEntry( Color( COL_LIGHTMAGENTA ),  XubString( RTL_CONSTASCII_USTRINGPARAM( "LightMagenta" ) ) );
     aColorBox.InsertEntry( Color( COL_YELLOW ),        XubString( RTL_CONSTASCII_USTRINGPARAM( "Yellow" ) ) );
     aColorBox.InsertEntry( Color( COL_WHITE ),         XubString( RTL_CONSTASCII_USTRINGPARAM( "White" ) ) );
-    aColorBox.SetUpdateMode( TRUE );
+    aColorBox.SetUpdateMode( sal_True );
     aColorBox.Show();
     }
 
@@ -515,7 +515,7 @@ void MyFontDialog::SetAttr()
     aFont.SetShadow( aShadowBox.IsChecked() );
     aFont.SetOutline( aOutlineBox.IsChecked() );
     aFont.SetOrientation( aLineOrientSlider.GetOrientation() );
-    aFont.SetTransparent( TRUE );
+    aFont.SetTransparent( sal_True );
     aMapText.SetText( pList->GetFontMapText( aFont ) );
     aShowFont.SetFont( aFont );
 }
@@ -545,12 +545,12 @@ long MyTabBar::DeactivatePage()
         QueryBox aQueryBox( this, WB_YES_NO | WB_DEF_YES,
                             XubString( RTL_CONSTASCII_USTRINGPARAM( "Deactivate" ) ) );
         if ( aQueryBox.Execute() == RET_YES )
-            return TRUE;
+            return sal_True;
         else
-            return FALSE;
+            return sal_False;
     }
     else
-        return TRUE;
+        return sal_True;
 }
 
 // -----------------------------------------------------------------------
@@ -750,7 +750,7 @@ MyWin::MyWin( Window* pParent, WinBits aWinStyle ) :
 
     {
     aColorList.SetPosSizePixel( Point( 10, nY ), Size( 130, 180 ) );
-    aColorList.SetUpdateMode( FALSE );
+    aColorList.SetUpdateMode( sal_False );
     aColorList.InsertEntry( Color( COL_BLACK ),         XubString( RTL_CONSTASCII_USTRINGPARAM( "Black" ) ) );
     aColorList.InsertEntry( Color( COL_BLUE ),          XubString( RTL_CONSTASCII_USTRINGPARAM( "Blue" ) ) );
     aColorList.InsertEntry( Color( COL_GREEN ),         XubString( RTL_CONSTASCII_USTRINGPARAM( "Green" ) ) );
@@ -767,7 +767,7 @@ MyWin::MyWin( Window* pParent, WinBits aWinStyle ) :
     aColorList.InsertEntry( Color( COL_LIGHTMAGENTA ),  XubString( RTL_CONSTASCII_USTRINGPARAM( "LightMagenta" ) ) );
     aColorList.InsertEntry( Color( COL_YELLOW ),        XubString( RTL_CONSTASCII_USTRINGPARAM( "Yellow" ) ) );
     aColorList.InsertEntry( Color( COL_WHITE ),         XubString( RTL_CONSTASCII_USTRINGPARAM( "White" ) ) );
-    aColorList.SetUpdateMode( TRUE );
+    aColorList.SetUpdateMode( sal_True );
     aColorList.SetSelectHdl( LINK( this, MyWin, SelectHdl ) );
     aColorList.Show();
     }
@@ -818,7 +818,7 @@ MyWin::MyWin( Window* pParent, WinBits aWinStyle ) :
     }
 
     {
-    aCalendarField.EnableEmptyFieldValue( TRUE );
+    aCalendarField.EnableEmptyFieldValue( sal_True );
     aCalendarField.SetCalendarStyle( aCalendarField.GetCalendarStyle() | WB_RANGESELECT );
     aCalendarField.SetSelectHdl( LINK( this, MyWin, CalSelectHdl ) );
 //    aCalendarField.SetDate( Date() );
diff --git a/svtools/workben/toolpanel/toolpaneltest.cxx b/svtools/workben/toolpanel/toolpaneltest.cxx
index 60c5e277707f..d7656b105fc9 100755
--- a/svtools/workben/toolpanel/toolpaneltest.cxx
+++ b/svtools/workben/toolpanel/toolpaneltest.cxx
@@ -145,7 +145,7 @@ public:
     // IToolPanel
     virtual ::rtl::OUString GetDisplayName() const;
     virtual Image GetImage() const;
-    virtual SmartId GetHelpID() const;
+    virtual rtl::OString GetHelpID() const;
     virtual void Activate( Window& i_rParentWindow );
     virtual void Deactivate();
     virtual void SetSizePixel( const Size& i_rPanelWindowSize );
@@ -272,9 +272,9 @@ Image ColoredPanel::GetImage() const
 }
 
 //-----------------------------------------------------------------------------
-SmartId ColoredPanel::GetHelpID() const
+rtl::OString ColoredPanel::GetHelpID() const
 {
-    return SmartId();
+    return rtl::OString();
 }
 
 //=============================================================================
diff --git a/svtools/workben/unodialog/roadmapskeleton.src b/svtools/workben/unodialog/roadmapskeleton.src
index 797490273b5f..33728c700df6 100644
--- a/svtools/workben/unodialog/roadmapskeleton.src
+++ b/svtools/workben/unodialog/roadmapskeleton.src
@@ -31,6 +31,7 @@
 // -----------------------------------------------------------------------------
 ModalDialog DLG_ROADMAP_SKELETON
 {
+    HelpID = "svtools:ModalDialog:DLG_ROADMAP_SKELETON";
     OutputSize = TRUE ;
     Moveable = TRUE;
     Closeable = TRUE ;
@@ -61,24 +62,28 @@ ModalDialog DLG_ROADMAP_SKELETON
 
 TabPage TP_WELCOME
 {
+    HelpID = "svtools:TabPage:TP_WELCOME";
     Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT );
     Hide = TRUE;
 };
 
 TabPage TP_PREPARE
 {
+    HelpID = "svtools:TabPage:TP_PREPARE";
     Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT );
     Hide = TRUE;
 };
 
 TabPage TP_SETUP
 {
+    HelpID = "svtools:TabPage:TP_SETUP";
     Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT );
     Hide = TRUE;
 };
 
 TabPage TP_FINISH
 {
+    HelpID = "svtools:TabPage:TP_FINISH";
     Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT );
     Hide = TRUE;
 };