summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorJesse <jspears@umd.edu>2011-12-14 14:43:58 -0500
committerMichael Meeks <michael.meeks@suse.com>2011-12-15 16:38:50 +0000
commit6a8f6c4b1324e28c598a065683103ac2ef8ea3fc (patch)
treed59cda7401565170e32c7d06af9755f3110651fd /vcl
parent63a817d2fb00f248053566c8b8364667432fa8b3 (diff)
Removed extra semicolons
Diffstat (limited to 'vcl')
-rw-r--r--vcl/aqua/source/gdi/salnativewidgets.cxx2
-rw-r--r--vcl/aqua/source/window/salobj.cxx2
-rw-r--r--vcl/generic/fontmanager/parseAFM.cxx2
-rw-r--r--vcl/ios/source/window/salobj.cxx2
-rw-r--r--vcl/source/control/button.cxx2
-rw-r--r--vcl/source/control/edit.cxx2
-rw-r--r--vcl/source/control/scrbar.cxx2
-rw-r--r--vcl/source/gdi/bitmap2.cxx2
-rw-r--r--vcl/source/gdi/metaact.cxx2
-rw-r--r--vcl/source/gdi/outmap.cxx2
-rw-r--r--vcl/source/gdi/pngread.cxx2
-rw-r--r--vcl/source/window/menu.cxx2
-rw-r--r--vcl/source/window/toolbox.cxx2
-rw-r--r--vcl/unx/generic/app/i18n_ic.cxx2
-rw-r--r--vcl/unx/kde4/KDESalGraphics.cxx2
-rw-r--r--vcl/win/source/gdi/salgdi3.cxx8
16 files changed, 19 insertions, 19 deletions
diff --git a/vcl/aqua/source/gdi/salnativewidgets.cxx b/vcl/aqua/source/gdi/salnativewidgets.cxx
index 81060fd38633..1b3798e483b0 100644
--- a/vcl/aqua/source/gdi/salnativewidgets.cxx
+++ b/vcl/aqua/source/gdi/salnativewidgets.cxx
@@ -795,7 +795,7 @@ sal_Bool AquaSalGraphics::drawNativeControl(ControlType nType,
{
aTrackDraw.bounds = rc;
aTrackDraw.min = pSLVal->mnMin;
- aTrackDraw.max = pSLVal->mnMax;;
+ aTrackDraw.max = pSLVal->mnMax;
aTrackDraw.value = pSLVal->mnCur;
aTrackDraw.reserved = 0;
aTrackDraw.attributes = kThemeTrackShowThumb;
diff --git a/vcl/aqua/source/window/salobj.cxx b/vcl/aqua/source/window/salobj.cxx
index 7abb49bd40f7..38fa396c4d51 100644
--- a/vcl/aqua/source/window/salobj.cxx
+++ b/vcl/aqua/source/window/salobj.cxx
@@ -188,7 +188,7 @@ void AquaSalObject::setClippedPosSize()
aClipViewRect.size.height = mnClipHeight;
aClipPt.x = mnClipX;
if( mnClipY == 0 )
- aClipPt.y = mnHeight - mnClipHeight;;
+ aClipPt.y = mnHeight - mnClipHeight;
}
mpFrame->VCLToCocoa( aClipViewRect, false );
diff --git a/vcl/generic/fontmanager/parseAFM.cxx b/vcl/generic/fontmanager/parseAFM.cxx
index 4abd4dbef76c..6297ef8cbc8b 100644
--- a/vcl/generic/fontmanager/parseAFM.cxx
+++ b/vcl/generic/fontmanager/parseAFM.cxx
@@ -834,7 +834,7 @@ static int parseCharMetrics( FileInputStream* fp, register FontInfo* fi)
(*tail)->lig = (char *)strdup(keyword);
break; }
case ENDCHARMETRICS:
- cont = false;;
+ cont = false;
break;
case ENDFONTMETRICS:
cont = false;
diff --git a/vcl/ios/source/window/salobj.cxx b/vcl/ios/source/window/salobj.cxx
index 033e5316af32..ba2b1b0b8c7d 100644
--- a/vcl/ios/source/window/salobj.cxx
+++ b/vcl/ios/source/window/salobj.cxx
@@ -179,7 +179,7 @@ void IosSalObject::setClippedPosSize()
aClipViewRect.size.height = mnClipHeight;
aClipPt.x = mnClipX;
if( mnClipY == 0 )
- aClipPt.y = mnHeight - mnClipHeight;;
+ aClipPt.y = mnHeight - mnClipHeight;
}
mpFrame->VCLToCocoaTouch( aClipViewRect, false );
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 25e8de594664..f41cf74eb7fe 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -887,7 +887,7 @@ void PushButton::ImplDrawPushButtonContent( OutputDevice* pDev, sal_uLong nDrawF
DecorationView aDecoView( pDev );
if( bMenuBtnSep )
{
- long nX = aInRect.Left() - 2*nDistance;;
+ long nX = aInRect.Left() - 2*nDistance;
Point aStartPt( nX, aInRect.Top()+nDistance );
Point aEndPt( nX, aInRect.Bottom()-nDistance );
aDecoView.DrawSeparator( aStartPt, aEndPt );
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index cfa4fc8bf702..a70ce3c7fcf0 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -764,7 +764,7 @@ void Edit::ImplDelete( const Selection& rSelection, sal_uInt8 nDirection, sal_uI
else
{
sal_Int32 nCount = 1;
- aSelection.Max() = xBI->nextCharacters( maText, aSelection.Max(), GetSettings().GetLocale(), i18n::CharacterIteratorMode::SKIPCHARACTER, nCount, nCount );;
+ aSelection.Max() = xBI->nextCharacters( maText, aSelection.Max(), GetSettings().GetLocale(), i18n::CharacterIteratorMode::SKIPCHARACTER, nCount, nCount );
}
}
}
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index 4004ba5cdf64..bb4cc3cfdb2c 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -335,7 +335,7 @@ long ScrollBar::ImplCalcThumbPosPix( long nPos )
void ScrollBar::ImplCalc( sal_Bool bUpdate )
{
const Size aSize = GetOutputSizePixel();
- const long nMinThumbSize = GetSettings().GetStyleSettings().GetMinThumbSize();;
+ const long nMinThumbSize = GetSettings().GetStyleSettings().GetMinThumbSize();
Rectangle& maTrackRect = mpData->maTrackRect; // TODO: remove when maTrackRect is no longer in mpData
if ( mbCalcSize )
diff --git a/vcl/source/gdi/bitmap2.cxx b/vcl/source/gdi/bitmap2.cxx
index a8ac07b32335..90d407ee94e0 100644
--- a/vcl/source/gdi/bitmap2.cxx
+++ b/vcl/source/gdi/bitmap2.cxx
@@ -280,7 +280,7 @@ sal_Bool Bitmap::ImplReadDIBFileHeader( SvStream& rIStm, sal_uLong& rOffset )
rIStm >> nTmp16;
rIStm.SeekRel( 8L );
rIStm >> nTmp32;
- rOffset = nTmp32 - 28UL;;
+ rOffset = nTmp32 - 28UL;
bRet = ( 0x4D42 == nTmp16 );
}
else
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 6d7ac00cf87f..a0b6c3b27c6b 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -962,7 +962,7 @@ void MetaPolyLineAction::Scale( double fScaleX, double fScaleY )
sal_Bool MetaPolyLineAction::Compare( const MetaAction& rMetaAction ) const
{
- sal_Bool bIsEqual = sal_True;;
+ sal_Bool bIsEqual = sal_True;
if ( maLineInfo != ((MetaPolyLineAction&)rMetaAction).maLineInfo )
bIsEqual = sal_False;
else
diff --git a/vcl/source/gdi/outmap.cxx b/vcl/source/gdi/outmap.cxx
index c4d03caf2a1e..6fca015a7066 100644
--- a/vcl/source/gdi/outmap.cxx
+++ b/vcl/source/gdi/outmap.cxx
@@ -274,7 +274,7 @@ static void ImplCalcMapResolution( const MapMode& rMapMode,
else
rMapRes.mnMapScNumX = pSVData->maGDIData.mnAppFontX;
rMapRes.mnMapScDenomX = nDPIX * 40;
- rMapRes.mnMapScNumY = pSVData->maGDIData.mnAppFontY;;
+ rMapRes.mnMapScNumY = pSVData->maGDIData.mnAppFontY;
rMapRes.mnMapScDenomY = nDPIY * 80;
}
break;
diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index 0d6a06c3632f..cb4f72ea37de 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -284,7 +284,7 @@ bool PNGReaderImpl::ReadNextChunk()
return false;
// calculate chunktype CRC (swap it back to original byte order)
- sal_uInt32 nChunkType = mnChunkType;;
+ sal_uInt32 nChunkType = mnChunkType;
#if defined(__LITTLEENDIAN) || defined(OSL_LITENDIAN)
nChunkType = SWAPLONG( nChunkType );
#endif
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index e143dfec8d22..65a83a5b82ea 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -341,7 +341,7 @@ MenuItemData* MenuItemList::SearchItem(
{
const vcl::I18nHelper& rI18nHelper = Application::GetSettings().GetUILocaleI18nHelper();
- size_t nListCount = maItemList.size();;
+ size_t nListCount = maItemList.size();
// try character code first
nDuplicates = GetItemCount( cSelectChar ); // return number of duplicates
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 217cac0776c7..6fd3fab8f583 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -2621,7 +2621,7 @@ void ToolBox::ImplFormat( sal_Bool bResize )
}
else
{
- maUpperRect.Top() = nTop+nMax+TB_SPIN_OFFSET;;
+ maUpperRect.Top() = nTop+nMax+TB_SPIN_OFFSET;
maUpperRect.Bottom() = maUpperRect.Top()+TB_SPIN_SIZE-1;
maUpperRect.Left() = nLeft;
maLowerRect.Right() = mnDX-mnRightBorder-mnBorderX-TB_BORDER_OFFSET2-1;
diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx
index f5f8138e527b..7b48cab75d12 100644
--- a/vcl/unx/generic/app/i18n_ic.cxx
+++ b/vcl/unx/generic/app/i18n_ic.cxx
@@ -202,7 +202,7 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) :
maClientData.aText.pUnicodeBuffer =
(sal_Unicode*)malloc(PREEDIT_BUFSZ * sizeof(sal_Unicode));
maClientData.aText.pCharStyle =
- (XIMFeedback*)malloc(PREEDIT_BUFSZ * sizeof(XIMFeedback));;
+ (XIMFeedback*)malloc(PREEDIT_BUFSZ * sizeof(XIMFeedback));
maClientData.aText.nSize = PREEDIT_BUFSZ;
maClientData.aText.nCursorPos = 0;
maClientData.aText.nLength = 0;
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index b673644db165..c552d91b2e9d 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -281,7 +281,7 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
OSL_ASSERT( value.getType() != CTRL_SPINBUTTONS );
const SpinbuttonValue* pSpinVal = static_cast<const SpinbuttonValue *>(&value);
Rectangle aButtonRect( pSpinVal->maUpperRect);
- aButtonRect.Union( pSpinVal->maLowerRect );;
+ aButtonRect.Union( pSpinVal->maLowerRect );
widgetRect = QRect( aButtonRect.Left(), aButtonRect.Top(),
aButtonRect.Right(), aButtonRect.Bottom() );
}
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 8be7a025b19b..cf7941e67805 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -515,7 +515,7 @@ bool WinGlyphFallbackSubstititution::HasMissingChars( const ImplFontData* pFace,
HFONT hOldFont = ::SelectFont( mhDC, hNewFont );
// read CMAP table to update their pCharMap
- pWinFont->UpdateFromHDC( mhDC );;
+ pWinFont->UpdateFromHDC( mhDC );
// cleanup temporary font
::SelectFont( mhDC, hOldFont );
@@ -1769,7 +1769,7 @@ void WinSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackLe
return;
// device independent font attributes
- pMetric->meFamily = ImplFamilyToSal( aWinMetric.tmPitchAndFamily );;
+ pMetric->meFamily = ImplFamilyToSal( aWinMetric.tmPitchAndFamily );
pMetric->mbSymbolFlag = (aWinMetric.tmCharSet == SYMBOL_CHARSET);
pMetric->meWeight = ImplWeightToSal( aWinMetric.tmWeight );
pMetric->mePitch = ImplMetricPitchToSal( aWinMetric.tmPitchAndFamily );
@@ -2259,7 +2259,7 @@ static bool ImplGetFontAttrFromFile( const String& rFontFileURL,
rDFA.meWidthType = WIDTH_DONTKNOW;
rDFA.meWeight = WEIGHT_DONTKNOW;
rDFA.meItalic = ITALIC_DONTKNOW;
- rDFA.mePitch = PITCH_DONTKNOW;;
+ rDFA.mePitch = PITCH_DONTKNOW;
rDFA.mbSubsettable= true;
rDFA.mbEmbeddable = false;
@@ -2377,7 +2377,7 @@ bool WinSalGraphics::AddTempDevFont( ImplDevFontList* pFontList,
aDFA.meWidthType = WIDTH_DONTKNOW;
aDFA.meWeight = WEIGHT_DONTKNOW;
aDFA.meItalic = ITALIC_DONTKNOW;
- aDFA.mePitch = PITCH_DONTKNOW;;
+ aDFA.mePitch = PITCH_DONTKNOW;
aDFA.mbSubsettable= true;
aDFA.mbEmbeddable = false;