configure.ac | 2 +- cui/source/options/personalization.cxx | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-)
New commits: commit 10f7cf9919e7a017d63ae98c62c9a0ca58a0db46 Author: Andras Timar <[email protected]> AuthorDate: Fri Sep 14 13:14:17 2018 +0200 Commit: Andras Timar <[email protected]> CommitDate: Fri Sep 14 13:14:17 2018 +0200 Bump version to 6.0-11 Change-Id: If2673b0bdd1489e8bd0bc60b8372756da8cf1533 diff --git a/configure.ac b/configure.ac index 385859d49935..5a21f9182202 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[6.0.10.10],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[6.0.10.11],[],[],[https://collaboraoffice.com/]) AC_PREREQ([2.59]) commit 6aeb24b12a5df389f4239b2b0822d90cb3796001 Author: Muhammet Kara <[email protected]> AuthorDate: Thu Sep 13 14:59:28 2018 +0300 Commit: Andras Timar <[email protected]> CommitDate: Fri Sep 14 13:13:22 2018 +0200 tdf#118881: Fix HTML parsing for personas This is just a band-aid to make personas feature work again. Change-Id: I80b54fe9a8ddc93d93744fcf2c7f739d81f6face Reviewed-on: https://gerrit.libreoffice.org/60432 Tested-by: Jenkins Reviewed-by: Heiko Tietze <[email protected]> Tested-by: Heiko Tietze <[email protected]> Reviewed-by: Muhammet Kara <[email protected]> (cherry picked from commit e98ac43ec42ff398ad489d6719960d595f0327be) Reviewed-on: https://gerrit.libreoffice.org/60468 Reviewed-by: Adolfo Jayme Barrientos <[email protected]> Tested-by: Adolfo Jayme Barrientos <[email protected]> (cherry picked from commit 2f52a8e0f1098a51631434129707cfb0b60fecb3) Reviewed-on: https://gerrit.libreoffice.org/60481 (cherry picked from commit 6a113caf17974eb07a9f06ef09b1b1737d4d07bc) diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index dab788d8b824..478be7d99193 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -550,14 +550,14 @@ static OUString searchValue( const OString &rBuffer, sal_Int32 from, const OStri where += rIdentifier.getLength(); - sal_Int32 end = rBuffer.indexOf( """, where ); + sal_Int32 end = rBuffer.indexOf( "\"", where ); if ( end < 0 ) return OUString(); OString aOString( rBuffer.copy( where, end - where ) ); OUString aString( aOString.getStr(), aOString.getLength(), RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS ); - return aString.replaceAll( "\\/", "/" ); + return aString.replaceAll( "\\u002F", "/" ); } /// Parse the Persona web page, and find where to get the bitmaps + the color values. @@ -569,32 +569,32 @@ static bool parsePersonaInfo( const OString &rBufferArg, OUString *pHeaderURL, O // let's replace the whole buffer with last one so we can treat it easily OString rBuffer = rBufferArg.replaceAll(OString("""), OString(""")); // it is the first attribute that contains "persona=" - sal_Int32 persona = rBuffer.indexOf( "data-browsertheme=\"{" ); + sal_Int32 persona = rBuffer.indexOf( "\"type\":\"persona\"" ); if ( persona < 0 ) return false; // now search inside - *pHeaderURL = searchValue( rBuffer, persona, ""headerURL":"" ); + *pHeaderURL = searchValue( rBuffer, persona, "\"headerURL\":\"" ); if ( pHeaderURL->isEmpty() ) return false; - *pFooterURL = searchValue( rBuffer, persona, ""footerURL":"" ); + *pFooterURL = searchValue( rBuffer, persona, "\"footerURL\":\"" ); if ( pFooterURL->isEmpty() ) return false; - *pTextColor = searchValue( rBuffer, persona, ""textcolor":"" ); + *pTextColor = searchValue( rBuffer, persona, "\"textcolor\":\"" ); if ( pTextColor->isEmpty() ) return false; - *pAccentColor = searchValue( rBuffer, persona, ""accentcolor":"" ); + *pAccentColor = searchValue( rBuffer, persona, "\"accentcolor\":\"" ); if ( pAccentColor->isEmpty() ) return false; - *pPreviewURL = searchValue( rBuffer, persona, ""previewURL":"" ); + *pPreviewURL = searchValue( rBuffer, persona, "\"previewURL\":\"" ); if ( pPreviewURL->isEmpty() ) return false; - *pName = searchValue( rBuffer, persona, ""name":"" ); + *pName = searchValue( rBuffer, persona, "\"name\":\"" ); return !pName->isEmpty(); } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
