diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/LineServicesCallbacks.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/LineServicesCallbacks.cs index db7ac93bded..5a9bd5f322d 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/LineServicesCallbacks.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/TextFormatting/LineServicesCallbacks.cs @@ -219,11 +219,7 @@ out cchText SaveException(e, plsrun, lsrun); lserr = LsErr.ClientAbort; } - catch - { - SaveNonCLSException("FetchRunRedefined", plsrun, lsrun); - lserr = LsErr.ClientAbort; - } + return lserr; } @@ -263,7 +259,6 @@ ref LsChp lschp } } - internal LsErr FetchPap( IntPtr pols, // Line Layout context int lscpFetch, // position to fetch @@ -344,11 +339,7 @@ ref LsPap lspap // [out] paragraph properties SaveException(e, Plsrun.Undefined, null); lserr = LsErr.ClientAbort; } - catch - { - SaveNonCLSException("FetchPap", Plsrun.Undefined, null); - lserr = LsErr.ClientAbort; - } + return lserr; } @@ -388,11 +379,7 @@ ref LsLineProps lsLineProps // [out] line properties SaveException(e, Plsrun.Undefined, null); lserr = LsErr.ClientAbort; } - catch - { - SaveNonCLSException("FetchLineProps", Plsrun.Undefined, null); - lserr = LsErr.ClientAbort; - } + return lserr; } @@ -434,11 +421,7 @@ ref LsTxM lstTextMetrics // [out] returning metrics SaveException(e, plsrun, lsrun); lserr = LsErr.ClientAbort; } - catch - { - SaveNonCLSException("GetRunTextMetrics", plsrun, lsrun); - lserr = LsErr.ClientAbort; - } + return lserr; } @@ -528,11 +511,7 @@ ref int stringLengthFitted // [out] number of char fitted SaveException(e, plsrun, lsrun); lserr = LsErr.ClientAbort; } - catch - { - SaveNonCLSException("GetRunCharWidths", plsrun, lsrun); - lserr = LsErr.ClientAbort; - } + return lserr; } @@ -559,15 +538,10 @@ ref int maxExpandRagged // [out] em width SaveException(e, plsrun, lsrun); lserr = LsErr.ClientAbort; } - catch - { - SaveNonCLSException("GetDurMaxExpandRagged", plsrun, lsrun); - lserr = LsErr.ClientAbort; - } + return lserr; } - internal LsErr GetAutoNumberInfo( IntPtr pols, // Line Layout context ref LsKAlign alignment, // [out] Marker alignment @@ -637,11 +611,7 @@ out lsrunLength SaveException(e, plsrun, lsrun); lserr = LsErr.ClientAbort; } - catch - { - SaveNonCLSException("GetAutoNumberInfo", plsrun, lsrun); - lserr = LsErr.ClientAbort; - } + return lserr; } @@ -701,11 +671,7 @@ ref LsULInfo ulInfo // [out] result underline info SaveException(e, plsrun, lsrun); lserr = LsErr.ClientAbort; } - catch - { - SaveNonCLSException("GetAutoNumberInfo", plsrun, lsrun); - lserr = LsErr.ClientAbort; - } + return lserr; } @@ -754,11 +720,7 @@ ref LsStInfo stInfo // [out] result strikethrough info SaveException(e, plsrun, lsrun); lserr = LsErr.ClientAbort; } - catch - { - SaveNonCLSException("GetRunStrikethroughInfo", plsrun, lsrun); - lserr = LsErr.ClientAbort; - } + return lserr; } @@ -814,11 +776,7 @@ ref lsHyph SaveException(e, Plsrun.Undefined, null); lserr = LsErr.ClientAbort; } - catch - { - SaveNonCLSException("Hyphenate", Plsrun.Undefined, null); - lserr = LsErr.ClientAbort; - } + return lserr; } @@ -851,11 +809,7 @@ ref lsHyph SaveException(e, Plsrun.Undefined, null); lserr = LsErr.ClientAbort; } - catch - { - SaveNonCLSException("GetNextHyphenOpp", Plsrun.Undefined, null); - lserr = LsErr.ClientAbort; - } + return lserr; } @@ -893,11 +847,7 @@ ref lsHyph SaveException(e, Plsrun.Undefined, null); lserr = LsErr.ClientAbort; } - catch - { - SaveNonCLSException("GetPrevHyphenOpp", Plsrun.Undefined, null); - lserr = LsErr.ClientAbort; - } + return lserr; } @@ -958,11 +908,7 @@ ref LSRECT clipRect // [in] clipping rectangle SaveException(e, plsrun, lsrun); lserr = LsErr.ClientAbort; } - catch - { - SaveNonCLSException("DrawStrikethrough", plsrun, lsrun); - lserr = LsErr.ClientAbort; - } + return lserr; } @@ -1011,11 +957,7 @@ ref LSRECT clipRect // [in] clipping rectangle SaveException(e, plsrun, lsrun); lserr = LsErr.ClientAbort; } - catch - { - SaveNonCLSException("DrawUnderline", plsrun, lsrun); - lserr = LsErr.ClientAbort; - } + return lserr; } @@ -1468,11 +1410,7 @@ ref LSRECT clipRect // [in] from DisplayLine's clip rectangle pa SaveException(e, plsrun, lsrun); lserr = LsErr.ClientAbort; } - catch - { - SaveNonCLSException("DrawTextRun", plsrun, lsrun); - lserr = LsErr.ClientAbort; - } + return lserr; } @@ -1518,11 +1456,7 @@ ref int fIsInterruptOk // [out] disconnect glyphs between runs? SaveException(e, Plsrun.Undefined, null); lserr = LsErr.ClientAbort; } - catch - { - SaveNonCLSException("FInterruptShaping", Plsrun.Undefined, null); - lserr = LsErr.ClientAbort; - } + return lserr; } @@ -1653,13 +1587,8 @@ out actualGlyphCount SaveException(e, (Plsrun)(plsplsruns[0]), lsrunFirst); lserr = LsErr.ClientAbort; } - catch - { - SaveNonCLSException("GetGlyphsRedefined", (Plsrun)(plsplsruns[0]), lsrunFirst); - lserr = LsErr.ClientAbort; - } + return lserr; - } @@ -1735,13 +1664,8 @@ out glyphOffset SaveException(e, (Plsrun)(plsplsruns[0]), lsrunFirst); lserr = LsErr.ClientAbort; } - catch - { - SaveNonCLSException("GetGlyphPositions", (Plsrun)(plsplsruns[0]), lsrunFirst); - lserr = LsErr.ClientAbort; - } + return lserr; - } @@ -1841,11 +1765,7 @@ internal unsafe LsErr DrawGlyphs( SaveException(e, plsrun, lsrun); lserr = LsErr.ClientAbort; } - catch - { - SaveNonCLSException("DrawGlyphs", plsrun, lsrun); - lserr = LsErr.ClientAbort; - } + return lserr; } @@ -1891,11 +1811,7 @@ internal unsafe LsErr GetCharCompressionInfoFullMixed( SaveException(e, plsrun, lsrun); lserr = LsErr.ClientAbort; } - catch - { - SaveNonCLSException("GetCharCompressionInfoFullMixed", plsrun, lsrun); - lserr = LsErr.ClientAbort; - } + return lserr; } @@ -1941,11 +1857,7 @@ internal unsafe LsErr GetCharExpansionInfoFullMixed( SaveException(e, plsrun, lsrun); lserr = LsErr.ClientAbort; } - catch - { - SaveNonCLSException("GetCharExpansionInfoFullMixed", plsrun, lsrun); - lserr = LsErr.ClientAbort; - } + return lserr; } @@ -2045,11 +1957,7 @@ internal unsafe LsErr GetGlyphCompressionInfoFullMixed( SaveException(e, plsrun, lsrun); lserr = LsErr.ClientAbort; } - catch - { - SaveNonCLSException("GetGlyphCompressionInfoFullMixed", plsrun, lsrun); - lserr = LsErr.ClientAbort; - } + return lserr; } @@ -2177,11 +2085,7 @@ internal unsafe LsErr GetGlyphExpansionInfoFullMixed( SaveException(e, plsrun, lsrun); lserr = LsErr.ClientAbort; } - catch - { - SaveNonCLSException("GetGlyphExpansionInfoFullMixed", plsrun, lsrun); - lserr = LsErr.ClientAbort; - } + return lserr; } @@ -2321,11 +2225,7 @@ internal unsafe LsErr GetObjectHandlerInfo( SaveException(e, Plsrun.Undefined, null); lserr = LsErr.ClientAbort; } - catch - { - SaveNonCLSException("GetObjectHandlerInfo", Plsrun.Undefined, null); - lserr = LsErr.ClientAbort; - } + return lserr; } @@ -2393,15 +2293,10 @@ out LsBrkCond breakAfter // [out] break condition after this SaveException(e, plsrun, lsrun); lserr = LsErr.ClientAbort; } - catch - { - SaveNonCLSException("InlineFormat", plsrun, lsrun); - lserr = LsErr.ClientAbort; - } + return lserr; } - private LsBrkCond BreakConditionToLsBrkCond(LineBreakCondition breakCondition) { switch (breakCondition) @@ -2422,7 +2317,6 @@ private LsBrkCond BreakConditionToLsBrkCond(LineBreakCondition breakCondition) return LsBrkCond.Please; } - internal LsErr InlineDraw( System.IntPtr pols, // Line Layout context Plsrun plsrun, // plsrun @@ -2557,15 +2451,10 @@ int runWidth // object width SaveException(e, plsrun, lsrun); lserr = LsErr.ClientAbort; } - catch - { - SaveNonCLSException("InlineDraw", plsrun, lsrun); - lserr = LsErr.ClientAbort; - } + return lserr; } - // // Line enumeration methods through Line Services LsEnumLine callbacks // @@ -2686,12 +2575,7 @@ int glyphCount // glyph count SaveException(e, plsrun, lsrun); lserr = LsErr.ClientAbort; } - catch - { - SaveNonCLSException("EnumText", plsrun, lsrun); - lserr = LsErr.ClientAbort; - } - + return lserr; } @@ -2768,11 +2652,6 @@ int dupRun // width of the run SaveException(e, plsrun, lsrun); lserr = LsErr.ClientAbort; } - catch - { - SaveNonCLSException("EnumTab", plsrun, lsrun); - lserr = LsErr.ClientAbort; - } return lserr; } @@ -2781,16 +2660,10 @@ int dupRun // width of the run /// Returns whether a given character is a space character and hence can safely be expanded/compressed /// with little visual impact on the text. /// - private bool IsSpace(char ch) + private static bool IsSpace(char ch) { - if ( ch == '\u0009' // tab - || ch == '\u0020' // Space - ) - { - return true; - } - - return false; + return ch is '\u0009' // Tab + or '\u0020'; // Space } /// @@ -3243,8 +3116,6 @@ out charWidths } } - - glyphRun = lsrun.Shapeable.ComputeUnshapedGlyphRun( runOrigin, charString, @@ -3255,8 +3126,6 @@ out charWidths return glyphRun; } - - ///// Delegate holder // // It is critical to have an object holding all delegates exercised @@ -3390,13 +3259,6 @@ private void SaveException(Exception e, Plsrun plsrun, LSRun lsrun) _exception = e; } - private void SaveNonCLSException(string methodName, Plsrun plsrun, LSRun lsrun) - { - Exception e = new System.Exception(SR.NonCLSException); - e.Data[ExceptionContext.Key] = new ExceptionContext(null, methodName, plsrun, lsrun); - _exception = e; - } - [Serializable()] private class ExceptionContext {