rpms/openoffice.org/devel openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch, NONE, 1.1 openoffice.org-2.4.0.ooo84684.vcl.fixfontconfig.patch, NONE, 1.1 openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch, NONE, 1.1 openoffice.org-2.4.0.ooo85055.psprint.linetoolong.patch, NONE, 1.1 .cvsignore, 1.140, 1.141 openoffice.org-1.9.114.rh161886.rpath.desktop.patch, 1.7, 1.8 openoffice.org-1.9.87.rh151357.setlangtolocale.patch, 1.21, 1.22 openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch, 1.1, 1.2 openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch, 1.17, 1.18 openoffice.org-2.0.3.ooo80816.selinux.bridges.patch, 1.1, 1.2 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.38, 1.39 openoffice.org-2.2.0.ooo68717.gstreamer.video.patch, 1.4, 1.5 openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch, 1.1, 1.2 openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch, 1.2, 1.3 openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch, 1.5, 1.6 openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch, 1.1, 1.2 openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch, 1.1, 1.2 openoffice.org.spec, 1.1366, 1.1367 pseudoworkspace.valgrind1.patch, 1.22, 1.23 sources, 1.258, 1.259 workspace.notes2.patch, 1.1, 1.2 workspace.unifysound01.patch, 1.9, 1.10 openoffice.org-1.9.129.ooo54603.fontconfig.patch, 1.18, NONE openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch, 1.2, NONE openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch, 1.3, NONE openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch, 1.6, NONE openoffice.org-2.2.0.ooo53397.linkopt.patch, 1.12, NONE openoffice.org-2.2.1.ooo80424.vcl.honourwidthtype.patch, 1.2, NONE openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch, 1.3, NONE openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch, 1.1, NONE openoffice.org-2.3.0.ooo80735.cppu.map.patch, 1.1, NONE openoffice.org-2.3.0.ooo80967.ucb.neon27.patch, 1.1, NONE openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch, 1.1, NONE openoffice.org-2.3.0.ooo81314.i18npool.crash.patch, 1.1, NONE openoffice.org-2.3.0.ooo81936.sc.maketypesagree.patch, 1.1, NONE openoffice.org-2.3.0.ooo83591.vcl.checkboxes.patch, 1.1, NONE openoffice.org-2.3.1.ooo82911.sd.insertbackground.patch, 1.1, NONE openoffice.org-2.3.1.ooo83930.sw.flushanchors.patch, 1.1, NONE workspace.as6.patch, 1.1, NONE workspace.cmcfixes39.patch, 1.1, NONE workspace.configrefactor01.patch, 1.3, NONE workspace.fpicker7.patch, 1.1, NONE workspace.gcc430.patch, 1.1, NONE workspace.locales24.patch, 1.1, NONE workspace.npower7.patch, 1.1, NONE workspace.sw8u10bf02.patch, 1.1, NONE
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Tue Jan 8 14:52:52 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16185
Modified Files:
.cvsignore openoffice.org-1.9.114.rh161886.rpath.desktop.patch
openoffice.org-1.9.87.rh151357.setlangtolocale.patch
openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch
openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
openoffice.org.spec pseudoworkspace.valgrind1.patch sources
workspace.notes2.patch workspace.unifysound01.patch
Added Files:
openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch
openoffice.org-2.4.0.ooo84684.vcl.fixfontconfig.patch
openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch
openoffice.org-2.4.0.ooo85055.psprint.linetoolong.patch
Removed Files:
openoffice.org-1.9.129.ooo54603.fontconfig.patch
openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch
openoffice.org-2.2.0.ooo53397.linkopt.patch
openoffice.org-2.2.1.ooo80424.vcl.honourwidthtype.patch
openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch
openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch
openoffice.org-2.3.0.ooo80735.cppu.map.patch
openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch
openoffice.org-2.3.0.ooo81314.i18npool.crash.patch
openoffice.org-2.3.0.ooo81936.sc.maketypesagree.patch
openoffice.org-2.3.0.ooo83591.vcl.checkboxes.patch
openoffice.org-2.3.1.ooo82911.sd.insertbackground.patch
openoffice.org-2.3.1.ooo83930.sw.flushanchors.patch
workspace.as6.patch workspace.cmcfixes39.patch
workspace.configrefactor01.patch workspace.fpicker7.patch
workspace.gcc430.patch workspace.locales24.patch
workspace.npower7.patch workspace.sw8u10bf02.patch
Log Message:
first 2.4.0 attempt
openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch:
--- NEW FILE openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch ---
Index: source/editeng/unolingu.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/editeng/unolingu.cxx,v
retrieving revision 1.36
diff -u -r1.36 unolingu.cxx
--- openoffice.org.orig/svx/source/editeng/unolingu.cxx 27 Jun 2007 18:01:18 -0000 1.36
+++ openoffice.org/svx/source/editeng/unolingu.cxx 25 Nov 2007 11:54:12 -0000
@@ -526,12 +526,15 @@
// 1: regular OOo dictionary path
// 2: user-dictionary path (where OOo linguistic by bad choice places downloaded dictionaries
// when the permissions for the share tree are missing. E.g. in user installations.)
- const USHORT nDirectories = 3;
- String aDirectories[ 3 /*nDirectories*/ ];
+ const USHORT nDirectories = 6;
+ String aDirectories[ 6 /*nDirectories*/ ];
aDirectories[0] = linguistic::GetFileURL( SvtPathOptions::PATH_LINGUISTIC, String::CreateFromAscii( "x" ) );
aDirectories[1] = linguistic::GetFileURL( SvtPathOptions::PATH_LINGUISTIC, String::CreateFromAscii( "ooo" ) );
//!! warning: see bUseFile below when changing this index !!
aDirectories[2] = linguistic::GetFileURL( SvtPathOptions::PATH_USERDICTIONARY, String::CreateFromAscii( "x" ) );
+ aDirectories[3] = String::CreateFromAscii( "file:///usr/share/myspell" );
+ aDirectories[4] = String::CreateFromAscii( "file:///usr/share/hyphen" );
+ aDirectories[5] = String::CreateFromAscii( "file:///usr/share/mythes" );
//
aDirectories[0].Erase( aDirectories[0].Len() - 2, 2 ); // erase /x from URL
aDirectories[2].Erase( aDirectories[2].Len() - 2, 2 ); // erase /x from URL
Index: source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
===================================================================
RCS file: /cvs/whiteboard/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx,v
retrieving revision 1.20
diff -u -r1.20 hyphenimp.cxx
--- openoffice.org.orig/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx 11 Oct 2006 09:25:13 -0000 1.20
+++ openoffice.org/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx 25 Nov 2007 13:59:17 -0000
@@ -186,8 +186,10 @@
int numusr; // number of user dictionary entries
int numshr; // number of shared dictionary entries
+ int numsys; // number of system dictionary entries
dictentry * spdict = NULL; // shared dict entry pointer
dictentry * updict = NULL; // user dict entry pointer
+ std::vector<dictentry*> postsyspdict;
std::vector<dictentry*> postspdict;
std::vector<dictentry*> postupdict;
@@ -234,15 +236,44 @@
postspdict.push_back(&spdict[i]);
}
+ numsys = 0;
+ const OUString sSystemDictPath(A2OU("file:///usr/share/hyphen"));
+ osl::Directory aSystemDicts(sSystemDictPath);
+ if (aSystemDicts.open() == osl::FileBase::E_None)
+ {
+ DirectoryItem aItem;
+ FileStatus aFileStatus(FileStatusMask_FileURL);
+ while (aSystemDicts.getNextItem(aItem) == osl::FileBase::E_None)
+ {
+ aItem.getFileStatus(aFileStatus);
+ rtl::OUString sPath = aFileStatus.getFileURL();
+ if (sPath.lastIndexOf(A2OU(".dic")) == sPath.getLength()-4)
+ {
+ sal_Int32 nStartIndex = sPath.lastIndexOf(sal_Unicode('/')) + 1;
+ sal_Int32 nIndex = nStartIndex;
+ nIndex += strlen("hyph_");
+ OUString sLang = sPath.getToken( 0, '_', nIndex );
+ OUString sRegion = sPath.getToken( 0, '.', nIndex );
+ sPath = sPath.copy(nStartIndex, nIndex - nStartIndex - 1);
+ dictentry *entry = new dictentry;
+ entry->filename = strdup(OUStringToOString(sPath, RTL_TEXTENCODING_UTF8).getStr());
+ entry->lang = strdup(OUStringToOString(sLang, RTL_TEXTENCODING_UTF8).getStr());
+ entry->region = strdup(OUStringToOString(sRegion, RTL_TEXTENCODING_UTF8).getStr());
+ postsyspdict.push_back(entry);
+ }
+ }
+ }
+
numusr = postupdict.size();
numshr = postspdict.size();
+ numsys = postsyspdict.size();
// we really should merge these and remove duplicates but since
// users can name their dictionaries anything they want it would
// be impossible to know if a real duplication exists unless we
// add some unique key to each hyphenation dictionary
// we can worry about that when and if issuezilla's flood in
- numdict = numusr + numshr;
+ numdict = numsys + numshr + numusr;
if (numdict) {
aDicts = new HDInfo[numdict];
@@ -295,6 +326,32 @@
k++;
}
+ // now add the system dictionaries
+ for (i = 0; i < numsys; i++) {
+ Locale nLoc( A2OU(postsyspdict[i]->lang), A2OU(postsyspdict[i]->region), OUString() );
+ newloc = 1;
+ for (j = 0; j < numlocs; j++) {
+ if (nLoc == pLocale[j]) newloc = 0;
+ }
+ if (newloc) {
+ pLocale[numlocs] = nLoc;
+ numlocs++;
+ }
+ aDicts[k].aPtr = NULL;
+ aDicts[k].aLoc = nLoc;
+ aDicts[k].aEnc = 0;
+ aDicts[k].aName = sSystemDictPath + A2OU("/") + A2OU(postsyspdict[i]->filename);
+ aDicts[k].apCC = new CharClass(nLoc);
+
+ free(postsyspdict[i]->filename);
+ free(postsyspdict[i]->lang);
+ free(postsyspdict[i]->region);
+ delete postsyspdict[i];
+
+ k++;
+ }
+
+
// reallocate the size to just cover the unique locales
aSuppLocales.realloc(numlocs);
Index: source/hyphenator/altlinuxhyph/hyphen/makefile.mk
===================================================================
RCS file: /cvs/whiteboard/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk,v
retrieving revision 1.14
diff -u -r1.14 makefile.mk
--- openoffice.org.orig/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk 31 Jul 2007 13:07:55 -0000 1.14
+++ openoffice.org/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk 25 Nov 2007 13:59:17 -0000
@@ -44,7 +44,7 @@
.IF "$(SYSTEM_HYPH)" == "YES"
HNJLIB=$(HYPHEN_LIB)
.ELSE
-HNJLIB=-lhnj
+HNJLIB=-lhyphen
.ENDIF
.ELIF "$(GUI)"=="OS2"
HNJLIB=$(SLB)\libhnj.lib
Index: source/spellcheck/spell/sspellimp.cxx
===================================================================
RCS file: /cvs/whiteboard/lingucomponent/source/spellcheck/spell/sspellimp.cxx,v
retrieving revision 1.18
diff -u -r1.18 sspellimp.cxx
--- openoffice.org.orig/lingucomponent/source/spellcheck/spell/sspellimp.cxx 16 Sep 2006 16:12:16 -0000 1.18
+++ openoffice.org/lingucomponent/source/spellcheck/spell/sspellimp.cxx 25 Nov 2007 13:59:18 -0000
@@ -160,14 +160,15 @@
int numusr; // number of user dictionary entries
int numshr; // number of shared dictionary entries
+ int numsys; // number of system dictionary entries
dictentry * spdict; // shared dict entry pointer
dictentry * updict; // user dict entry pointer
SvtPathOptions aPathOpt;
+ std::vector<dictentry *> postsyspdict;
std::vector<dictentry *> postspdict;
std::vector<dictentry *> postupdict;
-
if (!numdict) {
// invoke a dictionary manager to get the user dictionary list
@@ -214,14 +215,42 @@
postspdict.push_back(&spdict[i]);
}
+ numsys = 0;
+ const OUString sSystemDictPath(A2OU("file:///usr/share/myspell"));
+ osl::Directory aSystemDicts(sSystemDictPath);
+ if (aSystemDicts.open() == osl::FileBase::E_None)
+ {
+ DirectoryItem aItem;
+ FileStatus aFileStatus(FileStatusMask_FileURL);
+ while (aSystemDicts.getNextItem(aItem) == osl::FileBase::E_None)
+ {
+ aItem.getFileStatus(aFileStatus);
+ rtl::OUString sPath = aFileStatus.getFileURL();
+ if (sPath.lastIndexOf(A2OU(".dic")) == sPath.getLength()-4)
+ {
+ sal_Int32 nStartIndex = sPath.lastIndexOf(sal_Unicode('/')) + 1;
+ sal_Int32 nIndex = nStartIndex;
+ OUString sLang = sPath.getToken( 0, '_', nIndex );
+ OUString sRegion = sPath.getToken( 0, '.', nIndex );
+ sPath = sPath.copy(nStartIndex, nIndex - nStartIndex - 1);
+ dictentry *entry = new dictentry;
+ entry->filename = strdup(OUStringToOString(sPath, RTL_TEXTENCODING_UTF8).getStr());
+ entry->lang = strdup(OUStringToOString(sLang, RTL_TEXTENCODING_UTF8).getStr());
+ entry->region = strdup(OUStringToOString(sRegion, RTL_TEXTENCODING_UTF8).getStr());
+ postsyspdict.push_back(entry);
+ }
+ }
+ }
+
numusr = postupdict.size();
numshr = postspdict.size();
+ numsys = postsyspdict.size();
// we really should merge these and remove duplicates but since
// users can name their dictionaries anything they want it would
// be impossible to know if a real duplication exists unless we
// add some unique key to each myspell dictionary
- numdict = numshr + numusr;
+ numdict = numsys + numshr + numusr;
if (numdict) {
aDicts = new Hunspell* [numdict];
@@ -271,6 +300,31 @@
k++;
}
+ // now add the system dictionaries
+ for (i = 0; i < numsys; i++) {
+ Locale nLoc( A2OU(postsyspdict[i]->lang), A2OU(postsyspdict[i]->region), OUString() );
+ newloc = 1;
+ for (j = 0; j < numlocs; j++) {
+ if (nLoc == pLocale[j]) newloc = 0;
+ }
+ if (newloc) {
+ pLocale[numlocs] = nLoc;
+ numlocs++;
+ }
+ aDLocs[k] = nLoc;
+ aDicts[k] = NULL;
+ aDEncs[k] = 0;
+ aDNames[k] = sSystemDictPath + A2OU("/") + A2OU(postsyspdict[i]->filename);
+
+ free(postsyspdict[i]->filename);
+ free(postsyspdict[i]->lang);
+ free(postsyspdict[i]->region);
+ delete postsyspdict[i];
+
+ k++;
+ }
+
+
aSuppLocales.realloc(numlocs);
} else {
Index: source/thesaurus/libnth/nthesimp.cxx
===================================================================
RCS file: /cvs/whiteboard/lingucomponent/source/thesaurus/libnth/nthesimp.cxx,v
retrieving revision 1.10
diff -u -r1.10 nthesimp.cxx
--- openoffice.org.orig/lingucomponent/source/thesaurus/libnth/nthesimp.cxx 18 Jul 2007 09:41:49 -0000 1.10
+++ openoffice.org/lingucomponent/source/thesaurus/libnth/nthesimp.cxx 28 Nov 2007 15:57:52 -0000
@@ -172,9 +172,11 @@
dictentry * upthes; // shared thesaurus list entry pointer
std::vector<dictentry*> postspthes;
std::vector<dictentry*> postupthes;
+ std::vector<dictentry*> postsyspthes;
SvtPathOptions aPathOpt;
int numusr; // number of user dictionary entries
int numshr = 0; // number of shared dictionary entries
+ int numsys; // number of system dictionary entries
if (!numthes) {
@@ -221,15 +223,43 @@
postspthes.push_back(&spthes[i]);
}
+ numsys = 0;
+ const OUString sSystemDictPath(A2OU("file:///usr/share/mythes"));
+ osl::Directory aSystemDicts(sSystemDictPath);
+ if (aSystemDicts.open() == osl::FileBase::E_None)
+ {
+ DirectoryItem aItem;
+ FileStatus aFileStatus(FileStatusMask_FileURL);
+ while (aSystemDicts.getNextItem(aItem) == osl::FileBase::E_None)
+ {
+ aItem.getFileStatus(aFileStatus);
+ rtl::OUString sPath = aFileStatus.getFileURL();
+ if (sPath.lastIndexOf(A2OU("_v2.idx")) == sPath.getLength()-7)
+ {
+ sal_Int32 nStartIndex = sPath.lastIndexOf(sal_Unicode('/')) + 1;
+ sal_Int32 nIndex = nStartIndex;
+ nIndex += strlen("th_");
+ OUString sLang = sPath.getToken( 0, '_', nIndex );
+ OUString sRegion = sPath.getToken( 0, '_', nIndex );
+ sPath = sPath.copy(nStartIndex, nIndex - nStartIndex - 1 + 3);
+ dictentry *entry = new dictentry;
+ entry->filename = strdup(OUStringToOString(sPath, RTL_TEXTENCODING_UTF8).getStr());
+ entry->lang = strdup(OUStringToOString(sLang, RTL_TEXTENCODING_UTF8).getStr());
+ entry->region = strdup(OUStringToOString(sRegion, RTL_TEXTENCODING_UTF8).getStr());
+ postsyspthes.push_back(entry);
+ }
+ }
+ }
+
numusr = postupthes.size();
numshr = postspthes.size();
-
+ numsys = postsyspthes.size();
// we really should merge these and remove duplicates but since
// users can name their dictionaries anything they want it would
// be impossible to know if a real duplication exists unless we
// add some unique key to each dictionary
- numthes = numshr + numusr;
+ numthes = numsys + numshr + numusr;
if (numthes) {
aThes = new MyThes* [numthes];
@@ -283,6 +313,31 @@
k++;
}
+ // now add the system thesauri
+ for (i = 0; i < numsys; i++) {
+ Locale nLoc( A2OU(postsyspthes[i]->lang), A2OU(postsyspthes[i]->region), OUString() );
+ newloc = 1;
+ for (j = 0; j < numlocs; j++) {
+ if (nLoc == pLocale[j]) newloc = 0;
+ }
+ if (newloc) {
+ pLocale[numlocs] = nLoc;
+ numlocs++;
+ }
+ aTLocs[k] = nLoc;
+ aThes[k] = NULL;
+ aTEncs[k] = 0;
+ aTNames[k] = sSystemDictPath + A2OU("/") + A2OU(postsyspthes[i]->filename);
+ aCharSetInfo[k] = new CharClass(nLoc);
+
+ free(postsyspthes[i]->filename);
+ free(postsyspthes[i]->lang);
+ free(postsyspthes[i]->region);
+ delete postsyspthes[i];
+
+ k++;
+ }
+
aSuppLocales.realloc(numlocs);
} else {
--- openoffice.org.orig/solenv/inc/libs.mk 2007-12-12 13:15:14.000000000 +0000
+++ openoffice.org/inc/libs.mk 2008-01-08 08:56:51.000000000 +0000
@@ -326,7 +326,7 @@
SABLOT3RDLIB=-lsablot
APP3RDLIB=-lapp
SAMPLE3RDLIB=-lsample
-HNJLIB=-lhnj
+HNJLIB=-lhyphen
MYSPELLLIB=-lmyspell
COSVLIB=-lcosv
UDMLIB=-ludm
openoffice.org-2.4.0.ooo84684.vcl.fixfontconfig.patch:
--- NEW FILE openoffice.org-2.4.0.ooo84684.vcl.fixfontconfig.patch ---
Index: inc/vcl/outfont.hxx
===================================================================
RCS file: /cvs/gsl/vcl/inc/vcl/outfont.hxx,v
retrieving revision 1.3
diff -u -r1.3 outfont.hxx
--- openoffice.org.orig/vcl/inc/vcl/outfont.hxx 12 Dec 2007 13:19:39 -0000 1.3
+++ openoffice.org/vcl/inc/vcl/outfont.hxx 19 Dec 2007 10:55:40 -0000
@@ -237,6 +237,7 @@
// find the device font
ImplDevFontListData* FindFontFamily( const String& rFontName ) const;
ImplDevFontListData* ImplFindByFont( ImplFontSelectData&, bool bPrinter, ImplDirectFontSubstitution* ) const;
+ void ImplChangeByFontSubstitute(ImplFontSelectData& aFontSelData) const;
ImplDevFontListData* ImplFindBySearchName( const String& ) const;
// suggest fonts for glyph fallback
Index: source/gdi/outdev3.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/gdi/outdev3.cxx,v
retrieving revision 1.234
diff -u -r1.234 outdev3.cxx
--- openoffice.org.orig/vcl/source/gdi/outdev3.cxx 12 Dec 2007 13:20:52 -0000 1.234
+++ openoffice.org/vcl/source/gdi/outdev3.cxx 19 Dec 2007 10:56:52 -0000
@@ -2916,6 +2916,7 @@
if( !pEntry ) // no direct cache hit
{
// find the best matching logical font family and update font selector accordingly
+ pFontList->ImplChangeByFontSubstitute(aFontSelData);
pFontFamily = pFontList->ImplFindByFont( aFontSelData, mbPrinter, pDevSpecific );
DBG_ASSERT( (pFontFamily != NULL), "ImplFontCache::Get() No logical font found!" );
if( pFontFamily )
@@ -2970,6 +2971,19 @@
// -----------------------------------------------------------------------
+void ImplDevFontList::ImplChangeByFontSubstitute(ImplFontSelectData& aFontSelData) const
+{
+ if( mpPreMatchHook )
+ {
+ xub_StrLen nTokenPos = 0;
+ aFontSelData.maTargetName = GetNextFontToken( aFontSelData.maSearchName, nTokenPos );
+ if( mpPreMatchHook->FindFontSubstitute( aFontSelData ) )
+ aFontSelData.maName = aFontSelData.maSearchName;
+ }
+}
+
+// -----------------------------------------------------------------------
+
ImplDevFontListData* ImplDevFontList::ImplFindByFont( ImplFontSelectData& rFSD,
bool bPrinter, ImplDirectFontSubstitution* pDevSpecific ) const
{
openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch:
--- NEW FILE openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch ---
Index: makefile.mk
===================================================================
RCS file: /cvs/external/stlport/makefile.mk,v
retrieving revision 1.40
diff -u -r1.40 makefile.mk
--- openoffice.org.orig/stlport/makefile.mk 31 Jul 2007 13:10:28 -0000 1.40
+++ openoffice.org/stlport/makefile.mk 7 Jan 2008 14:58:06 -0000
@@ -150,7 +150,7 @@
BUILD_FLAGS=-f gcc.mak
.ENDIF # "$(OS)"=="MACOSX"
.ENDIF # "$(COMID)"=="gcc3"
- BUILD_ACTION=$(GNUMAKE)
+ BUILD_ACTION=rm ../stlport/stl/*.orig ../stlport/config/*.orig ../stlport/*.orig && $(GNUMAKE)
# build in parallel
BUILD_FLAGS+= -j$(MAXPROCESS)
.ENDIF
openoffice.org-2.4.0.ooo85055.psprint.linetoolong.patch:
--- NEW FILE openoffice.org-2.4.0.ooo85055.psprint.linetoolong.patch ---
Index: source/fontmanager/parseAFM.cxx
===================================================================
RCS file: /cvs/gsl/psprint/source/fontmanager/parseAFM.cxx,v
retrieving revision 1.10
diff -u -r1.10 parseAFM.cxx
--- openoffice.org.orig/psprint/source/fontmanager/parseAFM.cxx 21 Dec 2006 11:54:43 -0000 1.10
+++ openoffice.org/psprint/source/fontmanager/parseAFM.cxx 7 Jan 2008 15:32:51 -0000
@@ -285,7 +285,7 @@
;
idx = 0;
- while( ch != -1 && ! is_delimiter_Array[ ch & 255 ] )
+ while( ch != -1 && ! is_delimiter_Array[ ch & 255 ] && idx < MAX_NAME)
{
ident[idx++] = ch;
ch = stream->getChar();
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- .cvsignore 6 Jan 2008 12:39:03 -0000 1.140
+++ .cvsignore 8 Jan 2008 14:51:50 -0000 1.141
@@ -4,5 +4,4 @@
Tigert-templates.tar.gz
ooo64726.sdf
unowinreg.dll
-OOG680_m9.tar.bz2
OOH680_m1.tar.bz2
openoffice.org-1.9.114.rh161886.rpath.desktop.patch:
Index: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.114.rh161886.rpath.desktop.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- openoffice.org-1.9.114.rh161886.rpath.desktop.patch 16 Aug 2007 07:04:22 -0000 1.7
+++ openoffice.org-1.9.114.rh161886.rpath.desktop.patch 8 Jan 2008 14:51:50 -0000 1.8
@@ -5,7 +5,7 @@
diff -u -p -r1.17 soffice.sh
--- openoffice.org.orig/desktop/scripts/soffice.sh 15 Jun 2005 08:16:47 -0000 1.17
+++ openoffice.org/desktop/scripts/soffice.sh 5 Jul 2005 07:49:51 -0000
-@@ -77,96 +79,6 @@
+@@ -79,96 +79,6 @@
# change back directory
cd "$sd_cwd"
@@ -102,32 +102,32 @@
#collect all bootstrap variables specified on the command line
#so that they can be passed as arguments to javaldx later on
for arg in $@
-@@ -180,23 +92,11 @@
- if [ -x "$sd_prog/javaldx" ] ; then
- java_ld_library_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS`
- if [ "$java_ld_library_path" != "" ] ; then
-- case $sd_platform in
-- AIX)
-- LIBPATH=${java_ld_library_path}:${LIBPATH}
-- ;;
-- Darwin)
-- DYLD_LIBRARY_PATH=${java_ld_library_path}:${DYLD_LIBRARY_PATH}
-- ;;
-- HP-UX)
-- SHLIB_PATH=${java_ld_library_path}:${SHLIB_PATH}
-- ;;
-- IRIX*)
-- LD_LIBRARYN32_PATH=${java_ld_library_path}:${LD_LIBRARYN32_PATH}
-- ;;
-- *)
-- LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
-- ;;
-- esac
-+ if [ $LD_LIBRARY_PATH ]; then
-+ LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
-+ else
-+ LD_LIBRARY_PATH=${java_ld_library_path}
-+ fi
- fi
+@@ -186,23 +96,11 @@
+ java_ld_library_path=`"$sd_prog/../ure-link/javaldx" $BOOTSTRAPVARS`
+ fi
+ if [ "$java_ld_library_path" != "" ] ; then
+- case $sd_platform in
+- AIX)
+- LIBPATH=${java_ld_library_path}:${LIBPATH}
+- ;;
+- Darwin)
+- DYLD_LIBRARY_PATH=${java_ld_library_path}:${DYLD_LIBRARY_PATH}
+- ;;
+- HP-UX)
+- SHLIB_PATH=${java_ld_library_path}:${SHLIB_PATH}
+- ;;
+- IRIX*)
+- LD_LIBRARYN32_PATH=${java_ld_library_path}:${LD_LIBRARYN32_PATH}
+- ;;
+- *)
+- LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
+- ;;
+- esac
++ if [ $LD_LIBRARY_PATH ]; then
++ LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
++ else
++ LD_LIBRARY_PATH=${java_ld_library_path}
++ fi
fi
+ # misc. environment variables
openoffice.org-1.9.87.rh151357.setlangtolocale.patch:
Index: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.87.rh151357.setlangtolocale.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- openoffice.org-1.9.87.rh151357.setlangtolocale.patch 17 Aug 2007 17:57:33 -0000 1.21
+++ openoffice.org-1.9.87.rh151357.setlangtolocale.patch 8 Jan 2008 14:51:50 -0000 1.22
@@ -87,7 +87,7 @@
diff -u -p -r1.3 wizard.cxx
--- openoffice.org.orig/desktop/source/migration/wizard.cxx 11 Mar 2005 10:50:09 -0000 1.3
+++ openoffice.org/desktop/source/migration/wizard.cxx 29 Mar 2005 09:01:44 -0000
-@@ -729,25 +729,8 @@
+@@ -731,25 +731,8 @@
// yuck! no license :/
}
@@ -111,10 +111,10 @@
- aLangString += aLocale.Variant;
- }
- }
- #ifdef WNT
+ #if defined(WNT) || defined(OS2)
aLicensePath =
aBaseInstallPath + OUString::createFromAscii(szLicensePath)
-@@ -763,7 +746,6 @@
+@@ -765,7 +748,6 @@
+ aLangString
+ OUString::createFromAscii(szUNXLicenseExt);
#endif
@@ -144,26 +144,26 @@
diff -u -p -r1.19 glosdoc.cxx
--- openoffice.org.orig/sw/source/ui/misc/glosdoc.cxx 11 Jan 2005 12:42:19 -0000 1.19
+++ openoffice.org/sw/source/ui/misc/glosdoc.cxx 29 Jun 2005 11:02:03 -0000
-@@ -577,19 +577,7 @@ void SwGlossaries::UpdateGlosPath(sal_Bo
+@@ -557,19 +557,7 @@
}
aDirArr.DeleteAndDestroy(0, aDirArr.Count());
- if(!nTokenCount ||
-- sErrPath.Len() && (bPathChanged || sOldErrPath != sErrPath) )
+- m_sErrPath.Len() && (bPathChanged || m_sOldErrPath != m_sErrPath) )
- {
-- sOldErrPath = sErrPath;
+- m_sOldErrPath = m_sErrPath;
- // Falscher Pfad, d.h. AutoText-Verzeichnis existiert nicht
-
- ErrorHandler::HandleError( *new StringErrorInfo(
-- ERR_AUTOPATH_ERROR, sErrPath,
+- ERR_AUTOPATH_ERROR, m_sErrPath,
- ERRCODE_BUTTON_OK | ERRCODE_MSG_ERROR ));
-- bError = sal_True;
+- m_bError = sal_True;
- }
- else
-- bError = sal_False;
-+ bError = sal_False;
+- m_bError = sal_False;
++ m_bError = sal_False;
- if(pGlosArr)
+ if(m_pGlosArr)
{
Index: com/sun/star/wizards/letter/LetterWizardDialogImpl.java
===================================================================
@@ -253,7 +253,7 @@
diff -u -r1.28 optgdlg.cxx
--- openoffice.org.orig/svx/source/dialog/optgdlg.cxx 5 Jan 2006 17:58:40 -0000 1.28
+++ openoffice.org/svx/source/dialog/optgdlg.cxx 1 Feb 2006 11:04:37 -0000
-@@ -1183,8 +1183,6 @@
+@@ -1197,8 +1197,6 @@
/* -----------------------------23.11.00 13:06--------------------------------
---------------------------------------------------------------------------*/
@@ -262,7 +262,7 @@
// some things we'll need...
static const OUString sConfigSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider");
static const OUString sAccessSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess");
-@@ -1545,70 +1543,27 @@
+@@ -1534,70 +1532,27 @@
BOOL bRet = FALSE;
SfxObjectShell* pCurrentDocShell = SfxObjectShell::Current();
Reference< XPropertySet > xLinguProp( LinguMgr::GetLinguPropertySet(), UNO_QUERY );
@@ -343,7 +343,7 @@
}
if(aAsianSupportCB.GetSavedValue() != aAsianSupportCB.IsChecked() )
-@@ -1650,51 +1605,32 @@
+@@ -1639,51 +1594,32 @@
return FALSE;
}
@@ -417,25 +417,25 @@
//collect the configuration values first
aCurrentDocCB.Enable(FALSE);
//
-@@ -1717,45 +1653,89 @@
+@@ -1706,47 +1642,88 @@
catch(Exception&)
{
}
+
-+ LangToUI(eCurLang, eCurLangCJK, eCurLangCTL);
++ LangToUI(eCurLang, eCurLangCJK, eCurLangCTL);
+
-+ aWesternLanguageLB.SaveValue();
-+ aAsianLanguageLB.SaveValue();
-+ aComplexLanguageLB.SaveValue();
++ aWesternLanguageLB.SaveValue();
++ aAsianLanguageLB.SaveValue();
++ aComplexLanguageLB.SaveValue();
+
//overwrite them by the values provided by the DocShell
if(pCurrentDocShell)
{
- aCurrentDocCB.Enable(TRUE);
- aCurrentDocCB.Check(bLanguageCurrentDoc_Impl);
-+ Link aLink( LINK( this, OfaLanguagesTabPage, RegisterModify ) );
-+ aCurrentDocCB.SetClickHdl( aLink );
-+ sal_Bool bLanguageCurrentDoc_Impl=sal_False;
++ Link aLink( LINK( this, OfaLanguagesTabPage, RegisterModify ) );
++ aCurrentDocCB.SetClickHdl( aLink );
++ sal_Bool bLanguageCurrentDoc_Impl=sal_False;
const SfxPoolItem* pLang;
if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_LANGUAGE, FALSE, &pLang))
+ {
@@ -454,35 +454,25 @@
eCurLangCTL = ((const SvxLanguageItem*)pLang)->GetValue();
+ bLanguageCurrentDoc_Impl = true;
+ }
-+ aCurrentDocCB.Check(bLanguageCurrentDoc_Impl);
-+ aCurrentDocCB.Enable(!bLanguageCurrentDoc_Impl);
++ aCurrentDocCB.Check(bLanguageCurrentDoc_Impl);
++ aCurrentDocCB.Enable(!bLanguageCurrentDoc_Impl);
}
- if(LANGUAGE_NONE == eCurLang || LANGUAGE_DONTKNOW == eCurLang)
- aWesternLanguageLB.SelectLanguage(LANGUAGE_NONE);
- else
- aWesternLanguageLB.SelectLanguage(eCurLang);
--
+
- if(LANGUAGE_NONE == eCurLangCJK || LANGUAGE_DONTKNOW == eCurLangCJK)
- aAsianLanguageLB.SelectLanguage(LANGUAGE_NONE);
- else
- aAsianLanguageLB.SelectLanguage(eCurLangCJK);
++ aCurrentDocCB.SaveValue();
++}
- if(LANGUAGE_NONE == eCurLangCTL || LANGUAGE_DONTKNOW == eCurLangCTL)
- aComplexLanguageLB.SelectLanguage(LANGUAGE_NONE);
- else
- aComplexLanguageLB.SelectLanguage(eCurLangCTL);
-+ LangToUI(eCurLang, eCurLangCJK, eCurLangCTL);
-
-- aWesternLanguageLB.SaveValue();
-- aAsianLanguageLB.SaveValue();
-- aComplexLanguageLB.SaveValue();
- aCurrentDocCB.SaveValue();
-+}
-
-- sal_Bool bEnable = !pLangConfig->aLinguConfig.IsReadOnly( C2U("DefaultLocale") );
-- aWesternLanguageFT.Enable( bEnable );
-- aWesternLanguageLB.Enable( bEnable );
-- aWesternLanguageFI.Show(!bEnable);
+//-----------------------------------------------------------------------------
+void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet )
+{
@@ -495,11 +485,19 @@
+ aLocaleSettingLB.Enable(!bReadonly);
+ aLocaleSettingFT.Enable(!bReadonly);
+ aLocaleSettingFI.Show(bReadonly);
-+
+
+- aWesternLanguageLB.SaveValue();
+- aAsianLanguageLB.SaveValue();
+- aComplexLanguageLB.SaveValue();
+- aCurrentDocCB.SaveValue();
+ //
+ aDecimalSeparatorCB.Check( pLangConfig->aSysLocaleOptions.IsDecimalSeparatorAsLocale());
+ aDecimalSeparatorCB.SaveValue();
-+
+
+- sal_Bool bEnable = !pLangConfig->aLinguConfig.IsReadOnly( C2U("DefaultLocale") );
+- aWesternLanguageFT.Enable( bEnable );
+- aWesternLanguageLB.Enable( bEnable );
+-
+ // let LocaleSettingHdl enable/disable checkboxes for CJK/CTL support
+ // #i15812# must be done *before* the configured currency is set
+ // and update the decimal separator used for the given locale
@@ -527,9 +525,11 @@
+
+ RegisterModify( &aCurrentDocCB );
+- aWesternLanguageFI.Show(!bEnable);
+
// #i15812# controls for CJK/CTL already enabled/disabled from LocaleSettingHdl
#if 0
-@@ -1771,6 +1751,26 @@
+@@ -1773,6 +1750,26 @@
/* -----------------------------20.04.01 15:09--------------------------------
---------------------------------------------------------------------------*/
@@ -556,7 +556,7 @@
IMPL_LINK( OfaLanguagesTabPage, SupportHdl, CheckBox*, pBox )
{
DBG_ASSERT( pBox, "OfaLanguagesTabPage::SupportHdl(): pBox invalid" );
-@@ -1778,23 +1778,23 @@
+@@ -1780,23 +1777,23 @@
sal_Bool bCheck = pBox->IsChecked();
if ( &aAsianSupportCB == pBox )
{
openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch:
Index: openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch 4 Sep 2007 17:34:53 -0000 1.1
+++ openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch 8 Jan 2008 14:51:50 -0000 1.2
@@ -29,18 +29,3 @@
case JFW_E_RUNNING_JVM:
{
//This service should make sure that we do not start java twice.
-Index: plugins/sunmajor/pluginlib/gnujre.cxx
-===================================================================
-RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx,v
-retrieving revision 1.12
-diff -u -r1.12 gnujre.cxx
---- openoffice.org.orig/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 27 Sep 2006 10:54:01 -0000 1.12
-+++ openoffice.org/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 27 Nov 2006 16:04:59 -0000
-@@ -67,7 +67,6 @@
- {
- static char const* ar[]= {
- "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
-- "/gcj-4.1.1/libjvm.so",
- "/libgcj.so.7",
- "/libgcj.so.6"
- };
openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch:
Index: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch 20 Dec 2007 16:24:31 -0000 1.17
+++ openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch 8 Jan 2008 14:51:50 -0000 1.18
@@ -1099,14 +1099,6 @@
FcFontSet* FcFontList( FcConfig* pConfig, FcPattern* pPattern, FcObjectSet* pSet )
{ return m_pFcFontList( pConfig, pPattern, pSet ); }
-@@ -187,6 +189,7 @@
-
- FcResult FcPatternGetBool( const FcPattern* pPattern, const char* object, int n, FcBool* s )
- { return m_pFcPatternGetBool( pPattern, object, n, s ); }
-+
- void FcDefaultSubstitute( FcPattern* pPattern )
- { m_pFcDefaultSubstitute( pPattern ); }
- FcPattern* FcFontSetMatch( FcConfig* pConfig, FcFontSet **ppFontSet, int nset, FcPattern* pPattern, FcResult* pResult )
@@ -774,14 +777,19 @@
rWrapper.FcPatternAddDouble( pPattern, FC_PIXEL_SIZE, nSize);
openoffice.org-2.0.3.ooo80816.selinux.bridges.patch:
Index: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.3.ooo80816.selinux.bridges.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.3.ooo80816.selinux.bridges.patch 20 Aug 2007 07:02:32 -0000 1.1
+++ openoffice.org-2.0.3.ooo80816.selinux.bridges.patch 8 Jan 2008 14:51:50 -0000 1.2
@@ -229,7 +229,7 @@
diff -u -r1.5 vtablefactory.cxx
--- openoffice.org.orig/bridges/source/cpp_uno/shared/vtablefactory.cxx 2 May 2006 12:07:18 -0000 1.5
+++ openoffice.org/bridges/source/cpp_uno/shared/vtablefactory.cxx 17 May 2006 10:57:48 -0000
-@@ -41,6 +41,9 @@
+@@ -49,6 +49,9 @@
#include "osl/diagnose.h"
#include "osl/mutex.hxx"
@@ -239,15 +239,15 @@
#include "rtl/alloc.h"
#include "rtl/ustring.hxx"
#include "sal/types.h"
-@@ -53,6 +56,7 @@
+@@ -61,6 +64,7 @@
#if defined SAL_UNX
#include <unistd.h>
#include <sys/mman.h>
+#include <stdio.h>
#elif defined SAL_W32
#define WIN32_LEAN_AND_MEAN
- #pragma warning(push,1) // disable warnings within system headers
-@@ -64,9 +68,12 @@
+ #ifdef _MSC_VER
+@@ -80,9 +84,12 @@
using bridges::cpp_uno::shared::VtableFactory;
@@ -262,9 +262,9 @@
sal_Size pagesize;
#if defined SAL_UNX
#if defined FREEBSD || defined NETBSD
-@@ -79,40 +86,112 @@
- GetSystemInfo(&info);
- pagesize = info.dwPageSize;
+@@ -101,45 +108,118 @@
+ #else
+ #error Unsupported platform
#endif
- sal_Size n = (*size + (pagesize - 1)) & ~(pagesize - 1);
- void * p;
@@ -328,6 +328,9 @@
+ }
#elif defined SAL_W32
p = VirtualAlloc(0, n, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
+ #elif defined(SAL_OS2)
+ p = 0;
+ DosAllocMem( &p, n, PAG_COMMIT | PAG_READ | PAG_WRITE | OBJ_ANY);
#endif
- if (p != 0) {
- *size = n;
@@ -361,9 +364,13 @@
#elif defined SAL_W32
- (void) size; // unused
- VirtualFree(address, 0, MEM_RELEASE);
-+ VirtualFree(start, 0, MEM_RELEASE);
++ (void) size; // unused
++ VirtualFree(address, 0, MEM_RELEASE);
+ #elif defined(SAL_OS2)
+- (void) DosFreeMem( address);
++ (void) DosFreeMem( address);
#endif
-+ delete ref;
++ delete ref;
+ }
+ }
}
@@ -396,7 +403,7 @@
}
class VtableFactory::GuardedBlocks: public std::vector< Block > {
-@@ -133,11 +213,6 @@
+@@ -160,11 +240,6 @@
};
VtableFactory::GuardedBlocks::~GuardedBlocks() {
@@ -408,7 +415,7 @@
}
class VtableFactory::BaseOffset {
-@@ -172,28 +247,17 @@
+@@ -199,28 +274,17 @@
return offset;
}
@@ -438,7 +445,7 @@
}
VtableFactory::Vtables VtableFactory::getVtables(
-@@ -221,10 +285,6 @@
+@@ -248,10 +312,6 @@
return i->second;
}
@@ -449,7 +456,7 @@
void VtableFactory::createVtables(
GuardedBlocks & blocks, BaseOffset const & baseOffset,
typelib_InterfaceTypeDescription * type, bool includePrimary) const
-@@ -232,17 +292,16 @@
+@@ -259,17 +319,16 @@
if (includePrimary) {
sal_Int32 slotCount
= bridges::cpp_uno::shared::getPrimaryFunctions(type);
@@ -471,7 +478,7 @@
sal_Int32 vtableOffset = blocks.size() * sizeof (void **);
for (typelib_InterfaceTypeDescription const * type2 = type;
type2 != 0; type2 = type2->pBaseTypeDescription)
-@@ -251,14 +310,14 @@
+@@ -278,14 +337,14 @@
= bridges::cpp_uno::shared::getLocalFunctions(type2);
slots -= functionCount;
code = addLocalFunctions(
openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch:
Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 17 Oct 2007 11:42:07 -0000 1.38
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 8 Jan 2008 14:51:50 -0000 1.39
@@ -657,7 +657,7 @@
diff -u -r1.23 printdlg.cxx
--- openoffice.org.orig/svtools/source/dialogs/printdlg.cxx 17 Sep 2006 14:45:21 -0000 1.23
+++ openoffice.org/svtools/source/dialogs/printdlg.cxx 16 Nov 2006 14:14:35 -0000
-@@ -84,9 +84,64 @@
+@@ -85,9 +85,64 @@
#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
#include <comphelper/processfactory.hxx>
#endif
@@ -722,19 +722,20 @@
struct SvtPrinterImpl
{
-@@ -137,7 +190,10 @@
- maBtnHelp ( this, SvtResId( BTN_HELP ) ),
- maFlSepCopiesRange( this, SvtResId( FL_SEPCOPIESRANGE ) ),
- maFlSepButtonLine( this, SvtResId( FL_SEPBUTTONLINE ) ),
-- maAllFilterStr ( SvtResId( STR_ALLFILTER ) )
-+ maAllFilterStr ( SvtResId( STR_ALLFILTER ) ),
-+ maPaperFormatStr ( SvtResId( STR_PAPER_PAPER_TXT ) ),
-+ maOrientationStr ( SvtResId( STR_PAPER_ORIENTATION_TXT ) ),
+@@ -144,8 +199,10 @@
+ maBtnCancel ( this, SvtResId( BTN_CANCEL ) ),
+ maBtnHelp ( this, SvtResId( BTN_HELP ) ),
+ mbWithSheetsAndCells( bWithSheetsAndCells ),
+- maAllFilterStr ( SvtResId( STR_ALLFILTER ) )
+-
++ maAllFilterStr ( SvtResId( STR_ALLFILTER ) ),
++ maPaperFormatStr ( SvtResId( STR_PAPER_PAPER_TXT ) ),
++ maOrientationStr ( SvtResId( STR_PAPER_ORIENTATION_TXT ) ),
+ mnNativeHandle(0)
{
FreeResource();
-@@ -605,6 +661,250 @@
+@@ -781,6 +838,250 @@
// -----------------------------------------------------------------------
@@ -985,11 +986,11 @@
short PrintDialog::Execute()
{
if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() )
-@@ -622,15 +922,322 @@
+@@ -803,15 +1104,322 @@
ImplInitControls();
ImplModifyControlHdl( NULL );
-- // Dialog starten
+- // Dialog starten
- short nRet = ModalDialog::Execute();
+ short nRet = false;
@@ -1000,322 +1001,322 @@
- if ( TEMPPRINTER() )
- mpPrinter->SetPrinterProps( TEMPPRINTER() );
- ImplFillDialogData();
-+ unsigned long handle = GetParent() ? GetParent()->GetNativeHandle() : 0;
-+ GtkWindow *parent = handle ? GTK_WINDOW(handle) : NULL;
-+
-+ static ourhandle aHandle;
-+ if (!aHandle.pDialog)
-+ {
-+ aHandle.pDialog = gtk_print_unix_dialog_new (NULL, parent);
-+
-+ rtl::OString aOptions(rtl::OUStringToOString(maBtnOptions.GetText(), RTL_TEXTENCODING_UTF8));
-+ aOptions = aOptions.replace('~','_');
-+
-+ gtk_dialog_add_button( GTK_DIALOG( aHandle.pDialog ), aOptions.getStr(), GTK_RESPONSE_HELP);
-+
-+ rtl::OUString aProperties(maBtnProperties.GetText());
-+ aProperties = aProperties.copy(0, aProperties.lastIndexOf(OUString(RTL_CONSTASCII_USTRINGPARAM(("...")))));
-+ aProperties = aProperties.replaceAt(aProperties.indexOf('~'), 1, OUString());
-+
-+ gtk_print_unix_dialog_set_manual_capabilities(GTK_PRINT_UNIX_DIALOG(aHandle.pDialog),
-+ GtkPrintCapabilities(GTK_PRINT_CAPABILITY_COPIES | GTK_PRINT_CAPABILITY_COLLATE |
-+ GTK_PRINT_CAPABILITY_REVERSE|GTK_PRINT_CAPABILITY_GENERATE_PDF|GTK_PRINT_CAPABILITY_GENERATE_PS));
-+
-+ GtkWidget *box = gtk_vbox_new(FALSE, 18);
-+ gtk_container_set_border_width (GTK_CONTAINER (box), 12);
-+
-+ GtkWidget *tablewidget = gtk_table_new (2, 2, FALSE);
-+ gtk_table_set_row_spacings (GTK_TABLE (tablewidget), 6);
-+ gtk_table_set_col_spacings (GTK_TABLE (tablewidget), 12);
-+
-+ gtk_box_pack_start (GTK_BOX (box), tablewidget, FALSE, FALSE, 0);
-+
-+
-+ aHandle.orientwidget = gtk_combo_box_new_text();
-+ aHandle.paperwidget = gtk_combo_box_new_text();
-+
-+ gtk_table_attach(GTK_TABLE(tablewidget), gtk_label_new(
-+ rtl::OUStringToOString(maOrientationStr, RTL_TEXTENCODING_UTF8).getStr()),
-+ 0, 1, 0, 1, GTK_FILL, GTK_EXPAND, 0, 0);
-+ gtk_table_attach(GTK_TABLE(tablewidget), aHandle.orientwidget, 1, 2, 0, 1,
-+ GTK_FILL, GTK_EXPAND, 0, 0);
-+ gtk_table_attach(GTK_TABLE(tablewidget), gtk_label_new(
-+ rtl::OUStringToOString(maPaperFormatStr, RTL_TEXTENCODING_UTF8).getStr()),
-+ 0, 1, 1, 2, GTK_FILL, GTK_EXPAND, 0, 0);
-+ gtk_table_attach(GTK_TABLE(tablewidget), aHandle.paperwidget, 1, 2, 1, 2,
-+ GTK_FILL, GTK_EXPAND, 0, 0);
-+
-+ gtk_widget_show_all(box);
-+
-+ rtl::OString sProperties(OUStringToOString(aProperties, RTL_TEXTENCODING_UTF8));
-+ gtk_print_unix_dialog_add_custom_tab(GTK_PRINT_UNIX_DIALOG(aHandle.pDialog), box,
-+ gtk_label_new(sProperties.getStr()));
-+
-+ g_object_get(G_OBJECT(box),"parent", &aHandle.notebook,NULL);
-+ }
-+
-+ //make this the child of the OOo document window, and make it
-+ //the parent of the future OOo options window
-+ if (parent) gtk_window_set_transient_for(GTK_WINDOW(aHandle.pDialog), parent);
-+ mnNativeHandle = reinterpret_cast<unsigned long>(aHandle.pDialog);
-+
-+ GtkPrintSettings* pTempSettings = gtk_print_unix_dialog_get_settings(GTK_PRINT_UNIX_DIALOG(aHandle.pDialog));
-+ if (const QueueInfo* pInfo = (const QueueInfo*)(maLbName.GetEntryData(maLbName.GetSelectEntryPos())))
-+ {
-+ gtk_print_settings_set_printer(pTempSettings, rtl::OUStringToOString(pInfo->GetPrinterName(),
-+ RTL_TEXTENCODING_UTF8).getStr());
-+ }
-+
-+ gtk_print_settings_set_int(pTempSettings, "n-copies", GetCopyCount());
-+ gtk_print_settings_set_collate(pTempSettings, IsCollateEnabled() && IsCollateChecked());
-+ if (mbRange)
-+ {
-+ GtkPageRange page_ranges;
-+ page_ranges.start = page_ranges.end = maRangeText.ToInt32()-1;
-+ gtk_print_settings_set_page_ranges(pTempSettings, &page_ranges, 1);
-+ gtk_print_unix_dialog_set_current_page(GTK_PRINT_UNIX_DIALOG(aHandle.pDialog), page_ranges.start);
-+ }
-+ gtk_print_unix_dialog_set_settings(GTK_PRINT_UNIX_DIALOG(aHandle.pDialog), pTempSettings);
-+ g_object_unref(pTempSettings);
-+
-+ aHandle.pPrinter = mpPrinter;
-+
-+ SetProperties(aHandle, true);
-+
-+ gulong nHID_PageChange=0;
-+ if (aHandle.notebook && GTK_IS_NOTEBOOK(aHandle.notebook))
-+ {
-+ gtk_notebook_set_current_page(GTK_NOTEBOOK(aHandle.notebook), 0);
-+ nHID_PageChange = g_signal_connect(G_OBJECT(aHandle.notebook), "switch-page", G_CALLBACK(switch_page_cb), &aHandle);
-+ }
-+
-+ bool bContinue = true;
-+ while(bContinue)
-+ {
-+ bContinue = false;
-+ gint nStatus = gtk_dialog_run( GTK_DIALOG( aHandle.pDialog ) );
-+ switch( nStatus )
-+ {
-+ case GTK_RESPONSE_HELP:
-+ ClickOptionsHdl();
-+ bContinue = true;
-+ break;
-+ case GTK_RESPONSE_OK:
-+ {
-+ GtkPrintSettings* pSettings = gtk_print_unix_dialog_get_settings (GTK_PRINT_UNIX_DIALOG(aHandle.pDialog));
-+
-+ rtl::OUString sPath;
-+ if (const gchar *uri = gtk_print_settings_get(pSettings, GTK_PRINT_SETTINGS_OUTPUT_URI))
-+ {
-+ if (gchar *pFile = g_filename_from_uri (uri, NULL, NULL))
-+ {
-+ sPath = rtl::OUString((const sal_Char *)pFile, strlen((const sal_Char*)(pFile)), osl_getThreadTextEncoding());
-+ g_free(pFile);
-+ }
-+ }
-+ const gchar *pStr = gtk_print_settings_get(pSettings, GTK_PRINT_SETTINGS_PRINT_PAGES);
-+ if (pStr && !strcmp(pStr, "ranges"))
-+ {
-+ maRangeText = String();
-+ gint num_ranges;
-+ const GtkPageRange* pRanges = gtk_print_settings_get_page_ranges(pSettings, &num_ranges);
-+ for (gint i = 0; i < num_ranges; ++i)
-+ {
-+ maRangeText.Append(String::CreateFromInt32(pRanges[i].start+1));
-+ if (pRanges[i].start != pRanges[i].end)
-+ {
-+ maRangeText.AppendAscii("-");
-+ maRangeText.Append(String::CreateFromInt32(pRanges[i].end+1));
-+ }
-+
-+ if (i != num_ranges-1)
-+ maRangeText.AppendAscii(",");
-+ }
-+ meCheckRange = PRINTDIALOG_RANGE;
-+ }
-+ else if (pStr && !strcmp(pStr, "current"))
-+ {
-+ meCheckRange = PRINTDIALOG_RANGE;
-+
-+ try
-+ {
-+ Reference < XFramesSupplier > xDesktop = Reference < XFramesSupplier >(
-+ ::comphelper::getProcessServiceFactory()->
-+ createInstance( ASCII_STR("com.sun.star.frame.Desktop") ), UNO_QUERY );
-+ Reference < XFrame > xFrame( xDesktop->getActiveFrame() );
-+ if ( !xFrame.is() )
-+ xFrame = Reference < XFrame >( xDesktop, UNO_QUERY );
-+
-+ Reference< XController > xController;
-+ Reference< XSpreadsheetView > xSpreadsheetView;
-+ Reference< XSpreadsheet> xSheet;
-+ Reference< XSpreadsheetDocument > xSheetDoc;
-+ Reference< XIndexAccess > xSheets;
-+ Reference< XNamed > xName;
-+
-+ if (xFrame.is())
-+ xController = xFrame->getController();
-+ if (xController.is())
-+ xSpreadsheetView = Reference< XSpreadsheetView >(xController, UNO_QUERY);
-+ if (xSpreadsheetView.is())
-+ xSheet = Reference< XSpreadsheet>(xSpreadsheetView->getActiveSheet());
-+ if (xSheet.is())
-+ xName = Reference < XNamed >(xSheet, UNO_QUERY);
-+ if (xName.is())
-+ xSheetDoc = Reference< XSpreadsheetDocument >(xController->getModel(), UNO_QUERY);
-+ if (xSheetDoc.is())
-+ xSheets = Reference< XIndexAccess >(xSheetDoc->getSheets(), UNO_QUERY);
-+ if (xSheets.is())
-+ {
-+ const rtl::OUString &rName = xName->getName();
-+
-+ sal_Int32 i;
-+
-+ for( i = 0; i < xSheets->getCount(); ++i)
-+ {
-+ Reference < XNamed > xItem =
-+ Reference < XNamed >(xSheets->getByIndex(i), UNO_QUERY);
-+ if (rName == xItem->getName())
-+ break;
-+ }
-+
-+ if (i < xSheets->getCount())
-+ maRangeText = String::CreateFromInt32( i + 1 );
-+ }
-+ }
-+ catch (...) {}
-+ }
-+ else
-+ meCheckRange = PRINTDIALOG_ALL;
-+
-+ //Tell OOo to only print 1 simple copy, we'll stick everything
-+ //else through cups
-+ SetCopyCount(1);
-+ EnableCollate(false);
-+ CheckCollate(false);
-+
-+ pStr = 0;
-+
-+ if (sPath.getLength())
-+ pStr = gtk_print_settings_get(pSettings, GTK_PRINT_SETTINGS_OUTPUT_FILE_FORMAT);
-+
-+ if (pStr && !strcmp(pStr, "pdf"))
-+ {
-+ gtk_widget_hide( aHandle.pDialog );
-+ rtl::OUString sFileURL;
-+ FileBase::getFileURLFromSystemPath(sPath, sFileURL);
-+ ExportAsPDF(sFileURL, meCheckRange, maRangeText);
-+ }
-+ else
-+ {
-+ nRet = TRUE;
-+ rtl::OUString sNewPrinterName(mpPrinter->GetName());
-+
-+ if (sPath.getLength())
-+ {
-+ mpPrinter->EnablePrintFile(true);
-+ mpPrinter->SetPrintFile(sPath);
-+ sNewPrinterName = ASCII_STR("Generic Printer");
-+ }
-+ else if (GtkPrinter* pPrinter = gtk_print_unix_dialog_get_selected_printer(GTK_PRINT_UNIX_DIALOG(aHandle.pDialog)))
-+ {
-+ pStr = gtk_print_settings_get(pSettings, "lpr-commandline");
-+ if (pStr && *pStr)
-+ {
-+ sNewPrinterName = ASCII_STR("Generic Printer");
-+ psp::PrinterInfoManager& rManager( psp::PrinterInfoManager::get() );
-+ psp::PrinterInfo aInfo(rManager.getPrinterInfo(sNewPrinterName));
-+ aInfo.m_aCommand = rtl::OUString((const sal_Char *)pStr, strlen((const sal_Char*)(pStr)), RTL_TEXTENCODING_UTF8);
-+ rManager.changePrinterInfo(sNewPrinterName, aInfo);
-+ }
-+ else
-+ {
-+ pStr = gtk_printer_get_name(pPrinter);
-+ sNewPrinterName = rtl::OUString((const sal_Char *)pStr, strlen((const sal_Char*)(pStr)), RTL_TEXTENCODING_UTF8);
-+ }
-+ }
-+
-+ OUString sOldPrinterName(mpPrinter->GetName());
-+ if (sNewPrinterName != sOldPrinterName)
-+ {
-+ for (int i = 0; i < 2; ++i)
-+ {
-+ if (const QueueInfo* pInfo = Printer::GetQueueInfo( sNewPrinterName, false ))
-+ {
-+ Printer aTempPrinter(*pInfo);
-+ mpPrinter->SetPrinterProps(&aTempPrinter);
-+ break;
-+ }
-+ else
-+ {
-+ if (!i)
-+ {
-+ psp::PrinterInfoManager& rManager( psp::PrinterInfoManager::get() );
-+ rManager.stopsearch();
-+ rManager.startsearch();
-+ rManager.checkPrintersChanged(true);
-+ ImplDeletePrnQueueList();
-+ }
-+ else
-+ {
-+ fprintf(stderr, "OOo UNKNOWN PRINTER \"%s\"\n",
-+ rtl::OUStringToOString(sNewPrinterName, RTL_TEXTENCODING_UTF8).getStr());
-+ }
-+ }
-+ }
-+ }
-+ mpPrinter->Reset();
-+ gtk_print_settings_foreach(pSettings, setcupskey, mpPrinter);
-+
-+ mpPrinter->SetOrientation(ORIENTATION_PORTRAIT);
-+
-+ int nPapers = mpPrinter->GetPaperInfoCount();
-+ pStr = gtk_combo_box_get_active_text(GTK_COMBO_BOX(aHandle.paperwidget));
-+ if ( pStr && nPapers )
-+ {
-+ rtl::OUString sPaper((const sal_Char*)pStr, strlen((const sal_Char*)(pStr)), RTL_TEXTENCODING_UTF8);
-+ for (int i = 0; i < nPapers; ++i)
-+ {
-+ const vcl::PaperInfo &rInfo = mpPrinter->GetPaperInfo(i);
-+ if (rtl::OUString(rInfo.m_aPaperName) == sPaper)
-+ {
-+ mpPrinter->SetPaperFromInfo(rInfo);
-+ break;
-+ }
-+ }
-+ }
-+
-+ if (1 == gtk_combo_box_get_active(GTK_COMBO_BOX(aHandle.orientwidget)))
-+ mpPrinter->SetOrientation(ORIENTATION_LANDSCAPE);
-+ }
-+ g_object_unref(pSettings);
-+ }
-+ break;
-+ default:
-+ break;
-+ }
-+ }
-+ gtk_widget_hide( aHandle.pDialog );
-+ if (nHID_PageChange)
-+ g_signal_handler_disconnect(G_OBJECT(aHandle.notebook), nHID_PageChange);
-+// gtk_widget_destroy( aHandle.pDialog );
-+ }
-+ else
-+ {
-+ // Dialog starten
-+ nRet = ModalDialog::Execute();
-+
-+ // Wenn Dialog mit OK beendet wurde, dann die Daten updaten
-+ if( nRet == TRUE )
-+ {
-+ if ( TEMPPRINTER() )
-+ mpPrinter->SetPrinterProps( TEMPPRINTER() );
-+ ImplFillDialogData();
-+ }
++ unsigned long handle = GetParent() ? GetParent()->GetNativeHandle() : 0;
++ GtkWindow *parent = handle ? GTK_WINDOW(handle) : NULL;
++
++ static ourhandle aHandle;
++ if (!aHandle.pDialog)
++ {
++ aHandle.pDialog = gtk_print_unix_dialog_new (NULL, parent);
++
++ rtl::OString aOptions(rtl::OUStringToOString(maBtnOptions.GetText(), RTL_TEXTENCODING_UTF8));
++ aOptions = aOptions.replace('~','_');
++
++ gtk_dialog_add_button( GTK_DIALOG( aHandle.pDialog ), aOptions.getStr(), GTK_RESPONSE_HELP);
++
++ rtl::OUString aProperties(maBtnProperties.GetText());
++ aProperties = aProperties.copy(0, aProperties.lastIndexOf(OUString(RTL_CONSTASCII_USTRINGPARAM(("...")))));
++ aProperties = aProperties.replaceAt(aProperties.indexOf('~'), 1, OUString());
++
++ gtk_print_unix_dialog_set_manual_capabilities(GTK_PRINT_UNIX_DIALOG(aHandle.pDialog),
++ GtkPrintCapabilities(GTK_PRINT_CAPABILITY_COPIES | GTK_PRINT_CAPABILITY_COLLATE |
++ GTK_PRINT_CAPABILITY_REVERSE|GTK_PRINT_CAPABILITY_GENERATE_PDF|GTK_PRINT_CAPABILITY_GENERATE_PS));
++
++ GtkWidget *box = gtk_vbox_new(FALSE, 18);
++ gtk_container_set_border_width (GTK_CONTAINER (box), 12);
++
++ GtkWidget *tablewidget = gtk_table_new (2, 2, FALSE);
++ gtk_table_set_row_spacings (GTK_TABLE (tablewidget), 6);
++ gtk_table_set_col_spacings (GTK_TABLE (tablewidget), 12);
++
++ gtk_box_pack_start (GTK_BOX (box), tablewidget, FALSE, FALSE, 0);
++
++
++ aHandle.orientwidget = gtk_combo_box_new_text();
++ aHandle.paperwidget = gtk_combo_box_new_text();
++
++ gtk_table_attach(GTK_TABLE(tablewidget), gtk_label_new(
++ rtl::OUStringToOString(maOrientationStr, RTL_TEXTENCODING_UTF8).getStr()),
++ 0, 1, 0, 1, GTK_FILL, GTK_EXPAND, 0, 0);
++ gtk_table_attach(GTK_TABLE(tablewidget), aHandle.orientwidget, 1, 2, 0, 1,
++ GTK_FILL, GTK_EXPAND, 0, 0);
++ gtk_table_attach(GTK_TABLE(tablewidget), gtk_label_new(
++ rtl::OUStringToOString(maPaperFormatStr, RTL_TEXTENCODING_UTF8).getStr()),
++ 0, 1, 1, 2, GTK_FILL, GTK_EXPAND, 0, 0);
++ gtk_table_attach(GTK_TABLE(tablewidget), aHandle.paperwidget, 1, 2, 1, 2,
++ GTK_FILL, GTK_EXPAND, 0, 0);
++
++ gtk_widget_show_all(box);
++
++ rtl::OString sProperties(OUStringToOString(aProperties, RTL_TEXTENCODING_UTF8));
++ gtk_print_unix_dialog_add_custom_tab(GTK_PRINT_UNIX_DIALOG(aHandle.pDialog), box,
++ gtk_label_new(sProperties.getStr()));
++
++ g_object_get(G_OBJECT(box),"parent", &aHandle.notebook,NULL);
++ }
++
++ //make this the child of the OOo document window, and make it
++ //the parent of the future OOo options window
++ if (parent) gtk_window_set_transient_for(GTK_WINDOW(aHandle.pDialog), parent);
++ mnNativeHandle = reinterpret_cast<unsigned long>(aHandle.pDialog);
++
++ GtkPrintSettings* pTempSettings = gtk_print_unix_dialog_get_settings(GTK_PRINT_UNIX_DIALOG(aHandle.pDialog));
++ if (const QueueInfo* pInfo = (const QueueInfo*)(maLbName.GetEntryData(maLbName.GetSelectEntryPos())))
++ {
++ gtk_print_settings_set_printer(pTempSettings, rtl::OUStringToOString(pInfo->GetPrinterName(),
++ RTL_TEXTENCODING_UTF8).getStr());
++ }
++
++ gtk_print_settings_set_int(pTempSettings, "n-copies", GetCopyCount());
++ gtk_print_settings_set_collate(pTempSettings, IsCollateEnabled() && IsCollateChecked());
++ if (mbRange)
++ {
++ GtkPageRange page_ranges;
++ page_ranges.start = page_ranges.end = maRangeText.ToInt32()-1;
++ gtk_print_settings_set_page_ranges(pTempSettings, &page_ranges, 1);
++ gtk_print_unix_dialog_set_current_page(GTK_PRINT_UNIX_DIALOG(aHandle.pDialog), page_ranges.start);
++ }
++ gtk_print_unix_dialog_set_settings(GTK_PRINT_UNIX_DIALOG(aHandle.pDialog), pTempSettings);
++ g_object_unref(pTempSettings);
++
++ aHandle.pPrinter = mpPrinter;
++
++ SetProperties(aHandle, true);
++
++ gulong nHID_PageChange=0;
++ if (aHandle.notebook && GTK_IS_NOTEBOOK(aHandle.notebook))
++ {
++ gtk_notebook_set_current_page(GTK_NOTEBOOK(aHandle.notebook), 0);
++ nHID_PageChange = g_signal_connect(G_OBJECT(aHandle.notebook), "switch-page", G_CALLBACK(switch_page_cb), &aHandle);
++ }
++
++ bool bContinue = true;
++ while(bContinue)
++ {
++ bContinue = false;
++ gint nStatus = gtk_dialog_run( GTK_DIALOG( aHandle.pDialog ) );
++ switch( nStatus )
++ {
++ case GTK_RESPONSE_HELP:
++ ClickOptionsHdl();
++ bContinue = true;
++ break;
++ case GTK_RESPONSE_OK:
++ {
++ GtkPrintSettings* pSettings = gtk_print_unix_dialog_get_settings (GTK_PRINT_UNIX_DIALOG(aHandle.pDialog));
++
++ rtl::OUString sPath;
++ if (const gchar *uri = gtk_print_settings_get(pSettings, GTK_PRINT_SETTINGS_OUTPUT_URI))
++ {
++ if (gchar *pFile = g_filename_from_uri (uri, NULL, NULL))
++ {
++ sPath = rtl::OUString((const sal_Char *)pFile, strlen((const sal_Char*)(pFile)), osl_getThreadTextEncoding());
++ g_free(pFile);
++ }
++ }
++ const gchar *pStr = gtk_print_settings_get(pSettings, GTK_PRINT_SETTINGS_PRINT_PAGES);
++ if (pStr && !strcmp(pStr, "ranges"))
++ {
++ maRangeText = String();
++ gint num_ranges;
++ const GtkPageRange* pRanges = gtk_print_settings_get_page_ranges(pSettings, &num_ranges);
++ for (gint i = 0; i < num_ranges; ++i)
++ {
++ maRangeText.Append(String::CreateFromInt32(pRanges[i].start+1));
++ if (pRanges[i].start != pRanges[i].end)
++ {
++ maRangeText.AppendAscii("-");
++ maRangeText.Append(String::CreateFromInt32(pRanges[i].end+1));
++ }
++
++ if (i != num_ranges-1)
++ maRangeText.AppendAscii(",");
++ }
++ meCheckRange = PRINTDIALOG_RANGE;
++ }
++ else if (pStr && !strcmp(pStr, "current"))
++ {
++ meCheckRange = PRINTDIALOG_RANGE;
++
++ try
++ {
++ Reference < XFramesSupplier > xDesktop = Reference < XFramesSupplier >(
++ ::comphelper::getProcessServiceFactory()->
++ createInstance( ASCII_STR("com.sun.star.frame.Desktop") ), UNO_QUERY );
++ Reference < XFrame > xFrame( xDesktop->getActiveFrame() );
++ if ( !xFrame.is() )
++ xFrame = Reference < XFrame >( xDesktop, UNO_QUERY );
++
++ Reference< XController > xController;
++ Reference< XSpreadsheetView > xSpreadsheetView;
++ Reference< XSpreadsheet> xSheet;
++ Reference< XSpreadsheetDocument > xSheetDoc;
++ Reference< XIndexAccess > xSheets;
++ Reference< XNamed > xName;
++
++ if (xFrame.is())
++ xController = xFrame->getController();
++ if (xController.is())
++ xSpreadsheetView = Reference< XSpreadsheetView >(xController, UNO_QUERY);
++ if (xSpreadsheetView.is())
++ xSheet = Reference< XSpreadsheet>(xSpreadsheetView->getActiveSheet());
++ if (xSheet.is())
++ xName = Reference < XNamed >(xSheet, UNO_QUERY);
++ if (xName.is())
++ xSheetDoc = Reference< XSpreadsheetDocument >(xController->getModel(), UNO_QUERY);
++ if (xSheetDoc.is())
++ xSheets = Reference< XIndexAccess >(xSheetDoc->getSheets(), UNO_QUERY);
++ if (xSheets.is())
++ {
++ const rtl::OUString &rName = xName->getName();
++
++ sal_Int32 i;
++
++ for( i = 0; i < xSheets->getCount(); ++i)
++ {
++ Reference < XNamed > xItem =
++ Reference < XNamed >(xSheets->getByIndex(i), UNO_QUERY);
++ if (rName == xItem->getName())
++ break;
++ }
++
++ if (i < xSheets->getCount())
++ maRangeText = String::CreateFromInt32( i + 1 );
++ }
++ }
++ catch (...) {}
++ }
++ else
++ meCheckRange = PRINTDIALOG_ALL;
++
++ //Tell OOo to only print 1 simple copy, we'll stick everything
++ //else through cups
++ SetCopyCount(1);
++ EnableCollate(false);
++ CheckCollate(false);
++
++ pStr = 0;
++
++ if (sPath.getLength())
++ pStr = gtk_print_settings_get(pSettings, GTK_PRINT_SETTINGS_OUTPUT_FILE_FORMAT);
++
++ if (pStr && !strcmp(pStr, "pdf"))
++ {
++ gtk_widget_hide( aHandle.pDialog );
++ rtl::OUString sFileURL;
++ FileBase::getFileURLFromSystemPath(sPath, sFileURL);
++ ExportAsPDF(sFileURL, meCheckRange, maRangeText);
++ }
++ else
++ {
++ nRet = TRUE;
++ rtl::OUString sNewPrinterName(mpPrinter->GetName());
++
++ if (sPath.getLength())
++ {
++ mpPrinter->EnablePrintFile(true);
++ mpPrinter->SetPrintFile(sPath);
++ sNewPrinterName = ASCII_STR("Generic Printer");
++ }
++ else if (GtkPrinter* pPrinter = gtk_print_unix_dialog_get_selected_printer(GTK_PRINT_UNIX_DIALOG(aHandle.pDialog)))
++ {
++ pStr = gtk_print_settings_get(pSettings, "lpr-commandline");
++ if (pStr && *pStr)
++ {
++ sNewPrinterName = ASCII_STR("Generic Printer");
++ psp::PrinterInfoManager& rManager( psp::PrinterInfoManager::get() );
++ psp::PrinterInfo aInfo(rManager.getPrinterInfo(sNewPrinterName));
++ aInfo.m_aCommand = rtl::OUString((const sal_Char *)pStr, strlen((const sal_Char*)(pStr)), RTL_TEXTENCODING_UTF8);
++ rManager.changePrinterInfo(sNewPrinterName, aInfo);
++ }
++ else
++ {
++ pStr = gtk_printer_get_name(pPrinter);
++ sNewPrinterName = rtl::OUString((const sal_Char *)pStr, strlen((const sal_Char*)(pStr)), RTL_TEXTENCODING_UTF8);
++ }
++ }
++
++ OUString sOldPrinterName(mpPrinter->GetName());
++ if (sNewPrinterName != sOldPrinterName)
++ {
++ for (int i = 0; i < 2; ++i)
++ {
++ if (const QueueInfo* pInfo = Printer::GetQueueInfo( sNewPrinterName, false ))
++ {
++ Printer aTempPrinter(*pInfo);
++ mpPrinter->SetPrinterProps(&aTempPrinter);
++ break;
++ }
++ else
++ {
++ if (!i)
++ {
++ psp::PrinterInfoManager& rManager( psp::PrinterInfoManager::get() );
++ rManager.stopsearch();
++ rManager.startsearch();
++ rManager.checkPrintersChanged(true);
++ ImplDeletePrnQueueList();
++ }
++ else
++ {
++ fprintf(stderr, "OOo UNKNOWN PRINTER \"%s\"\n",
++ rtl::OUStringToOString(sNewPrinterName, RTL_TEXTENCODING_UTF8).getStr());
++ }
++ }
++ }
++ }
++ mpPrinter->Reset();
++ gtk_print_settings_foreach(pSettings, setcupskey, mpPrinter);
++
++ mpPrinter->SetOrientation(ORIENTATION_PORTRAIT);
++
++ int nPapers = mpPrinter->GetPaperInfoCount();
++ pStr = gtk_combo_box_get_active_text(GTK_COMBO_BOX(aHandle.paperwidget));
++ if ( pStr && nPapers )
++ {
++ rtl::OUString sPaper((const sal_Char*)pStr, strlen((const sal_Char*)(pStr)), RTL_TEXTENCODING_UTF8);
++ for (int i = 0; i < nPapers; ++i)
++ {
++ const vcl::PaperInfo &rInfo = mpPrinter->GetPaperInfo(i);
++ if (rtl::OUString(rInfo.m_aPaperName) == sPaper)
++ {
++ mpPrinter->SetPaperFromInfo(rInfo);
++ break;
++ }
++ }
++ }
++
++ if (1 == gtk_combo_box_get_active(GTK_COMBO_BOX(aHandle.orientwidget)))
++ mpPrinter->SetOrientation(ORIENTATION_LANDSCAPE);
++ }
++ g_object_unref(pSettings);
++ }
++ break;
++ default:
++ break;
++ }
++ }
++ gtk_widget_hide( aHandle.pDialog );
++ if (nHID_PageChange)
++ g_signal_handler_disconnect(G_OBJECT(aHandle.notebook), nHID_PageChange);
++ // gtk_widget_destroy( aHandle.pDialog );
++ }
++ else
++ {
++ // Dialog starten
++ nRet = ModalDialog::Execute();
++
++ // Wenn Dialog mit OK beendet wurde, dann die Daten updaten
++ if( nRet == TRUE )
++ {
++ if ( TEMPPRINTER() )
++ mpPrinter->SetPrinterProps( TEMPPRINTER() );
++ ImplFillDialogData();
++ }
}
maStatusTimer.Stop();
-@@ -645,4 +1239,3 @@
+@@ -826,4 +1434,3 @@
mpPrinterImpl->m_bHelpDisabled = sal_True;
maBtnHelp.Disable();
}
@@ -1327,12 +1328,15 @@
diff -u -r1.5 printdlg.hrc
--- openoffice.org.orig/svtools/source/dialogs/printdlg.hrc 8 Sep 2005 15:17:16 -0000 1.5
+++ openoffice.org/svtools/source/dialogs/printdlg.hrc 16 Nov 2006 14:14:40 -0000
-@@ -73,3 +73,5 @@
- #define FL_SEPCOPIESRANGE 33
- #define FL_SEPBUTTONLINE 34
- #define STR_ALLFILTER 35
-+#define STR_PAPER_PAPER_TXT 36
-+#define STR_PAPER_ORIENTATION_TXT 37
+@@ -78,5 +78,6 @@
+ #define BTN_HELP 53
+ #define BTN_OPTIONS 54
+
+-#define STR_ALLFILTER 10
+-
++#define STR_ALLFILTER 10
++#define STR_PAPER_PAPER_TXT 11
++#define STR_PAPER_ORIENTATION_TXT 12
Index: source/gdi/print.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/gdi/print.cxx,v
@@ -1431,16 +1435,16 @@
diff -u -r1.30 salframe.hxx
--- openoffice.org.orig/vcl/inc/vcl/salframe.hxx 1 Nov 2006 15:28:55 -0000 1.30
+++ openoffice.org/vcl/inc/vcl/salframe.hxx 1 May 2007 12:21:25 -0000
-@@ -313,6 +313,9 @@
+@@ -302,6 +302,9 @@
// (e.g. input methods, printer update handlers).
long CallCallback( USHORT nEvent, const void* pEvent ) const
- { return m_pProc ? m_pProc( m_pInst, const_cast<SalFrame*>(this), nEvent, pEvent ) : 0; }
+ { return m_pProc ? m_pProc( m_pWindow, const_cast<SalFrame*>(this), nEvent, pEvent ) : 0; }
+
+ virtual unsigned long GetNativeHandle() const { return 0; }
+ virtual void SetNativeParent(unsigned long nParent) {}
};
-
+ #endif // __cplusplus
Index: inc/window.hxx
===================================================================
RCS file: /cvs/gsl/vcl/inc/Attic/window.hxx,v
openoffice.org-2.2.0.ooo68717.gstreamer.video.patch:
Index: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.0.ooo68717.gstreamer.video.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openoffice.org-2.2.0.ooo68717.gstreamer.video.patch 16 Aug 2007 07:04:22 -0000 1.4
+++ openoffice.org-2.2.0.ooo68717.gstreamer.video.patch 8 Jan 2008 14:51:51 -0000 1.5
@@ -1,34 +1,34 @@
diff -rup avmedia-orig/prj/build.lst avmedia/prj/build.lst
--- avmedia-orig/prj/build.lst 2006-08-17 16:04:56.000000000 +0200
+++ avmedia/prj/build.lst 2006-08-17 16:05:01.000000000 +0200
-@@ -7,4 +7,5 @@ av avmedia\source\framework nmake - all
- av avmedia\source\win nmake - all av_win NULL
+@@ -8,4 +8,5 @@
av avmedia\source\java nmake - all av_java NULL
av avmedia\source\xine nmake - all av_xine NULL
--av avmedia\util nmake - all av_util av_viewer av_framework av_win av_java av_xine NULL
-+av avmedia\source\gstreamer nmake - all av_gstreamer NULL
-+av avmedia\util nmake - all av_util av_viewer av_framework av_win av_java av_xine av_gstreamer NULL
+ av avmedia\source\quicktime nmake - all av_quicktime NULL
+-av avmedia\util nmake - all av_util av_viewer av_framework av_win av_java av_quicktime av_xine NULL
++av avmedia\source\gstreamer nmake - all av_gstreamer NULL
++av avmedia\util nmake - all av_util av_viewer av_framework av_win av_java av_quicktime av_xine av_gstreamer NULL
diff -rup avmedia-orig/source/inc/mediamisc.hxx avmedia/source/inc/mediamisc.hxx
--- avmedia-orig/source/inc/mediamisc.hxx 2006-08-17 16:04:56.000000000 +0200
+++ avmedia/source/inc/mediamisc.hxx 2006-08-17 16:06:41.000000000 +0200
-@@ -37,13 +37,16 @@ class ResMgr;
+@@ -37,6 +37,9 @@
- #define AVMEDIA_RESID( nId ) ResId( nId, ::avmedia::GetResMgr() )
+ #define AVMEDIA_RESID( nId ) ResId( nId, * ::avmedia::GetResMgr() )
+#ifdef GSTREAMER
+#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer"
+#else
- #ifdef WNT
+ #ifdef WNT
#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX"
#else
+@@ -46,6 +49,7 @@
#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java"
#endif
+ #endif
+#endif
-
--
+
namespace avmedia
{
- ResMgr* GetResMgr();
Index: mediawindow_impl.cxx
===================================================================
RCS file: /cvs/graphics/avmedia/source/viewer/mediawindow_impl.cxx,v
@@ -144,25 +144,26 @@
const Point aPoint;
const Size aSize( maChildWindow.GetSizePixel() );
+#ifndef GSTREAMER
- const sal_Int32 nWndHandle = static_cast< sal_Int32 >( maChildWindow.getParentWindowHandleForJava() );
+ const sal_IntPtr nWndHandle = static_cast< sal_IntPtr >( maChildWindow.getParentWindowHandleForJava() );
+#else
-+ const sal_Int32 nWndHandle = 0;
++ const sal_IntPtr nWndHandle = 0;
+#endif
-
+
aArgs[ 0 ] = uno::makeAny( nWndHandle );
aArgs[ 1 ] = uno::makeAny( awt::Rectangle( aPoint.X(), aPoint.Y(), aSize.Width(), aSize.Height() ) );
+#ifdef GSTREAMER
-+ const SystemEnvData *pSystemData = maChildWindow.GetSystemData();
-+ OSL_TRACE( "MediaWindowImpl::onURLChanged xwindow id: %ld", pSystemData->aWindow );
-+ aArgs[ 2 ] = uno::makeAny( pSystemData->aWindow );
++ const SystemEnvData *pSystemData = maChildWindow.GetSystemData();
++ OSL_TRACE( "MediaWindowImpl::onURLChanged xwindow id: %ld", pSystemData->aWindow );
++ aArgs[ 2 ] = uno::makeAny( pSystemData->aWindow );
+#endif
try
{
+- if( nWndHandle != 0 )
+#ifdef GSTREAMER
-+ if( pSystemData->aWindow != 0 )
++ if( pSystemData->aWindow != 0 )
+#else
- if( nWndHandle != 0 )
++ if( nWndHandle != 0 )
+#endif
xPlayerWindow = getPlayer()->createPlayerWindow( aArgs );
}
@@ -201,7 +202,7 @@
diff -rup avmedia-orig/source/viewer/mediawindow.cxx avmedia/source/viewer/mediawindow.cxx
--- avmedia-orig/source/viewer/mediawindow.cxx 2006-09-21 12:10:28.000000000 +0200
+++ avmedia/source/viewer/mediawindow.cxx 2006-09-21 12:15:19.000000000 +0200
-@@ -382,8 +382,10 @@ void MediaWindow::getMediaFilters( Filte
+@@ -383,8 +383,10 @@
"AU Audio", "au",
"AVI", "avi",
"CD Audio", "cda",
@@ -209,9 +210,9 @@
"MIDI Audio", "mid;midi",
"MPEG Audio", "mp2;mp3;mpa",
+ "OGG Audio/Video", "ogg",
- "MPEG Video", "mpg;mpeg;mpv",
+ "MPEG Video", "mpg;mpeg;mpv;mp4",
+ "Ogg bitstream", "ogg",
"Quicktime Video", "mov",
- "Vivo Video", "viv",
--- config_office-orig/configure.in 2006-08-17 10:43:11.000000000 +0200
+++ config_office/configure.in 2006-08-17 10:48:43.000000000 +0200
@@ -718,6 +718,7 @@ case "$build_os" in
@@ -326,7 +327,7 @@
diff -rup sd-orig/source/ui/animations/CustomAnimationDialog.cxx sd/source/ui/animations/CustomAnimationDialog.cxx
--- sd-orig/source/ui/animations/CustomAnimationDialog.cxx 2006-08-17 15:48:52.000000000 +0200
+++ sd/source/ui/animations/CustomAnimationDialog.cxx 2006-08-17 15:50:37.000000000 +0200
-@@ -1943,10 +1943,14 @@
+@@ -1943,6 +1943,9 @@
// TODO(Q3): This breaks encapsulation. Either export
// these strings from avmedia, or provide an XManager
// factory there
@@ -334,27 +335,30 @@
+# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer"
+#else
#ifdef WNT
--# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX"
-+# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX"
+ # define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX"
+ #elif defined QUARTZ
+@@ -1950,6 +1953,7 @@
#else
--# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java"
-+# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java"
-+#endif
+ # define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java"
#endif
++#endif
void CustomAnimationEffectTabPage::onSoundPreview()
+ {
diff -rup sd-orig/source/ui/slideshow/slideshowimpl.cxx sd/source/ui/slideshow/slideshowimpl.cxx
--- sd-orig/source/ui/slideshow/slideshowimpl.cxx 2006-08-17 15:48:52.000000000 +0200
+++ sd/source/ui/slideshow/slideshowimpl.cxx 2006-08-17 15:54:35.000000000 +0200
-@@ -135,11 +135,15 @@
+@@ -121,6 +121,9 @@
// TODO(Q3): This breaks encapsulation. Either export
// these strings from avmedia, or provide an XManager
// factory there
+#ifdef GSTREAMER
-+# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer"
++# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer"
+#else
#ifdef WNT
# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX"
+ #elif defined QUARTZ
+@@ -128,6 +131,7 @@
#else
# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java"
#endif
@@ -365,27 +369,28 @@
diff -rup slideshow-orig/source/engine/soundplayer.cxx slideshow/source/engine/soundplayer.cxx
--- slideshow-orig/source/engine/soundplayer.cxx 2006-08-17 16:15:39.000000000 +0200
+++ slideshow/source/engine/soundplayer.cxx 2006-08-17 16:17:17.000000000 +0200
-@@ -57,12 +57,15 @@ using namespace ::com::sun::star;
+@@ -58,6 +58,9 @@
// TODO(Q3): This breaks encapsulation. Either export
// these strings from avmedia, or provide an XManager
// factory there
+#ifdef GSTREAMER
-+# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer"
++# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer"
+#else
#ifdef WNT
# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX"
+ #elif defined QUARTZ
+@@ -65,6 +68,7 @@
#else
# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java"
#endif
--
+#endif
- namespace presentation
- {
+
+ namespace slideshow
diff -rup slideshow-orig/source/engine/viewmediashape.cxx slideshow/source/engine/viewmediashape.cxx
--- slideshow-orig/source/engine/shapes/viewmediashape.cxx 2006-08-17 16:15:39.000000000 +0200
+++ slideshow/source/engine/shapes/viewmediashape.cxx 2006-08-17 17:26:09.000000000 +0200
-@@ -107,11 +107,22 @@
+@@ -75,6 +75,16 @@
#include "mediashape.hxx"
#include "tools.hxx"
@@ -401,6 +406,8 @@
+#else
#ifdef WNT
#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX"
+ #elif defined QUARTZ
+@@ -82,6 +92,7 @@
#else
#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java"
#endif
@@ -408,7 +415,7 @@
using namespace ::com::sun::star;
-@@ -182,7 +193,11 @@ namespace presentation
+@@ -159,7 +170,11 @@
mxPlayerWindow.clear();
}
@@ -420,7 +427,7 @@
// shutdown player
if( mxPlayer.is() )
-@@ -311,7 +326,8 @@ namespace presentation
+@@ -294,7 +309,8 @@
aDeviceParams[ 0 ] >>= aImplName;
if( aImplName.endsWithIgnoreAsciiCaseAsciiL(
@@ -430,15 +437,15 @@
{
implInitializeVCLBasedPlayerWindow( rBounds, aDeviceParams );
}
-@@ -424,6 +440,7 @@ namespace presentation
- bool ViewMediaShape::implInitializeVCLBasedPlayerWindow( const ::basegfx::B2DRectangle& rBounds,
+@@ -416,6 +432,7 @@
+ bool ViewMediaShape::implInitializeVCLBasedPlayerWindow( const ::basegfx::B2DRectangle& rBounds,
const uno::Sequence< uno::Any >& rVCLDeviceParams)
{
+ OSL_TRACE( "ViewMediaShape::implInitializeVCLBasedPlayerWindow" );
if( !mpMediaWindow.get() && !rBounds.isEmpty() )
{
try
-@@ -443,28 +460,46 @@ namespace presentation
+@@ -437,28 +454,50 @@
if( !rRangePix.isEmpty() )
{
@@ -450,8 +457,8 @@
rRangePix.getMaxY() - rRangePix.getMinY() );
+#ifdef GSTREAMER
-+ OSL_TRACE( "created sys child window for viewmediashape" );
-+ mpMediaWindow = ::std::auto_ptr< SystemChildWindow >( new SystemChildWindow( pWindow, WB_CLIPCHILDREN ) );
++ OSL_TRACE( "created sys child window for viewmediashape" );
++ mpMediaWindow = ::std::auto_ptr< SystemChildWindow >( new SystemChildWindow( pWindow, WB_CLIPCHILDREN ) );
+#else
mpMediaWindow = ::std::auto_ptr< JavaChildWindow >( new JavaChildWindow( pWindow, WB_CLIPCHILDREN ) );
+#endif
@@ -460,28 +467,31 @@
aAWTRect.Y ),
Size( aAWTRect.Width,
aAWTRect.Height ));
++
+ mpMediaWindow->SetParentClipMode( PARENTCLIPMODE_NOCLIP );
+ mpMediaWindow->EnableEraseBackground( FALSE );
+ mpMediaWindow->EnablePaint( FALSE );
+ mpMediaWindow->SetForwardKey( TRUE );
+ mpMediaWindow->SetMouseTransparent( TRUE );
++
mpMediaWindow->Show();
if( mxPlayer.is() )
{
+#ifndef GSTREAMER
aArgs[ 0 ] = uno::makeAny(
- sal::static_int_cast<sal_Int32>(
+ sal::static_int_cast<sal_IntPtr>(
mpMediaWindow->getParentWindowHandleForJava()) );
--
+#else
-+ aArgs[ 0 ] = uno::makeAny ( (sal_Int32) 0 );
++ aArgs[ 0 ] = uno::makeAny ( (sal_IntPtr) 0 );
+#endif
+
aAWTRect.X = aAWTRect.Y = 0;
aArgs[ 1 ] = uno::makeAny( aAWTRect );
++
+#ifdef GSTREAMER
-+ const SystemEnvData *pSystemData = mpMediaWindow->GetSystemData();
-+ OSL_TRACE( "xwindow id: %ld", pSystemData->aWindow );
++ const SystemEnvData *pSystemData = mpMediaWindow->GetSystemData();
++ OSL_TRACE( "xwindow id: %ld", pSystemData->aWindow );
+ aArgs[ 2 ] = uno::makeAny( pSystemData->aWindow );
+#endif
openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch:
Index: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch 5 Feb 2007 13:47:32 -0000 1.1
+++ openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch 8 Jan 2008 14:51:51 -0000 1.2
@@ -51,12 +51,3 @@
xub_StrLen nNextOfst;
do
-@@ -1561,7 +1591,7 @@
- }
- else
- {
-- SwTwips nSpace;
-+ SwTwips nSpace(0);
- if( FILL_TAB != rFill.Mode() )
- {
- static sal_Char __READONLY_DATA sDoubleSpace[] = " ";
openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch:
Index: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch 18 Apr 2007 08:41:13 -0000 1.2
+++ openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch 8 Jan 2008 14:51:51 -0000 1.3
@@ -13,7 +13,7 @@
#define INCLUDE_BACKTRACE
#define STACKTYPE "Linux"
#endif
-@@ -385,6 +394,87 @@
+@@ -393,6 +394,87 @@
#define REPORTENV_PARAM "-crashreportenv:"
@@ -101,68 +101,26 @@
static int ReportCrash( int Signal )
{
#ifdef SAL_ENABLE_CRASH_REPORT
-@@ -507,12 +597,12 @@
- {
- Dl_info dl_info;
-
-- fprintf( stackout, "0x%x:",
-- (unsigned int)stackframes[iFrame] );
-+ fprintf( stackout, "0x%.*lx:", sizeof(char*)*2,
-+ (unsigned long)stackframes[iFrame] );
-
-- fprintf( xmlout, "<errormail:StackInfo pos=\"%d\" ip=\"0x%x\"",
-+ fprintf( xmlout, "<errormail:StackInfo pos=\"%d\" ip=\"0x%lx\"",
- iFrame,
-- (unsigned int)stackframes[iFrame]
-+ (unsigned long)stackframes[iFrame]
- );
-
- memset( &dl_info, 0, sizeof(dl_info) );
-@@ -565,17 +655,26 @@
+@@ -573,6 +655,11 @@
if ( dl_info.dli_fbase && dl_info.dli_fname )
{
-- fprintf( stackout, " %s + 0x%x",
+#ifdef LINUX
-+ unsigned long dynamic_offset = dynamic_section_offset(dl_info.dli_fname);
-+ fprintf( stackout, " 0x%.*lx:",
-+ sizeof(char*) * 2,
-+ dynamic_offset);
++ ElfW(Off) dynamic_offset = dynamic_section_offset(dl_info.dli_fname);
++ fprintf( stackout, " 0x%" SAL_PRI_SIZET "x:", dynamic_offset);
+#endif
-+ fprintf( stackout, " %s + 0x%lx",
++
+ fprintf( stackout, " %s + 0x%" SAL_PRI_PTRDIFFT "x",
dl_info.dli_fname,
-- (char*)stackframes[iFrame] - (char*)dl_info.dli_fbase
-+ (unsigned long)(stackframes[iFrame] - dl_info.dli_fbase)
- );
-
-- fprintf( xmlout, " rel=\"0x%x\"", (char *)stackframes[iFrame] - (char *)dl_info.dli_fbase );
-+ fprintf( xmlout, " rel=\"0x%lx\"", (unsigned long)(stackframes[iFrame] - dl_info.dli_fbase) );
- if ( dli_fname )
- fprintf( xmlout, " name=\"%s\"", dli_fname );
+ (char*)stackframes[iFrame] - (char*)dl_info.dli_fbase
+@@ -584,6 +671,10 @@
if ( dli_fdir )
fprintf( xmlout, " path=\"%s\"", dli_fdir );
++
+#ifdef LINUX
-+ fprintf( xmlout, " dynamicoffset=\"0x%lx\"", dynamic_offset );
++ fprintf( xmlout, " dynamicoffset=\"0x%" SAL_PRI_SIZET "x\"", dynamic_offset );
+#endif
}
else
fprintf( stackout, " ????????" );
-@@ -584,13 +683,13 @@
- {
- fputs( " (", stackout );
- fputs_xml( dl_info.dli_sname, stackout );
-- fprintf( stackout, " + 0x%x)",
-- (char*)stackframes[iFrame] - (char*)dl_info.dli_saddr );
-+ fprintf( stackout, " + 0x%lx)",
-+ (unsigned long)(stackframes[iFrame] - dl_info.dli_saddr) );
-
- fputs( " ordinal=\"", xmlout );
- fputs_xml( dl_info.dli_sname, xmlout );
-- fprintf( xmlout, "+0x%x\"",
-- (char *)stackframes[iFrame] - (char *)dl_info.dli_saddr );
-+ fprintf( xmlout, "+0x%lx\"",
-+ (unsigned long)(stackframes[iFrame] - dl_info.dli_saddr) );
- }
-
- }
openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch:
Index: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch 16 Aug 2007 07:04:22 -0000 1.5
+++ openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch 8 Jan 2008 14:51:51 -0000 1.6
@@ -36,29 +36,21 @@
diff -u -r1.16 globals.hrc
--- openoffice.org.orig/sw/inc/globals.hrc 2 May 2006 15:13:43 -0000 1.16
+++ openoffice.org/sw/inc/globals.hrc 10 Jul 2007 12:55:08 -0000
-@@ -282,17 +282,19 @@
+@@ -282,7 +282,9 @@
#define TP_SECTION_INDENTS (RC_GLOBALS_BEGIN + 102)
#define TP_OPTCOMPATIBILITY_PAGE (RC_GLOBALS_BEGIN + 103)
#define TP_MAILCONFIG (RC_GLOBALS_BEGIN + 104)
-//maximum: RC_GLOBALS_BEGIN + 119
-+#define TP_TITLEPAGE (RC_GLOBALS_BEGIN + 105)
++#define TP_TITLEPAGE (RC_GLOBALS_BEGIN + 105)
+//maximum: RC_GLOBALS_BEGIN + 120
++
#if STR_DOC_STAT > RC_GLOBALS_END
#error Resource-Id Ueberlauf in #file, #line
- #endif
-
- //CHINA001 for PageCreated
--#define SID_PREVIEWFLAG_TYPE (RC_GLOBALS_BEGIN + 114)
--#define SID_FONTMODE_TYPE (RC_GLOBALS_BEGIN + 115)
--#define SID_FAX_LIST (RC_GLOBALS_BEGIN + 116)
-+#define SID_PREVIEWFLAG_TYPE (RC_GLOBALS_BEGIN + 114)
-+#define SID_FONTMODE_TYPE (RC_GLOBALS_BEGIN + 115)
-+#define SID_FAX_LIST (RC_GLOBALS_BEGIN + 116)
+@@ -294,4 +296,5 @@
#define SID_WRT_SHELL (RC_GLOBALS_BEGIN + 117)
- //CHINA001 for SwLineNumberingDlg
--#define DLG_LINE_NUMBERING (RC_GLOBALS_BEGIN + 118)
-+#define DLG_LINE_NUMBERING (RC_GLOBALS_BEGIN + 118)
+
+ #define DLG_LINE_NUMBERING (RC_GLOBALS_BEGIN + 118)
+#define DLG_TITLEPAGE (RC_GLOBALS_BEGIN + 119)
#endif // _GLOBALS_HRC
Index: inc/helpid.h
openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch:
Index: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch 22 Nov 2007 15:57:36 -0000 1.1
+++ openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch 8 Jan 2008 14:51:51 -0000 1.2
@@ -152,14 +152,14 @@
// copy content into activation temp dir:
if (mediaType.matchIgnoreAsciiCaseAsciiL(
RTL_CONSTASCII_STRINGPARAM(
-@@ -552,19 +587,48 @@
+@@ -552,19 +587,49 @@
{
// inflate content:
::rtl::OUStringBuffer buf;
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.zip://") );
- buf.append( ::rtl::Uri::encode( sourceContent.getURL(),
+ if (!sourceContent.isFolder())
-+ {
++ {
+ buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.zip://") );
+ buf.append( ::rtl::Uri::encode( sourceContent.getURL(),
rtl_UriCharClassRegName,
@@ -168,10 +168,11 @@
+ }
+ else
+ buf.append( sourceContent.getURL() );
++
buf.append( static_cast<sal_Unicode>('/') );
- sourceContent = ::ucbhelper::Content(
- buf.makeStringAndClear(), xCmdEnv );
-+ sourceContent = ::ucbhelper::Content( buf.makeStringAndClear(), xCmdEnv );
++ sourceContent = ::ucbhelper::Content( buf.makeStringAndClear(), xCmdEnv );
+ }
+
+ bool bLink = false;
@@ -197,14 +198,14 @@
+ {
+ if (! destFolderContent.transferContent(
+ sourceContent, ::ucbhelper::InsertOperation_COPY,
-+ OUString(), NameClash::OVERWRITE ))
++ title, NameClash::OVERWRITE ))
+ {
+ throw RuntimeException( OUSTR("UCB transferContent() failed!"), 0 );
+ }
}
- if (! destFolderContent.transferContent(
- sourceContent, ::ucbhelper::InsertOperation_COPY,
-- OUString(), NameClash::OVERWRITE ))
+- title, NameClash::OVERWRITE ))
- throw RuntimeException( OUSTR("UCB transferContent() failed!"), 0 );
// write to DB:
openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch:
Index: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch 18 Dec 2007 13:28:09 -0000 1.1
+++ openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch 8 Jan 2008 14:51:51 -0000 1.2
@@ -129,21 +129,10 @@
<node oor:name="Provider8" oor:op="replace">
<prop oor:name="ServiceName">
<value>com.sun.star.ucb.PackageContentProvider</value>
-@@ -150,6 +161,28 @@
- <value/>
- </prop>
- </node>
-+ <node oor:name="Provider12" oor:op="replace">
-+ <prop oor:name="ServiceName">
-+ <value>com.sun.star.ucb.WebDAVContentProvider</value>
-+ </prop>
-+ <prop oor:name="URLTemplate">
-+ <value>https</value>
-+ </prop>
-+ <prop oor:name="Arguments">
-+ <value/>
-+ </prop>
-+ </node>
+@@ -161,6 +172,17 @@
+ <value/>
+ </prop>
+ </node>
+ <node oor:name="Provider13" oor:op="replace">
+ <prop oor:name="ServiceName">
+ <value>com.sun.star.ucb.WebDAVContentProvider</value>
@@ -155,29 +144,6 @@
+ <value/>
+ </prop>
+ </node>
- </node>
+ </node>
</node>
</node>
---- openoffice.org.orig/ucb/source/ucp/webdav.orig/NeonSession.cxx 2007-12-08 15:44:24.000000000 +0000
-+++ openoffice.org/ucb/source/ucp/webdav/NeonSession.cxx 2007-12-08 15:47:02.000000000 +0000
-@@ -256,6 +256,11 @@
- return 0;
- }
-
-+extern "C" int ignore_verify(void *, int , const ne_ssl_certificate *)
-+{
-+ return 0;
-+}
-+
- // -------------------------------------------------------------------
- extern "C" int NeonSession_NeonAuth( void * inUserData,
- const char * inRealm,
-@@ -621,6 +626,8 @@
- // checked: 0.22.0)
- ne_set_server_auth( m_pHttpSession, NeonSession_NeonAuth, this );
- ne_set_proxy_auth ( m_pHttpSession, NeonSession_NeonAuth, this );
-+
-+ ne_ssl_set_verify( m_pHttpSession, ignore_verify, this);
- }
- }
-
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1366
retrieving revision 1.1367
diff -u -r1.1366 -r1.1367
--- openoffice.org.spec 2 Jan 2008 11:01:08 -0000 1.1366
+++ openoffice.org.spec 8 Jan 2008 14:51:51 -0000 1.1367
@@ -1,13 +1,11 @@
-%define oootag OOG680
-%define ooomilestone 9
-%define rh_rpm_release 11
+%define oootag OOH680
+%define ooomilestone 1
+%define rh_rpm_release 1
# undef to get english only and no-langpacks for a faster smoketest build
%define langpacks 1
# undef to revert to the traditional print dialog
%define gtkprintui 1
-# undef to refrain from combining startup libs into a single libsoffice
-%define linkopt 0
# whether to use stlport or gcc's stl, we're basically locked to stlport
# for i386 to enable third party built against "vanilla OOo" uno components
# and add-ons to work with our OOo. We assume there aren't any such for the
@@ -17,15 +15,8 @@
%else
%define stlport_abi_lockin 0
%endif
-#temporary until
-#a) jdk_line I fix configure to find gcj's jdk_home on its own
-#b) jdk_ver when the default java-devel pulled in is icedtea on intel-alikes
-#c) and figure out if we want sandbox.jar
-%ifarch %{ix86} x86_64
+# undef to build with icedtea
%define jdk_is_gcj 1
-%else
-%define jdk_is_gcj 1
-%endif
%if %{stlport_abi_lockin}
%define stlflags --with-stlport4
@@ -34,10 +25,8 @@
%endif
%if %{jdk_is_gcj}
-%define jdkflags --with-jdk-home=/usr/lib/jvm/java-1.5.0-gcj
%define java_devel java-1.5.0-devel
%else
-%define jdkflags ''
%define java_devel java-1.7.0-devel
%endif
@@ -53,7 +42,7 @@
Summary: OpenOffice.org comprehensive office suite.
Name: openoffice.org
-Version: 2.3.1
+Version: 2.4.0
Release: %{ooomilestone}.%{rh_rpm_release}%{?dist}
Epoch: 1
License: LGPLv2 and LGPLv2+ and MPLv1.1 and BSD
@@ -98,74 +87,53 @@
%endif
Patch14: openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch
Patch15: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
-Patch16: openoffice.org-1.9.129.ooo54603.fontconfig.patch
-Patch17: openoffice.org-1.9.115.ooo69368.fixxmlsec.patch
-Patch18: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
-Patch19: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
-Patch20: openoffice.org-2.0.2.rh188467.printingdefaults.patch
-Patch21: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
-Patch22: workspace.as6.patch
-Patch23: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
-Patch24: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
-Patch25: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
-Patch26: pseudoworkspace.valgrind1.patch
-Patch27: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch28: openoffice.org-2.0.4.rh217065.syncbackspace.patch
-Patch29: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch
-Patch30: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
-Patch31: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
-Patch32: openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch
-Patch33: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
-Patch34: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
-Patch35: workspace.tl37.patch
-Patch36: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
-Patch37: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
-Patch38: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
-Patch39: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
-Patch40: workspace.configrefactor01.patch
-Patch41: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
-Patch42: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
-Patch43: openoffice.org-2.2.0.rh232389.tango.patch
-Patch44: openoffice.org-2.2.0.ooo53397.linkopt.patch
-Patch45: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
-Patch46: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
-Patch47: openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch
-Patch48: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
-Patch49: openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch
-Patch50: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
-Patch51: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
-Patch52: openoffice.org-2.2.1.ooo80424.vcl.honourwidthtype.patch
-Patch53: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
-Patch54: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
-Patch55: workspace.unifysound01.patch
-Patch56: workspace.npower7.patch
-Patch57: openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch
-Patch58: openoffice.org-2.3.0.ooo80735.cppu.map.patch
-Patch59: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch60: openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
-Patch61: openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch
-Patch62: openoffice.org-2.3.0.ooo74751.bean.mawt.patch
-Patch63: openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch
-Patch64: openoffice.org-2.3.0.ooo81936.sc.maketypesagree.patch
-Patch65: workspace.fpicker7.patch
-Patch66: openoffice.org-2.3.0.ooo76649.httpencoding.patch
-Patch67: openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
-Patch68: openoffice.org-2.3.1.ooo81307.sw.word2.patch
-Patch69: openoffice.org-2.3.0.ooo83591.vcl.checkboxes.patch
-Patch70: openoffice.org-2.3.1.ooo82911.sd.insertbackground.patch
-Patch71: workspace.sw8u10bf02.patch
-Patch72: openoffice.org-2.3.1.ooo83877.sal.allowsoftlinkdelete.patch
-Patch73: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
-Patch74: openoffice.org-2.3.1.ooo83930.sw.flushanchors.patch
-Patch75: openoffice.org-2.3.1.ooo84001.slideshow.gccisaprick.patch
-Patch76: workspace.cmcfixes39.patch
-Patch77: workspace.notes2.patch
-Patch78: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
-Patch79: workspace.gcc430.patch
-Patch80: workspace.locales24.patch
-Patch81: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
-Patch82: openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch
-Patch83: openoffice.org-2.3.0.ooo81314.i18npool.crash.patch
+Patch16: openoffice.org-1.9.115.ooo69368.fixxmlsec.patch
+Patch17: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch18: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
+Patch19: openoffice.org-2.0.2.rh188467.printingdefaults.patch
+Patch20: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
+Patch21: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
+Patch22: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
+Patch23: pseudoworkspace.valgrind1.patch
+Patch24: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
+Patch25: openoffice.org-2.0.4.rh217065.syncbackspace.patch
+Patch26: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch
+Patch27: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
+Patch28: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
+Patch29: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch
+Patch30: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
+Patch31: workspace.tl37.patch
+Patch32: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
+Patch33: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
+Patch34: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
+Patch35: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
+Patch36: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
+Patch37: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
+Patch38: openoffice.org-2.2.0.rh232389.tango.patch
+Patch39: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
+Patch40: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
+Patch41: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
+Patch42: openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch
+Patch43: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
+Patch44: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
+Patch45: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
+Patch46: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
+Patch47: workspace.unifysound01.patch
+Patch48: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch49: openoffice.org-2.3.0.ooo74751.bean.mawt.patch
+Patch50: openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch
+Patch51: openoffice.org-2.3.0.ooo76649.httpencoding.patch
+Patch52: openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
+Patch53: openoffice.org-2.3.1.ooo81307.sw.word2.patch
+Patch54: openoffice.org-2.3.1.ooo83877.sal.allowsoftlinkdelete.patch
+Patch55: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
+Patch56: workspace.notes2.patch
+Patch57: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
+Patch58: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
+Patch59: openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch
+Patch60: openoffice.org-2.4.0.ooo84684.vcl.fixfontconfig.patch
+Patch61: openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch
+Patch62: openoffice.org-2.4.0.ooo85055.psprint.linetoolong.patch
%define instdir %{_libdir}/openoffice.org
@@ -343,6 +311,15 @@
%description sdk-doc
This provides the documentation for programming using the %{name} APIs and examples of creating extensions (UNO components) for %{name}.
+%package devel
+Summary: Development Libraries for %{name}
+Group: Development/Libraries
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: sdk
+
+%description devel
+The %{name} devel package provides necessary headers for development against %{name}.
+
%package headless
Summary: Headless plugin for %{name}
Group: Development/Libraries
@@ -578,7 +555,7 @@
Summary: Punjabi language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: fonts-punjabi
+Requires: fonts-punjabi, hunspell-pa
Obsoletes: openoffice.org-i18n
Obsoletes: openoffice.org2-langpack-pa_IN
@@ -602,7 +579,7 @@
Summary: Hindi language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: fonts-hindi
+Requires: fonts-hindi, hunspell-hi
Obsoletes: openoffice.org-langpack-hi-IN
Obsoletes: openoffice.org-i18n
Obsoletes: openoffice.org2-langpack-hi_IN
@@ -848,7 +825,7 @@
Summary: Tamil language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: fonts-tamil
+Requires: fonts-tamil, hunspell-ta
Obsoletes: openoffice.org-i18n
Obsoletes: openoffice.org2-langpack-ta_IN
@@ -973,7 +950,7 @@
Summary: Marathi language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: fonts-hindi
+Requires: fonts-hindi, hunspell-mr
Obsoletes: openoffice.org2-langpack-mr_IN
%description langpack-mr_IN
@@ -993,7 +970,7 @@
Summary: Oriya language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: fonts-oriya
+Requires: fonts-oriya, hunspell-or
Obsoletes: openoffice.org2-langpack-or_IN
%description langpack-or_IN
@@ -1058,82 +1035,53 @@
%endif
%patch14 -p1 -b .rh171692.jvmfwk.retryjvm.patch
%patch15 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
-%patch16 -p1 -b .ooo54603.fontconfig.patch
-%patch17 -p1 -b .ooo69368.fixxmlsec.patch
-%patch18 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
-%patch19 -p1 -b .ooo58606.sw.pre-edit.patch
-%patch20 -p1
-%patch21 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
-%patch22 -p1 -b .workspace.as6.patch
-%patch23 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
-%patch24 -p1 -b .ooo68048.vcl.imsurroundtext.patch
-%patch25 -p1 -b .ooo69051.vcl.singlekeypress.patch
-%patch26 -p1 -b .pseudoworkspace.valgrind1.patch
-%patch27 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
-%patch28 -p1 -b .rh217065.syncbackspace.patch
-%patch29 -p1 -b .ooo80412.i18npool.extendgrapheme.patch
-%patch30 -p1 -b .ooo65491.psprint.enablenups.patch
-cat %{PATCH31} >> svtools/source/dialogs/localize.sdf
-%patch32 -p1 -b .ooo78148.lingucomponent.systemhunspell.patch
-%patch33 -p1 -b .rh217269.officecfg.nosequencecheck.patch
-%patch34 -p1 -b .ooo72129.vcl.fontglyphindex.patch
-%patch35 -p1 -b .tl37.patch
-%patch36 -p1 -b .ooo73201.sw.a11yloadcrash.patch
-%patch37 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
-%patch38 -p1 -b .ooo73863.vcl.imcommit.patch
-%patch39 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
-%patch40 -p0 -b .workspace.configrefactor01.patch
-%patch41 -p0 -b .ooo68717.gstreamer.video.patch
-%patch42 -p1 -b .ooo63159.sal.dtype.patch
-%patch43 -p1 -b .rh232389.tango.patch
-%if %{linkopt}
-%patch44 -p1 -b .ooo53397.linkopt.patch
-%endif
-%patch45 -p1 -b .ooo76393.sal.dynamicsection.patch
-%patch46 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
-%if %{linkopt}
-%patch47 -p0 -b .ooo77885.stoc.stocmerge.patch
-%endif
-%patch48 -p1 -b .ooo80816.selinux.bridges.patch
-%patch49 -p1 -b .ooo78971.xmloff.outofrange.patch
-%patch50 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
-%patch51 -p1 -b .ooo79481.sw.rowordcount.patch
-%patch52 -p1 -b .ooo80424.vcl.honourwidthtype.patch
-%patch53 -p1 -b .ooo80257.sd.textonlystyle.patch
-tar xzf %{PATCH54}
-%patch55 -p1 -b .workspace.unifysound01.patch
-%patch56 -p1 -b .workspace.npower7.patch
-%patch57 -p1 -b .ooo80721.reportdesign.stlportism.patch
-%patch58 -p1 -b .ooo80735.cppu.map.patch
-%patch59 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch60 -p1 -b .ooo80967.ucb.neon27.patch
-%patch61 -p1 -b .ooo81112.reportdesign.parallel.patch
-%patch62 -p1 -b .ooo74751.bean.mawt.patch
-%patch63 -p1 -b .ooo81321.cppu.silencewarnings.patch
-%patch64 -p1 -b .ooo81936.sc.maketypesagree.patch
-%patch65 -p1 -b .workspace.fpicker7.patch
-%patch66 -p1 -b .ooo76649.httpencoding.patc
-%patch67 -p1 -b .ooo82966.svx.missing3d.patch
-%patch68 -p1 -b .ooo81307.sw.word2.patch
-%patch69 -p1 -b .ooo83591.vcl.checkboxes.patch
-%patch70 -p1 -b .ooo82911.sd.insertbackground.patch
-%patch71 -p1 -b .workspace.sw8u10bf02.patch
-%patch72 -p1 -b .ooo83877.sal.allowsoftlinkdelete.patch
-%patch73 -p1 -b .ooo83878.unopkg.enablelinking.patch
-%patch74 -p1 -b .ooo83930.sw.flushanchors.patch
-%patch75 -p1 -b .ooo84001.slideshow.gccisaprick.patch
-%patch76 -p1 -b .workspace.cmcfixes39.patch
-%patch77 -p1 -b .workspace.notes2.patch
-%patch78 -p1 -b .ooo84676.ucb.davprotocol.patch
-%patch79 -p1 -b .workspace.gcc430.patch
-%patch80 -p1 -b .workspace.locales24.patch
-%patch81 -p1 -b .ooo84621.sw.insertexcel.patch
-%patch82 -p1 -b .ooo84770.svx.eventsmismatch.patch
-%patch83 -p1 -b .ooo81314.i18npool.crash.patch
-
-%if %{linkopt}
-chmod a+x solenv/bin/mklinkscript.pl
-%endif
+%patch16 -p1 -b .ooo69368.fixxmlsec.patch
+%patch17 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch18 -p1 -b .ooo58606.sw.pre-edit.patch
+%patch19 -p1
+%patch20 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
+%patch21 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
+%patch22 -p1 -b .ooo69051.vcl.singlekeypress.patch
+%patch23 -p1 -b .pseudoworkspace.valgrind1.patch
+%patch24 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
+%patch25 -p1 -b .rh217065.syncbackspace.patch
+%patch26 -p1 -b .ooo80412.i18npool.extendgrapheme.patch
+%patch27 -p1 -b .ooo65491.psprint.enablenups.patch
+cat %{PATCH29} >> svtools/source/dialogs/localize.sdf
+%patch29 -p1 -b .oooXXXXX.lingucomponent.systemdicts.patch
+%patch30 -p1 -b .rh217269.officecfg.nosequencecheck.patch
+%patch31 -p1 -b .tl37.patch
+%patch32 -p1 -b .ooo73201.sw.a11yloadcrash.patch
+%patch33 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
+%patch34 -p1 -b .ooo73863.vcl.imcommit.patch
+%patch35 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
+%patch36 -p0 -b .ooo68717.gstreamer.video.patch
+%patch37 -p1 -b .ooo63159.sal.dtype.patch
+%patch38 -p1 -b .rh232389.tango.patch
+%patch39 -p1 -b .ooo76393.sal.dynamicsection.patch
+%patch40 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
+%patch41 -p1 -b .ooo80816.selinux.bridges.patch
+%patch42 -p1 -b .ooo78971.xmloff.outofrange.patch
+%patch43 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
+%patch44 -p1 -b .ooo79481.sw.rowordcount.patch
+%patch45 -p1 -b .ooo80257.sd.textonlystyle.patch
+tar xzf %{PATCH46}
+%patch47 -p1 -b .workspace.unifysound01.patch
+%patch48 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch49 -p1 -b .ooo74751.bean.mawt.patch
+%patch50 -p1 -b .ooo81321.cppu.silencewarnings.patch
+%patch51 -p1 -b .ooo76649.httpencoding.patc
+%patch52 -p1 -b .ooo82966.svx.missing3d.patch
+%patch53 -p1 -b .ooo81307.sw.word2.patch
+%patch54 -p1 -b .ooo83877.sal.allowsoftlinkdelete.patch
+%patch55 -p1 -b .ooo83878.unopkg.enablelinking.patch
+%patch56 -p1 -b .workspace.notes2.patch
+%patch57 -p1 -b .ooo84676.ucb.davprotocol.patch
+%patch58 -p1 -b .ooo84621.sw.insertexcel.patch
+%patch59 -p1 -b .ooo84770.svx.eventsmismatch.patch
+%patch60 -p1 -b .ooo84684.vcl.fixfontconfig.patch
+%patch61 -p1 -b .ooo85054.stlport.noorigs.patch
+%patch62 -p1 -b .oo85055.psprint.linetoolong.patch
# temporary until hsqldb is updated in rawhide
sed -i -e "s/exit 1/exit 0/g" config_office/configure.in
@@ -1145,7 +1093,7 @@
cd config_office
autoconf
export PATH=$PATH:/usr/sbin
-%configure --with-build-version=%{name}-%{version}-%{release} --with-unix-wrapper=%{name} --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --with-ant-home=/usr/share/ant %{jdkflags} --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba --enable-dbus --with-system-libs --with-system-python --with-system-mozilla=xulrunner --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --with-system-hunspell --with-system-altlinuxhyph --with-system-libtextcat --with-system-vigra --without-myspell-dicts --without-system-mspack --without-system-xt --without-fonts --without-nas --without-gpc --without-agg --without-ppds --wit!
hout-afms --without-writer2latex %{stlflags} --with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS"
+%configure --with-build-version=%{name}-%{version}-%{release} --with-unix-wrapper=%{name} --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba --enable-dbus --with-system-libs --with-system-python --with-system-mozilla=xulrunner --with-system-boost --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-hunspell --with-system-altlinuxhyph --with-system-libtextcat --with-system-vigra --without-myspell-dicts --without-system-mspack --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms --without-writer2latex %{stlflags} --with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS"
cd ..
./bootstrap
source Linux*Env.Set.sh
@@ -1219,18 +1167,14 @@
#start of jakub based suggestion on prelink optimization
cd ../../../../desktop/source/app
-%if ! %{linkopt}
sed -i -e "s/OBJ/SLO/" makefile.mk
dmake
-%endif
cd ../../util
-%if ! %{linkopt}
%if %{stlport_abi_lockin}
`(cat ../$OUTPATH.pro/misc/soffice.soffice_5.cmd | sed -e "s/obj/slo/g" | sed -e "s/bin\/soffice/lib\/libsoffice.so -shared/" && grep ^lib ../$OUTPATH.pro/misc/pagein-common | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs | xargs`
%else
`(cat ../$OUTPATH.pro/misc/soffice.soffice_5.cmd | sed -e "s/obj/slo/g" | sed -e "s/bin\/soffice/lib\/libsoffice.so -shared/" && grep ^lib ../$OUTPATH.pro/misc/pagein-common | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | grep -v stlport | xargs | xargs`
%endif
-%endif
$LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/soffice
`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/swriter) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-writer | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/scalc) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-calc| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
@@ -1256,9 +1200,7 @@
echo - ---dump log end---
dmake openoffice_en-US
fi
-%if ! %{linkopt}
cp -f ../../desktop/$OUTPATH.pro/lib/libsoffice.so $RPM_BUILD_ROOT/%{instdir}/program
-%endif
cp -f ../../desktop/$OUTPATH.pro/bin/soffice $RPM_BUILD_ROOT/%{instdir}/program/soffice.bin
cp -f ../../desktop/$OUTPATH.pro/bin/swriter $RPM_BUILD_ROOT/%{instdir}/program/swriter.bin
cp -f ../../desktop/$OUTPATH.pro/bin/scalc $RPM_BUILD_ROOT/%{instdir}/program/scalc.bin
@@ -1292,6 +1234,15 @@
done
popd
+#add enough to the sdk to build the kde vcl plug out of tree
+cp -r solenv/ $RPM_BUILD_ROOT/%{instdir}/sdk
+cp solver/680/unxlng*/bin/checkdll $RPM_BUILD_ROOT/%{instdir}/sdk/linux/bin
+cp -r solver/680/unxlng*/inc/comphelper/ $RPM_BUILD_ROOT/%{instdir}/sdk/include
+cp -r solver/680/unxlng*/inc/i18npool/ $RPM_BUILD_ROOT/%{instdir}/sdk/include
+cp -r solver/680/unxlng*/inc/psprint $RPM_BUILD_ROOT/%{instdir}/sdk/include
+cp -r solver/680/unxlng*/inc/tools/ $RPM_BUILD_ROOT/%{instdir}/sdk/include
+cp -r solver/680/unxlng*/inc/vos $RPM_BUILD_ROOT/%{instdir}/sdk/include
+
#add our custom configuration options
#default GTK fpicker
$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{PATCH1}
@@ -2304,9 +2255,6 @@
%{_datadir}/applications/openoffice.org-extension.desktop
%{_datadir}/mime/packages/openoffice.org.xml
%{_datadir}/mimelnk/application/*extension*
-#linkopt libs
-%if ! %{linkopt}
-#crude merge ones
%{instdir}/program/behelper.uno.so
%{instdir}/program/configmgr2.uno.so
%{instdir}/program/desktopbe1.uno.so
@@ -2347,23 +2295,9 @@
%{instdir}/program/localebe1.uno.so
%{instdir}/program/sysmgr1.uno.so
%{instdir}/program/ucpgvfs1.uno.so
-#stocmerge bootstrap
-%{instdir}/program/implreg.uno.so
-%{instdir}/program/nestedreg.uno.so
-%{instdir}/program/regtypeprov.uno.so
-%{instdir}/program/security.uno.so
-%{instdir}/program/servicemgr.uno.so
-%{instdir}/program/shlibloader.uno.so
-%{instdir}/program/simplereg.uno.so
-%{instdir}/program/typemgr.uno.so
-#stocmerge nonbootstrap
-%{instdir}/program/typeconverter.uno.so
-%{instdir}/program/uriproc.uno.so
-%else
#stocmerge ones
%{instdir}/program/bootstrap.uno.so
%{instdir}/program/stocservices.uno.so
-%endif
#vba
%{instdir}/program/oovbaapi.rdb
@@ -2816,12 +2750,29 @@
%{instdir}/sdk/
%exclude %{instdir}/sdk/docs/
%exclude %{instdir}/sdk/examples/
+%exclude %{instdir}/sdk/include/tools
+%exclude %{instdir}/sdk/include/comphelper
+%exclude %{instdir}/sdk/include/i18npool
+%exclude %{instdir}/sdk/include/vos
+%exclude %{instdir}/sdk/include/psprint
+%exclude %{instdir}/sdk/solenv
+%exclude %{instdir}/sdk/linux/bin/checkdll
%files sdk-doc
%defattr(-,root,root,-)
%{instdir}/sdk/docs/
%{instdir}/sdk/examples/
+%files devel
+%defattr(-,root,root,-)
+%{instdir}/sdk/include/tools
+%{instdir}/sdk/include/comphelper
+%{instdir}/sdk/include/i18npool
+%{instdir}/sdk/include/vos
+%{instdir}/sdk/include/psprint
+%{instdir}/sdk/solenv
+%{instdir}/sdk/linux/bin/checkdll
+
%files headless
%defattr(-,root,root,-)
%dir %{instdir}
@@ -2855,6 +2806,40 @@
%changelog
+* Sat Jan 06 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-1.1
+- first OOH680_m1
+- remove redundant entries from configure
+- drop integrated openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch
+- drop integrated openoffice.org-1.9.129.ooo54603.fontconfig.patch
+- drop integrated workspace.as6.patch
+- drop integrated openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
+- drop integrated openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
+- drop integrated workspace.configrefactor01.patch
+- drop integrated openoffice.org-2.2.1.ooo80424.vcl.honourwidthtype.patch
+- drop integrated workspace.npower7.patch
+- drop integrated openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch
+- drop integrated openoffice.org-2.3.0.ooo80735.cppu.map.patch
+- drop integrated openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
+- drop integrated openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch
+- drop integrated openoffice.org-2.3.0.ooo81936.sc.maketypesagree.patch
+- drop integrated workspace.fpicker7.patch
+- drop integrated openoffice.org-2.3.0.ooo83591.vcl.checkboxes.patch
+- drop integrated openoffice.org-2.3.1.ooo82911.sd.insertbackground.patch
+- drop integrated workspace.sw8u10bf02.patch
+- drop integrated openoffice.org-2.3.1.ooo83930.sw.flushanchors.patch
+- drop integrated workspace.cmcfixes39.patch
+- drop integrated workspace.gcc430.patch
+- drop integrated workspace.locales24.patch
+- drop integrated openoffice.org-2.3.0.ooo81314.i18npool.crash.patch
+- drop openoffice.org-2.3.1.ooo84001.slideshow.gccisaprick.patch
+- drop openoffice.org-2.2.0.ooo53397.linkopt.patch
+- replace openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch with
+ openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch
+- add openoffice.org-2.4.0.ooo84684.vcl.fixfontconfig.patch
+- add Requires for indic hunspell dictionaries
+- Resolves: rhbz#427757 add openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch
+- Resolves: rhbz#426876 add openoffice.org-2.4.0.ooo85055.psprint.linetoolong.patch
+
* Wed Jan 03 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.3.1-9.11
- Resolves: rhbz#427071 openoffice.org-2.3.0.ooo81314.i18npool.crash.patch
pseudoworkspace.valgrind1.patch:
Index: pseudoworkspace.valgrind1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/pseudoworkspace.valgrind1.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- pseudoworkspace.valgrind1.patch 5 Sep 2007 06:52:18 -0000 1.22
+++ pseudoworkspace.valgrind1.patch 8 Jan 2008 14:51:51 -0000 1.23
@@ -13,107 +13,3 @@
nNumItemId(SID_ATTR_NUMBERING_RULE),
bInInintControl(FALSE)
{
-Index: source/core/txtnode/swfont.cxx
-===================================================================
-RCS file: /cvs/sw/sw/source/core/txtnode/swfont.cxx,v
-retrieving revision 1.54
-diff -u -r1.54 swfont.cxx
---- openoffice.org.orig/sw/source/core/txtnode/swfont.cxx 16 Sep 2006 21:47:04 -0000 1.54
-+++ openoffice.org/sw/source/core/txtnode/swfont.cxx 9 Jan 2007 15:52:55 -0000
-@@ -885,7 +885,7 @@
- if( STRING_LEN == rInf.GetLen() )
- rInf.SetLen( nLn );
-
-- FontUnderline nOldUnder;
-+ FontUnderline nOldUnder(UNDERLINE_NONE);
- SwUnderlineFont* pUnderFnt = 0;
-
- if( rInf.GetUnderFnt() )
-Index: source/commontools/statementcomposer.cxx
-===================================================================
-RCS file: /cvs/dba/connectivity/source/commontools/statementcomposer.cxx,v
-retrieving revision 1.4
-diff -u -r1.4 statementcomposer.cxx
---- openoffice.org.orig/connectivity/source/commontools/statementcomposer.cxx 31 Jul 2007 13:38:39 -0000 1.4
-+++ openoffice.org/connectivity/source/commontools/statementcomposer.cxx 4 Sep 2007 11:51:46 -0000
-@@ -109,6 +109,7 @@
- ,nCommandType( CommandType::COMMAND )
- ,bEscapeProcessing( sal_True )
- ,bComposerDirty( true )
-+ ,bDisposeComposer( true )
- {
- if ( !_rxConnection.is() )
- throw NullPointerException();
-Index: source/ui/config/usrpref.cxx
-===================================================================
-RCS file: /cvs/sw/sw/source/ui/config/usrpref.cxx,v
-retrieving revision 1.32
-diff -u -r1.32 usrpref.cxx
---- openoffice.org.orig/sw/source/ui/config/usrpref.cxx 27 Jun 2007 12:49:41 -0000 1.32
-+++ openoffice.org/sw/source/ui/config/usrpref.cxx 4 Sep 2007 13:34:50 -0000
-@@ -79,16 +79,16 @@
- }
-
- SwMasterUsrPref::SwMasterUsrPref(BOOL bWeb) :
-- aContentConfig(bWeb, *this),
-- aLayoutConfig(bWeb, *this),
-- aGridConfig(bWeb, *this),
-- aCursorConfig(*this),
-- pWebColorConfig(bWeb ? new SwWebColorConfig(*this) : 0),
- nFldUpdateFlags(0),
- nLinkUpdateMode(0),
- bIsHScrollMetricSet(sal_False),
- bIsVScrollMetricSet(sal_False),
-- nDefTab( MM50 * 4 )
-+ nDefTab( MM50 * 4 ),
-+ aContentConfig(bWeb, *this),
-+ aLayoutConfig(bWeb, *this),
-+ aGridConfig(bWeb, *this),
-+ aCursorConfig(*this),
-+ pWebColorConfig(bWeb ? new SwWebColorConfig(*this) : 0)
- {
- MeasurementSystem eSystem = GetAppLocaleData().getMeasurementSystemEnum();
- eUserMetric = MEASURE_METRIC == eSystem ? FUNIT_CM : FUNIT_INCH;
-Index: source/ui/inc/usrpref.hxx
-===================================================================
-RCS file: /cvs/sw/sw/source/ui/inc/usrpref.hxx,v
-retrieving revision 1.11
-diff -u -r1.11 usrpref.hxx
---- openoffice.org.orig/sw/source/ui/inc/usrpref.hxx 27 Jun 2007 12:50:12 -0000 1.11
-+++ openoffice.org/sw/source/ui/inc/usrpref.hxx 4 Sep 2007 13:34:54 -0000
-@@ -141,6 +141,17 @@
- ---------------------------------------------------------------------------*/
- class SwMasterUsrPref : public SwViewOption
- {
-+ sal_Int32 nFldUpdateFlags; //udpate of fields and charts
-+ sal_Int32 nLinkUpdateMode;
-+ FieldUnit eUserMetric;
-+ FieldUnit eHScrollMetric;
-+ sal_Bool bIsHScrollMetricSet;
-+ FieldUnit eVScrollMetric;
-+ sal_Bool bIsVScrollMetricSet;
-+
-+ sal_Int32 nDefTab; //default tab stop distance
-+
-+
- friend class SwContentViewConfig;
- friend class SwLayoutViewConfig;
- friend class SwGridConfig;
-@@ -153,17 +164,6 @@
- SwCursorConfig aCursorConfig;
- SwWebColorConfig* pWebColorConfig;
-
-- sal_Int32 nFldUpdateFlags; //udpate of fields and charts
-- sal_Int32 nLinkUpdateMode;
-- FieldUnit eUserMetric;
-- FieldUnit eHScrollMetric;
-- sal_Bool bIsHScrollMetricSet;
-- FieldUnit eVScrollMetric;
-- sal_Bool bIsVScrollMetricSet;
--
--
-- sal_Int32 nDefTab; //default tab stop distance
--
- public:
- SwMasterUsrPref(BOOL bWeb);
- ~SwMasterUsrPref();
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- sources 8 Jan 2008 14:07:38 -0000 1.258
+++ sources 8 Jan 2008 14:51:51 -0000 1.259
@@ -4,5 +4,4 @@
05a906513ef89af5e189097fa0c50681 ooo64726.sdf
e3a0b76dcd876f3d721ee7183729153d unowinreg.dll
f0cda31fe18bf9289629a321663031b8 redhat-templates.tar.gz
-d857f932547a41c6f89f92bc78ba9f8f OOG680_m9.tar.bz2
31c0b0269670242bbb662b01c1fa04af OOH680_m1.tar.bz2
workspace.notes2.patch:
Index: workspace.notes2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.notes2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.notes2.patch 5 Dec 2007 12:42:15 -0000 1.1
+++ workspace.notes2.patch 8 Jan 2008 14:51:51 -0000 1.2
@@ -553,7 +553,7 @@
enum SwAuthorFormat
{
-@@ -505,30 +516,37 @@
+@@ -505,35 +516,46 @@
class SwPostItFieldType : public SwFieldType
{
@@ -598,16 +598,15 @@
// Author
virtual const String& GetPar1() const;
-@@ -539,6 +557,9 @@
- virtual void SetPar2(const String& rStr);
- const String& GetTxt() const { return sTxt; }
+ virtual void SetPar1(const String& rStr);
+ const OutlinerParaObject* GetTextObject() const;
+ void SetTextObject( OutlinerParaObject* pText );
+
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMId ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMId );
- virtual String GetDescription() const;
++
+ // Text
+ virtual String GetPar2() const;
+ virtual void SetPar2(const String& rStr);
Index: sw/sw/inc/fmtfld.hxx
diff -u sw/sw/inc/fmtfld.hxx:1.6 sw/sw/inc/fmtfld.hxx:1.6.806.3
--- sw/sw/inc/fmtfld.hxx:1.6 Thu Sep 8 18:49:24 2005
@@ -1708,10 +1707,10 @@
diff -u sw/sw/sdi/swriter.sdi:1.66 sw/sw/sdi/swriter.sdi:1.66.6.1
--- sw/sw/sdi/swriter.sdi:1.66 Wed Jun 27 06:16:04 2007
+++ sw/sw/sdi/swriter.sdi Wed Jul 4 08:39:16 2007
-@@ -9915,4 +9915,152 @@
- GroupId = GID_ENUMERATION;
+@@ -9989,3 +9989,152 @@
+ ToolBoxConfig = TRUE,
+ GroupId = GID_EDIT;
]
-
+//--------------------------------------------------------------------------
+SfxVoidItem DeleteNote FN_DELETE_NOTE
+()
@@ -1736,7 +1735,7 @@
+ ToolBoxConfig = TRUE,
+ GroupId = GID_EDIT;
+]
-
++
+//--------------------------------------------------------------------------
+SfxVoidItem DeleteAuthor FN_DELETE_NOTE_AUTHOR
+()
@@ -1880,38 +1879,38 @@
diff -u sw/sw/source/core/crsr/crsrsh.cxx:1.66 sw/sw/source/core/crsr/crsrsh.cxx:1.63.24.7
--- sw/sw/source/core/crsr/crsrsh.cxx:1.66 Thu Sep 27 01:28:47 2007
+++ sw/sw/source/core/crsr/crsrsh.cxx Sun Nov 4 13:42:59 2007
-@@ -1210,7 +1210,7 @@
- {
+@@ -1289,7 +1289,7 @@
SET_CURR_SHELL( this );
++nStartAction;
+ SwShellCrsr* pShellCrsr = getShellCrsr( true );
- Size aOldSz( GetLayout()->Frm().SSize() );
-+ Size aOldSz( GetDocSize() );
- SwCntntNode *pCNode = pCurCrsr->GetCntntNode();
++ Size aOldSz( GetDocSize() );
+ SwCntntNode *pCNode = pShellCrsr->GetCntntNode();
SwCntntFrm *pFrm = pCNode ?
- pCNode->GetFrm( &pCurCrsr->GetPtPos(), pCurCrsr->GetPoint() ) :0;
-@@ -1224,7 +1224,7 @@
- pCurCrsr->DeleteMark();
+ pCNode->GetFrm( &pShellCrsr->GetPtPos(), pShellCrsr->GetPoint() ) :0;
+@@ -1303,7 +1303,7 @@
+ pShellCrsr->DeleteMark();
}
--nStartAction;
- if( aOldSz != GetLayout()->Frm().SSize() )
+ if( aOldSz != GetDocSize() )
- SizeChgNotify( GetLayout()->Frm().SSize() );
+ SizeChgNotify();
}
-@@ -1952,10 +1952,10 @@
+@@ -2172,10 +2172,10 @@
{
const USHORT* pST = &nStartAction;
++(*((USHORT*)pST));
- const Size aOldSz( GetLayout()->Frm().SSize() );
-+ const Size aOldSz( GetDocSize() );
++ const Size aOldSz( GetDocSize() );
pRet = pNd->GetFrm( &pCurCrsr->GetPtPos(), pCurCrsr->GetPoint() );
--(*((USHORT*)pST));
- if( aOldSz != GetLayout()->Frm().SSize() )
-+ if( aOldSz != GetDocSize() )
- ((SwCrsrShell*)this)->SizeChgNotify( GetLayout()->Frm().SSize() );
++ if( aOldSz != GetDocSize() )
+ ((SwCrsrShell*)this)->SizeChgNotify();
}
else
-@@ -3109,6 +3109,14 @@
+@@ -3351,6 +3351,14 @@
return aResult;
}
@@ -2050,17 +2049,16 @@
diff -u sw/sw/source/core/docnode/nodes.cxx:1.27 sw/sw/source/core/docnode/nodes.cxx:1.27.2.5
--- sw/sw/source/core/docnode/nodes.cxx:1.27 Thu Sep 27 01:42:17 2007
+++ sw/sw/source/core/docnode/nodes.cxx Wed Nov 14 09:05:20 2007
-@@ -87,6 +87,9 @@
+@@ -86,6 +86,8 @@
+ // --> OD 2006-11-14 #b6492987#
#include <txtnodenumattr.hxx>
// <--
-
+#include <docsh.hxx>
+#include <svtools/smplhint.hxx>
-+
- extern FASTBOOL CheckNodesRange( const SwNodeIndex& rStt,
- const SwNodeIndex& rEnd, BOOL bChkSection );
-@@ -367,10 +370,14 @@
+ extern BOOL CheckNodesRange( const SwNodeIndex& rStt,
+ const SwNodeIndex& rEnd, BOOL bChkSection );
+@@ -367,10 +369,14 @@
case RES_TXTATR_FIELD:
{
SwTxtFld* pTxtFld = (SwTxtFld*)pAttr;
@@ -2079,7 +2077,7 @@
if( RES_DDEFLD == pTyp->Which() )
{
if( bToUndo )
-@@ -1903,6 +1910,7 @@
+@@ -1903,6 +1909,7 @@
// wird aufgehoben !
pEnd->nContent = pStt->nContent;
rPam.DeleteMark();
@@ -2087,7 +2085,7 @@
return;
}
-@@ -2020,6 +2028,7 @@
+@@ -2020,6 +2027,7 @@
// wird aufgehoben !
*pEnd = *pStt;
rPam.DeleteMark();
@@ -2144,17 +2142,17 @@
#include <tools/pstm.hxx>
-@@ -43,6 +44,9 @@
- #include <hintids.hxx>
+@@ -46,6 +47,9 @@
+ #ifndef _COM_SUN_STAR_SCRIPT_XTYPECONVERTER_HPP_
+ #include <com/sun/star/script/XTypeConverter.hpp>
#endif
-
+#ifndef _COM_SUN_STAR_TEXT_XTEXT_HPP_
+#include <com/sun/star/text/XText.hpp>
+#endif
#ifndef _COM_SUN_STAR_TEXT_SETVARIABLETYPE_HPP_
#include <com/sun/star/text/SetVariableType.hpp>
#endif
-@@ -199,6 +203,9 @@
+@@ -202,6 +206,9 @@
#include <comcore.hrc>
#endif
@@ -2164,7 +2162,7 @@
#define URL_DECODE INetURLObject::DECODE_UNAMBIGUOUS
using namespace ::com::sun::star;
-@@ -1784,26 +1791,37 @@
+@@ -1800,26 +1807,37 @@
Beschreibung: PostIt
--------------------------------------------------------------------*/
@@ -2186,13 +2184,13 @@
Beschreibung: SwPostItFieldType
--------------------------------------------------------------------*/
--SwPostItField::SwPostItField( SwPostItFieldType* pType,
+-SwPostItField::SwPostItField( SwPostItFieldType* pTyp,
- const String& rAuthor, const String& rTxt, const Date& rDate )
-- : SwField( pType ), sTxt( rTxt ), sAuthor( rAuthor ), aDate( rDate )
+- : SwField( pTyp ), sTxt( rTxt ), sAuthor( rAuthor ), aDate( rDate )
+SwPostItField::SwPostItField( SwPostItFieldType* pT,
-+ const String& rAuthor, const String& rTxt, const DateTime& rDateTime )
++ const String& rAuthor, const String& rTxt, const DateTime& rDateTime )
+ : SwField( pT ), sTxt( rTxt ), sAuthor( rAuthor ), aDateTime( rDateTime ),
-+ mpText(0), m_pTextObject(0)
++ mpText(0), m_pTextObject(0)
+{
+}
+
@@ -2208,7 +2206,7 @@
/* ---------------------------------------------------------------------------
---------------------------------------------------------------------------*/
-@@ -1823,8 +1841,11 @@
+@@ -1839,8 +1857,11 @@
---------------------------------------------------------------------------*/
SwField* SwPostItField::Copy() const
{
@@ -2222,7 +2220,7 @@
}
/*--------------------------------------------------------------------
Beschreibung: Author setzen
-@@ -1856,6 +1877,17 @@
+@@ -1872,6 +1893,17 @@
return sTxt;
}
@@ -2240,7 +2238,7 @@
/*-----------------05.03.98 13:42-------------------
--------------------------------------------------*/
-@@ -1870,15 +1902,46 @@
+@@ -1885,15 +1917,46 @@
case FIELD_PROP_PAR2:
rAny <<= OUString(sTxt);
break;
@@ -2294,7 +2292,7 @@
default:
DBG_ERROR("illegal property");
}
-@@ -1898,13 +1961,31 @@
+@@ -1912,13 +1975,31 @@
case FIELD_PROP_PAR2:
::GetString( rAny, sTxt );
break;
@@ -2782,65 +2780,7 @@
PROTOCOL( this, PROT_FILE_INIT, 0, 0)
-@@ -2870,9 +2883,12 @@
- // #i68597#
- const bool bGridPainting(pSh->GetWin() && pSh->Imp()->HasDrawView() && pSh->Imp()->GetDrawView()->IsGridVisible());
-
-+
- while ( pPage && !::IsShortCut( aRect, pPage->Frm() ) )
- {
-- if ( !pPage->IsEmptyPage() && aRect.IsOver( pPage->Frm() ) )
-+ SwRect aPaintRect;
-+ pPage->GetBorderAndShadowBoundRect( pPage->Frm(), pSh, aPaintRect );
-+ if ( !pPage->IsEmptyPage() && aRect.IsOver( aPaintRect ) )
- {
- if ( pSh->GetWin() )
- {
-@@ -2880,24 +2896,25 @@
- // OD 18.11.2002 #99672# - create array for special sub-lines
- pSpecSubsLines = new SwSubsRects;
- }
--
-- // --> OD 2007-08-15 #i80691#
-- // include border and shadow area into paint area.
--// SwRect aPaintRect( pPage->Frm() );
-- SwRect aPaintRect;
-- pPage->GetBorderAndShadowBoundRect( pPage->Frm(), pSh, aPaintRect );
-- // <--
-- aPaintRect._Intersection( aRect );
--
-- if ( bExtraData )
-- {
-- //Ja, das ist grob, aber wie macht man es besser?
-- SWRECTFN( pPage )
-- (aPaintRect.*fnRect->fnSetLeftAndWidth)(
-- (pPage->Frm().*fnRect->fnGetLeft)(),
-- (pPage->Frm().*fnRect->fnGetWidth)() );
-- aPaintRect._Intersection( pSh->VisArea() );
-- }
-+ aPaintRect._Intersection( aRect );
-+
-+ // invalidate area for extra data (line numbers or change tracking
-+ // marks), if painting on a window and the paint is trigger by an
-+ // end action.
-+ if ( bExtraData && pSh->GetWin() && pSh->IsInEndAction() )
-+ {
-+ // enlarge paint rectangle to complete page width, subtract
-+ // current paint area and invalidate the resulting region.
-+ SWRECTFN( pPage )
-+ SwRect aPageRectTemp( aPaintRect );
-+ (aPageRectTemp.*fnRect->fnSetLeftAndWidth)(
-+ (pPage->Frm().*fnRect->fnGetLeft)(),
-+ (pPage->Frm().*fnRect->fnGetWidth)() );
-+ aPageRectTemp._Intersection( pSh->VisArea() );
-+ Region aPageRectRegion( aPageRectTemp.SVRect() );
-+ aPageRectRegion.Exclude( aPaintRect.SVRect() );
-+ pSh->GetWin()->Invalidate( aPageRectRegion, INVALIDATE_CHILDREN );
-+ }
-
- // --> OD 2007-08-20 #i80793#
- // enlarge paint rectangle for objects overlapping the same pixel
-@@ -2961,14 +2978,15 @@
+@@ -2981,14 +2994,15 @@
pPage->Paint( aPaintRect );
@@ -2859,7 +2799,7 @@
}
pLines->PaintLines( pSh->GetOut() );
-@@ -3008,6 +3026,7 @@
+@@ -3028,6 +3042,7 @@
{
pSh->DLPostPaint2();
}
@@ -2867,7 +2807,7 @@
}
ASSERT( !pPage->GetNext() || pPage->GetNext()->IsPageFrm(),
"Nachbar von Seite keine Seite." );
-@@ -5178,7 +5197,7 @@
+@@ -5198,7 +5213,7 @@
OutputDevice *pOut = _pViewShell->GetOut();
if ( pOut->GetFillColor() != aGlobalRetoucheColor )
pOut->SetFillColor( aGlobalRetoucheColor );
@@ -2876,7 +2816,7 @@
{
if ( 1 < aPgRegion.Count() )
{
-@@ -5186,7 +5205,7 @@
+@@ -5206,7 +5221,7 @@
if( !aPgRegion[i].HasArea() )
continue;
}
@@ -2885,7 +2825,7 @@
}
}
}
-@@ -5222,11 +5241,13 @@
+@@ -5242,11 +5257,13 @@
Rectangle aBorderPxRect =
_pViewShell->GetOut()->LogicToPixel( aAlignedPageRect.SVRect() );
@@ -2900,7 +2840,7 @@
_orBorderRect =
SwRect( _pViewShell->GetOut()->PixelToLogic( aBorderPxRect ) );
}
-@@ -5252,6 +5273,8 @@
+@@ -5272,6 +5289,8 @@
aPagePxRect.Right() + mnBorderPxWidth + mnShadowPxWidth,
aPagePxRect.Bottom() + mnBorderPxWidth + mnShadowPxWidth );
@@ -2909,7 +2849,7 @@
_orRightShadowRect =
SwRect( _pViewShell->GetOut()->PixelToLogic( aRightShadowPxRect ) );
}
-@@ -5276,7 +5299,9 @@
+@@ -5296,7 +5315,9 @@
aPagePxRect.Bottom() + mnShadowPxWidth,
aPagePxRect.Right() + mnBorderPxWidth + mnShadowPxWidth,
aPagePxRect.Bottom() + mnBorderPxWidth + mnShadowPxWidth );
@@ -2920,7 +2860,7 @@
_orBottomShadowRect =
SwRect( _pViewShell->GetOut()->PixelToLogic( aBottomShadowPxRect ) );
}
-@@ -5318,7 +5343,91 @@
+@@ -5338,7 +5359,91 @@
_pViewShell->GetOut()->SetFillColor( aFill );
_pViewShell->GetOut()->SetLineColor( aLine );
@@ -2985,13 +2925,13 @@
+ Point aMiddleFirst(aPointTop + Point(pMgr->GetSidebarWidth()/3,_pViewShell->GetOut()->PixelToLogic(Size(0,POSTIT_SCROLL_SIDEBAR_HEIGHT)).Height()/2));
+ Point aMiddleSecond(aPointTop + Point(pMgr->GetSidebarWidth()/6*5,_pViewShell->GetOut()->PixelToLogic(Size(0,POSTIT_SCROLL_SIDEBAR_HEIGHT)).Height()/2));
+ PaintNotesSidebarArrows(aMiddleFirst,aMiddleSecond,_pViewShell, pMgr->GetArrowColor(KEY_PAGEUP,GetPhyPageNum()), pMgr->GetArrowColor(KEY_PAGEDOWN,GetPhyPageNum()));
-
++
+ }
+ }
+ }
+ }
+}
-+
+
+void SwPageFrm::PaintNotesSidebarArrows(const Point &aMiddleFirst, const Point &aMiddleSecond, ViewShell* _pViewShell, const Color aColorUp, const Color aColorDown) const
+{
+ Polygon aTriangleUp(3);
@@ -3012,7 +2952,7 @@
}
/** get bound rectangle of border and shadow for repaints
-@@ -5338,6 +5447,40 @@
+@@ -5358,6 +5463,40 @@
_orBorderAndShadowBoundRect.Union( aTmpRect );
GetBottomShadowRect( _rPageRect, _pViewShell, aTmpRect );
_orBorderAndShadowBoundRect.Union( aTmpRect );
@@ -3053,7 +2993,7 @@
}
/*************************************************************************
-@@ -6443,5 +6586,3 @@
+@@ -6463,5 +6602,3 @@
}
return aRet;
}
@@ -3076,17 +3016,16 @@
diff -u sw/sw/source/core/text/inftxt.cxx:1.111 sw/sw/source/core/text/inftxt.cxx:1.109.126.4
--- sw/sw/source/core/text/inftxt.cxx:1.111 Thu Sep 27 02:13:09 2007
+++ sw/sw/source/core/text/inftxt.cxx Fri Oct 12 15:30:10 2007
-@@ -1104,8 +1104,7 @@
- /*************************************************************************
+@@ -1103,7 +1103,7 @@
* SwTxtPaintInfo::DrawPostIts()
*************************************************************************/
--
--void SwTxtPaintInfo::DrawPostIts( const SwLinePortion &rPor, sal_Bool bScript ) const
+
+-void SwTxtPaintInfo::DrawPostIts( const SwLinePortion&, sal_Bool bScript ) const
+void SwTxtPaintInfo::DrawPostIts( const SwLinePortion&, sal_Bool /*bScript*/ ) const
{
if( OnWin() && pOpt->IsPostIts() )
{
-@@ -1148,7 +1147,7 @@
+@@ -1146,7 +1146,7 @@
GetTxtFrm()->SwitchHorizontalToVertical( aTmpRect );
const Rectangle aRect( aTmpRect.SVRect() );
@@ -3296,29 +3235,29 @@
using namespace ::com::sun::star;
using namespace ::rtl;
-@@ -1273,10 +1276,11 @@
+@@ -1279,10 +1282,11 @@
-----------------------------------------------------------------------*/
-SwXTextField::SwXTextField(sal_uInt16 nServiceId) :
+SwXTextField::SwXTextField(sal_uInt16 nServiceId, SwDoc* pDoc) :
- pFmtFld(0),
aLstnrCntnr( (XTextContent*)this),
+ pFmtFld(0),
- m_pDoc(0),
+ m_pDoc(pDoc),
+ m_pTextObject(0),
- m_nServiceId(nServiceId),
m_bIsDescriptor(nServiceId != USHRT_MAX),
- m_pProps(new SwFieldProperties_Impl),
-@@ -1301,6 +1305,7 @@
- pFmtFld(&rFmt),
+ m_bCallUpdate(sal_False),
+ m_nServiceId(nServiceId),
+@@ -1307,6 +1311,7 @@
aLstnrCntnr( (XTextContent*)this),
+ pFmtFld(&rFmt),
m_pDoc(pDc),
+ m_pTextObject(0),
- m_nServiceId( lcl_GetServiceForField( *pFmtFld->GetFld() ) ),
m_bIsDescriptor(sal_False),
- m_pProps(0),
-@@ -1313,6 +1318,12 @@
+ m_bCallUpdate(sal_False),
+ m_nServiceId( lcl_GetServiceForField( *pFmtFld->GetFld() ) ),
+@@ -1319,6 +1324,12 @@
-----------------------------------------------------------------------*/
SwXTextField::~SwXTextField()
{
@@ -3331,7 +3270,7 @@
delete m_pProps;
}
/*-- 14.12.98 11:37:16---------------------------------------------------
-@@ -1412,9 +1423,19 @@
+@@ -1418,9 +1429,19 @@
case SW_SERVICE_FIELDTYPE_ANNOTATION:
{
SwFieldType* pFldType = pDoc->GetSysFldType(RES_POSTITFLD);
@@ -3353,16 +3292,16 @@
}
break;
case SW_SERVICE_FIELDTYPE_SCRIPT:
-@@ -1758,7 +1779,7 @@
+@@ -1764,7 +1785,7 @@
{
- case text::SetVariableType::STRING: nSubType = GSE_STRING; break;
- case text::SetVariableType::VAR: nSubType = GSE_EXPR; break;
-- case text::SetVariableType::SEQUENCE: nSubType = GSE_SEQ; break;
-+// case text::SetVariableType::SEQUENCE: nSubType = GSE_SEQ; break;
- case text::SetVariableType::FORMULA: nSubType = GSE_FORMULA; break;
+ case text::SetVariableType::STRING: nSubType = nsSwGetSetExpType::GSE_STRING; break;
+ case text::SetVariableType::VAR: nSubType = nsSwGetSetExpType::GSE_EXPR; break;
+- case text::SetVariableType::SEQUENCE: nSubType = nsSwGetSetExpType::GSE_SEQ; break;
++// case text::SetVariableType::SEQUENCE: nSubType = nsSwGetSetExpType::GSE_SEQ; break;
+ case text::SetVariableType::FORMULA: nSubType = nsSwGetSetExpType::GSE_FORMULA; break;
default:
DBG_ERROR("wrong value");
-@@ -1900,7 +1921,7 @@
+@@ -1906,7 +1927,7 @@
SwTxtAttr* pTxtAttr = 0;
if(aPam.HasMark())
pDoc->DeleteAndJoin(aPam);
@@ -3371,7 +3310,7 @@
pTxtAttr = aPam.GetNode()->GetTxtNode()->GetTxtAttr(
aPam.GetPoint()->nContent.GetIndex()-1, RES_TXTATR_FIELD);
-@@ -1974,6 +1995,13 @@
+@@ -1980,6 +2001,13 @@
aPam.Move();
GetDoc()->DeleteAndJoin(aPam);
}
@@ -3385,7 +3324,7 @@
}
/*-- 14.12.98 11:37:18---------------------------------------------------
-@@ -2273,6 +2301,19 @@
+@@ -2279,6 +2307,19 @@
{
switch(pMap->nWID)
{
@@ -6676,12 +6615,12 @@
diff -u sw/sw/source/ui/inc/popup.hrc:1.3 sw/sw/source/ui/inc/popup.hrc:1.3.808.2
--- sw/sw/source/ui/inc/popup.hrc:1.3 Fri Sep 9 02:57:58 2005
+++ sw/sw/source/ui/inc/popup.hrc Mon Oct 22 03:04:24 2007
-@@ -49,6 +49,8 @@
- #define MN_SRCVIEW_POPUPMENU (RC_POPUPS_BEGIN + 8)
- #define MN_DRAWFORM_POPUPMENU (RC_POPUPS_BEGIN + 9)
- #define MN_MEDIA_POPUPMENU (RC_POPUPS_BEGIN + 10)
-+#define MN_ANNOTATION_POPUPMENU (RC_POPUPS_BEGIN + 11)
-+#define MN_ANNOTATION_BUTTON (RC_POPUPS_BEGIN + 12)
+@@ -52,6 +52,8 @@
+ #define MN_LANGUAGE_FOR_TEXT (RC_POPUPS_BEGIN + 11)
+ #define MN_LANGUAGE_FOR_PARAGRAPH (RC_POPUPS_BEGIN + 12)
+ #define MN_LANGUAGE_FOR_DOCUMENT (RC_POPUPS_BEGIN + 13)
++#define MN_ANNOTATION_POPUPMENU (RC_POPUPS_BEGIN + 14)
++#define MN_ANNOTATION_BUTTON (RC_POPUPS_BEGIN + 15)
#if MN_MEDIA_POPUPMENU > RC_POPUPS_END
@@ -6717,10 +6656,10 @@
diff -u sw/sw/source/ui/inc/textsh.hxx:1.14 sw/sw/source/ui/inc/textsh.hxx:1.13.624.2
--- sw/sw/source/ui/inc/textsh.hxx:1.14 Thu Sep 27 05:12:45 2007
+++ sw/sw/source/ui/inc/textsh.hxx Fri Sep 28 09:33:21 2007
-@@ -62,8 +62,6 @@
- //CHINA001 DECL_LINK( PostItPrevHdl, Button * );
- //CHINA001 DECL_LINK( RedlineNextHdl, Button * );
- //CHINA001 DECL_LINK( RedlinePrevHdl, Button * );
+@@ -57,8 +57,6 @@
+ SFX_DECL_INTERFACE(SW_TEXTSHELL)
+ TYPEINFO();
+
- DECL_LINK( PostItNextHdl, AbstractSvxPostItDialog * );
- DECL_LINK( PostItPrevHdl, AbstractSvxPostItDialog * );
DECL_LINK( RedlineNextHdl, AbstractSvxPostItDialog * );
@@ -6739,12 +6678,12 @@
namespace com{ namespace sun { namespace star {
namespace view{ class XSelectionSupplier; }
@@ -151,7 +152,8 @@
- SEL_TABLE_LIST_TEXT,
- SEL_MEDIA,
- SEL_EXTRUDED_CUSTOMSHAPE,
-- SEL_FONTWORK
-+ SEL_FONTWORK,
-+ SHELL_MODE_POSTIT
+ SHELL_MODE_TABLE_LIST_TEXT,
+ SHELL_MODE_MEDIA,
+ SHELL_MODE_EXTRUDED_CUSTOMSHAPE,
+- SHELL_MODE_FONTWORK
++ SHELL_MODE_FONTWORK,
++ SHELL_MODE_POSTIT
};
/*--------------------------------------------------------------------
@@ -6757,7 +6696,7 @@
int nSelectionType;
static const int MASTERENUMCOMMANDS = 6;
-@@ -675,6 +679,8 @@
+@@ -676,6 +680,8 @@
BOOL bLink = TRUE, GraphicFilter *pFlt = 0,
Graphic* pPreviewGrf = 0,
BOOL bRule = FALSE );
@@ -6770,15 +6709,13 @@
diff -u sw/sw/source/ui/inc/wrtsh.hxx:1.39 sw/sw/source/ui/inc/wrtsh.hxx:1.37.86.4
--- sw/sw/source/ui/inc/wrtsh.hxx:1.39 Thu Sep 27 05:15:57 2007
+++ sw/sw/source/ui/inc/wrtsh.hxx Sat Sep 29 09:07:10 2007
-@@ -116,7 +116,8 @@
- FOC_FRM_CTRL = 0x2000, // a form control is focused. Neither set nor evaluated by the SwWrtShell itself, only by it's clients.
- SEL_MEDIA = 0x4000, // Media object
- SEL_EXTRUDED_CUSTOMSHAPE = 0x8000, // extruded custom shape
-- SEL_FONTWORK = 0x10000 // fontwork
-+ SEL_FONTWORK = 0x10000, // fontwork
-+ SEL_POSTIT = 0x020000 //annotation
- };
- int GetSelectionType() const;
+@@ -101,6 +101,7 @@
+ const SelectionType SEL_MEDIA = 0x004000; // Media object
+ const SelectionType SEL_EXTRUDED_CUSTOMSHAPE = 0x008000; // extruded custom shape
+ const SelectionType SEL_FONTWORK = 0x010000; // fontwork
++ const SelectionType SEL_POSTIT = 0x020000; //annotation
+ }
+
Index: sw/sw/source/ui/shells/annotsh.cxx
diff -u /dev/null sw/sw/source/ui/shells/annotsh.cxx:1.1.2.18
@@ -8011,7 +7948,7 @@
#ifndef _URLOBJ_HXX //autogen
#include <tools/urlobj.hxx>
#endif
-@@ -91,7 +92,7 @@
+@@ -85,7 +86,7 @@
#ifndef _UNOTOOLS_LOCALEDATAWRAPPER_HXX
#include <unotools/localedatawrapper.hxx>
#endif
@@ -8020,7 +7957,7 @@
#ifndef _FMTINFMT_HXX //autogen
#include <fmtinfmt.hxx>
#endif
-@@ -402,104 +403,27 @@
+@@ -388,103 +389,28 @@
case FN_POSTIT:
{
@@ -8028,13 +7965,12 @@
- SwPostItField* pPostIt = (SwPostItField*)pPostItFldMgr->GetCurFld();
- BOOL bNew = !(pPostIt && pPostIt->GetTyp()->Which() == RES_POSTITFLD);
- BOOL bTravel = FALSE;
-- BOOL bNext, bPrev;
+- BOOL bNext = FALSE, bPrev = FALSE;
-
-- //CHINA001 SfxItemSet aSet(GetPool(), SvxPostItDialog::GetRanges());
- SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-- DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
+- DBG_ASSERT(pFact, "Dialogdiet fail!");
- ::DialogGetRanges fnGetRange = pFact->GetDialogGetRangesFunc( RID_SVXDLG_POSTIT );
-- DBG_ASSERT(fnGetRange, "Dialogdiet fail! GetRanges()");//CHINA001
+- DBG_ASSERT(fnGetRange, "Dialogdiet fail! GetRanges()");
- SfxItemSet aSet(GetPool(), fnGetRange());
-
- if(!bNew)
@@ -8075,11 +8011,10 @@
- AbstractSvxPostItDialog *pDlg = NULL;
- if ( !pArgs )
- {
-- //CHINA001 pDlg = new SvxPostItDialog( pMDI, aSet, bTravel);
- SvxAbstractDialogFactory* pFact2 = SvxAbstractDialogFactory::Create();
-- DBG_ASSERT(pFact2, "Dialogdiet fail!");//CHINA001
-- pDlg = pFact2->CreateSvxPostItDialog( pMDI, aSet, RID_SVXDLG_POSTIT, bTravel );
-- DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
+- DBG_ASSERT(pFact2, "Dialogdiet fail!");
+- pDlg = pFact2->CreateSvxPostItDialog( pMDI, aSet, RID_SVXDLG_POSTIT, bTravel );
+- DBG_ASSERT(pDlg, "Dialogdiet fail!");
- pDlg->SetReadonlyPostIt(rSh.IsReadOnlyAvailable() && rSh.HasReadonlySel());
-
- if (bTravel)
@@ -8122,31 +8057,33 @@
- delete pPostItFldMgr;
- bNoInterrupt = FALSE;
- GetView().AttrChangedNotify(GetShellPtr());
-+ SwPostItField* pPostIt = (SwPostItField*)aFldMgr.GetCurFld();
-+ BOOL bNew = !(pPostIt && pPostIt->GetTyp()->Which() == RES_POSTITFLD);
-+ if (bNew)
-+ {
-+ SvtUserOptions aUserOpt;
-+ String sAuthor = aUserOpt.GetFullName();
-+ if (sAuthor==aEmptyStr)
-+ sAuthor = aUserOpt.GetID();
-+ SwInsertFld_Data aData(TYP_POSTITFLD, 0, sAuthor, aEmptyStr, 0);
-+ aFldMgr.InsertFld(aData);
-+ rSh.Push();
-+ rSh.Left(CRSR_SKIP_CHARS, FALSE, 1, FALSE);
-+ pPostIt = (SwPostItField*)aFldMgr.GetCurFld();
-+ rSh.Pop(FALSE); // Cursorpos restaurieren
-+ if (pPostIt)
-+ pPostIt->Broadcast( SwFmtFldHint( 0, SWFMTFLD_FOCUS ) );
-+ }
-+ else
-+ {
-+ pPostIt->Broadcast( SwFmtFldHint( 0, SWFMTFLD_FOCUS ) );
+- }
++ SwPostItField* pPostIt = (SwPostItField*)aFldMgr.GetCurFld();
++ BOOL bNew = !(pPostIt && pPostIt->GetTyp()->Which() == RES_POSTITFLD);
++ if (bNew)
++ {
++ SvtUserOptions aUserOpt;
++ String sAuthor = aUserOpt.GetFullName();
++ if (sAuthor==aEmptyStr)
++ sAuthor = aUserOpt.GetID();
++ SwInsertFld_Data aData(TYP_POSTITFLD, 0, sAuthor, aEmptyStr, 0);
++ aFldMgr.InsertFld(aData);
++ rSh.Push();
++ rSh.Left(CRSR_SKIP_CHARS, FALSE, 1, FALSE);
++ pPostIt = (SwPostItField*)aFldMgr.GetCurFld();
++ rSh.Pop(FALSE); // Cursorpos restaurieren
++ if (pPostIt)
++ pPostIt->Broadcast( SwFmtFldHint( 0, SWFMTFLD_FOCUS ) );
+ }
- }
++ else
++ {
++ pPostIt->Broadcast( SwFmtFldHint( 0, SWFMTFLD_FOCUS ) );
++ }
++ }
break;
-@@ -876,88 +800,6 @@
+ case FN_REDLINE_COMMENT:
+@@ -853,84 +779,6 @@
}
/*--------------------------------------------------------------------
@@ -8154,10 +8091,8 @@
- --------------------------------------------------------------------*/
-
-
--//CHINA001 IMPL_LINK( SwTextShell, PostItNextHdl, Button *, pBtn )
-IMPL_LINK( SwTextShell, PostItNextHdl, AbstractSvxPostItDialog *, pBtn )
-{
-- //CHINA001 SvxPostItDialog *pDlg = (SvxPostItDialog*)pBtn;
- AbstractSvxPostItDialog *pDlg = (AbstractSvxPostItDialog*)pBtn;
- if( pDlg->IsOkEnabled() )
- {
@@ -8194,10 +8129,8 @@
- Beschreibung:
- --------------------------------------------------------------------*/
-
--//CHINA001 IMPL_LINK( SwTextShell, PostItPrevHdl, Button *, pBtn )
-IMPL_LINK( SwTextShell, PostItPrevHdl, AbstractSvxPostItDialog *, pBtn )
-{
-- //CHINA001 SvxPostItDialog *pDlg = (SvxPostItDialog*)pBtn;
- AbstractSvxPostItDialog *pDlg = (AbstractSvxPostItDialog*)pBtn;
-
- if( pDlg->IsOkEnabled() )
@@ -8239,9 +8172,9 @@
diff -u sw/sw/source/ui/uiview/view.cxx:1.106 sw/sw/source/ui/uiview/view.cxx:1.100.70.13
--- sw/sw/source/ui/uiview/view.cxx:1.106 Thu Sep 27 05:36:31 2007
+++ sw/sw/source/ui/uiview/view.cxx Sun Nov 4 13:43:01 2007
-@@ -265,6 +265,11 @@
- #include "formatclipboard.hxx"
- #endif
+@@ -267,6 +267,11 @@
+
+ #include <unomid.h>
+#ifndef _POSTITMGR_HXX
+#include <PostItMgr.hxx>
@@ -8288,7 +8221,7 @@
pShell = new SwDrawTextShell( *this );
rDispatcher.Push( *pShell );
}
-+ else if ( nSelectionType & SwWrtShell::SEL_POSTIT )
++ else if ( nSelectionType & nsSelectionType::SEL_POSTIT )
+ {
+ eShellMode = SHELL_MODE_POSTIT;
+ pShell = new SwAnnotationShell( *this );
@@ -8297,7 +8230,7 @@
else
{
bSetExtInpCntxt = sal_True;
-@@ -642,7 +663,7 @@
+@@ -638,7 +659,7 @@
IMPL_LINK( SwView, AttrChangedNotify, SwWrtShell *, EMPTYARG )
{
@@ -8306,15 +8239,15 @@
GetEditWin().SetChainMode( sal_False );
//Opt: Nicht wenn PaintLocked. Beim Unlock wird dafuer nocheinmal ein
-@@ -885,6 +906,7 @@
+@@ -886,6 +907,7 @@
pDrawActual(0),
pLastTableFormat(0),
pFormatClipboard(new SwFormatClipboard()),
+ mpPostItMgr(0),
+ nSelectionType( INT_MAX ),
nDrawSfxId( USHRT_MAX ),
nFormSfxId( USHRT_MAX ),
- nSelectionType( INT_MAX ),
-@@ -1071,6 +1093,8 @@
+@@ -1070,6 +1092,8 @@
pDocSh->SetView( this );
SW_MOD()->SetView( this );
@@ -8323,7 +8256,7 @@
// Die DocSize erfragen und verarbeiten. Ueber die Handler konnte
// die Shell nicht gefunden werden, weil die Shell innerhalb CTOR-Phase
// nicht in der SFX-Verwaltung bekannt ist.
-@@ -1186,6 +1210,7 @@
+@@ -1185,6 +1209,7 @@
if(bOldModifyFlag)
pDocSh->EnableSetModified( sal_True );
InvalidateBorder();
@@ -8331,7 +8264,7 @@
}
/*--------------------------------------------------------------------
-@@ -1195,6 +1220,8 @@
+@@ -1194,6 +1219,8 @@
SwView::~SwView()
{
@@ -8357,12 +8290,12 @@
const long nOf = DOCUMENTBORDER * 2L;
Size aPageSize( pWrtShell->GetAnyCurRect(RECT_PAGE_CALC).SSize() );
-+ //mod #i6193# added sidebar width
-+ SwPostItMgr* pPostItMgr = GetPostItMgr();
-+ if (pPostItMgr->HasNotes() && pPostItMgr->ShowNotes())
-+ aPageSize.Width() += pPostItMgr->GetSidebarWidth();
-+
- if( PD_MIRROR == rDesc.GetUseOn() ) // gespiegelte Seiten
++ //mod #i6193# added sidebar width
++ SwPostItMgr* pPostItMgr = GetPostItMgr();
++ if (pPostItMgr->HasNotes() && pPostItMgr->ShowNotes())
++ aPageSize.Width() += pPostItMgr->GetSidebarWidth();
++
+ if( nsUseOnPage::PD_MIRROR == rDesc.GetUseOn() ) // gespiegelte Seiten
{
const SvxLRSpaceItem &rLeftLRSpace = rDesc.GetLeft().GetLRSpace();
@@ -256,6 +263,9 @@
@@ -8454,19 +8387,18 @@
diff -u sw/sw/source/ui/utlui/content.cxx:1.47 sw/sw/source/ui/utlui/content.cxx:1.45.28.10
--- sw/sw/source/ui/utlui/content.cxx:1.47 Thu Sep 27 05:45:04 2007
+++ sw/sw/source/ui/utlui/content.cxx Tue Oct 16 15:55:56 2007
-@@ -205,6 +205,11 @@
+@@ -204,6 +204,10 @@
+ #ifndef _NDTXT_HXX
#include <ndtxt.hxx>
#endif
-
+#ifndef _POSTITMGR_HXX
+#include <PostItMgr.hxx>
+#endif
+
-+
- #include "swabstdlg.hxx" //CHINA001
- #include "globals.hrc" //CHINA001
-
-@@ -507,29 +512,25 @@
+
+ #include "swabstdlg.hxx"
+ #include "globals.hrc"
+@@ -507,30 +511,26 @@
pMember = new SwContentArr;
else if(pMember->Count())
pMember->DeleteAndDestroy(0, pMember->Count());
@@ -8476,45 +8408,48 @@
- SwClient * pFirst = aIter.GoStart();
- while(pFirst)
- {
-- if(((SwFmtFld*)pFirst)->GetTxtFld() &&
-- ((SwFmtFld*)pFirst)->IsFldInDoc())
+- SwFmtFld* pFldFmtFirst = dynamic_cast<SwFmtFld*>(pFirst);
+- if( pFldFmtFirst && pFldFmtFirst->GetTxtFld() &&
+- pFldFmtFirst->IsFldInDoc())
- {
-- SwField* pField = (SwField*)((SwFmtFld*)pFirst)
-- ->GetFld();
+- SwField* pField = pFldFmtFirst->GetFld();
-
- String sEntry = pField->GetPar2();
- RemoveNewline(sEntry);
- SwPostItContent* pCnt = new SwPostItContent(
- this,
- sEntry, // hier steht der Text
-- (const SwFmtFld*)pFirst,
+- pFldFmtFirst,
- nMemberCount);
- pMember->Insert(pCnt);//, nMemberCount);
- nMemberCount++;
-+
-+ SwPostItMgr* aMgr = pWrtShell->GetView().GetPostItMgr();
-+ if (aMgr)
-+ {
-+ for(SwPostItMgr::const_iterator i = aMgr->begin(); i != aMgr->end(); ++i)
-+ {
-+ if ( (*i)->pFmtFld->GetTxtFld() && (*i)->pFmtFld->IsFldInDoc() )
-+ {
-+ String sEntry = (*i)->pFmtFld->GetFld()->GetPar2();
-+ RemoveNewline(sEntry);
-+ SwPostItContent* pCnt = new SwPostItContent(
-+ this,
-+ sEntry, // hier steht der Text
-+ (const SwFmtFld*)(*i)->pFmtFld,
-+ nMemberCount);
-+ pMember->Insert(pCnt);
-+ nMemberCount++;
-+ }
- }
+- }
- pFirst = aIter++;
- }
+- }
++
++ SwPostItMgr* aMgr = pWrtShell->GetView().GetPostItMgr();
++ if (aMgr)
++ {
++ for(SwPostItMgr::const_iterator i = aMgr->begin(); i != aMgr->end(); ++i)
++ {
++ if ( (*i)->pFmtFld->GetTxtFld() && (*i)->pFmtFld->IsFldInDoc() )
++ {
++ String sEntry = (*i)->pFmtFld->GetFld()->GetPar2();
++ RemoveNewline(sEntry);
++ SwPostItContent* pCnt = new SwPostItContent(
++ this,
++ sEntry, // hier steht der Text
++ (const SwFmtFld*)(*i)->pFmtFld,
++ nMemberCount);
++ pMember->Insert(pCnt);
++ nMemberCount++;
++ }
++ }
++ }
sTypeToken = aEmptyStr;
bEdit = sal_True;
-@@ -849,28 +850,20 @@
+ nOldMemberCount = nMemberCount;
+@@ -849,29 +849,22 @@
pMember = new SwContentArr;
else if(pMember->Count())
pMember->DeleteAndDestroy(0, pMember->Count());
@@ -8524,38 +8459,42 @@
- SwClient * pFirst = aIter.GoStart();
- while(pFirst)
- {
-- if(((SwFmtFld*)pFirst)->GetTxtFld() &&
-- ((SwFmtFld*)pFirst)->IsFldInDoc())
+- SwFmtFld* pFldFmtFirst = dynamic_cast<SwFmtFld*>(pFirst);
+- if(pFldFmtFirst && pFldFmtFirst->GetTxtFld() &&
+- pFldFmtFirst->IsFldInDoc())
- {
-- SwField* pField = (SwField*)((SwFmtFld*)pFirst)
-- ->GetFld();
+- SwField* pField = (SwField*)pFldFmtFirst->GetFld();
- String sEntry = pField->GetPar2();
- RemoveNewline(sEntry);
- SwPostItContent* pCnt = new SwPostItContent(
- this,
- sEntry, // hier steht der Text
-- (const SwFmtFld*)pFirst,
+- pFldFmtFirst,
- nMemberCount);
- pMember->Insert(pCnt);//, nMemberCount);
- nMemberCount++;
-+ SwPostItMgr* aMgr = pWrtShell->GetView().GetPostItMgr();
-+ if (aMgr)
-+ {
-+ for(SwPostItMgr::const_iterator i = aMgr->begin(); i != aMgr->end(); ++i)
-+ {
-+ if ( (*i)->pFmtFld->GetTxtFld() && (*i)->pFmtFld->IsFldInDoc() )
-+ {
-+ String sEntry = (*i)->pFmtFld->GetFld()->GetPar2();
-+ RemoveNewline(sEntry);
-+ SwPostItContent* pCnt = new SwPostItContent(this,sEntry, (*i)->pFmtFld,nMemberCount);
-+ pMember->Insert(pCnt);
-+ nMemberCount++;
-+ }
- }
+- }
- pFirst = aIter++;
- }
+- }
++
++ SwPostItMgr* aMgr = pWrtShell->GetView().GetPostItMgr();
++ if (aMgr)
++ {
++ for(SwPostItMgr::const_iterator i = aMgr->begin(); i != aMgr->end(); ++i)
++ {
++ if ( (*i)->pFmtFld->GetTxtFld() && (*i)->pFmtFld->IsFldInDoc() )
++ {
++ String sEntry = (*i)->pFmtFld->GetFld()->GetPar2();
++ RemoveNewline(sEntry);
++ SwPostItContent* pCnt = new SwPostItContent(this,sEntry, (*i)->pFmtFld,nMemberCount);
++ pMember->Insert(pCnt);
++ nMemberCount++;
++ }
++ }
++ }
}
break;
+ case CONTENT_TYPE_DRAWOBJECT:
@@ -1117,12 +1110,11 @@
else if(bIsHidden)
pSubPop3->CheckItem( nId );
@@ -9936,14 +9875,14 @@
diff -u sw/sw/source/ui/wrtsh/delete.cxx:1.17 sw/sw/source/ui/wrtsh/delete.cxx:1.16.104.2
--- sw/sw/source/ui/wrtsh/delete.cxx:1.17 Thu Sep 27 05:52:35 2007
+++ sw/sw/source/ui/wrtsh/delete.cxx Fri Sep 28 09:33:51 2007
-@@ -271,6 +271,7 @@
+@@ -283,6 +283,7 @@
- switch( nSelection & ~(SEL_BEZ) )
+ switch( nSelection & ~(nsSelectionType::SEL_BEZ) )
{
-+ case SEL_POSTIT:
- case SEL_TXT:
- case SEL_TBL:
- case SEL_NUM:
++ case nsSelectionType::SEL_POSTIT:
+ case nsSelectionType::SEL_TXT:
+ case nsSelectionType::SEL_TBL:
+ case nsSelectionType::SEL_NUM:
Index: sw/sw/source/ui/wrtsh/wrtsh1.cxx
diff -u sw/sw/source/ui/wrtsh/wrtsh1.cxx:1.63 sw/sw/source/ui/wrtsh/wrtsh1.cxx:1.61.86.4
--- sw/sw/source/ui/wrtsh/wrtsh1.cxx:1.63 Thu Sep 27 05:53:15 2007
@@ -9957,19 +9896,19 @@
using namespace com::sun::star;
#define COMMON_INI_LIST \
-@@ -1481,8 +1483,10 @@
+@@ -1483,8 +1485,10 @@
// if ( IsTableMode() )
- // return SEL_TBL | SEL_TBL_CELLS;
+ // return nsSelectionType::SEL_TBL | nsSelectionType::SEL_TBL_CELLS;
-- SwView &rView = ((SwView&)GetView());
+- SwView &_rView = ((SwView&)GetView());
- int nCnt;
+ SwView &_rView = ((SwView&)GetView());
+ if (_rView.GetPostItMgr() && _rView.GetPostItMgr()->GetActivePostIt() )
-+ return SEL_POSTIT;
++ return nsSelectionType::SEL_POSTIT;
+ int nCnt;
// Rahmen einfuegen ist kein DrawMode
- if ( !rView.GetEditWin().IsFrmAction() &&
+ if ( !_rView.GetEditWin().IsFrmAction() &&
Index: sw/sw/source/ui/wrtsh/wrtsh2.cxx
diff -u sw/sw/source/ui/wrtsh/wrtsh2.cxx:1.29 sw/sw/source/ui/wrtsh/wrtsh2.cxx:1.29.2.1
--- sw/sw/source/ui/wrtsh/wrtsh2.cxx:1.29 Thu Sep 27 05:53:28 2007
@@ -10001,30 +9940,6 @@
{
case UNDO:
DoUndo(sal_False); // #i21739#
-Index: sw/sw/util/defs/wntmsci10
-diff -u sw/sw/util/defs/wntmsci10:1.104 sw/sw/util/defs/wntmsci10:1.104.2.4
---- sw/sw/util/defs/wntmsci10:1.104 Thu Sep 27 14:12:00 2007
-+++ sw/sw/util/defs/wntmsci10 Tue Nov 13 08:43:10 2007
-@@ -5095,3 +5095,19 @@
- ?_FwdPara at SwWrtShell@@AAEEXZ
- ?_BwdPara at SwWrtShell@@AAEEXZ
- ?DelRight at SwWrtShell@@QAEJXZ
-+?GetPostItMgr at SwView@@QAEPAVSwPostItMgr@@XZ
-+?GetRectOfCurrentChar at SwCrsrShell@@QAE?AVSwRect@@XZ
-+??_7SwFmtFld@@6BSfxBroadcaster@@@
-+??0SwFmtFldHint@@QAE at PBVSwFmtFld@@@Z
-+??_7SwFmtFldHint@@6B@
-+?GetField at SwFmtFldHint@@QBEPBVSwFmtFld@@XZ
-+??1SwFmtFldHint@@UAE at XZ
-+??0SwFmtFldHint@@QAE at ABV0@@Z
-+??4SwFmtFldHint@@QAEAAV0 at ABV0@@Z
-+?IsA at SwFmtFldHint@@UBEEP6APAXXZ at Z
-+?Type at SwFmtFldHint@@UBEP6APAXXZXZ
-+?CreateType at SwFmtFldHint@@SAPAXXZ
-+?StaticType at SwFmtFldHint@@SAP6APAXXZXZ
-+?IsOf at SwFmtFldHint@@SAEP6APAXXZ at Z
-+??0SwFmtFldHint@@QAE at PBVSwFmtFld@@F at Z
-+?Which at SwFmtFldHint@@QBEFXZ
Index: xml/xmloff/inc/txtflde.hxx
diff -u xml/xmloff/inc/txtflde.hxx:1.36 xml/xmloff/inc/txtflde.hxx:1.36.56.1
--- xml/xmloff/inc/txtflde.hxx:1.36 Wed Jun 27 07:45:38 2007
workspace.unifysound01.patch:
Index: workspace.unifysound01.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.unifysound01.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- workspace.unifysound01.patch 16 Aug 2007 07:04:23 -0000 1.9
+++ workspace.unifysound01.patch 8 Jan 2008 14:51:51 -0000 1.10
@@ -1293,7 +1293,7 @@
};
-@@ -1940,19 +1941,6 @@
+@@ -1940,21 +1941,6 @@
mpLBSound->SelectEntryPos( (USHORT) nPos );
}
@@ -1304,16 +1304,18 @@
-# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer"
-#else
-#ifdef WNT
--# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX"
+-# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX"
+-#elif defined QUARTZ
+-# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_QuickTime"
-#else
--# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java"
+-# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java"
-#endif
-#endif
-
void CustomAnimationEffectTabPage::onSoundPreview()
{
const USHORT nPos = mpLBSound->GetSelectEntryPos();
-@@ -1960,18 +1948,7 @@
+@@ -1962,18 +1948,7 @@
if( nPos >= 2 ) try
{
const OUString aSoundURL( *(String*)maSoundList.GetObject( nPos-2 ) );
@@ -1666,49 +1668,6 @@
FSS_IsShowingEffectInfo* pIsShowingEffectInfo;
void DrawInsertMarker(BOOL bShow);
-diff -ru SRC680_m224/sd/source/ui/slideshow/slideshowimpl.cxx SRC680_m223/sd/source/ui/slideshow/slideshowimpl.cxx
---- openoffice.org.orig/sd/source/ui/slideshow/slideshowimpl.cxx 2007-08-03 09:27:57.000000000 +0100
-+++ openoffice.org/sd/source/ui/slideshow/slideshowimpl.cxx 2007-08-02 14:08:33.000000000 +0100
-@@ -116,19 +116,7 @@
- #include "slideshow.hrc"
- #include "canvas/elapsedtime.hxx"
- #include "canvas/prioritybooster.hxx"
--
--// TODO(Q3): This breaks encapsulation. Either export
--// these strings from avmedia, or provide an XManager
--// factory there
--#ifdef GSTREAMER
--# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer"
--#else
--#ifdef WNT
--# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX"
--#else
--# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java"
--#endif
--#endif
-+#include "avmedia/mediawindow.hxx"
-
- using ::com::sun::star::uno::UNO_QUERY;
- using ::com::sun::star::uno::UNO_QUERY_THROW;
-@@ -1698,17 +1686,7 @@
- {
- try
- {
-- if( !mxManager.is() )
-- {
-- uno::Reference<lang::XMultiServiceFactory> xFac( ::comphelper::getProcessServiceFactory() );
--
-- mxManager.set(
-- xFac->createInstance(
-- ::rtl::OUString::createFromAscii( AVMEDIA_MANAGER_SERVICE_NAME ) ),
-- uno::UNO_QUERY_THROW );
-- }
--
-- mxPlayer.set( mxManager->createPlayer( pEvent->maStrBookmark ), uno::UNO_QUERY_THROW );
-+ mxPlayer.set(avmedia::MediaWindow::createPlayer(pEvent->maStrBookmark));
- mxPlayer->start();
- }
- catch( uno::Exception& e )
diff -ru SRC680_m224/sd/source/ui/slideshow/slideshowimpl.hxx SRC680_m223/sd/source/ui/slideshow/slideshowimpl.hxx
--- openoffice.org.orig/sd/source/ui/slideshow/slideshowimpl.hxx 2007-08-03 09:27:57.000000000 +0100
+++ openoffice.org/sd/source/ui/slideshow/slideshowimpl.hxx 2007-08-02 14:08:19.000000000 +0100
--- openoffice.org-1.9.129.ooo54603.fontconfig.patch DELETED ---
--- openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch DELETED ---
--- openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch DELETED ---
--- openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch DELETED ---
--- openoffice.org-2.2.0.ooo53397.linkopt.patch DELETED ---
--- openoffice.org-2.2.1.ooo80424.vcl.honourwidthtype.patch DELETED ---
--- openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch DELETED ---
--- openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch DELETED ---
--- openoffice.org-2.3.0.ooo80735.cppu.map.patch DELETED ---
--- openoffice.org-2.3.0.ooo80967.ucb.neon27.patch DELETED ---
--- openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch DELETED ---
--- openoffice.org-2.3.0.ooo81314.i18npool.crash.patch DELETED ---
--- openoffice.org-2.3.0.ooo81936.sc.maketypesagree.patch DELETED ---
--- openoffice.org-2.3.0.ooo83591.vcl.checkboxes.patch DELETED ---
--- openoffice.org-2.3.1.ooo82911.sd.insertbackground.patch DELETED ---
--- openoffice.org-2.3.1.ooo83930.sw.flushanchors.patch DELETED ---
--- workspace.as6.patch DELETED ---
--- workspace.cmcfixes39.patch DELETED ---
--- workspace.configrefactor01.patch DELETED ---
--- workspace.fpicker7.patch DELETED ---
--- workspace.gcc430.patch DELETED ---
--- workspace.locales24.patch DELETED ---
--- workspace.npower7.patch DELETED ---
--- workspace.sw8u10bf02.patch DELETED ---
More information about the fedora-extras-commits
mailing list