User: timar Date: 2006/12/11 14:33:19 Modified: hu/src/2.1.0/Patches/i59853-dejavu.diff hu/src/2.1.0/Patches/i61008-arvizturo2.diff
Log: . File Changes: Directory: /hu/src/2.1.0/Patches/ ================================= File [changed]: i59853-dejavu.diff Url: http://hu.openoffice.org/source/browse/hu/src/2.1.0/Patches/i59853-dejavu.diff?r1=1.1&r2=1.2 Delta lines: +14 -14 --------------------- --- i59853-dejavu.diff 24 Nov 2006 23:28:46 -0000 1.1 +++ i59853-dejavu.diff 11 Dec 2006 22:33:17 -0000 1.2 @@ -1,7 +1,7 @@ --- config_office/configure.orig 2005-10-25 16:42:08.000000000 +0200 +++ config_office/configure 2006-01-16 17:20:56.884662900 +0100 -@@ -990,7 +990,7 @@ - --with-firefox Use Firefox instead of Mozilla Suite for building. +@@ -1023,7 +1023,7 @@ + --with-xulrunner Use XULRunner instead of Mozilla Suite for building. Only honoured with --with-system-mozilla - --without-fonts Removes Bitstream Vera fonts from @@ -9,7 +9,7 @@ openoffice.org installation set, for people building for specific distributions where the fonts are known to be already available -@@ -18517,13 +18517,13 @@ +@@ -21681,13 +21681,13 @@ SCPDEFS="$SCPDEFS -DWITHOUT_MATHMLDTD" fi @@ -28,7 +28,7 @@ echo "${ECHO_T}no" >&6 --- config_office/configure.in.orig 2005-10-25 13:23:57.000000000 +0200 +++ config_office/configure.in 2006-01-16 17:20:13.274729700 +0100 -@@ -47,7 +47,7 @@ +@@ -57,7 +57,7 @@ Only honoured with --with-system-mozilla ],,) AC_ARG_WITH(fonts, @@ -37,7 +37,7 @@ openoffice.org installation set, for people building for specific distributions where the fonts are known to be already available -@@ -3995,11 +3995,11 @@ +@@ -4774,11 +4774,11 @@ dnl =================================================================== dnl Test whether to include fonts dnl =================================================================== @@ -387,14 +387,14 @@ -#endif --- vcl/source/gdi/fontcfg.cxx.orig 2005-09-09 13:57:35.000000000 +0200 +++ vcl/source/gdi/fontcfg.cxx 2006-01-16 17:29:32.906892900 +0100 -@@ -374,8 +374,8 @@ +@@ -303,8 +303,8 @@ // fallback mechanism (either no configuration or no entry in configuration -- #define FALLBACKFONT_UI_SANS "Andale Sans UI;Tahoma;Arial Unicode MS;Arial;Bitstream Vera Sans;gnu-unifont;Interface User;Geneva;WarpSans;Dialog;Swiss;Lucida;Helvetica;Charcoal;Chicago;MS Sans Serif;Helv;Times;Times New Roman;Interface System" -- #define FALLBACKFONT_UI_SANS_LATIN2 "Andale Sans UI;Tahoma;Arial Unicode MS;Arial;Luxi Sans;Bitstream Vera Sans;Interface User;Geneva;WarpSans;Dialog;Swiss;Lucida;Helvetica;Charcoal;Chicago;MS Sans Serif;Helv;Times;Times New Roman;Interface System" -+ #define FALLBACKFONT_UI_SANS "Andale Sans UI;Tahoma;Arial Unicode MS;Arial;DejaVu Sans;Bitstream Vera Sans;gnu-unifont;Interface User;Geneva;WarpSans;Dialog;Swiss;Lucida;Helvetica;Charcoal;Chicago;MS Sans Serif;Helv;Times;Times New Roman;Interface System" -+ #define FALLBACKFONT_UI_SANS_LATIN2 "Andale Sans UI;Tahoma;Arial Unicode MS;Arial;DejaVu Sans;Luxi Sans;Bitstream Vera Sans;Interface User;Geneva;WarpSans;Dialog;Swiss;Lucida;Helvetica;Charcoal;Chicago;MS Sans Serif;Helv;Times;Times New Roman;Interface System" +- #define FALLBACKFONT_UI_SANS "Andale Sans UI;Albany;Albany AMT;Tahoma;Arial Unicode MS;Arial;Nimbus Sans L;Bitstream Vera Sans;gnu-unifont;Interface User;Geneva;WarpSans;Dialog;Swiss;Lucida;Helvetica;Charcoal;Chicago;MS Sans Serif;Helv;Times;Times New Roman;Interface System" +- #define FALLBACKFONT_UI_SANS_LATIN2 "Andale Sans UI;Albany;Albany AMT;Tahoma;Arial Unicode MS;Arial;Nimbus Sans L;Luxi Sans;Bitstream Vera Sans;Interface User;Geneva;WarpSans;Dialog;Swiss;Lucida;Helvetica;Charcoal;Chicago;MS Sans Serif;Helv;Times;Times New Roman;Interface System" ++ #define FALLBACKFONT_UI_SANS "Andale Sans UI;Albany;Albany AMT;Tahoma;Arial Unicode MS;Arial;Nimbus Sans L;DejaVu Sans;Bitstream Vera Sans;gnu-unifont;Interface User;Geneva;WarpSans;Dialog;Swiss;Lucida;Helvetica;Charcoal;Chicago;MS Sans Serif;Helv;Times;Times New Roman;Interface System" ++ #define FALLBACKFONT_UI_SANS_LATIN2 "Andale Sans UI;Albany;Albany AMT;Tahoma;Arial Unicode MS;Arial;Nimbus Sans L;Luxi Sans;DejaVu Sans;Bitstream Vera Sans;Interface User;Geneva;WarpSans;Dialog;Swiss;Lucida;Helvetica;Charcoal;Chicago;MS Sans Serif;Helv;Times;Times New Roman;Interface System" #define FALLBACKFONT_UI_SANS_ARABIC "Tahoma;Traditional Arabic;Simplified Arabic;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;clearlyU;Interface User;Arial Unicode MS;Lucida Sans Unicode;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif" #define FALLBACKFONT_UI_SANS_THAI "OONaksit;Tahoma;Lucidasans;Arial Unicode MS" #define FALLBACKFONT_UI_SANS_KOREAN "SunGulim;BaekmukGulim;Gulim;Roundgothic;Arial Unicode MS;Lucida Sans Unicode;gnu-unifont;Andale Sans UI" @@ -457,12 +457,12 @@ } --- solenv/config/ssrc680.ini.orig 2006-02-12 22:04:50.000000000 +0100 +++ solenv/config/ssrc680.ini 2006-03-01 18:18:05.106604600 +0100 -@@ -95,7 +95,7 @@ +@@ -93,7 +93,7 @@ + { BIG_SVX TRUE - BIG_GOODIES TRUE BMP_WRITES_FLAG TRUE -- BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES FREETYPE HSQLDB JPEG LIBXML2 LIBXMLSEC MOZ NAS NEON TWAIN PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB SABLOT XALAN SUN AGG -+ BUILD_TYPE SO OOo EXT BINFILTER FONTS BSH CURL DICTIONARIES FREETYPE HSQLDB JPEG LIBXML2 LIBXMLSEC MOZ NAS NEON TWAIN PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB SABLOT XALAN SUN AGG +- BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES FREETYPE HSQLDB JPEG LIBXML2 LIBXMLSEC MOZ NAS NEON TWAIN PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB SABLOT XALAN SUN AGG GTK ++ BUILD_TYPE SO OOo EXT BINFILTER FONTS BSH CURL DICTIONARIES FREETYPE HSQLDB JPEG LIBXML2 LIBXMLSEC MOZ NAS NEON TWAIN PYTHON ZLIB SNDFILE PORTAUDIO SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB SABLOT XALAN SUN AGG GTK RES_ENUS TRUE RES_GER TRUE NO_REC_RES TRUE File [changed]: i61008-arvizturo2.diff Url: http://hu.openoffice.org/source/browse/hu/src/2.1.0/Patches/i61008-arvizturo2.diff?r1=1.1&r2=1.2 Delta lines: +4 -14 -------------------- --- i61008-arvizturo2.diff 24 Nov 2006 23:28:46 -0000 1.1 +++ i61008-arvizturo2.diff 11 Dec 2006 22:33:17 -0000 1.2 @@ -1,14 +1,6 @@ --- svx/source/dialog/fntctrl.cxx.orig 2005-09-11 17:21:06.000000000 +0200 +++ svx/source/dialog/fntctrl.cxx 2005-10-15 19:33:41.915643100 +0200 -@@ -34,6 +34,7 @@ - ************************************************************************/ - - // include --------------------------------------------------------------- -+#include "chardlg.hrc" - - #ifndef _SFXVIEWSH_HXX - #include <sfx2/viewsh.hxx> // SfxViewShell -@@ -83,7 +84,7 @@ +@@ -84,7 +84,7 @@ #include "fntctrl.hxx" #include "dialogs.hrc" @@ -17,7 +9,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -@@ -611,6 +612,8 @@ +@@ -613,6 +613,8 @@ { Printer* pPrinter = pImpl->pPrinter; SvxFont& rFont = pImpl->aFont; @@ -26,15 +18,13 @@ if ( pImpl->bUseResText ) pImpl->aText = GetText(); -@@ -627,7 +630,10 @@ +@@ -629,7 +631,7 @@ } if ( !pImpl->bSelection ) - pImpl->aText = rFont.GetName(); -+// pImpl->aText = rFont.GetName(); + pImpl->aText = str_fontpreview_utf; -+// pImpl->aText.Append(rFont.GetName()); -+ if ( !pImpl->aText.Len() ) pImpl->aText = GetText(); + --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
