vcl/generic/fontmanager/fontconfig.cxx | 3 ++- vcl/source/window/builder.cxx | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-)
New commits: commit 9f5ef935986cdf84189cbe2a7a0b0e90de0c3b1c Author: Caolán McNamara <[email protected]> Date: Fri Nov 30 16:52:31 2012 +0000 warn if an explicit requested top level widget name wasn't found Change-Id: I8e06bd91e5a20fc0d007aa5f7d1e01bd0ead86ab diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index ab4a6e7..0d8068b 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -238,6 +238,10 @@ VclBuilder::VclBuilder(Window *pParent, OUString sUIDir, OUString sUIFile, OStri //drop maps, etc. that we don't need again delete m_pParserState; + + SAL_WARN_IF(!m_sID.isEmpty() && !get_by_name(m_sID), "vcl.layout", + "Requested top level widget \"" << m_sID.getStr() << + "\" not found in " << sUIFile); } VclBuilder::~VclBuilder() commit 247c460449176349e66676efd59a6cd2655a652e Author: Caolán McNamara <[email protected]> Date: Fri Nov 30 16:51:53 2012 +0000 fix build for me Change-Id: Ic29ff474101c88fbc428d229871659d99dd92d05 diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx index f5fe7d8..86c4ff5 100644 --- a/vcl/generic/fontmanager/fontconfig.cxx +++ b/vcl/generic/fontmanager/fontconfig.cxx @@ -382,7 +382,8 @@ FcResult FontCfgWrapper::LocalizedElementFromPattern(FcPattern* pPattern, FcChar //possible to-do, sort by UILocale instead of process locale rtl_Locale* pLoc = NULL; osl_getProcessLocale(&pLoc); - localizedsorter aSorter( *pLoc); + LanguageTag aTag(*pLoc); + localizedsorter aSorter(aTag); *element = aSorter.bestname(lang_and_elements); //if this element is a fontname, map the other names to this best-name
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
