[Libreoffice-commits] core.git: sw/source
Michael Stahl
mstahl at redhat.com
Fri May 27 09:26:05 UTC 2016
sw/source/filter/html/css1atr.cxx | 2 +-
sw/source/filter/html/swhtml.cxx | 2 +-
sw/source/uibase/shells/basesh.cxx | 2 +-
sw/source/uibase/utlui/content.cxx | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 4c52c27caf3b81e084f4b161d5ba3924ec9d5dda
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri May 27 11:09:13 2016 +0200
sw: these all look like intended fall-throughs
Change-Id: Idfea426b69d07dc6d8eb8d0edb59b0ec0f4ecdf9
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 2394ed9..e84cf78 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -1991,7 +1991,7 @@ void SwHTMLWriter::OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat
}
break;
}
- SAL_FALLTHROUGH; //TODO ???
+ SAL_FALLTHROUGH;
case FLY_AT_PAGE:
case FLY_AT_FLY:
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 304c2bb..9ecbb40 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -1412,7 +1412,7 @@ void SwHTMLParser::NextToken( int nToken )
else
bGetIDOption = true;
// <BR>s in <PRE> resemble true LFs, hence no break
- SAL_FALLTHROUGH; //TODO ???
+ SAL_FALLTHROUGH;
case HTML_NEWPARA:
// CR in PRE/LISTING/XMP
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index eb70ed6..551d922 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -427,7 +427,7 @@ void SwBaseShell::StateClpbrd(SfxItemSet &rSet)
rSet.DisableItem( nWhich );
break;
}
- SAL_FALLTHROUGH; //TODO ???
+ SAL_FALLTHROUGH;
case SID_COPY:
if( !bCopy )
rSet.DisableItem( nWhich );
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index e1038a4..c6ea275 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1780,7 +1780,7 @@ bool SwContentTree::FillTransferData( TransferDataContainer& rTransfer,
case ContentTypeId::POSTIT:
case ContentTypeId::INDEX:
case ContentTypeId::REFERENCE :
- // cannot be inserted, neither as URL nor as region
+ // cannot be inserted, neither as URL nor as section
break;
case ContentTypeId::URLFIELD:
sUrl = static_cast<SwURLFieldContent*>(pCnt)->GetURL();
@@ -1791,7 +1791,7 @@ bool SwContentTree::FillTransferData( TransferDataContainer& rTransfer,
break;
else
rDragMode &= ~( DND_ACTION_MOVE | DND_ACTION_LINK );
- SAL_FALLTHROUGH; //TODO ???
+ SAL_FALLTHROUGH;
default:
sEntry = GetEntryText(pEntry);
}
More information about the Libreoffice-commits
mailing list