rpms/openoffice.org/FC-4 openoffice.org-1.9.106.ooo44627.sal.brokencondition.patch, NONE, 1.1 openoffice.org-1.9.106.ooo50172.icu.tamilvowelslikepango.patch, NONE, 1.1 openoffice.org-1.9.108.ooo30133.lingucomponent.ukrainean.patch, NONE, 1.1 openoffice.org-1.9.108.ooo47323.binfilter.stupiddetect.patch, NONE, 1.1 openoffice.org-1.9.108.oooXXXXX.solenv.nostipwithsimpleinstall.patch, NONE, 1.1 workspace-fpicker4.patch, NONE, 1.1 workspace.gcc4fwdecl.patch, NONE, 1.1 workspace.vcl39.patch, NONE, 1.1 openoffice.org-1.9.87.rh151357.patch, 1.5, 1.6 openoffice.org-1.9.90.ooo46585.sunmiscisnotstandard.filter.patch, 1.1, 1.2 openoffice.org-1.9.91.oooXXXXX.fontfallbacks.officecfg.patch, 1.2, 1.3 openoffice.org-1.9.97.rh156067.noversionedicons.patch, 1.1, 1.2 openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch, 1.1, 1.2 openoffice.org.spec, 1.200, 1.201 sources, 1.69, 1.70
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Jun 10 10:26:27 UTC 2005
- Previous message (by thread): rpms/xerces-j2/devel XJavac.java, NONE, 1.1 .cvsignore, 1.6, 1.7 sources, 1.4, 1.5 xerces-j2-build.patch, 1.3, 1.4 xerces-j2.spec, 1.25, 1.26
- Next message (by thread): rpms/openoffice.org/FC-4 openoffice.org.spec,1.201,1.202
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv22889
Modified Files:
openoffice.org-1.9.87.rh151357.patch
openoffice.org-1.9.90.ooo46585.sunmiscisnotstandard.filter.patch
openoffice.org-1.9.91.oooXXXXX.fontfallbacks.officecfg.patch
openoffice.org-1.9.97.rh156067.noversionedicons.patch
openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch
openoffice.org.spec sources
Added Files:
openoffice.org-1.9.106.ooo44627.sal.brokencondition.patch
openoffice.org-1.9.106.ooo50172.icu.tamilvowelslikepango.patch
openoffice.org-1.9.108.ooo30133.lingucomponent.ukrainean.patch
openoffice.org-1.9.108.ooo47323.binfilter.stupiddetect.patch
openoffice.org-1.9.108.oooXXXXX.solenv.nostipwithsimpleinstall.patch
workspace-fpicker4.patch workspace.gcc4fwdecl.patch
workspace.vcl39.patch
Log Message:
sync to 1.9.108-4
openoffice.org-1.9.106.ooo44627.sal.brokencondition.patch:
osl/unx/conditn.c | 0
sal/osl/unx/conditn.c | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE openoffice.org-1.9.106.ooo44627.sal.brokencondition.patch ---
Index: osl/unx/conditn.c
===================================================================
RCS file: /cvs/porting/sal/osl/unx/conditn.c,v
retrieving revision 1.4
diff -u -p -r1.4 conditn.c
--- openoffice.org.orig/sal/osl/unx/conditn.c 16 Mar 2001 13:14:43 -0000 1.4
+++ openoffice.org/sal/osl/unx/conditn.c 2 Jun 2005 09:49:19 -0000
@@ -278,7 +278,7 @@ oslConditionResult SAL_CALL osl_waitCond
return osl_cond_result_error;
}
- while ( ! pCond->m_State )
+ if ( ! pCond->m_State )
{
if ( pTimeout )
{
openoffice.org-1.9.106.ooo50172.icu.tamilvowelslikepango.patch:
icu-2.6.patch | 11 +++++++++++
1 files changed, 11 insertions(+)
--- NEW FILE openoffice.org-1.9.106.ooo50172.icu.tamilvowelslikepango.patch ---
Index: icu-2.6.patch
===================================================================
RCS file: /cvs/external/icu/icu-2.6.patch,v
retrieving revision 1.10
diff -u -p -r1.10 icu-2.6.patch
--- openoffice.org.orig/icu/icu-2.6.patch 15 Mar 2005 13:37:05 -0000 1.10
+++ openoffice.org/icu/icu-2.6.patch 3 Jun 2005 12:49:12 -0000
@@ -2243,3 +2243,17 @@
commands = pkg_appendToList(commands, NULL, uprv_strdup(stanza));
sprintf(stanza, "@$(RMV) $(TEMP_DIR)/%s", cfile+genFileOffset);
+*** misc/icu/source/data/unidata/DerivedCoreProperties.txt Fri Jun 3 13:45:39 2005
+--- misc/build/icu/source/data/unidata/DerivedCoreProperties.txt Fri Jun 3 13:49:45 2005
+***************
+*** 3498,3503 ****
+--- 3498,3506 ----
+ 0B82 ; Grapheme_Extend # Mn TAMIL SIGN ANUSVARA
+ 0BBE ; Grapheme_Extend # Mc TAMIL VOWEL SIGN AA
+ 0BC0 ; Grapheme_Extend # Mn TAMIL VOWEL SIGN II
++ 0BC1..0BC2 ; Grapheme_Extend # Mc [2] TAMIL VOWEL SIGN U..TAMIL VOWEL SIGN UU
++ 0BC6..0BC8 ; Grapheme_Extend # Mc [3] TAMIL VOWEL SIGN E..TAMIL VOWEL SIGN AI
++ 0BCA..0BCC ; Grapheme_Extend # Mc [3] TAMIL VOWEL SIGN O..TAMIL VOWEL SIGN AU
+ 0BCD ; Grapheme_Extend # Mn TAMIL SIGN VIRAMA
+ 0BD7 ; Grapheme_Extend # Mc TAMIL AU LENGTH MARK
+ 0C3E..0C40 ; Grapheme_Extend # Mn [3] TELUGU VOWEL SIGN AA..TELUGU VOWEL SIGN II
openoffice.org-1.9.108.ooo30133.lingucomponent.ukrainean.patch:
csutil.cxx | 262 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 262 insertions(+)
--- NEW FILE openoffice.org-1.9.108.ooo30133.lingucomponent.ukrainean.patch ---
diff -r -u SRC680_m104.orig/lingucomponent/source/spellcheck/myspell/csutil.cxx SRC680_m104/lingucomponent/source/spellcheck/myspell/csutil.cxx
--- SRC680_m104.orig/lingucomponent/source/spellcheck/myspell/csutil.cxx 2004-03-09 14:41:29.000000000 +0200
+++ SRC680_m104/lingucomponent/source/spellcheck/myspell/csutil.cxx 2005-06-01 22:53:16.080957488 +0300
@@ -3027,6 +3027,266 @@
{ 0x01, 0xdf, 0xff },
};
+struct cs_info koi8u_tbl[] = {
+{ 0x00, 0x00, 0x00 },
+{ 0x00, 0x01, 0x01 },
+{ 0x00, 0x02, 0x02 },
+{ 0x00, 0x03, 0x03 },
+{ 0x00, 0x04, 0x04 },
+{ 0x00, 0x05, 0x05 },
+{ 0x00, 0x06, 0x06 },
+{ 0x00, 0x07, 0x07 },
+{ 0x00, 0x08, 0x08 },
+{ 0x00, 0x09, 0x09 },
+{ 0x00, 0x0a, 0x0a },
+{ 0x00, 0x0b, 0x0b },
+{ 0x00, 0x0c, 0x0c },
+{ 0x00, 0x0d, 0x0d },
+{ 0x00, 0x0e, 0x0e },
+{ 0x00, 0x0f, 0x0f },
+{ 0x00, 0x10, 0x10 },
+{ 0x00, 0x11, 0x11 },
+{ 0x00, 0x12, 0x12 },
+{ 0x00, 0x13, 0x13 },
+{ 0x00, 0x14, 0x14 },
+{ 0x00, 0x15, 0x15 },
+{ 0x00, 0x16, 0x16 },
+{ 0x00, 0x17, 0x17 },
+{ 0x00, 0x18, 0x18 },
+{ 0x00, 0x19, 0x19 },
+{ 0x00, 0x1a, 0x1a },
+{ 0x00, 0x1b, 0x1b },
+{ 0x00, 0x1c, 0x1c },
+{ 0x00, 0x1d, 0x1d },
+{ 0x00, 0x1e, 0x1e },
+{ 0x00, 0x1f, 0x1f },
+{ 0x00, 0x20, 0x20 },
+{ 0x00, 0x21, 0x21 },
+{ 0x00, 0x22, 0x22 },
+{ 0x00, 0x23, 0x23 },
+{ 0x00, 0x24, 0x24 },
+{ 0x00, 0x25, 0x25 },
+{ 0x00, 0x26, 0x26 },
+{ 0x00, 0x27, 0x27 },
+{ 0x00, 0x28, 0x28 },
+{ 0x00, 0x29, 0x29 },
+{ 0x00, 0x2a, 0x2a },
+{ 0x00, 0x2b, 0x2b },
+{ 0x00, 0x2c, 0x2c },
+{ 0x00, 0x2d, 0x2d },
+{ 0x00, 0x2e, 0x2e },
+{ 0x00, 0x2f, 0x2f },
+{ 0x00, 0x30, 0x30 },
+{ 0x00, 0x31, 0x31 },
+{ 0x00, 0x32, 0x32 },
+{ 0x00, 0x33, 0x33 },
+{ 0x00, 0x34, 0x34 },
+{ 0x00, 0x35, 0x35 },
+{ 0x00, 0x36, 0x36 },
+{ 0x00, 0x37, 0x37 },
+{ 0x00, 0x38, 0x38 },
+{ 0x00, 0x39, 0x39 },
+{ 0x00, 0x3a, 0x3a },
+{ 0x00, 0x3b, 0x3b },
+{ 0x00, 0x3c, 0x3c },
+{ 0x00, 0x3d, 0x3d },
+{ 0x00, 0x3e, 0x3e },
+{ 0x00, 0x3f, 0x3f },
+{ 0x00, 0x40, 0x40 },
+{ 0x01, 0x61, 0x41 },
+{ 0x01, 0x62, 0x42 },
+{ 0x01, 0x63, 0x43 },
+{ 0x01, 0x64, 0x44 },
+{ 0x01, 0x65, 0x45 },
+{ 0x01, 0x66, 0x46 },
+{ 0x01, 0x67, 0x47 },
+{ 0x01, 0x68, 0x48 },
+{ 0x01, 0x69, 0x49 },
+{ 0x01, 0x6a, 0x4a },
+{ 0x01, 0x6b, 0x4b },
+{ 0x01, 0x6c, 0x4c },
+{ 0x01, 0x6d, 0x4d },
+{ 0x01, 0x6e, 0x4e },
+{ 0x01, 0x6f, 0x4f },
+{ 0x01, 0x70, 0x50 },
+{ 0x01, 0x71, 0x51 },
+{ 0x01, 0x72, 0x52 },
+{ 0x01, 0x73, 0x53 },
+{ 0x01, 0x74, 0x54 },
+{ 0x01, 0x75, 0x55 },
+{ 0x01, 0x76, 0x56 },
+{ 0x01, 0x77, 0x57 },
+{ 0x01, 0x78, 0x58 },
+{ 0x01, 0x79, 0x59 },
+{ 0x01, 0x7a, 0x5a },
+{ 0x00, 0x5b, 0x5b },
+{ 0x00, 0x5c, 0x5c },
+{ 0x00, 0x5d, 0x5d },
+{ 0x00, 0x5e, 0x5e },
+{ 0x00, 0x5f, 0x5f },
+{ 0x00, 0x60, 0x60 },
+{ 0x00, 0x61, 0x41 },
+{ 0x00, 0x62, 0x42 },
+{ 0x00, 0x63, 0x43 },
+{ 0x00, 0x64, 0x44 },
+{ 0x00, 0x65, 0x45 },
+{ 0x00, 0x66, 0x46 },
+{ 0x00, 0x67, 0x47 },
+{ 0x00, 0x68, 0x48 },
+{ 0x00, 0x69, 0x49 },
+{ 0x00, 0x6a, 0x4a },
+{ 0x00, 0x6b, 0x4b },
+{ 0x00, 0x6c, 0x4c },
+{ 0x00, 0x6d, 0x4d },
+{ 0x00, 0x6e, 0x4e },
+{ 0x00, 0x6f, 0x4f },
+{ 0x00, 0x70, 0x50 },
+{ 0x00, 0x71, 0x51 },
+{ 0x00, 0x72, 0x52 },
+{ 0x00, 0x73, 0x53 },
+{ 0x00, 0x74, 0x54 },
+{ 0x00, 0x75, 0x55 },
+{ 0x00, 0x76, 0x56 },
+{ 0x00, 0x77, 0x57 },
+{ 0x00, 0x78, 0x58 },
+{ 0x00, 0x79, 0x59 },
+{ 0x00, 0x7a, 0x5a },
+{ 0x00, 0x7b, 0x7b },
+{ 0x00, 0x7c, 0x7c },
+{ 0x00, 0x7d, 0x7d },
+{ 0x00, 0x7e, 0x7e },
+{ 0x00, 0x7f, 0x7f },
+{ 0x00, 0x80, 0x80 },
+{ 0x00, 0x81, 0x81 },
+{ 0x00, 0x82, 0x82 },
+{ 0x00, 0x83, 0x83 },
+{ 0x00, 0x84, 0x84 },
+{ 0x00, 0x85, 0x85 },
+{ 0x00, 0x86, 0x86 },
+{ 0x00, 0x87, 0x87 },
+{ 0x00, 0x88, 0x88 },
+{ 0x00, 0x89, 0x89 },
+{ 0x00, 0x8a, 0x8a },
+{ 0x00, 0x8b, 0x8b },
+{ 0x00, 0x8c, 0x8c },
+{ 0x00, 0x8d, 0x8d },
+{ 0x00, 0x8e, 0x8e },
+{ 0x00, 0x8f, 0x8f },
+{ 0x00, 0x90, 0x90 },
+{ 0x00, 0x91, 0x91 },
+{ 0x00, 0x92, 0x92 },
+{ 0x00, 0x93, 0x93 },
+{ 0x00, 0x94, 0x94 },
+{ 0x00, 0x95, 0x95 },
+{ 0x00, 0x96, 0x96 },
+{ 0x00, 0x97, 0x97 },
+{ 0x00, 0x98, 0x98 },
+{ 0x00, 0x99, 0x99 },
+{ 0x00, 0x9a, 0x9a },
+{ 0x00, 0x9b, 0x9b },
+{ 0x00, 0x9c, 0x9c },
+{ 0x00, 0x9d, 0x9d },
+{ 0x00, 0x9e, 0x9e },
+{ 0x00, 0x9f, 0x9f },
+{ 0x00, 0xa0, 0xa0 },
+{ 0x00, 0xa1, 0xa1 },
+{ 0x00, 0xa2, 0xa2 },
+{ 0x00, 0xa3, 0xb3 },
+{ 0x00, 0xa4, 0xb4 }, /* ie */
+{ 0x00, 0xa5, 0xa5 },
+{ 0x00, 0xa6, 0xb6 }, /* i */
+{ 0x00, 0xa7, 0xb7 }, /* ii */
+{ 0x00, 0xa8, 0xa8 },
+{ 0x00, 0xa9, 0xa9 },
+{ 0x00, 0xaa, 0xaa },
+{ 0x00, 0xab, 0xab },
+{ 0x00, 0xac, 0xac },
+{ 0x00, 0xad, 0xbd }, /* g'' */
+{ 0x00, 0xae, 0xae },
+{ 0x00, 0xaf, 0xaf },
+{ 0x00, 0xb0, 0xb0 },
+{ 0x00, 0xb1, 0xb1 },
+{ 0x00, 0xb2, 0xb2 },
+{ 0x01, 0xa3, 0xb3 },
+{ 0x00, 0xb4, 0xb4 }, /* IE */
+{ 0x00, 0xb5, 0xb5 },
+{ 0x00, 0xb6, 0xb6 }, /* I */
+{ 0x00, 0xb7, 0xb7 }, /* II */
+{ 0x00, 0xb8, 0xb8 },
+{ 0x00, 0xb9, 0xb9 },
+{ 0x00, 0xba, 0xba },
+{ 0x00, 0xbb, 0xbb },
+{ 0x00, 0xbc, 0xbc },
+{ 0x00, 0xbd, 0xbd },
+{ 0x00, 0xbe, 0xbe },
+{ 0x00, 0xbf, 0xbf },
+{ 0x00, 0xc0, 0xe0 },
+{ 0x00, 0xc1, 0xe1 },
+{ 0x00, 0xc2, 0xe2 },
+{ 0x00, 0xc3, 0xe3 },
+{ 0x00, 0xc4, 0xe4 },
+{ 0x00, 0xc5, 0xe5 },
+{ 0x00, 0xc6, 0xe6 },
+{ 0x00, 0xc7, 0xe7 },
+{ 0x00, 0xc8, 0xe8 },
+{ 0x00, 0xc9, 0xe9 },
+{ 0x00, 0xca, 0xea },
+{ 0x00, 0xcb, 0xeb },
+{ 0x00, 0xcc, 0xec },
+{ 0x00, 0xcd, 0xed },
+{ 0x00, 0xce, 0xee },
+{ 0x00, 0xcf, 0xef },
+{ 0x00, 0xd0, 0xf0 },
+{ 0x00, 0xd1, 0xf1 },
+{ 0x00, 0xd2, 0xf2 },
+{ 0x00, 0xd3, 0xf3 },
+{ 0x00, 0xd4, 0xf4 },
+{ 0x00, 0xd5, 0xf5 },
+{ 0x00, 0xd6, 0xf6 },
+{ 0x00, 0xd7, 0xf7 },
+{ 0x00, 0xd8, 0xf8 },
+{ 0x00, 0xd9, 0xf9 },
+{ 0x00, 0xda, 0xfa },
+{ 0x00, 0xdb, 0xfb },
+{ 0x00, 0xdc, 0xfc },
+{ 0x00, 0xdd, 0xfd },
+{ 0x00, 0xde, 0xfe },
+{ 0x00, 0xdf, 0xff },
+{ 0x01, 0xc0, 0xe0 },
+{ 0x01, 0xc1, 0xe1 },
+{ 0x01, 0xc2, 0xe2 },
+{ 0x01, 0xc3, 0xe3 },
+{ 0x01, 0xc4, 0xe4 },
+{ 0x01, 0xc5, 0xe5 },
+{ 0x01, 0xc6, 0xe6 },
+{ 0x01, 0xc7, 0xe7 },
+{ 0x01, 0xc8, 0xe8 },
+{ 0x01, 0xc9, 0xe9 },
+{ 0x01, 0xca, 0xea },
+{ 0x01, 0xcb, 0xeb },
+{ 0x01, 0xcc, 0xec },
+{ 0x01, 0xcd, 0xed },
+{ 0x01, 0xce, 0xee },
+{ 0x01, 0xcf, 0xef },
+{ 0x01, 0xd0, 0xf0 },
+{ 0x01, 0xd1, 0xf1 },
+{ 0x01, 0xd2, 0xf2 },
+{ 0x01, 0xd3, 0xf3 },
+{ 0x01, 0xd4, 0xf4 },
+{ 0x01, 0xd5, 0xf5 },
+{ 0x01, 0xd6, 0xf6 },
+{ 0x01, 0xd7, 0xf7 },
+{ 0x01, 0xd8, 0xf8 },
+{ 0x01, 0xd9, 0xf9 },
+{ 0x01, 0xda, 0xfa },
+{ 0x01, 0xdb, 0xfb },
+{ 0x01, 0xdc, 0xfc },
+{ 0x01, 0xdd, 0xfd },
+{ 0x01, 0xde, 0xfe },
+{ 0x01, 0xdf, 0xff },
+};
+
+
struct cs_info cp1251_tbl[] = {
{ 0x00, 0x00, 0x00 },
{ 0x00, 0x01, 0x01 },
@@ -4076,6 +4336,7 @@
{"ISO8859-9",iso9_tbl},
{"ISO8859-10",iso10_tbl},
{"KOI8-R",koi8r_tbl},
+{"KOI8-U",koi8u_tbl},
{"microsoft-cp1251",cp1251_tbl},
{"ISO8859-13", iso13_tbl},
{"ISO8859-14", iso14_tbl},
@@ -4114,6 +4375,7 @@
{"pt","ISO8859-1"},
{"sv","ISO8859-1"},
{"ru","KOI8-R"},
+ {"uk","KOI8-U"},
{"bg","microsoft-cp1251"},
};
openoffice.org-1.9.108.ooo47323.binfilter.stupiddetect.patch:
binfilter/binfilterdetect/source/bindetect.cxx | 4 +++-
binfilterdetect/source/bindetect.cxx | 0
2 files changed, 3 insertions(+), 1 deletion(-)
--- NEW FILE openoffice.org-1.9.108.ooo47323.binfilter.stupiddetect.patch ---
Index: binfilterdetect/source/bindetect.cxx
===================================================================
RCS file: /cvs/framework/binfilter/binfilterdetect/source/bindetect.cxx,v
retrieving revision 1.6
diff -u -p -r1.6 bindetect.cxx
--- openoffice.org.orig/binfilter/binfilterdetect/source/bindetect.cxx 31 Jan 2005 08:34:15 -0000 1.6
+++ openoffice.org/binfilter/binfilterdetect/source/bindetect.cxx 9 Jun 2005 15:14:02 -0000
@@ -77,6 +77,7 @@
#include <svtools/itemset.hxx>
#include <vcl/svapp.hxx>
#include <sot/storage.hxx>
+#include <sot/formats.hxx>
using namespace ::com::sun::star::registry;
using namespace ::com::sun::star::uno;
@@ -240,7 +241,8 @@ BinFilterDetect::~BinFilterDetect()
lDescriptor[nIndexOfFilterName].Value <<= ::rtl::OUString();
// try general detection using clipboard Id
- pFilter = rMatcher.GetFilter4ClipBoardId( aStor->GetFormat(), nMust, nDont );
+ if (aStor->GetFormat() != SOT_FORMATSTR_ID_MSWORD_DOC)
+ pFilter = rMatcher.GetFilter4ClipBoardId( aStor->GetFormat(), nMust, nDont );
}
}
}
openoffice.org-1.9.108.oooXXXXX.solenv.nostipwithsimpleinstall.patch:
bin/make_installer.pl | 0
bin/modules/installer/globals.pm | 0
bin/modules/installer/parameter.pm | 0
solenv/bin/make_installer.pl | 2 +-
solenv/bin/modules/installer/globals.pm | 2 +-
solenv/bin/modules/installer/parameter.pm | 1 +
6 files changed, 3 insertions(+), 2 deletions(-)
--- NEW FILE openoffice.org-1.9.108.oooXXXXX.solenv.nostipwithsimpleinstall.patch ---
Index: bin/make_installer.pl
===================================================================
RCS file: /cvs/tools/solenv/bin/make_installer.pl,v
retrieving revision 1.43
diff -u -p -u -r1.43 make_installer.pl
--- openoffice.org.orig/solenv/bin/make_installer.pl 13 May 2005 09:40:50 -0000 1.43
+++ openoffice.org/solenv/bin/make_installer.pl 9 Jun 2005 09:51:48 -0000
@@ -1186,7 +1186,7 @@ for ( my $n = 0; $n <= $#installer::glob
# 1. copy all files that need to be stripped locally
# 2. strip all these files
- installer::strip::strip_libraries($filesinpackage, $languagestringref);
+ if ( $installer::globals::strip ) { installer::strip::strip_libraries($filesinpackage, $languagestringref); }
if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . $packagename ."_files.log", $filesinpackage); }
###############################################################
Index: bin/modules/installer/globals.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/globals.pm,v
retrieving revision 1.35
diff -u -p -u -r1.35 globals.pm
--- openoffice.org.orig/solenv/bin/modules/installer/globals.pm 13 May 2005 09:41:38 -0000 1.35
+++ openoffice.org/solenv/bin/modules/installer/globals.pm 9 Jun 2005 09:51:55 -0000
@@ -151,7 +151,7 @@ BEGIN
@linuxlinks = ();
@linkrpms = ();
- $strip = 0;
+ $strip = 1;
$solarjava = 0;
$jdklib = "";
$jrepath = "";
Index: bin/modules/installer/parameter.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/parameter.pm,v
retrieving revision 1.23
diff -u -p -u -r1.23 parameter.pm
--- openoffice.org.orig/solenv/bin/modules/installer/parameter.pm 20 May 2005 07:40:16 -0000 1.23
+++ openoffice.org/solenv/bin/modules/installer/parameter.pm 9 Jun 2005 09:51:58 -0000
@@ -203,6 +203,7 @@ sub getparameter
{
$installer::globals::simple = 1;
$installer::globals::call_epm = 0;
+ $installer::globals::strip = 0;
my $path = shift(@ARGV);
$path =~ s/^$installer::globals::destdir//;
$installer::globals::rootpath = $path;
workspace-fpicker4.patch:
SalGtkFilePicker.cxx | 339 ++++++++++++++++++++++++++++++---------------------
SalGtkFilePicker.hxx | 22 +--
SalGtkPicker.cxx | 17 +-
SalGtkPicker.hxx | 5
makefile.mk | 2
5 files changed, 229 insertions(+), 156 deletions(-)
--- NEW FILE workspace-fpicker4.patch ---
Index: source/unx/gnome/SalGtkFilePicker.cxx
===================================================================
RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkFilePicker.cxx,v
retrieving revision 1.6
retrieving revision 1.6.6.3
diff -u -p -u -r1.6 -r1.6.6.3
--- openoffice.org.orig/fpicker/source/unx/gnome/SalGtkFilePicker.cxx 3 May 2005 13:47:32 -0000 1.6
+++ openoffice.org/fpicker/source/unx/gnome/SalGtkFilePicker.cxx 2 Jun 2005 10:08:52 -0000 1.6.6.3
@@ -109,8 +109,6 @@
#include <SalGtkFilePicker.hxx>
#endif
-#include "filepickereventnotification.hxx"
-
#include <tools/urlobj.hxx>
#include <iostream>
@@ -168,7 +166,6 @@ SalGtkFilePicker::SalGtkFilePicker( cons
lang::XEventListener,
lang::XServiceInfo>( m_rbHelperMtx ),
m_xServiceMgr( xServiceMgr ),
- m_aAsyncEventNotifier( rBHelper ),
m_pVBox ( NULL ),
m_pFilterList( NULL ),
bVersionWidthUnset( false ),
@@ -302,16 +299,71 @@ SalGtkFilePicker::SalGtkFilePicker( cons
gtk_box_pack_end( GTK_BOX( m_pVBox ), m_pHBoxs[i], FALSE, FALSE, 0 );
}
+ aLabel = aResProvider.getResString( FILE_PICKER_FILE_TYPE );
+ m_pFilterExpander = gtk_expander_new_with_mnemonic(
+ OUStringToOString( aLabel, RTL_TEXTENCODING_UTF8 ).getStr());
+
+ gtk_box_pack_end( GTK_BOX( m_pVBox ), m_pFilterExpander, FALSE, TRUE, 0 );
+ gtk_widget_show( m_pFilterExpander );
+
+ GtkWidget *scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),
+ GTK_SHADOW_IN);
+ gtk_container_add (GTK_CONTAINER (m_pFilterExpander), scrolled_window);
+ gtk_widget_show (scrolled_window);
+
+ m_pFilterStore = gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_STRING,
+ G_TYPE_STRING, G_TYPE_STRING);
+ m_pFilterView = gtk_tree_view_new_with_model (GTK_TREE_MODEL(m_pFilterStore));
+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(m_pFilterView), false);
+ gtk_tree_view_set_rules_hint (GTK_TREE_VIEW(m_pFilterView), true);
+
+ GtkTreeViewColumn *column;
+ GtkCellRenderer *cell;
+
+ for (int i = 0; i < 2; ++i)
+ {
+ column = gtk_tree_view_column_new ();
+ cell = gtk_cell_renderer_text_new ();
+ gtk_tree_view_column_set_expand (column, TRUE);
+ gtk_tree_view_column_pack_start (column, cell, FALSE);
+ gtk_tree_view_column_set_attributes (column, cell, "text", i, NULL);
+ gtk_tree_view_append_column (GTK_TREE_VIEW(m_pFilterView), column);
+ }
+
+ gtk_container_add (GTK_CONTAINER (scrolled_window), m_pFilterView);
+ gtk_widget_show (m_pFilterView);
+
gtk_file_chooser_set_extra_widget( GTK_FILE_CHOOSER( m_pDialog ), m_pVBox );
+ m_pPreview = gtk_image_new();
+ gtk_file_chooser_set_preview_widget( GTK_FILE_CHOOSER( m_pDialog ), m_pPreview );
+
g_signal_connect( G_OBJECT( m_pToggles[PREVIEW] ), "toggled",
G_CALLBACK( preview_toggled_cb ), this );
-// g_signal_connect( G_OBJECT( m_pFilterComboBox ), "changed",
-// G_CALLBACK( filter_changed_atsave_cb ), this );
+ g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW(m_pFilterView)), "changed",
+ G_CALLBACK ( type_changed_cb ), this);
g_signal_connect( G_OBJECT( m_pDialog ), "notify::filter",
G_CALLBACK( filter_changed_cb ), this );
+ g_signal_connect( G_OBJECT( m_pFilterExpander ), "activate",
+ G_CALLBACK( expander_changed_cb ), this );
+
gtk_widget_show( m_pVBox );
+
+ PangoLayout *layout = gtk_widget_create_pango_layout (m_pFilterView, NULL);
+ guint ypad;
+ PangoRectangle row_height;
+ pango_layout_set_markup (layout, "All Files", -1);
+ pango_layout_get_pixel_extents (layout, NULL, &row_height);
+ g_object_get (cell, "ypad", &ypad, NULL);
+ guint height = (row_height.height + 2*ypad) * 5;
+ gtk_widget_set_size_request (m_pFilterView, -1, height);
+
+ gtk_widget_hide(m_pPreview);
+ gtk_file_chooser_set_preview_widget_active( GTK_FILE_CHOOSER( m_pDialog ), false );
}
//------------------------------------------------------------------------------------
@@ -321,22 +373,15 @@ SalGtkFilePicker::SalGtkFilePicker( cons
void SAL_CALL SalGtkFilePicker::addFilePickerListener( const uno::Reference<XFilePickerListener>& xListener )
throw( uno::RuntimeException )
{
- if( rBHelper.bDisposed )
- throw lang::DisposedException( rtl::OUString::createFromAscii( "object is already disposed" ),
- static_cast< XFilePicker* >( this ) );
-
- if( !rBHelper.bInDispose && !rBHelper.bDisposed )
- rBHelper.aLC.addInterface( getCppuType( &xListener ), xListener );
+ ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ m_xListener = xListener;
}
void SAL_CALL SalGtkFilePicker::removeFilePickerListener( const uno::Reference<XFilePickerListener>& xListener )
throw( uno::RuntimeException )
{
- if( rBHelper.bDisposed )
- throw lang::DisposedException( rtl::OUString::createFromAscii( "object is already disposed" ),
- static_cast< XFilePicker* >( this ) );
-
- rBHelper.aLC.removeInterface( getCppuType( &xListener ), xListener );
+ ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ m_xListener.clear();
}
// -------------------------------------------------
@@ -358,31 +403,26 @@ void SAL_CALL SalGtkFilePicker::disposin
void SAL_CALL SalGtkFilePicker::fileSelectionChanged( FilePickerEvent aEvent )
{
OSL_TRACE( "file selection changed");
- aEvent.Source = uno::Reference<uno::XInterface>( static_cast<XFilePickerNotifier*>( this ) );
- m_aAsyncEventNotifier.notifyEvent(
- new SalGtkFilePickerParamEventNotification( &XFilePickerListener::fileSelectionChanged, aEvent ) );
+ if (m_xListener.is()) m_xListener->fileSelectionChanged( aEvent );
}
void SAL_CALL SalGtkFilePicker::directoryChanged( FilePickerEvent aEvent )
{
OSL_TRACE("directory changed");
- aEvent.Source = uno::Reference<uno::XInterface>( static_cast<XFilePickerNotifier*>( this ) );
- m_aAsyncEventNotifier.notifyEvent(
- new SalGtkFilePickerParamEventNotification( &XFilePickerListener::directoryChanged, aEvent ) );
+ if (m_xListener.is()) m_xListener->directoryChanged( aEvent );
}
void SAL_CALL SalGtkFilePicker::controlStateChanged( FilePickerEvent aEvent )
{
- aEvent.Source = uno::Reference<uno::XInterface>( static_cast<XFilePickerNotifier*>( this ) );
- m_aAsyncEventNotifier.notifyEvent(
- new SalGtkFilePickerParamEventNotification( &XFilePickerListener::controlStateChanged, aEvent ) );
+ OSL_TRACE("control state changed");
+ if (m_xListener.is()) m_xListener->controlStateChanged( aEvent );
}
void SAL_CALL SalGtkFilePicker::dialogSizeChanged()
{
+ OSL_TRACE("dialog size changed");
/*
- m_aAsyncEventNotifier.notifyEvent(
- new SalGtkFilePickerEventNotification( &XFilePickerListener::dialogSizeChanged ) );
+ if (m_xListener.is()) m_xListener->dialogSizeChanged( aEvent );
*/
}
@@ -432,48 +472,6 @@ rtl::OUString SAL_CALL SalGtkFilePicker:
return aHelpText;
}
-bool SalGtkFilePicker::startupEventNotification( bool bStartupSuspended )
-{
- OSL_TRACE( "attempting to start\n");
- bool bRet = m_aAsyncEventNotifier.startup( bStartupSuspended );
- if (bRet)
- {
- mHID_FolderChange =
- g_signal_connect( GTK_FILE_CHOOSER( m_pDialog ), "current-folder-changed",
- G_CALLBACK( folder_changed_cb ), ( gpointer )this );
-
- mHID_SelectionChange =
- g_signal_connect( GTK_FILE_CHOOSER( m_pDialog ), "selection-changed",
- G_CALLBACK( selection_changed_cb ), ( gpointer )this );
-
- }
- return bRet;
-}
-
-void SalGtkFilePicker::shutdownEventNotification()
-{
- OSL_TRACE( "before terminate, risky for some reason\n" );
- m_aAsyncEventNotifier.shutdown();
- if (mHID_FolderChange)
- g_signal_handler_disconnect(GTK_FILE_CHOOSER( m_pDialog ), mHID_FolderChange);
- if (mHID_SelectionChange)
- g_signal_handler_disconnect(GTK_FILE_CHOOSER( m_pDialog ), mHID_SelectionChange);
- OSL_TRACE( "after terminate, risky for some reason\n" );
-}
-
-void SalGtkFilePicker::suspendEventNotification()
-{
- OSL_TRACE( "suspend called\n" );
- m_aAsyncEventNotifier.suspend();
-}
-
-void SalGtkFilePicker::resumeEventNotification()
-{
- OSL_TRACE( "resume called\n" );
- m_aAsyncEventNotifier.resume();
-}
-
-
//=====================================================================
struct FilterEntry
@@ -532,17 +530,19 @@ sal_Int32 FilterEntry::getSubFilters( Un
return m_aSubFilters.getLength();
}
-static inline bool
-isFilterString( const rtl::OUString &rFilterString )
+static bool
+isFilterString( const rtl::OUString &rFilterString, char *pMatch )
{
sal_Int32 nIndex = 0;
rtl::OUString aToken;
bool bIsFilter = true;
+ rtl::OUString aMatch(rtl::OUString::createFromAscii(pMatch));
+
do
{
aToken = rFilterString.getToken( 0, ';', nIndex );
- if( !aToken.match( rtl::OUString::createFromAscii( "*." ) ) )
+ if( !aToken.match( aMatch ) )
{
bIsFilter = false;
break;
@@ -554,7 +554,7 @@ isFilterString( const rtl::OUString &rFi
}
static rtl::OUString
-shrinkFilterName( const rtl::OUString &rFilterName )
+shrinkFilterName( const rtl::OUString &rFilterName, bool bAllowNoStar = false )
{
int i;
int nBracketLen = -1;
@@ -566,21 +566,21 @@ shrinkFilterName( const rtl::OUString &r
{
if( pStr[i] == ')' )
nBracketEnd = i;
-
else if( pStr[i] == '(' )
{
nBracketLen = nBracketEnd - i;
- if( nBracketEnd > 0 &&
- isFilterString( rFilterName.copy( i + 1, nBracketLen - 1 ) ) )
- aRealName = aRealName.replaceAt( i, nBracketLen + 1, rtl::OUString() );
+ if( nBracketEnd <= 0 )
+ continue;
+ if( isFilterString( rFilterName.copy( i + 1, nBracketLen - 1 ), "*." ) )
+ aRealName = aRealName.replaceAt( i, nBracketLen + 1, rtl::OUString() );
+ else if (bAllowNoStar)
+ {
+ if( isFilterString( rFilterName.copy( i + 1, nBracketLen - 1 ), ".") )
+ aRealName = aRealName.replaceAt( i, nBracketLen + 1, rtl::OUString() );
+ }
}
}
-// OSL_TRACE( "BEFORE %s\n",
-// OUStringToOString( rFilterName, RTL_TEXTENCODING_UTF8 ).getStr());
-// OSL_TRACE( "AFTER %s\n",
-// OUStringToOString( aRealName, RTL_TEXTENCODING_UTF8 ).getStr());
-
return aRealName;
}
@@ -738,6 +738,20 @@ void SAL_CALL SalGtkFilePicker::setCurre
//
//-----------------------------------------------------------------------------------------
+void SalGtkFilePicker::updateCurrentFilterFromName(const gchar* filtername)
+{
+ OUString aFilterName(filtername, strlen(filtername), RTL_TEXTENCODING_UTF8);
+ FilterList::iterator aEnd = m_pFilterList->end();
+ for (FilterList::iterator aIter = m_pFilterList->begin(); aIter != aEnd; ++aIter)
+ {
+ if (aFilterName == shrinkFilterName( aIter->getTitle()))
+ {
+ m_aCurrentFilter = aIter->getTitle();
+ break;
+ }
+ }
+}
+
rtl::OUString SAL_CALL SalGtkFilePicker::getCurrentFilter() throw( uno::RuntimeException )
{
OSL_ASSERT( m_pDialog != NULL );
@@ -747,20 +761,22 @@ rtl::OUString SAL_CALL SalGtkFilePicker:
OSL_TRACE( "GetCURRENTfilter\n" );
// Update the filtername from the users selection if they have had a chance to do so.
- if( GtkFileFilter *filter = gtk_file_chooser_get_filter( GTK_FILE_CHOOSER( m_pDialog ) ) )
- {
- const gchar* filtername = gtk_file_filter_get_name( filter );
- OUString aFilterName(filtername, strlen(filtername), RTL_TEXTENCODING_UTF8);
- FilterList::iterator aEnd = m_pFilterList->end();
- for (FilterList::iterator aIter = m_pFilterList->begin(); aIter != aEnd; ++aIter)
- {
- if (aFilterName == shrinkFilterName( aIter->getTitle()))
- {
- m_aCurrentFilter = aIter->getTitle();
- break;
- }
- }
- }
+ // If the user explicitly sets a type then use that, if not then take the implicit type
+ // from the filter of the files glob on which he is currently searching
+ GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(m_pFilterView));
+ GtkTreeIter iter;
+ GtkTreeModel *model;
+ if (gtk_tree_selection_get_selected (selection, &model, &iter))
+ {
+ gchar *title;
+ gtk_tree_model_get (model, &iter, 2, &title, -1);
+ updateCurrentFilterFromName(title);
+ g_free (title);
+ }
+ else if( GtkFileFilter *filter = gtk_file_chooser_get_filter(GTK_FILE_CHOOSER(m_pDialog)))
+ {
+ updateCurrentFilterFromName(gtk_file_filter_get_name( filter ));
+ }
OSL_TRACE( "Returning current filter of %s\n",
OUStringToOString( m_aCurrentFilter, RTL_TEXTENCODING_UTF8 ).getStr() );
@@ -881,23 +897,36 @@ uno::Sequence<rtl::OUString> SAL_CALL Sa
if( GTK_FILE_CHOOSER_ACTION_SAVE == eAction )
{
- const gchar* filtername =
- gtk_file_filter_get_name( gtk_file_chooser_get_filter( GTK_FILE_CHOOSER( m_pDialog ) ) );
+ OUString sFilterName;
- OSL_TRACE( "2: current filter is %s\n", filtername );
+ GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(m_pFilterView));
+ GtkTreeIter iter;
+ GtkTreeModel *model;
+ if (gtk_tree_selection_get_selected (selection, &model, &iter))
+ {
+ gchar *title;
+ gtk_tree_model_get (model, &iter, 2, &title, -1);
+ sFilterName = OUString( title, strlen( title), RTL_TEXTENCODING_UTF8 );
+ g_free (title);
+ }
+ else
+ {
+ const gchar* filtername =
+ gtk_file_filter_get_name( gtk_file_chooser_get_filter( GTK_FILE_CHOOSER( m_pDialog ) ) );
+ sFilterName = OUString( filtername, strlen( filtername ), RTL_TEXTENCODING_UTF8 );
+ }
+ OSL_TRACE( "2: current filter is %s\n",
+ OUStringToOString( sFilterName, RTL_TEXTENCODING_UTF8 ).getStr() );
FilterList::iterator aListIter = ::std::find_if(
- m_pFilterList->begin(), m_pFilterList->end(),
- FilterTitleMatch( OUString( filtername,
- strlen( filtername ), RTL_TEXTENCODING_UTF8 ) ) );
+ m_pFilterList->begin(), m_pFilterList->end(), FilterTitleMatch(sFilterName) );
OUString aFilter = aListIter->getFilter();
OSL_TRACE( "turned into %s\n",
OUStringToOString( aFilter, RTL_TEXTENCODING_UTF8 ).getStr() );
-
sal_Int32 nTokenIndex = 0;
rtl::OUString sToken;
// rtl::OUString strExt;
@@ -959,14 +988,13 @@ sal_Int16 SAL_CALL SalGtkFilePicker::exe
sal_Int16 retVal = 0;
- if( !startupEventNotification( STARTUP_SUSPENDED ) )
- {
- OSL_ENSURE( sal_False, "Could not start event notifier thread!" );
-
- throw uno::RuntimeException(
- rtl::OUString::createFromAscii( "Error executing dialog" ),
- static_cast<XFilePicker*>( this ) );
- }
+ mHID_FolderChange =
+ g_signal_connect( GTK_FILE_CHOOSER( m_pDialog ), "current-folder-changed",
+ G_CALLBACK( folder_changed_cb ), ( gpointer )this );
+
+ mHID_SelectionChange =
+ g_signal_connect( GTK_FILE_CHOOSER( m_pDialog ), "selection-changed",
+ G_CALLBACK( selection_changed_cb ), ( gpointer )this );
SetFilters();
@@ -977,10 +1005,8 @@ sal_Int16 SAL_CALL SalGtkFilePicker::exe
{
btn = GTK_RESPONSE_YES; // we dont want to repeat unless user clicks NO for file save.
- resumeEventNotification();
RunDialog aRunInMain(m_pDialog);
gint nStatus = aRunInMain.runandwaitforresult();
- suspendEventNotification();
switch( nStatus )
{
case GTK_RESPONSE_ACCEPT:
@@ -995,7 +1021,8 @@ sal_Int16 SAL_CALL SalGtkFilePicker::exe
CResourceProvider aResProvider;
GtkWidget *dlg;
- dlg = gtk_message_dialog_new( GTK_WINDOW( m_pDialog ), GTK_DIALOG_MODAL,
+ dlg = gtk_message_dialog_new( NULL,
+ GTK_DIALOG_MODAL,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_YES_NO,
OUStringToOString(
@@ -1006,8 +1033,6 @@ sal_Int16 SAL_CALL SalGtkFilePicker::exe
OUStringToOString(aResProvider.getResString(FILE_PICKER_TITLE_SAVE ),
RTL_TEXTENCODING_UTF8 ).getStr() );
- gtk_dialog_set_has_separator( GTK_DIALOG( dlg ), FALSE );
-
btn = gtk_dialog_run( GTK_DIALOG( dlg ) );
gtk_widget_destroy( dlg );
}
@@ -1029,14 +1054,17 @@ sal_Int16 SAL_CALL SalGtkFilePicker::exe
break;
}
}
- shutdownEventNotification();
+
+ if (mHID_FolderChange)
+ g_signal_handler_disconnect(GTK_FILE_CHOOSER( m_pDialog ), mHID_FolderChange);
+ if (mHID_SelectionChange)
+ g_signal_handler_disconnect(GTK_FILE_CHOOSER( m_pDialog ), mHID_SelectionChange);
+
return retVal;
}
//------------------------------------------------------------------------------------
-
-
// cf. offapi/com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.idl
GtkWidget *SalGtkFilePicker::getWidget( sal_Int16 nControlId, GType *pType )
{
@@ -1405,16 +1433,45 @@ void SAL_CALL SalGtkFilePicker::setImage
// TODO m_pImpl->setImage( aImageFormat, aImage );
}
-void SalGtkFilePicker::filter_changed_cb( GtkFileChooser *file_chooser, GParamSpec *pspec,
- SalGtkFilePicker *pobjFP )
+void SalGtkFilePicker::implChangeType( GtkTreeSelection *selection )
{
+ CResourceProvider aResProvider;
+ OUString aLabel = aResProvider.getResString( FILE_PICKER_FILE_TYPE );
+ GtkTreeIter iter;
+ GtkTreeModel *model;
+ if (gtk_tree_selection_get_selected (selection, &model, &iter))
+ {
+ gchar *title;
+ gtk_tree_model_get (model, &iter, 2, &title, -1);
+ aLabel += rtl::OUString::createFromAscii( ": " );
+ aLabel += rtl::OUString( title, strlen(title), RTL_TEXTENCODING_UTF8 );
+ g_free (title);
+ }
+ gtk_expander_set_label (GTK_EXPANDER (m_pFilterExpander),
+ OUStringToOString( aLabel, RTL_TEXTENCODING_UTF8 ).getStr());
FilePickerEvent evt;
evt.ElementId = LISTBOX_FILTER;
- OSL_TRACE( "filter_changed, isn't it great %x\n", pobjFP );
- pobjFP->controlStateChanged( evt );
+ controlStateChanged( evt );
}
-void SalGtkFilePicker::filter_changed_atsave_cb( GtkComboBox *widget, SalGtkFilePicker *pobjFP )
+void SalGtkFilePicker::type_changed_cb( GtkTreeSelection *selection, SalGtkFilePicker *pobjFP )
+{
+ pobjFP->implChangeType(selection);
+}
+
+void SalGtkFilePicker::unselect_type()
+{
+ gtk_tree_selection_unselect_all(gtk_tree_view_get_selection(GTK_TREE_VIEW(m_pFilterView)));
+}
+
+void SalGtkFilePicker::expander_changed_cb( GtkExpander *expander, SalGtkFilePicker *pobjFP )
+{
+ if (gtk_expander_get_expanded(expander))
+ pobjFP->unselect_type();
+}
+
+void SalGtkFilePicker::filter_changed_cb( GtkFileChooser *file_chooser, GParamSpec *pspec,
+ SalGtkFilePicker *pobjFP )
{
FilePickerEvent evt;
evt.ElementId = LISTBOX_FILTER;
@@ -1482,27 +1539,16 @@ sal_Bool SAL_CALL SalGtkFilePicker::setS
// Show
if( !mHID_Preview )
{
- // This is the first time
- m_pPreview = gtk_image_new();
- gtk_file_chooser_set_preview_widget(
- GTK_FILE_CHOOSER( m_pDialog ), m_pPreview );
mHID_Preview = g_signal_connect(
GTK_FILE_CHOOSER( m_pDialog ), "update-preview",
G_CALLBACK( update_preview_cb ), ( gpointer )this );
}
- else
- {
- gtk_widget_show( m_pPreview );
- }
-
+ gtk_widget_show( m_pPreview );
}
else
{
// Hide
gtk_widget_hide( m_pPreview );
-
- if( m_pPreview )
- gtk_widget_hide( m_pPreview );
}
// also emit the signal
@@ -1792,8 +1838,10 @@ void SalGtkFilePicker::implAddFilter( co
gtk_file_filter_set_name( filter, aFilterName );
static const OUString aStarDot = OUString::createFromAscii( "*." );
+ OUString aTokens;
- if( !rType.compareToAscii( "*.*" ) )
+ bool bAllGlob = !rType.compareToAscii( "*.*" );
+ if (bAllGlob)
gtk_file_filter_add_pattern( filter, "*" );
else
{
@@ -1806,10 +1854,15 @@ void SalGtkFilePicker::implAddFilter( co
aToken = aToken.copy( aToken.lastIndexOf( aStarDot ) + 2 );
if (aToken.getLength())
{
+ if (aTokens.getLength())
+ aTokens += OUString::createFromAscii(",");
+ aTokens = aTokens += aToken;
gtk_file_filter_add_custom (filter, GTK_FILE_FILTER_FILENAME,
case_insensitive_filter,
g_strdup( rtl::OUStringToOString( aToken, RTL_TEXTENCODING_UTF8 ) ),
(GDestroyNotify) g_free );
+
+ OSL_TRACE( "fustering with %s\n", rtl::OUStringToOString( aToken, RTL_TEXTENCODING_UTF8 ).getStr());
}
#ifdef DEBUG
else
@@ -1824,6 +1877,18 @@ void SalGtkFilePicker::implAddFilter( co
}
gtk_file_chooser_add_filter( GTK_FILE_CHOOSER( m_pDialog ), filter );
+
+ if (!bAllGlob)
+ {
+ GtkTreeIter iter;
+ gtk_list_store_append (m_pFilterStore, &iter);
+ gtk_list_store_set (m_pFilterStore, &iter,
+ 0, OUStringToOString(shrinkFilterName( rFilter, true ), RTL_TEXTENCODING_UTF8).getStr(),
+ 1, OUStringToOString(aTokens, RTL_TEXTENCODING_UTF8).getStr(),
+ 2, aFilterName.getStr(),
+ 3, OUStringToOString(rType, RTL_TEXTENCODING_UTF8).getStr(),
+ -1);
+ }
}
void SalGtkFilePicker::implAddFilterGroup( const OUString& _rFilter, const Sequence< StringPair >& _rFilters )
Index: source/unx/gnome/SalGtkFilePicker.hxx
===================================================================
RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkFilePicker.hxx,v
retrieving revision 1.4
retrieving revision 1.4.8.2
diff -u -p -u -r1.4 -r1.4.8.2
--- openoffice.org.orig/fpicker/source/unx/gnome/SalGtkFilePicker.hxx 3 May 2005 13:47:48 -0000 1.4
+++ openoffice.org/fpicker/source/unx/gnome/SalGtkFilePicker.hxx 1 Jun 2005 11:05:43 -0000 1.4.8.2
@@ -102,10 +102,6 @@
#include "SalGtkPicker.hxx"
#endif
-#ifndef _ASYNCEVENTNOTIFIER_HXX_
-#include "asynceventnotifier.hxx"
-#endif
-
#include <memory>
#ifndef _RTL_USTRING_H_
@@ -302,11 +298,6 @@ class SalGtkFilePicker :
void SAL_CALL controlStateChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent );
void SAL_CALL dialogSizeChanged( );
- bool startupEventNotification(bool bStartupSuspended);
- void shutdownEventNotification();
- void suspendEventNotification();
- void resumeEventNotification();
-
private:
// prevent copy and assignment
SalGtkFilePicker( const SalGtkFilePicker& );
@@ -321,10 +312,15 @@ class SalGtkFilePicker :
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceMgr;
private:
- SalGtkAsyncEventNotifier m_aAsyncEventNotifier;
+ ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >
+ m_xListener;
FilterList *m_pFilterList;
GtkWidget *m_pVBox;
+ GtkWidget *m_pFilterExpander;
+ GtkWidget *m_pFilterView;
+ GtkListStore *m_pFilterStore;
+
enum {
AUTOEXTENSION,
PASSWORD,
@@ -369,9 +365,12 @@ class SalGtkFilePicker :
void SetCurFilter( const OUString& rFilter );
void SetFilters();
+ void implChangeType( GtkTreeSelection *selection );
void implAddFilter( const OUString& rFilter, const OUString& rType);
void implAddFilterGroup( const OUString& rFilter,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair>& _rFilters );
+ void updateCurrentFilterFromName(const gchar* filtername);
+ void unselect_type();
bool bVersionWidthUnset;
sal_Bool mbPreviewState;
@@ -386,9 +385,10 @@ class SalGtkFilePicker :
const ::com::sun::star::uno::Any& rValue);
::com::sun::star::uno::Any HandleGetListValue(GtkComboBox *pWidget, sal_Int16 nControlAction) const;
+ static void expander_changed_cb( GtkExpander *expander, SalGtkFilePicker *pobjFP );
static void preview_toggled_cb (GtkObject *cb, SalGtkFilePicker *pobjFP);
static void filter_changed_cb (GtkFileChooser *file_chooser, GParamSpec *pspec, SalGtkFilePicker *pobjFP);
- static void filter_changed_atsave_cb (GtkComboBox* widget, SalGtkFilePicker *pobjFP);
+ static void type_changed_cb( GtkTreeSelection *selection, SalGtkFilePicker *pobjFP );
static void folder_changed_cb (GtkFileChooser *file_chooser, SalGtkFilePicker *pobjFP);
static void selection_changed_cb (GtkFileChooser *file_chooser, SalGtkFilePicker *pobjFP);
static void update_preview_cb (GtkFileChooser *file_chooser, SalGtkFilePicker *pobjFP);
Index: source/unx/gnome/SalGtkPicker.cxx
===================================================================
RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkPicker.cxx,v
retrieving revision 1.6
retrieving revision 1.6.8.1
diff -u -p -u -r1.6 -r1.6.8.1
--- openoffice.org.orig/fpicker/source/unx/gnome/SalGtkPicker.cxx 3 May 2005 13:48:23 -0000 1.6
+++ openoffice.org/fpicker/source/unx/gnome/SalGtkPicker.cxx 1 Jun 2005 11:05:21 -0000 1.6.8.1
@@ -141,17 +141,26 @@ gboolean rundialog(RunDialog *pDialog)
void RunDialog::run()
{
mnStatus = gtk_dialog_run( GTK_DIALOG( m_pDialog ) );
- gtk_widget_hide( m_pDialog );
- bFinished = true;
+ gtk_widget_hide( m_pDialog );
+
+ maLock.acquire();
+ mbFinished = true;
+ maLock.release();
+
+ Application::EndYield();
}
gint RunDialog::runandwaitforresult()
{
g_timeout_add_full(G_PRIORITY_HIGH_IDLE, 0, (GSourceFunc)rundialog, this, NULL);
- do {
+ while (1)
+ {
+ maLock.acquire();
+ if (mbFinished)
+ break;
+ maLock.release();
Application::Yield();
}
- while (!bFinished);
return mnStatus;
}
Index: source/unx/gnome/SalGtkPicker.hxx
===================================================================
RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkPicker.hxx,v
retrieving revision 1.4
retrieving revision 1.4.8.1
diff -u -p -u -r1.4 -r1.4.8.1
--- openoffice.org.orig/fpicker/source/unx/gnome/SalGtkPicker.hxx 3 May 2005 13:48:40 -0000 1.4
+++ openoffice.org/fpicker/source/unx/gnome/SalGtkPicker.hxx 1 Jun 2005 11:05:22 -0000 1.4.8.1
@@ -117,12 +117,13 @@ class SalGtkPicker
class RunDialog
{
private:
- bool bFinished;
+ bool mbFinished;
+ osl::Mutex maLock;
gint mnStatus;
GtkWidget *m_pDialog;
public:
void run();
- RunDialog(GtkWidget *pDialog) : bFinished(false), m_pDialog(pDialog) { }
+ RunDialog(GtkWidget *pDialog) : mbFinished(false), m_pDialog(pDialog) { }
gint runandwaitforresult();
};
Index: source/unx/gnome/makefile.mk
===================================================================
RCS file: /cvs/gsl/fpicker/source/unx/gnome/makefile.mk,v
retrieving revision 1.4
retrieving revision 1.4.14.1
diff -u -p -u -r1.4 -r1.4.14.1
--- openoffice.org.orig/fpicker/source/unx/gnome/makefile.mk 13 Apr 2005 08:57:09 -0000 1.4
+++ openoffice.org/fpicker/source/unx/gnome/makefile.mk 1 Jun 2005 11:05:44 -0000 1.4.14.1
@@ -104,8 +104,6 @@ SLOFILES =\
$(SLO)$/SalGtkFilePicker.obj \
$(SLO)$/SalGtkFolderPicker.obj \
$(SLO)$/resourceprovider.obj \
- $(SLO)$/asynceventnotifier.obj \
- $(SLO)$/filepickereventnotification.obj \
$(SLO)$/FPentry.obj
SHL1NOCHECK=TRUE
workspace.gcc4fwdecl.patch:
bf_forms/source/component/Image.hxx | 0
bf_sfx2/source/inc/loadenv.hxx | 0
bf_sfx2/source/inc/splitwin.hxx | 0
bf_svx/source/editeng/impedit.hxx | 0
bf_svx/source/inc/fmpgeimp.hxx | 0
bf_svx/source/inc/fmshimp.hxx | 0
bf_svx/source/inc/fmvwimp.hxx | 0
bf_sw/source/core/sw3io/sw_sw3style.cxx | 0
binfilter/bf_forms/source/component/Image.hxx | 2 +
binfilter/bf_sfx2/source/inc/loadenv.hxx | 1
binfilter/bf_sfx2/source/inc/splitwin.hxx | 1
binfilter/bf_svx/source/editeng/impedit.hxx | 17 ++++++++++
binfilter/bf_svx/source/inc/fmpgeimp.hxx | 3 +
binfilter/bf_svx/source/inc/fmshimp.hxx | 6 +++
binfilter/bf_svx/source/inc/fmvwimp.hxx | 10 +++++
binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx | 2 +
binfilter/inc/bf_sfx2/bindings.hxx | 5 ++
binfilter/inc/bf_sfx2/frame.hxx | 4 ++
binfilter/inc/bf_sfx2/mnumgr.hxx | 2 +
binfilter/inc/bf_sfx2/objface.hxx | 2 +
binfilter/inc/bf_sfx2/tbxchild.hxx | 1
binfilter/inc/bf_sfx2/topfrm.hxx | 7 ++++
binfilter/inc/bf_sfx2/unoctitm.hxx | 2 +
binfilter/inc/bf_starmath/symbol.hxx | 4 ++
binfilter/inc/bf_starmath/view.hxx | 2 +
binfilter/inc/bf_svx/fmview.hxx | 7 ++++
binfilter/inc/bf_svx/svdedxv.hxx | 2 +
binfilter/inc/bf_svx/svdhdl.hxx | 2 +
binfilter/inc/bf_svx/svdobj.hxx | 4 ++
binfilter/inc/bf_svx/svdograf.hxx | 1
binfilter/inc/bf_svx/svdotext.hxx | 2 +
binfilter/inc/bf_svx/svdpagv.hxx | 5 ++
binfilter/inc/bf_svx/svdpntv.hxx | 6 +++
binfilter/inc/bf_svx/svdvmark.hxx | 5 +-
binfilter/inc/bf_svx/unoshape.hxx | 4 ++
binfilter/inc/bf_sw/fchrfmt.hxx | 1
binfilter/inc/bf_sw/fmtflcnt.hxx | 1
binfilter/inc/bf_sw/fmtfld.hxx | 1
binfilter/inc/bf_sw/fmtftn.hxx | 1
binfilter/inc/bf_sw/fmtinfmt.hxx | 1
binfilter/inc/bf_sw/fmtrfmrk.hxx | 2 +
binfilter/inc/bf_sw/fmtruby.hxx | 1
binfilter/inc/bf_sw/section.hxx | 1
binfilter/inc/bf_xmloff/xmlaustp.hxx | 1
inc/bf_sfx2/bindings.hxx | 0
inc/bf_sfx2/frame.hxx | 0
inc/bf_sfx2/mnumgr.hxx | 0
inc/bf_sfx2/objface.hxx | 0
inc/bf_sfx2/tbxchild.hxx | 0
inc/bf_sfx2/topfrm.hxx | 0
inc/bf_sfx2/unoctitm.hxx | 0
inc/bf_starmath/symbol.hxx | 0
inc/bf_starmath/view.hxx | 0
inc/bf_svx/fmview.hxx | 0
inc/bf_svx/svdedxv.hxx | 0
inc/bf_svx/svdhdl.hxx | 0
inc/bf_svx/svdobj.hxx | 0
inc/bf_svx/svdograf.hxx | 0
inc/bf_svx/svdotext.hxx | 0
inc/bf_svx/svdpagv.hxx | 0
inc/bf_svx/svdpntv.hxx | 0
inc/bf_svx/svdvmark.hxx | 0
inc/bf_svx/unoshape.hxx | 0
inc/bf_sw/fchrfmt.hxx | 0
inc/bf_sw/fmtflcnt.hxx | 0
inc/bf_sw/fmtfld.hxx | 0
inc/bf_sw/fmtftn.hxx | 0
inc/bf_sw/fmtinfmt.hxx | 0
inc/bf_sw/fmtrfmrk.hxx | 0
inc/bf_sw/fmtruby.hxx | 0
inc/bf_sw/section.hxx | 0
inc/bf_xmloff/xmlaustp.hxx | 0
inc/mapmod.hxx | 0
openoffice.org/automation/source/server/statemnt.hxx | 1
openoffice.org/basctl/source/inc/baside3.hxx | 1
openoffice.org/basctl/source/inc/bastypes.hxx | 1
openoffice.org/basctl/source/inc/dlgedobj.hxx | 1
openoffice.org/comphelper/inc/comphelper/propmultiplex.hxx | 2 +
openoffice.org/configmgr/source/api2/confproviderimpl2.hxx | 2 +
openoffice.org/configmgr/source/api2/providerimpl.hxx | 1
openoffice.org/connectivity/inc/connectivity/sqliterator.hxx | 2 -
openoffice.org/connectivity/source/inc/file/fcomp.hxx | 1
openoffice.org/dbaccess/source/core/dataaccess/ModelImpl.hxx | 3 +
openoffice.org/extensions/source/bibliography/framectr.hxx | 1
openoffice.org/extensions/source/bibliography/loadlisteneradapter.hxx | 2 +
openoffice.org/forms/source/component/clickableimage.hxx | 1
openoffice.org/padmin/source/padialog.hxx | 1
openoffice.org/psprint/inc/psprint/fontmanager.hxx | 2 +
openoffice.org/psprint/inc/psprint/printergfx.hxx | 1
openoffice.org/sc/source/ui/attrdlg/scdlgfact.hxx | 1
openoffice.org/sd/source/ui/inc/animobjs.hxx | 1
openoffice.org/sd/source/ui/inc/navigatr.hxx | 2 +
openoffice.org/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx | 1
openoffice.org/sfx2/inc/bindings.hxx | 1
openoffice.org/sfx2/inc/frame.hxx | 2 +
openoffice.org/sfx2/inc/ipclient.hxx | 1
openoffice.org/sfx2/inc/objface.hxx | 1
openoffice.org/sfx2/inc/topfrm.hxx | 2 +
openoffice.org/sfx2/inc/unoctitm.hxx | 1
openoffice.org/sfx2/source/doc/sfxbasemodel.cxx | 4 ++
openoffice.org/sfx2/source/inc/splitwin.hxx | 1
openoffice.org/so3/source/inplace/applet2.cxx | 3 +
openoffice.org/starmath/inc/symbol.hxx | 2 +
openoffice.org/starmath/inc/view.hxx | 1
openoffice.org/stoc/source/inspect/introspection.cxx | 1
openoffice.org/svtools/inc/ctrltool.hxx | 1
openoffice.org/svtools/inc/inettbc.hxx | 2 +
openoffice.org/svtools/inc/poolitem.hxx | 2 +
openoffice.org/svx/inc/float3d.hxx | 1
openoffice.org/svx/inc/fmgridcl.hxx | 1
openoffice.org/svx/inc/fmpage.hxx | 1
openoffice.org/svx/inc/fmview.hxx | 3 +
openoffice.org/svx/inc/graphctl.hxx | 1
openoffice.org/svx/inc/imapdlg.hxx | 1
openoffice.org/svx/inc/srchdlg.hxx | 1
openoffice.org/svx/inc/svdedxv.hxx | 1
openoffice.org/svx/inc/svdfppt.hxx | 1
openoffice.org/svx/inc/svdhdl.hxx | 1
openoffice.org/svx/inc/svdobj.hxx | 1
openoffice.org/svx/inc/svdograf.hxx | 1
openoffice.org/svx/inc/svdotext.hxx | 1
openoffice.org/svx/inc/svdpagv.hxx | 1
openoffice.org/svx/inc/svdpntv.hxx | 2 +
openoffice.org/svx/inc/svdvmark.hxx | 1
openoffice.org/svx/inc/unoedsrc.hxx | 1
openoffice.org/svx/inc/unoshape.hxx | 3 -
openoffice.org/svx/source/inc/fmpgeimp.hxx | 1
openoffice.org/svx/source/inc/fmvwimp.hxx | 3 +
openoffice.org/sw/inc/fchrfmt.hxx | 1
openoffice.org/sw/inc/fmtflcnt.hxx | 1
openoffice.org/sw/inc/fmtfld.hxx | 1
openoffice.org/sw/inc/fmtftn.hxx | 1
openoffice.org/sw/inc/fmtinfmt.hxx | 1
openoffice.org/sw/inc/fmtrfmrk.hxx | 2 +
openoffice.org/sw/inc/fmtruby.hxx | 1
openoffice.org/sw/inc/section.hxx | 1
openoffice.org/sw/source/core/access/accfrmobjslist.hxx | 2 +
openoffice.org/sw/source/core/inc/doctxm.hxx | 1
openoffice.org/tools/inc/fsys.hxx | 1
openoffice.org/ucb/source/core/ucbstore.hxx | 1
openoffice.org/vcl/inc/alpha.hxx | 1
openoffice.org/vcl/inc/bitmap.hxx | 1
openoffice.org/vcl/inc/outdev.hxx | 1
openoffice.org/xmloff/inc/xmlaustp.hxx | 1
openoffice.org/xmlsecurity/source/helper/xsecctl.hxx | 3 +
vcl/inc/mapmod.hxx | 1
146 files changed, 215 insertions(+), 6 deletions(-)
--- NEW FILE workspace.gcc4fwdecl.patch ---
--- openoffice.org/automation/source/server/statemnt.hxx.old 2004-11-09 17:52:53.000000000 +0100
+++ openoffice.org/automation/source/server/statemnt.hxx 2005-05-24 17:17:15.000000000 +0200
@@ -115,6 +115,7 @@
#endif
class Window;
+class SystemWindow;
class Point;
class SfxPoolItem;
--- openoffice.org/basctl/source/inc/baside3.hxx.old 2004-07-23 14:08:20.000000000 +0200
+++ openoffice.org/basctl/source/inc/baside3.hxx 2005-05-25 11:20:44.000000000 +0200
@@ -73,6 +73,7 @@
#include <com/sun/star/script/XLibraryContainer.hpp>
#endif
+class Printer;
class StarBASIC;
class SfxItemSet;
class DlgEditor;
--- openoffice.org/basctl/source/inc/bastypes.hxx.old 2004-07-23 14:08:34.000000000 +0200
+++ openoffice.org/basctl/source/inc/bastypes.hxx 2005-05-25 11:20:03.000000000 +0200
@@ -219,6 +219,7 @@
#define BASWIN_SUSPENDED 0x04
#define BASWIN_INRESCHEDULE 0x08
+class Printer;
class SfxUndoManager;
class SfxObjectShell;
class BasicEntryDescriptor;
--- openoffice.org/basctl/source/inc/dlgedobj.hxx.old 2004-12-10 18:03:18.000000000 +0100
+++ openoffice.org/basctl/source/inc/dlgedobj.hxx 2005-05-25 11:25:37.000000000 +0200
@@ -86,6 +86,7 @@
class DlgEdForm;
+class DlgEditor;
//============================================================================
// DlgEdObj
--- openoffice.org/comphelper/inc/comphelper/propmultiplex.hxx.old 2005-02-16 17:00:09.000000000 +0100
+++ openoffice.org/comphelper/inc/comphelper/propmultiplex.hxx 2005-05-23 14:04:11.000000000 +0200
@@ -81,6 +81,8 @@
{
//.........................................................................
+ class OPropertyChangeMultiplexer;
+
//==================================================================
//= OPropertyChangeListener
//==================================================================
--- openoffice.org/configmgr/source/api2/confproviderimpl2.hxx.old 2003-03-19 17:18:31.000000000 +0100
+++ openoffice.org/configmgr/source/api2/confproviderimpl2.hxx 2005-05-23 16:05:23.000000000 +0200
@@ -79,6 +79,8 @@
namespace uno = css::uno;
namespace script = css::script;
+ class OConfigurationProvider;
+
class OConfigurationProviderImpl : public OProviderImpl
{
friend class OConfigurationProvider;
--- openoffice.org/configmgr/source/api2/providerimpl.hxx.old 2004-11-15 14:35:31.000000000 +0100
+++ openoffice.org/configmgr/source/api2/providerimpl.hxx 2005-05-23 16:01:45.000000000 +0200
@@ -130,6 +130,7 @@
class IConfigDefaultProvider;
class TreeManager;
class ContextReader;
+ class OProvider;
struct IConfigBroadcaster;
--- openoffice.org/connectivity/source/inc/file/fcomp.hxx.old 2004-08-02 19:13:40.000000000 +0200
+++ openoffice.org/connectivity/source/inc/file/fcomp.hxx 2005-05-23 19:40:36.000000000 +0200
@@ -75,6 +75,7 @@
{
class OCode;
class OOperand;
+ class OSQLAnalyzer;
typedef::std::vector<OCode*> OCodeList;
class OPredicateCompiler : public ::vos::OReference
--- openoffice.org/connectivity/inc/connectivity/sqliterator.hxx.old 2005-01-05 12:59:09.000000000 +0100
+++ openoffice.org/connectivity/inc/connectivity/sqliterator.hxx 2005-05-23 19:35:22.000000000 +0200
@@ -99,7 +99,7 @@
{
class OSQLParseNode;
-
+ class OSQLParser;
enum OSQLStatementType {
SQL_STATEMENT_UNKNOWN,
--- openoffice.org/dbaccess/source/core/dataaccess/ModelImpl.hxx.old 2005-03-30 13:55:09.000000000 +0200
+++ openoffice.org/dbaccess/source/core/dataaccess/ModelImpl.hxx 2005-05-25 12:03:03.000000000 +0200
@@ -191,6 +191,9 @@
typedef ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XConnection > OWeakConnection;
typedef std::vector< OWeakConnection > OWeakConnectionArray;
+class ODatabaseContext;
+class OSharedConnectionManager;
+
//============================================================
//= ODatabaseModelImpl
//============================================================
--- openoffice.org/extensions/source/bibliography/framectr.hxx.old 2004-11-16 15:47:14.000000000 +0100
+++ openoffice.org/extensions/source/bibliography/framectr.hxx 2005-05-25 13:45:57.000000000 +0200
@@ -93,6 +93,7 @@
#include "bibmod.hxx"
class BibDataManager;
+class BibFrameCtrl_Impl;
namespace com{namespace sun{namespace star{
namespace form{
class XFormController;
--- openoffice.org/extensions/source/bibliography/loadlisteneradapter.hxx.old 2003-03-25 17:03:02.000000000 +0100
+++ openoffice.org/extensions/source/bibliography/loadlisteneradapter.hxx 2005-05-25 13:41:48.000000000 +0200
@@ -82,6 +82,8 @@
{
//.........................................................................
+ class OComponentAdapterBase;
+
//=====================================================================
//= OComponentListener
//=====================================================================
--- openoffice.org/forms/source/component/clickableimage.hxx.old 2005-04-13 11:46:26.000000000 +0200
+++ openoffice.org/forms/source/component/clickableimage.hxx 2005-05-25 17:56:53.000000000 +0200
@@ -117,6 +117,7 @@
{
//.........................................................................
+ class OImageProducerThread_Impl;
class SubmissionVetoListeners;
class ControlFeatureInterception;
//==================================================================
--- openoffice.org/padmin/source/padialog.hxx.old 2005-05-23 12:14:40.000000000 +0200
+++ openoffice.org/padmin/source/padialog.hxx 2005-05-23 18:23:23.000000000 +0200
@@ -94,6 +94,7 @@
// forward declaration
namespace psp { class PrinterInfoManager; }
+class Printer;
namespace padmin {
--- openoffice.org/psprint/inc/psprint/fontmanager.hxx.old 2005-01-31 09:58:54.000000000 +0100
+++ openoffice.org/psprint/inc/psprint/fontmanager.hxx 2005-05-23 16:56:15.000000000 +0200
@@ -243,6 +243,8 @@
KernPair() : first( 0 ), second( 0 ), kern_x( 0 ), kern_y( 0 ) {}
};
+class FontCache;
+
// a class to manage printable fonts
// aims are type1 and truetype fonts
--- openoffice.org/psprint/inc/psprint/printergfx.hxx.old 2004-09-08 16:00:04.000000000 +0200
+++ openoffice.org/psprint/inc/psprint/printergfx.hxx 2005-05-23 17:00:30.000000000 +0200
@@ -164,6 +164,7 @@
* forward declarations
*/
+class Font3;
class GlyphSet;
class PrinterJob;
class PrintFontManager;
--- openoffice.org/sc/source/ui/attrdlg/scdlgfact.hxx.old 2004-08-03 14:45:48.000000000 +0200
+++ openoffice.org/sc/source/ui/attrdlg/scdlgfact.hxx 2005-05-25 19:06:42.000000000 +0200
@@ -63,6 +63,7 @@
// include ---------------------------------------------------------------
#include "scabstdlg.hxx" //CHINA001
+class Dialog;
class ScImportAsciiDlg;
class ScAutoFormatDlg;
class ScColRowLabelDlg;
--- openoffice.org/sd/source/ui/inc/animobjs.hxx.old 2004-01-20 12:47:42.000000000 +0100
+++ openoffice.org/sd/source/ui/inc/animobjs.hxx 2005-05-26 10:28:30.000000000 +0200
@@ -107,6 +107,7 @@
namespace sd {
+class AnimationControllerItem;
class View;
//------------------------------------------------------------------------
--- openoffice.org/sd/source/ui/inc/navigatr.hxx.old 2004-11-26 21:17:53.000000000 +0100
+++ openoffice.org/sd/source/ui/inc/navigatr.hxx 2005-05-26 10:40:23.000000000 +0200
@@ -107,6 +107,8 @@
class View;
}
class Menu;
+class SdNavigatorControllerItem;
+class SdPageNameControllerItem;
//------------------------------------------------------------------------
--- openoffice.org/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx.old 2004-11-26 16:07:57.000000000 +0100
+++ openoffice.org/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx 2005-05-26 10:53:41.000000000 +0200
@@ -69,6 +69,7 @@
#include <utility>
class MapMode;
+class OutputDevice;
class Size;
namespace sd { namespace slidesorter { namespace view {
--- openoffice.org/sfx2/inc/bindings.hxx.old 2005-01-18 18:04:21.000000000 +0100
+++ openoffice.org/sfx2/inc/bindings.hxx 2005-05-24 15:13:41.000000000 +0200
@@ -110,6 +110,7 @@
class SfxItemSet;
class SfxDispatcher;
class SfxBindings;
+class SfxBindings_Impl;
class Timer;
struct SfxFoundCache_Impl;
class SfxFoundCacheArr_Impl;
--- openoffice.org/sfx2/inc/frame.hxx.old 2005-01-18 16:52:43.000000000 +0100
+++ openoffice.org/sfx2/inc/frame.hxx 2005-05-24 15:10:40.000000000 +0200
@@ -192,6 +192,8 @@
class SfxFrameArr_Impl;
class SfxCancelManager;
+struct SfxFramePickEntry_Impl;
+class SfxUnoFrame;
class SFX2_DLLPUBLIC SfxFrame
{
friend class SfxFrameIterator;
--- openoffice.org/sfx2/inc/ipclient.hxx.old 2005-03-15 12:46:53.000000000 +0100
+++ openoffice.org/sfx2/inc/ipclient.hxx 2005-05-24 15:51:10.000000000 +0200
@@ -87,6 +87,7 @@
#include <objsh.hxx>
+class SfxInPlaceClient_Impl;
class SfxViewShell;
class SfxObjectShell;
class Window;
--- openoffice.org/sfx2/inc/objface.hxx.old 2005-01-11 15:47:24.000000000 +0100
+++ openoffice.org/sfx2/inc/objface.hxx 2005-05-24 15:22:56.000000000 +0200
@@ -86,6 +86,7 @@
struct SfxInterface_Impl;
class SfxConfigManager;
class SfxConfigItem;
+class SfxIFConfig_Impl;
class SfxObjectUIArr_Impl ;
class SfxModule;
class SvStream;
--- openoffice.org/sfx2/source/doc/sfxbasemodel.cxx.old 2005-04-28 17:08:47.000000000 +0200
+++ openoffice.org/sfx2/source/doc/sfxbasemodel.cxx 2005-05-24 17:43:55.000000000 +0200
@@ -3491,6 +3491,10 @@
m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const REFERENCE< XPRINTJOBLISTENER >*)0), xListener );
}
+// simple declaration of class SvObject is enough
+// the corresponding <so3/iface.hxx> cannon be included because it provides
+// declaration of class SvBorder that conflicts with ../../inc/viewfrm.hxx
+class SvObject;
sal_Int64 SAL_CALL SfxBaseModel::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException)
{
::vos::OGuard aGuard( Application::GetSolarMutex() );
--- openoffice.org/sfx2/source/inc/splitwin.hxx.old 2001-09-06 09:46:05.000000000 +0200
+++ openoffice.org/sfx2/source/inc/splitwin.hxx 2005-05-24 15:47:22.000000000 +0200
@@ -69,6 +69,7 @@
class SfxWorkWindow;
class SfxDockingWindow;
class SfxDockArr_Impl;
+class SfxEmptySplitWin_Impl;
struct SfxDock_Impl;
class SfxSplitWindow : public SplitWindow
--- openoffice.org/sfx2/inc/topfrm.hxx.old 2005-01-11 15:53:45.000000000 +0100
+++ openoffice.org/sfx2/inc/topfrm.hxx 2005-05-24 15:20:24.000000000 +0200
@@ -85,6 +85,7 @@
class SfxViewShell;
class SfxTopFrame;
+class SfxTopFrame_Impl;
namespace svtools { class AsynchronLink; }
// class SfxTopFrame -----------------------------------------------------
@@ -128,6 +129,7 @@
// class SfxTopViewFrame -------------------------------------------------
+class SfxTopViewFrame_Impl;
class SFX2_DLLPUBLIC SfxTopViewFrame : public SfxViewFrame
{
friend class SfxTopWindow_Impl;
--- openoffice.org/sfx2/inc/unoctitm.hxx.old 2005-01-27 10:46:21.000000000 +0100
+++ openoffice.org/sfx2/inc/unoctitm.hxx 2005-05-24 14:59:00.000000000 +0200
@@ -181,6 +181,7 @@
};
class SfxSlotServer;
+class SfxDispatchController_Impl;
class SfxOfficeDispatch : public SfxStatusDispatcher
, public ::com::sun::star::lang::XUnoTunnel
{
--- openoffice.org/so3/source/inplace/applet2.cxx.old 2003-03-27 12:28:14.000000000 +0100
+++ openoffice.org/so3/source/inplace/applet2.cxx 2005-05-24 17:03:03.000000000 +0200
@@ -95,6 +95,9 @@
#define SoResId( id ) ResId( id, SOAPP->GetResMgr() )
+// forward declarations
+class SvAppletEnvironment;
+
//=========================================================================
//=========================================================================
//=========================================================================
--- openoffice.org/starmath/inc/symbol.hxx.old 2005-04-04 10:03:27.000000000 +0200
+++ openoffice.org/starmath/inc/symbol.hxx 2005-05-26 12:04:16.000000000 +0200
@@ -95,6 +95,8 @@
#define SYMBOLSET_NONE 0xFFFF
#define SYMBOL_NONE 0xFFFF
+class SmSymSetManager;
+
////////////////////////////////////////////////////////////////////////////////
inline const String GetExportSymbolName( const String &rUiSymbolName )
--- openoffice.org/starmath/inc/view.hxx.old 2003-04-24 19:29:12.000000000 +0200
+++ openoffice.org/starmath/inc/view.hxx 2005-05-26 12:01:10.000000000 +0200
@@ -98,6 +98,7 @@
class Menu;
class DataChangedEvent;
+class SmClipboardChangeListener;
class SmDocShell;
class SmViewShell;
--- openoffice.org/stoc/source/inspect/introspection.cxx.old 2004-04-21 15:28:52.000000000 +0200
+++ openoffice.org/stoc/source/inspect/introspection.cxx 2005-05-23 15:19:37.000000000 +0200
@@ -239,6 +239,7 @@
LowerToExactNameMap;
+class ImplIntrospectionAccess;
class IntrospectionAccessStatic_Impl
{
friend class ImplIntrospection;
--- openoffice.org/svtools/inc/ctrltool.hxx.old 2005-04-13 12:04:30.000000000 +0200
+++ openoffice.org/svtools/inc/ctrltool.hxx 2005-05-24 13:58:03.000000000 +0200
@@ -77,6 +77,7 @@
#endif
class ImplFontListNameInfo;
+class OutputDevice;
/*************************************************************************
--- openoffice.org/svtools/inc/inettbc.hxx.old 2005-04-13 12:16:04.000000000 +0200
+++ openoffice.org/svtools/inc/inettbc.hxx 2005-05-23 18:50:07.000000000 +0200
@@ -80,6 +80,8 @@
#endif
class IUrlFilter;
+class SvtMatchContext_Impl;
+class SvtURLBox_Impl;
class SVT_DLLPUBLIC SvtURLBox : public ComboBox
{
friend class SvtMatchContext_Impl;
--- openoffice.org/svtools/inc/poolitem.hxx.old 2005-04-14 20:42:40.000000000 +0200
+++ openoffice.org/svtools/inc/poolitem.hxx 2005-05-23 18:45:44.000000000 +0200
@@ -213,6 +213,8 @@
DBG_NAMEEX(SfxItemHandle);
class SvXMLUnitConverter;
+class SfxItemPool;
+class SfxItemSet;
class String;
namespace rtl
--- openoffice.org/svx/inc/float3d.hxx.old 2005-01-21 15:29:03.000000000 +0100
+++ openoffice.org/svx/inc/float3d.hxx 2005-05-24 19:13:36.000000000 +0200
@@ -112,6 +112,7 @@
class VirtualDevice;
class E3dView;
class SdrPageView;
+class Svx3DCtrlItem;
class SvxConvertTo3DItem;
//------------------------------------------------------------------------
--- openoffice.org/svx/inc/fmgridcl.hxx.old 2005-01-21 15:30:31.000000000 +0100
+++ openoffice.org/svx/inc/fmgridcl.hxx 2005-05-24 19:24:52.000000000 +0200
@@ -149,6 +149,7 @@
//==================================================================
// FmGridControl
//==================================================================
+class FmXGridPeer;
class SVX_DLLPUBLIC FmGridControl : public DbGridControl
{
--- openoffice.org/svx/inc/fmpage.hxx.old 2005-03-18 19:42:22.000000000 +0100
+++ openoffice.org/svx/inc/fmpage.hxx 2005-05-24 18:53:28.000000000 +0200
@@ -81,6 +81,7 @@
//FORWARD_DECLARE_INTERFACE(uno,Reference)
FORWARD_DECLARE_INTERFACE(container,XNameContainer)
+class SdrView;
class SfxJSArray;
class HelpEvent;
--- openoffice.org/svx/source/inc/fmpgeimp.hxx.old 2005-03-18 19:43:38.000000000 +0100
+++ openoffice.org/svx/source/inc/fmpgeimp.hxx 2005-05-24 19:36:48.000000000 +0200
@@ -99,6 +99,7 @@
class SvStream;
//BFS01class SdrIOHeader;
class FmFormObj;
+class FmFormPage;
class SdrObject;
//FORWARD_DECLARE_INTERFACE(uno,Reference)
--- openoffice.org/svx/inc/fmview.hxx.old 2005-03-23 12:48:29.000000000 +0100
+++ openoffice.org/svx/inc/fmview.hxx 2005-05-24 19:22:07.000000000 +0200
@@ -85,7 +85,10 @@
class XOutputDevice;
class FmFormModel;
class FmPageViewWinRec;
+class FmFormObj;
class FmFormPage;
+class FmFormShell;
+class FmXFormView;
namespace svx {
class ODataAccessDescriptor;
--- openoffice.org/svx/source/inc/fmvwimp.hxx.old 2005-03-23 12:51:41.000000000 +0100
+++ openoffice.org/svx/source/inc/fmvwimp.hxx 2005-05-24 19:34:28.000000000 +0200
@@ -121,6 +121,8 @@
class SdrObject;
class FmFormObj;
class FmFormModel;
+class FmFormView;
+class FmFormShell;
class Window;
class OutputDevice;
@@ -130,6 +132,7 @@
FORWARD_DECLARE_INTERFACE(util,XNumberFormats)
class FmXFormController;
+class FmXFormView;
namespace svx {
class ODataAccessDescriptor;
--- openoffice.org/svx/inc/graphctl.hxx.old 2005-01-21 15:43:28.000000000 +0100
+++ openoffice.org/svx/inc/graphctl.hxx 2005-05-24 18:40:30.000000000 +0200
@@ -83,6 +83,7 @@
|*
\************************************************************************/
+class GraphCtrlUserCall;
class SvxGraphCtrlAccessibleContext;
#define WB_SDRMODE ((WinBits)0x0080)
--- openoffice.org/svx/inc/imapdlg.hxx.old 2005-01-21 15:47:38.000000000 +0100
+++ openoffice.org/svx/inc/imapdlg.hxx 2005-05-24 18:58:04.000000000 +0200
@@ -166,6 +166,7 @@
\************************************************************************/
class IMapOwnData;
+class IMapWindow;
class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow
{
--- openoffice.org/svx/inc/srchdlg.hxx.old 2005-02-25 14:05:14.000000000 +0100
+++ openoffice.org/svx/inc/srchdlg.hxx 2005-05-24 18:50:12.000000000 +0200
@@ -119,6 +119,7 @@
class MoreButton;
class SfxStyleSheetBasePool;
class SvxJSearchOptionsPage;
+class SvxSearchController;
struct SearchDlg_Impl;
--- openoffice.org/svx/inc/svdedxv.hxx.old 2005-01-21 16:22:33.000000000 +0100
+++ openoffice.org/svx/inc/svdedxv.hxx 2005-05-24 18:27:34.000000000 +0200
@@ -82,6 +82,7 @@
class OutlinerView;
class EditStatus;
class EditFieldInfo;
+class ImpSdrEditPara;
namespace com { namespace sun { namespace star { namespace uno {
class Any;
--- openoffice.org/svx/inc/svdfppt.hxx.old 2005-01-21 18:34:03.000000000 +0100
+++ openoffice.org/svx/inc/svdfppt.hxx 2005-05-24 19:57:37.000000000 +0200
@@ -131,6 +131,7 @@
class Graphic;
class SvxMSDffManager;
class PptTextMetaCharList;
+class PPTTextObj;
class DffRecordHeader;
struct PptCharAttrSet;
class SvxBulletItem;
--- openoffice.org/svx/inc/svdhdl.hxx.old 2005-01-28 18:08:25.000000000 +0100
+++ openoffice.org/svx/inc/svdhdl.hxx 2005-05-24 18:21:05.000000000 +0200
@@ -103,6 +103,7 @@
class Region;
class Window;
class SdrHdlList;
+class SdrMarkView;
class SdrObject;
class SdrPageView;
class SdrHdlBitmapSet;
--- openoffice.org/svx/inc/svdobj.hxx.old 2005-01-21 16:26:33.000000000 +0100
+++ openoffice.org/svx/inc/svdobj.hxx 2005-05-24 18:14:12.000000000 +0200
@@ -162,6 +162,7 @@
class PolyPolygon;
class SfxPoolItem;
class SdrLineGeometry;
+class SdrVirtObj;
namespace sdr
{
--- openoffice.org/svx/inc/svdograf.hxx.old 2005-01-21 16:27:35.000000000 +0100
+++ openoffice.org/svx/inc/svdograf.hxx 2005-05-24 18:44:31.000000000 +0200
@@ -122,6 +122,7 @@
// --------------
class GraphicObject;
+class SdrGraphicLink;
//BFS01class SdrGrafSetItem;
class SVX_DLLPUBLIC SdrGrafObj: public SdrRectObj
--- openoffice.org/svx/inc/svdotext.hxx.old 2005-01-28 17:29:23.000000000 +0100
+++ openoffice.org/svx/inc/svdotext.hxx 2005-05-24 18:17:37.000000000 +0200
@@ -98,6 +98,7 @@
class OutlinerParaObject;
class SdrOutliner;
+class SdrTextObj;
class SvxFieldItem;
class ImpSdrObjTextLink;
--- openoffice.org/svx/inc/svdpagv.hxx.old 2005-01-21 16:30:39.000000000 +0100
+++ openoffice.org/svx/inc/svdpagv.hxx 2005-05-24 19:10:44.000000000 +0200
@@ -126,6 +126,7 @@
class SdrPageObj;
class B2dIAOManager;
class SdrPageView;
+class SdrView;
// #110094#
namespace sdr
--- openoffice.org/svx/inc/svdpntv.hxx.old 2005-01-28 17:29:36.000000000 +0100
+++ openoffice.org/svx/inc/svdpntv.hxx 2005-05-24 20:11:49.000000000 +0200
@@ -126,6 +126,7 @@
class XControlContainer;
}}}}
+class SdrPage;
class SdrPageViewWindow;
class OutputDevice;
@@ -139,6 +140,7 @@
class SdrOle2Obj;
class SdrItemBrowser;
class SdrObject;
+class SdrViewUserMarker;
class B2dIAOManager;
namespace sdr
--- openoffice.org/svx/inc/svdvmark.hxx.old 2005-01-21 16:33:11.000000000 +0100
+++ openoffice.org/svx/inc/svdvmark.hxx 2005-05-24 20:28:02.000000000 +0200
@@ -82,6 +82,7 @@
class XPolyPolygon;
class SdrObject;
class SdrPageView;
+class SdrPaintView;
//************************************************************
// Defines
--- openoffice.org/svx/inc/unoedsrc.hxx.old 2005-01-21 16:43:12.000000000 +0100
+++ openoffice.org/svx/inc/unoedsrc.hxx 2005-05-24 18:32:53.000000000 +0200
@@ -100,6 +100,7 @@
struct ESelection;
struct EFieldInfo;
struct EBulletInfo;
+class OutputDevice;
class String;
class SfxItemSet;
class SvUShorts;
--- openoffice.org/svx/inc/unoshape.hxx.old 2005-04-12 18:53:20.000000000 +0200
+++ openoffice.org/svx/inc/unoshape.hxx 2005-05-24 18:29:46.000000000 +0200
@@ -151,6 +151,7 @@
class SfxItemSet;
class SdrObject;
class SdrModel;
+class SvxDrawPage;
class SvxShapeList;
class SvGlobalName;
@@ -441,8 +442,6 @@
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
};
-class SvxDrawPage;
-
#ifndef _COM_SUN_STAR_DRAWING_XSHAPES_HPP_
#include <com/sun/star/drawing/XShapes.hpp>
#endif
--- openoffice.org/sw/source/core/access/accfrmobjslist.hxx.old 2002-04-11 15:45:32.000000000 +0200
+++ openoffice.org/sw/source/core/access/accfrmobjslist.hxx 2005-05-26 13:30:40.000000000 +0200
@@ -65,6 +65,8 @@
#include <accfrmobj.hxx>
#endif
+class SwFrmOrObjSList;
+
class SwFrmOrObjSList_const_iterator
{
friend class SwFrmOrObjSList;
--- openoffice.org/sw/source/core/inc/doctxm.hxx.old 2003-04-17 12:11:02.000000000 +0200
+++ openoffice.org/sw/source/core/inc/doctxm.hxx 2005-05-26 15:34:25.000000000 +0200
@@ -80,6 +80,7 @@
class SvUShorts;
class SvStringsDtor;
class SvPtrarr;
+class SwPageDesc;
class SwTxtNode;
class SwTxtFmtColl;
struct SwPosition;
--- openoffice.org/sw/inc/fchrfmt.hxx.old 2005-01-05 16:47:36.000000000 +0100
+++ openoffice.org/sw/inc/fchrfmt.hxx 2005-05-26 13:50:17.000000000 +0200
@@ -73,6 +73,7 @@
#endif
class SwCharFmt;
+class SwTxtCharFmt;
class IntlWrapper;
// ATT_CHARFMT *********************************************
--- openoffice.org/sw/inc/fmtflcnt.hxx.old 2005-01-05 16:50:02.000000000 +0100
+++ openoffice.org/sw/inc/fmtflcnt.hxx 2005-05-26 13:38:47.000000000 +0200
@@ -67,6 +67,7 @@
#endif
class SwFrmFmt;
+class SwTxtFlyCnt;
// ATT_FLYCNT *******************************************************
class SwFmtFlyCnt : public SfxPoolItem
--- openoffice.org/sw/inc/fmtfld.hxx.old 2005-01-05 16:50:21.000000000 +0100
+++ openoffice.org/sw/inc/fmtfld.hxx 2005-05-26 13:43:32.000000000 +0200
@@ -73,6 +73,7 @@
#endif
class SwField;
+class SwTxtFld;
// ATT_FLD ***********************************
class SW_DLLPUBLIC SwFmtFld : public SfxPoolItem, public SwClient
--- openoffice.org/sw/inc/fmtftn.hxx.old 2005-01-05 16:51:33.000000000 +0100
+++ openoffice.org/sw/inc/fmtftn.hxx 2005-05-26 13:48:14.000000000 +0200
@@ -73,6 +73,7 @@
#endif
class SwDoc;
+class SwTxtFtn;
// ATT_FTN **********************************************************
--- openoffice.org/sw/inc/fmtinfmt.hxx.old 2005-01-05 16:52:53.000000000 +0100
+++ openoffice.org/sw/inc/fmtinfmt.hxx 2005-05-26 13:36:26.000000000 +0200
@@ -75,6 +75,7 @@
class SvxMacro;
class SvxMacroTableDtor;
+class SwTxtINetFmt;
class IntlWrapper;
// ATT_INETFMT *********************************************
--- openoffice.org/sw/inc/fmtrfmrk.hxx.old 2005-01-05 16:54:31.000000000 +0100
+++ openoffice.org/sw/inc/fmtrfmrk.hxx 2005-05-26 13:46:02.000000000 +0200
@@ -69,6 +69,8 @@
#include <svtools/poolitem.hxx>
#endif
+class SwTxtRefMark;
+
// ATT_REFMARK *******************************************************
class SwFmtRefMark : public SfxPoolItem
--- openoffice.org/sw/inc/fmtruby.hxx.old 2005-01-05 16:55:07.000000000 +0100
+++ openoffice.org/sw/inc/fmtruby.hxx 2005-05-26 13:52:18.000000000 +0200
@@ -69,6 +69,7 @@
#include <svtools/poolitem.hxx>
#endif
+class SwTxtRuby;
class SwFmtRuby : public SfxPoolItem
{
--- openoffice.org/sw/inc/section.hxx.old 2004-11-16 11:19:29.000000000 +0100
+++ openoffice.org/sw/inc/section.hxx 2005-05-26 13:33:53.000000000 +0200
@@ -86,6 +86,7 @@
class SwSectionFmt;
class SwDoc;
class SwSection;
+class SwSectionNode;
class SwTOXBase;
#ifndef SW_DECL_SWSERVEROBJECT_DEFINED
--- openoffice.org/tools/inc/fsys.hxx.old 2005-04-13 13:59:10.000000000 +0200
+++ openoffice.org/tools/inc/fsys.hxx 2005-05-23 14:23:13.000000000 +0200
@@ -498,6 +498,7 @@
// - Dir -
// -------
+struct DirReader_Impl;
class TOOLS_DLLPUBLIC Dir : public DirEntry
{
friend struct DirReader_Impl;
--- openoffice.org/ucb/source/core/ucbstore.hxx.old 2000-12-10 16:13:04.000000000 +0100
+++ openoffice.org/ucb/source/core/ucbstore.hxx 2005-05-23 17:12:47.000000000 +0200
@@ -169,6 +169,7 @@
//=========================================================================
struct PropertySetRegistry_Impl;
+class PersistentPropertySet;
class PropertySetRegistry :
public cppu::OWeakObject,
--- openoffice.org/vcl/inc/alpha.hxx.old 2005-01-13 18:25:24.000000000 +0100
+++ openoffice.org/vcl/inc/alpha.hxx 2005-05-23 17:41:31.000000000 +0200
@@ -75,6 +75,7 @@
// -------------
class ImageList;
+class BitmapEx;
class VCL_DLLPUBLIC AlphaMask : private Bitmap
{
--- openoffice.org/vcl/inc/bitmap.hxx.old 2005-03-10 14:12:51.000000000 +0100
+++ openoffice.org/vcl/inc/bitmap.hxx 2005-05-23 17:37:02.000000000 +0200
@@ -276,6 +276,7 @@
class RMBitmap;
class GDIMetaFile;
class AlphaMask;
+class OutputDevice;
struct BitmapSystemData
{
--- openoffice.org/vcl/inc/outdev.hxx.old 2005-03-29 13:45:06.000000000 +0200
+++ openoffice.org/vcl/inc/outdev.hxx 2005-05-23 17:45:23.000000000 +0200
@@ -130,6 +130,7 @@
class FontCharMap;
class SalLayout;
class ImplLayoutArgs;
+class VirtualDevice;
#ifndef _COM_SUN_STAR_UNO_REFERENCE_H_
#include <com/sun/star/uno/Reference.h>
--- openoffice.org/xmloff/inc/xmlaustp.hxx.old 2005-01-11 15:20:53.000000000 +0100
+++ openoffice.org/xmloff/inc/xmlaustp.hxx 2005-05-24 10:41:50.000000000 +0200
@@ -84,6 +84,7 @@
class SvXMLExportPropertyMapper;
class SvXMLNamespaceMap;
+class SvXMLAutoStylePoolP_Impl;
class SvXMLAttributeList;
class SvXMLExport;
namespace com { namespace sun { namespace star { namespace uno
--- openoffice.org/xmlsecurity/source/helper/xsecctl.hxx.old 2005-03-10 19:08:35.000000000 +0100
+++ openoffice.org/xmlsecurity/source/helper/xsecctl.hxx 2005-05-27 11:05:23.000000000 +0200
@@ -154,6 +154,9 @@
#define RTL_ASCII_USTRINGPARAM( asciiStr ) asciiStr, strlen( asciiStr ), RTL_TEXTENCODING_ASCII_US
+// forward declaration
+class XSecParser;
+
class InternalSignatureInformation
{
public:
Index: inc/mapmod.hxx
===================================================================
RCS file: /cvs/gsl/vcl/inc/mapmod.hxx,v
retrieving revision 1.3
diff -u -p -r1.3 mapmod.hxx
--- openoffice.org.orig/vcl/inc/mapmod.hxx 13 Jan 2005 17:39:52 -0000 1.3
+++ openoffice.org/vcl/inc/mapmod.hxx 1 Jun 2005 17:00:11 -0000
@@ -85,6 +85,7 @@
#endif
class SvStream;
+class OutputDevice;
// --------------
// - ImplMapMode -
Index: bf_forms/source/component/Image.hxx
===================================================================
RCS file: /cvs/framework/binfilter/bf_forms/source/component/Image.hxx,v
retrieving revision 1.4
diff -u -p -u -r1.4 Image.hxx
--- openoffice.org.orig/binfilter/bf_forms/source/component/Image.hxx 14 Apr 2005 15:33:27 -0000 1.4
+++ openoffice.org/binfilter/bf_forms/source/component/Image.hxx 8 Jun 2005 21:57:54 -0000
@@ -198,6 +198,8 @@ protected:
typedef ::cppu::ImplHelper2< ::com::sun::star::form::XApproveActionBroadcaster,
::com::sun::star::beans::XPropertyChangeListener> OImageControl_BASE;
+class OImageControlThread_Impl;
+
class OImageControl : public OImageControl_BASE,
public OControl
{
Index: bf_sfx2/source/inc/loadenv.hxx
===================================================================
RCS file: /cvs/framework/binfilter/bf_sfx2/source/inc/loadenv.hxx,v
retrieving revision 1.2
diff -u -p -u -r1.2 loadenv.hxx
--- openoffice.org.orig/binfilter/bf_sfx2/source/inc/loadenv.hxx 6 Nov 2003 07:39:55 -0000 1.2
+++ openoffice.org/binfilter/bf_sfx2/source/inc/loadenv.hxx 8 Jun 2005 22:21:07 -0000
@@ -90,6 +90,7 @@ SV_DECL_REF( LoadEnvironment_Impl )
class SfxMedium;
class SfxFrame;
class SfxFilterMatcher;
+class SfxLoadEnvironment;
class LoadEnvironment_Impl : public SvRefBase, public SfxListener
{
Index: bf_sfx2/source/inc/splitwin.hxx
===================================================================
RCS file: /cvs/framework/binfilter/bf_sfx2/source/inc/splitwin.hxx,v
retrieving revision 1.2
diff -u -p -u -r1.2 splitwin.hxx
--- openoffice.org.orig/binfilter/bf_sfx2/source/inc/splitwin.hxx 6 Nov 2003 07:40:05 -0000 1.2
+++ openoffice.org/binfilter/bf_sfx2/source/inc/splitwin.hxx 8 Jun 2005 22:21:09 -0000
@@ -71,6 +71,7 @@ class SfxWorkWindow;
class SfxDockingWindow;
class SfxDockArr_Impl;
struct SfxDock_Impl;
+class SfxEmptySplitWin_Impl;
class SfxSplitWindow : public SplitWindow
{
Index: bf_svx/source/editeng/impedit.hxx
===================================================================
RCS file: /cvs/framework/binfilter/bf_svx/source/editeng/impedit.hxx,v
retrieving revision 1.3
diff -u -p -u -r1.3 impedit.hxx
--- openoffice.org.orig/binfilter/bf_svx/source/editeng/impedit.hxx 18 Nov 2003 19:23:47 -0000 1.3
+++ openoffice.org/binfilter/bf_svx/source/editeng/impedit.hxx 8 Jun 2005 22:25:43 -0000
@@ -422,6 +422,23 @@ public:
typedef EditView* EditViewPtr;
SV_DECL_PTRARR( EditViews, EditViewPtr, 0, 1 )//STRIP008 ;
+class EditUndoInsertChars;
+class EditUndoRemoveChars;
+class EditUndoDelContent;
+class EditUndoConnectParas;
+class EditUndoSplitPara;
+class EditUndoInsertFeature;
+class EditUndoMoveParagraphs;
+
+class EditView;
+class ImpEditView;
+class EditEngine; // Fuer Zugriff auf Imp-Methoden
+class EditRTFParser; // Fuer Zugriff auf Imp-Methoden
+class EditHTMLParser; // Fuer Zugriff auf Imp-Methoden
+class EdtAutoCorrDoc; // Fuer Zugriff auf Imp-Methoden
+class EditDbg; // DebugRoutinen
+
+
class ImpEditEngine : public SfxListener
{
// Die Undos muessen direkt manipulieren ( private-Methoden ),
Index: bf_svx/source/inc/fmpgeimp.hxx
===================================================================
RCS file: /cvs/framework/binfilter/bf_svx/source/inc/fmpgeimp.hxx,v
retrieving revision 1.2
diff -u -p -u -r1.2 fmpgeimp.hxx
--- openoffice.org.orig/binfilter/bf_svx/source/inc/fmpgeimp.hxx 6 Nov 2003 07:44:25 -0000 1.2
+++ openoffice.org/binfilter/bf_svx/source/inc/fmpgeimp.hxx 8 Jun 2005 22:28:02 -0000
@@ -115,6 +115,9 @@ DECLARE_LIST(FmObjectList, FmFormObj*)//
// lauscht an allen Containern, um festzustellen, wann Objecte
// eingefuegt worden sind und wann diese entfernt wurden
//==================================================================
+class FmFormPage;
+class FmFormObj;
+class FmXFormShell;
class FmFormPageImpl
{
Index: bf_svx/source/inc/fmshimp.hxx
===================================================================
RCS file: /cvs/framework/binfilter/bf_svx/source/inc/fmshimp.hxx,v
retrieving revision 1.3
diff -u -p -u -r1.3 fmshimp.hxx
--- openoffice.org.orig/binfilter/bf_svx/source/inc/fmshimp.hxx 3 Aug 2004 15:57:15 -0000 1.3
+++ openoffice.org/binfilter/bf_svx/source/inc/fmshimp.hxx 8 Jun 2005 22:28:04 -0000
@@ -323,6 +323,12 @@ protected:
typedef FmXFormShell_Base_Disambiguation FmXFormShell_BASE;
typedef ::utl::ConfigItem FmXFormShell_CFGBASE;
+class FmFormShell;
+class FmFormView;
+class WizardUsageConfigItem;
+class SuspendPropertyTracking;
+class SuspendPropertyTracking;
+
class FmXFormShell :public FmXFormShell_BASE
,public FmXFormShell_CFGBASE
,public FmDispatchInterceptor
Index: bf_svx/source/inc/fmvwimp.hxx
===================================================================
RCS file: /cvs/framework/binfilter/bf_svx/source/inc/fmvwimp.hxx,v
retrieving revision 1.3
diff -u -p -u -r1.3 fmvwimp.hxx
--- openoffice.org.orig/binfilter/bf_svx/source/inc/fmvwimp.hxx 3 Aug 2004 15:58:20 -0000 1.3
+++ openoffice.org/binfilter/bf_svx/source/inc/fmvwimp.hxx 8 Jun 2005 22:28:06 -0000
@@ -138,6 +138,8 @@ namespace svx {
class ODataAccessDescriptor;
}
+class FmXFormView;
+
//==================================================================
// FmXPageViewWinRec
//==================================================================
@@ -183,6 +185,14 @@ protected:
};
typedef vector<FmXPageViewWinRec*> FmWinRecList;
+
+class FmFormView;
+class FmFormShell;
+class FmXFormShell;
+class FmXPageViewWinRec;
+class ObjectRemoveListener;
+class ObjectRemoveListener;
+
//==================================================================
// FmXFormView
//==================================================================
Index: bf_sw/source/core/sw3io/sw_sw3style.cxx
===================================================================
RCS file: /cvs/framework/binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx,v
retrieving revision 1.6
diff -u -p -u -r1.6 sw_sw3style.cxx
--- openoffice.org.orig/binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx 3 Aug 2004 17:44:58 -0000 1.6
+++ openoffice.org/binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx 8 Jun 2005 22:39:40 -0000
@@ -161,6 +161,8 @@ SV_DECL_PTRARR_DEL( SwStyleCondColls, Sw
// Unsere Ableitungen der Klassen SfxStyleSheetBase und SfxStyleSheetBasePool
+class SwStyleSheetPool;
+
class SwStyleSheet : public SfxStyleSheetBase {
friend class SwStyleSheetPool;
SfxItemSet aSet; // Set fuer Load/Store
Index: inc/bf_sfx2/bindings.hxx
===================================================================
RCS file: /cvs/framework/binfilter/inc/bf_sfx2/bindings.hxx,v
retrieving revision 1.2
diff -u -p -u -r1.2 bindings.hxx
--- openoffice.org.orig/binfilter/inc/bf_sfx2/bindings.hxx 6 Nov 2003 08:26:08 -0000 1.2
+++ openoffice.org/binfilter/inc/bf_sfx2/bindings.hxx 8 Jun 2005 22:55:23 -0000
@@ -167,6 +167,11 @@ enum SfxPopupAction
//====================================================================
class SfxImageManager;
+class SfxApplication;
+class SfxShell;
+class SfxSlotInterceptor;
+class SfxBindings_Impl;
+
class SfxBindings: public SfxBroadcaster
/* [Beschreibung]
Index: inc/bf_sfx2/frame.hxx
===================================================================
RCS file: /cvs/framework/binfilter/inc/bf_sfx2/frame.hxx,v
retrieving revision 1.4
diff -u -p -u -r1.4 frame.hxx
--- openoffice.org.orig/binfilter/inc/bf_sfx2/frame.hxx 3 Aug 2004 20:57:02 -0000 1.4
+++ openoffice.org/binfilter/inc/bf_sfx2/frame.hxx 8 Jun 2005 22:55:29 -0000
@@ -183,6 +183,10 @@ DECLARE_LIST( TargetList, String* )//STR
//==========================================================================
class SfxFrameArr_Impl;
+class SfxFrameIterator;
+class SfxUnoFrame;
+class SfxViewFrame; /*HACK!*/
+
class SfxFrame
{
friend class SfxFrameIterator;
Index: inc/bf_sfx2/mnumgr.hxx
===================================================================
RCS file: /cvs/framework/binfilter/inc/bf_sfx2/mnumgr.hxx,v
retrieving revision 1.2
diff -u -p -u -r1.2 mnumgr.hxx
--- openoffice.org.orig/binfilter/inc/bf_sfx2/mnumgr.hxx 6 Nov 2003 08:26:19 -0000 1.2
+++ openoffice.org/binfilter/inc/bf_sfx2/mnumgr.hxx 8 Jun 2005 22:55:32 -0000
@@ -84,6 +84,8 @@ class PopupMenu;
class ResId;
class SvVerbList;
class Point;
+class SystemWindow;
+
namespace binfilter {
class SfxMenuCfgItemArr;
Index: inc/bf_sfx2/objface.hxx
===================================================================
RCS file: /cvs/framework/binfilter/inc/bf_sfx2/objface.hxx,v
retrieving revision 1.3
diff -u -p -u -r1.3 objface.hxx
--- openoffice.org.orig/binfilter/inc/bf_sfx2/objface.hxx 13 Feb 2004 14:31:02 -0000 1.3
+++ openoffice.org/binfilter/inc/bf_sfx2/objface.hxx 8 Jun 2005 22:55:33 -0000
@@ -79,6 +79,8 @@ class SfxConfigManager;
class SfxConfigItem;
class SfxObjectUIArr_Impl ;
class SfxModule;
+class SfxIFConfig_Impl;
+class SfxSlotPool;
class SfxInterface
{
Index: inc/bf_sfx2/tbxchild.hxx
===================================================================
RCS file: /cvs/framework/binfilter/inc/bf_sfx2/tbxchild.hxx,v
retrieving revision 1.3
diff -u -p -u -r1.3 tbxchild.hxx
--- openoffice.org.orig/binfilter/inc/bf_sfx2/tbxchild.hxx 3 Aug 2004 21:04:50 -0000 1.3
+++ openoffice.org/binfilter/inc/bf_sfx2/tbxchild.hxx 8 Jun 2005 22:55:42 -0000
@@ -81,6 +81,7 @@ class SfxToolBoxControl;
class SfxToolBox_Impl;
struct SfxChildWinInfo;
+class SfxToolBoxManager;
class SfxToolbox: public ToolBox
{
Index: inc/bf_sfx2/topfrm.hxx
===================================================================
RCS file: /cvs/framework/binfilter/inc/bf_sfx2/topfrm.hxx,v
retrieving revision 1.2
diff -u -p -u -r1.2 topfrm.hxx
--- openoffice.org.orig/binfilter/inc/bf_sfx2/topfrm.hxx 6 Nov 2003 08:26:31 -0000 1.2
+++ openoffice.org/binfilter/inc/bf_sfx2/topfrm.hxx 8 Jun 2005 22:55:42 -0000
@@ -80,6 +80,10 @@ class SfxTopFrame;
// class SfxTopFrame -----------------------------------------------------
+class SfxTopWindow_Impl;
+class SfxTopFrameWindow_Impl;
+class SfxTopFrame_Impl;
+
class SfxTopFrame : public SfxFrame
{
friend class SfxTopWindow_Impl;
@@ -118,6 +122,9 @@ public:
// class SfxTopViewFrame -------------------------------------------------
+class SfxTopWindow_Impl;
+class SfxTopViewFrame_Impl;
+
class SfxTopViewFrame : public SfxViewFrame
{
friend class SfxTopWindow_Impl;
Index: inc/bf_sfx2/unoctitm.hxx
===================================================================
RCS file: /cvs/framework/binfilter/inc/bf_sfx2/unoctitm.hxx,v
retrieving revision 1.3
diff -u -p -u -r1.3 unoctitm.hxx
--- openoffice.org.orig/binfilter/inc/bf_sfx2/unoctitm.hxx 13 Apr 2005 08:11:49 -0000 1.3
+++ openoffice.org/binfilter/inc/bf_sfx2/unoctitm.hxx 8 Jun 2005 22:55:42 -0000
@@ -184,6 +184,8 @@ public:
{ return aListeners; }
};
+class SfxDispatchController_Impl;
+
class SfxOfficeDispatch : public SfxStatusDispatcher
, public ::com::sun::star::lang::XUnoTunnel
{
Index: inc/bf_starmath/symbol.hxx
===================================================================
RCS file: /cvs/framework/binfilter/inc/bf_starmath/symbol.hxx,v
retrieving revision 1.2
diff -u -p -u -r1.2 symbol.hxx
--- openoffice.org.orig/binfilter/inc/bf_starmath/symbol.hxx 6 Nov 2003 08:27:17 -0000 1.2
+++ openoffice.org/binfilter/inc/bf_starmath/symbol.hxx 8 Jun 2005 22:55:59 -0000
@@ -122,6 +122,8 @@ namespace binfilter {
////////////////////////////////////////////////////////////////////////////////
+class SmSymSetManager;
+
class SmSym
{
friend class SmSymSetManager;
@@ -173,6 +175,8 @@ SV_DECL_PTRARR( SymbolArray, SmSym *, 32
/**************************************************************************/
+class SmSymSetManager;
+
class SmSymSet
{
friend class SmSymSetManager;
Index: inc/bf_starmath/view.hxx
===================================================================
RCS file: /cvs/framework/binfilter/inc/bf_starmath/view.hxx,v
retrieving revision 1.2
diff -u -p -u -r1.2 view.hxx
--- openoffice.org.orig/binfilter/inc/bf_starmath/view.hxx 6 Nov 2003 08:27:18 -0000 1.2
+++ openoffice.org/binfilter/inc/bf_starmath/view.hxx 8 Jun 2005 22:56:00 -0000
@@ -272,6 +272,8 @@ public:
/**************************************************************************/
+class SmClipboardChangeListener;
+
class SmViewShell: public SfxViewShell
{
// for handling the PasteClipboardState
Index: inc/bf_svx/fmview.hxx
===================================================================
RCS file: /cvs/framework/binfilter/inc/bf_svx/fmview.hxx,v
retrieving revision 1.2
diff -u -p -u -r1.2 fmview.hxx
--- openoffice.org.orig/binfilter/inc/bf_svx/fmview.hxx 6 Nov 2003 08:27:46 -0000 1.2
+++ openoffice.org/binfilter/inc/bf_svx/fmview.hxx 8 Jun 2005 22:56:30 -0000
@@ -88,6 +88,13 @@ namespace svx {
class ODataAccessDescriptor;
}
+class FmXFormController;
+class FmFormShell;
+class FmXFormShell;
+class FmXFormView;
+class FmExplorer;
+class FmFormObj;
+
class FmFormView : public E3dView
{
friend class FmXFormController;
Index: inc/bf_svx/svdedxv.hxx
===================================================================
RCS file: /cvs/framework/binfilter/inc/bf_svx/svdedxv.hxx,v
retrieving revision 1.2
diff -u -p -u -r1.2 svdedxv.hxx
--- openoffice.org.orig/binfilter/inc/bf_svx/svdedxv.hxx 6 Nov 2003 08:28:48 -0000 1.2
+++ openoffice.org/binfilter/inc/bf_svx/svdedxv.hxx 8 Jun 2005 22:57:03 -0000
@@ -106,6 +106,8 @@ enum SdrEndTextEditKind {SDRENDTEXTEDIT_
//
////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////
+class SdrPageView;
+class ImpSdrEditPara;
class SdrObjEditView: public SdrGlueEditView
{
Index: inc/bf_svx/svdhdl.hxx
===================================================================
RCS file: /cvs/framework/binfilter/inc/bf_svx/svdhdl.hxx,v
retrieving revision 1.3
diff -u -p -u -r1.3 svdhdl.hxx
--- openoffice.org.orig/binfilter/inc/bf_svx/svdhdl.hxx 5 May 2004 16:29:59 -0000 1.3
+++ openoffice.org/binfilter/inc/bf_svx/svdhdl.hxx 8 Jun 2005 22:57:06 -0000
@@ -185,6 +185,8 @@ enum BitmapMarkerKind
////////////////////////////////////////////////////////////////////////////////////////////////////
+class SdrMarkView;
+
class SdrHdl
{
friend class SdrMarkView; // fuer den Zugriff auf nObjHdlNum
Index: inc/bf_svx/svdobj.hxx
===================================================================
RCS file: /cvs/framework/binfilter/inc/bf_svx/svdobj.hxx,v
retrieving revision 1.3
diff -u -p -u -r1.3 svdobj.hxx
--- openoffice.org.orig/binfilter/inc/bf_svx/svdobj.hxx 13 Feb 2004 14:31:08 -0000 1.3
+++ openoffice.org/binfilter/inc/bf_svx/svdobj.hxx 8 Jun 2005 22:57:12 -0000
@@ -506,6 +506,10 @@ public:
//
////////////////////////////////////////////////////////////////////////////////////////////////////
+class SdrObjListIter;
+class SdrVirtObj;
+class SdrRectObj;
+
class SdrObject: public SfxListener
{
friend class SdrObjListIter;
Index: inc/bf_svx/svdograf.hxx
===================================================================
RCS file: /cvs/framework/binfilter/inc/bf_svx/svdograf.hxx,v
retrieving revision 1.2
diff -u -p -u -r1.2 svdograf.hxx
--- openoffice.org.orig/binfilter/inc/bf_svx/svdograf.hxx 6 Nov 2003 08:28:53 -0000 1.2
+++ openoffice.org/binfilter/inc/bf_svx/svdograf.hxx 8 Jun 2005 22:57:13 -0000
@@ -105,6 +105,7 @@ public:
// --------------
class SdrGrafSetItem;
+class SdrGraphicLink;
class SdrGrafObj: public SdrRectObj
{
Index: inc/bf_svx/svdotext.hxx
===================================================================
RCS file: /cvs/framework/binfilter/inc/bf_svx/svdotext.hxx,v
retrieving revision 1.3
diff -u -p -u -r1.3 svdotext.hxx
--- openoffice.org.orig/binfilter/inc/bf_svx/svdotext.hxx 5 May 2004 16:29:59 -0000 1.3
+++ openoffice.org/binfilter/inc/bf_svx/svdotext.hxx 8 Jun 2005 22:57:15 -0000
@@ -118,6 +118,8 @@ public:
//************************************************************
// Hilfsklasse ImpSdrObjTextLinkUserData
//************************************************************
+class SdrTextObj;
+class ImpSdrObjTextLink;
class ImpSdrObjTextLinkUserData : public SdrObjUserData
{
Index: inc/bf_svx/svdpagv.hxx
===================================================================
RCS file: /cvs/framework/binfilter/inc/bf_svx/svdpagv.hxx,v
retrieving revision 1.3
diff -u -p -u -r1.3 svdpagv.hxx
--- openoffice.org.orig/binfilter/inc/bf_svx/svdpagv.hxx 5 May 2004 16:29:59 -0000 1.3
+++ openoffice.org/binfilter/inc/bf_svx/svdpagv.hxx 8 Jun 2005 22:57:17 -0000
@@ -282,7 +282,8 @@ public:
//STRIP001 USHORT Find(::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > rUnoControl) const;
USHORT Find(::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > rUnoControlModel) const;
};
-
+class SdrPageView;
+class SdrView;
class SdrPageViewWinRec
{
friend class SdrPageView;
@@ -329,6 +330,8 @@ public:
////////////////////////////////////////////////////////////////////////////////////////////////////
namespace binfilter {
+class SdrPaintView;
+class SdrView;
class SdrPageView: public SfxListener {
friend class SdrPaintView;
//friend class SdrSnapView;
Index: inc/bf_svx/svdpntv.hxx
===================================================================
RCS file: /cvs/framework/binfilter/inc/bf_svx/svdpntv.hxx,v
retrieving revision 1.3
diff -u -p -u -r1.3 svdpntv.hxx
--- openoffice.org.orig/binfilter/inc/bf_svx/svdpntv.hxx 3 Dec 2003 10:43:08 -0000 1.3
+++ openoffice.org/binfilter/inc/bf_svx/svdpntv.hxx 8 Jun 2005 22:57:18 -0000
@@ -313,6 +313,12 @@ public:
//
////////////////////////////////////////////////////////////////////////////////////////////////////
+class SdrPageView;
+class FrameAnimator;
+class SdrViewUserMarker;
+class SdrGrafObj;
+class SdrPage;
+
class SdrPaintView: public SfxListener, public SfxRepeatTarget, public SfxBroadcaster
{
friend class SdrPageView;
Index: inc/bf_svx/svdvmark.hxx
===================================================================
RCS file: /cvs/framework/binfilter/inc/bf_svx/svdvmark.hxx,v
retrieving revision 1.3
diff -u -p -u -r1.3 svdvmark.hxx
--- openoffice.org.orig/binfilter/inc/bf_svx/svdvmark.hxx 3 Aug 2004 21:30:46 -0000 1.3
+++ openoffice.org/binfilter/inc/bf_svx/svdvmark.hxx 8 Jun 2005 22:57:22 -0000
@@ -95,10 +95,11 @@ enum SdrViewUserMarkerAlign
// SdrViewUserMarker
//************************************************************
+class SdrPaintView;
+
class SdrViewUserMarker
{
- friend class SdrPaintView;
-
+ friend class SdrPaintView;
SdrPaintView* pView;
OutputDevice* pForcedOutDev;
Point* pPoint;
Index: inc/bf_svx/unoshape.hxx
===================================================================
RCS file: /cvs/framework/binfilter/inc/bf_svx/unoshape.hxx,v
retrieving revision 1.2
diff -u -p -u -r1.2 unoshape.hxx
--- openoffice.org.orig/binfilter/inc/bf_svx/unoshape.hxx 6 Nov 2003 08:29:25 -0000 1.2
+++ openoffice.org/binfilter/inc/bf_svx/unoshape.hxx 8 Jun 2005 22:57:35 -0000
@@ -153,6 +153,10 @@ protected:
struct SvxShapeImpl;
class SvxShapeMaster;
+class SvxDrawPage;
+class SvxShapeConnector;
+class SdXShape;
+
// WARNING: if you update the supported interfaces, also update the
// SvxShape::queryAggregation helper method
Index: inc/bf_sw/fchrfmt.hxx
===================================================================
RCS file: /cvs/framework/binfilter/inc/bf_sw/fchrfmt.hxx,v
retrieving revision 1.3
diff -u -p -u -r1.3 fchrfmt.hxx
--- openoffice.org.orig/binfilter/inc/bf_sw/fchrfmt.hxx 3 Aug 2004 21:39:11 -0000 1.3
+++ openoffice.org/binfilter/inc/bf_sw/fchrfmt.hxx 8 Jun 2005 22:57:54 -0000
@@ -75,6 +75,7 @@ class IntlWrapper;
namespace binfilter {
class SwCharFmt;
+class SwTxtCharFmt;
// ATT_CHARFMT *********************************************
Index: inc/bf_sw/fmtflcnt.hxx
===================================================================
RCS file: /cvs/framework/binfilter/inc/bf_sw/fmtflcnt.hxx,v
retrieving revision 1.2
diff -u -p -u -r1.2 fmtflcnt.hxx
--- openoffice.org.orig/binfilter/inc/bf_sw/fmtflcnt.hxx 6 Nov 2003 08:33:47 -0000 1.2
+++ openoffice.org/binfilter/inc/bf_sw/fmtflcnt.hxx 8 Jun 2005 22:57:58 -0000
@@ -68,6 +68,7 @@
namespace binfilter {
class SwFrmFmt;
+class SwTxtFlyCnt;
// ATT_FLYCNT *******************************************************
class SwFmtFlyCnt : public SfxPoolItem
Index: inc/bf_sw/fmtfld.hxx
===================================================================
RCS file: /cvs/framework/binfilter/inc/bf_sw/fmtfld.hxx,v
retrieving revision 1.3
diff -u -p -u -r1.3 fmtfld.hxx
--- openoffice.org.orig/binfilter/inc/bf_sw/fmtfld.hxx 22 Apr 2004 15:42:08 -0000 1.3
+++ openoffice.org/binfilter/inc/bf_sw/fmtfld.hxx 8 Jun 2005 22:57:58 -0000
@@ -71,6 +71,7 @@
namespace binfilter {
class SwField;
+class SwTxtFld;
// ATT_FLD ***********************************
class SwFmtFld : public SfxPoolItem, public SwClient
Index: inc/bf_sw/fmtftn.hxx
===================================================================
RCS file: /cvs/framework/binfilter/inc/bf_sw/fmtftn.hxx,v
retrieving revision 1.3
diff -u -p -u -r1.3 fmtftn.hxx
--- openoffice.org.orig/binfilter/inc/bf_sw/fmtftn.hxx 3 Aug 2004 21:41:49 -0000 1.3
+++ openoffice.org/binfilter/inc/bf_sw/fmtftn.hxx 8 Jun 2005 22:57:58 -0000
@@ -71,6 +71,7 @@
namespace binfilter {
class SwDoc;
+class SwTxtFtn;
// ATT_FTN **********************************************************
Index: inc/bf_sw/fmtinfmt.hxx
===================================================================
RCS file: /cvs/framework/binfilter/inc/bf_sw/fmtinfmt.hxx,v
retrieving revision 1.4
diff -u -p -u -r1.4 fmtinfmt.hxx
--- openoffice.org.orig/binfilter/inc/bf_sw/fmtinfmt.hxx 3 Aug 2004 21:42:14 -0000 1.4
+++ openoffice.org/binfilter/inc/bf_sw/fmtinfmt.hxx 8 Jun 2005 22:57:58 -0000
@@ -73,6 +73,7 @@ class SvxMacroTableDtor;
class IntlWrapper;
namespace binfilter {
+class SwTxtINetFmt;
// ATT_INETFMT *********************************************
Index: inc/bf_sw/fmtrfmrk.hxx
===================================================================
RCS file: /cvs/framework/binfilter/inc/bf_sw/fmtrfmrk.hxx,v
retrieving revision 1.3
diff -u -p -u -r1.3 fmtrfmrk.hxx
--- openoffice.org.orig/binfilter/inc/bf_sw/fmtrfmrk.hxx 3 Aug 2004 21:43:11 -0000 1.3
+++ openoffice.org/binfilter/inc/bf_sw/fmtrfmrk.hxx 8 Jun 2005 22:57:58 -0000
@@ -72,6 +72,8 @@ namespace binfilter {
// ATT_REFMARK *******************************************************
+class SwTxtRefMark;
+
class SwFmtRefMark : public SfxPoolItem
{
friend class SwTxtRefMark;
Index: inc/bf_sw/fmtruby.hxx
===================================================================
RCS file: /cvs/framework/binfilter/inc/bf_sw/fmtruby.hxx,v
retrieving revision 1.4
diff -u -p -u -r1.4 fmtruby.hxx
--- openoffice.org.orig/binfilter/inc/bf_sw/fmtruby.hxx 3 Aug 2004 21:43:22 -0000 1.4
+++ openoffice.org/binfilter/inc/bf_sw/fmtruby.hxx 8 Jun 2005 22:57:58 -0000
@@ -70,6 +70,7 @@
#endif
namespace binfilter {
+class SwTxtRuby;
class SwFmtRuby : public SfxPoolItem
{
Index: inc/bf_sw/section.hxx
===================================================================
RCS file: /cvs/framework/binfilter/inc/bf_sw/section.hxx,v
retrieving revision 1.5
diff -u -p -u -r1.5 section.hxx
--- openoffice.org.orig/binfilter/inc/bf_sw/section.hxx 27 Oct 2004 13:41:24 -0000 1.5
+++ openoffice.org/binfilter/inc/bf_sw/section.hxx 8 Jun 2005 22:58:09 -0000
@@ -116,6 +116,7 @@ enum LinkCreateType
CREATE_UPDATE // Link connecten und updaten
};
+class SwSectionNode;
class SwSection : public SwClient
{
Index: inc/bf_xmloff/xmlaustp.hxx
===================================================================
RCS file: /cvs/framework/binfilter/inc/bf_xmloff/xmlaustp.hxx,v
retrieving revision 1.2
diff -u -p -u -r1.2 xmlaustp.hxx
--- openoffice.org.orig/binfilter/inc/bf_xmloff/xmlaustp.hxx 5 Dec 2003 09:18:04 -0000 1.2
+++ openoffice.org/binfilter/inc/bf_xmloff/xmlaustp.hxx 8 Jun 2005 22:58:35 -0000
@@ -79,6 +79,7 @@ class SvXMLExportPropertyMapper;
class SvXMLNamespaceMap;
class SvXMLAttributeList;
class SvXMLExport;
+class SvXMLAutoStylePoolP_Impl;
class SvXMLAutoStylePoolP : public UniRefBase
{
workspace.vcl39.patch:
padmin/source/fontentry.cxx | 6
psprint/inc/psprint/fontmanager.hxx | 2
psprint/source/fontmanager/fontcache.cxx | 40 --
psprint/source/fontmanager/fontconfig.cxx | 7
psprint/source/fontmanager/fontmanager.cxx | 17 -
psprint/source/fontsubset/sft.c | 8
psprint/source/fontsubset/sft.h | 2
toolkit/source/awt/vclxtoolkit.cxx | 5
vcl/inc/salframe.hxx | 2
vcl/inc/sallayout.hxx | 10
vcl/inc/scrbar.hxx | 1
vcl/inc/window.hxx | 2
vcl/source/app/stdtext.cxx | 5
vcl/source/app/svapp.cxx | 5
vcl/source/app/svdata.cxx | 41 +-
vcl/source/control/button.cxx | 52 ++-
vcl/source/control/edit.cxx | 6
vcl/source/control/ilstbox.cxx | 29 -
vcl/source/control/scrbar.cxx | 88 +++--
vcl/source/gdi/bmpfast.cxx | 34 +-
vcl/source/gdi/metric.cxx | 5
vcl/source/gdi/print.cxx | 2
vcl/source/gdi/sallayout.cxx | 49 ++
vcl/source/window/brdwin.cxx | 7
vcl/source/window/menu.cxx | 63 ++-
vcl/source/window/msgbox.cxx | 23 +
vcl/source/window/scrwnd.cxx | 11
vcl/source/window/splitwin.cxx | 15
vcl/source/window/window.cxx | 5
vcl/unx/gtk/app/gtkdata.cxx | 18 -
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 33 -
vcl/unx/gtk/window/gtkframe.cxx | 92 +++--
vcl/unx/inc/plugins/gtk/gtkframe.hxx | 1
vcl/unx/inc/salframe.h | 1
vcl/unx/inc/wmadaptor.hxx | 21 +
vcl/unx/source/app/sm.cxx | 11
vcl/unx/source/app/soicon.cxx | 3
vcl/unx/source/app/wmadaptor.cxx | 179 +++++++---
vcl/unx/source/gdi/pspgraphics.cxx | 2
vcl/unx/source/gdi/xfont.cxx | 5
vcl/unx/source/window/salframe.cxx | 37 ++
vcl/win/inc/salgdi.h | 1
vcl/win/source/gdi/salgdi.cxx | 2
vcl/win/source/gdi/salgdi3.cxx | 274 ++++++++++++----
vcl/win/source/gdi/winlayout.cxx | 492 ++++++++++++++++++-----------
vcl/win/source/window/salframe.cxx | 15
46 files changed, 1183 insertions(+), 546 deletions(-)
--- NEW FILE workspace.vcl39.patch ---
Index: source/fontentry.cxx
===================================================================
RCS file: /cvs/gsl/padmin/source/fontentry.cxx,v
retrieving revision 1.12
retrieving revision 1.12.58.1
diff -u -p -u -r1.12 -r1.12.58.1
--- openoffice.org.orig/padmin/source/fontentry.cxx 30 Mar 2004 13:45:42 -0000 1.12
+++ openoffice.org/padmin/source/fontentry.cxx 21 Mar 2005 17:51:23 -0000 1.12.58.1
@@ -339,14 +339,14 @@ void FontNameDlg::init()
FastPrintFontInfo aInfo;
m_rFontManager.getFontFastInfo( *font_it, aInfo );
- ::std::list< fontID > aDups;
+ std::list< fontID > aDups;
String aEntry;
if( m_rFontManager.getFileDuplicates( *font_it, aDups ) )
{
FastPrintFontInfo aDupInfo;
- ::std::list< FastPrintFontInfo > aInfos;
+ std::list< FastPrintFontInfo > aInfos;
aInfos.push_back( aInfo );
- for( ::std::list< fontID >::iterator dup = aDups.begin(); dup != aDups.end(); ++dup )
+ for( std::list< fontID >::iterator dup = aDups.begin(); dup != aDups.end(); ++dup )
{
m_rFontManager.getFontFastInfo( *dup, aDupInfo );
aInfos.push_back( aDupInfo );
Index: inc/psprint/fontmanager.hxx
===================================================================
RCS file: /cvs/gsl/psprint/inc/psprint/fontmanager.hxx,v
retrieving revision 1.22
retrieving revision 1.22.14.1
diff -u -p -u -r1.22 -r1.22.14.1
--- openoffice.org.orig/psprint/inc/psprint/fontmanager.hxx 31 Jan 2005 08:58:54 -0000 1.22
+++ openoffice.org/psprint/inc/psprint/fontmanager.hxx 21 Mar 2005 17:46:46 -0000 1.22.14.1
@@ -186,6 +186,7 @@ struct FastPrintFontInfo
// font attributes
rtl::OUString m_aFamilyName;
+ rtl::OUString m_aStyleName;
std::list< rtl::OUString > m_aAliases;
family::type m_eFamilyStyle;
italic::type m_eItalic;
@@ -293,6 +294,7 @@ class PrintFontManager
int m_nFamilyName; // atom
std::list< int > m_aAliases;
int m_nPSName; // atom
+ rtl::OUString m_aStyleName;
italic::type m_eItalic;
width::type m_eWidth;
weight::type m_eWeight;
Index: source/fontmanager/fontcache.cxx
===================================================================
RCS file: /cvs/gsl/psprint/source/fontmanager/fontcache.cxx,v
retrieving revision 1.12
retrieving revision 1.12.14.2
diff -u -p -u -r1.12 -r1.12.14.2
--- openoffice.org.orig/psprint/source/fontmanager/fontcache.cxx 31 Jan 2005 08:59:14 -0000 1.12
+++ openoffice.org/psprint/source/fontmanager/fontcache.cxx 22 Mar 2005 10:26:15 -0000 1.12.14.2
@@ -81,7 +81,7 @@
#endif
#define FONTCACHEFILE "/user/psprint/pspfontcache"
-#define CACHE_MAGIC "PspFontCacheFile format 1"
+#define CACHE_MAGIC "PspFontCacheFile format 2"
using namespace std;
using namespace rtl;
@@ -203,7 +203,7 @@ void FontCache::flush()
/*
* for each font entry write:
* name[;name[;name]]
- * fontnr;PSName;italic;weight;width;pitch;encoding;ascend;descend;leading;vsubst;gxw;gxh;gyw;gyh;useroverrride[;{metricfile,typeflags}]
+ * fontnr;PSName;italic;weight;width;pitch;encoding;ascend;descend;leading;vsubst;gxw;gxh;gyw;gyh;useroverrride[;{metricfile,typeflags}][;stylename]
*/
if( nEntrySize > 1 )
nSubEntry = static_cast<const PrintFontManager::TrueTypeFontFile*>(*it)->m_nCollectionEntry;
@@ -267,6 +267,11 @@ void FontCache::flush()
break;
default: break;
}
+ if( (*it)->m_aStyleName.getLength() )
+ {
+ aLine.Append( ';' );
+ aLine.Append( ByteString( String( (*it)->m_aStyleName ), RTL_TEXTENCODING_UTF8 ) );
+ }
aStream.WriteLine( aLine );
}
aStream.WriteLine( ByteString() );
@@ -467,6 +472,8 @@ void FontCache::read()
break;
default: break;
}
+ if( nIndex != STRING_NOTFOUND )
+ pFont->m_aStyleName = String( aLine.Copy( nIndex ), RTL_TEXTENCODING_UTF8 );
bool bObsolete = false;
if( bKeepOnlyUserOverridden )
@@ -492,32 +499,6 @@ void FontCache::read()
else
bObsolete = true;
}
- FontCacheEntry& rEntry = (*pDir)[aFile].m_aEntry;
- if( ! bObsolete )
- {
- /*
- * #i20287# duplicate lines could exist because of
- * fontcache code prior to OOo 1.1.1, ignore them
- */
- for( FontCacheEntry::const_iterator entry = rEntry.begin();
- entry != rEntry.end() && ! bObsolete; ++entry )
- {
- const PrintFontManager::PrintFont* pOld = *entry;
- if( pOld->m_eType == pFont->m_eType &&
- pOld->m_nFamilyName == pFont->m_nFamilyName &&
- pOld->m_nPSName == pFont->m_nPSName &&
- pOld->m_eItalic == pFont->m_eItalic &&
- pOld->m_eWidth == pFont->m_eWidth &&
- pOld->m_ePitch == pFont->m_ePitch &&
- pOld->m_aEncoding == pFont->m_aEncoding &&
- pOld->m_bFontEncodingOnly == pFont->m_bFontEncodingOnly &&
- pOld->m_nAscend == pFont->m_nAscend &&
- pOld->m_nDescend == pFont->m_nDescend
- )
- bObsolete = true;
- }
- }
-
if( bObsolete )
{
m_bDoFlush = true;
@@ -528,6 +509,7 @@ void FontCache::read()
continue;
}
+ FontCacheEntry& rEntry = (*pDir)[aFile].m_aEntry;
rEntry.push_back( pFont );
}
}
@@ -575,6 +557,7 @@ void FontCache::copyPrintFont( const Pri
default: break;
}
pTo->m_nFamilyName = pFrom->m_nFamilyName;
+ pTo->m_aStyleName = pFrom->m_aStyleName;
pTo->m_aAliases = pFrom->m_aAliases;
pTo->m_nPSName = pFrom->m_nPSName;
pTo->m_eItalic = pFrom->m_eItalic;
@@ -637,6 +620,7 @@ bool FontCache::equalsPrintFont( const P
default: break;
}
if( pRight->m_nFamilyName != pLeft->m_nFamilyName ||
+ pRight->m_aStyleName != pLeft->m_aStyleName ||
pRight->m_nPSName != pLeft->m_nPSName ||
pRight->m_eItalic != pLeft->m_eItalic ||
pRight->m_eWeight != pLeft->m_eWeight ||
Index: source/fontmanager/fontconfig.cxx
===================================================================
RCS file: /cvs/gsl/psprint/source/fontmanager/fontconfig.cxx,v
retrieving revision 1.7
retrieving revision 1.7.24.1
diff -u -p -u -r1.7 -r1.7.24.1
--- openoffice.org.orig/psprint/source/fontmanager/fontconfig.cxx 13 Oct 2004 08:22:03 -0000 1.7
+++ openoffice.org/psprint/source/fontmanager/fontconfig.cxx 21 Mar 2005 17:46:46 -0000 1.7.24.1
@@ -348,6 +348,7 @@ bool PrintFontManager::initFontconfig()
NULL );
FcPattern* pPattern = rWrapper.FcPatternCreate();
FcFontSet* pFSet = rWrapper.FcFontList( pConfig, pPattern, pOSet );
+ rtl_TextEncoding aThreadTextEncoding = osl_getThreadTextEncoding();
if( pFSet )
{
@@ -417,7 +418,7 @@ bool PrintFontManager::initFontconfig()
if( aFonts.empty() )
continue;
- int nFamilyName = m_pAtoms->getAtom( ATOM_FAMILYNAME, OStringToOUString( OString( (sal_Char*)family ), osl_getThreadTextEncoding() ), sal_True );
+ int nFamilyName = m_pAtoms->getAtom( ATOM_FAMILYNAME, OStringToOUString( OString( (sal_Char*)family ), aThreadTextEncoding ), sal_True );
PrintFont* pUpdate = aFonts.front();
if( ++aFonts.begin() != aFonts.end() ) // more than one font
{
@@ -504,6 +505,10 @@ bool PrintFontManager::initFontconfig()
else if( slant == FC_SLANT_OBLIQUE )
pUpdate->m_eItalic = italic::Oblique;
}
+ if( eStyleRes == FcResultMatch )
+ {
+ pUpdate->m_aStyleName = OStringToOUString( OString( (sal_Char*)style ), aThreadTextEncoding );
+ }
// update font cache
m_pFontCache->updateFontCacheEntry( pUpdate, false );
Index: source/fontmanager/fontmanager.cxx
===================================================================
RCS file: /cvs/gsl/psprint/source/fontmanager/fontmanager.cxx,v
retrieving revision 1.58
retrieving revision 1.56.14.5
diff -u -p -u -r1.58 -r1.56.14.5
--- openoffice.org.orig/psprint/source/fontmanager/fontmanager.cxx 12 Apr 2005 12:11:17 -0000 1.58
+++ openoffice.org/psprint/source/fontmanager/fontmanager.cxx 8 Jun 2005 11:25:49 -0000 1.56.14.5
@@ -1116,6 +1116,10 @@ bool PrintFontManager::PrintFont::readAf
[...3139 lines suppressed...]
{
nWidth += mpCharWidths[ i ] * nFactor;
+
+ // check if the nMaxWidth still fits the current sub-layout
if( nWidth >= nMaxWidth )
{
// go back to cluster start
- while( !mpVisualAttrs[ mpLogClusters[i] ].fClusterStart
- && (--i > mnMinCharPos) );
- return i;
+ // we have to find the visual item first since the mpLogClusters[]
+ // needed to find the cluster start is relative to to the visual item
+ int nMinGlyphIndex = 0;
+ for( int nItem = 0; nItem < mnItemCount; ++nItem )
+ {
+ const VisualItem& rVisualItem = mpVisualItems[ nItem ];
+ nMinGlyphIndex = rVisualItem.mnMinGlyphPos;
+ if( (i >= rVisualItem.mnMinCharPos)
+ && (i < rVisualItem.mnEndCharPos) )
+ break;
+ }
+ // now go back to the matching cluster start
+ do
+ {
+ int nGlyphPos = mpLogClusters[i] + nMinGlyphIndex;
+ if( 0 != mpVisualAttrs[ nGlyphPos ].fClusterStart )
+ return i;
+ } while( --i >= mnMinCharPos );
+
+ // if the cluster starts before the start of the visual item
+ // then set the visual breakpoint before this item
+ return mnMinCharPos;
}
+
+ // the visual break also depends on the nCharExtra between the characters
nWidth += nCharExtra;
}
+ // the whole layout did fit inside the nMaxWidth
return STRING_LEN;
}
@@ -2000,7 +2129,7 @@ void UniscribeLayout::GetCaretPositions(
continue;
// get glyph positions
- // TODO: rVisualItem's glyph range only partially used
+ // TODO: handle when rVisualItem's glyph range is only partially used
for( i = rVisualItem.mnMinGlyphPos; i < rVisualItem.mnEndGlyphPos; ++i )
{
pGlyphPos[ i ] = nXPos;
@@ -2091,58 +2220,64 @@ void UniscribeLayout::ApplyDXArray( cons
for( int nItem = 0; nItem < mnItemCount; ++nItem )
{
VisualItem& rVisualItem = mpVisualItems[ nItem ];
+
+ // set the position of this visual item
+ rVisualItem.mnXOffset = nXOffset;
+
+ // ignore empty visual items
if( rVisualItem.IsEmpty() )
continue;
- if( (rVisualItem.mnMinCharPos < mnEndCharPos)
- && (rVisualItem.mnEndCharPos > mnMinCharPos) )
+ // ignore irrelevant visual items
+ if( (rVisualItem.mnMinCharPos >= mnEndCharPos)
+ || (rVisualItem.mnEndCharPos <= mnMinCharPos) )
+ continue;
+
+ if( rVisualItem.mpScriptItem->a.fRTL )
{
- if( rVisualItem.mpScriptItem->a.fRTL )
- {
- // HACK: make sure kashida justification is used when possible
- // TODO: make sure this works on all usp versions
- for( i = rVisualItem.mnMinGlyphPos; i < rVisualItem.mnEndGlyphPos; ++i )
- if( (1U << mpVisualAttrs[i].uJustification) & 0x7F89 )
- mpVisualAttrs[i].uJustification = SCRIPT_JUSTIFY_ARABIC_KASHIDA;
- }
+ // HACK: make sure kashida justification is used when possible
+ // TODO: make sure this works on all usp versions
+ for( i = rVisualItem.mnMinGlyphPos; i < rVisualItem.mnEndGlyphPos; ++i )
+ if( (1U << mpVisualAttrs[i].uJustification) & 0x7F89 )
+ mpVisualAttrs[i].uJustification = SCRIPT_JUSTIFY_ARABIC_KASHIDA;
+ }
- HRESULT nRC = (*pScriptApplyLogicalWidth)(
- mpCharWidths + rVisualItem.mnMinCharPos,
- rVisualItem.mnEndCharPos - rVisualItem.mnMinCharPos,
- rVisualItem.mnEndGlyphPos - rVisualItem.mnMinGlyphPos,
- mpLogClusters + rVisualItem.mnMinCharPos,
- mpVisualAttrs + rVisualItem.mnMinGlyphPos,
- mpGlyphAdvances + rVisualItem.mnMinGlyphPos,
- &rVisualItem.mpScriptItem->a,
- &rVisualItem.maABCWidths,
- mpJustifications + rVisualItem.mnMinGlyphPos );
+ // convert virtual charwidths to glyph justification values
+ HRESULT nRC = (*pScriptApplyLogicalWidth)(
+ mpCharWidths + rVisualItem.mnMinCharPos,
+ rVisualItem.mnEndCharPos - rVisualItem.mnMinCharPos,
+ rVisualItem.mnEndGlyphPos - rVisualItem.mnMinGlyphPos,
+ mpLogClusters + rVisualItem.mnMinCharPos,
+ mpVisualAttrs + rVisualItem.mnMinGlyphPos,
+ mpGlyphAdvances + rVisualItem.mnMinGlyphPos,
+ &rVisualItem.mpScriptItem->a,
+ &rVisualItem.maABCWidths,
+ mpJustifications + rVisualItem.mnMinGlyphPos );
- if( nRC != 0 )
- {
- delete[] mpJustifications;
- mpJustifications = NULL;
- break;
- }
+ if( nRC != 0 )
+ {
+ delete[] mpJustifications;
+ mpJustifications = NULL;
+ break;
+ }
- rVisualItem.mnXOffset = nXOffset;
- // update nXOffset
- int nEndGlyphPos;
- if( GetItemSubrange( rVisualItem, i, nEndGlyphPos ) )
- for(; i < nEndGlyphPos; ++i )
- nXOffset += mpJustifications[ i ];
+ // update nXOffset to the position of the next visual item
+ int nEndGlyphPos;
+ if( GetItemSubrange( rVisualItem, i, nEndGlyphPos ) )
+ for(; i < nEndGlyphPos; ++i )
+ nXOffset += mpJustifications[ i ];
- if( rVisualItem.mpScriptItem->a.fRTL )
- {
- // right align adjusted glyph positions for RTL item
- // exception: kashida aligned glyphs
- // TODO: make sure this works on all usp versions
- for( i = rVisualItem.mnMinGlyphPos+1; i < rVisualItem.mnEndGlyphPos; ++i )
- if( mpVisualAttrs[i].uJustification != SCRIPT_JUSTIFY_ARABIC_KASHIDA )
- {
- mpJustifications[i-1] += mpJustifications[ i ] - mpGlyphAdvances[ i ];
- mpJustifications[ i ] = mpGlyphAdvances[ i ];
- }
- }
+ if( rVisualItem.mpScriptItem->a.fRTL )
+ {
+ // right align adjusted glyph positions for RTL item
+ // exception: kashida aligned glyphs
+ // TODO: make sure this works on all usp versions
+ for( i = rVisualItem.mnMinGlyphPos+1; i < rVisualItem.mnEndGlyphPos; ++i )
+ if( mpVisualAttrs[i].uJustification != SCRIPT_JUSTIFY_ARABIC_KASHIDA )
+ {
+ mpJustifications[i-1] += mpJustifications[ i ] - mpGlyphAdvances[ i ];
+ mpJustifications[ i ] = mpGlyphAdvances[ i ];
+ }
}
}
}
@@ -2245,6 +2380,9 @@ SalLayout* WinSalGraphics::GetTextLayout
pWinLayout = new SimpleWinLayout( mhDC, eCharSet, rFontFace, rFontInstance );
}
+ if( mfFontScale != 1.0 )
+ pWinLayout->SetFontScale( mfFontScale );
+
return pWinLayout;
}
Index: win/source/window/salframe.cxx
===================================================================
RCS file: /cvs/gsl/vcl/win/source/window/salframe.cxx,v
retrieving revision 1.116
retrieving revision 1.114.70.1
diff -u -p -u -r1.116 -r1.114.70.1
--- openoffice.org.orig/vcl/win/source/window/salframe.cxx 30 Mar 2005 09:10:41 -0000 1.116
+++ openoffice.org/vcl/win/source/window/salframe.cxx 23 Mar 2005 15:21:26 -0000 1.114.70.1
@@ -1445,7 +1445,20 @@ void WinSalFrame::SetPosSize( long nX, l
POINT aPt;
aPt.x = nX;
aPt.y = nY;
- ClientToScreen( ImplGetParentHwnd( mhWnd ), &aPt );
+
+ HWND parentHwnd = ImplGetParentHwnd( mhWnd );
+ WinSalFrame* pParentFrame = GetWindowPtr( parentHwnd );
+ if ( pParentFrame && pParentFrame->mnShowState == SW_SHOWMAXIMIZED )
+ {
+ // #i42485#: parent will be shown maximized in which case
+ // a ClientToScreen uses the wrong coordinates (i.e. those from the restore pos)
+ // so use the (already updated) frame geometry for the transformation
+ aPt.x += pParentFrame->maGeometry.nX;
+ aPt.y += pParentFrame->maGeometry.nY;
+ }
+ else
+ ClientToScreen( parentHwnd, &aPt );
+
nX = aPt.x;
nY = aPt.y;
}
openoffice.org-1.9.87.rh151357.patch:
desktop/source/app/langselect.cxx | 39 +++-----
desktop/source/app/langselect.hxx | 2
desktop/source/app/userinstall.cxx | 15 ---
desktop/source/migration/wizard.cxx | 19 ----
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 4
registry/schema/org/openoffice/Office/Common.xcs | 0
sfx2/source/appl/sfxhelp.cxx | 59 +++++++++++--
source/app/langselect.cxx | 0
source/app/langselect.hxx | 0
source/app/userinstall.cxx | 0
source/appl/sfxhelp.cxx | 0
source/migration/wizard.cxx | 0
12 files changed, 75 insertions(+), 63 deletions(-)
Index: openoffice.org-1.9.87.rh151357.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-1.9.87.rh151357.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openoffice.org-1.9.87.rh151357.patch 29 Apr 2005 14:51:01 -0000 1.5
+++ openoffice.org-1.9.87.rh151357.patch 10 Jun 2005 10:26:24 -0000 1.6
@@ -206,10 +206,20 @@
===================================================================
RCS file: /cvs/framework/desktop/source/app/userinstall.cxx,v
retrieving revision 1.16
-diff -u -p -r1.16 userinstall.cxx
+diff -u -p -u -r1.16 userinstall.cxx
--- openoffice.org.orig/desktop/source/app/userinstall.cxx 11 Mar 2005 10:48:28 -0000 1.16
-+++ openoffice.org/desktop/source/app/userinstall.cxx 14 Apr 2005 09:39:33 -0000
-@@ -338,19 +338,12 @@ namespace desktop {
++++ openoffice.org/desktop/source/app/userinstall.cxx 9 Jun 2005 08:27:23 -0000
+@@ -330,27 +330,20 @@ namespace desktop {
+ OUString aDefaultLocale( OUString::createFromAscii("DefaultLocale") );
+ OUString aDefaultLocale_CJK( OUString::createFromAscii("DefaultLocale_CJK") );
+ OUString aTmp;
+- if (aUserLanguage.equalsAscii("ja") || aUserLanguage.equalsAscii("ko")
+- || aUserLanguage.equalsAscii("zh-CN") || aUserLanguage.equalsAscii("zh-TW"))
++ if (aLocale.Language.equalsAscii("ja") || aLocale.Language.equalsAscii("ko")
++ || aLocale.Language.equalsAscii("zh"))
+ {
+ // only set the locales if there is not already a value set
+ // (inititially there is no value set in the configuration)
pset->getPropertyValue(aDefaultLocale) >>= aTmp;
if (!aTmp.getLength())
pset->setPropertyValue(aDefaultLocale, makeAny(OUString::createFromAscii("en-US")));
openoffice.org-1.9.90.ooo46585.sunmiscisnotstandard.filter.patch:
filter/source/xsltfilter/XSLTFilterOLEExtracter.java | 11
filter/source/xsltfilter/makefile.mk | 4
openoffice.org/filter/source/xsltfilter/Base64.java | 1449 +++++++++++++++++++
source/xsltfilter/XSLTFilterOLEExtracter.java | 0
source/xsltfilter/makefile.mk | 0
5 files changed, 1456 insertions(+), 8 deletions(-)
Index: openoffice.org-1.9.90.ooo46585.sunmiscisnotstandard.filter.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-1.9.90.ooo46585.sunmiscisnotstandard.filter.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.90.ooo46585.sunmiscisnotstandard.filter.patch 11 Apr 2005 11:05:57 -0000 1.1
+++ openoffice.org-1.9.90.ooo46585.sunmiscisnotstandard.filter.patch 10 Jun 2005 10:26:24 -0000 1.2
@@ -152,24 +152,24 @@
+
+
+ /** Maximum line length (76) of Base64 output. */
-+ private final static int MAX_LINE_LENGTH = 76;
++ public final static int MAX_LINE_LENGTH = 76;
+
+
+ /** The equals sign (=) as a byte. */
-+ private final static byte EQUALS_SIGN = (byte)'=';
++ public final static byte EQUALS_SIGN = (byte)'=';
+
+
+ /** The new line character (\n) as a byte. */
-+ private final static byte NEW_LINE = (byte)'\n';
++ public final static byte NEW_LINE = (byte)'\n';
+
+
+ /** Preferred encoding. */
-+ private final static String PREFERRED_ENCODING = "UTF-8";
++ public final static String PREFERRED_ENCODING = "UTF-8";
+
+
+ /** The 64 valid Base64 values. */
-+ private final static byte[] ALPHABET;
-+ private final static byte[] _NATIVE_ALPHABET = /* May be something funny like EBCDIC */
++ public final static byte[] ALPHABET;
++ public final static byte[] _NATIVE_ALPHABET = /* May be something funny like EBCDIC */
+ {
+ (byte)'A', (byte)'B', (byte)'C', (byte)'D', (byte)'E', (byte)'F', (byte)'G',
+ (byte)'H', (byte)'I', (byte)'J', (byte)'K', (byte)'L', (byte)'M', (byte)'N',
@@ -203,7 +203,7 @@
+ * Translates a Base64 value to either its 6-bit reconstruction value
+ * or a negative number indicating some other meaning.
+ **/
-+ private final static byte[] DECODABET =
++ public final static byte[] DECODABET =
+ {
+ -9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 0 - 8
+ -5,-5, // Whitespace: Tab and Linefeed
@@ -239,13 +239,13 @@
+ };
+
+ // I think I end up not using the BAD_ENCODING indicator.
-+ //private final static byte BAD_ENCODING = -9; // Indicates error in encoding
-+ private final static byte WHITE_SPACE_ENC = -5; // Indicates white space in encoding
-+ private final static byte EQUALS_SIGN_ENC = -1; // Indicates equals sign in encoding
++ //public final static byte BAD_ENCODING = -9; // Indicates error in encoding
++ public final static byte WHITE_SPACE_ENC = -5; // Indicates white space in encoding
++ public final static byte EQUALS_SIGN_ENC = -1; // Indicates equals sign in encoding
+
+
+ /** Defeats instantiation. */
-+ private Base64(){}
++ public Base64(){}
+
+
+
@@ -267,7 +267,7 @@
+ * @return four byte array in Base64 notation.
+ * @since 1.5.1
+ */
-+ private static byte[] encode3to4( byte[] b4, byte[] threeBytes, int numSigBytes )
++ public static byte[] encode3to4( byte[] b4, byte[] threeBytes, int numSigBytes )
+ {
+ encode3to4( threeBytes, 0, numSigBytes, b4, 0 );
+ return b4;
@@ -295,7 +295,7 @@
+ * @return the <var>destination</var> array
+ * @since 1.3
+ */
-+ private static byte[] encode3to4(
++ public static byte[] encode3to4(
+ byte[] source, int srcOffset, int numSigBytes,
+ byte[] destination, int destOffset )
+ {
@@ -643,7 +643,7 @@
+ * @return the number of decoded bytes converted
+ * @since 1.3
+ */
-+ private static int decode4to3( byte[] source, int srcOffset, byte[] destination, int destOffset )
++ public static int decode4to3( byte[] source, int srcOffset, byte[] destination, int destOffset )
+ {
+ // Example: Dk==
+ if( source[ srcOffset + 2] == EQUALS_SIGN )
@@ -1075,13 +1075,13 @@
+ */
+ public static class InputStream extends java.io.FilterInputStream
+ {
-+ private boolean encode; // Encoding or decoding
-+ private int position; // Current position in the buffer
-+ private byte[] buffer; // Small buffer holding converted data
-+ private int bufferLength; // Length of buffer (3 or 4)
-+ private int numSigBytes; // Number of meaningful bytes in the buffer
-+ private int lineLength;
-+ private boolean breakLines; // Break lines at less than 80 characters
++ public boolean encode; // Encoding or decoding
++ public int position; // Current position in the buffer
++ public byte[] buffer; // Small buffer holding converted data
++ public int bufferLength; // Length of buffer (3 or 4)
++ public int numSigBytes; // Number of meaningful bytes in the buffer
++ public int lineLength;
++ public boolean breakLines; // Break lines at less than 80 characters
+
+
+ /**
@@ -1305,14 +1305,14 @@
+ */
+ public static class OutputStream extends java.io.FilterOutputStream
+ {
-+ private boolean encode;
-+ private int position;
-+ private byte[] buffer;
-+ private int bufferLength;
-+ private int lineLength;
-+ private boolean breakLines;
-+ private byte[] b4; // Scratch used in a few places
-+ private boolean suspendEncoding;
++ public boolean encode;
++ public int position;
++ public byte[] buffer;
++ public int bufferLength;
++ public int lineLength;
++ public boolean breakLines;
++ public byte[] b4; // Scratch used in a few places
++ public boolean suspendEncoding;
+
+ /**
+ * Constructs a {@link Base64.OutputStream} in ENCODE mode.
openoffice.org-1.9.91.oooXXXXX.fontfallbacks.officecfg.patch:
officecfg/registry/data/org/openoffice/VCL.xcu |14452 ++++++++++++-------------
registry/data/org/openoffice/VCL.xcu | 0
2 files changed, 7266 insertions(+), 7186 deletions(-)
Index: openoffice.org-1.9.91.oooXXXXX.fontfallbacks.officecfg.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-1.9.91.oooXXXXX.fontfallbacks.officecfg.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-1.9.91.oooXXXXX.fontfallbacks.officecfg.patch 20 Apr 2005 15:14:18 -0000 1.2
+++ openoffice.org-1.9.91.oooXXXXX.fontfallbacks.officecfg.patch 10 Jun 2005 10:26:24 -0000 1.3
@@ -1,11 +1,11 @@
Index: registry/data/org/openoffice/VCL.xcu
===================================================================
RCS file: /cvs/util/officecfg/registry/data/org/openoffice/VCL.xcu,v
-retrieving revision 1.38
-diff -u -p -r1.38 VCL.xcu
---- openoffice.org.orig/officecfg/registry/data/org/openoffice/VCL.xcu 18 Mar 2005 17:45:02 -0000 1.38
-+++ openoffice.org/officecfg/registry/data/org/openoffice/VCL.xcu 18 Apr 2005 08:51:43 -0000
-@@ -60,7259 +60,7340 @@
+retrieving revision 1.39
+diff -u -p -u -r1.39 VCL.xcu
+--- openoffice.org.orig/officecfg/registry/data/org/openoffice/VCL.xcu 6 Jun 2005 16:07:01 -0000 1.39
++++ openoffice.org/officecfg/registry/data/org/openoffice/VCL.xcu 8 Jun 2005 15:02:46 -0000
+@@ -60,7191 +60,7271 @@
*
************************************************************************ -->
<!DOCTYPE oor:component-data SYSTEM "../../../component-update.dtd">
@@ -1106,7 +1106,7 @@
+ <value>ì¬ë°”탕;sunbatang;baekmukbatang;ì¬êµ´ë¦¼;sungulim;hymyeongjolightk;myeongjo;batangche;gungsuh;gungsuhche;myeomjo;gulim;gulimche;ì¬ë‹ì›€;sundotum;dotum;dotumche;roundgothic;kodig;andalesansui;arialunicodems;lucidaunicode</value>
+ </prop>
+ <prop oor:name="SubstFontsMS">
-+ <value/>
++ <value>바탕</value>
+ </prop>
+ <prop oor:name="SubstFontsPS">
+ <value/>
@@ -1129,7 +1129,7 @@
+ <value>ì¬ë°”탕;batang;baekmukbatang;myeongjo;batangche;gungsuh;gungsuhche;hymyeongjolightk;myeomjo;ì¬êµ´ë¦¼;sungulim;gulim;gulimche;ì¬ë‹ì›€;sundotum;dotum;dotumche;roundgothic;kodig;andalesansui;arialunicodems;lucidaunicode</value>
+ </prop>
+ <prop oor:name="SubstFontsMS">
-+ <value>바탕;Batang</value>
++ <value>바탕;batang</value>
+ </prop>
+ <prop oor:name="SubstFontsPS">
+ <value/>
@@ -1980,7 +1980,7 @@
+ <value>ì¬ë‹ì›€;baekmukdotum;dotum;dotumche;gulim;gulimche;roundgothic;kodig;ì¬êµ´ë¦¼;sungulim;hygothicmedium;hygraphicmedium;hymyeongjolightk;haansoftdotum;myeongjo;ì¬ë°”탕;sunbatang;batang;batangche;gungsuh;gungsuhche;myeomjo;andalesansui;arialunicodems;lucidaunicode</value>
+ </prop>
+ <prop oor:name="SubstFontsMS">
-+ <value>ë‹ì›€;Dotum</value>
++ <value>ë‹ì›€;dotum</value>
+ </prop>
+ <prop oor:name="SubstFontsPS">
+ <value/>
@@ -2554,15 +2554,9 @@
+ <prop oor:name="SubstFonts">
+ <value>hggothicbsun;msgothic;mspgothic;hggothic;hggothicb;hggothice;ipagothic;kochigothic;sazanamigothic;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;andalesansui;arialunicodems;lucidaunicode</value>
+ </prop>
-+ <prop oor:name="SubstFontsMS">
-+ <value/>
-+ </prop>
-+ <prop oor:name="SubstFontsPS">
-+ <value/>
-+ </prop>
-+ <prop oor:name="SubstFontsHTML">
-+ <value/>
-+ </prop>
++ <prop oor:name="SubstFontsMS"><value>msgothic</value></prop>
++ <prop oor:name="SubstFontsPS"><value/></prop>
++ <prop oor:name="SubstFontsHTML"><value/></prop>
+ <prop oor:name="FontWeight">
+ <value>Normal</value>
+ </prop>
@@ -2922,11 +2916,13 @@
+ <prop oor:name="SubstFonts">
+ <value>msgothic;hggothicb;hggothice;andalesansui;gothic;hgmincholightj;msmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;andalesansui;arialunicodems;lucidaunicode</value>
+ </prop>
++ <prop oor:name="SubstFontsMS"><value>msgothic</value></prop>
+ </node>
+ <node oor:name="hgpgothicbsun" oor:op="replace">
+ <prop oor:name="SubstFonts">
+ <value>mspgothic;hgpgothicb;hgpgothice;andalesansui</value>
+ </prop>
++ <prop oor:name="SubstFontsMS"><value>mspgothic</value></prop>
+ </node>
+ <node oor:name="hgmincholsun" oor:op="replace">
+ <prop oor:name="SubstFonts">
@@ -2937,20 +2933,15 @@
+ <prop oor:name="SubstFonts">
+ <value>mspmincho;ipapmincho;sazanamimincho;kochimincho;andalesansui;mincho;arialunicodems;lucidaunicode</value>
+ </prop>
++ <prop oor:name="SubstFontsMS"><value>msmincho</value></prop>
+ </node>
+ <node oor:name="hggothic" oor:op="replace">
+ <prop oor:name="SubstFonts">
+ <value>msgothic;mspgothic;hggothicb;hggothice;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;andalesansui;arialunicodems;lucidaunicode</value>
+ </prop>
-+ <prop oor:name="SubstFontsMS">
-+ <value/>
-+ </prop>
-+ <prop oor:name="SubstFontsPS">
-+ <value/>
-+ </prop>
-+ <prop oor:name="SubstFontsHTML">
-+ <value/>
-+ </prop>
++ <prop oor:name="SubstFontsMS"><value>msgothic</value></prop>
++ <prop oor:name="SubstFontsPS"><value/></prop>
++ <prop oor:name="SubstFontsHTML"><value/></prop>
+ <prop oor:name="FontWeight">
+ <value>Normal</value>
+ </prop>
@@ -2965,15 +2956,9 @@
+ <prop oor:name="SubstFonts">
+ <value>msgothic;mspgothic;hggothic;hggothice;ipagothic;ipapgothic;sazanamigothic;kochigothic;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;andalesansui;arialunicodems;lucidaunicode</value>
+ </prop>
-+ <prop oor:name="SubstFontsMS">
-+ <value/>
-+ </prop>
-+ <prop oor:name="SubstFontsPS">
-+ <value/>
-+ </prop>
-+ <prop oor:name="SubstFontsHTML">
-+ <value/>
-+ </prop>
++ <prop oor:name="SubstFontsMS"><value>msgothic</value></prop>
++ <prop oor:name="SubstFontsPS"><value/></prop>
++ <prop oor:name="SubstFontsHTML"><value/></prop>
+ <prop oor:name="FontWeight">
+ <value>Normal</value>
+ </prop>
@@ -3011,15 +2996,9 @@
+ <prop oor:name="SubstFonts">
+ <value>hgmincholightj;msmincho;mspmincho;ipapmincho;sazanamimincho;kochimincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;andalesansui;arialunicodems;lucidaunicode</value>
+ </prop>
-+ <prop oor:name="SubstFontsMS">
-+ <value/>
-+ </prop>
-+ <prop oor:name="SubstFontsPS">
-+ <value/>
-+ </prop>
-+ <prop oor:name="SubstFontsHTML">
-+ <value/>
-+ </prop>
++ <prop oor:name="SubstFontsMS"><value>msmincho</value></prop>
++ <prop oor:name="SubstFontsPS"><value/></prop>
++ <prop oor:name="SubstFontsHTML"><value/></prop>
+ <prop oor:name="FontWeight">
+ <value>Normal</value>
+ </prop>
@@ -3057,15 +3036,9 @@
+ <prop oor:name="SubstFonts">
+ <value>hgmincholsun;msmincho;mspmincho;ipapmincho;sazanamimincho;hgmincholightj;kochimincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;andalesansui;arialunicodems;lucidaunicode</value>
+ </prop>
-+ <prop oor:name="SubstFontsMS">
-+ <value/>
-+ </prop>
-+ <prop oor:name="SubstFontsPS">
-+ <value/>
-+ </prop>
-+ <prop oor:name="SubstFontsHTML">
-+ <value/>
-+ </prop>
++ <prop oor:name="SubstFontsMS"><value>msmincho</value></prop>
++ <prop oor:name="SubstFontsPS"><value/></prop>
++ <prop oor:name="SubstFontsHTML"><value/></prop>
+ <prop oor:name="FontWeight">
+ <value>Normal</value>
+ </prop>
@@ -4437,15 +4410,9 @@
+ <prop oor:name="SubstFonts">
+ <value>hgmincholsun;hgmincholightj;msmincho;mspmincho;ipamincho;ipapmincho;sazanamimincho;hgmincholightj;hgminchoj;kochimincho;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;arialunicodems;lucidaunicode</value>
+ </prop>
-+ <prop oor:name="SubstFontsMS">
-+ <value/>
-+ </prop>
-+ <prop oor:name="SubstFontsPS">
-+ <value/>
-+ </prop>
-+ <prop oor:name="SubstFontsHTML">
-+ <value/>
-+ </prop>
++ <prop oor:name="SubstFontsMS"><value>msmincho</value></prop>
++ <prop oor:name="SubstFontsPS"><value/></prop>
++ <prop oor:name="SubstFontsHTML"><value/></prop>
+ <prop oor:name="FontWeight">
+ <value>Normal</value>
+ </prop>
@@ -4460,15 +4427,9 @@
+ <prop oor:name="SubstFonts">
+ <value>hgmincholsun;hgmincholightj;msmincho;sazanamimincho;hgmincholightj;mspmincho;hgminchoj;hgminchol;minchol;hgheiseimin;heiseimin;mincho;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;arialunicodems;lucidaunicode</value>
+ </prop>
-+ <prop oor:name="SubstFontsMS">
-+ <value/>
-+ </prop>
-+ <prop oor:name="SubstFontsPS">
-+ <value/>
-+ </prop>
-+ <prop oor:name="SubstFontsHTML">
-+ <value/>
-+ </prop>
++ <prop oor:name="SubstFontsMS"><value>msmincho</value></prop>
++ <prop oor:name="SubstFontsPS"><value/></prop>
++ <prop oor:name="SubstFontsHTML"><value/></prop>
+ <prop oor:name="FontWeight">
+ <value>Normal</value>
+ </prop>
@@ -4483,15 +4444,9 @@
+ <prop oor:name="SubstFonts">
+ <value>hgmincholsun;hgmincholightj;msmincho;ipamincho;sazanamimincho;kochimincho;mspmincho;hgminchoj;hgminchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;arialunicodems;lucidaunicode</value>
+ </prop>
-+ <prop oor:name="SubstFontsMS">
-+ <value/>
-+ </prop>
-+ <prop oor:name="SubstFontsPS">
-+ <value/>
-+ </prop>
-+ <prop oor:name="SubstFontsHTML">
-+ <value/>
-+ </prop>
++ <prop oor:name="SubstFontsMS"><value>msmincho</value></prop>
++ <prop oor:name="SubstFontsPS"><value/></prop>
++ <prop oor:name="SubstFontsHTML"><value/></prop>
+ <prop oor:name="FontWeight">
+ <value>Normal</value>
+ </prop>
@@ -4759,15 +4714,9 @@
+ <prop oor:name="SubstFonts">
+ <value>hggothicbsun;mspgothic;hggothic;hggothicb;ipagothic;sazanamigothic;kochigothic;hggothice;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;arialunicodems;lucidaunicode</value>
+ </prop>
-+ <prop oor:name="SubstFontsMS">
-+ <value/>
-+ </prop>
-+ <prop oor:name="SubstFontsPS">
-+ <value/>
-+ </prop>
-+ <prop oor:name="SubstFontsHTML">
-+ <value/>
-+ </prop>
++ <prop oor:name="SubstFontsMS"><value>msgothic</value></prop>
++ <prop oor:name="SubstFontsPS"><value/></prop>
++ <prop oor:name="SubstFontsHTML"><value/></prop>
+ <prop oor:name="FontWeight">
+ <value>Normal</value>
+ </prop>
@@ -4851,15 +4800,9 @@
+ <prop oor:name="SubstFonts">
+ <value>hggothicbsun;mspgothic;msgothic;hggothic;hggothicb;ipauigothic;sazanamigothic;kochigothic;hggothice;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;arialunicodems;lucidaunicode</value>
+ </prop>
-+ <prop oor:name="SubstFontsMS">
-+ <value/>
-+ </prop>
-+ <prop oor:name="SubstFontsPS">
-+ <value/>
-+ </prop>
-+ <prop oor:name="SubstFontsHTML">
-+ <value/>
-+ </prop>
++ <prop oor:name="SubstFontsMS"><value>msgothic</value></prop>
++ <prop oor:name="SubstFontsPS"><value/></prop>
++ <prop oor:name="SubstFontsHTML"><value/></prop>
+ <prop oor:name="FontWeight">
+ <value>Normal</value>
+ </prop>
@@ -5357,15 +5300,9 @@
+ <prop oor:name="SubstFonts">
+ <value>hgpgothicbsun;mspgothic;msgothic;hggothic;hggothicb;ipapgothic;sazanamigothic;kochigothic;hggothice;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;andalesansui;arialunicodems;lucidaunicode</value>
+ </prop>
-+ <prop oor:name="SubstFontsMS">
-+ <value/>
-+ </prop>
-+ <prop oor:name="SubstFontsPS">
-+ <value/>
-+ </prop>
-+ <prop oor:name="SubstFontsHTML">
-+ <value/>
-+ </prop>
++ <prop oor:name="SubstFontsMS"><value>mspgothic</value></prop>
++ <prop oor:name="SubstFontsPS"><value/></prop>
++ <prop oor:name="SubstFontsHTML"><value/></prop>
+ <prop oor:name="FontWeight">
+ <value>Normal</value>
+ </prop>
@@ -5426,15 +5363,9 @@
+ <prop oor:name="SubstFonts">
+ <value>hgpminchobsun;hgmincholightj;mspmincho;msmincho;ipapmincho;sazanamimincho;kochimincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;arialunicodems;lucidaunicode</value>
+ </prop>
-+ <prop oor:name="SubstFontsMS">
-+ <value/>
-+ </prop>
-+ <prop oor:name="SubstFontsPS">
-+ <value/>
-+ </prop>
-+ <prop oor:name="SubstFontsHTML">
-+ <value/>
-+ </prop>
++ <prop oor:name="SubstFontsMS"><value>mspmincho</value></prop>
++ <prop oor:name="SubstFontsPS"><value/></prop>
++ <prop oor:name="SubstFontsHTML"><value/></prop>
+ <prop oor:name="FontWeight">
+ <value>Normal</value>
+ </prop>
@@ -8333,6 +8264,7 @@
- <value>ì¬ë°”탕;sunbatang;baekmukbatang;ì¬êµ´ë¦¼;sungulim;hymyeongjolightk;myeongjo;batangche;gungsuh;gungsuhche;myeomjo;gulim;gulimche;ì¬ë‹ì›€;sundotum;dotum;dotumche;roundgothic;kodig;andalesansui;arialunicodems;lucidaunicode</value>
- </prop>
- <prop oor:name="SubstFontsMS">
+- <value>바탕</value>
- <value/>
- </prop>
- <prop oor:name="SubstFontsPS">
@@ -8356,7 +8288,7 @@
- <value>ì¬ë°”탕;batang;baekmukbatang;myeongjo;batangche;gungsuh;gungsuhche;hymyeongjolightk;myeomjo;ì¬êµ´ë¦¼;sungulim;gulim;gulimche;ì¬ë‹ì›€;sundotum;dotum;dotumche;roundgothic;kodig;andalesansui;arialunicodems;lucidaunicode</value>
- </prop>
- <prop oor:name="SubstFontsMS">
-- <value>바탕;Batang</value>
+- <value>바탕;batang</value>
- </prop>
- <prop oor:name="SubstFontsPS">
- <value/>
@@ -9207,7 +9139,7 @@
- <value>ì¬ë‹ì›€;baekmukdotum;dotum;dotumche;gulim;gulimche;roundgothic;kodig;ì¬êµ´ë¦¼;sungulim;hygothicmedium;hygraphicmedium;hymyeongjolightk;haansoftdotum;myeongjo;ì¬ë°”탕;sunbatang;batang;batangche;gungsuh;gungsuhche;myeomjo;andalesansui;arialunicodems;lucidaunicode</value>
- </prop>
- <prop oor:name="SubstFontsMS">
-- <value>ë‹ì›€;Dotum</value>
+- <value>ë‹ì›€;dotum</value>
- </prop>
- <prop oor:name="SubstFontsPS">
- <value/>
@@ -9758,15 +9690,9 @@
- <prop oor:name="SubstFonts">
- <value>hggothicbsun;msgothic;mspgothic;hggothic;hggothicb;hggothice;ipagothic;kochigothic;sazanamigothic;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;centurygothic;avantgarde;itcavantgarde;gothic;avantgardegothic;conga;andalesansui;arialunicodems;lucidaunicode</value>
- </prop>
-- <prop oor:name="SubstFontsMS">
-- <value/>
-- </prop>
-- <prop oor:name="SubstFontsPS">
-- <value/>
-- </prop>
-- <prop oor:name="SubstFontsHTML">
-- <value/>
-- </prop>
+- <prop oor:name="SubstFontsMS"><value>msgothic</value></prop>
+- <prop oor:name="SubstFontsPS"><value/></prop>
+- <prop oor:name="SubstFontsHTML"><value/></prop>
- <prop oor:name="FontWeight">
- <value>Normal</value>
- </prop>
@@ -9781,15 +9707,9 @@
- <prop oor:name="SubstFonts">
- <value>hggothicbsun;msgothic;mspgothic;hggothic;hggothicb;hggothice;ipagothic;kochigothic;sazanamigothic;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;andalesansui;arialunicodems;lucidaunicode</value>
- </prop>
-- <prop oor:name="SubstFontsMS">
-- <value/>
-- </prop>
-- <prop oor:name="SubstFontsPS">
-- <value/>
-- </prop>
-- <prop oor:name="SubstFontsHTML">
-- <value/>
-- </prop>
+- <prop oor:name="SubstFontsMS"><value>msgothic</value></prop>
+- <prop oor:name="SubstFontsPS"><value/></prop>
+- <prop oor:name="SubstFontsHTML"><value/></prop>
- <prop oor:name="FontWeight">
- <value>Normal</value>
- </prop>
@@ -9804,15 +9724,9 @@
- <prop oor:name="SubstFonts">
- <value>msgothic;mspgothic;hggothic;hggothicb;hggothice;ipapgothic;sazanamigothic;kochigothic;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;centurygothic;avantgarde;itcavantgarde;gothic;avantgardegothic;conga;andalesansui;arialunicodems;lucidaunicode</value>
- </prop>
-- <prop oor:name="SubstFontsMS">
-- <value/>
-- </prop>
-- <prop oor:name="SubstFontsPS">
-- <value/>
-- </prop>
-- <prop oor:name="SubstFontsHTML">
-- <value/>
-- </prop>
+- <prop oor:name="SubstFontsMS"><value>msgothic</value></prop>
+- <prop oor:name="SubstFontsPS"><value/></prop>
+- <prop oor:name="SubstFontsHTML"><value/></prop>
- <prop oor:name="FontWeight">
- <value>Normal</value>
- </prop>
@@ -10149,11 +10063,13 @@
- <prop oor:name="SubstFonts">
- <value>msgothic;hggothicb;hggothice;andalesansui;gothic;hgmincholightj;msmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;andalesansui;arialunicodems;lucidaunicode</value>
- </prop>
+- <prop oor:name="SubstFontsMS"><value>msgothic</value></prop>
- </node>
- <node oor:name="hgpgothicbsun" oor:op="replace">
- <prop oor:name="SubstFonts">
- <value>mspgothic;hgpgothicb;hgpgothice;andalesansui</value>
- </prop>
+- <prop oor:name="SubstFontsMS"><value>mspgothic</value></prop>
- </node>
- <node oor:name="hgmincholsun" oor:op="replace">
- <prop oor:name="SubstFonts">
@@ -10164,20 +10080,15 @@
- <prop oor:name="SubstFonts">
- <value>mspmincho;ipapmincho;sazanamimincho;kochimincho;andalesansui;mincho;arialunicodems;lucidaunicode</value>
- </prop>
+- <prop oor:name="SubstFontsMS"><value>msmincho</value></prop>
- </node>
- <node oor:name="hggothic" oor:op="replace">
- <prop oor:name="SubstFonts">
- <value>msgothic;mspgothic;hggothicb;hggothice;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;andalesansui;arialunicodems;lucidaunicode</value>
- </prop>
-- <prop oor:name="SubstFontsMS">
-- <value/>
-- </prop>
-- <prop oor:name="SubstFontsPS">
-- <value/>
-- </prop>
-- <prop oor:name="SubstFontsHTML">
-- <value/>
-- </prop>
+- <prop oor:name="SubstFontsMS"><value>msgothic</value></prop>
+- <prop oor:name="SubstFontsPS"><value/></prop>
+- <prop oor:name="SubstFontsHTML"><value/></prop>
- <prop oor:name="FontWeight">
- <value>Normal</value>
- </prop>
@@ -10192,15 +10103,9 @@
- <prop oor:name="SubstFonts">
- <value>msgothic;mspgothic;hggothic;hggothice;ipagothic;ipapgothic;sazanamigothic;kochigothic;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;andalesansui;arialunicodems;lucidaunicode</value>
- </prop>
-- <prop oor:name="SubstFontsMS">
-- <value/>
-- </prop>
-- <prop oor:name="SubstFontsPS">
-- <value/>
-- </prop>
-- <prop oor:name="SubstFontsHTML">
-- <value/>
-- </prop>
+- <prop oor:name="SubstFontsMS"><value>msgothic</value></prop>
+- <prop oor:name="SubstFontsPS"><value/></prop>
+- <prop oor:name="SubstFontsHTML"><value/></prop>
- <prop oor:name="FontWeight">
- <value>Normal</value>
- </prop>
@@ -10238,15 +10143,9 @@
- <prop oor:name="SubstFonts">
- <value>hgmincholightj;msmincho;mspmincho;ipapmincho;sazanamimincho;kochimincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;andalesansui;arialunicodems;lucidaunicode</value>
- </prop>
-- <prop oor:name="SubstFontsMS">
-- <value/>
-- </prop>
-- <prop oor:name="SubstFontsPS">
-- <value/>
-- </prop>
-- <prop oor:name="SubstFontsHTML">
-- <value/>
-- </prop>
+- <prop oor:name="SubstFontsMS"><value>msmincho</value></prop>
+- <prop oor:name="SubstFontsPS"><value/></prop>
+- <prop oor:name="SubstFontsHTML"><value/></prop>
- <prop oor:name="FontWeight">
- <value>Normal</value>
- </prop>
@@ -10284,15 +10183,9 @@
- <prop oor:name="SubstFonts">
- <value>hgmincholsun;msmincho;mspmincho;ipapmincho;sazanamimincho;hgmincholightj;kochimincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;andalesansui;arialunicodems;lucidaunicode</value>
- </prop>
-- <prop oor:name="SubstFontsMS">
-- <value/>
-- </prop>
-- <prop oor:name="SubstFontsPS">
-- <value/>
-- </prop>
-- <prop oor:name="SubstFontsHTML">
-- <value/>
-- </prop>
+- <prop oor:name="SubstFontsMS"><value>msmincho</value></prop>
+- <prop oor:name="SubstFontsPS"><value/></prop>
+- <prop oor:name="SubstFontsHTML"><value/></prop>
- <prop oor:name="FontWeight">
- <value>Normal</value>
- </prop>
@@ -11664,15 +11557,9 @@
- <prop oor:name="SubstFonts">
- <value>hgmincholsun;hgmincholightj;msmincho;mspmincho;ipamincho;ipapmincho;sazanamimincho;hgmincholightj;hgminchoj;kochimincho;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;arialunicodems;lucidaunicode</value>
- </prop>
-- <prop oor:name="SubstFontsMS">
-- <value/>
-- </prop>
-- <prop oor:name="SubstFontsPS">
-- <value/>
-- </prop>
-- <prop oor:name="SubstFontsHTML">
-- <value/>
-- </prop>
+- <prop oor:name="SubstFontsMS"><value>msmincho</value></prop>
+- <prop oor:name="SubstFontsPS"><value/></prop>
+- <prop oor:name="SubstFontsHTML"><value/></prop>
- <prop oor:name="FontWeight">
- <value>Normal</value>
- </prop>
@@ -11687,15 +11574,9 @@
- <prop oor:name="SubstFonts">
- <value>hgmincholsun;hgmincholightj;msmincho;sazanamimincho;hgmincholightj;mspmincho;hgminchoj;hgminchol;minchol;hgheiseimin;heiseimin;mincho;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;arialunicodems;lucidaunicode</value>
- </prop>
-- <prop oor:name="SubstFontsMS">
-- <value/>
-- </prop>
-- <prop oor:name="SubstFontsPS">
-- <value/>
-- </prop>
-- <prop oor:name="SubstFontsHTML">
-- <value/>
-- </prop>
+- <prop oor:name="SubstFontsMS"><value>msmincho</value></prop>
+- <prop oor:name="SubstFontsPS"><value/></prop>
+- <prop oor:name="SubstFontsHTML"><value/></prop>
- <prop oor:name="FontWeight">
- <value>Normal</value>
- </prop>
@@ -11710,15 +11591,9 @@
- <prop oor:name="SubstFonts">
- <value>hgmincholsun;hgmincholightj;msmincho;ipamincho;sazanamimincho;kochimincho;mspmincho;hgminchoj;hgminchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;arialunicodems;lucidaunicode</value>
- </prop>
-- <prop oor:name="SubstFontsMS">
-- <value/>
-- </prop>
-- <prop oor:name="SubstFontsPS">
-- <value/>
-- </prop>
-- <prop oor:name="SubstFontsHTML">
-- <value/>
-- </prop>
+- <prop oor:name="SubstFontsMS"><value>msmincho</value></prop>
+- <prop oor:name="SubstFontsPS"><value/></prop>
+- <prop oor:name="SubstFontsHTML"><value/></prop>
- <prop oor:name="FontWeight">
- <value>Normal</value>
- </prop>
@@ -12584,15 +12459,9 @@
- <prop oor:name="SubstFonts">
- <value>hgpgothicbsun;mspgothic;msgothic;hggothic;hggothicb;ipapgothic;sazanamigothic;kochigothic;hggothice;andalesansui;gothic;hgmincholightj;msmincho;mspmincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;andalesansui;arialunicodems;lucidaunicode</value>
- </prop>
-- <prop oor:name="SubstFontsMS">
-- <value/>
-- </prop>
-- <prop oor:name="SubstFontsPS">
-- <value/>
-- </prop>
-- <prop oor:name="SubstFontsHTML">
-- <value/>
-- </prop>
+- <prop oor:name="SubstFontsMS"><value>mspgothic</value></prop>
+- <prop oor:name="SubstFontsPS"><value/></prop>
+- <prop oor:name="SubstFontsHTML"><value/></prop>
- <prop oor:name="FontWeight">
- <value>Normal</value>
- </prop>
@@ -12653,15 +12522,9 @@
- <prop oor:name="SubstFonts">
- <value>hgpminchobsun;hgmincholightj;mspmincho;msmincho;ipapmincho;sazanamimincho;kochimincho;hgminchoj;hgminchol;minchol;mincho;hgheiseimin;heiseimin;minchou;msgothic;mspgothic;hggothic;hggothicb;hggothice;andalesansui;gothic;arialunicodems;lucidaunicode</value>
- </prop>
-- <prop oor:name="SubstFontsMS">
-- <value/>
-- </prop>
-- <prop oor:name="SubstFontsPS">
-- <value/>
-- </prop>
-- <prop oor:name="SubstFontsHTML">
-- <value/>
-- </prop>
+- <prop oor:name="SubstFontsMS"><value>mspmincho</value></prop>
+- <prop oor:name="SubstFontsPS"><value/></prop>
+- <prop oor:name="SubstFontsHTML"><value/></prop>
- <prop oor:name="FontWeight">
- <value>Normal</value>
- </prop>
openoffice.org-1.9.97.rh156067.noversionedicons.patch:
desktop/redhat/makefile.mk | 0
desktop/share/makefile.mk | 0
sysui/desktop/redhat/makefile.mk | 3 ++-
sysui/desktop/share/makefile.mk | 3 ++-
4 files changed, 4 insertions(+), 2 deletions(-)
Index: openoffice.org-1.9.97.rh156067.noversionedicons.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-1.9.97.rh156067.noversionedicons.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.97.rh156067.noversionedicons.patch 29 Apr 2005 13:52:57 -0000 1.1
+++ openoffice.org-1.9.97.rh156067.noversionedicons.patch 10 Jun 2005 10:26:24 -0000 1.2
@@ -1,10 +1,10 @@
Index: desktop/redhat/makefile.mk
===================================================================
RCS file: /cvs/gsl/sysui/desktop/redhat/makefile.mk,v
-retrieving revision 1.12
-diff -u -p -r1.12 makefile.mk
---- openoffice.org.orig/sysui/desktop/redhat/makefile.mk 20 Apr 2005 11:35:49 -0000 1.12
-+++ openoffice.org/sysui/desktop/redhat/makefile.mk 29 Apr 2005 13:57:06 -0000
+retrieving revision 1.13
+diff -u -p -u -r1.13 makefile.mk
+--- openoffice.org.orig/sysui/desktop/redhat/makefile.mk 13 May 2005 09:28:19 -0000 1.13
++++ openoffice.org/sysui/desktop/redhat/makefile.mk 8 Jun 2005 15:18:52 -0000
@@ -73,7 +73,8 @@ TARGET=redhat
# --- Files --------------------------------------------------------
@@ -18,14 +18,14 @@
Index: desktop/share/makefile.mk
===================================================================
RCS file: /cvs/gsl/sysui/desktop/share/makefile.mk,v
-retrieving revision 1.4
-diff -u -p -r1.4 makefile.mk
---- openoffice.org.orig/sysui/desktop/share/makefile.mk 28 Apr 2005 09:20:38 -0000 1.4
-+++ openoffice.org/sysui/desktop/share/makefile.mk 29 Apr 2005 13:57:07 -0000
-@@ -76,7 +76,8 @@ TARGET=desktopshare
- # --- Files --------------------------------------------------------
-
- # GNOME does not like icon names with more than one '.'
+retrieving revision 1.5
+diff -u -p -u -r1.5 makefile.mk
+--- openoffice.org.orig/sysui/desktop/share/makefile.mk 6 Jun 2005 16:26:21 -0000 1.5
++++ openoffice.org/sysui/desktop/share/makefile.mk 8 Jun 2005 15:18:52 -0000
+@@ -79,7 +79,8 @@ TARGET=desktopshare
+ # even though the "icon_filename" in '.keys' is specified as filename
+ # without extension. Since it alos does not know how to handle "9-writer"
+ # type icons :-), we are stripping all '.' for now.
-ICONPREFIX = $(UNIXFILENAME:s/.//g)
+#ICONPREFIX = $(UNIXFILENAME:s/.//g)
+ICONPREFIX = openofficeorg
openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch:
filter/source/xsltfilter/XSLTFilter.java | 26 +++++------
filter/source/xsltfilter/XSLTFilterOLEExtracter.java | 24 +++++-----
filter/source/xsltfilter/XSLTXalanOLEExtracter.java | 2
filter/source/xsltfilter/XSLTransformer.java | 44 +++++++++----------
source/xsltfilter/XSLTFilter.java | 0
source/xsltfilter/XSLTFilterOLEExtracter.java | 0
source/xsltfilter/XSLTXalanOLEExtracter.java | 0
source/xsltfilter/XSLTransformer.java | 0
8 files changed, 48 insertions(+), 48 deletions(-)
Index: openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch 3 May 2005 13:56:58 -0000 1.1
+++ openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch 10 Jun 2005 10:26:24 -0000 1.2
@@ -1,16 +1,210 @@
+Index: source/xsltfilter/XSLTFilter.java
+===================================================================
+RCS file: /cvs/framework/filter/source/xsltfilter/XSLTFilter.java,v
+retrieving revision 1.3
+diff -u -p -r1.3 XSLTFilter.java
+--- openoffice.org.orig/filter/source/xsltfilter/XSLTFilter.java 22 Jul 2003 11:06:45 -0000 1.3
++++ openoffice.org/filter/source/xsltfilter/XSLTFilter.java 2 Jun 2005 09:31:37 -0000
+@@ -108,10 +108,10 @@ import com.sun.star.lib.uno.adapter.*;
+ public class XSLTFilter {
+
+ // ----------------------------------------------------------------
+- private static boolean DEBUG = false;
+- private static boolean DEBUGCHK = false;
+- private static String debugfile;
+- private static void debug(String s)
++ public static boolean DEBUG = false;
++ public static boolean DEBUGCHK = false;
++ public static String debugfile;
++ public static void debug(String s)
+ {
+ if (!DEBUGCHK) {
+ if (System.getProperty("xsltfilter.debug")==null){
+@@ -133,7 +133,7 @@ public class XSLTFilter {
+ }
+ // ----------------------------------------------------------------
+
+- private static XMultiServiceFactory xMSF;
++ public static XMultiServiceFactory xMSF;
+
+ /** This inner class provides the component as a concrete implementation
+ * of the service description. It implements the needed interfaces.
+@@ -147,13 +147,13 @@ public class XSLTFilter {
+ XDocumentHandler,
+ XTypeProvider {
+
+- private boolean indent;
+- private XInputStream xInStream;
+- private XOutputStream xOutStream;
+- private XOutputStream xos;
+- private String sExportStyleSheet;
+- private String doctype_public;
+- private String doctype_system;
++ public boolean indent;
++ public XInputStream xInStream;
++ public XOutputStream xOutStream;
++ public XOutputStream xos;
++ public String sExportStyleSheet;
++ public String doctype_public;
++ public String doctype_system;
+
+ public _XSLTFilter()
+ {
+@@ -168,7 +168,7 @@ public class XSLTFilter {
+
+ /** The component will be registered under this name.
+ */
+- static private final String __serviceName = "com.sun.star.documentconversion.XSLTFilter";
++ static public final String __serviceName = "com.sun.star.documentconversion.XSLTFilter";
+
+ public com.sun.star.uno.Type[] getTypes() {
+ Type[] typeReturn = {};
+Index: source/xsltfilter/XSLTFilterOLEExtracter.java
+===================================================================
+RCS file: /cvs/framework/filter/source/xsltfilter/XSLTFilterOLEExtracter.java,v
+retrieving revision 1.2
+diff -u -p -r1.2 XSLTFilterOLEExtracter.java
+--- openoffice.org.orig/filter/source/xsltfilter/XSLTFilterOLEExtracter.java 29 Mar 2005 12:23:52 -0000 1.2
++++ openoffice.org/filter/source/xsltfilter/XSLTFilterOLEExtracter.java 2 Jun 2005 09:31:37 -0000
+@@ -90,11 +90,11 @@ import com.sun.star.uno.UnoRuntime;
+ * see XSLTXalanOLEExtracter.java
+ */
+ public class XSLTFilterOLEExtracter {
+- protected XMultiServiceFactory m_xMSF;
+- protected XNameContainer m_Storage;
+- protected XStream m_RootStream;
+- protected XConnection m_Connection;
+- protected String sConnectionString;
++ public XMultiServiceFactory m_xMSF;
++ public XNameContainer m_Storage;
++ public XStream m_RootStream;
++ public XConnection m_Connection;
++ public String sConnectionString;
+
+ public XSLTFilterOLEExtracter ()
+ {}
+@@ -357,7 +357,7 @@ public class XSLTFilterOLEExtracter {
+ }
+ /** separtates the uno-url into 3 different parts.
+ */
+- protected static String[] parseUnoUrl( String url )
++ public static String[] parseUnoUrl( String url )
+ {
+ String [] aRet = new String [3];
+
+@@ -381,7 +381,7 @@ public class XSLTFilterOLEExtracter {
+ return aRet;
+ }
+ //connect to running OOo and keep an XConnection object so that we can disconnect from OOo as we wish
+- protected XMultiServiceFactory connectAwareGetServiceFactory()throws com.sun.star.uno.Exception,
++ public XMultiServiceFactory connectAwareGetServiceFactory()throws com.sun.star.uno.Exception,
+ com.sun.star.uno.RuntimeException,
+ Exception
+ {
+@@ -434,14 +434,14 @@ public class XSLTFilterOLEExtracter {
+ return xFac;
+ }
+
+- protected static boolean DEBUG = false;
+- protected static boolean DEBUGCHK = false;
+- protected static String debugfile;
+- protected static void debugln(String s)
++ public static boolean DEBUG = false;
++ public static boolean DEBUGCHK = false;
++ public static String debugfile;
++ public static void debugln(String s)
+ {
+ debug(s + "\n");
+ }
+- protected static void debug(String s)
++ public static void debug(String s)
+ {
+ if (!DEBUGCHK) {
+ if (System.getProperty("xsltfilter.debug")==null){
+Index: source/xsltfilter/XSLTXalanOLEExtracter.java
+===================================================================
+RCS file: /cvs/framework/filter/source/xsltfilter/XSLTXalanOLEExtracter.java,v
+retrieving revision 1.2
+diff -u -p -r1.2 XSLTXalanOLEExtracter.java
+--- openoffice.org.orig/filter/source/xsltfilter/XSLTXalanOLEExtracter.java 29 Mar 2005 12:24:03 -0000 1.2
++++ openoffice.org/filter/source/xsltfilter/XSLTXalanOLEExtracter.java 2 Jun 2005 09:31:37 -0000
+@@ -89,4 +89,4 @@ public class XSLTXalanOLEExtracter exten
+ {
+ exit();
+ }
+-}
+\ No newline at end of file
++}
Index: source/xsltfilter/XSLTransformer.java
===================================================================
RCS file: /cvs/framework/filter/source/xsltfilter/XSLTransformer.java,v
-retrieving revision 1.10
-diff -u -p -r1.10 XSLTransformer.java
---- openoffice.org.orig/filter/source/xsltfilter/XSLTransformer.java 29 Mar 2005 14:53:43 -0000 1.10
-+++ openoffice.org/filter/source/xsltfilter/XSLTransformer.java 3 May 2005 11:10:45 -0000
-@@ -102,7 +102,7 @@ public class XSLTransformer
+retrieving revision 1.12
+diff -u -p -r1.12 XSLTransformer.java
+--- openoffice.org.orig/filter/source/xsltfilter/XSLTransformer.java 20 May 2005 07:47:10 -0000 1.12
++++ openoffice.org/filter/source/xsltfilter/XSLTransformer.java 2 Jun 2005 09:31:37 -0000
+@@ -95,35 +95,35 @@ public class XSLTransformer
+ *
+ */
- private static final int STREAM_BUFFER_SIZE = 4000;
- private static final String STATSPROP = "XSLTransformer.statsfile";
+- private XInputStream xistream;
+- private XOutputStream xostream;
+- private BufferedOutputStream ostream;
+-
+- // private static HashMap templatecache;
+-
+- private static final int STREAM_BUFFER_SIZE = 4000;
+- private static final String STATSPROP = "XSLTransformer.statsfile";
- private static PrintStream statsp;
-+ static PrintStream statsp;
+-
+- private String stylesheeturl;
+- private String targeturl;
+- private String targetbaseurl;
+- private String sourceurl;
+- private String sourcebaseurl;
+- private String pubtype = new String();
+- private String systype = new String();
++ public XInputStream xistream;
++ public XOutputStream xostream;
++ public BufferedOutputStream ostream;
++
++ // public static HashMap templatecache;
++
++ public static final int STREAM_BUFFER_SIZE = 4000;
++ public static final String STATSPROP = "XSLTransformer.statsfile";
++ public static PrintStream statsp;
++
++ public String stylesheeturl;
++ public String targeturl;
++ public String targetbaseurl;
++ public String sourceurl;
++ public String sourcebaseurl;
++ public String pubtype = new String();
++ public String systype = new String();
+
+ // processing thread
+- private Thread t;
++ public Thread t;
+
+ // listeners
+- private Vector listeners = new Vector();
++ public Vector listeners = new Vector();
+
+ //
+- private XMultiServiceFactory svcfactory;
++ public XMultiServiceFactory svcfactory;
+
+ // cache for transformations by stylesheet
+- private static Hashtable transformers = new Hashtable();
++ public static Hashtable transformers = new Hashtable();
+
+ // --- Initialization ---
+
+@@ -397,7 +397,7 @@ public class XSLTransformer
+ }
+
+ // --- component management interfaces... ---
+- private final static String _serviceName = "com.sun.star.comp.JAXTHelper";
++ public final static String _serviceName = "com.sun.star.comp.JAXTHelper";
- private String stylesheeturl;
- private String targeturl;
+ // Implement methods from interface XTypeProvider
+ public byte[] getImplementationId() {
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- openoffice.org.spec 31 May 2005 13:15:15 -0000 1.200
+++ openoffice.org.spec 10 Jun 2005 10:26:24 -0000 1.201
@@ -1,4 +1,8 @@
-%define ooo2ver 106
+%define ooo2ver 108
+%define ooo_rpm_release 4
+%define build_fc4 0
+%define build_fc5 1
+
#undef to get english only and no-langpacks for a quick smoketest build
%define langpacks 1
%if %{langpacks}
@@ -16,11 +20,18 @@
# other similiar duplicate/conflicting libs rh#156039#
%define _use_internal_dependency_generator 0
+%if %{build_fc4}
+%define release_extension .1.0.fc4
+%endif
+%if %{build_fc5}
+%define release_extension .2.0.fc5
+%endif
+
ExclusiveArch: %{ix86} ppc
Summary: OpenOffice.org comprehensive office suite.
Name: openoffice.org
Version: 1.9.%{ooo2ver}
-Release: 1
+Release: %{ooo_rpm_release}%{release_extension}
Epoch: 1
License: LGPL/SISSL
Group: Applications/Productivity
@@ -34,6 +45,7 @@
Source5: GSI_pa-IN.sdf
Source6: GSI_nn.sdf
Source7: GSI_nb.sdf
+Source8: GSI_ru.sdf
BuildRequires: perl, sed, zip, bzip2, unzip, tar, findutils
BuildRequires: autoconf, make >= 3.79.1, ant, flex, bison, perl-Compress-Zlib
BuildRequires: gcc >= %{gccver}, gcc-c++ >= %{gccver}, binutils
@@ -62,7 +74,7 @@
Patch8: openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch
Patch10: openoffice.org-1.9.87.warnnoterroronmissing.patch
Patch11: openoffice.org-1.9.87.rh151357.patch
-#Patch12: openoffice.org-1.9.87.oooXXXXX.fragments.patch
+Patch12: openoffice.org-1.9.87.oooXXXXX.fragments.patch
Patch13: openoffice.org-1.9.88.NONE.gcc3gcj4.patch
Patch14: openoffice.org-1.9.88.rh133741.alwaysgtk.patch
Patch15: openoffice.org-1.9.88.ooo46217.allowfallbacktoenUSfromotherenglish.patch
@@ -88,10 +100,15 @@
Patch37: openoffice.org-1.9.101.ooo48816.instsetoo_native.systempython.patch
Patch38: openoffice.org-1.9.103.oooXXXXX.installation.disable-epm.fix.patch
Patch39: openoffice.org-1.9.104-use-fontconfig-everywhere.patch
-Patch40: openoffice.org-1.9.104-gcjawt.patch
-Patch41: openoffice.org-1.9.104-berkeleydb-jni-casting-misuse.patch
-Patch42: openoffice.org-1.9.106.ooo50107.briges.noexecstack.patch
-Patch43: openoffice.org-1.9.106.oooXXXXX.comphelper.missingforward.patch
+Patch40: openoffice.org-1.9.104-berkeleydb-jni-casting-misuse.patch
+Patch41: workspace.gcc4fwdecl.patch
+Patch42: workspace-fpicker4.patch
+Patch43: openoffice.org-1.9.106.ooo44627.sal.brokencondition.patch
+Patch44: openoffice.org-1.9.106.ooo50172.icu.tamilvowelslikepango.patch
+Patch45: workspace.vcl39.patch
+Patch46: openoffice.org-1.9.108.ooo30133.lingucomponent.ukrainean.patch
+Patch47: openoffice.org-1.9.108.oooXXXXX.solenv.nostipwithsimpleinstall.patch
+Patch48: openoffice.org-1.9.108.ooo47323.binfilter.stupiddetect.patch
%define instdir %{_libdir}/openoffice.org%{version}
@@ -672,7 +689,7 @@
%patch8 -p1 -b .usetwodotzeropath.patch
%patch10 -p1 -b .warnnoterroronmissing.patch
%patch11 -p1 -b .rh151357.patch
-#%patch12 -p1 -b .oooXXXXX.fragments.patch
+%patch12 -p1 -b .oooXXXXX.fragments.patch
%patch13 -p1 -b .gcc3gcj4.patch
%patch14 -p1 -b .rh133741.alwaysgtk.patch
%patch15 -p1 -b .ooo46217.allowfallbacktoenUSfromotherenglish.patch
@@ -698,10 +715,15 @@
%patch37 -p1 -b .ooo48816.instsetoo_native.systempython.patch
%patch38 -p1 -b .oooXXXXX.installation.disable-epm.fix.patch
%patch39 -p1 -b .use-fontconfig-everwhere.patch
-%patch40 -p1 -b .gcjawt.patch
-%patch41 -p1 -b .berkeleydb-jni-casting-misuse.patch
-%patch42 -p1 -b .briges.noexecstack.patch
-%patch43 -p1 -b .oooXXXXX.comphelper.missingforward.patch
+%patch40 -p1 -b .berkeleydb-jni-casting-misuse.patch
+%patch41 -p1 -b .workspace.gcc4fwdecl.patch
+%patch42 -p1 -b .workspace-fpicker4.patch
+%patch43 -p1 -b .ooo44627.sal.brokencondition.patch
+%patch44 -p1 -b .ooo50172.icu.tamilvowelslikepango.patch
+%patch45 -p1 -b .workspace.vcl39.patch
+%patch46 -p1 -b .ooo30133.lingucomponent.ukrainean.patch
+%patch47 -p1 -b .oooXXXXX.solenv.nostipwithsimpleinstall.patch
+%patch48 -p1 -b .ooo47323.binfilter.stupiddetect.patch
#start ludicrous workaround
#while we include these libs we need this, if/when we move to system
@@ -724,6 +746,7 @@
tar xzf %{SOURCE2}
%build
echo build start time is `date`
+df -h .
if [ -z "$RPM_BUILD_NCPUS" ] ; then
if [ -x /usr/bin/getconf ] ; then
RPM_BUILD_NCPUS=$(/usr/bin/getconf _NPROCESSORS_ONLN)
@@ -754,39 +777,44 @@
if [ $MAXBUILDS -lt 2 ]; then
export MAXBUILDS=2
fi
-#enable filelocking during build, so avoid concurrent cppumakers colliding
-export SAL_ENABLE_FILE_LOCKING=1
#dance of the seven veils to get unpackaged install
export RPM=echo
export EPM=DUMMY
export PKGFORMAT="rpm -simple $RPM_BUILD_ROOT/%{instdir}"
export BUILD_SPECIAL=1
+#don't duplicate english helpcontent about the place
+unset DEFAULT_TO_ENGLISH_FOR_PACKING
%if !%{gcc_is_gcc4}
#this is needed for a mix of gcc/g++ 3.4.x and gcj/gij 4.0.x
export GCJ_CFLAGS="-I`$JAVACOMPILER -print-search-dirs | grep install | awk ' { print $2 } '`""include"
export GCJ_LDFLAGS="-L`$JAVACOMPILER -print-search-dirs | grep install | awk ' { print $2 } '`"
%endif
cd transex3/prj
-build --all -P$MAXBUILDS
+build --dlv_switch link --all -P$MAXBUILDS
deliver
localize -m -x -l gu-IN -f %{SOURCE3}
localize -m -x -l ta-IN -f %{SOURCE4}
localize -m -x -l pa-IN -f %{SOURCE5}
localize -m -x -l nn -f %{SOURCE6}
localize -m -x -l nb -f %{SOURCE7}
+localize -m -x -l ru -f %{SOURCE8}
cd ../..
cd instsetoo_native/util
-if ! build --all -P$MAXBUILDS; then
+if ! build --dlv_switch link --all -P$MAXBUILDS; then
+ echo Hmm...
+ df -h .
unset MAXPROCESS
- build --all
+ build --dlv_switch link --all
fi
echo build end time is `date`
+df -h .
%if %{langpacks}
echo start langpack install time is `date`
export MAXPROCESS=1
dmake ooolanguagepack
echo end langpack install time is `date`
+df -h .
%endif
# We don't need to carry around all the letter templates for all the languages
@@ -892,13 +920,16 @@
mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/writer.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-writer.desktop
rm -rf $RPM_BUILD_ROOT/%{instdir}/share/xdg
cp -r sysui/unxlng*/misc/redhat/usr/share/application-registry $RPM_BUILD_ROOT/%{_datadir}
-mkdir $RPM_BUILD_ROOT/%{_datadir}/icons
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons
cp -r sysui/unxlng*/misc/redhat/usr/share/icons/HighContrast $RPM_BUILD_ROOT/%{_datadir}/icons
tar -C $RPM_BUILD_ROOT/%{_datadir}/icons -xzf %{SOURCE1}
cp -r sysui/unxlng*/misc/redhat/usr/share/mime-info $RPM_BUILD_ROOT/%{_datadir}
cp -r sysui/unxlng*/misc/redhat/usr/share/mimelnk $RPM_BUILD_ROOT/%{_datadir}
rm -f $RPM_BUILD_ROOT/%{_datadir}/mimelnk/application.flag
+rm -rf $RPM_BUILD_ROOT/%{instdir}/readmes
+rm -rf $RPM_BUILD_ROOT/%{instdir}/licenses
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -2037,6 +2068,7 @@
%dir %{instdir}/share/registry/data
%dir %{instdir}/share/registry/data/org
%dir %{instdir}/share/registry/data/org/openoffice
+%{instdir}/share/registry/data/org/openoffice/FirstStartWizard.xcu
%{instdir}/share/registry/data/org/openoffice/Inet.xcu
%{instdir}/share/registry/data/org/openoffice/LDAP.xcu.sample
%dir %{instdir}/share/registry/data/org/openoffice/Office
@@ -2091,6 +2123,7 @@
%dir %{instdir}/share/registry/schema
%dir %{instdir}/share/registry/schema/org
%dir %{instdir}/share/registry/schema/org/openoffice
+%{instdir}/share/registry/schema/org/openoffice/FirstStartWizard.xcs
%{instdir}/share/registry/schema/org/openoffice/Inet.xcs
%{instdir}/share/registry/schema/org/openoffice/LDAP.xcs
%dir %{instdir}/share/registry/schema/org/openoffice/Office
@@ -2502,10 +2535,43 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
+* Fri Jun 10 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.108-4
+- ooo#50556# Filetype-label doesn't support special char
+
+* Thu Jun 09 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.108-3
+- rh#159930# use us english thesaurus for australia as well
+- add openoffice.org-1.9.108.ooo47323.binfilter.stupiddetect.patch for
+ rh#159851#/ooo#47323#
+
+* Thu Jun 09 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.108-2
+- add openoffice.org-1.9.108.ooo30133.lingucomponent.ukrainean.patch
+- rh#158923# korean not identified as CJK font by userinstall module
+- add openoffice.org-1.9.108.oooXXXXX.solenv.nostipwithsimpleinstall.patch
+ to fix rh#157254# useless debuginfo rpm
+- shrink buildtime space requirements
+
+* Wed Jun 08 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.108-1
+- bump to latest version
+- add workspace.vcl39.patch for rh#156176#
+- drop integrated openoffice.org-1.9.106.ooo50107.briges.noexecstack.patch
+- drop integrated openoffice.org-1.9.106.ooo45298.psprint.pspfontcache.patch
+- drop integrated workspace.gcj5.patch
+
+* Fri Jun 03 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.106-2
+- add openoffice.org-1.9.106.ooo50172.icu.tamilvowelslikepango.patch to fix (?)
+ rh#157815#
+
* Tue May 31 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.106-1
- bump to latest version
- drop gcc#20629# workaround
- add openoffice.org-1.9.106.ooo50107.briges.noexecstack.patch
+- add workspace.gcc4fwdecl.patch to workaround new gcc pickiness
+- add openoffice.org-1.9.106.ooo45298.psprint.pspfontcache.patch
+- upstream openoffice.org-1.9.104-gcjawt.patch as part of gcj5
+- add GSI_ru.sdf for rh#158539#
+- add workspace-fpicker4.patch
+- add openoffice.org-1.9.106.ooo44627.sal.brokencondition.patch to
+ fix rh#158489#
* Wed May 24 2005 Dan Williams <dcbw at redhat.com> - 1:1.9.104-3
- Remove openoffice.org-1.9.104.oooXXXXX.indic-font-fallbacks.patch
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources 31 May 2005 11:09:24 -0000 1.69
+++ sources 10 Jun 2005 10:26:24 -0000 1.70
@@ -4,5 +4,6 @@
176aa81d51a6ed28c5e9a14696a8d208 openoffice.org-jakubicons.tar.gz
8b62dddd6aacf37798d21a9116230b52 GSI_pa-IN.sdf
3d59875531c9c84789b0dedf758eb96d GSI_gu-IN.sdf
-a2c66d8f4be2f02484a6f9731f799382 openoffice.org-myspell-contrib.tar.gz
-7e55871c27385dcf858586180aacbed1 SRC680_m106.tar.bz2
+643082a18fe2c8dc4f49cec1069ce6a0 GSI_ru.sdf
+05ec2e1a41324158b1f5e3c89c82fa09 SRC680_m108.tar.bz2
+6b3bd4b8eb31dd067d4cb2dcc1ba5e12 openoffice.org-myspell-contrib.tar.gz
- Previous message (by thread): rpms/xerces-j2/devel XJavac.java, NONE, 1.1 .cvsignore, 1.6, 1.7 sources, 1.4, 1.5 xerces-j2-build.patch, 1.3, 1.4 xerces-j2.spec, 1.25, 1.26
- Next message (by thread): rpms/openoffice.org/FC-4 openoffice.org.spec,1.201,1.202
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list