summaryrefslogtreecommitdiff
path: root/vcl/unx
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/unx')
-rw-r--r--vcl/unx/generic/fontmanager/fontcache.cxx14
-rw-r--r--vcl/unx/generic/gdi/cairotextrender.cxx2
-rw-r--r--vcl/unx/generic/gdi/font.cxx2
-rw-r--r--vcl/unx/generic/glyphs/freetype_glyphcache.cxx8
-rw-r--r--vcl/unx/generic/print/genpspgraphics.cxx4
-rw-r--r--vcl/unx/gtk/salnativewidgets-gtk.cxx76
6 files changed, 52 insertions, 54 deletions
diff --git a/vcl/unx/generic/fontmanager/fontcache.cxx b/vcl/unx/generic/fontmanager/fontcache.cxx
index a4a1550b0a57..27851c19f563 100644
--- a/vcl/unx/generic/fontmanager/fontcache.cxx
+++ b/vcl/unx/generic/fontmanager/fontcache.cxx
@@ -76,7 +76,7 @@ void FontCache::clearCache()
{
for( FontDirMap::iterator entry_it = dir_it->second.m_aEntries.begin(); entry_it != dir_it->second.m_aEntries.end(); ++entry_it )
{
- for( FontCacheEntry::iterator font_it = entry_it->second.m_aEntry.begin(); font_it != entry_it->second.m_aEntry.end(); ++font_it )
+ for( std::list< PrintFontManager::PrintFont* >::iterator font_it = entry_it->second.m_aEntry.begin(); font_it != entry_it->second.m_aEntry.end(); ++font_it )
delete *font_it;
}
}
@@ -124,7 +124,7 @@ void FontCache::flush()
for( FontDirMap::const_iterator entry_it = rDir.begin(); entry_it != rDir.end(); ++entry_it )
{
// insert cache entries
- const FontCacheEntry& rEntry( entry_it->second.m_aEntry );
+ const std::list< PrintFontManager::PrintFont* >& rEntry( entry_it->second.m_aEntry );
if( rEntry.empty() )
continue;
@@ -140,7 +140,7 @@ void FontCache::flush()
aStream.WriteLine(aLine.makeStringAndClear());
sal_Int32 nSubEntry = 0;
- for( FontCacheEntry::const_iterator it = rEntry.begin(); it != rEntry.end(); ++it, nSubEntry++ )
+ for( std::list< PrintFontManager::PrintFont* >::const_iterator it = rEntry.begin(); it != rEntry.end(); ++it, nSubEntry++ )
{
/*
* for each font entry write:
@@ -463,7 +463,7 @@ void FontCache::read()
continue;
}
- FontCacheEntry& rEntry = (*pDir)[aFile].m_aEntry;
+ std::list< PrintFontManager::PrintFont* >& rEntry = (*pDir)[aFile].m_aEntry;
rEntry.push_back( pFont );
}
}
@@ -611,7 +611,7 @@ bool FontCache::getFontCacheFile( int nDirID, const OString& rFile, list< PrintF
FontDirMap::const_iterator entry = dir->second.m_aEntries.find( rFile );
if( entry != dir->second.m_aEntries.end() )
{
- for( FontCacheEntry::const_iterator font = entry->second.m_aEntry.begin(); font != entry->second.m_aEntry.end(); ++font )
+ for( std::list< PrintFontManager::PrintFont* >::const_iterator font = entry->second.m_aEntry.begin(); font != entry->second.m_aEntry.end(); ++font )
{
bSuccess = true;
PrintFontManager::PrintFont* pFont = clonePrintFont( *font );
@@ -644,7 +644,7 @@ void FontCache::updateFontCacheEntry( const PrintFontManager::PrintFont* pFont,
}
FontCacheData::const_iterator dir = m_aCache.find( nDirID );
FontDirMap::const_iterator entry;
- FontCacheEntry::const_iterator font;
+ std::list< PrintFontManager::PrintFont* >::const_iterator font;
PrintFontManager::PrintFont* pCacheFont = nullptr;
if( dir != m_aCache.end() )
@@ -700,7 +700,7 @@ bool FontCache::listDirectory( const OString& rDir, std::list< PrintFontManager:
{
for( FontDirMap::const_iterator file = dir->second.m_aEntries.begin(); file != dir->second.m_aEntries.end(); ++file )
{
- for( FontCacheEntry::const_iterator font = file->second.m_aEntry.begin(); font != file->second.m_aEntry.end(); ++font )
+ for( std::list< PrintFontManager::PrintFont* >::const_iterator font = file->second.m_aEntry.begin(); font != file->second.m_aEntry.end(); ++font )
{
PrintFontManager::PrintFont* pFont = clonePrintFont( *font );
rNewFonts.push_back( pFont );
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx
index 513f5e58dc2e..d1ad18091d93 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -593,7 +593,7 @@ const Ucs2SIntMap* CairoTextRender::GetFontEncodingVector( const PhysicalFontFac
void CairoTextRender::GetGlyphWidths( const PhysicalFontFace* pFont,
bool bVertical,
- Int32Vector& rWidths,
+ std::vector< sal_Int32 >& rWidths,
Ucs2UIntMap& rUnicodeEnc )
{
// in this context the pFont->GetFontId() is a valid PSP
diff --git a/vcl/unx/generic/gdi/font.cxx b/vcl/unx/generic/gdi/font.cxx
index 16694655ee03..3cc651064d06 100644
--- a/vcl/unx/generic/gdi/font.cxx
+++ b/vcl/unx/generic/gdi/font.cxx
@@ -157,7 +157,7 @@ const Ucs2SIntMap* X11SalGraphics::GetFontEncodingVector( const PhysicalFontFace
void X11SalGraphics::GetGlyphWidths( const PhysicalFontFace* pFont,
bool bVertical,
- Int32Vector& rWidths,
+ std::vector< sal_Int32 >& rWidths,
Ucs2UIntMap& rUnicodeEnc )
{
mxTextRenderImpl->GetGlyphWidths(pFont, bVertical, rWidths, rUnicodeEnc);
diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
index e12fcb8332c5..3db03a22ac27 100644
--- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
+++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
@@ -1307,8 +1307,7 @@ void ServerFont::ApplyGSUB( const FontSelectPattern& rFSD )
{
#define MKTAG(s) ((((((s[0]<<8)+s[1])<<8)+s[2])<<8)+s[3])
- typedef std::vector<sal_uLong> ReqFeatureTagList;
- ReqFeatureTagList aReqFeatureTagList;
+ std::vector<sal_uInt32> aReqFeatureTagList;
if( rFSD.mbVertical )
aReqFeatureTagList.push_back( MKTAG("vert") );
// TODO: request more features depending on script and language system
@@ -1458,8 +1457,7 @@ void ServerFont::ApplyGSUB( const FontSelectPattern& rFSD )
pSubLookup += 4;
typedef std::pair<sal_uInt16,sal_uInt16> GlyphSubst;
- typedef std::vector<GlyphSubst> SubstVector;
- SubstVector aSubstVector;
+ std::vector<GlyphSubst> aSubstVector;
const FT_Byte* pCoverage = pGsubBase + nOfsLookupList + nOfsLookupTable + nOfsSubLookupTable + nOfsCoverage;
const sal_uInt16 nFmtCoverage = GetUShort( pCoverage+0 );
@@ -1497,7 +1495,7 @@ void ServerFont::ApplyGSUB( const FontSelectPattern& rFSD )
break;
}
- SubstVector::iterator it( aSubstVector.begin() );
+ std::vector<GlyphSubst>::iterator it( aSubstVector.begin() );
switch( nFmtSubstitution )
{
diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx
index 9c032853e9f5..2d8461ad6c1a 100644
--- a/vcl/unx/generic/print/genpspgraphics.cxx
+++ b/vcl/unx/generic/print/genpspgraphics.cxx
@@ -1049,7 +1049,7 @@ const Ucs2SIntMap* GenPspGraphics::GetFontEncodingVector( const PhysicalFontFace
void GenPspGraphics::GetGlyphWidths( const PhysicalFontFace* pFont,
bool bVertical,
- Int32Vector& rWidths,
+ std::vector< sal_Int32 >& rWidths,
Ucs2UIntMap& rUnicodeEnc )
{
// in this context the pFont->GetFontId() is a valid PSP
@@ -1078,7 +1078,7 @@ const Ucs2SIntMap* GenPspGraphics::DoGetFontEncodingVector( fontID aFont, const
void GenPspGraphics::DoGetGlyphWidths( psp::fontID aFont,
bool bVertical,
- Int32Vector& rWidths,
+ std::vector< sal_Int32 >& rWidths,
Ucs2UIntMap& rUnicodeEnc )
{
psp::PrintFontManager& rMgr = psp::PrintFontManager::get();
diff --git a/vcl/unx/gtk/salnativewidgets-gtk.cxx b/vcl/unx/gtk/salnativewidgets-gtk.cxx
index e3badbc2205c..96f68851bc94 100644
--- a/vcl/unx/gtk/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/salnativewidgets-gtk.cxx
@@ -911,7 +911,7 @@ bool GtkSalGraphics::drawNativeControl(ControlType nType, ControlPart nPart,
return true;
}
- clipList aClip;
+ std::list< Rectangle > aClip;
int nPasses = 0;
GdkDrawable* gdkDrawable[2];
std::unique_ptr<GdkX11Pixmap> xPixmap;
@@ -992,7 +992,7 @@ bool GtkSalGraphics::DoDrawNativeControl(
ControlType nType,
ControlPart nPart,
const Rectangle& aCtrlRect,
- const clipList& aClip,
+ const std::list< Rectangle >& aClip,
ControlState nState,
const ImplControlValue& aValue,
const OUString& rCaption,
@@ -1430,7 +1430,7 @@ bool GtkSalGraphics::NWPaintGTKArrow(
GdkDrawable* gdkDrawable,
ControlType, ControlPart,
const Rectangle& rControlRectangle,
- const clipList& rClipList,
+ const std::list< Rectangle >& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& )
{
@@ -1438,7 +1438,7 @@ bool GtkSalGraphics::NWPaintGTKArrow(
GtkStateType stateType(nState&ControlState::PRESSED?GTK_STATE_ACTIVE:GTK_STATE_NORMAL);
GdkRectangle clipRect;
- for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
+ for( std::list< Rectangle >::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
{
clipRect.x = it->Left();
clipRect.y = it->Top();
@@ -1459,7 +1459,7 @@ bool GtkSalGraphics::NWPaintGTKListHeader(
GdkDrawable* gdkDrawable,
ControlType, ControlPart,
const Rectangle& rControlRectangle,
- const clipList& rClipList,
+ const std::list< Rectangle >& rClipList,
ControlState nState, const ImplControlValue&,
const OUString& )
{
@@ -1479,7 +1479,7 @@ bool GtkSalGraphics::NWPaintGTKListHeader(
NWSetWidgetState( button, nState, stateType );
GdkRectangle clipRect;
- for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
+ for( std::list< Rectangle >::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
{
clipRect.x = it->Left();
clipRect.y = it->Top();
@@ -1500,7 +1500,7 @@ bool GtkSalGraphics::NWPaintGTKFixedLine(
GdkDrawable* gdkDrawable,
ControlType, ControlPart nPart,
const Rectangle& rControlRectangle,
- const clipList&,
+ const std::list< Rectangle >&,
ControlState, const ImplControlValue&,
const OUString& )
{
@@ -1516,7 +1516,7 @@ bool GtkSalGraphics::NWPaintGTKFrame(
GdkDrawable* gdkDrawable,
ControlType, ControlPart,
const Rectangle& rControlRectangle,
- const clipList& rClipList,
+ const std::list< Rectangle >& rClipList,
ControlState /* nState */, const ImplControlValue& aValue,
const OUString& )
{
@@ -1529,7 +1529,7 @@ bool GtkSalGraphics::NWPaintGTKFrame(
if( nStyle == DrawFrameStyle::Out )
shadowType=GTK_SHADOW_IN;
- for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
+ for( std::list< Rectangle >::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
{
clipRect.x = it->Left();
clipRect.y = it->Top();
@@ -1583,12 +1583,12 @@ bool GtkSalGraphics::NWPaintGTKWindowBackground(
GdkDrawable* gdkDrawable,
ControlType, ControlPart,
const Rectangle& rControlRectangle,
- const clipList& rClipList,
+ const std::list< Rectangle >& rClipList,
ControlState /* nState */, const ImplControlValue&,
const OUString& )
{
GdkRectangle clipRect;
- for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
+ for( std::list< Rectangle >::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
{
clipRect.x = it->Left();
clipRect.y = it->Top();
@@ -1611,7 +1611,7 @@ bool GtkSalGraphics::NWPaintGTKButtonReal(
GdkDrawable* gdkDrawable,
ControlType, ControlPart,
const Rectangle& rControlRectangle,
- const clipList& rClipList,
+ const std::list< Rectangle >& rClipList,
ControlState nState, const ImplControlValue&,
const OUString& )
{
@@ -1707,7 +1707,7 @@ bool GtkSalGraphics::NWPaintGTKButtonReal(
wi -= 2 * (focusWidth + focusPad);
hi -= 2 * (focusWidth + focusPad);
}
- for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it)
+ for( std::list< Rectangle >::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it)
{
clipRect.x = it->Left();
clipRect.y = it->Top();
@@ -1747,7 +1747,7 @@ bool GtkSalGraphics::NWPaintGTKButton(
GdkDrawable* gdkDrawable,
ControlType type, ControlPart part,
const Rectangle& rControlRectangle,
- const clipList& rClipList,
+ const std::list< Rectangle >& rClipList,
ControlState nState, const ImplControlValue& value,
const OUString& string)
{
@@ -1837,7 +1837,7 @@ static Rectangle NWGetTabItemRect( SalX11Screen nScreen, Rectangle aAreaRect )
bool GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable,
ControlType, ControlPart,
const Rectangle& rControlRectangle,
- const clipList& rClipList,
+ const std::list< Rectangle >& rClipList,
ControlState nState,
const ImplControlValue& aValue,
const OUString& )
@@ -1875,7 +1875,7 @@ bool GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable,
GTK_TOGGLE_BUTTON(gWidgetData[m_nXScreen].gRadioWidgetSibling)->active = true;
GTK_TOGGLE_BUTTON(gWidgetData[m_nXScreen].gRadioWidget)->active = isChecked;
- for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
+ for( std::list< Rectangle >::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
{
clipRect.x = it->Left();
clipRect.y = it->Top();
@@ -1893,7 +1893,7 @@ bool GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable,
bool GtkSalGraphics::NWPaintGTKCheck( GdkDrawable* gdkDrawable,
ControlType, ControlPart,
const Rectangle& rControlRectangle,
- const clipList& rClipList,
+ const std::list< Rectangle >& rClipList,
ControlState nState,
const ImplControlValue& aValue,
const OUString& )
@@ -1920,7 +1920,7 @@ bool GtkSalGraphics::NWPaintGTKCheck( GdkDrawable* gdkDrawable,
NWSetWidgetState( gWidgetData[m_nXScreen].gCheckWidget, nState, stateType );
GTK_TOGGLE_BUTTON(gWidgetData[m_nXScreen].gCheckWidget)->active = isChecked;
- for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
+ for( std::list< Rectangle >::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
{
clipRect.x = it->Left();
clipRect.y = it->Top();
@@ -1949,7 +1949,7 @@ static void NWCalcArrowRect( const Rectangle& rButton, Rectangle& rArrow )
bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart,
const Rectangle& rControlRectangle,
- const clipList&,
+ const std::list< Rectangle >&,
ControlState nState,
const ImplControlValue& aValue,
const OUString& )
@@ -2351,7 +2351,7 @@ static Rectangle NWGetScrollButtonRect( SalX11Screen nScreen, ControlPart nPa
bool GtkSalGraphics::NWPaintGTKEditBox( GdkDrawable* gdkDrawable,
ControlType nType, ControlPart nPart,
const Rectangle& rControlRectangle,
- const clipList& rClipList,
+ const std::list< Rectangle >& rClipList,
ControlState nState,
const ImplControlValue& aValue,
const OUString& rCaption )
@@ -2363,7 +2363,7 @@ bool GtkSalGraphics::NWPaintGTKEditBox( GdkDrawable* gdkDrawable,
// plus its actual draw rect excluding adornment
pixmapRect = NWGetEditBoxPixmapRect( m_nXScreen, nType, nPart, rControlRectangle,
nState, aValue, rCaption );
- for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
+ for( std::list< Rectangle >::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
{
clipRect.x = it->Left();
clipRect.y = it->Top();
@@ -2483,7 +2483,7 @@ static void NWPaintOneEditBox( SalX11Screen nScreen,
bool GtkSalGraphics::NWPaintGTKSpinBox(ControlType nType, ControlPart nPart,
const Rectangle& rControlRectangle,
- const clipList&,
+ const std::list< Rectangle >&,
ControlState nState,
const ImplControlValue& aValue,
const OUString& rCaption,
@@ -2657,7 +2657,7 @@ static void NWPaintOneSpinButton( SalX11Screen nScreen,
bool GtkSalGraphics::NWPaintGTKComboBox( GdkDrawable* gdkDrawable,
ControlType nType, ControlPart nPart,
const Rectangle& rControlRectangle,
- const clipList& rClipList,
+ const std::list< Rectangle >& rClipList,
ControlState nState,
const ImplControlValue& aValue,
const OUString& rCaption )
@@ -2700,7 +2700,7 @@ bool GtkSalGraphics::NWPaintGTKComboBox( GdkDrawable* gdkDrawable,
arrowRect.SetPos( Point( buttonRect.Left() + (gint)((buttonRect.GetWidth() - arrowRect.GetWidth()) / 2),
buttonRect.Top() + (gint)((buttonRect.GetHeight() - arrowRect.GetHeight()) / 2) ) );
- for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
+ for( std::list< Rectangle >::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
{
clipRect.x = it->Left();
clipRect.y = it->Top();
@@ -2790,7 +2790,7 @@ static Rectangle NWGetComboBoxButtonRect( SalX11Screen nScreen,
bool GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart,
const Rectangle& rControlRectangle,
- const clipList&,
+ const std::list< Rectangle >&,
ControlState nState,
const ImplControlValue& aValue,
const OUString& )
@@ -2943,7 +2943,7 @@ bool GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart,
bool GtkSalGraphics::NWPaintGTKListBox( GdkDrawable* gdkDrawable,
ControlType nType, ControlPart nPart,
const Rectangle& rControlRectangle,
- const clipList& rClipList,
+ const std::list< Rectangle >& rClipList,
ControlState nState,
const ImplControlValue& aValue,
const OUString& rCaption )
@@ -2981,7 +2981,7 @@ bool GtkSalGraphics::NWPaintGTKListBox( GdkDrawable* gdkDrawable,
nullptr);
}
- for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
+ for( std::list< Rectangle >::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
{
clipRect.x = it->Left();
clipRect.y = it->Top();
@@ -3020,7 +3020,7 @@ bool GtkSalGraphics::NWPaintGTKToolbar(
GdkDrawable* gdkDrawable,
ControlType, ControlPart nPart,
const Rectangle& rControlRectangle,
- const clipList& rClipList,
+ const std::list< Rectangle >& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& string)
{
@@ -3097,7 +3097,7 @@ bool GtkSalGraphics::NWPaintGTKToolbar(
if( nPart != PART_BUTTON )
{
- for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
+ for( std::list< Rectangle >::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
{
clipRect.x = it->Left();
clipRect.y = it->Top();
@@ -3200,7 +3200,7 @@ bool GtkSalGraphics::NWPaintGTKMenubar(
GdkDrawable* gdkDrawable,
ControlType, ControlPart nPart,
const Rectangle& rControlRectangle,
- const clipList& rClipList,
+ const std::list< Rectangle >& rClipList,
ControlState nState, const ImplControlValue&,
const OUString& )
{
@@ -3228,7 +3228,7 @@ bool GtkSalGraphics::NWPaintGTKMenubar(
}
}
- for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
+ for( std::list< Rectangle >::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
{
lcl_rectangleToGdkRectangle(*it, clipRect);
@@ -3287,7 +3287,7 @@ bool GtkSalGraphics::NWPaintGTKPopupMenu(
GdkDrawable* gdkDrawable,
ControlType, ControlPart nPart,
const Rectangle& rControlRectangle,
- const clipList& rClipList,
+ const std::list< Rectangle >& rClipList,
ControlState nState, const ImplControlValue&,
const OUString& )
{
@@ -3325,7 +3325,7 @@ bool GtkSalGraphics::NWPaintGTKPopupMenu(
if ( nState & ControlState::ENABLED )
GTK_WIDGET_SET_FLAGS( gWidgetData[m_nXScreen].gMenuWidget, GTK_SENSITIVE );
- for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
+ for( std::list< Rectangle >::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
{
clipRect.x = it->Left();
clipRect.y = it->Top();
@@ -3452,7 +3452,7 @@ bool GtkSalGraphics::NWPaintGTKTooltip(
GdkDrawable* gdkDrawable,
ControlType, ControlPart,
const Rectangle& rControlRectangle,
- const clipList& rClipList,
+ const std::list< Rectangle >& rClipList,
ControlState, const ImplControlValue&,
const OUString& )
{
@@ -3466,7 +3466,7 @@ bool GtkSalGraphics::NWPaintGTKTooltip(
w = rControlRectangle.GetWidth();
h = rControlRectangle.GetHeight();
- for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
+ for( std::list< Rectangle >::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
{
clipRect.x = it->Left();
clipRect.y = it->Top();
@@ -3490,7 +3490,7 @@ bool GtkSalGraphics::NWPaintGTKListNode(
GdkDrawable*,
ControlType, ControlPart,
const Rectangle& rControlRectangle,
- const clipList&,
+ const std::list< Rectangle >&,
ControlState nState, const ImplControlValue& rValue,
const OUString& )
{
@@ -3540,7 +3540,7 @@ bool GtkSalGraphics::NWPaintGTKProgress(
GdkDrawable*,
ControlType, ControlPart,
const Rectangle& rControlRectangle,
- const clipList&,
+ const std::list< Rectangle >&,
ControlState, const ImplControlValue& rValue,
const OUString& )
{
@@ -3605,7 +3605,7 @@ bool GtkSalGraphics::NWPaintGTKSlider(
GdkDrawable*,
ControlType, ControlPart nPart,
const Rectangle& rControlRectangle,
- const clipList&,
+ const std::list< Rectangle >&,
ControlState nState, const ImplControlValue& rValue,
const OUString& )
{