[Libreoffice-commits] core.git: sal/textenc
sal/textenc/context.hxx |6 +- 1 file changed, 1 insertion(+), 5 deletions(-) New commits: commit a43fe4e5c73c44a68fc32b16c1c8db4f3e216f4e Author: iakarsu AuthorDate: Sat Jan 25 14:59:01 2020 +0300 Commit: Muhammet Kara CommitDate: Sat Jan 25 17:47:15 2020 +0100 tdf#124176: Use pragma once instead of include guards Change-Id: Ibf31d5b97017f875e62b609beef0ecdebd559502 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87391 Tested-by: Jenkins Reviewed-by: Muhammet Kara diff --git a/sal/textenc/context.hxx b/sal/textenc/context.hxx index 7c6d96b7eff9..e887bab53ccc 100644 --- a/sal/textenc/context.hxx +++ b/sal/textenc/context.hxx @@ -17,9 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SAL_TEXTENC_CONTEXT_HXX -#define INCLUDED_SAL_TEXTENC_CONTEXT_HXX - +#pragma once #include @@ -34,6 +32,4 @@ void ImplResetUnicodeToTextContext(void * pContext); void ImplDestroyUnicodeToTextContext(void * pContext); -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/textenc
sal/textenc/tcvtkr6.tab |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 86690d55e935f48da67dc79e54a124b4b0515531 Author: Caolán McNamara AuthorDate: Wed Nov 20 09:22:14 2019 + Commit: Caolán McNamara CommitDate: Wed Nov 20 11:27:00 2019 +0100 ofz#19010 wrong start of range Change-Id: Ibf97a830932d3f153b99031abc8c4a00b54cedab Reviewed-on: https://gerrit.libreoffice.org/83265 Reviewed-by: Stephan Bergmann Tested-by: Jenkins diff --git a/sal/textenc/tcvtkr6.tab b/sal/textenc/tcvtkr6.tab index 61d87c930b5b..874040396645 100644 --- a/sal/textenc/tcvtkr6.tab +++ b/sal/textenc/tcvtkr6.tab @@ -381,7 +381,7 @@ static ImplUniToDBCSHighTab const aKSC5601DBCSHighTab[256] = { 0x06, 0xFA, aImplUniToDBCSTab_KSC5601_56 }, /* 0x56 */ { 0x03, 0xFC, aImplUniToDBCSTab_KSC5601_57 }, /* 0x57 */ { 0x00, 0xFD, aImplUniToDBCSTab_KSC5601_58 }, /* 0x58 */ -{ 0x07, 0xFF, aImplUniToDBCSTab_KSC5601_59 }, /* 0x59 */ +{ 0x0F, 0xFF, aImplUniToDBCSTab_KSC5601_59 }, /* 0x59 */ { 0x01, 0xE9, aImplUniToDBCSTab_KSC5601_5A }, /* 0x5A */ { 0x05, 0xFA, aImplUniToDBCSTab_KSC5601_5B }, /* 0x5B */ { 0x01, 0xFD, aImplUniToDBCSTab_KSC5601_5C }, /* 0x5C */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/textenc
sal/textenc/textenc.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ec7ad2a0bbd7f45d8262ae97c98e835650afd3a9 Author: Stephan Bergmann AuthorDate: Sun Dec 2 19:49:22 2018 +0100 Commit: Stephan Bergmann CommitDate: Sun Dec 2 19:49:22 2018 +0100 -Werror,-Wc++98-compat-extra-semi Change-Id: I15d67108b4a80a4788982ad6bea65e32fd941a35 diff --git a/sal/textenc/textenc.cxx b/sal/textenc/textenc.cxx index 4f5923d44fde..42b6848beb35 100644 --- a/sal/textenc/textenc.cxx +++ b/sal/textenc/textenc.cxx @@ -376,7 +376,7 @@ typedef ImplTextEncodingData const * TextEncodingFunction(rtl_TextEncoding); void thisModule() {} -}; +} class FullTextEncodingData { public: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/textenc sc/source
sal/textenc/tencinfo.cxx |2 +- sc/source/ui/app/inputhdl.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 55bb8bddd72079e619ab637409733764ddd33328 Author: Jens Carl AuthorDate: Fri Nov 30 17:46:04 2018 + Commit: Eike Rathke CommitDate: Sat Dec 1 19:23:31 2018 +0100 tdf#39468 Translate German comments Change-Id: I27e5e4604cd999d778eb84976b3bea0ef35122ee Reviewed-on: https://gerrit.libreoffice.org/64353 Tested-by: Jenkins Reviewed-by: Eike Rathke diff --git a/sal/textenc/tencinfo.cxx b/sal/textenc/tencinfo.cxx index 91b98c056f68..915f1e27237b 100644 --- a/sal/textenc/tencinfo.cxx +++ b/sal/textenc/tencinfo.cxx @@ -433,7 +433,7 @@ rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromUnixCharset( const char* pUnixC pTempBuf++; } -/* Parttrenner gefunden */ +/* found part separator */ if ( pSecondPart ) { /* Search for the part tab */ diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index ab2d53995fd4..dbe34d3fc937 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -322,7 +322,7 @@ void ScInputHandler::InitRangeFinder( const OUString& rFormula ) ++nPos; // Separator or closing quote } -// Text zwischen Trennern +// text between separators nStart = nPos; handle_r1c1: { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/textenc sc/source sfx2/source sw/source ucb/source unoxml/source
sal/textenc/convertisciidevangari.cxx|8 ++ sc/source/core/data/dociter.cxx |8 -- sc/source/ui/Accessibility/AccessibleCell.cxx| 17 ++ sc/source/ui/Accessibility/AccessibleDocument.cxx| 12 ++ sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx |5 sc/source/ui/app/client.cxx |6 - sc/source/ui/docshell/dbdocfun.cxx | 11 +++-- sc/source/ui/docshell/dbdocimp.cxx |2 - sc/source/ui/docshell/docsh.cxx | 14 +++- sc/source/ui/drawfunc/drtxtob.cxx| 14 +++- sc/source/ui/view/cellsh1.cxx| 22 ++- sc/source/ui/view/cellsh2.cxx| 16 +++-- sfx2/source/dialog/dinfdlg.cxx |8 +- sfx2/source/doc/docfile.cxx |4 +-- sw/source/uibase/app/docsh.cxx | 15 +++- sw/source/uibase/app/docsh2.cxx |2 - sw/source/uibase/dbui/dbmgr.cxx |9 ++- sw/source/uibase/docvw/edtwin.cxx|2 - sw/source/uibase/frmdlg/colex.cxx|6 + ucb/source/cacher/cachedcontentresultset.cxx |4 +-- unoxml/source/dom/attr.cxx |7 +- 21 files changed, 58 insertions(+), 134 deletions(-) New commits: commit 5f0ddb2d2068a4388a7df12cd0e11f628b91e4c0 Author: Mike Kaganski AuthorDate: Sun Oct 28 00:13:29 2018 +0300 Commit: Mike Kaganski CommitDate: Sun Oct 28 07:55:59 2018 +0100 tdf#120703 PVS: V547 Expression is always true/false Change-Id: Ic92cc594979cac2edac04a085957398672a5dfcc Reviewed-on: https://gerrit.libreoffice.org/62450 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/sal/textenc/convertisciidevangari.cxx b/sal/textenc/convertisciidevangari.cxx index 852b8c65a3ce..16c453fb8487 100644 --- a/sal/textenc/convertisciidevangari.cxx +++ b/sal/textenc/convertisciidevangari.cxx @@ -194,11 +194,9 @@ sal_Size IsciiDevanagariToUnicode::convert( continue; if (eAction == BAD_INPUT_STOP) break; -if (eAction == BAD_INPUT_NO_OUTPUT) -{ -nInfo |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL; -break; -} +assert(eAction == BAD_INPUT_NO_OUTPUT); +nInfo |= RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL; +break; } ++nConverted; if (bDouble) diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index db418e330154..3ceaf83c8048 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.cxx @@ -1739,14 +1739,6 @@ bool ScQueryCellIterator::BinarySearch() { size_t nMid = (nLo+nHi)/2; size_t i = nMid; -if (i > nHi) -{ -if (nMid > 0) -nHi = nMid - 1; -else -bDone = true; -continue; // while -} aCellData = aIndexer.getCell(i); aCell = aCellData.first; diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx index d07a2a07f3fb..0c414eaf1beb 100644 --- a/sc/source/ui/Accessibility/AccessibleCell.cxx +++ b/sc/source/ui/Accessibility/AccessibleCell.cxx @@ -445,24 +445,21 @@ void ScAccessibleCell::AddRelation(const ScRange& rRange, uno::Reference < XAccessibleTable > xTable ( getAccessibleParent()->getAccessibleContext(), uno::UNO_QUERY ); if (xTable.is()) { -sal_uInt32 nCount(static_cast(rRange.aEnd.Col() - +const sal_uInt32 nCount(static_cast(rRange.aEnd.Col() - rRange.aStart.Col() + 1) * (rRange.aEnd.Row() - rRange.aStart.Row() + 1)); uno::Sequence < uno::Reference < uno::XInterface > > aTargetSet( nCount ); uno::Reference < uno::XInterface >* pTargetSet = aTargetSet.getArray(); -if (pTargetSet) +sal_uInt32 nPos(0); +for (sal_uInt32 nRow = rRange.aStart.Row(); nRow <= sal::static_int_cast(rRange.aEnd.Row()); ++nRow) { -sal_uInt32 nPos(0); -for (sal_uInt32 nRow = rRange.aStart.Row(); nRow <= sal::static_int_cast(rRange.aEnd.Row()); ++nRow) +for (sal_uInt32 nCol = rRange.aStart.Col(); nCol <= sal::static_int_cast(rRange.aEnd.Col()); ++nCol) { -for (sal_uInt32 nCol = rRange.aStart.Col(); nCol <= sal::static_int_cast(rRange.aEnd.Col()); ++nCol) -{ -pTargetSet[nPos] = xTable->getAccessibleCellAt(nRow, nCol); -++nPos; -} +pTargetSet[nPos] = xTable->getAccessibleCellAt(nRow, nCol); +++nPos;
[Libreoffice-commits] core.git: sal/textenc
sal/textenc/convertsimple.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit c3554e77056b6c950fe946c7c53dd93838e17c9a Author: Andrea Gelmini AuthorDate: Mon Aug 13 17:12:53 2018 +0200 Commit: Regina Henschel CommitDate: Sun Aug 19 19:05:30 2018 +0200 Fix typos Change-Id: Ib717870185bdf4ac43af8fcd3a7233b051e23d30 Reviewed-on: https://gerrit.libreoffice.org/5 Tested-by: Jenkins Reviewed-by: Regina Henschel diff --git a/sal/textenc/convertsimple.cxx b/sal/textenc/convertsimple.cxx index e621cdda504a..635a881432fd 100644 --- a/sal/textenc/convertsimple.cxx +++ b/sal/textenc/convertsimple.cxx @@ -372,8 +372,8 @@ static ImplReplaceCharStrData const aImplRepCharStrTab[] = { 0x0153, { 0x006F, 0x0065, 0x, 0x, 0x } }, /* LATIN SMALL LIGATURE OE */ { 0x2025, { 0x002E, 0x002E, 0x, 0x, 0x } }, /* TWO DOT LEADER */ { 0x2026, { 0x002E, 0x002E, 0x002E, 0x, 0x } }, /* HORIZONTAL ELLIPSES */ - { 0x2034, { 0x0027, 0x0027, 0x0027, 0x, 0x } }, /* TRIPPLE PRIME */ - { 0x2037, { 0x0027, 0x0027, 0x0027, 0x, 0x } }, /* RESERVED TRIPPLE PRIME */ + { 0x2034, { 0x0027, 0x0027, 0x0027, 0x, 0x } }, /* TRIPLE PRIME */ + { 0x2037, { 0x0027, 0x0027, 0x0027, 0x, 0x } }, /* REVERSED TRIPLE PRIME */ { 0x20AC, { 0x0045, 0x0055, 0x0052, 0x, 0x } }, /* EURO SIGN */ { 0x2122, { 0x0028, 0x0074, 0x006D, 0x0029, 0x } }, /* TRADE MARK SIGN */ { 0x2153, { 0x0031, 0x002F, 0x0033, 0x, 0x } }, /* VULGAR FRACTION ONE THIRD */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/textenc
sal/textenc/tcvtkr6.tab |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 934fa68365b40c9dcfe5ae4a0e712195e0c1d5a4 Author: Caolán McNamara AuthorDate: Mon Jul 23 09:23:54 2018 +0100 Commit: Caolán McNamara CommitDate: Mon Jul 23 11:42:26 2018 +0200 ofz#9507 wrong start point for Johab block 59 Change-Id: I011f4cbb10324c4a7d4e1be3ab1355291f79730b Reviewed-on: https://gerrit.libreoffice.org/57838 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sal/textenc/tcvtkr6.tab b/sal/textenc/tcvtkr6.tab index 1685963408c3..61d87c930b5b 100644 --- a/sal/textenc/tcvtkr6.tab +++ b/sal/textenc/tcvtkr6.tab @@ -1013,7 +1013,7 @@ static ImplUniToDBCSHighTab const aJOHABDBCSHighTab[256] = { 0x06, 0xFA, aImplUniToDBCSTab_JOHAB_56 }, /* 0x56 */ { 0x03, 0xFC, aImplUniToDBCSTab_JOHAB_57 }, /* 0x57 */ { 0x00, 0xFD, aImplUniToDBCSTab_JOHAB_58 }, /* 0x58 */ -{ 0x07, 0xFF, aImplUniToDBCSTab_JOHAB_59 }, /* 0x59 */ +{ 0x0F, 0xFF, aImplUniToDBCSTab_JOHAB_59 }, /* 0x59 */ { 0x01, 0xE9, aImplUniToDBCSTab_JOHAB_5A }, /* 0x5A */ { 0x05, 0xFA, aImplUniToDBCSTab_JOHAB_5B }, /* 0x5B */ { 0x01, 0xFD, aImplUniToDBCSTab_JOHAB_5C }, /* 0x5C */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/textenc
sal/textenc/tcvtkr6.tab |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 17adc2f8ebe48a3b7dd394269b09240967fc5995 Author: Caolán McNamaraDate: Thu Feb 8 17:05:11 2018 + ofz#6112 wrong start off sets for korean KSC5601 table Change-Id: If986352478f34f54015f1969c97c26e2ef05c06c Reviewed-on: https://gerrit.libreoffice.org/49444 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sal/textenc/tcvtkr6.tab b/sal/textenc/tcvtkr6.tab index 6c83292b50c4..1685963408c3 100644 --- a/sal/textenc/tcvtkr6.tab +++ b/sal/textenc/tcvtkr6.tab @@ -401,13 +401,13 @@ static ImplUniToDBCSHighTab const aKSC5601DBCSHighTab[256] = { 0x02, 0xFB, aImplUniToDBCSTab_KSC5601_6A }, /* 0x6A */ { 0x04, 0xEC, aImplUniToDBCSTab_KSC5601_6B }, /* 0x6B */ { 0x08, 0xF3, aImplUniToDBCSTab_KSC5601_6C }, /* 0x6C */ -{ 0x03, 0xFB, aImplUniToDBCSTab_KSC5601_6D }, /* 0x6D */ +{ 0x0B, 0xFB, aImplUniToDBCSTab_KSC5601_6D }, /* 0x6D */ { 0x17, 0xFF, aImplUniToDBCSTab_KSC5601_6E }, /* 0x6E */ { 0x01, 0xFE, aImplUniToDBCSTab_KSC5601_6F }, /* 0x6F */ { 0x01, 0xFD, aImplUniToDBCSTab_KSC5601_70 }, /* 0x70 */ { 0x04, 0xFF, aImplUniToDBCSTab_KSC5601_71 }, /* 0x71 */ { 0x00, 0xFD, aImplUniToDBCSTab_KSC5601_72 }, /* 0x72 */ -{ 0x02, 0xFE, aImplUniToDBCSTab_KSC5601_73 }, /* 0x73 */ +{ 0x0A, 0xFE, aImplUniToDBCSTab_KSC5601_73 }, /* 0x73 */ { 0x01, 0xF7, aImplUniToDBCSTab_KSC5601_74 }, /* 0x74 */ { 0x01, 0xFC, aImplUniToDBCSTab_KSC5601_75 }, /* 0x75 */ { 0x00, 0xFE, aImplUniToDBCSTab_KSC5601_76 }, /* 0x76 */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/textenc
sal/textenc/tcvtmb.cxx | 14 +- 1 file changed, 1 insertion(+), 13 deletions(-) New commits: commit 363cb299ddda76504f49e3445e6609fe3a4c8111 Author: Chris SherlockDate: Fri Dec 22 19:01:25 2017 +1100 sal: fix typo in tcvtmb.cxx and remove comment cruft Change-Id: I1617900cd2df096d46a2cba75ef2fe1373c0ab63 Reviewed-on: https://gerrit.libreoffice.org/46948 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/sal/textenc/tcvtmb.cxx b/sal/textenc/tcvtmb.cxx index 7446fbfec562..efdf01ea4e90 100644 --- a/sal/textenc/tcvtmb.cxx +++ b/sal/textenc/tcvtmb.cxx @@ -25,15 +25,11 @@ #include "tenchelp.hxx" #include "unichars.hxx" -/* === */ - /* DBCS to Unicode conversion routine use a lead table for the first byte, */ /* where we determine the trail table or for single byte chars the unicode */ /* value. We have for all lead byte a separate table, because we can */ /* then share many tables for different charset encodings. */ -/* === */ - sal_Size ImplDBCSToUnicode( const void* pData, SAL_UNUSED_PARAMETER void*, const char* pSrcBuf, sal_Size nSrcBytes, sal_Unicode* pDestBuf, sal_Size nDestChars, @@ -82,7 +78,7 @@ sal_Size ImplDBCSToUnicode( const void* pData, SAL_UNUSED_PARAMETER void*, } else { -/* Source buffer to small */ +/* Source buffer too small */ if ( pSrcBuf +1 == pEndSrcBuf ) { if ( (nFlags & RTL_TEXTTOUNICODE_FLAGS_FLUSH) == 0 ) @@ -207,8 +203,6 @@ sal_Size ImplDBCSToUnicode( const void* pData, SAL_UNUSED_PARAMETER void*, return (nDestChars - (pEndDestBuf-pDestBuf)); } -/* --- */ - sal_Size ImplUnicodeToDBCS( const void* pData, SAL_UNUSED_PARAMETER void*, const sal_Unicode* pSrcBuf, sal_Size nSrcChars, char* pDestBuf, sal_Size nDestBytes, @@ -361,13 +355,9 @@ sal_Size ImplUnicodeToDBCS( const void* pData, SAL_UNUSED_PARAMETER void*, return (nDestBytes - (pEndDestBuf-pDestBuf)); } -/* === */ - #define JIS_EUC_LEAD_OFF0x80 #define JIS_EUC_TRAIL_OFF 0x80 -/* --- */ - sal_Size ImplEUCJPToUnicode( const void* pData, SAL_UNUSED_PARAMETER void*, const char* pSrcBuf, sal_Size nSrcBytes, @@ -525,8 +515,6 @@ sal_Size ImplEUCJPToUnicode( const void* pData, return (nDestChars - (pEndDestBuf-pDestBuf)); } -/* --- */ - sal_Size ImplUnicodeToEUCJP( const void* pData, SAL_UNUSED_PARAMETER void*, const sal_Unicode* pSrcBuf, sal_Size nSrcChars, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/textenc
sal/textenc/textcvt.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 870617882366232aa4ff9aa2faaae1cad2bbc3f8 Author: Stephan BergmannDate: Thu Sep 28 14:32:49 2017 +0200 Warn about missing text converter (probably because the encoding is RTL_TEXTENCODING_DONTKNOW; that may still happen in various places, so can't use anything stronger than SAL_WARN here) Change-Id: I75993c9ad629104055c171389ed7708649747d9b diff --git a/sal/textenc/textcvt.cxx b/sal/textenc/textcvt.cxx index 03914833544b..1c5ec838b57c 100644 --- a/sal/textenc/textcvt.cxx +++ b/sal/textenc/textcvt.cxx @@ -22,6 +22,7 @@ #include #include "rtl/textcvt.h" +#include "sal/log.hxx" #include "gettextencodingdata.hxx" #include "tenchelp.hxx" @@ -183,6 +184,7 @@ sal_Size SAL_CALL rtl_convertTextToUnicode( rtl_TextToUnicodeConverter hConverte converter, because not all converters are implemented yet */ if ( !pConverter ) { +SAL_WARN("sal.textenc", "Missing rtl_TextToUnicodeConverter"); return ImplDummyToUnicode( pSrcBuf, nSrcBytes, pDestBuf, nDestChars, nFlags, pInfo, pSrcCvtBytes ); @@ -280,6 +282,7 @@ sal_Size SAL_CALL rtl_convertUnicodeToText( rtl_UnicodeToTextConverter hConverte converter, because not all converters are implemented yet */ if ( !pConverter ) { +SAL_WARN("sal.textenc", "Missing rtl_UnicodeToTextConverter"); return ImplUnicodeToDummy( pSrcBuf, nSrcChars, pDestBuf, nDestBytes, nFlags, pInfo, pSrcCvtChars ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/textenc
sal/textenc/tcvtkr6.tab |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit dc3779adf1af5459653bde91e1e6447598cba538 Author: Caolán McNamaraDate: Mon Aug 28 14:34:16 2017 +0100 ofz#3186: wrong starting offset for JOHAB 0x6D block Change-Id: I4de6d9d781b2f2313d8fd338b34dcb31434efe91 Reviewed-on: https://gerrit.libreoffice.org/41638 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sal/textenc/tcvtkr6.tab b/sal/textenc/tcvtkr6.tab index e03f3405e811..fab6c6131a5f 100644 --- a/sal/textenc/tcvtkr6.tab +++ b/sal/textenc/tcvtkr6.tab @@ -1033,7 +1033,7 @@ static ImplUniToDBCSHighTab const aJOHABDBCSHighTab[256] = { 0x02, 0xFB, aImplUniToDBCSTab_JOHAB_6A }, /* 0x6A */ { 0x04, 0xEC, aImplUniToDBCSTab_JOHAB_6B }, /* 0x6B */ { 0x08, 0xF3, aImplUniToDBCSTab_JOHAB_6C }, /* 0x6C */ -{ 0x03, 0xFB, aImplUniToDBCSTab_JOHAB_6D }, /* 0x6D */ +{ 0x0B, 0xFB, aImplUniToDBCSTab_JOHAB_6D }, /* 0x6D */ { 0x17, 0xFF, aImplUniToDBCSTab_JOHAB_6E }, /* 0x6E */ { 0x01, 0xFE, aImplUniToDBCSTab_JOHAB_6F }, /* 0x6F */ { 0x01, 0xFD, aImplUniToDBCSTab_JOHAB_70 }, /* 0x70 */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/textenc
sal/textenc/tcvtutf8.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 66322c5f4a5465c74fa3ceefaa2f76e86a277c16 Author: Stephan BergmannDate: Wed Sep 13 09:12:04 2017 +0200 Silence warning C4701: potentially uninitialized local variable Change-Id: Ia37347108f9fe7094f055a5c6f2ec9511c3aff1d diff --git a/sal/textenc/tcvtutf8.cxx b/sal/textenc/tcvtutf8.cxx index 4943f6987a29..d9c3c134a83a 100644 --- a/sal/textenc/tcvtutf8.cxx +++ b/sal/textenc/tcvtutf8.cxx @@ -68,7 +68,7 @@ sal_Size ImplConvertUtf8ToUnicode( { bool bJavaUtf8 = pData != nullptr; sal_uInt32 nUtf32 = 0; -int nBytes; +int nBytes = int(); int nShift = -1; bool bCheckBom = true; sal_uInt32 nInfo = 0; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/textenc
sal/textenc/tcvtest1.tab | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) New commits: commit a2a890a4eb5029b9adace190a7da1b65b5855b15 Author: Stephan BergmannDate: Mon Jul 3 12:45:24 2017 +0200 Rather translate "Sonderzeichen" as "special characters" ...as had been done in sal/textenc/tcvtlat1.tab, in 5034e8217c9844293dc94e5dff0bdc865ad7a91a "Translate German comments and debug strings (leftovers in dirs sal to sc)". What those comments actually want to say is that, despite being the ASCII control character region, those encodings contain some graphic characters there. Change-Id: Iefad9c45341891c3e91e6b9fb265d3070d1220ad diff --git a/sal/textenc/tcvtest1.tab b/sal/textenc/tcvtest1.tab index 8c045de2d006..9a23d29a8355 100644 --- a/sal/textenc/tcvtest1.tab +++ b/sal/textenc/tcvtest1.tab @@ -3030,7 +3030,7 @@ static ImplTextEncodingData const aImplISO885913TextEncodingData /* APPLE-CentEuro */ /* Apple CharSet for Eastern Europa (Polish, Czech, Slovak, Hungarian, Estonian, Latvian, Lithuanian) */ -/* 1-byte, 0x00-0x7F ASCII, but actually control character between 0x00-0x1F */ +/* 1-byte, 0x00-0x7F ASCII, but actually special characters between 0x00-0x1F */ /* which we don't consider, though */ /* Convert-Tables: mappings/vendors/apple/centeuro.txt from 02/05/98 */ /* Last-Changes from us: */ @@ -3235,7 +3235,7 @@ static ImplTextEncodingData const aImplAPPLECENTEUROTextEncodingData /* APPLE-Croatian */ /* Standard Apple CharSet for Croatian */ -/* 1-byte, 0x00-0x7F ASCII, but actually control character between 0x00-0x1F */ +/* 1-byte, 0x00-0x7F ASCII, but actually special characters between 0x00-0x1F */ /* which we don't consider, though */ /* Convert-Tables: mappings/vendors/apple/croatien.txt from 02/05/98 */ /* Last-Changes from us: */ @@ -3383,7 +3383,7 @@ static ImplTextEncodingData const aImplAPPLECROATIANTextEncodingData /* APPLE-Cyrillic */ /* Apple CharSet for Cyrillic */ -/* 1-byte, 0x00-0x7F ASCII, but actually control character between 0x00-0x1F */ +/* 1-byte, 0x00-0x7F ASCII, but actually special characters between 0x00-0x1F */ /* which we don't consider, though */ /* Convert-Tables: mappings/vendors/apple/cyrillic.txt from 02/15/98 */ /* Last-Changes from us: */ @@ -3518,7 +3518,7 @@ static ImplTextEncodingData const aImplAPPLECYRILLICTextEncodingData /* APPLE-Greek */ /* Apple CharSet for Greek */ -/* 1-byte, 0x00-0x7F ASCII, but actually control character between 0x00-0x1F */ +/* 1-byte, 0x00-0x7F ASCII, but actually special characters between 0x00-0x1F */ /* which we don't consider, though */ /* Convert-Tables: mappings/vendors/apple/roman.txt from 08/18/98 */ /* Last-Changes from us: */ @@ -3672,7 +3672,7 @@ static ImplTextEncodingData const aImplAPPLEGREEKTextEncodingData /* APPLE-Romanian */ /* Standard Apple CharSet for Romanian */ -/* 1-byte, 0x00-0x7F ASCII, but actually control character between 0x00-0x1F */ +/* 1-byte, 0x00-0x7F ASCII, but actually special characters between 0x00-0x1F */ /* which we don't consider, though */ /* Convert-Tables: mappings/vendors/apple/romanian.txt from 02/05/98 */ /* Last-Changes from us: */ @@ -3826,7 +3826,7 @@ static ImplTextEncodingData const aImplAPPLEROMANIANTextEncodingData /* APPLE-Turkish */ /* Apple CharSet for Turkish */ -/* 1-byte, 0x00-0x7F ASCII, but actually control character between 0x00-0x1F */ +/* 1-byte, 0x00-0x7F ASCII, but actually special characters between 0x00-0x1F */ /* which we don't consider, though */ /* Convert-Tables: mappings/vendors/apple/turkish.txt from 02/05/98 */ /* Last-Changes from us: */ @@ -3973,7 +3973,7 @@ static ImplTextEncodingData const aImplAPPLETURKISHTextEncodingData /* APPLE-Ukrainian */ /* Apple CharSet for Ukrainian */ -/* 1-byte, 0x00-0x7F ASCII, but actually control character between 0x00-0x1F */ +/* 1-byte, 0x00-0x7F ASCII, but actually special characters between 0x00-0x1F */ /* which we don't consider, though */ /* Convert-Tables: mappings/vendors/apple/ukraine.txt from 02/05/98 */ /* Last-Changes from us: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/textenc
sal/textenc/tcvtkr6.tab |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6c81597663d07fd0c1043cc83410e1bfd42e08b4 Author: Caolán McNamaraDate: Thu Mar 9 09:40:58 2017 + ofz#770 JOHAB_73 table starts at 0xA not 0x2 the start value is out by one row Change-Id: I77ed154358516ccd47a090cf7ed45bb609bc81a3 Reviewed-on: https://gerrit.libreoffice.org/34992 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sal/textenc/tcvtkr6.tab b/sal/textenc/tcvtkr6.tab index 384c12045956..de68d624f8b2 100644 --- a/sal/textenc/tcvtkr6.tab +++ b/sal/textenc/tcvtkr6.tab @@ -1039,7 +1039,7 @@ static ImplUniToDBCSHighTab const aJOHABDBCSHighTab[256] = { 0x01, 0xFD, aImplUniToDBCSTab_JOHAB_70 }, /* 0x70 */ { 0x04, 0xFF, aImplUniToDBCSTab_JOHAB_71 }, /* 0x71 */ { 0x00, 0xFD, aImplUniToDBCSTab_JOHAB_72 }, /* 0x72 */ -{ 0x02, 0xFE, aImplUniToDBCSTab_JOHAB_73 }, /* 0x73 */ +{ 0x0A, 0xFE, aImplUniToDBCSTab_JOHAB_73 }, /* 0x73 */ { 0x01, 0xF7, aImplUniToDBCSTab_JOHAB_74 }, /* 0x74 */ { 0x01, 0xFC, aImplUniToDBCSTab_JOHAB_75 }, /* 0x75 */ { 0x00, 0xFE, aImplUniToDBCSTab_JOHAB_76 }, /* 0x76 */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/textenc
sal/textenc/tcvtjp6.tab |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 0f4eb22d5f3a86af9e5f8042c69e4ddf4a350b93 Author: Caolán McNamaraDate: Sun Jan 1 17:26:44 2017 + ofz#358 SJIS_84 table mnLeadEnd is out by one sjis 82 and 83 correctly denote the last index available while 84 reports one past the last available index 0x84BE is the last value to map, not 0x84BF Change-Id: Idcadc2d554ee59586f6e2f2775301fe69c94d55a diff --git a/sal/textenc/tcvtjp6.tab b/sal/textenc/tcvtjp6.tab index 3b98079..1dd7789 100644 --- a/sal/textenc/tcvtjp6.tab +++ b/sal/textenc/tcvtjp6.tab @@ -162,7 +162,7 @@ static ImplDBCSToUniLeadTab const aSJISUniLeadTab[256] = { 0, 0x40, 0xFC, aImplDBCSToUniTab_MS932_81 }, /* 0x81 */ { 0, 0x4F, 0xF1, aImplDBCSToUniTab_SJIS_82 }, /* 0x82 */ { 0, 0x40, 0xD6, aImplDBCSToUniTab_SJIS_83 }, /* 0x83 */ -{ 0, 0x40, 0xBF, aImplDBCSToUniTab_SJIS_84 }, /* 0x84 */ +{ 0, 0x40, 0xBE, aImplDBCSToUniTab_SJIS_84 }, /* 0x84 */ { 0,1,0, aImplDoubleByteIdentifierTab }, /* 0x85 */ /* We convert this as double byte */ { 0,1,0, aImplDoubleByteIdentifierTab }, /* 0x86 */ /* We convert this as double byte */ { 0, 0x40, 0x9C, aImplDBCSToUniTab_MS932_87 }, /* 0x87 */ /* We use the MS table for better MS compatibility */ @@ -734,7 +734,7 @@ static ImplDBCSToUniLeadTab const aMS932UniLeadTab[256] = { 0, 0x40, 0xFC, aImplDBCSToUniTab_MS932_81 }, /* 0x81 */ { 0, 0x4F, 0xF1, aImplDBCSToUniTab_SJIS_82 }, /* 0x82 */ { 0, 0x40, 0xD6, aImplDBCSToUniTab_SJIS_83 }, /* 0x83 */ -{ 0, 0x40, 0xBF, aImplDBCSToUniTab_SJIS_84 }, /* 0x84 */ +{ 0, 0x40, 0xBE, aImplDBCSToUniTab_SJIS_84 }, /* 0x84 */ { 0,1,0, aImplDoubleByteIdentifierTab }, /* 0x85 */ /* We convert this as double byte */ { 0,1,0, aImplDoubleByteIdentifierTab }, /* 0x86 */ /* We convert this as double byte */ { 0, 0x40, 0x9C, aImplDBCSToUniTab_MS932_87 }, /* 0x87 */ @@ -1291,7 +1291,7 @@ static ImplDBCSToUniLeadTab const aAPPLEJAPANESEUniLeadTab[256] = { 0, 0x40, 0xFC, aImplDBCSToUniTab_MS932_81 }, /* 0x81 */ { 0, 0x4F, 0xF1, aImplDBCSToUniTab_SJIS_82 }, /* 0x82 */ { 0, 0x40, 0xD6, aImplDBCSToUniTab_SJIS_83 }, /* 0x83 */ -{ 0, 0x40, 0xBF, aImplDBCSToUniTab_SJIS_84 }, /* 0x84 */ +{ 0, 0x40, 0xBE, aImplDBCSToUniTab_SJIS_84 }, /* 0x84 */ { 0, 0x40, 0xF4, aImplDBCSToUniTab_APPLEJAPANESE_85 }, /* 0x85 */ { 0, 0x40, 0xD2, aImplDBCSToUniTab_APPLEJAPANESE_86 }, /* 0x86 */ { 0, 0x40, 0xFA, aImplDBCSToUniTab_APPLEJAPANESE_87 }, /* 0x87 */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/textenc
sal/textenc/textenc.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 33b93f9d4aac62a913f401858b6bf96b508dfa93 Author: Stephan Bergmann sberg...@redhat.com Date: Mon May 18 17:34:48 2015 +0200 loplugin:staticmethods Change-Id: Ie225e9816a626e2581b8309f59519ab99e1af04a diff --git a/sal/textenc/textenc.cxx b/sal/textenc/textenc.cxx index 99b3dbb..a0031be 100644 --- a/sal/textenc/textenc.cxx +++ b/sal/textenc/textenc.cxx @@ -362,6 +362,7 @@ extern C ImplTextEncodingData const * sal_getFullTextEncodingData( class FullTextEncodingData: private boost::noncopyable { public: ImplTextEncodingData const * get(rtl_TextEncoding encoding) { +(void) this; // loplugin:staticmethods return sal_getFullTextEncodingData(encoding); } }; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/textenc
sal/textenc/tcvtmb.cxx | 163 + 1 file changed, 84 insertions(+), 79 deletions(-) New commits: commit d82e94307f1e073a0ccddb506ba5fff3da042b42 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Apr 8 15:30:34 2015 +0200 tdf#88169: Do not return ..._INFO_SRCBUFFERTOSMALL when ..._FLAGS_FLUSH ...in accordance with http://www.openoffice.org/udk/cpp/man/spec/textconversion.html Change-Id: I62013f89c421722770123db8a5794e63d3572e6b diff --git a/sal/textenc/tcvtmb.cxx b/sal/textenc/tcvtmb.cxx index acf02cc..6d0534b 100644 --- a/sal/textenc/tcvtmb.cxx +++ b/sal/textenc/tcvtmb.cxx @@ -87,113 +87,118 @@ sal_Size ImplDBCSToUnicode( const void* pData, SAL_UNUSED_PARAMETER void*, /* Source buffer to small */ if ( pSrcBuf +1 == pEndSrcBuf ) { -*pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL; -break; +if ( (nFlags RTL_TEXTTOUNICODE_FLAGS_FLUSH) == 0 ) +{ +*pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL; +break; +} } - -pSrcBuf++; -cTrail = (unsigned char)*pSrcBuf; -if ( (cTrail = pLeadEntry-mnTrailStart) (cTrail = pLeadEntry-mnTrailEnd) ) -cConv = pLeadEntry-mpToUniTrailTab[cTrail-pLeadEntry-mnTrailStart]; else -cConv = 0; - -if ( !cConv ) { -/* EUDC Ranges */ -sal_uInt16 i; -const ImplDBCSEUDCData* pEUDCTab = pConvertData-mpEUDCTab; -for ( i = 0; i pConvertData-mnEUDCCount; i++ ) +pSrcBuf++; +cTrail = (unsigned char)*pSrcBuf; +if ( (cTrail = pLeadEntry-mnTrailStart) (cTrail = pLeadEntry-mnTrailEnd) ) +cConv = pLeadEntry-mpToUniTrailTab[cTrail-pLeadEntry-mnTrailStart]; +else +cConv = 0; + +if ( !cConv ) { -if ( (cLead = pEUDCTab-mnLeadStart) - (cLead = pEUDCTab-mnLeadEnd) ) +/* EUDC Ranges */ +sal_uInt16 i; +const ImplDBCSEUDCData* pEUDCTab = pConvertData-mpEUDCTab; +for ( i = 0; i pConvertData-mnEUDCCount; i++ ) { -if ( (cTrail = pEUDCTab-mnTrail1Start) - (cTrail = pEUDCTab-mnTrail1End) ) +if ( (cLead = pEUDCTab-mnLeadStart) + (cLead = pEUDCTab-mnLeadEnd) ) { -cConv = pEUDCTab-mnUniStart+ - ((cLead-pEUDCTab-mnLeadStart)*pEUDCTab-mnTrailRangeCount)+ -(cTrail-pEUDCTab-mnTrail1Start); -break; -} -else -{ -sal_uInt16 nTrailCount = pEUDCTab-mnTrail1End-pEUDCTab-mnTrail1Start+1; -if ( (pEUDCTab-mnTrailCount = 2) - (cTrail = pEUDCTab-mnTrail2Start) - (cTrail = pEUDCTab-mnTrail2End) ) +if ( (cTrail = pEUDCTab-mnTrail1Start) + (cTrail = pEUDCTab-mnTrail1End) ) { cConv = pEUDCTab-mnUniStart+ - ((cLead-pEUDCTab-mnLeadStart)*pEUDCTab-mnTrailRangeCount)+ -nTrailCount+ -(cTrail-pEUDCTab-mnTrail2Start); + ((cLead-pEUDCTab-mnLeadStart)*pEUDCTab-mnTrailRangeCount)+ +(cTrail-pEUDCTab-mnTrail1Start); break; } else { -nTrailCount = pEUDCTab-mnTrail2End-pEUDCTab-mnTrail2Start+1; -if ( (pEUDCTab-mnTrailCount = 3) - (cTrail = pEUDCTab-mnTrail3Start) - (cTrail = pEUDCTab-mnTrail3End) ) +sal_uInt16 nTrailCount = pEUDCTab-mnTrail1End-pEUDCTab-mnTrail1Start+1; +if ( (pEUDCTab-mnTrailCount = 2) + (cTrail = pEUDCTab-mnTrail2Start) + (cTrail = pEUDCTab-mnTrail2End) ) { cConv = pEUDCTab-mnUniStart+ +
[Libreoffice-commits] core.git: sal/textenc
sal/textenc/tcvtmb.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit c4dca26eafd60dc4c4f19e0be0b8e086108b3048 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Apr 8 15:47:19 2015 +0200 -Werror=maybe-uninitialized Change-Id: I7d3c36e564b3a5286ebd32527575472313119587 diff --git a/sal/textenc/tcvtmb.cxx b/sal/textenc/tcvtmb.cxx index 6d0534b..75e5b7f 100644 --- a/sal/textenc/tcvtmb.cxx +++ b/sal/textenc/tcvtmb.cxx @@ -92,6 +92,7 @@ sal_Size ImplDBCSToUnicode( const void* pData, SAL_UNUSED_PARAMETER void*, *pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL; break; } +cConv = 0; } else { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/textenc
sal/textenc/convertisciidevangari.tab |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit c8945b3fb850985794efcb8afbbdc2f5985d7088 Author: Stephan Bergmann sberg...@redhat.com Date: Thu May 22 17:57:34 2014 +0200 Fix order of function pointers Change-Id: Ic1bae7fcebfaf35b62aecd86ed8b3a70fae3e4d3 diff --git a/sal/textenc/convertisciidevangari.tab b/sal/textenc/convertisciidevangari.tab index 6c4a24b..19fbca1 100644 --- a/sal/textenc/convertisciidevangari.tab +++ b/sal/textenc/convertisciidevangari.tab @@ -22,8 +22,8 @@ static ImplTextEncodingData const aImplIsciiDevanagariTextEncodingData ImplDestroyIsciiDevanagariToUnicodeContext, ImplResetIsciiDevanagariToUnicodeContext, ImplCreateUnicodeToIsciiDevanagariContext, - ImplResetUnicodeToIsciiDevanagariContext, - ImplDestroyUnicodeToIsciiDevanagariContext }, + ImplDestroyUnicodeToIsciiDevanagariContext, + ImplResetUnicodeToIsciiDevanagariContext }, 1, 2, 2, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/textenc
sal/textenc/handleundefinedunicodetotextchar.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 51bfb3a5af91dcd17ebc4c52845e77f530f05c6d Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Mon May 5 02:29:55 2014 +0200 Asan: fix invalid memory access Change-Id: I7a2acd99f3a8cb143c2ad1c978dfa4b02bf54464 Signed-off-by: Stephan Bergmann sberg...@redhat.com diff --git a/sal/textenc/handleundefinedunicodetotextchar.cxx b/sal/textenc/handleundefinedunicodetotextchar.cxx index 6ea1dad..7ff7bd0 100644 --- a/sal/textenc/handleundefinedunicodetotextchar.cxx +++ b/sal/textenc/handleundefinedunicodetotextchar.cxx @@ -108,7 +108,7 @@ bool sal::detail::textenc::handleUndefinedUnicodeToTextChar( /* one replacement character */ if (ImplIsHighSurrogate(c)) { -if ( *ppSrcBuf == pEndSrcBuf ) +if ( ((*ppSrcBuf) + 1) == pEndSrcBuf ) { *pInfo |= RTL_UNICODETOTEXT_INFO_ERROR | RTL_UNICODETOTEXT_INFO_SRCBUFFERTOSMALL; return false; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/textenc vcl/inc
sal/textenc/textcvt.cxx |4 ++-- vcl/inc/regband.hxx |2 +- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit d0800e35d492b797968d4dd00b83ace4d9400a92 Author: Tor Lillqvist t...@collabora.com Date: Wed Apr 23 18:31:25 2014 +0300 Typo fix: s/temporaer/temporary/ Change-Id: I8f845323ccc6446fe74ef7c1f8d55c49ed070f53 diff --git a/sal/textenc/textcvt.cxx b/sal/textenc/textcvt.cxx index 6e497f4..2710973 100644 --- a/sal/textenc/textcvt.cxx +++ b/sal/textenc/textcvt.cxx @@ -161,7 +161,7 @@ sal_Size SAL_CALL rtl_convertTextToUnicode( rtl_TextToUnicodeConverter hConverte { const ImplTextConverter* pConverter = (const ImplTextConverter*)hConverter; -/* Only temporaer, because we don't want die, if we don't have a +/* Only temporary, because we don't want die, if we don't have a converter, because not all converters are implemented yet */ if ( !pConverter ) { @@ -239,7 +239,7 @@ sal_Size SAL_CALL rtl_convertUnicodeToText( rtl_UnicodeToTextConverter hConverte { const ImplTextConverter* pConverter = (const ImplTextConverter*)hConverter; -/* Only temporaer, because we don't want die, if we don't have a +/* Only temporary, because we don't want die, if we don't have a converter, because not all converters are implemented yet */ if ( !pConverter ) { diff --git a/vcl/inc/regband.hxx b/vcl/inc/regband.hxx index af63756..b9855e2 100644 --- a/vcl/inc/regband.hxx +++ b/vcl/inc/regband.hxx @@ -60,7 +60,7 @@ class ImplRegionBand { public: ImplRegionBand* mpNextBand; // pointer to the next element of the list -ImplRegionBand* mpPrevBand; // pointer to the previous element of the list (only used temporaery) +ImplRegionBand* mpPrevBand; // pointer to the previous element of the list (only used temporarily) ImplRegionBandSep* mpFirstSep; // root of the list with x-separations ImplRegionBandPoint*mpFirstBandPoint; // root of the list with lines longmnYTop; // actual boundary of the band ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/textenc
sal/textenc/tables.cxx |8 1 file changed, 8 insertions(+) New commits: commit 247cec2c119464dca7775c1a556cc2bfd59e0f8c Author: Tor Lillqvist t...@collabora.com Date: Tue Apr 22 16:55:13 2014 +0300 Bypass EUC and ISO-2022 encoding tables for iOS It is questionable whether they are needed for any document format. Saves 0.4 MB of app executable size. If it turns out that some document format that support is needed for actually does need these tables, will have to revert this then. An alternative, but more complex, way to save executable size would be to put this, and other, conversion data into a data file instead. Change-Id: I017e8f15626023af1344964be54c09fe2d937acc diff --git a/sal/textenc/tables.cxx b/sal/textenc/tables.cxx index 90b40ce..0d5eaf0 100644 --- a/sal/textenc/tables.cxx +++ b/sal/textenc/tables.cxx @@ -171,11 +171,19 @@ extern C SAL_DLLPUBLIC_EXPORT ImplTextEncodingData const * aImplGBT12345TextEncodingData, /* GBT_12345 */ aImplGBKTextEncodingData, /* GBK */ aImplBIG5TextEncodingData, /* BIG5 */ +#ifndef IOS aImplEUCJPTextEncodingData, /* EUC_JP */ aImplEUCCNTextEncodingData, /* EUC_CN */ aImplEucTwTextEncodingData, /* EUC_TW */ aImplIso2022JpTextEncodingData, /* ISO_2022_JP */ aImplIso2022CnTextEncodingData, /* ISO_2022_CN */ +#else +NULL, /* EUC_JP */ +NULL, /* EUC_CN */ +NULL, /* EUC_TW */ +NULL, /* ISO_2022_JP */ +NULL, /* ISO_2022_CN */ +#endif aImplKOI8RTextEncodingData, /* KOI8_R */ aImplUTF7TextEncodingData, /* UTF7 */ NULL, /* UTF8, see above */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/textenc
sal/textenc/tcvtkr6.tab |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8568fec3b942e725a0114ff137a61b3292e079ed Author: Stephan Bergmann sberg...@redhat.com Date: Fri Apr 11 12:09:10 2014 +0200 Fix bounds Change-Id: I61ce5563d90bb2cf8d186586f15ef4318acdc963 diff --git a/sal/textenc/tcvtkr6.tab b/sal/textenc/tcvtkr6.tab index fdce46e..4aef7a1 100644 --- a/sal/textenc/tcvtkr6.tab +++ b/sal/textenc/tcvtkr6.tab @@ -341,7 +341,7 @@ static ImplUniToDBCSHighTab const aKSC5601DBCSHighTab[256] = {1,0, NULL }, /* 0x2E */ {1,0, NULL }, /* 0x2F */ { 0x00, 0xF6, aImplUniToDBCSTab_KSC5601_30 }, /* 0x30 */ -{ 0x31, 0xFE, aImplUniToDBCSTab_KSC5601_31 }, /* 0x31 */ +{ 0x31, 0x8E, aImplUniToDBCSTab_KSC5601_31 }, /* 0x31 */ { 0x00, 0x7F, aImplUniToDBCSTab_KSC5601_32 }, /* 0x32 */ { 0x80, 0xDD, aImplUniToDBCSTab_KSC5601_33 }, /* 0x33 */ {1,0, NULL }, /* 0x34 */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/textenc
sal/textenc/tcvtkr6.tab |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 160410842be82a4c9a1da58f2e608e9d9c54ebf7 Author: Arnaud Versini arnaud.vers...@gmail.com Date: Sun Dec 15 15:25:30 2013 +0100 fdo#72468 Remove memory overflow on static memory. Change-Id: Id294931921499bacb4590c82a5824d3b26d61171 Reviewed-on: https://gerrit.libreoffice.org/7087 Reviewed-by: Caolán McNamara caol...@redhat.com Reviewed-by: Stephan Bergmann sberg...@redhat.com Tested-by: Stephan Bergmann sberg...@redhat.com diff --git a/sal/textenc/tcvtkr6.tab b/sal/textenc/tcvtkr6.tab index fcd7c8b..fdce46e 100644 --- a/sal/textenc/tcvtkr6.tab +++ b/sal/textenc/tcvtkr6.tab @@ -340,7 +340,7 @@ static ImplUniToDBCSHighTab const aKSC5601DBCSHighTab[256] = {1,0, NULL }, /* 0x2D */ {1,0, NULL }, /* 0x2E */ {1,0, NULL }, /* 0x2F */ -{ 0x00, 0xF7, aImplUniToDBCSTab_KSC5601_30 }, /* 0x30 */ +{ 0x00, 0xF6, aImplUniToDBCSTab_KSC5601_30 }, /* 0x30 */ { 0x31, 0xFE, aImplUniToDBCSTab_KSC5601_31 }, /* 0x31 */ { 0x00, 0x7F, aImplUniToDBCSTab_KSC5601_32 }, /* 0x32 */ { 0x80, 0xDD, aImplUniToDBCSTab_KSC5601_33 }, /* 0x33 */ @@ -972,7 +972,7 @@ static ImplUniToDBCSHighTab const aJOHABDBCSHighTab[256] = {1,0, NULL }, /* 0x2D */ {1,0, NULL }, /* 0x2E */ {1,0, NULL }, /* 0x2F */ -{ 0x00, 0xF7, aImplUniToDBCSTab_JOHAB_30 }, /* 0x30 */ +{ 0x00, 0xF6, aImplUniToDBCSTab_JOHAB_30 }, /* 0x30 */ { 0x31, 0x8E, aImplUniToDBCSTab_JOHAB_31 }, /* 0x31 */ { 0x00, 0x7F, aImplUniToDBCSTab_JOHAB_32 }, /* 0x32 */ { 0x80, 0xDD, aImplUniToDBCSTab_JOHAB_33 }, /* 0x33 */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/textenc svtools/source
sal/textenc/tencinfo.cxx | 12 ++-- svtools/source/misc/sampletext.cxx |4 ++-- svtools/source/table/defaultinputhandler.cxx |2 +- 3 files changed, 9 insertions(+), 9 deletions(-) New commits: commit 6c912701dc9fd82dc1fec0481119f3c9d753e161 Author: Takeshi Abe t...@fixedpoint.jp Date: Mon Jul 1 21:00:55 2013 +0900 Mark as const Change-Id: Ic71f39aaebf07d3b0435882986be71cf2b0390c2 diff --git a/sal/textenc/tencinfo.cxx b/sal/textenc/tencinfo.cxx index ded6bc5..ccbfe40 100644 --- a/sal/textenc/tencinfo.cxx +++ b/sal/textenc/tencinfo.cxx @@ -294,32 +294,32 @@ rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromUnixCharset( const char* pUnixC { NULL, RTL_TEXTENCODING_DONTKNOW } }; -static ImplStrCharsetDef aUnixCharsetJISX0208Tab[] = +static ImplStrCharsetDef const aUnixCharsetJISX0208Tab[] = { { NULL, RTL_TEXTENCODING_JIS_X_0208 } }; -static ImplStrCharsetDef aUnixCharsetJISX0201Tab[] = +static ImplStrCharsetDef const aUnixCharsetJISX0201Tab[] = { { NULL, RTL_TEXTENCODING_JIS_X_0201 } }; -static ImplStrCharsetDef aUnixCharsetJISX0212Tab[] = +static ImplStrCharsetDef const aUnixCharsetJISX0212Tab[] = { { NULL, RTL_TEXTENCODING_JIS_X_0212 } }; -static ImplStrCharsetDef aUnixCharsetGBTab[] = +static ImplStrCharsetDef const aUnixCharsetGBTab[] = { { NULL, RTL_TEXTENCODING_GB_2312 } }; -static ImplStrCharsetDef aUnixCharsetGBKTab[] = +static ImplStrCharsetDef const aUnixCharsetGBKTab[] = { { NULL, RTL_TEXTENCODING_GBK } }; -static ImplStrCharsetDef aUnixCharsetBIG5Tab[] = +static ImplStrCharsetDef const aUnixCharsetBIG5Tab[] = { { NULL, RTL_TEXTENCODING_BIG5 } }; diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx index bacde29..f3279c9 100644 --- a/svtools/source/misc/sampletext.cxx +++ b/svtools/source/misc/sampletext.cxx @@ -92,9 +92,9 @@ OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice rDevice) } } -static sal_Unicode aImplSymbolFontText[] = { +static const sal_Unicode aImplSymbolFontText[] = { 0xF021,0xF032,0xF043,0xF054,0xF065,0xF076,0xF0B7,0xF0C8,0}; -static sal_Unicode aImplStarSymbolText[] = { +static const sal_Unicode aImplStarSymbolText[] = { 0x2706,0x2704,0x270D,0xE033,0x2211,0x2288,0}; const sal_Unicode* pText = bOpenSymbol ? aImplStarSymbolText : aImplSymbolFontText; OUString sSampleText(pText); diff --git a/svtools/source/table/defaultinputhandler.cxx b/svtools/source/table/defaultinputhandler.cxx index ed47403..ff098f2 100644 --- a/svtools/source/table/defaultinputhandler.cxx +++ b/svtools/source/table/defaultinputhandler.cxx @@ -147,7 +147,7 @@ namespace svt { namespace table sal_uInt16 nKeyModifier; TableControlAction eAction; } -static aKnownActions[] = { +static const aKnownActions[] = { { KEY_DOWN, 0, cursorDown }, { KEY_UP, 0, cursorUp }, { KEY_LEFT, 0, cursorLeft }, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits