[Libreoffice-commits] core.git: 4 commits - filter/source sal/textenc sw/qa vcl/source
Caolán McNamara
caolanm at redhat.com
Fri Aug 25 17:40:17 UTC 2017
filter/source/graphicfilter/itiff/itiff.cxx | 2 +-
sal/textenc/tcvtkr6.tab | 4 ++--
sw/qa/extras/ww8export/ww8export2.cxx | 1 +
vcl/source/app/svmain.cxx | 25 ++++++++++++++++---------
4 files changed, 20 insertions(+), 12 deletions(-)
New commits:
commit 969838675cfd42bdfc27ee12d796dece59c3d5a3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Aug 4 09:45:40 2017 +0100
ofz#2852 korean table entries start at 0xF not 0x7
Change-Id: Iaf3ed48d0eb0e5a57770af057c565a7310bb96d4
Reviewed-on: https://gerrit.libreoffice.org/40761
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sal/textenc/tcvtkr6.tab b/sal/textenc/tcvtkr6.tab
index de68d624f8b2..e03f3405e811 100644
--- a/sal/textenc/tcvtkr6.tab
+++ b/sal/textenc/tcvtkr6.tab
@@ -388,7 +388,7 @@ static ImplUniToDBCSHighTab const aKSC5601DBCSHighTab[256] =
{ 0x07, 0xFE, aImplUniToDBCSTab_KSC5601_5D }, /* 0x5D */
{ 0x02, 0xFB, aImplUniToDBCSTab_KSC5601_5E }, /* 0x5E */
{ 0x01, 0xFF, aImplUniToDBCSTab_KSC5601_5F }, /* 0x5F */
- { 0x07, 0xFB, aImplUniToDBCSTab_KSC5601_60 }, /* 0x60 */
+ { 0x0F, 0xFB, aImplUniToDBCSTab_KSC5601_60 }, /* 0x60 */
{ 0x01, 0xFF, aImplUniToDBCSTab_KSC5601_61 }, /* 0x61 */
{ 0x00, 0xFF, aImplUniToDBCSTab_KSC5601_62 }, /* 0x62 */
{ 0x01, 0xF7, aImplUniToDBCSTab_KSC5601_63 }, /* 0x63 */
@@ -1020,7 +1020,7 @@ static ImplUniToDBCSHighTab const aJOHABDBCSHighTab[256] =
{ 0x07, 0xFE, aImplUniToDBCSTab_JOHAB_5D }, /* 0x5D */
{ 0x02, 0xFB, aImplUniToDBCSTab_JOHAB_5E }, /* 0x5E */
{ 0x01, 0xFF, aImplUniToDBCSTab_JOHAB_5F }, /* 0x5F */
- { 0x07, 0xFB, aImplUniToDBCSTab_JOHAB_60 }, /* 0x60 */
+ { 0x0F, 0xFB, aImplUniToDBCSTab_JOHAB_60 }, /* 0x60 */
{ 0x01, 0xFF, aImplUniToDBCSTab_JOHAB_61 }, /* 0x61 */
{ 0x00, 0xFF, aImplUniToDBCSTab_JOHAB_62 }, /* 0x62 */
{ 0x01, 0xF7, aImplUniToDBCSTab_JOHAB_63 }, /* 0x63 */
commit c2e7df1ce8ba50b2179904963e825315785585e4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jul 28 10:07:50 2017 +0100
ofz#2766 ensure palette is large enough for all colors
Change-Id: I4669b473f5975ac74a37025f7c936f13bcfea420
Reviewed-on: https://gerrit.libreoffice.org/40511
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index f785ab5a7666..65db2efaa6d9 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -1128,7 +1128,6 @@ void TIFFReader::MakePalCol()
nNumColors = nLargestPixelIndex + 1;
}
- pAcc->SetPaletteEntryCount(nNumColors);
for (sal_uInt32 i = 0; i < nNumColors; ++i)
{
sal_uInt32 nVal = ( i * 255 / ( nNumColors - 1 ) ) & 0xff;
@@ -1139,6 +1138,7 @@ void TIFFReader::MakePalCol()
xColorMap[nNumColors - i - 1] = n0RGB;
}
}
+ pAcc->SetPaletteEntryCount(std::max<sal_uInt16>(nNumColors, pAcc->GetPaletteEntryCount()));
for (sal_uInt32 i = 0; i < nNumColors; ++i)
{
pAcc->SetPaletteColor(i, BitmapColor( (sal_uInt8)( xColorMap[ i ] >> 16 ),
commit 5e975f671bc37d837d66e712ea064809daf51288
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Aug 25 10:39:21 2017 +0100
coverity#1416668 Uncaught exception
Change-Id: Ibc2be8fe44295a8ea08105549448609e00262740
Reviewed-on: https://gerrit.libreoffice.org/41560
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 1b88fc290157..a8e42ad394d7 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -322,15 +322,22 @@ bool InitVCL()
pSVData->mpApp->Init();
}
- //Now that uno has been bootstrapped we can ask the config what the UI language is so that we can
- //force that in as $LANGUAGE. That way we can get gtk to render widgets RTL
- //if we have a RTL UI in an otherwise LTR locale and get gettext using externals (e.g. python)
- //to match their translations to our preferred UI language
- OUString aLocaleString(SvtSysLocaleOptions().GetRealUILanguageTag().getGlibcLocaleString(".UTF-8"));
- if (!aLocaleString.isEmpty())
- {
- OUString envVar("LANGUAGE");
- osl_setEnvironment(envVar.pData, aLocaleString.pData);
+ try
+ {
+ //Now that uno has been bootstrapped we can ask the config what the UI language is so that we can
+ //force that in as $LANGUAGE. That way we can get gtk to render widgets RTL
+ //if we have a RTL UI in an otherwise LTR locale and get gettext using externals (e.g. python)
+ //to match their translations to our preferred UI language
+ OUString aLocaleString(SvtSysLocaleOptions().GetRealUILanguageTag().getGlibcLocaleString(".UTF-8"));
+ if (!aLocaleString.isEmpty())
+ {
+ OUString envVar("LANGUAGE");
+ osl_setEnvironment(envVar.pData, aLocaleString.pData);
+ }
+ }
+ catch (const uno::Exception &e)
+ {
+ SAL_INFO("vcl.app", "Unable to get ui language: '" << e.Message);
}
pSVData->mpDefInst->AfterAppInit();
commit 304d7f557acee5ac1aa6e072550bb73f3a6e9e29
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Aug 25 10:30:09 2017 +0100
coverity#1416667 Unchecked dynamic_cast
Change-Id: I1df3f13c47a021bad7c5b5ab7d5804dc70f091c8
Reviewed-on: https://gerrit.libreoffice.org/41558
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sw/qa/extras/ww8export/ww8export2.cxx b/sw/qa/extras/ww8export/ww8export2.cxx
index 066b680d01dd..1aadcb17326f 100644
--- a/sw/qa/extras/ww8export/ww8export2.cxx
+++ b/sw/qa/extras/ww8export/ww8export2.cxx
@@ -62,6 +62,7 @@ DECLARE_WW8EXPORT_TEST(testTdf55427_footnote2endnote, "tdf55427_footnote2endnote
CPPUNIT_ASSERT_EQUAL_MESSAGE( "Endnote style is cyan3 color", sal_Int32(0x2BD0D2), getProperty< sal_Int32 >(xPageStyle, "CharColor") );
SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get());
+ CPPUNIT_ASSERT(pTextDoc);
SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
// The footnote numbering type of ARABIC will not transfer over when those footnotes are converted to endnotes.
CPPUNIT_ASSERT_EQUAL_MESSAGE( "Footnote numbering type", SVX_NUM_ARABIC, pDoc->GetFootnoteInfo().aFormat.GetNumberingType() );
More information about the Libreoffice-commits
mailing list