|
| 1 | +This is https://github.com/freebsd/freebsd-ports/commit/e6daa211c609bde6ed3fe00fd5ce675714371805 |
| 2 | + |
| 3 | +--- a/plugins/kword/xp/ie_imp_KWord_1.cpp |
| 4 | ++++ b/plugins/kword/xp/ie_imp_KWord_1.cpp |
| 5 | +@@ -180,7 +180,7 @@ void IE_Imp_KWord_1::charData(const gchar *s, int len) |
| 6 | + m_charDataSeen[m_lenCharDataSeen++] = currentChar; |
| 7 | + if (m_lenCharDataSeen == m_lenCharDataExpected) |
| 8 | + { |
| 9 | +- buf += g_utf8_get_char(m_charDataSeen); |
| 10 | ++ buf += static_cast<UT_UCS4Char>(g_utf8_get_char(m_charDataSeen)); |
| 11 | + m_lenCharDataSeen = 0; |
| 12 | + } |
| 13 | + } |
| 14 | +--- a/src/af/ev/gtk/ev_UnixKeyboard.cpp |
| 15 | ++++ b/src/af/ev/gtk/ev_UnixKeyboard.cpp |
| 16 | +@@ -130,7 +130,7 @@ bool ev_UnixKeyboard::keyPressEvent(AV_View* pView, GdkEventKey* e) |
| 17 | + { |
| 18 | + // TODO: is this necessary? |
| 19 | + charData = gdk_keyval_to_unicode (charData); |
| 20 | +- UT_UTF8String utf8 (static_cast<const UT_UCS4Char *>(&charData), 1); |
| 21 | ++ UT_UTF8String utf8 (reinterpret_cast<const UT_UCS4Char *>(&charData), 1); |
| 22 | + return charDataEvent (pView, state, utf8.utf8_str(), utf8.byteLength()); |
| 23 | + } |
| 24 | + |
| 25 | +--- a/src/af/gr/xp/gr_CairoGraphics.cpp |
| 26 | ++++ b/src/af/gr/xp/gr_CairoGraphics.cpp |
| 27 | +@@ -535,7 +535,7 @@ bool GR_CairoGraphics::endPrint(void) |
| 28 | + |
| 29 | + void GR_CairoGraphics::drawGlyph(UT_uint32 Char, UT_sint32 xoff, UT_sint32 yoff) |
| 30 | + { |
| 31 | +- drawChars(&Char, 0, 1, xoff, yoff, NULL); |
| 32 | ++ drawChars(reinterpret_cast<const UT_UCSChar*>(&Char), 0, 1, xoff, yoff, NULL); |
| 33 | + } |
| 34 | + |
| 35 | + void GR_CairoGraphics::setColorSpace(GR_Graphics::ColorSpace /* c */) |
| 36 | +--- a/src/af/util/xp/ut_types.h |
| 37 | ++++ b/src/af/util/xp/ut_types.h |
| 38 | +@@ -40,7 +40,7 @@ |
| 39 | + |
| 40 | + typedef guint8 UT_Byte; |
| 41 | + |
| 42 | +-typedef gunichar UT_UCS4Char; |
| 43 | ++typedef char32_t UT_UCS4Char; |
| 44 | + typedef guint16 UT_UCS2Char; |
| 45 | + typedef gint32 UT_GrowBufElement; |
| 46 | + |
| 47 | +--- a/src/text/fmt/xp/fv_View_protected.cpp |
| 48 | ++++ b/src/text/fmt/xp/fv_View_protected.cpp |
| 49 | +@@ -5752,7 +5752,7 @@ UT_UCSChar * FV_View::_lookupSuggestion(fl_BlockLayout* pBL, |
| 50 | + UT_uint32 len = iLength; |
| 51 | + for (UT_uint32 ldex=0; ldex < len && ldex < INPUTWORDLEN; ldex++) |
| 52 | + { |
| 53 | +- stMisspelledWord += *pWord == UCS_RQUOTE ? '\'' : *pWord; |
| 54 | ++ stMisspelledWord += *pWord == UCS_RQUOTE ? U'\'' : *pWord; |
| 55 | + ++pWord; |
| 56 | + } |
| 57 | + |
| 58 | +--- a/src/wp/ap/gtk/ap_UnixDialog_Options.cpp |
| 59 | ++++ b/src/wp/ap/gtk/ap_UnixDialog_Options.cpp |
| 60 | +@@ -959,7 +959,7 @@ void AP_UnixDialog_Options::_setupSmartQuotesCombos( GtkWidget *optionmenu ) |
| 61 | + wszDisplayString[1] = (gunichar)'O'; |
| 62 | + wszDisplayString[2] = XAP_EncodingManager::smartQuoteStyles[i].rightQuote; |
| 63 | + wszDisplayString[3] = (gunichar)0; |
| 64 | +- gchar* szDisplayStringUTF8 = g_ucs4_to_utf8 ( wszDisplayString, -1, NULL, NULL, NULL ); |
| 65 | ++ gchar* szDisplayStringUTF8 = g_ucs4_to_utf8 ( reinterpret_cast<const gunichar*>(wszDisplayString), -1, NULL, NULL, NULL ); |
| 66 | + XAP_appendComboBoxTextAndInt(combo, szDisplayStringUTF8, i); |
| 67 | + g_free ( szDisplayStringUTF8 ); |
| 68 | + } |
| 69 | +--- a/src/wp/ap/xp/ap_Menu_Functions.cpp |
| 70 | ++++ b/src/wp/ap/xp/ap_Menu_Functions.cpp |
| 71 | +@@ -744,7 +744,7 @@ Defun_EV_GetMenuItemComputedLabel_Fn(ap_GetLabel_Suggest) |
| 72 | + UT_UCSChar *p = pView->getContextSuggest(ndx); |
| 73 | + gchar * c = NULL; |
| 74 | + if (p && *p) { |
| 75 | +- c = g_ucs4_to_utf8(p, -1, NULL, NULL, NULL); |
| 76 | ++ c = g_ucs4_to_utf8(reinterpret_cast<const gunichar *>(p), -1, NULL, NULL, NULL); |
| 77 | + } |
| 78 | + else if (ndx == 1) |
| 79 | + { |
0 commit comments