summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-12-08 09:46:01 +0100
committerStephan Bergmann <sbergman@redhat.com>2018-12-08 13:28:16 +0100
commitab9b67bbb001f380b3973941443bfbc59fe7141c (patch)
tree4737847b2970d2310932f115935a9454aacff6fe /vcl/source
parent3c0cb54b7ca20439e7e5e1e19dc6fcc75709973b (diff)
Remove obsolete SAL_FALLTHROUGH completely
...after 7ffdd830d5fb52f2ca25aa80277d22ea6d89970b "HAVE_CPP_ATTRIBUTE_FALLTHROUGH is always true now" Change-Id: I54e5ff4e036a6bb3e5774d1c0524158aae18e937 Reviewed-on: https://gerrit.libreoffice.org/64800 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl/source')
-rw-r--r--vcl/source/control/edit.cxx4
-rw-r--r--vcl/source/edit/textview.cxx16
-rw-r--r--vcl/source/filter/graphicfilter2.cxx2
-rw-r--r--vcl/source/fontsubset/cff.cxx2
-rw-r--r--vcl/source/fontsubset/xlat.cxx2
-rw-r--r--vcl/source/gdi/dibtools.cxx2
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx4
-rw-r--r--vcl/source/gdi/pngread.cxx4
-rw-r--r--vcl/source/outdev/nativecontrols.cxx2
-rw-r--r--vcl/source/window/decoview.cxx2
-rw-r--r--vcl/source/window/layout.cxx2
-rw-r--r--vcl/source/window/winproc.cxx2
12 files changed, 22 insertions, 22 deletions
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 6e2667258190..be35941fe775 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -1534,7 +1534,7 @@ bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt )
case css::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH:
case css::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT:
bSelect = true;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case css::awt::Key::MOVE_TO_BEGIN_OF_LINE:
case css::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH:
case css::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT:
@@ -1543,7 +1543,7 @@ bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt )
case css::awt::Key::SELECT_TO_END_OF_PARAGRAPH:
case css::awt::Key::SELECT_TO_END_OF_DOCUMENT:
bSelect = true;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case css::awt::Key::MOVE_TO_END_OF_LINE:
case css::awt::Key::MOVE_TO_END_OF_PARAGRAPH:
case css::awt::Key::MOVE_TO_END_OF_DOCUMENT:
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index 6857089945eb..3ccae7706092 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -1167,49 +1167,49 @@ TextSelection const & TextView::ImpMoveCursor( const KeyEvent& rKeyEvent )
break;
case css::awt::Key::SELECT_WORD_FORWARD:
bSelect = true;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case css::awt::Key::MOVE_WORD_FORWARD:
aPaM = CursorWordRight( aPaM );
break;
case css::awt::Key::SELECT_WORD_BACKWARD:
bSelect = true;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case css::awt::Key::MOVE_WORD_BACKWARD:
aPaM = CursorWordLeft( aPaM );
break;
case css::awt::Key::SELECT_TO_BEGIN_OF_LINE:
bSelect = true;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case css::awt::Key::MOVE_TO_BEGIN_OF_LINE:
aPaM = CursorStartOfLine( aPaM );
break;
case css::awt::Key::SELECT_TO_END_OF_LINE:
bSelect = true;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case css::awt::Key::MOVE_TO_END_OF_LINE:
aPaM = CursorEndOfLine( aPaM );
break;
case css::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH:
bSelect = true;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case css::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH:
aPaM = CursorStartOfParagraph( aPaM );
break;
case css::awt::Key::SELECT_TO_END_OF_PARAGRAPH:
bSelect = true;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case css::awt::Key::MOVE_TO_END_OF_PARAGRAPH:
aPaM = CursorEndOfParagraph( aPaM );
break;
case css::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT:
bSelect = true;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case css::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT:
aPaM = CursorStartOfDoc();
break;
case css::awt::Key::SELECT_TO_END_OF_DOCUMENT:
bSelect = true;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case css::awt::Key::MOVE_TO_END_OF_DOCUMENT:
aPaM = CursorEndOfDoc();
break;
diff --git a/vcl/source/filter/graphicfilter2.cxx b/vcl/source/filter/graphicfilter2.cxx
index b79d4afa425c..27dd780b57c8 100644
--- a/vcl/source/filter/graphicfilter2.cxx
+++ b/vcl/source/filter/graphicfilter2.cxx
@@ -873,7 +873,7 @@ bool GraphicDescriptor::ImpDetectPSD( SvStream& rStm, bool bExtendedInfo )
case 4 :
case 3 :
nBitsPerPixel = 24;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case 2 :
case 1 :
aPixSize.setWidth( nColumns );
diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index fb4bb52ee719..ef230704cd66 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -903,7 +903,7 @@ void CffSubsetterContext::convertOneTypeEsc()
assert( mnStackIdx >= 1 );
if( pTop[0] >= 0)
break;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case TYPE2OP::NEG:
assert( mnStackIdx >= 1 );
pTop[0] = -pTop[0];
diff --git a/vcl/source/fontsubset/xlat.cxx b/vcl/source/fontsubset/xlat.cxx
index 042d8e79517d..239b1bf0b454 100644
--- a/vcl/source/fontsubset/xlat.cxx
+++ b/vcl/source/fontsubset/xlat.cxx
@@ -66,7 +66,7 @@ void ConverterCache::ensureConverter( int nSelect )
rtl_TextEncoding eRecodeFrom = RTL_TEXTENCODING_UNICODE;
switch( nSelect )
{
- default: nSelect = 1; SAL_FALLTHROUGH; // to unicode recoding
+ default: nSelect = 1; [[fallthrough]]; // to unicode recoding
case 1: eRecodeFrom = RTL_TEXTENCODING_UNICODE; break;
case 2: eRecodeFrom = RTL_TEXTENCODING_SHIFT_JIS; break;
case 3: eRecodeFrom = RTL_TEXTENCODING_GB_2312; break;
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index b6ffa8fd9908..2c44af9ccc71 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -1378,7 +1378,7 @@ bool ImplWriteDIBBits(SvStream& rOStm, BitmapReadAccess const & rAcc, BitmapRead
size_t nUnusedBytes = nAlignedWidth - nWidth * 3;
memset(aBuf.data() + nAlignedWidth - nUnusedBytes, 0, nUnusedBytes);
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
// #i59239# fallback to 24 bit format, if bitcount is non-default
default:
{
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 3ebe2ce38673..af08ca7a3e6c 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -4617,7 +4617,7 @@ bool PDFWriterImpl::emitWidgetAnnotations()
else
appendName( rWidget.m_aValue, aValue );
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case PDFWriter::PushButton:
aLine.append( "Btn" );
break;
@@ -8681,7 +8681,7 @@ bool PDFWriterImpl::writeGradientFunction( GradientEmit const & rObject )
aCol[1] = rObject.m_aGradient.GetEndColor().GetGreen();
aCol[2] = rObject.m_aGradient.GetEndColor().GetBlue();
CHECK_RETURN( writeBuffer( aCol, 3 ) );
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case GradientStyle::Linear:
{
aCol[0] = rObject.m_aGradient.GetStartColor().GetRed();
diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index cfd9391f69b5..ba9d9afc5507 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -501,7 +501,7 @@ bool PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint )
break;
case 16 :
mnTargetDepth = 8; // we have to reduce the bitmap
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case 1 :
case 4 :
case 8 :
@@ -556,7 +556,7 @@ bool PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint )
{
case 16 :
mnTargetDepth = 8; // we have to reduce the bitmap
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case 8 :
mbGrayScale = true;
break;
diff --git a/vcl/source/outdev/nativecontrols.cxx b/vcl/source/outdev/nativecontrols.cxx
index c848ec2d0b53..ef2295808a6d 100644
--- a/vcl/source/outdev/nativecontrols.cxx
+++ b/vcl/source/outdev/nativecontrols.cxx
@@ -52,7 +52,7 @@ static bool EnableNativeWidget( const OutputDevice& i_rDevice )
}
case OUTDEV_PDF:
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case OUTDEV_VIRDEV:
{
const vcl::ExtOutDevData* pOutDevData( i_rDevice.GetExtOutDevData() );
diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx
index c8cfb1d70f3f..c1fb51df019e 100644
--- a/vcl/source/window/decoview.cxx
+++ b/vcl/source/window/decoview.cxx
@@ -293,7 +293,7 @@ void ImplDrawSymbol( OutputDevice* pDev, tools::Rectangle nRect, const SymbolTyp
Point( nRect.Right(), nRect.Bottom() ) );
pDev->DrawLine( Point( nRect.Left(), nRect.Bottom() ),
Point( nRect.Right(), nRect.Bottom() ) );
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case SymbolType::ROLLUP:
pDev->DrawRect( tools::Rectangle( nRect.Left(), nRect.Top(),
nRect.Right(), nRect.Top()+n8 ) );
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 91de02405af6..bace88d1d59c 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -780,7 +780,7 @@ void VclButtonBox::setAllocation(const Size &rAllocation)
break;
default:
SAL_WARN("vcl.layout", "todo unimplemented layout style");
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case VclButtonBoxStyle::Default:
case VclButtonBoxStyle::End:
if (!aReq.m_aMainGroupDimensions.empty())
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index a4cce43051c7..f58ea591b922 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -2518,7 +2518,7 @@ bool ImplWindowFrameProc( vcl::Window* _pWindow, SalEvent nEvent, const void* pE
ImplHandleSurroundingTextSelectionChange( pWindow,
pEvt->mnStart,
pEvt->mnEnd );
- SAL_FALLTHROUGH; // TODO: Fallthrough really intended?
+ [[fallthrough]]; // TODO: Fallthrough really intended?
}
case SalEvent::StartReconversion:
ImplHandleStartReconversion( pWindow );