Hi Pedro, On Sun, Apr 15, 2012 at 09:47:30PM -0500, Pedro Giffuni wrote: > On 04/15/12 21:06, Ariel Constenla-Haile wrote: > >>... > >>I committed the fix (I had a blackout between the commit and the moment > >>I did the followup on BZ). Hope you don't mind > >As far as you built and tested the fix before committing it, I don't > >mind :) > > > > Actually .. the fix that I committed (removing STYLE_SYMBOLS_TANGO) > is necessary but is only a part of the issue. > > Please note that the .sdf files still carry Tango as a valid Icon Style:
@Jürgen: aren't we in "translation freeze" mode? > # grep Tango * > cui source\options\optgdlg.src 0 stringlist > OFA_TP_VIEW.LB_ICONSTYLE 5 0 es > Tango 20120314 15:13:33 > That is http://svn.apache.org/viewvc/incubator/ooo/trunk/main/cui/source/options/optgdlg.src?revision=1303543&view=markup#l242 and I don't see < "Tango" ; > ; there. IMHO we shouldn't remove anything, on the contrary we should revert all changes: the list of icon styles is filled in the constructor of OfaViewTabPage. Ultimately, the existence of an icon set is checked on bool ImplImageTree::checkStyle(rtl::OUString const & style) so that non-existent icon styles are removed from the list box. IMO we should keep all the list as it was before, with all icon styles, so that the user can install by herself/himself the ones AOO can't ship due to license issues. This means reverting changes in ::rtl::OUString StyleSettings::ImplSymbolsStyleToName( sal_uLong nStyle ) const sal_uLong StyleSettings::ImplNameToSymbolsStyle( const ::rtl::OUString &rName ) const sal_uLong StyleSettings::GetAutoSymbolsStyle() const and some other places. Regards -- Ariel Constenla-Haile La Plata, Argentina
pgpQIVlm1ara7.pgp
Description: PGP signature
