User: timar Date: 06/05/24 08:02:13 Modified: /hu/src/2.0.3/Patches/ i13816-sd-save-image-context-menu.diff, i35579-sc-standard-filter-options.diff, i59853-dejavu.diff
Log: updated File Changes: Directory: /hu/src/2.0.3/Patches/ ================================= File [changed]: i13816-sd-save-image-context-menu.diff Url: http://hu.openoffice.org/source/browse/hu/src/2.0.3/Patches/i13816-sd-save-image-context-menu.diff?r1=1.1&r2=1.2 Delta lines: +13 -13 --------------------- --- i13816-sd-save-image-context-menu.diff 24 May 2006 13:09:07 -0000 1.1 +++ i13816-sd-save-image-context-menu.diff 24 May 2006 15:02:05 -0000 1.2 @@ -1,8 +1,8 @@ --- sd/inc/app.hrc 2004-12-07 18:49:43.000000000 +0530 +++ sd/inc/app.hrc 2004-12-22 13:45:04.000000000 +0530 -@@ -487,4 +487,7 @@ - #define SID_RENAME_MASTER_PAGE (SID_SD_START+433) - #define SID_CLOSE_MASTER_VIEW (SID_SD_START+434) +@@ -465,4 +465,7 @@ + #define SID_DISPLAY_MASTER_BACKGROUND (SID_SD_START+436) + #define SID_DISPLAY_MASTER_OBJECTS (SID_SD_START+437) +// FIXME get an official SID +#define SID_SAVE_GRAPHIC (SID_SD_START+450) @@ -10,7 +10,7 @@ #endif --- sd/sdi/_drvwsh.sdi 2004-12-07 18:50:08.000000000 +0530 +++ sd/sdi/_drvwsh.sdi 2004-12-22 13:46:11.000000000 +0530 -@@ -115,6 +115,11 @@ interface DrawView : Object +@@ -89,6 +89,11 @@ interface DrawView : Object ExecMethod = FuTemporary ; StateMethod = GetMenuState ; ] @@ -24,7 +24,7 @@ ExecMethod = FuSupport ; --- sd/sdi/sdraw.sdi 2004-12-07 18:50:09.000000000 +0530 +++ sd/sdi/sdraw.sdi 2004-12-22 13:49:14.000000000 +0530 -@@ -4818,6 +4818,31 @@ SfxVoidItem OriginalSize SID_ORIGINAL_SI +@@ -4842,6 +4842,31 @@ SfxVoidItem OriginalSize SID_ORIGINAL_SI ] //-------------------------------------------------------------------------- @@ -59,7 +59,7 @@ --- sd/source/ui/app/menuids_tmpl.src 2004-11-04 21:34:05.000000000 +0530 +++ sd/source/ui/app/menuids_tmpl.src 2004-12-23 11:57:32.982925950 +0530 -@@ -1357,6 +1357,17 @@ +@@ -1370,6 +1370,17 @@ Text [ x-comment ] = " ";\ }; @@ -79,7 +79,7 @@ {\ --- sd/source/ui/app/popup2_tmpl.src 2004-12-07 18:50:16.000000000 +0530 +++ sd/source/ui/app/popup2_tmpl.src 2004-12-23 11:49:14.865785320 +0530 -@@ -570,6 +570,8 @@ +@@ -550,6 +550,8 @@ MN_STARIMAGE MN_COLORRESOLUTION SEPARATOR @@ -90,7 +90,7 @@ MN_POSITION --- sd/source/ui/inc/DrawViewShell.hxx 2004-12-07 18:50:23.000000000 +0530 +++ sd/source/ui/inc/DrawViewShell.hxx 2004-12-22 14:00:43.000000000 +0530 -@@ -490,6 +490,9 @@ private: +@@ -478,6 +478,9 @@ private: PageKind ePageKind, SdPage* pPage); @@ -102,7 +102,7 @@ TransferableClipboardListener* pClipEvtLstnr; --- sd/source/ui/view/drviews2.cxx 2004-12-07 18:50:29.000000000 +0530 +++ sd/source/ui/view/drviews2.cxx 2004-12-22 15:44:30.000000000 +0530 -@@ -112,6 +112,35 @@ +@@ -86,6 +86,35 @@ #include <basic/sbstar.hxx> #endif @@ -138,7 +138,7 @@ #define ITEMID_FIELD EE_FEATURE_FIELD #ifndef _SVX_FLDITEM_HXX //autogen #include <svx/flditem.hxx> -@@ -1256,6 +1285,12 @@ void DrawViewShell::FuTemporary(SfxReque +@@ -983,6 +983,12 @@ void DrawViewShell::FuTemporary(SfxReque rReq.Done(); break; @@ -151,7 +151,7 @@ case SID_DRAW_FONTWORK: case SID_DRAW_FONTWORK_VERTICAL: { -@@ -1306,4 +1341,88 @@ SdPage* DrawViewShell::CreateOrDuplicate +@@ -1033,4 +1033,88 @@ SdPage* DrawViewShell::CreateOrDuplicate return pNewPage; } @@ -242,7 +242,7 @@ } // end of namespace sd --- sd/source/ui/view/drviewsj.cxx 2004-10-15 16:06:30.000000000 +0530 +++ sd/source/ui/view/drviewsj.cxx 2004-12-22 14:11:09.000000000 +0530 -@@ -193,7 +193,8 @@ void DrawViewShell::GetMenuStateSel( Sfx +@@ -167,7 +167,8 @@ void DrawViewShell::GetMenuStateSel( Sfx SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_BEFORE_OBJ ) || SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_BEHIND_OBJ ) || SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_REVERSE_ORDER ) || @@ -252,7 +252,7 @@ { const SdrObject* pObj = rMarkList.GetMark(0)->GetObj(); UINT32 nInv = pObj->GetObjInventor(); -@@ -211,6 +212,11 @@ void DrawViewShell::GetMenuStateSel( Sfx +@@ -185,6 +186,11 @@ void DrawViewShell::GetMenuStateSel( Sfx rSet.DisableItem(SID_ORIGINAL_SIZE); } File [changed]: i35579-sc-standard-filter-options.diff Url: http://hu.openoffice.org/source/browse/hu/src/2.0.3/Patches/i35579-sc-standard-filter-options.diff?r1=1.1&r2=1.2 Delta lines: +12 -12 --------------------- --- i35579-sc-standard-filter-options.diff 24 May 2006 13:09:09 -0000 1.1 +++ i35579-sc-standard-filter-options.diff 24 May 2006 15:02:06 -0000 1.2 @@ -5,7 +5,7 @@ diff -u -p -u -r1.42 global.hxx --- sc/inc/global.hxx 13 Jan 2005 17:21:00 -0000 1.42 +++ sc/inc/global.hxx 11 Apr 2005 11:36:29 -0000 -@@ -818,7 +818,11 @@ enum ScQueryOp +@@ -804,7 +804,11 @@ enum ScQueryOp SC_TOPVAL, SC_BOTVAL, SC_TOPPERC, @@ -27,7 +27,7 @@ +++ sc/source/ui/src/filter.src 11 Apr 2005 11:36:29 -0000 @@ -151,19 +151,27 @@ < "kleinste" ; Default ; > ; - < "größte %" ; Default ; > ; + < "gröÃte %" ; Default ; > ; < "kleinste %" ; Default ; > ; + < "Contains" ; Default ; > ; + < "Does not Contain" ; Default ; > ; @@ -57,7 +57,7 @@ ListBox LB_COND2 @@ -185,19 +193,27 @@ < "kleinste" ; Default ; > ; - < "größte %" ; Default ; > ; + < "gröÃte %" ; Default ; > ; < "kleinste %" ; Default ; > ; + < "Contains" ; Default ; > ; + < "Does not Contain" ; Default ; > ; @@ -87,7 +87,7 @@ ListBox LB_COND3 @@ -219,19 +235,27 @@ < "kleinste" ; Default ; > ; - < "größte %" ; Default ; > ; + < "gröÃte %" ; Default ; > ; < "kleinste %" ; Default ; > ; + < "Contains" ; Default ; > ; + < "Does not Contain" ; Default ; > ; @@ -122,7 +122,7 @@ diff -u -p -u -r1.11 filtdlg.cxx --- sc/source/ui/dbgui/filtdlg.cxx 23 Jul 2004 10:51:24 -0000 1.11 +++ sc/source/ui/dbgui/filtdlg.cxx 11 Apr 2005 11:36:29 -0000 -@@ -84,6 +84,7 @@ +@@ -58,6 +58,7 @@ #include "document.hxx" #include "docsh.hxx" #include "scresid.hxx" @@ -130,7 +130,7 @@ #include "foptmgr.hxx" -@@ -572,6 +573,8 @@ ScQueryItem* ScFilterDlg::GetOutputItem( +@@ -546,6 +546,8 @@ ScQueryItem* ScFilterDlg::GetOutputItem( bCopyPosOk = ( SCA_VALID == (nResult & SCA_VALID) ); } @@ -139,7 +139,7 @@ for ( i = 0; i < 3; i++ ) { USHORT nField = aFieldLbArr[i]->GetSelectEntryPos(); -@@ -605,6 +608,18 @@ ScQueryItem* ScFilterDlg::GetOutputItem( +@@ -579,6 +582,18 @@ ScQueryItem* ScFilterDlg::GetOutputItem( } else { @@ -158,7 +158,7 @@ *rEntry.pStr = aStrVal; rEntry.nVal = 0; rEntry.bQueryByString = TRUE; -@@ -642,7 +657,7 @@ ScQueryItem* ScFilterDlg::GetOutputItem( +@@ -616,7 +631,7 @@ ScQueryItem* ScFilterDlg::GetOutputItem( theParam.bByRow = TRUE; theParam.bDuplicate = !aBtnUnique.IsChecked(); theParam.bCaseSens = aBtnCase.IsChecked(); @@ -177,7 +177,7 @@ diff -u -p -u -r1.20 table3.cxx --- sc/source/core/data/table3.cxx 15 Nov 2004 16:34:51 -0000 1.20 +++ sc/source/core/data/table3.cxx 11 Apr 2005 11:36:30 -0000 -@@ -1037,13 +1037,22 @@ BOOL ScTable::ValidQuery(SCROW nRow, con +@@ -1011,13 +1011,22 @@ BOOL ScTable::ValidQuery(SCROW nRow, con break; } } @@ -201,7 +201,7 @@ if ( pCell ) { if (pCell->GetCellType() != CELLTYPE_NOTE) -@@ -1056,7 +1065,9 @@ BOOL ScTable::ValidQuery(SCROW nRow, con +@@ -1030,7 +1039,9 @@ BOOL ScTable::ValidQuery(SCROW nRow, con GetInputString( static_cast<SCCOL>(rEntry.nField), nRow, aCellStr ); BOOL bRealRegExp = (rParam.bRegExp && ((rEntry.eOp == SC_EQUAL) @@ -212,7 +212,7 @@ BOOL bTestRegExp = (pbTestEqualCondition && rParam.bRegExp && ((rEntry.eOp == SC_LESS_EQUAL) || (rEntry.eOp == SC_GREATER_EQUAL))); -@@ -1071,13 +1082,16 @@ BOOL ScTable::ValidQuery(SCROW nRow, con +@@ -1045,13 +1056,16 @@ BOOL ScTable::ValidQuery(SCROW nRow, con && (nStart != 0 || nEnd != aCellStr.Len()) ) bMatch = FALSE; // RegExp must match entire cell string if ( bRealRegExp ) @@ -231,7 +231,7 @@ { if ( !rEntry.bQueryByString && rEntry.pStr->Len() == 0 ) { -@@ -1099,7 +1113,8 @@ BOOL ScTable::ValidQuery(SCROW nRow, con +@@ -1073,7 +1087,8 @@ BOOL ScTable::ValidQuery(SCROW nRow, con &xOff ) ); bOk = (aCell.Search( aQuer ) != STRING_NOTFOUND); } File [changed]: i59853-dejavu.diff Url: http://hu.openoffice.org/source/browse/hu/src/2.0.3/Patches/i59853-dejavu.diff?r1=1.1&r2=1.2 Delta lines: +6 -71 -------------------- --- i59853-dejavu.diff 24 May 2006 13:09:13 -0000 1.1 +++ i59853-dejavu.diff 24 May 2006 15:02:06 -0000 1.2 @@ -1,68 +1,3 @@ ---- officecfg/registry/data/org/openoffice/VCL.xcu.orig 2005-11-16 10:15:43.000000000 +0100 -+++ officecfg/registry/data/org/openoffice/VCL.xcu 2006-01-16 17:32:06.690111300 +0100 -@@ -55,25 +55,25 @@ - <node oor:name="DefaultFonts"> - <node oor:name="en" oor:op="replace"> - <prop oor:name="LATIN_DISPLAY" oor:type="xs:string" oor:op="replace"> -- <value>Albany;Arial;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value> -+ <value>Albany;Arial;DejaVu Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value> - </prop> - <prop oor:name="CJK_DISPLAY" oor:type="xs:string" oor:op="replace"> - <value>Andale Sans UI;MS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic;MS PGothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value> - </prop> - <prop oor:name="LATIN_HEADING" oor:type="xs:string" oor:op="replace"> -- <value>Albany;Arial;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value> -+ <value>Albany;Arial;DejaVu Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value> - </prop> - <prop oor:name="LATIN_FIXED" oor:type="xs:string" oor:op="replace"> -- <value>Cumberland;Courier New;Bitstream Vera Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value> -+ <value>Cumberland;Courier New;DejaVu Sans Mono;Bitstream Vera Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value> - </prop> - <prop oor:name="LATIN_PRESENTATION" oor:type="xs:string" oor:op="replace"> -- <value>Albany;Arial;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value> -+ <value>Albany;Arial;DejaVu Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value> - </prop> - <prop oor:name="LATIN_SPREADSHEET" oor:type="xs:string" oor:op="replace"> -- <value>Albany;Arial;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value> -+ <value>Albany;Arial;DejaVu Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value> - </prop> - <prop oor:name="LATIN_TEXT" oor:type="xs:string" oor:op="replace"> -- <value>Thorndale;Times New Roman;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value> -+ <value>Thorndale;Times New Roman;DejaVu Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value> - </prop> - <prop oor:name="CJK_HEADING" oor:type="xs:string" oor:op="replace"> - <value>HG Mincho Light J;MS Mincho;HG Mincho J;HG Mincho L;HG Mincho;Mincho;MS PMincho;HG Mincho Light J;MS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic;MS PGothic;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value> -@@ -100,25 +100,25 @@ - <value>Tahoma;Lucidasans;Lucida Sans;Arial Unicode MS</value> - </prop> - <prop oor:name="SANS" oor:type="xs:string" oor:op="replace"> -- <value>Albany;Arial;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value> -+ <value>Albany;Arial;DejaVu Sans;Bitstream Vera Sans;Helvetica;Lucida;Geneva;Helmet;SansSerif;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma</value> - </prop> - <prop oor:name="SANS_UNICODE" oor:type="xs:string" oor:op="replace"> - <value>Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;SansSerif</value> - </prop> - <prop oor:name="SERIF" oor:type="xs:string" oor:op="replace"> -- <value>Thorndale;Times New Roman;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value> -+ <value>Thorndale;Times New Roman;DejaVu Serif;Bitstream Vera Serif;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif</value> - </prop> - <prop oor:name="SYMBOL" oor:type="xs:string" oor:op="replace"> - <value>StarSymbol;OpenSymbol;Andale Sans UI;Arial Unicode MS;StarBats;Zapf Dingbats;WingDings;Symbol</value> - </prop> - <prop oor:name="UI_FIXED" oor:type="xs:string" oor:op="replace"> -- <value>Cumberland;Courier New;Bitstream Vera Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value> -+ <value>Cumberland;Courier New;DejaVu Sans Mono;Bitstream Vera Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value> - </prop> - <prop oor:name="FIXED" oor:type="xs:string" oor:op="replace"> -- <value>Cumberland;Courier New;Bitstream Vera Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value> -+ <value>Cumberland;Courier New;DejaVu Sans Mono;Bitstream Vera Sans Mono;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced</value> - </prop> - <prop oor:name="UI_SANS" oor:type="xs:string" oor:op="replace"> -- <value>Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;Bitstream Vera Sans;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif</value> -+ <value>Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma;DejaVu Sans;Bitstream Vera Sans;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif</value> - </prop> - </node> - --- 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 @@ @@ -4973,7 +4908,7 @@ + { color: #000000; } --- ./scp2/source/ooo/module_hidden_ooo.scp.org 2005-11-11 15:27:10.000000000 +0100 +++ ./scp2/source/ooo/module_hidden_ooo.scp 2005-12-28 15:49:28.956322400 +0100 -@@ -927,15 +927,25 @@ +@@ -933,15 +933,25 @@ Default = YES; Styles = (HIDDEN_ROOT); Files = (gid_File_Fnt_Opensymb, @@ -5030,18 +4965,18 @@ } --- 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 -@@ -108,7 +108,7 @@ +@@ -95,7 +95,7 @@ BIG_SVX TRUE BIG_GOODIES TRUE BMP_WRITES_FLAG TRUE -- BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS CURL DICTIONARIES FREETYPE 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 CURL DICTIONARIES FREETYPE 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 ++ 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 RES_ENUS TRUE RES_GER TRUE NO_REC_RES TRUE --- solenv/config/stand.lst.orig 2006-02-12 22:04:50.000000000 +0100 +++ solenv/config/stand.lst 2006-03-02 09:21:46.865289500 +0100 -@@ -224,7 +224,7 @@ +@@ -227,7 +227,7 @@ Switch -jdk14 SCS :pserver:[EMAIL PROTECTED]:/cvs } @@ -5050,7 +4985,7 @@ { SCS :pserver:[EMAIL PROTECTED]:/cvs } -@@ -1179,7 +1179,7 @@ +@@ -1120,7 +1120,7 @@ Switch -jdk14 SCS :pserver:[EMAIL PROTECTED]:/cvs } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
