fix up merging issues, so it compiles

20 files changed, 87 insertions, 154 deletions

diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx
index 479ae4a5df6b..f26de38cc1ab 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.cxx
@@ -156,7 +156,7 @@ SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::InsertEntry( const String& rText, con
 
 sal_Bool SvtIconChoiceCtrl::EditedEntry( SvxIconChoiceCtrlEntry*, const XubString&, sal_Bool )
 {
-    return TRUE;
+    return sal_True;
 }
 
 sal_Bool SvtIconChoiceCtrl::EditingEntry( SvxIconChoiceCtrlEntry* )
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index ee707829444e..90d0cb9e096a 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -838,7 +838,7 @@ sal_Bool SvHeaderTabListBox::IsCellFocusable() const
     return IsCellFocusEnabled();
 }
 // -----------------------------------------------------------------------
-BOOL SvHeaderTabListBox::GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn )
+sal_Bool SvHeaderTabListBox::GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn )
 {
     sal_Bool bRet = ( IsCellFocusEnabled() == sal_True );
     if ( bRet )
diff --git a/svtools/source/contnr/svtreebx.cxx b/svtools/source/contnr/svtreebx.cxx
index 91d36548ad88..12ac258dd31c 100644
--- a/svtools/source/contnr/svtreebx.cxx
+++ b/svtools/source/contnr/svtreebx.cxx
@@ -397,7 +397,7 @@ IMPL_LINK_INLINE_END( SvTreeListBox, CheckButtonClick, SvLBoxButtonData *, pData
 SvLBoxEntry* SvTreeListBox::InsertEntry(
     const XubString& aText,
     SvLBoxEntry* pParent,
-    BOOL bChildsOnDemand, ULONG nPos,
+    sal_Bool bChildsOnDemand, sal_uLong nPos,
     void* pUser,
     SvLBoxButtonKind eButtonKind
 )
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index ceefa0391753..67705c48a84a 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -41,7 +41,7 @@
 #include <svtools/svtools.hrc>
 #include <svtools/ctrlbox.hxx>
 #include <svtools/ctrltool.hxx>
-#include <borderhelper.hxx>
+#include <svtools/borderhelper.hxx>
 
 #include <vcl/i18nhelp.hxx>
 #include <vcl/fontcapabilities.hxx>
@@ -288,7 +288,7 @@ struct ImpLineListData
     long    nLine1;
     long    nLine2;
     long    nDistance;
-    USHORT  nStyle;
+    sal_uInt16  nStyle;
 };
 
 // -----------------------------------------------------------------------
@@ -301,9 +301,9 @@ inline const Color& LineListBox::GetPaintColor( void ) const
 // -----------------------------------------------------------------------
 
 
-inline void lclDrawPolygon( OutputDevice& rDev, const basegfx::B2DPolygon& rPolygon, long nWidth, USHORT nDashing )
+inline void lclDrawPolygon( OutputDevice& rDev, const basegfx::B2DPolygon& rPolygon, long nWidth, sal_uInt16 nDashing )
 {
-    USHORT nOldAA = rDev.GetAntialiasing();
+    sal_uInt16 nOldAA = rDev.GetAntialiasing();
     rDev.SetAntialiasing( nOldAA & !ANTIALIASING_ENABLE_B2DDRAW );
 
     Color aOldColor = rDev.GetFillColor( );
@@ -337,7 +337,7 @@ inline void lclDrawPolygon( OutputDevice& rDev, const basegfx::B2DPolygon& rPoly
 
 namespace svtools
 {
-    basegfx::B2DPolyPolygon ApplyLineDashing( const basegfx::B2DPolygon& rPolygon, USHORT nDashing, MapUnit eUnit )
+    basegfx::B2DPolyPolygon ApplyLineDashing( const basegfx::B2DPolygon& rPolygon, sal_uInt16 nDashing, MapUnit eUnit )
     {
         ::std::vector < double >aPattern;
         switch ( nDashing )
@@ -390,7 +390,7 @@ namespace svtools
     }
 
     void DrawLine( OutputDevice& rDev, const Point& rP1, const Point& rP2,
-        sal_uInt32 nWidth, USHORT nDashing )
+        sal_uInt32 nWidth, sal_uInt16 nDashing )
     {
         basegfx::B2DPolygon aPolygon;
         aPolygon.append( basegfx::B2DPoint( rP1.X(), rP1.Y() ) );
@@ -400,7 +400,7 @@ namespace svtools
 }
 
 void LineListBox::ImpGetLine( long nLine1, long nLine2, long nDistance,
-                            USHORT nStyle, Bitmap& rBmp, XubString& rStr )
+                            sal_uInt16 nStyle, Bitmap& rBmp, XubString& rStr )
 {
     Size aSize = GetOutputSizePixel();
     aSize.Width() -= 20;
@@ -613,7 +613,7 @@ void LineListBox::Clear()
 // -----------------------------------------------------------------------
 
 sal_uInt16 LineListBox::GetEntryPos( long nLine1, long nLine2,
-                                long nDistance, USHORT nStyle ) const
+                                long nDistance, sal_uInt16 nStyle ) const
 {
     for ( size_t i = 0, n = pLineList->size(); i < n; ++i ) {
         ImpLineListData* pData = (*pLineList)[ i ];
@@ -624,7 +624,7 @@ sal_uInt16 LineListBox::GetEntryPos( long nLine1, long nLine2,
                && (pData->nDistance == nDistance)
                && (pData->nStyle    == nStyle)
             ) {
-                return (USHORT)i;
+                return (sal_uInt16)i;
             }
         }
     }
@@ -649,7 +649,7 @@ long LineListBox::GetEntryLine2( sal_uInt16 nPos ) const
 
 // -----------------------------------------------------------------------
 
-long LineListBox::GetEntryDistance( USHORT nPos ) const
+long LineListBox::GetEntryDistance( sal_uInt16 nPos ) const
 {
     ImpLineListData* pData = (nPos < pLineList->size()) ? (*pLineList)[ nPos ] : NULL;
     return ( pData ) ? pData->nDistance : 0;
@@ -657,7 +657,7 @@ long LineListBox::GetEntryDistance( USHORT nPos ) const
 
 // -----------------------------------------------------------------------
 
-USHORT LineListBox::GetEntryStyle( USHORT nPos ) const
+sal_uInt16 LineListBox::GetEntryStyle( sal_uInt16 nPos ) const
 {
     ImpLineListData* pData = (nPos < pLineList->size()) ? (*pLineList)[ nPos ] : NULL;
     return ( pData ) ? pData->nStyle : STYLE_SOLID;
@@ -679,7 +679,7 @@ void LineListBox::UpdateLineColors( void )
         // exchange entries which containing lines
         SetUpdateMode( sal_False );
 
-        USHORT nSelEntry = GetSelectEntryPos();
+        sal_uInt16 nSelEntry = GetSelectEntryPos();
         for( size_t n = 0 ; n < nCount ; ++n )
         {
             ImpLineListData* pData = (*pLineList)[ n ];
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 96a824d362f0..01587623fc77 100755
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -3235,7 +3235,7 @@ const RulerIndent*  Ruler::GetIndents() const { return mpData->pIndents; }
  * ---------------------------------------------------*/
 void Ruler::DrawTicks()
 {
-    mbFormat = TRUE;
+    mbFormat = sal_True;
     ImplDraw();
 }
 
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index b969483d25af..9b61f88562da 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -38,9 +38,11 @@
 #include <vcl/decoview.hxx>
 #include <vcl/button.hxx>
 #include <vcl/edit.hxx>
+#include <vcl/image.hxx>
 #include "svtaccessiblefactory.hxx"
 #include <filectrl.hrc>
 #include <svtools/svtdata.hxx>
+#include <svtools/svtools.hrc>
 #include <limits>
 
 // =======================================================================
@@ -371,7 +373,7 @@ struct TabBar_Impl
 
 const sal_uInt16 TabBar::APPEND         = ::std::numeric_limits<sal_uInt16>::max();
 const sal_uInt16 TabBar::PAGE_NOT_FOUND = ::std::numeric_limits<sal_uInt16>::max();
-const sal_uInt16 TabBar::INSERT_TAB_POS = ::std::numeric_limits<USHORT>::max() - 1;
+const sal_uInt16 TabBar::INSERT_TAB_POS = ::std::numeric_limits<sal_uInt16>::max() - 1;
 
 void TabBar::ImplInit( WinBits nWinStyle )
 {
@@ -1249,7 +1251,8 @@ public:
 
     void drawPlusImage()
     {
-        Image aPlusImg( SvtResId(BMP_LIST_ADD) );
+        SvtResId id( BMP_LIST_ADD );
+        Image aPlusImg( id );
         // Center the image within the bounding rectangle.
         Size aSize = aPlusImg.GetSizePixel();
         Point pt = maRect.TopLeft();
@@ -1330,7 +1333,7 @@ private:
 void TabBar::Paint( const Rectangle& )
 {
     // Items berechnen und ausgeben
-    USHORT nItemCount = (USHORT)mpItemList->size();
+    sal_uInt16 nItemCount = (sal_uInt16)mpItemList->size();
     if (!nItemCount)
         return;
 
@@ -1700,7 +1703,7 @@ long TabBar::ImplDeactivatePage()
 
 void TabBar::ImplPrePaint()
 {
-    USHORT nItemCount = (USHORT)mpItemList->size();
+    sal_uInt16 nItemCount = (sal_uInt16)mpItemList->size();
     if (!nItemCount)
         return;
 
@@ -1713,7 +1716,7 @@ void TabBar::ImplPrePaint()
     // sichtbar wird
     if ( mbFirstFormat )
     {
-        mbFirstFormat = FALSE;
+        mbFirstFormat = sal_False;
 
         if ( mnCurPageId && (mnFirstPos == 0) && !mbDropPos )
         {
@@ -1722,9 +1725,9 @@ void TabBar::ImplPrePaint()
             {
                 // mbDropPos setzen (bzw. misbrauchen) um Invalidate()
                 // zu unterbinden
-                mbDropPos = TRUE;
+                mbDropPos = sal_True;
                 SetFirstPageId( mnCurPageId );
-                mbDropPos = FALSE;
+                mbDropPos = sal_False;
                 if ( mnFirstPos != 0 )
                     ImplFormat();
             }
@@ -1732,10 +1735,10 @@ void TabBar::ImplPrePaint()
     }
 }
 
-ImplTabBarItem* TabBar::ImplGetLastTabBarItem( USHORT nItemCount )
+ImplTabBarItem* TabBar::ImplGetLastTabBarItem( sal_uInt16 nItemCount )
 {
     // letzten sichtbaren Eintrag suchen
-    USHORT n = mnFirstPos+1;
+    sal_uInt16 n = mnFirstPos+1;
     if ( n >= nItemCount )
         n = nItemCount-1;
     ImplTabBarItem* pItem = seek( n );
@@ -2060,7 +2063,7 @@ sal_uInt16 TabBar::GetPagePos( sal_uInt16 nPageId ) const
 {
     for ( size_t i = 0, n = mpItemList->size(); i < n; ++i ) {
         if ( (*mpItemList)[ i ]->mnId == nPageId ) {
-            return USHORT( i );
+            return sal_uInt16( i );
         }
     }
     return PAGE_NOT_FOUND;
diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx
index b0751780862a..e558a72ae33a 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -455,7 +455,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessible
     const sal_uInt16                                    nItemId = mpParent->GetItemId( Point( aPoint.X, aPoint.Y ) );
     uno::Reference< accessibility::XAccessible >    xRet;
 
-    if( ((USHORT)-1) != nItemId )
+    if( ((sal_uInt16)-1) != nItemId )
     {
         const size_t nItemPos = mpParent->GetItemPos( nItemId );
 
diff --git a/svtools/source/dialogs/filedlg2.cxx b/svtools/source/dialogs/filedlg2.cxx
index 9525ea132598..a6ccff12a506 100644
--- a/svtools/source/dialogs/filedlg2.cxx
+++ b/svtools/source/dialogs/filedlg2.cxx
@@ -1216,7 +1216,7 @@ void ImpFileDialog::SetCurFilter( const UniString& rFilter )
 
     for ( size_t i = 0, n = aFilterList.size(); i < n; ++i ) {
         if ( aFilterList[ i ]->aName == rFilter ) {
-            pTypeList->SelectEntryPos( USHORT( i ) );
+            pTypeList->SelectEntryPos( sal_uInt16( i ) );
             return;
         }
     }
diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx
index 539c34538c44..15412276e587 100644
--- a/svtools/source/edit/texteng.cxx
+++ b/svtools/source/edit/texteng.cxx
@@ -2098,7 +2098,7 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectan
             // Ueber die Zeilen des Absatzes...
             // --------------------------------------------------
             sal_uInt16 nLines = pPortion->GetLines().Count();
-            USHORT nIndex = 0;
+            sal_uInt16 nIndex = 0;
             for ( sal_uInt16 nLine = 0; nLine < nLines; nLine++ )
             {
                 TextLine* pLine = pPortion->GetLines().GetObject(nLine);
diff --git a/svtools/source/filter.vcl/filter/sgfbram.cxx b/svtools/source/filter.vcl/filter/sgfbram.cxx
index f17b6c2f675a..8559cbee30eb 100644
--- a/svtools/source/filter.vcl/filter/sgfbram.cxx
+++ b/svtools/source/filter.vcl/filter/sgfbram.cxx
@@ -308,7 +308,7 @@ sal_Bool SgfFilterBMap(SvStream& rInp, SvStream& rOut, SgfHeader& rHead, SgfEntr
             rOut.Write((char*)pBuf,nWdtOut);
         }
     } else if (nColors==16) {
-        BYTE pl2= 0;     // Masken fuer die Planes
+        sal_uInt8 pl2= 0;     // Masken fuer die Planes
 
         rOut<<RGBQuad(0x00,0x00,0x00); // Schwarz
         rOut<<RGBQuad(0x24,0x24,0x24); // Grau 80%
diff --git a/svtools/source/filter.vcl/wmf/enhwmf.cxx b/svtools/source/filter.vcl/wmf/enhwmf.cxx
index f54eca6f6075..91cabcf430a3 100644
--- a/svtools/source/filter.vcl/wmf/enhwmf.cxx
+++ b/svtools/source/filter.vcl/wmf/enhwmf.cxx
@@ -272,8 +272,8 @@ void EnhWMFReader::ReadEMFPlusComment(sal_uInt32 length, sal_Bool& bHaveDC)
     length -= 4;
 
     while (length > 0) {
-        UINT16 type, flags;
-        UINT32 size, dataSize;
+        sal_uInt16 type, flags;
+        sal_uInt32 size, dataSize;
         sal_uInt32 next;
 
         *pWMF >> type >> flags >> size >> dataSize;
@@ -384,7 +384,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
             EMFP_DEBUG(printf ("\tGDI comment\n\t\tlength: %d\n", length));
 
             if( length >= 4 ) {
-                UINT32 id;
+                sal_uInt32 id;
 
                 *pWMF >> id;
 
@@ -1337,14 +1337,14 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
 
             case EMR_CREATEDIBPATTERNBRUSHPT :
             {
-                UINT32  nStart = pWMF->Tell() - 8;
+                sal_uInt32  nStart = pWMF->Tell() - 8;
                 Bitmap aBitmap;
 
                 *pWMF >> nIndex;
 
                 if ( ( nIndex & ENHMETA_STOCK_OBJECT ) == 0 )
                 {
-                    UINT32 usage, offBmi, cbBmi, offBits, cbBits;
+                    sal_uInt32 usage, offBmi, cbBmi, offBits, cbBits;
 
                     *pWMF >> usage;
                     *pWMF >> offBmi;
@@ -1353,28 +1353,28 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
                     *pWMF >> cbBits;
 
                     if ( (cbBits > (SAL_MAX_UINT32 - 14)) || ((SAL_MAX_UINT32 - 14) - cbBits < cbBmi) )
-                       bStatus = FALSE;
+                       bStatus = sal_False;
                     else if ( offBmi )
                     {
-                        UINT32  nSize = cbBmi + cbBits + 14;
+                        sal_uInt32  nSize = cbBmi + cbBits + 14;
                         if ( nSize <= ( nEndPos - nStartPos ) )
                         {
                             char*   pBuf = new char[ nSize ];
 
                             SvMemoryStream aTmp( pBuf, nSize, STREAM_READ | STREAM_WRITE );
-                            aTmp.ObjectOwnsMemory( TRUE );
-                            aTmp << (BYTE)'B'
-                                 << (BYTE)'M'
-                                 << (UINT32)cbBits
-                                 << (UINT16)0
-                                 << (UINT16)0
-                                 << (UINT32)cbBmi + 14;
+                            aTmp.ObjectOwnsMemory( sal_True );
+                            aTmp << (sal_uInt8)'B'
+                                 << (sal_uInt8)'M'
+                                 << (sal_uInt32)cbBits
+                                 << (sal_uInt16)0
+                                 << (sal_uInt16)0
+                                 << (sal_uInt32)cbBmi + 14;
                             pWMF->Seek( nStart + offBmi );
                             pWMF->Read( pBuf + 14, cbBmi );
                             pWMF->Seek( nStart + offBits );
                             pWMF->Read( pBuf + 14 + cbBmi, cbBits );
                             aTmp.Seek( 0 );
-                            aBitmap.Read( aTmp, TRUE );
+                            aBitmap.Read( aTmp, sal_True );
                         }
                     }
                 }
@@ -1457,13 +1457,13 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
 
 sal_Bool EnhWMFReader::ReadHeader()
 {
-    sal_uInt32      nUINT32, nHeaderSize, nPalEntries;
+    sal_uInt32      nsal_uInt32, nHeaderSize, nPalEntries;
     sal_Int32       nLeft, nTop, nRight, nBottom;
 
     // METAFILEHEADER SPARE ICH MIR HIER
     // Einlesen des METAHEADER
-    *pWMF >> nUINT32 >> nHeaderSize;
-    if ( nUINT32 != 1 )         // Typ
+    *pWMF >> nsal_uInt32 >> nHeaderSize;
+    if ( nsal_uInt32 != 1 )         // Typ
         return sal_False;
 
     // bound size
@@ -1482,12 +1482,12 @@ sal_Bool EnhWMFReader::ReadHeader()
     rclFrame.Right() = nRight;
     rclFrame.Bottom() = nBottom;
 
-    *pWMF >> nUINT32;                                   // signature
+    *pWMF >> nsal_uInt32;                                   // signature
 
-    if ( nUINT32 != 0x464d4520 )
+    if ( nsal_uInt32 != 0x464d4520 )
         return sal_False;
 
-    *pWMF >> nUINT32;                                   // nVersion
+    *pWMF >> nsal_uInt32;                                   // nVersion
     *pWMF >> nEndPos;                                   // size of metafile
     nEndPos += nStartPos;
 
diff --git a/svtools/source/filter.vcl/wmf/winmtf.cxx b/svtools/source/filter.vcl/wmf/winmtf.cxx
index 6335ee12ade9..b0625567d5d6 100644
--- a/svtools/source/filter.vcl/wmf/winmtf.cxx
+++ b/svtools/source/filter.vcl/wmf/winmtf.cxx
@@ -1352,7 +1352,7 @@ void WinMtfOutput::DrawPolygon( Polygon& rPolygon, sal_Bool bRecordPath )
                     aMemStm << aFill;
 
                     mpGDIMetaFile->AddAction( new MetaCommentAction( "XPATHFILL_SEQ_BEGIN", 0,
-                                                            static_cast<const BYTE*>(aMemStm.GetData()),
+                                                            static_cast<const sal_uInt8*>(aMemStm.GetData()),
                                                             aMemStm.Seek( STREAM_SEEK_TO_END ) ) );
                     mpGDIMetaFile->AddAction( new MetaCommentAction( "XPATHFILL_SEQ_END" ) );
                 }
@@ -2216,14 +2216,14 @@ void WinMtfOutput::PassEMFPlusHeaderInfo()
     // rotate and scale operations
     mem << one << zero << zero << one << zero << zero;
 
-    mpGDIMetaFile->AddAction( new MetaCommentAction( "EMF_PLUS_HEADER_INFO", 0, (const BYTE*) mem.GetData(), mem.GetEndOfData() ) );
-    mpGDIMetaFile->UseCanvas( TRUE );
+    mpGDIMetaFile->AddAction( new MetaCommentAction( "EMF_PLUS_HEADER_INFO", 0, (const sal_uInt8*) mem.GetData(), mem.GetEndOfData() ) );
+    mpGDIMetaFile->UseCanvas( sal_True );
 }
 
-void WinMtfOutput::PassEMFPlus( void* pBuffer, UINT32 nLength )
+void WinMtfOutput::PassEMFPlus( void* pBuffer, sal_uInt32 nLength )
 {
     EMFP_DEBUG(printf ("\t\t\tadd EMF_PLUS comment length %d\n", nLength));
-    mpGDIMetaFile->AddAction( new MetaCommentAction( "EMF_PLUS", 0, static_cast<const BYTE*>(pBuffer), nLength ) );
+    mpGDIMetaFile->AddAction( new MetaCommentAction( "EMF_PLUS", 0, static_cast<const sal_uInt8*>(pBuffer), nLength ) );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/filter.vcl/wmf/winmtf.hxx b/svtools/source/filter.vcl/wmf/winmtf.hxx
index d6db4b6fcdd6..bd2293fe108b 100644
--- a/svtools/source/filter.vcl/wmf/winmtf.hxx
+++ b/svtools/source/filter.vcl/wmf/winmtf.hxx
@@ -682,7 +682,7 @@ class WinMtfOutput
         void                UpdateClipRegion();
         void                AddFromGDIMetaFile( GDIMetaFile& rGDIMetaFile );
 
-        void                PassEMFPlus( void* pBuffer, UINT32 nLength );
+        void                PassEMFPlus( void* pBuffer, sal_uInt32 nLength );
         void                PassEMFPlusHeaderInfo();
 
                             WinMtfOutput( GDIMetaFile& rGDIMetaFile );
@@ -723,7 +723,7 @@ class EnhWMFReader : public WinMtf
 {
     sal_Bool        bRecordPath;
     sal_Int32       nRecordCount;
-    BOOL            bEMFPlus;
+    sal_Bool        bEMFPlus;
 
 
     sal_Bool            ReadHeader();
@@ -732,7 +732,7 @@ class EnhWMFReader : public WinMtf
 
 public:
                     EnhWMFReader( SvStream& rStreamWMF, GDIMetaFile& rGDIMetaFile, FilterConfigItem* pConfigItem = NULL )
-                                    : WinMtf( new WinMtfOutput( rGDIMetaFile ), rStreamWMF, pConfigItem ), bRecordPath( sal_False ), bEMFPlus (FALSE) {};
+                                    : WinMtf( new WinMtfOutput( rGDIMetaFile ), rStreamWMF, pConfigItem ), bRecordPath( sal_False ), bEMFPlus( sal_False ) {};
                     ~EnhWMFReader();
 
     sal_Bool            ReadEnhWMF();
diff --git a/svtools/source/hatchwindow/hatchwindow.cxx b/svtools/source/hatchwindow/hatchwindow.cxx
index c3c26071646c..c32e3a6c0b60 100644
--- a/svtools/source/hatchwindow/hatchwindow.cxx
+++ b/svtools/source/hatchwindow/hatchwindow.cxx
@@ -34,7 +34,7 @@
 #include "ipwin.hxx"
 
 #include <toolkit/helper/convert.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
 using namespace ::com::sun::star;
@@ -53,7 +53,7 @@ void VCLXHatchWindow::initializeWindow( const uno::Reference< awt::XWindowPeer >
                 const awt::Rectangle& aBounds,
                 const awt::Size& aSize )
 {
-    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
 
     Window* pParent = NULL;
     VCLXWindow* pParentComponent = VCLXWindow::GetImplementation( xParent );
diff --git a/svtools/source/hatchwindow/hatchwindowfactory.cxx b/svtools/source/hatchwindow/hatchwindowfactory.cxx
index 3c7dc2dbc2c0..a0ff0d4daf17 100644
--- a/svtools/source/hatchwindow/hatchwindowfactory.cxx
+++ b/svtools/source/hatchwindow/hatchwindowfactory.cxx
@@ -71,7 +71,7 @@ uno::Reference< embed::XHatchWindow > SAL_CALL OHatchWindowFactory::createHatchW
     if ( !xParent.is() )
         throw lang::IllegalArgumentException(); // TODO
 
-    ::vos::OGuard aGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
     VCLXHatchWindow* pResult = new VCLXHatchWindow();
     pResult->initializeWindow( xParent, aBounds, aHandlerSize );
     return uno::Reference< embed::XHatchWindow >( static_cast< embed::XHatchWindow* >( pResult ) );
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index 0ee5a722df35..92fd64bde9cc 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -529,77 +529,6 @@ static sal_uInt16 GetFolderDescriptionId_Impl( const String& rURL )
     return nRet;
 }
 
-/*
-static ResMgr* GetIsoResMgr_Impl()
-{
-    static ResMgr* pIsoResMgr = NULL;
-
-    if ( !pIsoResMgr )
-    {
-        ByteString aResMgrName( "iso" );
-        pIsoResMgr = ResMgr::CreateResMgr(
-            aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() );
-        if ( !pIsoResMgr )
-        {
-            // no "iso" resource -> search for "ooo" resource
-            aResMgrName = ByteString( "ooo" );
-            pIsoResMgr = ResMgr::CreateResMgr(
-                aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() );
-        }
-    }
-
-    return pIsoResMgr;
-}
-
-static ImageList* CreateImageList_Impl( sal_uInt16 nResId )
-{
-    ImageList* pList = NULL;
-    ResMgr* pResMgr = GetIsoResMgr_Impl();
-    DBG_ASSERT( pResMgr, "SvFileInformationManager::CreateImageList_Impl(): no resmgr" );
-    ResId aResId( nResId, *pResMgr );
-    aResId.SetRT( RSC_IMAGELIST );
-    if ( pResMgr->IsAvailable( aResId ) )
-        pList = new ImageList( aResId );
-    else
-        pList = new ImageList();
-    return pList;
-}
-
-static Image GetOfficeImageFromList_Impl( sal_uInt16 nImageId, sal_Bool bBig )
-{
-    ImageList* pList = NULL;
-
-    static ImageList* _pSmallOfficeImgList = NULL;
-    static ImageList* _pBigOfficeImgList = NULL;
-    static sal_uLong nStyle = Application::GetSettings().GetStyleSettings().GetSymbolsStyle();
-
-    // If the style has been changed, throw away our cache of the older images
-    if ( nStyle != Application::GetSettings().GetStyleSettings().GetSymbolsStyle() )
-    {
-        delete _pSmallOfficeImgList, _pSmallOfficeImgList = NULL;
-        delete _pBigOfficeImgList, _pBigOfficeImgList = NULL;
-        nStyle = Application::GetSettings().GetStyleSettings().GetSymbolsStyle();
-    }
-
-    if ( bBig )
-    {
-        if ( !_pBigOfficeImgList )
-            _pBigOfficeImgList = CreateImageList_Impl( RID_SVTOOLS_IMAGELIST_BIG );
-        pList = _pBigOfficeImgList;
-    }
-    else
-    {
-        if ( !_pSmallOfficeImgList )
-            _pSmallOfficeImgList = CreateImageList_Impl( RID_SVTOOLS_IMAGELIST_SMALL );
-        pList = _pSmallOfficeImgList;
-    }
-
-    Image aImage = pList->GetImage( nImageId );
-
-    return aImage;
-}
-*/
-
 static Image GetImageFromList_Impl( sal_uInt16 nImageId, sal_Bool bBig )
 {
     if ( !bBig && IMG_FOLDER == nImageId )
@@ -636,7 +565,8 @@ static Image GetImageFromList_Impl( sal_uInt16 nImageId, sal_Bool bBig )
     if ( pList->HasImageAtPos( nImageId ) )
         return pList->GetImage( nImageId );
     else
-        return GetOfficeImageFromList_Impl( nImageId, bBig );
+        return Image();
+//      return GetOfficeImageFromList_Impl( nImageId, bBig );
 }
 
 String SvFileInformationManager::GetDescription_Impl( const INetURLObject& rObject, sal_Bool bDetectFolder )
diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx
index 1aec8d4b27a4..eda54726c717 100644
--- a/svtools/source/table/tablecontrol.cxx
+++ b/svtools/source/table/tablecontrol.cxx
@@ -594,7 +594,6 @@ namespace svt { namespace table
     {
         ImplCallEventListenersAndHandler( VCLEVENT_TABLEROW_SELECT, m_pImpl->getSelectHandler(), this );
     }
-}} // namespace svt::table
 //........................................................................
 
     //------------------------------------------------------------------------------------------------------------------
@@ -608,6 +607,7 @@ namespace svt { namespace table
     {
         return m_pImpl->getSelectHandler();
     }
+}} // namespace svt::table
 
 //......................................................................................................................
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx
index 1f48b904aec3..778925a60c44 100644
--- a/svtools/source/uno/svtxgridcontrol.cxx
+++ b/svtools/source/uno/svtxgridcontrol.cxx
@@ -83,7 +83,7 @@ void SVTXGridControl::SetWindow( Window* pWindow )
 // ---------------------------------------------------------------------------------------------------------------------
 sal_Int32 SAL_CALL SVTXGridControl::getRowAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::vos::OGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     TableControl* pTable = dynamic_cast< TableControl* >( GetWindow() );
     ENSURE_OR_RETURN( pTable != NULL, "SVTXGridControl::getRowAtPoint: no control (anymore)!", -1 );
@@ -95,7 +95,7 @@ sal_Int32 SAL_CALL SVTXGridControl::getRowAtPoint(::sal_Int32 x, ::sal_Int32 y)
 // ---------------------------------------------------------------------------------------------------------------------
 sal_Int32 SAL_CALL SVTXGridControl::getColumnAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::vos::OGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     TableControl* pTable = dynamic_cast< TableControl* >( GetWindow() );
     ENSURE_OR_RETURN( pTable != NULL, "SVTXGridControl::getColumnAtPoint: no control (anymore)!", -1 );
@@ -107,7 +107,7 @@ sal_Int32 SAL_CALL SVTXGridControl::getColumnAtPoint(::sal_Int32 x, ::sal_Int32
 // ---------------------------------------------------------------------------------------------------------------------
 sal_Int32 SAL_CALL SVTXGridControl::getCurrentColumn(  ) throw (RuntimeException)
 {
-    ::vos::OGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     TableControl* pTable = dynamic_cast< TableControl* >( GetWindow() );
     ENSURE_OR_RETURN( pTable != NULL, "SVTXGridControl::getCurrentColumn: no control (anymore)!", -1 );
@@ -119,7 +119,7 @@ sal_Int32 SAL_CALL SVTXGridControl::getCurrentColumn(  ) throw (RuntimeException
 // ---------------------------------------------------------------------------------------------------------------------
 sal_Int32 SAL_CALL SVTXGridControl::getCurrentRow(  ) throw (RuntimeException)
 {
-    ::vos::OGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     TableControl* pTable = dynamic_cast< TableControl* >( GetWindow() );
     ENSURE_OR_RETURN( pTable != NULL, "SVTXGridControl::getCurrentRow: no control (anymore)!", -1 );
@@ -531,7 +531,7 @@ void SAL_CALL//-----------------------------------------------------------------
 //----------------------------------------------------------------------------------------------------------------------
 void SAL_CALL SVTXGridControl::dataChanged( const GridDataEvent& i_event ) throw (RuntimeException)
 {
-    ::vos::OGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     m_pTableModel->notifyDataChanged( i_event );
 
@@ -596,7 +596,7 @@ void SAL_CALL SVTXGridControl::disposing( const ::com::sun::star::lang::EventObj
 //----------------------------------------------------------------------------------------------------------------------
 void SAL_CALL SVTXGridControl::selectRow( ::sal_Int32 i_rowIndex ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::vos::OGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     TableControl* pTable = dynamic_cast< TableControl* >( GetWindow() );
     ENSURE_OR_RETURN_VOID( pTable, "SVTXGridControl::selectRow: no control (anymore)!" );
@@ -607,7 +607,7 @@ void SAL_CALL SVTXGridControl::selectRow( ::sal_Int32 i_rowIndex ) throw (::com:
 //----------------------------------------------------------------------------------------------------------------------
 void SAL_CALL SVTXGridControl::selectAllRows() throw (::com::sun::star::uno::RuntimeException)
 {
-    ::vos::OGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     TableControl* pTable = dynamic_cast< TableControl* >( GetWindow() );
     ENSURE_OR_RETURN_VOID( pTable, "SVTXGridControl::selectAllRows: no control (anymore)!" );
@@ -618,7 +618,7 @@ void SAL_CALL SVTXGridControl::selectAllRows() throw (::com::sun::star::uno::Run
 //----------------------------------------------------------------------------------------------------------------------
 void SAL_CALL SVTXGridControl::deselectRow( ::sal_Int32 i_rowIndex ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::vos::OGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     TableControl* pTable = dynamic_cast< TableControl* >( GetWindow() );
     ENSURE_OR_RETURN_VOID( pTable, "SVTXGridControl::deselectRow: no control (anymore)!" );
@@ -629,7 +629,7 @@ void SAL_CALL SVTXGridControl::deselectRow( ::sal_Int32 i_rowIndex ) throw (::co
 //----------------------------------------------------------------------------------------------------------------------
 void SAL_CALL SVTXGridControl::deselectAllRows() throw (::com::sun::star::uno::RuntimeException)
 {
-    ::vos::OGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     TableControl* pTable = dynamic_cast< TableControl* >( GetWindow() );
     ENSURE_OR_RETURN_VOID( pTable, "SVTXGridControl::deselectAllRows: no control (anymore)!" );
@@ -640,7 +640,7 @@ void SAL_CALL SVTXGridControl::deselectAllRows() throw (::com::sun::star::uno::R
 //----------------------------------------------------------------------------------------------------------------------
 ::com::sun::star::uno::Sequence< ::sal_Int32 > SAL_CALL SVTXGridControl::getSelection() throw (::com::sun::star::uno::RuntimeException)
 {
-    ::vos::OGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     TableControl* pTable = dynamic_cast< TableControl* >( GetWindow() );
     ENSURE_OR_RETURN( pTable, "SVTXGridControl::getSelection: no control (anymore)!", Sequence< sal_Int32 >() );
@@ -655,7 +655,7 @@ void SAL_CALL SVTXGridControl::deselectAllRows() throw (::com::sun::star::uno::R
 //----------------------------------------------------------------------------------------------------------------------
 ::sal_Bool SAL_CALL SVTXGridControl::isSelectionEmpty() throw (::com::sun::star::uno::RuntimeException)
 {
-    ::vos::OGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     TableControl* pTable = dynamic_cast< TableControl* >( GetWindow() );
     ENSURE_OR_RETURN( pTable, "SVTXGridControl::getSelection: no control (anymore)!", sal_True );
@@ -666,7 +666,7 @@ void SAL_CALL SVTXGridControl::deselectAllRows() throw (::com::sun::star::uno::R
 //----------------------------------------------------------------------------------------------------------------------
 ::sal_Bool SAL_CALL SVTXGridControl::isSelectedIndex( ::sal_Int32 index ) throw (::com::sun::star::uno::RuntimeException)
 {
-    ::vos::OGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     TableControl* pTable = dynamic_cast< TableControl* >( GetWindow() );
     ENSURE_OR_RETURN( pTable, "SVTXGridControl::isSelectedIndex: no control (anymore)!", sal_False );
@@ -686,7 +686,7 @@ void SVTXGridControl::dispose() throw(::com::sun::star::uno::RuntimeException)
 //----------------------------------------------------------------------------------------------------------------------
 void SVTXGridControl::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 {
-    ::vos::OGuard aGuard( GetMutex() );
+    SolarMutexGuard aGuard;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xKeepAlive( this );
     switch ( rVclWindowEvent.GetId() )
@@ -781,4 +781,4 @@ void SVTXGridControl::impl_updateColumnsFromModel_nothrow()
     }
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/uno/unocontroltablemodel.cxx b/svtools/source/uno/unocontroltablemodel.cxx
index 9aff5f1df8e5..73085561e542 100644
--- a/svtools/source/uno/unocontroltablemodel.cxx
+++ b/svtools/source/uno/unocontroltablemodel.cxx
@@ -47,7 +47,7 @@
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 
 // .....................................................................................................................
 namespace svt { namespace table
@@ -892,4 +892,4 @@ namespace svt { namespace table
 // .....................................................................................................................
 } } // svt::table
 // .....................................................................................................................
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/uno/unogridcolumnfacade.cxx b/svtools/source/uno/unogridcolumnfacade.cxx
index d2f5e7b565fd..46c9273ba153 100755
--- a/svtools/source/uno/unogridcolumnfacade.cxx
+++ b/svtools/source/uno/unogridcolumnfacade.cxx
@@ -44,7 +44,7 @@
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/svapp.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
 
 // .....................................................................................................................
 namespace svt { namespace table
@@ -150,7 +150,7 @@ namespace svt { namespace table
     {
         if ( i_event.AttributeName.equalsAscii( "DataColumnIndex" ) )
         {
-            ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        SolarMutexGuard aGuard;
             if ( m_pColumnImplementation != NULL )
                 m_pColumnImplementation->dataColumnIndexChanged();
             return;
@@ -173,7 +173,7 @@ namespace svt { namespace table
         OSL_ENSURE( nChangedAttributes != COL_ATTRS_NONE,
             "ColumnChangeMultiplexer::columnChanged: unknown column attributed changed!" );
 
-        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    SolarMutexGuard aGuard;
         if ( m_pColumnImplementation != NULL )
             m_pColumnImplementation->columnChanged( nChangedAttributes );
     }