5 files changed, 11 insertions, 11 deletions
diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx
index e83a3f531810..abac4c89af76 100644
--- a/vcl/unx/generic/app/i18n_ic.cxx
+++ b/vcl/unx/generic/app/i18n_ic.cxx
@@ -512,7 +512,7 @@ SalI18N_InputContext::SupportInputMethodStyle( XIMStyles *pIMStyles )
 // handle extended and normal key input
 
 void
-SalI18N_InputContext::CommitKeyEvent(sal_Unicode* pText, sal_Size nLength)
+SalI18N_InputContext::CommitKeyEvent(sal_Unicode* pText, std::size_t nLength)
 {
     if (nLength == 1 && IsControlCode(pText[0]))
         return;
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index 89caeb7da885..cca391c159d7 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -1412,7 +1412,7 @@ PixmapHolder* SelectionManager::getPixmapHolder( Atom selection )
     return it->second->m_pPixmap;
 }
 
-static sal_Size GetTrueFormatSize(int nFormat)
+static std::size_t GetTrueFormatSize(int nFormat)
 {
     // http://mail.gnome.org/archives/wm-spec-list/2003-March/msg00067.html
     return nFormat == 32 ? sizeof(long) : nFormat/8;
@@ -1541,7 +1541,7 @@ bool SelectionManager::sendData( SelectionAdaptor* pAdaptor,
         }
         else
         {
-            sal_Size nUnitSize = GetTrueFormatSize(nFormat);
+            std::size_t nUnitSize = GetTrueFormatSize(nFormat);
             XChangeProperty( m_pDisplay,
                              requestor,
                              property,
@@ -1846,7 +1846,7 @@ bool SelectionManager::handleReceivePropertyNotify( XPropertyEvent& rNotify )
                      nFormat, nBytes );
 #endif
 
-            sal_Size nUnitSize = GetTrueFormatSize(nFormat);
+            std::size_t nUnitSize = GetTrueFormatSize(nFormat);
 
             if( it->second->m_eState == Selection::WaitingForData ||
                 it->second->m_eState == Selection::WaitingForResponse )
@@ -1948,7 +1948,7 @@ bool SelectionManager::handleSendPropertyNotify( XPropertyEvent& rNotify )
                          (const unsigned char*)rInc.m_aData.getConstArray()+rInc.m_nBufferPos );
 #endif
 
-                sal_Size nUnitSize = GetTrueFormatSize(rInc.m_nFormat);
+                std::size_t nUnitSize = GetTrueFormatSize(rInc.m_nFormat);
 
                 XChangeProperty( m_pDisplay,
                                  rInc.m_aRequestor,
@@ -2046,7 +2046,7 @@ bool SelectionManager::handleSelectionNotify( XSelectionEvent& rNotify )
                                     &pData );
             }
             it->second->m_eState        = Selection::Inactive;
-            sal_Size nUnitSize = GetTrueFormatSize(nFormat);
+            std::size_t nUnitSize = GetTrueFormatSize(nFormat);
             it->second->m_aData         = Sequence< sal_Int8 >(reinterpret_cast<sal_Int8*>(pData), nItems * nUnitSize);
             it->second->m_aDataArrived.set();
             if( pData )
diff --git a/vcl/unx/generic/print/psputil.cxx b/vcl/unx/generic/print/psputil.cxx
index 7c363b9898ee..53b94c465e99 100644
--- a/vcl/unx/generic/print/psputil.cxx
+++ b/vcl/unx/generic/print/psputil.cxx
@@ -210,9 +210,9 @@ ConverterFactory::Get (rtl_TextEncoding nEncoding)
 
 // wrapper for rtl_convertUnicodeToText that handles the usual cases for
 // textconversion in drawtext
-sal_Size
+std::size_t
 ConverterFactory::Convert (const sal_Unicode *pText, int nTextLen,
-                           unsigned char *pBuffer, sal_Size nBufferSize, rtl_TextEncoding nEncoding)
+                           unsigned char *pBuffer, std::size_t nBufferSize, rtl_TextEncoding nEncoding)
 {
     const sal_uInt32 nCvtFlags =  RTL_UNICODETOTEXT_FLAGS_UNDEFINED_QUESTIONMARK
         | RTL_UNICODETOTEXT_FLAGS_INVALID_QUESTIONMARK ;
diff --git a/vcl/unx/generic/print/psputil.hxx b/vcl/unx/generic/print/psputil.hxx
index 01a2d4f3cb31..b035de16aafe 100644
--- a/vcl/unx/generic/print/psputil.hxx
+++ b/vcl/unx/generic/print/psputil.hxx
@@ -53,8 +53,8 @@ public:
     ConverterFactory();
     ~ConverterFactory();
     rtl_UnicodeToTextConverter  Get (rtl_TextEncoding nEncoding);
-    sal_Size                    Convert (const sal_Unicode *pText, int nTextLen,
-                                         unsigned char *pBuffer, sal_Size nBufferSize,
+    std::size_t                 Convert (const sal_Unicode *pText, int nTextLen,
+                                         unsigned char *pBuffer, std::size_t nBufferSize,
                                          rtl_TextEncoding nEncoding);
 private:
 
diff --git a/vcl/unx/generic/print/text_gfx.cxx b/vcl/unx/generic/print/text_gfx.cxx
index 723fd46e2fa7..bcb46583a8ae 100644
--- a/vcl/unx/generic/print/text_gfx.cxx
+++ b/vcl/unx/generic/print/text_gfx.cxx
@@ -536,7 +536,7 @@ PrinterGfx::LicenseWarning(const Point& rPoint, const sal_Unicode* pStr,
             RTL_TEXTENCODING_ASCII_US);
     PSSetFont (aFontName, RTL_TEXTENCODING_ISO_8859_1);
 
-    sal_Size  nSize    = 4 * nLen;
+    std::size_t  nSize    = 4 * nLen;
     unsigned char* pBuffer = static_cast<unsigned char*>(alloca (nSize* sizeof(unsigned char)));
 
     ConverterFactory &rCvt = GetConverterFactory ();