mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove unused NONE from ScrollRangeCheck enum

Browse Source 
Change-Id: I9d83cc38a9fa477a61ec7e2ec3d9786318187085
This commit is contained in:
Noel Grandin
2017-02-16 10:55:46 +02:00
parent 2f358c6392
commit 1c3de19e98
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
compilerplugins/clang/unusedenumconstants.py
View File

@@ -133,6 +133,10 @@ for d in definitionSet:
"sc/source/ui/docshell/impex.cxx", # SylkVersion "sc/source/ui/docshell/impex.cxx", # SylkVersion
"include/rsc/rsc-vcl-shared-types.hxx", # KeyFuncType "include/rsc/rsc-vcl-shared-types.hxx", # KeyFuncType
"include/i18nutil/paper.hxx", # Paper "include/i18nutil/paper.hxx", # Paper
"cppcanvas/source/mtfrenderer/emfplus.cxx", # EmfPlusCombineMode
"cppcanvas/source/mtfrenderer/emfpbrush.hxx", # EmfPlusHatchStyle
"include/filter/msfilter/svdfppt.hxx", # PptPlaceholder, PptSlideLayout
"include/filter/msfilter/escherex.hxx", # various
# Windows or OSX only # Windows or OSX only
"include/canvas/rendering/icolorbuffer.hxx", "include/canvas/rendering/icolorbuffer.hxx",
"include/vcl/commandevent.hxx", "include/vcl/commandevent.hxx",
@@ -162,6 +166,9 @@ for d in definitionSet:
"sc/source/ui/inc/scuitphfedit.hxx", # ScHFEntryId (from UI) "sc/source/ui/inc/scuitphfedit.hxx", # ScHFEntryId (from UI)
"include/i18nlangtag/languagetag.hxx", # LanguageTag::ScriptType "include/i18nlangtag/languagetag.hxx", # LanguageTag::ScriptType
"extensions/source/scanner/grid.hxx", # ResetType (from UI) "extensions/source/scanner/grid.hxx", # ResetType (from UI)
"dbaccess/source/inc/dsntypes.hxx", # dbaccess::DATASOURCE_TYPE (from UI)
"cui/source/tabpages/tparea.cxx", # FillType (from UI)
"include/editeng/svxenum.hxx", # css::style::NumberingType
# represents constants from an external API # represents constants from an external API
"opencl/inc/opencl_device_selection.h", "opencl/inc/opencl_device_selection.h",
"vcl/inc/sft.hxx", "vcl/inc/sft.hxx",

4
editeng/source/editeng/impedit.cxx
View File

@@ -1096,7 +1096,7 @@ Pair ImpEditView::Scroll( long ndX, long ndY, ScrollRangeCheck nRangeCheck )
long nDiff = pEditEngine->pImpEditEngine->GetTextHeight() - aNewVisArea.Bottom(); // negative long nDiff = pEditEngine->pImpEditEngine->GetTextHeight() - aNewVisArea.Bottom(); // negative
aNewVisArea.Move( 0, nDiff ); // could end up in the negative area... aNewVisArea.Move( 0, nDiff ); // could end up in the negative area...
} }
if ( ( aNewVisArea.Top() < 0 ) && ( nRangeCheck != ScrollRangeCheck::NONE ) ) if ( aNewVisArea.Top() < 0 )
aNewVisArea.Move( 0, -aNewVisArea.Top() ); aNewVisArea.Move( 0, -aNewVisArea.Top() );
// Horizontal: // Horizontal:
@@ -1115,7 +1115,7 @@ Pair ImpEditView::Scroll( long ndX, long ndY, ScrollRangeCheck nRangeCheck )
long nDiff = pEditEngine->pImpEditEngine->CalcTextWidth( false ) - aNewVisArea.Right(); // negative long nDiff = pEditEngine->pImpEditEngine->CalcTextWidth( false ) - aNewVisArea.Right(); // negative
aNewVisArea.Move( nDiff, 0 ); // could end up in the negative area... aNewVisArea.Move( nDiff, 0 ); // could end up in the negative area...
} }
if ( ( aNewVisArea.Left() < 0 ) && ( nRangeCheck != ScrollRangeCheck::NONE ) ) if ( aNewVisArea.Left() < 0 )
aNewVisArea.Move( -aNewVisArea.Left(), 0 ); aNewVisArea.Move( -aNewVisArea.Left(), 0 );
// The difference must be alignt on pixel (due to scroll!) // The difference must be alignt on pixel (due to scroll!)

1
include/editeng/editview.hxx
View File

@@ -73,7 +73,6 @@ namespace linguistic2 {
enum class ScrollRangeCheck enum class ScrollRangeCheck
{ {
NONE = 0, // No correction of VisArea when scrolling
NoNegative = 1, // No negative VisArea when scrolling NoNegative = 1, // No negative VisArea when scrolling
PaperWidthTextSize = 2, // VisArea must be within paper width, Text Size PaperWidthTextSize = 2, // VisArea must be within paper width, Text Size
}; };