Hello community, here is the log from the commit of package libodfgen for openSUSE:Factory checked in at 2015-12-23 09:56:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libodfgen (Old) and /work/SRC/openSUSE:Factory/.libodfgen.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libodfgen" Changes: -------- --- /work/SRC/openSUSE:Factory/libodfgen/libodfgen.changes 2015-06-17 16:15:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libodfgen.new/libodfgen.changes 2015-12-23 09:56:25.000000000 +0100 @@ -1,0 +2,14 @@ +Mon Dec 21 11:52:48 UTC 2015 - [email protected] + +- Version bump to 0.1.5: + - graphics: + + add code for librevenge:replacement-objects + + allow to set the opacity value:"draw:opacity" for surfaces which + contain patterns, + + add minimalist implementation of "measure": if drawPolyline is + called with two points and draw:show-unit is set, then create a + draw:measure tag instead of a draw:line... + - sheet interface: + + add some operators (plage, union, intersection and %) + +------------------------------------------------------------------- Old: ---- libodfgen-0.1.4.tar.xz New: ---- libodfgen-0.1.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libodfgen.spec ++++++ --- /var/tmp/diff_new_pack.5fJhOi/_old 2015-12-23 09:56:26.000000000 +0100 +++ /var/tmp/diff_new_pack.5fJhOi/_new 2015-12-23 09:56:26.000000000 +0100 @@ -18,7 +18,7 @@ %define libname libodfgen-0_1-1 Name: libodfgen -Version: 0.1.4 +Version: 0.1.5 Release: 0 Summary: Library to generate ODF documents from libwpd's and libwpg's api calls License: LGPL-2.1+ and MPL-2.0+ ++++++ libodfgen-0.1.4.tar.xz -> libodfgen-0.1.5.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libodfgen-0.1.4/ChangeLog new/libodfgen-0.1.5/ChangeLog --- old/libodfgen-0.1.4/ChangeLog 2015-05-17 11:04:54.000000000 +0200 +++ new/libodfgen-0.1.5/ChangeLog 2015-10-24 09:58:58.000000000 +0200 @@ -1,3 +1,48 @@ +2015-10-24 osnola <[email protected]> [5109e2d2d68ed9c7033206d6a6f0a6cb401c7731] + +tOdfDocumentHandler.hxx: do not add attribute to enums, mingw32-g++ do not like that, configure.ac: check correctly if we need to add --std=c++11 + update NEWS file + + +2015-10-03 osnola <[email protected]> [653de2329a6cc5f0c4751245ce5e90144b18f337] + +tSheetStyle.cxx: add some operators (plage, union, intersection and %) + accept also "librevenge:sheet-name" to define the sheet's name... + + +2015-08-30 David Tardon <[email protected]> [42f6ef8f4428e3d352166a45d179b0bd57db7a22] + +tautomatically pass -std=c++11 if needed + + +2015-08-30 David Tardon <[email protected]> [473698347afd9c4f53151ea2c82229640f3d5912] + +tremove unused argument + + +2015-07-19 osnola <[email protected]> [ce4a03ca92873343c526f514f0e3a6353530cf69] + +tOdfGenerator: implements librevenge:replacement-objects... + + +2015-06-23 David Tardon <[email protected]> [8ef8c171ebe3c5daebdce80ee422cf7bb96aa3bc] + +tfix typo + + +2015-06-23 osnola <[email protected]> [d55c58fad462a95db8474a240cef7236f5e98ac9] + +tGraphicStyle: also allow to set the opacity value:"draw:opacity" for surfaces which contain patterns, + add minimalist implementation of "measure": if drawPolyline is called with two points and draw:show-unit is set, then create a draw:measure tag instead of a draw:line... + + +2015-05-19 Fridrich Štrba <[email protected]> [9b8e077429dd5cb3a5b3eb92aa86ef6a7204e2f5] + +tFixing werror build and wondering why developers don't use it :( + + +2015-05-17 osnola <[email protected]> [6066227bc5d23b3d5ead3f1e7d4277e4c5484591] + +tconfigure.ac: bump version... + + 2015-05-17 osnola <[email protected]> [4300376e1617ffe93dde3bcb79e7031ee9707f83] tupdate version and NEWS + add an ODFGENAPI inside the "enum OdfStreamType"'s definition diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libodfgen-0.1.4/NEWS new/libodfgen-0.1.5/NEWS --- old/libodfgen-0.1.4/NEWS 2015-05-17 10:51:38.000000000 +0200 +++ new/libodfgen-0.1.5/NEWS 2015-10-23 20:19:16.000000000 +0200 @@ -1,3 +1,14 @@ +libodfgen 0.1.5 +- graphics: + + add code for librevenge:replacement-objects + + allow to set the opacity value:"draw:opacity" for surfaces which + contain patterns, + + add minimalist implementation of "measure": if drawPolyline is + called with two points and draw:show-unit is set, then create a + draw:measure tag instead of a draw:line... +- sheet interface: + + add some operators (plage, union, intersection and %) + libodfgen 0.1.4 - drawing interface: do no forget to call startDocument/endDocument when diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libodfgen-0.1.4/configure new/libodfgen-0.1.5/configure --- old/libodfgen-0.1.4/configure 2015-05-17 10:50:33.000000000 +0200 +++ new/libodfgen-0.1.5/configure 2015-10-24 09:34:58.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libodfgen 0.1.4. +# Generated by GNU Autoconf 2.69 for libodfgen 0.1.5. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='libodfgen' PACKAGE_TARNAME='libodfgen' -PACKAGE_VERSION='0.1.4' -PACKAGE_STRING='libodfgen 0.1.4' +PACKAGE_VERSION='0.1.5' +PACKAGE_STRING='libodfgen 0.1.5' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1357,7 +1357,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libodfgen 0.1.4 to adapt to many kinds of systems. +\`configure' configures libodfgen 0.1.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1427,7 +1427,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libodfgen 0.1.4:";; + short | recursive ) echo "Configuration of libodfgen 0.1.5:";; esac cat <<\_ACEOF @@ -1560,7 +1560,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libodfgen configure 0.1.4 +libodfgen configure 0.1.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1959,7 +1959,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libodfgen $as_me 0.1.4, which was +It was created by libodfgen $as_me 0.1.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2825,7 +2825,7 @@ # Define the identity of the package. PACKAGE='libodfgen' - VERSION='0.1.4' + VERSION='0.1.5' cat >>confdefs.h <<_ACEOF @@ -16350,7 +16350,7 @@ LIBODFGEN_MINOR_VERSION=1 -LIBODFGEN_MICRO_VERSION=4 +LIBODFGEN_MICRO_VERSION=5 # AC_SUBST(LT_RELEASE, [libodfgen_version_major.libodfgen_version_minor]) LT_CURRENT=`expr 100 '*' 0 + 1` @@ -16358,7 +16358,7 @@ LT_AGE=0 # LT_AGE=libodfgen_version_minor -LT_REVISION=4 +LT_REVISION=5 @@ -16715,6 +16715,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for c++11 shared ptr" >&5 $as_echo_n "checking for c++11 shared ptr... " >&6; } + save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -std=c++11" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -16745,6 +16747,36 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CXXFLAGS="$save_CXXFLAGS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler needs -std=c++11" >&5 +$as_echo_n "checking whether the compiler needs -std=c++11... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include <memory> +int +main () +{ +std::shared_ptr<int> p; + + ; + return 0; +} + +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + CXXFLAGS="$CXXFLAGS -std=c++11" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi if test "x$with_sharedptr" = "xtr1"; then : @@ -17457,7 +17489,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libodfgen $as_me 0.1.4, which was +This file was extended by libodfgen $as_me 0.1.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17523,7 +17555,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libodfgen config.status 0.1.4 +libodfgen config.status 0.1.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libodfgen-0.1.4/configure.ac new/libodfgen-0.1.5/configure.ac --- old/libodfgen-0.1.4/configure.ac 2015-05-17 10:28:25.000000000 +0200 +++ new/libodfgen-0.1.5/configure.ac 2015-10-24 09:33:41.000000000 +0200 @@ -7,7 +7,7 @@ # ==================== m4_define([libodfgen_version_major],[0]) m4_define([libodfgen_version_minor],[1]) -m4_define([libodfgen_version_micro],[4]) +m4_define([libodfgen_version_micro],[5]) m4_define([libodfgen_version],[libodfgen_version_major.libodfgen_version_minor.libodfgen_version_micro]) # ============= @@ -216,6 +216,8 @@ AS_IF([test "x$with_sharedptr" = "xc++11"], [ AC_MSG_CHECKING([for c++11 shared ptr]) + save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -std=c++11" AC_COMPILE_IFELSE([ AC_LANG_PROGRAM( [[#include <memory>]], @@ -227,8 +229,19 @@ ], [ AC_MSG_RESULT([no]) AC_MSG_ERROR([Could not find C++11 implementation of shared_ptr]) + ]) + CXXFLAGS="$save_CXXFLAGS" + AC_MSG_CHECKING([whether the compiler needs -std=c++11]) + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM( + [[#include <memory>]], + [[std::shared_ptr<int> p;]] + ) + ], [ + AC_MSG_RESULT([no]) ], [ - [#include <memory>] + AC_MSG_RESULT([yes]) + CXXFLAGS="$CXXFLAGS -std=c++11" ]) ]) AS_IF([test "x$with_sharedptr" = "xtr1"], [ @@ -244,8 +257,6 @@ ], [ AC_MSG_RESULT([no]) AC_MSG_ERROR([Could not find TR1 implementation of shared_ptr]) - ], [ - [#include <tr1/memory>] ]) ]) AS_IF([test "x$with_sharedptr" = "xboost"], [ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libodfgen-0.1.4/inc/libodfgen/OdfDocumentHandler.hxx new/libodfgen-0.1.5/inc/libodfgen/OdfDocumentHandler.hxx --- old/libodfgen-0.1.4/inc/libodfgen/OdfDocumentHandler.hxx 2015-05-17 10:32:40.000000000 +0200 +++ new/libodfgen-0.1.5/inc/libodfgen/OdfDocumentHandler.hxx 2015-10-24 09:37:52.000000000 +0200 @@ -32,7 +32,7 @@ * * @sa OdgGenerator, OdpGenerator, OdtGenerator */ -enum ODFGENAPI OdfStreamType { ODF_FLAT_XML, ODF_CONTENT_XML, ODF_STYLES_XML, ODF_SETTINGS_XML, ODF_META_XML, ODF_MANIFEST_XML }; +enum OdfStreamType { ODF_FLAT_XML, ODF_CONTENT_XML, ODF_STYLES_XML, ODF_SETTINGS_XML, ODF_META_XML, ODF_MANIFEST_XML }; class OdfDocumentHandler; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libodfgen-0.1.4/src/GraphicStyle.cxx new/libodfgen-0.1.5/src/GraphicStyle.cxx --- old/libodfgen-0.1.4/src/GraphicStyle.cxx 2015-05-07 14:14:57.000000000 +0200 +++ new/libodfgen-0.1.5/src/GraphicStyle.cxx 2015-07-16 15:15:13.000000000 +0200 @@ -60,6 +60,13 @@ pHandler->startElement("style:graphic-properties", graphicElement); pHandler->endElement("style:graphic-properties"); + if (mPropList["draw:show-unit"] && mPropList["draw:show-unit"]->getStr()=="true") + { + librevenge::RVNGPropertyList textElement; + textElement.insert("fo:font-size", 12, librevenge::RVNG_POINT); + pHandler->startElement("style:text-properties", textElement); + pHandler->endElement("style:text-properties"); + } pHandler->endElement("style:style"); } @@ -361,7 +368,7 @@ librevenge::RVNGString GraphicStyleManager::getStyleNameForStrokeDash(librevenge::RVNGPropertyList const &style) { librevenge::RVNGPropertyList pList; - if (style["svg:stoke-linecap"]) + if (style["svg:stroke-linecap"]) pList.insert("draw:style", style["svg:stroke-linecap"]->getStr()); else pList.insert("draw:style", "rect"); @@ -416,7 +423,7 @@ if (style["svg:stroke-linejoin"]) element.insert("draw:stroke-linejoin", style["svg:stroke-linejoin"]->getStr()); if (style["svg:stroke-linecap"]) - element.insert("svg:stoke-linecap", style["svg:stroke-linecap"]->getStr()); + element.insert("svg:stroke-linecap", style["svg:stroke-linecap"]->getStr()); librevenge::RVNGString name(""); if (style["draw:stroke"] && style["draw:stroke"]->getStr() == "dash") @@ -489,6 +496,8 @@ element.insert("draw:fill-image-ref-point-x", style["draw:fill-image-ref-point-x"]->getStr()); if (style["draw:fill-image-ref-point-y"]) element.insert("draw:fill-image-ref-point-y", style["draw:fill-image-ref-point-y"]->getStr()); + if (style["draw:opacity"]) + element.insert("draw:opacity", style["draw:opacity"]->getStr()); } else element.insert("draw:fill", "none"); @@ -562,6 +571,7 @@ static char const *(others[])= { "draw:ole-draw-aspect", + "draw:show-unit", "fo:background-color", "fo:border","fo:border-top","fo:border-left","fo:border-bottom","fo:border-right", "fo:clip", @@ -571,7 +581,7 @@ "style:mirror", "style:parent-style-name", "style:run-through", "style:wrap" }; - for (int b = 0; b < 18; b++) + for (int b = 0; b < 19; b++) { if (style[others[b]]) element.insert(others[b], style[others[b]]->getStr()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libodfgen-0.1.4/src/OdcGenerator.cxx new/libodfgen-0.1.5/src/OdcGenerator.cxx --- old/libodfgen-0.1.4/src/OdcGenerator.cxx 2015-01-01 10:14:57.000000000 +0100 +++ new/libodfgen-0.1.5/src/OdcGenerator.cxx 2015-06-23 09:37:46.000000000 +0200 @@ -137,7 +137,7 @@ // ok create a new list librevenge::RVNGString sName(""); - sName.sprintf("Chart%i", mChartStyleHash.size()); + sName.sprintf("Chart%i", (int)mChartStyleHash.size()); pList.insert("style:name", sName); mChartStyleHash[sName] =pList; mHashChartNameMap[hashKey] = sName; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libodfgen-0.1.4/src/OdfGenerator.cxx new/libodfgen-0.1.5/src/OdfGenerator.cxx --- old/libodfgen-0.1.4/src/OdfGenerator.cxx 2015-03-12 09:15:21.000000000 +0100 +++ new/libodfgen-0.1.5/src/OdfGenerator.cxx 2015-10-23 20:13:18.000000000 +0200 @@ -1147,6 +1147,12 @@ else mpCurrentStorage->push_back(new TagCloseElement("draw:image")); } + + librevenge::RVNGPropertyListVector const *replacements=propList.child("librevenge:replacement-objects"); + if (!replacements) + return; + for (unsigned long c=0; c < replacements->count(); ++c) + insertBinaryObject((*replacements)[c]); } //////////////////////////////////////////////////////////// @@ -1284,7 +1290,10 @@ return; } librevenge::RVNGString sValue=getCurrentGraphicStyleName(propList); - TagOpenElement *pDrawLineElement = new TagOpenElement("draw:line"); + bool isMeasure=(propList["draw:show-unit"] && propList["draw:show-unit"]->getStr()=="true"); + librevenge::RVNGString what= isMeasure ? "draw:measure" : "draw:line"; + + TagOpenElement *pDrawLineElement = new TagOpenElement(what); addFrameProperties(propList, *pDrawLineElement); pDrawLineElement->addAttribute("draw:style-name", sValue); pDrawLineElement->addAttribute("svg:x1", (*vertices)[0]["svg:x"]->getStr()); @@ -1292,7 +1301,7 @@ pDrawLineElement->addAttribute("svg:x2", (*vertices)[1]["svg:x"]->getStr()); pDrawLineElement->addAttribute("svg:y2", (*vertices)[1]["svg:y"]->getStr()); mpCurrentStorage->push_back(pDrawLineElement); - mpCurrentStorage->push_back(new TagCloseElement("draw:line")); + mpCurrentStorage->push_back(new TagCloseElement(what)); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libodfgen-0.1.4/src/SectionStyle.cxx new/libodfgen-0.1.5/src/SectionStyle.cxx --- old/libodfgen-0.1.4/src/SectionStyle.cxx 2014-09-14 11:23:29.000000000 +0200 +++ new/libodfgen-0.1.5/src/SectionStyle.cxx 2015-06-23 09:37:46.000000000 +0200 @@ -119,9 +119,9 @@ zone=Style::Z_ContentAutomatic; librevenge::RVNGString name; if (zone==Style::Z_StyleAutomatic) - name.sprintf("Section_M%i", mStyleList.size()); + name.sprintf("Section_M%i", (int)mStyleList.size()); else - name.sprintf("Section%i", mStyleList.size()); + name.sprintf("Section%i", (int)mStyleList.size()); shared_ptr<SectionStyle> style(new SectionStyle(propList, name.cstr(), zone)); mStyleList.push_back(style); return name; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libodfgen-0.1.4/src/SheetStyle.cxx new/libodfgen-0.1.5/src/SheetStyle.cxx --- old/libodfgen-0.1.4/src/SheetStyle.cxx 2015-03-12 08:55:28.000000000 +0100 +++ new/libodfgen-0.1.5/src/SheetStyle.cxx 2015-10-03 17:37:49.000000000 +0200 @@ -138,7 +138,7 @@ } else if (type=="currency") { - what.sprintf("number:currency-style", type.c_str()); + what = "number:currency-style"; TagOpenElement styleOpen(what); styleOpen.addAttribute("style:name", getName()); styleOpen.write(pHandler); @@ -562,11 +562,11 @@ } std::string oper(list["librevenge:operator"]->getStr().cstr()); bool find=false; - for (int w=0; w<15; ++w) + for (int w=0; w<19; ++w) { - static char const *(s_operators[15])= + static char const *(s_operators[19])= { - "(", ")", "+", "-", "*", "/", "=", "<>", ";", "<", ">", "<=", ">=", "^", "&" + "(", ")", "+", "-", "*", "/", "=", "<>", ";", "<", ">", "<=", ">=", "^", "&", "!", "~", ":", "%" }; if (oper!=s_operators[w]) continue; s << oper; @@ -645,7 +645,8 @@ ODFGEN_DEBUG_MSG(("SheetManager::convertCellRange: find bad coordinate!!!\n")); return res; } - if (list["librevenge:sheet"]) s << list["librevenge:sheet"]->getStr().cstr(); + if (list["librevenge:sheet-name"]) s << list["librevenge:sheet-name"]->getStr().cstr(); + else if (list["librevenge:sheet"]) s << list["librevenge:sheet"]->getStr().cstr(); s << "."; if (list["librevenge:column-absolute"] && list["librevenge:column-absolute"]->getInt()) s << "$"; if (column>=26) s << char('A'+(column/26-1)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libodfgen-0.1.4/src/TextRunStyle.cxx new/libodfgen-0.1.5/src/TextRunStyle.cxx --- old/libodfgen-0.1.4/src/TextRunStyle.cxx 2015-01-01 10:14:57.000000000 +0100 +++ new/libodfgen-0.1.5/src/TextRunStyle.cxx 2015-10-23 20:13:32.000000000 +0200 @@ -215,11 +215,11 @@ // ok create a new style if (currentZone==Style::Z_Style) - sName.sprintf("S_N%i", mStyleHash.size()); + sName.sprintf("S_N%i", (int)mStyleHash.size()); else if (currentZone==Style::Z_StyleAutomatic) - sName.sprintf("S_M%i", mStyleHash.size()); + sName.sprintf("S_M%i", (int)mStyleHash.size()); else - sName.sprintf("S%i", mStyleHash.size()); + sName.sprintf("S%i", (int)mStyleHash.size()); if (propList["style:display-name"]) { librevenge::RVNGString name(propList["style:display-name"]->getStr()); @@ -361,11 +361,11 @@ librevenge::RVNGString sName(""); if (zone==Style::Z_Style) - sName.sprintf("Span_N%i", mStyleHash.size()); + sName.sprintf("Span_N%i", (int)mStyleHash.size()); else if (zone==Style::Z_StyleAutomatic) - sName.sprintf("Span_M%i", mStyleHash.size()); + sName.sprintf("Span_M%i", (int)mStyleHash.size()); else - sName.sprintf("Span%i", mStyleHash.size()); + sName.sprintf("Span%i", (int)mStyleHash.size()); shared_ptr<SpanStyle> span(new SpanStyle(sName.cstr(), propList, zone)); mStyleHash[sName] = span; mHashNameMap[hashKey] = sName;
