gridsort: pulled and merged DEV300_m100

12 files changed, 29 insertions, 29 deletions

diff --git a/forms/source/richtext/clipboarddispatcher.cxx b/forms/source/richtext/clipboarddispatcher.cxx
index 97b2ec1cba84..1f021d9ad0ea 100644
--- a/forms/source/richtext/clipboarddispatcher.cxx
+++ b/forms/source/richtext/clipboarddispatcher.cxx
@@ -155,7 +155,7 @@ namespace frm
     {
         m_pClipListener = new TransferableClipboardListener( LINK( this, OPasteClipboardDispatcher, OnClipboardChanged ) );
         m_pClipListener->acquire();
-        m_pClipListener->AddRemoveListener( _rView.GetWindow(), TRUE );
+        m_pClipListener->AddRemoveListener( _rView.GetWindow(), sal_True );
 
         // initial state
         TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( _rView.GetWindow() ) );
@@ -189,7 +189,7 @@ namespace frm
     {
         OSL_ENSURE( getEditView() && getEditView()->GetWindow(), "OPasteClipboardDispatcher::disposing: EditView should not (yet) be disfunctional here!" );
         if ( getEditView() && getEditView()->GetWindow() && m_pClipListener )
-            m_pClipListener->AddRemoveListener( getEditView()->GetWindow(), FALSE );
+            m_pClipListener->AddRemoveListener( getEditView()->GetWindow(), sal_False );
         m_pClipListener->release();
         m_pClipListener = NULL;
 
diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx
index 7aac8918c877..8fa944ea943f 100644
--- a/forms/source/richtext/richtextimplcontrol.cxx
+++ b/forms/source/richtext/richtextimplcontrol.cxx
@@ -89,7 +89,7 @@ namespace frm
         m_pEngine->registerEngineStatusListener( this );
 
         {
-            ULONG nViewControlWord = m_pView->GetControlWord();
+            sal_uLong nViewControlWord = m_pView->GetControlWord();
             nViewControlWord |= EV_CNTRL_AUTOSCROLL;
             m_pView->SetControlWord( nViewControlWord );
         }
@@ -236,7 +236,7 @@ namespace frm
     //--------------------------------------------------------------------
     void RichTextControlImpl::normalizeScriptDependentAttribute( SvxScriptSetItem& _rScriptSetItem )
     {
-        _rScriptSetItem.GetItemSet().Put( m_pView->GetAttribs(), FALSE );
+        _rScriptSetItem.GetItemSet().Put( m_pView->GetAttribs(), sal_False );
         const SfxPoolItem* pNormalizedItem = _rScriptSetItem.GetItemOfScript( getSelectedScriptType() );
 
         WhichId nNormalizedWhichId = _rScriptSetItem.GetItemSet().GetPool()->GetWhich( _rScriptSetItem.Which() );
@@ -291,7 +291,7 @@ namespace frm
     //--------------------------------------------------------------------
     void RichTextControlImpl::EditEngineStatusChanged( const EditStatus& _rStatus )
     {
-        ULONG nStatusWord( _rStatus.GetStatusWord() );
+        sal_uLong nStatusWord( _rStatus.GetStatusWord() );
         if  (   ( nStatusWord & EE_STAT_TEXTWIDTHCHANGED )
             ||  ( nStatusWord & EE_STAT_TEXTHEIGHTCHANGED )
             )
@@ -589,7 +589,7 @@ namespace frm
     }
 
     //--------------------------------------------------------------------
-    void RichTextControlImpl::Draw( OutputDevice* _pDev, const Point& _rPos, const Size& _rSize, ULONG /*_nFlags*/ )
+    void RichTextControlImpl::Draw( OutputDevice* _pDev, const Point& _rPos, const Size& _rSize, sal_uLong /*_nFlags*/ )
     {
         // need to normalize the map mode of the device - every paint operation on any device needs
         // to use the same map mode
@@ -643,7 +643,7 @@ namespace frm
         lcl_inflate( aPlayground, -aOnePixel.Width(), -aOnePixel.Height() );
 
         // actually draw the content
-        m_pEngine->Draw( _pDev, aPlayground, Point(), TRUE );
+        m_pEngine->Draw( _pDev, aPlayground, Point(), sal_True );
 
         _pDev->Pop();
     }
diff --git a/forms/source/richtext/richtextimplcontrol.hxx b/forms/source/richtext/richtextimplcontrol.hxx
index 619766bbfc4e..52341905087f 100644
--- a/forms/source/richtext/richtextimplcontrol.hxx
+++ b/forms/source/richtext/richtextimplcontrol.hxx
@@ -152,7 +152,7 @@ namespace frm
         bool    GetHideInactiveSelection() const;
 
         /// draws the control onto a given output device
-        void    Draw( OutputDevice* _pDev, const Point& _rPos, const Size& _rSize, ULONG _nFlags );
+        void    Draw( OutputDevice* _pDev, const Point& _rPos, const Size& _rSize, sal_uLong _nFlags );
 
         /// handles command events arrived at the anti-impl control
         long    HandleCommand( const CommandEvent& _rEvent );
diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx
index 46a77c6dd791..91c6100f1817 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -157,7 +157,7 @@ namespace frm
         {
             m_pEngine->SetModifyHdl( LINK( this, ORichTextModel, OnEngineContentModified ) );
 
-            ULONG nEngineControlWord = m_pEngine->GetControlWord();
+            sal_uLong nEngineControlWord = m_pEngine->GetControlWord();
             nEngineControlWord = nEngineControlWord & ~EE_CNTRL_AUTOPAGESIZE;
             m_pEngine->SetControlWord( nEngineControlWord );
 
diff --git a/forms/source/richtext/richtextunowrapper.cxx b/forms/source/richtext/richtextunowrapper.cxx
index 1d3f98467aa7..d08f04f5c0ae 100644
--- a/forms/source/richtext/richtextunowrapper.cxx
+++ b/forms/source/richtext/richtextunowrapper.cxx
@@ -118,8 +118,8 @@ namespace frm
     {
         // this means that the content of the EditEngine changed via the UNO API
         // to reflect this in the views, we need to update them
-        USHORT viewCount = m_rEngine.GetViewCount();
-        for ( USHORT view = 0; view < viewCount; ++view )
+        sal_uInt16 viewCount = m_rEngine.GetViewCount();
+        for ( sal_uInt16 view = 0; view < viewCount; ++view )
         {
             EditView* pView = m_rEngine.GetView( view );
             if ( pView )
diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx
index 48d458288d40..ed2ca6aef521 100644
--- a/forms/source/richtext/richtextvclcontrol.cxx
+++ b/forms/source/richtext/richtextvclcontrol.cxx
@@ -83,7 +83,7 @@ namespace frm
     void RichTextControl::implInit( RichTextEngine* _pEngine, ITextAttributeListener* _pTextAttribListener, ITextSelectionListener* _pSelectionListener )
     {
         m_pImpl = new RichTextControlImpl( this, _pEngine, _pTextAttribListener, _pSelectionListener );
-        SetCompoundControl( TRUE );
+        SetCompoundControl( sal_True );
     }
 
     //--------------------------------------------------------------------
@@ -118,8 +118,8 @@ namespace frm
         if ( HasChildPathFocus() )
             getView().HideCursor();
 
-        BOOL bOldUpdateMode = getEngine().GetUpdateMode();   // TODO: guard?
-        getEngine().SetUpdateMode( FALSE );
+        sal_Bool bOldUpdateMode = getEngine().GetUpdateMode();   // TODO: guard?
+        getEngine().SetUpdateMode( sal_False );
 
         getView().SetAttribs( _rAttributesToApply );
 
@@ -320,7 +320,7 @@ namespace frm
     }
 
     //--------------------------------------------------------------------
-    void RichTextControl::Draw( OutputDevice* _pDev, const Point& _rPos, const Size& _rSize, ULONG _nFlags )
+    void RichTextControl::Draw( OutputDevice* _pDev, const Point& _rPos, const Size& _rSize, sal_uLong _nFlags )
     {
         m_pImpl->Draw( _pDev, _rPos, _rSize, _nFlags );
     }
diff --git a/forms/source/richtext/richtextvclcontrol.hxx b/forms/source/richtext/richtextvclcontrol.hxx
index 54f59569984f..254665f9b873 100644
--- a/forms/source/richtext/richtextvclcontrol.hxx
+++ b/forms/source/richtext/richtextvclcontrol.hxx
@@ -115,7 +115,7 @@ namespace frm
               EditView& getView();
 
         // Window overridables
-        virtual void        Draw( OutputDevice* _pDev, const Point& _rPos, const Size& _rSize, ULONG _nFlags );
+        virtual void        Draw( OutputDevice* _pDev, const Point& _rPos, const Size& _rSize, sal_uLong _nFlags );
 
     protected:
         // Window overridables
diff --git a/forms/source/richtext/richtextviewport.cxx b/forms/source/richtext/richtextviewport.cxx
index ffeda61e6b0c..295f83248a9f 100644
--- a/forms/source/richtext/richtextviewport.cxx
+++ b/forms/source/richtext/richtextviewport.cxx
@@ -63,7 +63,7 @@ namespace frm
     {
         Control::GetFocus();
         m_pView->SetSelectionMode( EE_SELMODE_STD );
-        m_pView->ShowCursor( TRUE );
+        m_pView->ShowCursor( sal_True );
     }
 
     //--------------------------------------------------------------------
diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx
index b56319f33dee..16b98bff7efa 100644
--- a/forms/source/richtext/rtattributehandler.cxx
+++ b/forms/source/richtext/rtattributehandler.cxx
@@ -122,7 +122,7 @@ namespace frm
     {
         SvxScriptSetItem aSetItem( (WhichId)getAttributeId(), *_rAttribs.GetPool() );
         aSetItem.PutItemForScriptType( _nForScriptType, _rItem );
-        _rAttribs.Put( aSetItem.GetItemSet(), FALSE );
+        _rAttribs.Put( aSetItem.GetItemSet(), sal_False );
     }
 
     //--------------------------------------------------------------------
@@ -276,7 +276,7 @@ namespace frm
     AttributeCheckState LineSpacingHandler::implGetCheckState( const SfxPoolItem& _rItem ) const
     {
         OSL_ENSURE( _rItem.ISA( SvxLineSpacingItem ), "LineSpacingHandler::implGetCheckState: invalid pool item!" );
-        USHORT nLineSpace = static_cast< const SvxLineSpacingItem& >( _rItem ).GetPropLineSpace();
+        sal_uInt16 nLineSpace = static_cast< const SvxLineSpacingItem& >( _rItem ).GetPropLineSpace();
         return ( nLineSpace == m_nLineSpace ) ? eChecked : eUnchecked;
     }
 
@@ -291,7 +291,7 @@ namespace frm
         if ( 100 == m_nLineSpace )
             aLineSpacing.GetInterLineSpaceRule() = SVX_INTER_LINE_SPACE_OFF;
         else
-            aLineSpacing.SetPropLineSpace( (BYTE)m_nLineSpace );
+            aLineSpacing.SetPropLineSpace( (sal_uInt8)m_nLineSpace );
 
         _rNewAttribs.Put( aLineSpacing );
     }
@@ -399,7 +399,7 @@ namespace frm
         if ( pFontHeightItem )
         {
             // by definition, the item should have the unit twip
-            ULONG nHeight = pFontHeightItem->GetHeight();
+            sal_uLong nHeight = pFontHeightItem->GetHeight();
             if ( _rAttribs.GetPool()->GetMetric( getWhich() ) != SFX_MAPUNIT_TWIP )
             {
                 nHeight = OutputDevice::LogicToLogic(
@@ -427,7 +427,7 @@ namespace frm
         {
             // corect measurement units
             SfxMapUnit eItemMapUnit = pFontHeightItem->GetPropUnit(); (void)eItemMapUnit;
-            ULONG nHeight = pFontHeightItem->GetHeight();
+            sal_uLong nHeight = pFontHeightItem->GetHeight();
             if ( _rNewAttribs.GetPool()->GetMetric( getWhich() ) != SFX_MAPUNIT_TWIP )
             {
                 nHeight = OutputDevice::LogicToLogic(
@@ -488,7 +488,7 @@ namespace frm
         // then we toggle the adjustment, too
         SvxAdjust eCurrentAdjustment = SVX_ADJUST_LEFT;
         const SfxPoolItem* pCurrentAdjustment = NULL;
-        if ( SFX_ITEM_ON == _rCurrentAttribs.GetItemState( EE_PARA_JUST, TRUE, &pCurrentAdjustment ) )
+        if ( SFX_ITEM_ON == _rCurrentAttribs.GetItemState( EE_PARA_JUST, sal_True, &pCurrentAdjustment ) )
             eCurrentAdjustment = static_cast< const SvxAdjustItem* >( pCurrentAdjustment )->GetAdjust();
 
         if ( eCurrentAdjustment == m_eOppositeDefaultAdjustment )
diff --git a/forms/source/richtext/rtattributehandler.hxx b/forms/source/richtext/rtattributehandler.hxx
index 4e15cbc44050..f15fd5d5c49b 100644
--- a/forms/source/richtext/rtattributehandler.hxx
+++ b/forms/source/richtext/rtattributehandler.hxx
@@ -146,7 +146,7 @@ namespace frm
     class LineSpacingHandler : public AttributeHandler
     {
     private:
-        USHORT  m_nLineSpace;
+        sal_uInt16  m_nLineSpace;
 
     public:
         LineSpacingHandler( AttributeId _nAttributeId );
diff --git a/forms/source/richtext/rtattributes.hxx b/forms/source/richtext/rtattributes.hxx
index 2506dbcb5186..29baa5b8d355 100644
--- a/forms/source/richtext/rtattributes.hxx
+++ b/forms/source/richtext/rtattributes.hxx
@@ -43,11 +43,11 @@ namespace frm
     /// the id of an attribute
     typedef sal_Int32   AttributeId;
     /// the "which id" of an item in an SfxItemSet
-    typedef USHORT      WhichId;
+    typedef sal_uInt16      WhichId;
     /// a SFX slot id
-    typedef USHORT      SfxSlotId;
+    typedef sal_uInt16      SfxSlotId;
     /// a script type
-    typedef USHORT      ScriptType;
+    typedef sal_uInt16      ScriptType;
 
     //====================================================================
     //= AttributeCheckState
diff --git a/forms/source/richtext/specialdispatchers.cxx b/forms/source/richtext/specialdispatchers.cxx
index 2540c9d797f2..c7f2005eb7df 100644
--- a/forms/source/richtext/specialdispatchers.cxx
+++ b/forms/source/richtext/specialdispatchers.cxx
@@ -80,10 +80,10 @@ namespace frm
         if ( !pEngine )
             return;
 
-        USHORT nParagraphs = pEngine->GetParagraphCount();
+        sal_uInt16 nParagraphs = pEngine->GetParagraphCount();
         if ( nParagraphs )
         {
-            USHORT nLastParaNumber = nParagraphs - 1;
+            sal_uInt16 nLastParaNumber = nParagraphs - 1;
             xub_StrLen nParaLen = pEngine->GetTextLen( nLastParaNumber );
             getEditView()->SetSelection( ESelection( 0, 0, nLastParaNumber, nParaLen ) );
         }