rpms/openoffice.org/devel openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch, NONE, 1.1 workspace.dba32h.patch, NONE, 1.1 ooo-build.ooo2497.filter.svg.patch, 1.2, 1.3 ooo-build.ooo68717.gstreamer.video.patch, 1.2, 1.3 openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch, 1.10, 1.11 openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch, 1.2, 1.3 openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch, 1.25, 1.26 openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch, 1.1, 1.2 openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch, 1.6, 1.7 openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch, 1.3, 1.4 openoffice.org-2.3.0.ooo76649.httpencoding.patch, 1.1, 1.2 openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch, 1.3, 1.4 openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch, 1.4, 1.5 openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch, 1.4, 1.5 openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch, 1.3, 1.4 openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch, 1.1, 1.2 openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch, 1.1, 1.2 openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch, 1.3, 1.4 openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch, 1.1, 1.2 openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch, 1.2, 1.3 openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch, 1.1, 1.2 openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch, 1.1, 1.2 openoffice.org.spec, 1.2018, 1.2019 workspace.vcl106.patch, 1.1, 1.2 openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch, 1.1, NONE openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch, 1.2, NONE openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch, 1.5, NONE openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch, 1.1, NONE openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch, 1.5, NONE openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch, 1.1, NONE workspace.aw073.patch, 1.3, NONE workspace.calc50.patch, 1.1, NONE workspace.calc51.patch, 1.3, NONE workspace.cmcfixes54.patch, 1.2, NONE workspace.cmcfixes57.patch, 1.2, NONE workspace.cmcfixes59.patch, 1.1, NONE workspace.cmcfixes60.patch, 1.1, NONE workspace.cmcfixes61.patch, 1.1, NONE workspace.cmcfixes62.patch, 1.1, NONE workspace.cmcfixes63.patch, 1.1, NONE workspace.defaultdoclang.patch, 1.1, NONE workspace.dr69.patch, 1.1, NONE workspace.dr72.patch, 1.1, NONE workspace.evoab2def.patch, 1.1, NONE workspace.fwk103.patch, 1.4, NONE workspace.gtkmenuimages.patch, 1.1, NONE workspace.hb18.patch, 1.3, NONE workspace.hb32bugs01.patch, 1.2, NONE workspace.impress169.patch, 1.3, NONE workspace.impress170.patch, 1.1, NONE workspace.impress171.patch, 1.1, NONE workspace.impress174.patch, 1.1, NONE workspace.kso32fixes.patch, 1.1, NONE workspace.locales32.patch, 1.1, NONE workspace.mav46.patch, 1.1, NONE workspace.mba32issues02.patch, 1.1, NONE workspace.mhu17.patch, 1.1, NONE workspace.os130.patch, 1.1, NONE workspace.os131.patch, 1.2, NONE workspace.os132.patch, 1.1, NONE workspace.sb113.patch, 1.1, NONE workspace.tl66.patch, 1.1, NONE workspace.transogl03redux.patch, 1.4, NONE workspace.unifypaper01.patch, 1.4, NONE workspace.vcl100.patch, 1.2, NONE workspace.vcl101.patch, 1.2, NONE workspace.vcl102.patch, 1.1, NONE workspace.vcl103.patch, 1.1, NONE workspace.vcl104.patch, 1.1, NONE workspace.xmergeclean.patch, 1.1, NONE
Caolan McNamara
caolanm at fedoraproject.org
Sat Oct 10 15:48:51 UTC 2009
- Previous message: rpms/exo/devel .cvsignore, 1.12, 1.13 exo.spec, 1.39, 1.40 sources, 1.12, 1.13 exo-0.3.101-default-mount-options.patch, 1.1, NONE exo-0.3.101-url-quoting.patch, 1.1, NONE
- Next message: rpms/openoffice.org/devel openoffice.org.spec,1.2019,1.2020
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13302
Modified Files:
ooo-build.ooo2497.filter.svg.patch
ooo-build.ooo68717.gstreamer.video.patch
openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
openoffice.org-2.3.0.ooo76649.httpencoding.patch
openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch
openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
openoffice.org.spec workspace.vcl106.patch
Added Files:
openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
workspace.dba32h.patch
Removed Files:
openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch
openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch
workspace.aw073.patch workspace.calc50.patch
workspace.calc51.patch workspace.cmcfixes54.patch
workspace.cmcfixes57.patch workspace.cmcfixes59.patch
workspace.cmcfixes60.patch workspace.cmcfixes61.patch
workspace.cmcfixes62.patch workspace.cmcfixes63.patch
workspace.defaultdoclang.patch workspace.dr69.patch
workspace.dr72.patch workspace.evoab2def.patch
workspace.fwk103.patch workspace.gtkmenuimages.patch
workspace.hb18.patch workspace.hb32bugs01.patch
workspace.impress169.patch workspace.impress170.patch
workspace.impress171.patch workspace.impress174.patch
workspace.kso32fixes.patch workspace.locales32.patch
workspace.mav46.patch workspace.mba32issues02.patch
workspace.mhu17.patch workspace.os130.patch
workspace.os131.patch workspace.os132.patch
workspace.sb113.patch workspace.tl66.patch
workspace.transogl03redux.patch workspace.unifypaper01.patch
workspace.vcl100.patch workspace.vcl101.patch
workspace.vcl102.patch workspace.vcl103.patch
workspace.vcl104.patch workspace.xmergeclean.patch
Log Message:
first 3.2.0 milestone
openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch:
unx/source/fontmanager/fontconfig.cxx | 142 +++++++++++++++++++++++++++++++++-
util/makefile.mk | 1
2 files changed, 141 insertions(+), 2 deletions(-)
--- NEW FILE openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch ---
diff -ru vcl.orig/unx/source/fontmanager/fontconfig.cxx vcl/unx/source/fontmanager/fontconfig.cxx
--- vcl.orig/unx/source/fontmanager/fontconfig.cxx 2009-10-08 13:25:00.000000000 +0100
+++ vcl/unx/source/fontmanager/fontconfig.cxx 2009-10-08 13:51:51.000000000 +0100
@@ -80,6 +80,9 @@
#include "sal/alloca.h"
+#include <i18nutil/unicode.hxx> //unicode::getUnicodeScriptType
+#include <com/sun/star/i18n/ScriptType.hdl> //ScriptType
+
#include <utility>
#include <algorithm>
@@ -907,6 +910,138 @@
}
}
+static const char* pick_sample_language(const sal_uInt32 cCode)
+{
+ using namespace ::com::sun::star::i18n;
+
+ static ScriptTypeList aScripts[] =
+ {
+ { UnicodeScript_kBasicLatin, UnicodeScript_kBasicLatin, UnicodeScript_kBasicLatin },
+ { UnicodeScript_kLatin1Supplement, UnicodeScript_kLatin1Supplement, UnicodeScript_kLatin1Supplement },
+ { UnicodeScript_kLatinExtendedA, UnicodeScript_kLatinExtendedA, UnicodeScript_kLatinExtendedA },
+ { UnicodeScript_kLatinExtendedB, UnicodeScript_kLatinExtendedB, UnicodeScript_kLatinExtendedB },
+ { UnicodeScript_kGreek, UnicodeScript_kGreek, UnicodeScript_kGreek },
+ { UnicodeScript_kCyrillic, UnicodeScript_kCyrillic, UnicodeScript_kCyrillic },
+ { UnicodeScript_kArmenian, UnicodeScript_kArmenian, UnicodeScript_kArmenian },
+ { UnicodeScript_kHebrew, UnicodeScript_kHebrew, UnicodeScript_kHebrew },
+ { UnicodeScript_kArabic, UnicodeScript_kArabic, UnicodeScript_kArabic },
+ { UnicodeScript_kSyriac, UnicodeScript_kSyriac, UnicodeScript_kSyriac },
+ { UnicodeScript_kThaana, UnicodeScript_kThaana, UnicodeScript_kThaana },
+ { UnicodeScript_kDevanagari, UnicodeScript_kDevanagari, UnicodeScript_kDevanagari },
+ { UnicodeScript_kBengali, UnicodeScript_kBengali, UnicodeScript_kBengali },
+ { UnicodeScript_kGurmukhi, UnicodeScript_kGurmukhi, UnicodeScript_kGurmukhi },
+ { UnicodeScript_kGujarati, UnicodeScript_kGujarati, UnicodeScript_kGujarati },
+ { UnicodeScript_kOriya, UnicodeScript_kOriya, UnicodeScript_kOriya },
+ { UnicodeScript_kTamil, UnicodeScript_kTamil, UnicodeScript_kTamil },
+ { UnicodeScript_kTelugu, UnicodeScript_kTelugu, UnicodeScript_kTelugu },
+ { UnicodeScript_kKannada, UnicodeScript_kKannada, UnicodeScript_kKannada },
+ { UnicodeScript_kMalayalam, UnicodeScript_kMalayalam, UnicodeScript_kMalayalam },
+ { UnicodeScript_kSinhala, UnicodeScript_kSinhala, UnicodeScript_kSinhala },
+ { UnicodeScript_kThai, UnicodeScript_kThai, UnicodeScript_kThai },
+ { UnicodeScript_kLao, UnicodeScript_kLao, UnicodeScript_kLao },
+ { UnicodeScript_kTibetan, UnicodeScript_kTibetan, UnicodeScript_kTibetan },
+ { UnicodeScript_kMyanmar, UnicodeScript_kMyanmar, UnicodeScript_kMyanmar },
+ { UnicodeScript_kGeorgian, UnicodeScript_kGeorgian, UnicodeScript_kGeorgian },
+ { UnicodeScript_kHangulJamo, UnicodeScript_kHangulJamo, UnicodeScript_kHangulJamo },
+ { UnicodeScript_kEthiopic, UnicodeScript_kEthiopic, UnicodeScript_kEthiopic },
+ { UnicodeScript_kCherokee, UnicodeScript_kCherokee, UnicodeScript_kCherokee },
+ { UnicodeScript_kUnifiedCanadianAboriginalSyllabics,
+ UnicodeScript_kUnifiedCanadianAboriginalSyllabics,
+ UnicodeScript_kUnifiedCanadianAboriginalSyllabics },
+ { UnicodeScript_kKhmer, UnicodeScript_kKhmer, UnicodeScript_kKhmer },
+ { UnicodeScript_kMongolian, UnicodeScript_kMongolian, UnicodeScript_kMongolian },
+ { UnicodeScript_kLatinExtendedAdditional, UnicodeScript_kLatinExtendedAdditional,
+ UnicodeScript_kLatinExtendedAdditional },
+ { UnicodeScript_kGreekExtended, UnicodeScript_kGreekExtended, UnicodeScript_kGreekExtended },
+ { UnicodeScript_kHiragana, UnicodeScript_kHiragana, UnicodeScript_kHiragana },
+ { UnicodeScript_kKatakana, UnicodeScript_kKatakana, UnicodeScript_kKatakana },
+ { UnicodeScript_kHangulCompatibilityJamo, UnicodeScript_kHangulCompatibilityJamo,
+ UnicodeScript_kHangulCompatibilityJamo },
+ { UnicodeScript_kHangulSyllable, UnicodeScript_kHangulSyllable,
+ UnicodeScript_kHangulSyllable },
+ { UnicodeScript_kArabicPresentationB, UnicodeScript_kArabicPresentationB,
+ UnicodeScript_kArabicPresentationB },
+ { UnicodeScript_kScriptCount, UnicodeScript_kScriptCount, UnicodeScript_kScriptCount }
+ };
+
+ switch (unicode::getUnicodeScriptType(cCode, aScripts, UnicodeScript_kScriptCount))
+ {
+ case UnicodeScript_kBasicLatin:
+ case UnicodeScript_kLatin1Supplement:
+ case UnicodeScript_kLatinExtendedA:
+ case UnicodeScript_kLatinExtendedB:
+ case UnicodeScript_kLatinExtendedAdditional:
+ return "en";
+ case UnicodeScript_kGreek:
+ case UnicodeScript_kGreekExtended:
+ return "el";
+ case UnicodeScript_kCyrillic:
+ return "ru";
+ case UnicodeScript_kArmenian:
+ return "hy";
+ case UnicodeScript_kHebrew:
+ return "he";
+ case UnicodeScript_kArabic:
+ case UnicodeScript_kArabicPresentationB:
+ return "ar";
+ case UnicodeScript_kSyriac:
+ return "syr";
+ case UnicodeScript_kThaana:
+ return "dv";
+ case UnicodeScript_kDevanagari:
+ return "hi";
+ case UnicodeScript_kBengali:
+ return "bn";
+ case UnicodeScript_kGurmukhi:
+ return "pa";
+ case UnicodeScript_kGujarati:
+ return "gu";
+ case UnicodeScript_kOriya:
+ return "or";
+ case UnicodeScript_kTamil:
+ return "ta";
+ case UnicodeScript_kTelugu:
+ return "te";
+ case UnicodeScript_kKannada:
+ return "ka";
+ case UnicodeScript_kMalayalam:
+ return "ml";
+ case UnicodeScript_kSinhala:
+ return "si";
+ case UnicodeScript_kThai:
+ return "th";
+ case UnicodeScript_kLao:
+ return "lo";
+ case UnicodeScript_kTibetan:
+ return "bo";
+ case UnicodeScript_kMyanmar:
+ return "my";
+ case UnicodeScript_kGeorgian:
+ return "ka";
+ case UnicodeScript_kHangulJamo:
+ case UnicodeScript_kHangulCompatibilityJamo:
+ case UnicodeScript_kHangulSyllable:
+ return "ko";
+ case UnicodeScript_kEthiopic:
+ return "am";
+ case UnicodeScript_kCherokee:
+ return "chr";
+ case UnicodeScript_kUnifiedCanadianAboriginalSyllabics:
+ return "ui";
+ case UnicodeScript_kKhmer:
+ return "km";
+ case UnicodeScript_kMongolian:
+ return "mn";
+ case UnicodeScript_kHiragana:
+ case UnicodeScript_kKatakana:
+ return "ja";
+ default:
+ break;
+ }
+
+ return NULL;
+}
+
rtl::OUString PrintFontManager::Substitute(const rtl::OUString& rFontName,
rtl::OUString& rMissingCodes, const rtl::OString &rLangAttrib,
italic::type &rItalic, weight::type &rWeight,
@@ -928,8 +1063,6 @@
rWrapper.FcPatternAddString( pPattern, FC_FAMILY, pTargetNameUtf8 );
const FcChar8* pLangAttribUtf8 = (FcChar8*)rLangAttrib.getStr();
- if( rLangAttrib.getLength() )
- rWrapper.FcPatternAddString( pPattern, FC_LANG, pLangAttribUtf8 );
// Add required Unicode characters, if any
if ( rMissingCodes.getLength() )
@@ -940,11 +1073,16 @@
// also handle unicode surrogates
const sal_uInt32 nCode = rMissingCodes.iterateCodePoints( &nStrIndex );
rWrapper.FcCharSetAddChar( unicodes, nCode );
+ if (!pLangAttribUtf8)
+ pLangAttribUtf8 = (const FcChar8*)pick_sample_language(nCode);
}
rWrapper.FcPatternAddCharSet( pPattern, FC_CHARSET, unicodes);
rWrapper.FcCharSetDestroy( unicodes );
}
+ if( pLangAttribUtf8 )
+ rWrapper.FcPatternAddString( pPattern, FC_LANG, pLangAttribUtf8 );
+
addtopattern(rWrapper, pPattern, rItalic, rWeight, rWidth, rPitch);
// query fontconfig for a substitute
diff -ru vcl.orig/util/makefile.mk vcl/util/makefile.mk
--- vcl.orig/util/makefile.mk 2009-10-08 13:25:00.000000000 +0100
+++ vcl/util/makefile.mk 2009-10-08 13:25:09.000000000 +0100
@@ -298,6 +298,7 @@
# libs for generic plugin
SHL2STDLIBS=\
$(VCLLIB)\
+ $(I18NUTILLIB) \
$(I18NPAPERLIB) \
$(TOOLSLIB) \
$(VOSLIB) \
workspace.dba32h.patch:
ldapaccess.cxx | 15 +++++++++------
wrapldapinclude.hxx | 6 ++++++
2 files changed, 15 insertions(+), 6 deletions(-)
--- NEW FILE workspace.dba32h.patch ---
Index: extensions/source/config/ldap/wrapldapinclude.hxx
===================================================================
--- extensions/source/config/ldap/wrapldapinclude.hxx (revision 276155)
+++ extensions/source/config/ldap/wrapldapinclude.hxx (working copy)
@@ -35,6 +35,12 @@
#ifdef WITH_OPENLDAP
#include <ldap.h>
+#ifndef LDAP_API
+# define LDAP_API(rt) rt
+#endif
+#ifndef LDAP_CALL
+# define LDAP_CALL
+#endif
#else
#ifndef LDAP_INCLUDED
#define LDAP_INCLUDED
Index: extensions/source/config/ldap/ldapaccess.cxx
===================================================================
--- extensions/source/config/ldap/ldapaccess.cxx (revision 276155)
+++ extensions/source/config/ldap/ldapaccess.cxx (working copy)
@@ -315,14 +315,17 @@
if ( !s_Ldap_Module )
{
#if defined(WIN) || defined(WNT)
- const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM("nsldap32v50.dll"));
+# define LIBLDAP "nsldap32v50.dll"
#else
-#ifdef WITH_OPENLDAP
- const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM("libldap.so"));
-#else
- const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM("libldap50.so"));
+# ifdef WITH_OPENLDAP
+# define xstr(s) str(s)
+# define str(s) #s
+# define LIBLDAP "libldap-" xstr(LDAP_VENDOR_VERSION_MAJOR) "." xstr(LDAP_VENDOR_VERSION_MINOR) ".so." xstr(LDAP_VENDOR_VERSION_MAJOR)
+# else
+# define LIBLDAP "libldap50.so"
+# endif
#endif
-#endif
+ const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM(LIBLDAP));
// load the dbtools library
s_Ldap_Module = osl_loadModuleRelative(&thisModule, sModuleName.pData, 0);
ooo-build.ooo2497.filter.svg.patch:
OOO310_m6/filter/source/config/fragments/fcfg_drawgraphics.mk | 1
OOO310_m6/filter/source/config/fragments/fcfg_internalgraphics.mk | 1
OOO310_m6/filter/source/config/fragments/filters/SVG___Scalable_Vector_Graphics.xcu | 13
OOO310_m6/filter/source/config/fragments/internalgraphicfilters/svg_Import.xcu | 10
OOO310_m6/filter/source/config/fragments/types/svg_Scalable_Vector_Graphics.xcu | 6
OOO310_m6/filter/source/svg/b2dellipse.cxx | 139
OOO310_m6/filter/source/svg/b2dellipse.hxx | 77
OOO310_m6/filter/source/svg/exports.map | 5
OOO310_m6/filter/source/svg/gentoken.pl | 58
OOO310_m6/filter/source/svg/gfxtypes.hxx | 343 +
OOO310_m6/filter/source/svg/makefile.mk | 62
OOO310_m6/filter/source/svg/parserfragments.cxx | 600 ++
OOO310_m6/filter/source/svg/parserfragments.hxx | 74
OOO310_m6/filter/source/svg/spirit_supplements.hxx | 115
OOO310_m6/filter/source/svg/svgfilter.cxx | 102
OOO310_m6/filter/source/svg/svgfilter.hxx | 46
OOO310_m6/filter/source/svg/svgimport.cxx | 197
OOO310_m6/filter/source/svg/svgreader.cxx | 2772 ++++++++++
OOO310_m6/filter/source/svg/svgreader.hxx | 43
OOO310_m6/filter/source/svg/test/makefile.mk | 115
OOO310_m6/filter/source/svg/test/odfserializer.cxx | 140
OOO310_m6/filter/source/svg/test/odfserializer.hxx | 31
OOO310_m6/filter/source/svg/test/parsertest.cxx | 210
OOO310_m6/filter/source/svg/test/svg2odf.cxx | 124
OOO310_m6/filter/source/svg/tokenmap.cxx | 62
OOO310_m6/filter/source/svg/tokenmap.hxx | 32
OOO310_m6/filter/source/svg/tokens.txt | 403 +
OOO310_m6/filter/source/svg/units.cxx | 99
OOO310_m6/filter/source/svg/units.hxx | 60
filter/source/svg/units.cxx | 27
30 files changed, 5710 insertions(+), 257 deletions(-)
Index: ooo-build.ooo2497.filter.svg.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/ooo-build.ooo2497.filter.svg.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ooo-build.ooo2497.filter.svg.patch 9 Jun 2009 16:38:24 -0000 1.2
+++ ooo-build.ooo2497.filter.svg.patch 10 Oct 2009 15:48:44 -0000 1.3
@@ -764,21 +764,18 @@ diff -ruN OOO310_m6.orig/filter/source/s
.ENDIF
# --- Library -----------------------------------
-@@ -56,22 +66,20 @@
- SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
-
+@@ -58,19 +68,17 @@
SHL1STDLIBS=\
-+ $(BASEGFXLIB) \
- $(SVXLIB) \
+ $(SVXCORELIB) \
$(XMLOFFLIB) \
- $(GOODIESLIB) \
-+ $(SVTOOLLIB) \
-+ $(BASEGFXLIB) \
++ $(SVTOOLLIB) \
++ $(BASEGFXLIB) \
$(VCLLIB) \
$(UNOTOOLSLIB) \
$(TOOLSLIB) \
$(COMPHELPERLIB) \
-+ $(SVTOOLLIB) \
++ $(SVTOOLLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
- $(SALLIB)
@@ -787,12 +784,28 @@ diff -ruN OOO310_m6.orig/filter/source/s
-SHL1STDLIBS+=\
- $(JVMACCESSLIB)
-.ENDIF
--
+ $(SALLIB) \
+ $(LIBXML)
+
SHL1DEPN=
- SHL1IMPLIB= i$(SHL1TARGET)
+@@ -84,3 +92,16 @@
+ # --- Targets ----------------------------------
+
+ .INCLUDE : target.mk
++
++# Generate gperf files - from oox/source/token
++$(INCCOM)$/tokens.hxx $(MISC)$/tokens.gperf : tokens.txt gentoken.pl
++ $(PERL) gentoken.pl tokens.txt $(INCCOM)$/tokens.hxx $(MISC)$/tokens.gperf
++
++$(INCCOM)$/tokens.cxx : $(MISC)$/tokens.gperf makefile.mk
++ gperf --compare-strncmp -C -m 20 $(MISC)$/tokens.gperf | $(SED) -e "s/(char\*)0/(char\*)0, 0/g" >$(INCCOM)$/tokens.cxx
++
++$(SLO)$/tokenmap.obj : $(INCCOM)$/tokens.cxx $(INCCOM)$/tokens.hxx
++
++$(SLO)$/parserfragments.obj : $(INCCOM)$/tokens.cxx $(INCCOM)$/tokens.hxx
++
++$(SLO)$/svgreader.obj : $(INCCOM)$/tokens.cxx $(INCCOM)$/tokens.hxx
@@ -84,3 +92,16 @@
# --- Targets ----------------------------------
ooo-build.ooo68717.gstreamer.video.patch:
avmedia/prj/build.lst | 3
avmedia/source/gstreamer/ChangeLog | 112 +++
avmedia/source/gstreamer/exports.dxp | 4
avmedia/source/gstreamer/gstcommon.hxx | 83 ++
avmedia/source/gstreamer/gstframegrabber.cxx | 244 ++++++++
avmedia/source/gstreamer/gstframegrabber.hxx | 78 ++
avmedia/source/gstreamer/gstmanager.cxx | 114 +++
avmedia/source/gstreamer/gstmanager.hxx | 74 ++
avmedia/source/gstreamer/gstplayer.cxx | 628 ++++++++++++++++++++++
avmedia/source/gstreamer/gstplayer.hxx | 120 ++++
avmedia/source/gstreamer/gstuno.cxx | 111 +++
avmedia/source/gstreamer/gstwindow.cxx | 365 ++++++++++++
avmedia/source/gstreamer/gstwindow.hxx | 119 ++++
avmedia/source/gstreamer/makefile.mk | 85 ++
avmedia/source/inc/mediamisc.hxx | 4
avmedia/source/viewer/mediawindow.cxx | 2
avmedia/source/viewer/mediawindow_impl.cxx | 52 +
avmedia/source/viewer/mediawindow_impl.hxx | 8
com/sun/star/wizards/letter/LocaleCodes.java | 2
configure.in | 21
scp2/source/ooo/file_library_ooo.scp | 4
scp2/source/ooo/module_hidden_ooo.scp | 1
set_soenv.in | 1
slideshow/source/engine/shapes/viewmediashape.cxx | 38 +
slideshow/source/engine/shapes/viewmediashape.hxx | 7
solenv/inc/settings.mk | 4
source/gstreamer/gstplayer.cxx | 15
source/gstreamer/gstplayer.hxx | 1
svtools/inc/svtools/inettype.hxx | 4
svtools/inc/svtools/svtools.hrc | 210 +++----
svtools/source/misc1/inettype.cxx | 5
svtools/source/misc1/mediatyp.src | 162 +++++
vcl/inc/vcl/salobj.hxx | 2
vcl/inc/vcl/syschild.hxx | 1
vcl/source/window/syschild.cxx | 6
vcl/unx/gtk/window/gtkobject.cxx | 8
vcl/unx/inc/plugins/gtk/gtkobject.hxx | 2
37 files changed, 2585 insertions(+), 115 deletions(-)
Index: ooo-build.ooo68717.gstreamer.video.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/ooo-build.ooo68717.gstreamer.video.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ooo-build.ooo68717.gstreamer.video.patch 28 Apr 2009 09:32:23 -0000 1.2
+++ ooo-build.ooo68717.gstreamer.video.patch 10 Oct 2009 15:48:45 -0000 1.3
@@ -215,15 +215,15 @@ diff -rup avmedia-orig/source/viewer/med
"Quicktime Video", "mov",
--- configure.in.orig 2006-08-17 10:43:11.000000000 +0200
+++ configure.in 2006-08-17 10:48:43.000000000 +0200
-@@ -908,6 +908,7 @@
+@@ -932,6 +932,7 @@
linux-gnu*)
test_gtk=yes
test_cairo=yes
-+ build_gstreamer=yes
++ build_gstreamer=yes
test_kde=yes
+ test_kde4=yes
test_cups=yes
- test_randr=yes
-@@ -5695,6 +5696,26 @@
+@@ -5973,6 +5974,26 @@
AC_SUBST(COMMONS_LOGGING_JAR)
dnl ===================================================================
@@ -417,7 +417,7 @@ diff -rup slideshow/source/inc-orig/view
diff -rup solenv-orig/inc/settings.mk solenv/inc/settings.mk
--- solenv-orig/inc/settings.mk 2006-08-17 16:01:59.000000000 +0200
+++ solenv/inc/settings.mk 2006-08-17 16:02:36.000000000 +0200
-@@ -1126,6 +1126,10 @@ CDEFS+=-DEXCEPTIONS_ON
+@@ -1147,6 +1147,10 @@
LOCAL_EXCEPTIONS_FLAGS+=$(CFLAGSEXCEPTIONS)
LOCAL_EXCEPTIONS_FLAGS+=-DEXCEPTIONS_ON
@@ -425,9 +425,9 @@ diff -rup solenv-orig/inc/settings.mk so
+CDEFS+=-DGSTREAMER
+.ENDIF
+
- # compose flags and defines for GUI
- .IF "$(TARGETTYPE)"=="GUI"
- CDEFS+= $(CDEFSGUI)
+ .IF "$(ENABLE_LAYOUT)" == "TRUE"
+ CDEFS+=-DENABLE_LAYOUT=1
+ .ELSE # ENABLE_LAYOUT != TRUE
diff -rup svtools-orig/inc/inettype.hxx svtools/inc/inettype.hxx
--- svtools-orig/inc/svtools/inettype.hxx 2006-09-21 11:40:23.000000000 +0200
+++ svtools/inc/svtools/inettype.hxx 2006-09-21 11:44:50.000000000 +0200
openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch:
SRC680_m123/desktop/scripts/soffice.sh | 12 ++++--------
sal/osl/unx/signal.c | 8 ++++++++
2 files changed, 12 insertions(+), 8 deletions(-)
Index: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch 15 Sep 2009 08:24:14 -0000 1.10
+++ openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch 10 Oct 2009 15:48:45 -0000 1.11
@@ -1,44 +1,40 @@
--- SRC680_m123/desktop/scripts/soffice.sh.orig 2005-08-15 20:17:35.000000000 +0100
+++ SRC680_m123/desktop/scripts/soffice.sh 2005-08-15 20:19:36.000000000 +0100
-@@ -91,23 +91,22 @@
- # uncomment line below if you encounter problems starting soffice on your system
- # SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS
+@@ -73,30 +73,26 @@
+ esac
+ done
-# pagein
- for sd_arg in ${1+"$@"} ; do
+-sd_pagein_args=@pagein-common
+ for sd_arg in "$@"; do
case ${sd_arg} in
-calc)
-- sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-calc"
-+ sd_binary="scalc.bin"
+- sd_pagein_args="${sd_pagein_args} @pagein-calc"
++ sd_binary="scalc.bin"
break;
;;
-draw)
-- sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-draw"
-+ sd_binary="sdraw.bin"
+- sd_pagein_args="${sd_pagein_args} @pagein-draw"
++ sd_binary="sdraw.bin"
break;
;;
-impress)
-- sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-impress"
-+ sd_binary="simpress.bin"
+- sd_pagein_args="${sd_pagein_args} @pagein-impress"
++ sd_binary="simpress.bin"
break;
;;
-writer)
-- sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-writer"
-+ sd_binary="swriter.bin"
+- sd_pagein_args="${sd_pagein_args} @pagein-writer"
++ sd_binary="swriter.bin"
break;
;;
- *)
-@@ -120,10 +119,6 @@
- . /etc/adabasrc
- fi
-
--sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-common"
+ esac
+ done
-"$sd_prog/../basis-link/program/pagein" -L"$sd_prog/../basis-link/program" \
- ${sd_pagein_args}
--
- # Set PATH so that crash_report is found:
- PATH=$sd_prog${PATH+:$PATH}
- export PATH
+
+ # extend the ld_library_path for java: javaldx checks the sofficerc for us
+ if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
Index: osl/unx/signal.c
===================================================================
RCS file: /cvs/porting/sal/osl/unx/signal.c,v
openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch:
docnew.cxx | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
Index: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch 16 Aug 2007 07:04:22 -0000 1.2
+++ openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch 10 Oct 2009 15:48:45 -0000 1.3
@@ -5,7 +5,7 @@ retrieving revision 1.57
diff -u -p -u -r1.57 docnew.cxx
--- openoffice.org.orig/sw/source/core/doc/docnew.cxx 8 Nov 2005 17:16:18 -0000 1.57
+++ openoffice.org/sw/source/core/doc/docnew.cxx 29 Nov 2005 09:38:58 -0000
-@@ -502,6 +502,16 @@
+@@ -459,6 +459,16 @@
SwDoc::~SwDoc()
{
@@ -22,8 +22,8 @@ diff -u -p -u -r1.57 docnew.cxx
// --> OD 2007-03-16 #i73788#
SwPauseThreadStarting aPauseThreadStarting;
// <--
-@@ -582,15 +592,6 @@
- pBookmarkTbl->DeleteAndDestroy( 0, pBookmarkTbl->Count() );
+@@ -547,15 +557,6 @@
+ pMarkManager->clearAllMarks();
DELETEZ( pMacroTable );
- if( pExtInputRing )
openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch:
inc/vcl/fontmanager.hxx | 37 ++++-
vcl/inc/vcl/impfont.hxx | 36 +++++
vcl/inc/vcl/outdev.hxx | 3
vcl/inc/vcl/outfont.hxx | 4
vcl/inc/vcl/salgdi.hxx | 2
vcl/inc/vcl/vclenum.hxx | 21 +++
vcl/source/gdi/outdev3.cxx | 8 +
vcl/source/glyphs/gcach_ftyp.cxx | 88 ++++++++-----
vcl/source/glyphs/gcach_ftyp.hxx | 5
vcl/unx/headless/svpgdi.cxx | 4
vcl/unx/headless/svpgdi.hxx | 1
vcl/unx/headless/svppspgraphics.cxx | 30 ----
vcl/unx/headless/svppspgraphics.hxx | 1
vcl/unx/inc/pspgraphics.h | 1
vcl/unx/inc/salgdi.h | 1
vcl/unx/source/fontmanager/fontcache.cxx | 13 -
vcl/unx/source/fontmanager/fontconfig.cxx | 196 +++++++++++++++++++++--------
vcl/unx/source/fontmanager/fontmanager.cxx | 8 -
vcl/unx/source/gdi/pspgraphics.cxx | 30 ----
vcl/unx/source/gdi/salgdi3.cxx | 189 +++++++++++++++++++++++++++
vcl/unx/source/gdi/xlfd_extd.cxx | 3
vcl/win/inc/salgdi.h | 1
vcl/win/source/gdi/salgdi3.cxx | 6
23 files changed, 515 insertions(+), 173 deletions(-)
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.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch 12 Feb 2009 16:11:14 -0000 1.25
+++ openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch 10 Oct 2009 15:48:45 -0000 1.26
@@ -177,15 +177,15 @@ retrieving revision 1.149
diff -u -r1.149 gcach_ftyp.cxx
--- openoffice.org.orig/vcl/source/glyphs/gcach_ftyp.cxx 11 Apr 2008 08:57:28 -0000 1.149
+++ openoffice.org/vcl/source/glyphs/gcach_ftyp.cxx 30 May 2008 09:30:01 -0000
-@@ -43,6 +43,7 @@
- #include <vcl/impfont.hxx>
- #include <vcl/bitmap.hxx>
- #include <vcl/bmpacc.hxx>
-+#include <vcl/virdev.hxx>
-
- #include <tools/poly.hxx>
- #include <basegfx/matrix/b2dhommatrix.hxx>
-@@ -623,9 +624,6 @@
+@@ -40,6 +40,7 @@
+ #include "vcl/impfont.hxx"
+ #include "vcl/bitmap.hxx"
+ #include "vcl/bmpacc.hxx"
++#include "vcl/virdev.hxx"
+
+ #include "tools/poly.hxx"
+ #include "basegfx/matrix/b2dhommatrix.hxx"
+@@ -620,9 +621,6 @@
aDFA.mbSubsettable= false;
aDFA.mbEmbeddable = false;
@@ -195,7 +195,7 @@ diff -u -r1.149 gcach_ftyp.cxx
FT_Done_Face( aFaceFT );
AddFontFile( aCFileName, nFaceNum, ++mnNextFontId, aDFA, NULL );
++nCount;
-@@ -705,6 +703,7 @@
+@@ -702,6 +700,7 @@
: ServerFont( rFSD ),
mnPrioEmbedded(nDefaultPrioEmbedded),
mnPrioAntiAlias(nDefaultPrioAntiAlias),
@@ -203,7 +203,7 @@ diff -u -r1.149 gcach_ftyp.cxx
mpFontInfo( pFI ),
maFaceFT( NULL ),
maSizeFT( NULL ),
-@@ -834,42 +833,69 @@
+@@ -835,42 +834,69 @@
mbArtItalic = (rFSD.meItalic != ITALIC_NONE && pFI->GetFontAttributes().GetSlant() == ITALIC_NONE);
mbArtBold = (rFSD.meWeight > WEIGHT_MEDIUM && pFI->GetFontAttributes().GetWeight() <= WEIGHT_MEDIUM);
@@ -296,7 +296,7 @@ diff -u -r1.149 gcach_ftyp.cxx
#endif
if( ((mnCos != 0) && (mnSin != 0)) || (mnPrioEmbedded <= 0) )
-@@ -1204,13 +1230,15 @@
+@@ -1228,13 +1254,15 @@
}
}
@@ -313,7 +313,7 @@ diff -u -r1.149 gcach_ftyp.cxx
#endif
if( nGlyphIndex != 0 )
-@@ -1341,11 +1369,11 @@
+@@ -1376,11 +1404,11 @@
#if (FTVERSION >= 2002)
// for 0/90/180/270 degree fonts enable autohinting even if not advisable
// non-hinted and non-antialiased bitmaps just look too ugly
@@ -327,7 +327,7 @@ diff -u -r1.149 gcach_ftyp.cxx
nLoadFlags |= FT_LOAD_NO_BITMAP;
FT_Error rc = -1;
-@@ -1496,7 +1524,7 @@
+@@ -1545,7 +1573,7 @@
// autohinting in FT<=2.0.4 makes antialiased glyphs look worse
nLoadFlags |= FT_LOAD_NO_HINTING;
#else
@@ -384,12 +384,11 @@ retrieving revision 1.5
diff -u -r1.5 svpgdi.hxx
--- openoffice.org.orig/vcl/unx/headless/svpgdi.hxx 11 Apr 2008 09:29:03 -0000 1.5
+++ openoffice.org/vcl/unx/headless/svpgdi.hxx 30 May 2008 09:30:54 -0000
-@@ -169,6 +169,8 @@
- virtual BOOL drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize );
+@@ -170,6 +170,7 @@
virtual SystemGraphicsData GetGraphicsData() const;
-+
-+ virtual void GetFontHints( const ImplFontAttributes& rFontAttributes, int nSize, ImplFontHints& rFontHints) const;
+ virtual SystemFontData GetSysFontData( int nFallbacklevel ) const;
++ virtual void GetFontHints( const ImplFontAttributes& rFontAttributes, int nSize, ImplFontHints& rFontHints) const;
};
#endif
@@ -448,11 +447,11 @@ retrieving revision 1.5
diff -u -r1.5 svppspgraphics.hxx
--- openoffice.org.orig/vcl/unx/headless/svppspgraphics.hxx 11 Apr 2008 09:30:40 -0000 1.5
+++ openoffice.org/vcl/unx/headless/svppspgraphics.hxx 30 May 2008 09:30:56 -0000
-@@ -197,6 +197,7 @@
- virtual BOOL drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize );
- virtual bool filterText( const String& rOrigText, String& rNewText, xub_StrLen nIndex, xub_StrLen& rLen, xub_StrLen& rCutStart, xub_StrLen& rCutStop );
+@@ -190,6 +190,7 @@
+
virtual SystemGraphicsData GetGraphicsData() const;
-+ virtual void GetFontHints( const ImplFontAttributes& rFontAttributes, int nSize, ImplFontHints& rFontHints) const;
+ virtual SystemFontData GetSysFontData( int nFallbacklevel ) const;
++ virtual void GetFontHints( const ImplFontAttributes& rFontAttributes, int nSize, ImplFontHints& rFontHints) const;
};
#endif // _SVP_PSPGRAPHICS_HXX
@@ -478,9 +477,9 @@ retrieving revision 1.45
diff -u -r1.45 salgdi.h
--- openoffice.org.orig/vcl/unx/inc/salgdi.h 11 Apr 2008 09:37:25 -0000 1.45
+++ openoffice.org/vcl/unx/inc/salgdi.h 30 May 2008 09:30:58 -0000
-@@ -247,6 +247,7 @@
+@@ -253,6 +253,7 @@
virtual void SetTextColor( SalColor nSalColor );
- virtual USHORT SetFont( ImplFontSelectData*, int nFallbackLevel );
+ virtual USHORT SetFont( ImplFontSelectData*, int nFallbackLevel );
virtual void GetFontMetric( ImplFontMetricData* );
+ virtual void GetFontHints( const ImplFontAttributes& rFontAttributes, int nSize, ImplFontHints& rFontHints) const;
virtual ULONG GetKernPairs( ULONG nPairs, ImplKernPairData* pKernPairs );
@@ -493,7 +492,7 @@ retrieving revision 1.29
diff -u -r1.29 pspgraphics.cxx
--- openoffice.org.orig/vcl/unx/source/gdi/pspgraphics.cxx 11 Apr 2008 09:53:14 -0000 1.29
+++ openoffice.org/vcl/unx/source/gdi/pspgraphics.cxx 30 May 2008 09:31:10 -0000
-@@ -866,6 +866,10 @@
+@@ -885,6 +885,10 @@
}
}
@@ -505,8 +504,8 @@ diff -u -r1.29 pspgraphics.cxx
{
const psp::PrintFontManager& rMgr = psp::PrintFontManager::get();
@@ -1278,32 +1282,6 @@
- aDFA.mePitch = ToFontPitch (rInfo.m_ePitch);
- aDFA.mbSymbolFlag = (rInfo.m_aEncoding == RTL_TEXTENCODING_SYMBOL);
+ aDFA.mbSubsettable = rInfo.m_bSubsettable;
+ aDFA.mbEmbeddable = rInfo.m_bEmbeddable;
- switch (rInfo.m_eEmbeddedbitmap)
- {
@@ -825,9 +824,9 @@ Index: inc/psprint/fontmanager.hxx
RCS file: /cvs/gsl/psprint/inc/psprint/fontmanager.hxx,v
retrieving revision 1.36
diff -u -r1.36 fontmanager.hxx
---- openoffice.org.orig/psprint/inc/psprint/fontmanager.hxx 11 Apr 2008 10:09:55 -0000 1.36
-+++ openoffice.org/psprint/inc/psprint/fontmanager.hxx 18 Nov 2008 10:40:41 -0000
-@@ -142,6 +142,33 @@
+--- openoffice.org.orig/vcl/inc/vcl/fontmanager.hxx 11 Apr 2008 10:09:55 -0000 1.36
++++ openoffice.org/psprint/inc/vcl/fontmanager.hxx 18 Nov 2008 10:40:41 -0000
+@@ -137,6 +137,33 @@
};
}
@@ -861,16 +860,16 @@ diff -u -r1.36 fontmanager.hxx
/*
* the difference between FastPrintFontInfo and PrintFontInfo
* is that the information in FastPrintFontInfo can usually
-@@ -167,8 +194,6 @@
+@@ -162,8 +189,6 @@
weight::type m_eWeight;
pitch::type m_ePitch;
rtl_TextEncoding m_aEncoding;
- fcstatus::type m_eEmbeddedbitmap;
- fcstatus::type m_eAntialias;
+ bool m_bSubsettable;
+ bool m_bEmbeddable;
- FastPrintFontInfo() :
- m_nID( 0 ),
-@@ -178,9 +203,7 @@
+@@ -175,9 +200,7 @@
m_eWidth( width::Unknown ),
m_eWeight( weight::Unknown ),
m_ePitch( pitch::Unknown ),
@@ -881,7 +880,7 @@ diff -u -r1.36 fontmanager.hxx
{}
};
-@@ -297,9 +320,6 @@
+@@ -294,9 +317,6 @@
bool m_bHaveVerticalSubstitutedGlyphs;
bool m_bUserOverride;
@@ -891,7 +890,7 @@ diff -u -r1.36 fontmanager.hxx
std::map< sal_Unicode, sal_Int32 > m_aEncodingVector;
std::map< sal_Unicode, rtl::OString > m_aNonEncoded;
-@@ -742,6 +762,7 @@
+@@ -736,6 +756,7 @@
false else
*/
bool matchFont( FastPrintFontInfo& rInfo, const com::sun::star::lang::Locale& rLocale );
@@ -904,8 +903,8 @@ Index: source/fontmanager/fontcache.cxx
RCS file: /cvs/gsl/psprint/source/fontmanager/fontcache.cxx,v
retrieving revision 1.26
diff -u -r1.26 fontcache.cxx
---- openoffice.org.orig/psprint/source/fontmanager/fontcache.cxx 11 Apr 2008 10:12:37 -0000 1.26
-+++ openoffiec.org/psprint/source/fontmanager/fontcache.cxx 18 Nov 2008 10:40:41 -0000
+--- openoffice.org.orig/vcl/unx/source/fontmanager/fontcache.cxx 11 Apr 2008 10:12:37 -0000 1.26
++++ openoffiec.org/vcl/unx/source/fontmanager/fontcache.cxx 18 Nov 2008 10:40:41 -0000
@@ -214,9 +214,9 @@
aLine.Append( ';' );
aLine.Append( (*it)->m_bUserOverride ? "1" : "0" );
@@ -953,8 +952,8 @@ Index: source/fontmanager/fontconfig.cxx
RCS file: /cvs/gsl/psprint/source/fontmanager/fontconfig.cxx,v
retrieving revision 1.30.20.1
diff -u -r1.30.20.1 fontconfig.cxx
---- openoffice.org.orig/psprint/source/fontmanager/fontconfig.cxx 10 Sep 2008 13:53:12 -0000 1.30.20.1
-+++ openoffice.org/psprint/source/fontmanager/fontconfig.cxx 18 Nov 2008 10:40:42 -0000
+--- openoffice.org.orig/vcl/unx/source/fontmanager/fontconfig.cxx 10 Sep 2008 13:53:12 -0000 1.30.20.1
++++ openoffice.org/vcl/unx/source/fontmanager/fontconfig.cxx 18 Nov 2008 10:40:42 -0000
@@ -122,6 +122,7 @@
FcBool (*m_pFcConfigAppFontAddDir)(FcConfig*, const FcChar8*);
FcBool (*m_pFcConfigSubstitute)(FcConfig*,FcPattern*,FcMatchKind);
@@ -1244,9 +1243,9 @@ Index: source/fontmanager/fontmanager.cx
RCS file: /cvs/gsl/psprint/source/fontmanager/fontmanager.cxx,v
retrieving revision 1.81.18.1
diff -u -r1.81.18.1 fontmanager.cxx
---- openoffice.org.orig/psprint/source/fontmanager/fontmanager.cxx 10 Sep 2008 13:53:28 -0000 1.81.18.1
-+++ openoffice.org/psprint/source/fontmanager/fontmanager.cxx 18 Nov 2008 10:40:42 -0000
-@@ -355,9 +355,7 @@
+--- openoffice.org.orig/vcl/unx/source/fontmanager/fontmanager.cxx 10 Sep 2008 13:53:28 -0000 1.81.18.1
++++ openoffice.org/vcl/unx/source/fontmanager/fontmanager.cxx 18 Nov 2008 10:40:42 -0000
+@@ -353,9 +353,7 @@
m_nXMax( 0 ),
m_nYMax( 0 ),
m_bHaveVerticalSubstitutedGlyphs( false ),
@@ -1257,16 +1256,16 @@ diff -u -r1.81.18.1 fontmanager.cxx
{
}
-@@ -2732,8 +2730,6 @@
+@@ -2630,8 +2628,6 @@
rInfo.m_eWeight = pFont->m_eWeight;
rInfo.m_ePitch = pFont->m_ePitch;
rInfo.m_aEncoding = pFont->m_aEncoding;
- rInfo.m_eEmbeddedbitmap = pFont->m_eEmbeddedbitmap;
- rInfo.m_eAntialias = pFont->m_eAntialias;
- rInfo.m_aAliases.clear();
- for( ::std::list< int >::iterator it = pFont->m_aAliases.begin(); it != pFont->m_aAliases.end(); ++it )
- rInfo.m_aAliases.push_back( m_pAtoms->getString( ATOM_FAMILYNAME, *it ) );
-@@ -3977,8 +3973,6 @@
+
+ rInfo.m_bEmbeddable = (pFont->m_eType == fonttype::Type1);
+ rInfo.m_bSubsettable = (pFont->m_eType == fonttype::TrueType); // TODO: rename to SfntType
+@@ -3936,8 +3932,6 @@
BuiltinFont* pFont = new BuiltinFont();
pFont->m_nDirectory = 0;
pFont->m_bUserOverride = false;
openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch:
inc/vcl/printerjob.hxx | 2 -
unx/source/printergfx/printerjob.cxx | 45 +++++++++++++++++------------------
2 files changed, 24 insertions(+), 23 deletions(-)
Index: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch 9 Nov 2006 10:48:30 -0000 1.1
+++ openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch 10 Oct 2009 15:48:45 -0000 1.2
@@ -1,5 +1,5 @@
---- openoffice.org.orig/psprint/inc/psprint/printerjob.hxx 2005-09-08 18:35:45.000000000 +0200
-+++ openoffice.org/psprint/inc/psprint/printerjob.hxx 2006-05-16 20:23:54.000000000 +0200
+--- vcl/inc/vcl/printerjob.hxx
++++ vcl/inc/vcl/printerjob.hxx
@@ -99,7 +99,7 @@ private: // private methods
bool writeFeatureList( osl::File* pFile, const JobData&, bool bDocumentSetup );
@@ -9,8 +9,8 @@
void writeJobPatch( osl::File* File, const JobData& );
bool writeProlog (osl::File* pFile, const JobData& );
---- openoffice.org.orig/psprint/source/printergfx/printerjob.cxx 2006-05-04 10:41:55.000000000 +0200
-+++ openoffice.org/psprint/source/printergfx/printerjob.cxx 2006-05-16 20:23:10.000000000 +0200
+--- vcl/unx/source/printergfx/printerjob.cxx
++++ vcl/unx/source/printergfx/printerjob.cxx
@@ -1047,14 +1047,6 @@ PrinterJob::StartPage (const JobData& rJ
if( ! (pPageHeader && pPageBody) )
return sal_False;
openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch:
globals.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch 24 Jan 2009 22:48:22 -0000 1.6
+++ openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch 10 Oct 2009 15:48:45 -0000 1.7
@@ -5,10 +5,10 @@ retrieving revision 1.62.2.3
diff -u -r1.62.2.3 globals.pm
--- openoffice.org.orig/solenv/bin/modules/installer/globals.pm 24 Jan 2007 16:34:05 -0000 1.62.2.3
+++ openoffice.org/solenv/bin/modules/installer/globals.pm 27 Feb 2007 17:25:53 -0000
-@@ -305,7 +305,7 @@
+@@ -399,7 +399,7 @@
%moduledestination = ();
- $unomaxservices = 25;
+ $unomaxservices = 1800; # regcomp -c argument length
- $javamaxservices = 15;
+ $javamaxservices = 1;
openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch:
openoffice.org.orig/sw/source/ui/inc/titlepage.hxx | 129 +++
openoffice.org/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 5
openoffice.org/sw/source/ui/misc/titlepage.cxx | 401 ++++++++++
openoffice.org/sw/source/ui/misc/titlepage.hrc | 58 +
openoffice.org/sw/source/ui/misc/titlepage.src | 260 ++++++
sw/inc/cmdid.h | 2
sw/inc/globals.hrc | 5
sw/inc/helpid.h | 1
sw/inc/rcid.hrc | 2
sw/inc/swabstdlg.hxx | 1
sw/sdi/_basesh.sdi | 6
sw/sdi/swriter.sdi | 25
sw/sdi/swslots.src | 4
sw/source/ui/dialog/swdlgfact.cxx | 9
sw/source/ui/dialog/swdlgfact.hxx | 1
sw/source/ui/inc/swmn_tmpl.hrc | 9
sw/source/ui/misc/makefile.mk | 4
sw/source/ui/shells/basesh.cxx | 8
sw/uiconfig/swriter/menubar/menubar.xml | 1
sw/util/makefile.mk | 1
20 files changed, 927 insertions(+), 5 deletions(-)
Index: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch 13 Nov 2008 13:21:35 -0000 1.3
+++ openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch 10 Oct 2009 15:48:45 -0000 1.4
@@ -165,7 +165,7 @@ retrieving revision 1.13
diff -u -r1.13 swdlgfact.cxx
--- openoffice.org.orig/sw/source/ui/dialog/swdlgfact.cxx 26 Apr 2007 09:06:20 -0000 1.13
+++ openoffice.org/sw/source/ui/dialog/swdlgfact.cxx 10 Jul 2007 13:05:50 -0000
-@@ -109,6 +109,7 @@
+@@ -97,6 +97,7 @@
#include <instable.hxx> //add for SwInsTableDlg
#include <javaedit.hxx> //add for SwJavaEditDialog
#include <linenum.hxx> //add for SwLineNumberingDlg
@@ -173,7 +173,7 @@ diff -u -r1.13 swdlgfact.cxx
#include <mailmrge.hxx> //add for SwMailMergeDlg, SwMailMergeCreateFromDlg, SwMailMergeFieldConnectionsDlg
#include <mergetbl.hxx> //add for SwMergeTblDlg
#include <multmrk.hxx> //add for SwMultiTOXMarkDlg
-@@ -1405,6 +1406,14 @@
+@@ -1357,6 +1358,14 @@
return 0;
}
@@ -186,7 +186,7 @@ diff -u -r1.13 swdlgfact.cxx
+}
+
VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateVclSwViewDialog( int nResId,
- SwView& rView, BOOL bCol ) //add for SwInsRowColDlg, SwLineNumberingDlg
+ SwView& rView, BOOL /*bCol*/ ) //add for SwInsRowColDlg, SwLineNumberingDlg
{
Index: source/ui/dialog/swdlgfact.hxx
===================================================================
openoffice.org-2.3.0.ooo76649.httpencoding.patch:
sc/source/filter/html/htmlpars.cxx | 46 +------------------------------------
sfx2/source/bastyp/sfxhtml.cxx | 23 +++++++++++++++++-
svx/source/editeng/eehtml.cxx | 3 --
sw/source/filter/html/swhtml.cxx | 8 ++----
4 files changed, 28 insertions(+), 52 deletions(-)
Index: openoffice.org-2.3.0.ooo76649.httpencoding.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.3.0.ooo76649.httpencoding.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-2.3.0.ooo76649.httpencoding.patch 31 Oct 2007 10:04:02 -0000 1.1
+++ openoffice.org-2.3.0.ooo76649.httpencoding.patch 10 Oct 2009 15:48:45 -0000 1.2
@@ -5,7 +5,7 @@ retrieving revision 1.29
diff -u -r1.29 htmlpars.cxx
--- openoffice.org.orig/sc/source/filter/html/htmlpars.cxx 3 Aug 2006 14:54:12 -0000 1.29
+++ openoffice.org/sc/source/filter/html/htmlpars.cxx 24 Apr 2007 09:47:29 -0000
-@@ -170,26 +170,7 @@
+@@ -157,27 +157,7 @@
SfxObjectShell* pObjSh = mpDoc->GetDocumentShell();
BOOL bLoading = pObjSh && pObjSh->IsLoading();
@@ -25,15 +25,16 @@ diff -u -r1.29 htmlpars.cxx
- aContentType.AppendAscii( pCharSet );
-
- xValues = new SvKeyValueIterator;
-- xValues->Append( SvKeyValue( String::CreateFromAscii( sHTML_META_content_type ), aContentType ) );
+- xValues->Append( SvKeyValue( String::CreateFromAscii( OOO_STRING_SVTOOLS_HTML_META_content_type ), aContentType ) );
- pAttributes = xValues;
- }
- }
+-
+ SvKeyValueIterator* pAttributes = bLoading ? pObjSh->GetHeaderAttributes() : 0;
-
ULONG nErr = pEdit->Read( rStream, rBaseURL, EE_FORMAT_HTML, pAttributes );
-@@ -2797,29 +2779,8 @@
+ pEdit->SetImportHdl( aOldLink );
+@@ -2796,30 +2776,8 @@
ULONG ScHTMLQueryParser::Read( SvStream& rStrm, const String& rBaseURL )
{
@@ -56,14 +57,15 @@ diff -u -r1.29 htmlpars.cxx
- aContentType.AppendAscii( pCharSet );
-
- xValues = new SvKeyValueIterator;
-- xValues->Append( SvKeyValue( String::CreateFromAscii( sHTML_META_content_type ), aContentType ) );
+- xValues->Append( SvKeyValue( String::CreateFromAscii( OOO_STRING_SVTOOLS_HTML_META_content_type ), aContentType ) );
- pAttributes = xValues;
- }
- }
+-
+ SvKeyValueIterator* pAttributes = (pObjSh && pObjSh->IsLoading()) ? pObjSh->GetHeaderAttributes() : 0;
-
Link aOldLink = pEdit->GetImportHdl();
pEdit->SetImportHdl( LINK( this, ScHTMLQueryParser, HTMLImportHdl ) );
+ ULONG nErr = pEdit->Read( rStrm, rBaseURL, EE_FORMAT_HTML, pAttributes );
Index: source/filter/html/swhtml.cxx
===================================================================
RCS file: /cvs/sw/sw/source/filter/html/swhtml.cxx,v
@@ -100,17 +102,20 @@ retrieving revision 1.17
diff -u -r1.17 sfxhtml.cxx
--- openoffice.org.orig/sfx2/source/bastyp/sfxhtml.cxx 17 Sep 2006 16:25:00 -0000 1.17
+++ openoffice.org/sfx2/source/bastyp/sfxhtml.cxx 24 Apr 2007 09:35:50 -0000
-@@ -90,6 +90,9 @@
- sal_Char __FAR_DATA sHTML_MIME_application[] = "application/";
- sal_Char __FAR_DATA sHTML_MIME_experimental[] = "x-";
+@@ -53,10 +53,11 @@
+ #include <tools/tenccvt.hxx>
+ #include <sfx2/sfxhtml.hxx>
+#include <sfx2/objsh.hxx>
+#include <sfx2/docfile.hxx>
-+
- #define HTML_META_NONE 0
- #define HTML_META_AUTHOR 1
- #define HTML_META_DESCRIPTION 2
-@@ -624,6 +627,26 @@
+
+ #include <com/sun/star/beans/XPropertyContainer.hpp>
+
+-
+ using namespace ::com::sun::star;
+
+
+@@ -381,6 +382,26 @@
BOOL SfxHTMLParser::SetEncodingByHTTPHeader(
SvKeyValueIterator *pHTTPHeader )
{
openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch:
salplug.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch 12 Feb 2009 14:25:02 -0000 1.3
+++ openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch 10 Oct 2009 15:48:45 -0000 1.4
@@ -5,16 +5,16 @@ retrieving revision 1.24
diff -u -r1.24 salplug.cxx
--- openoffice.org.orig/vcl/unx/source/plugadapt/salplug.cxx 15 Oct 2007 13:07:38 -0000 1.24
+++ openoffice.org.orig/vcl/unx/source/plugadapt/salplug.cxx 10 Jan 2008 18:00:21 -0000
-@@ -434,7 +434,7 @@
+@@ -152,7 +152,7 @@
static const char* autodetect_plugin()
{
- const char * desktop = get_desktop_environment();
+ const rtl::OUString& desktop( get_desktop_environment() );
- const char * pRet = "gen";
+ const char * pRet = "gtk";
// no server at all: dummy plugin
- if ( desktop == desktop_strings[DESKTOP_NONE] )
-@@ -502,7 +502,7 @@
+ if ( desktop.equalsAscii( desktop_strings[DESKTOP_NONE] ) )
+@@ -209,7 +209,7 @@
// fallback to gen
if( ! pInst )
openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch:
inc/vcl/fontmanager.hxx | 4 -
unx/source/fontmanager/fontconfig.cxx | 125 ++++++++++++++++++++++------------
unx/source/gdi/salgdi3.cxx | 93 +++++++++++++++++++++----
3 files changed, 164 insertions(+), 58 deletions(-)
Index: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch 12 Feb 2009 14:25:02 -0000 1.4
+++ openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch 10 Oct 2009 15:48:45 -0000 1.5
@@ -1,6 +1,6 @@
-diff -ru psprint/inc/psprint/fontmanager.hxx psprint/inc/psprint/fontmanager.hxx
---- openoffice.org.orig/psprint/inc/psprint/fontmanager.hxx 2008-05-26 15:48:28.000000000 +0100
-+++ openoffice.org/psprint/inc/psprint/fontmanager.hxx 2008-05-26 15:50:13.000000000 +0100
+diff -ru vcl/inc/vcl/fontmanager.hxx vcl/inc/vcl/fontmanager.hxx
+--- openoffice.org.orig/vcl/inc/vcl/fontmanager.hxx 2008-05-26 15:48:28.000000000 +0100
++++ openoffice.org/vcl/inc/vcl/fontmanager.hxx 2008-05-26 15:50:13.000000000 +0100
@@ -765,8 +765,8 @@
FontConfigHints getFontConfigHints(const FastPrintFontInfo& rInfo, int nSize, void (*subcallback)(void *));
@@ -12,9 +12,9 @@ diff -ru psprint/inc/psprint/fontmanager
bool hasFontconfig() const { return m_bFontconfigSuccess; }
int FreeTypeCharIndex( void *pFace, sal_uInt32 aChar );
-diff -ru psprint/source/fontmanager/fontconfig.cxx psprint/source/fontmanager/fontconfig.cxx
---- openoffice.org.orig/psprint/source/fontmanager/fontconfig.cxx 2008-05-26 15:48:28.000000000 +0100
-+++ openoffice.org/psprint/source/fontmanager/fontconfig.cxx 2008-05-26 16:07:30.000000000 +0100
+diff -ru vcl/unx/source/fontmanager/fontconfig.cxx vcl/unx/source/fontmanager/fontconfig.cxx
+--- openoffice.org.orig/vcl/unx/source/fontmanager/fontconfig.cxx 2008-05-26 15:48:28.000000000 +0100
++++ openoffice.org/vcl/unx/source/fontmanager/fontconfig.cxx 2008-05-26 16:07:30.000000000 +0100
@@ -560,6 +560,72 @@
return true;
}
openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch:
inc/vcl/glyphcache.hxx | 3 ++-
inc/vcl/settings.hxx | 6 ++++++
source/app/settings.cxx | 2 ++
source/window/winproc.cxx | 6 ++++++
unx/gtk/gdi/salnativewidgets-gtk.cxx | 5 +++++
unx/gtk/window/gtkframe.cxx | 3 +++
unx/source/gdi/salgdi3.cxx | 11 ++++++++++-
7 files changed, 34 insertions(+), 2 deletions(-)
Index: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch 12 Feb 2009 14:25:02 -0000 1.4
+++ openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch 10 Oct 2009 15:48:45 -0000 1.5
@@ -83,9 +83,9 @@ diff -ru vcl/source/window/winproc.cxx v
diff -ru vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
--- openoffice.org.orig/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 2008-04-15 08:44:28.000000000 +0100
+++ openoffice.org/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 2008-04-15 16:21:17.000000000 +0100
-@@ -3286,6 +3287,11 @@
- aStyleSet.GetWindowColor().IsDark() );
- aStyleSet.SetHighContrastMode( bHC );
+@@ -3465,6 +3465,11 @@
+ // FIXME: need some way of fetching toolbar icon size.
+ // aStyleSet.SetToolbarIconSize( STYLE_TOOLBAR_ICONSIZE_SMALL );
+ const cairo_font_options_t *pNewOptions = 0;
+ if (GdkScreen* pScreen = gdk_display_get_screen( gdk_display_get_default(), m_nScreen ))
openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch:
optgdlg.cxx | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
Index: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch 7 Jan 2009 12:51:24 -0000 1.3
+++ openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch 10 Oct 2009 15:48:45 -0000 1.4
@@ -1,5 +1,5 @@
---- openoffice.org.orig/svx/source/dialog/optgdlg.cxx 2008-08-29 08:29:20.000000000 +0100
-+++ openoffice.org/svx/source/dialog/optgdlg.cxx 2008-08-29 08:31:35.000000000 +0100
+--- openoffice.org.orig/svx/source/cui/optgdlg.cxx 2008-08-29 08:29:20.000000000 +0100
++++ openoffice.org/svx/source/cui/optgdlg.cxx 2008-08-29 08:31:35.000000000 +0100
@@ -795,11 +795,11 @@
switch( Application::GetSettings().GetStyleSettings().GetAutoSymbolsStyle() )
{
openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch:
body.xsl | 42 +++++++++++++++++++++++++++++-------------
1 file changed, 29 insertions(+), 13 deletions(-)
Index: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch 27 Apr 2009 06:02:35 -0000 1.1
+++ openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch 10 Oct 2009 15:48:46 -0000 1.2
@@ -2,146 +2,145 @@ Index: filter/source/xslt/odf2xhtml/expo
===================================================================
--- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl (revision 270524)
+++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl (working copy)
-@@ -1028,7 +1027,11 @@
- <xsl:param name="minLabelWidth"/>
- <xsl:param name="listIndent" />
-
--
-+ <!-- The text:list-header shall not be labeled. According to ODF specification (sect. 4.3.2):
-+ "The <text:list-header> element represents a list header and is a special kind of list item. It
-+ contains one or more paragraphs that are displayed before a list. The paragraphs are formatted
-+ like list items but they do not have a preceding number or bullet." -->
-+ <xsl:variable name="isListHeader" select="boolean(self::text:list-header)"/>
- <xsl:variable name="listIndentNew">
- <xsl:choose>
- <xsl:when test="$listIndent">
-@@ -1046,13 +1049,16 @@
- <xsl:variable name="itemNumberNew">
- <xsl:if test="$listStyle/text:list-level-style-number">
- <xsl:choose>
-+ <xsl:when test="$isListHeader">0</xsl:when>
- <xsl:when test="$isEmptyList">
- <!-- An empty list item (no text:h/text:p as child), will not count as item and does not increment the count. -->
- <xsl:variable name="tempItemNumber">
- <xsl:choose>
- <!-- siblings will be incremented by one -->
- <xsl:when test="$itemNumber">
-- <xsl:value-of select="$itemNumber + 1"/>
-+ <xsl:if test="not($isListHeader)">
-+ <xsl:value-of select="$itemNumber + 1"/>
-+ </xsl:if>
- </xsl:when>
- <!-- if a higher list level had content the numbering starts with 1 -->
- <xsl:when test="$isListNumberingReset and $listLevel > 1">
-@@ -1132,6 +1138,7 @@
- <xsl:when test="$display">
- <xsl:value-of select="$display"/>
- </xsl:when>
-+ <xsl:when test="$isListHeader">0</xsl:when>
- <xsl:otherwise>1</xsl:otherwise>
- </xsl:choose>
- </xsl:with-param>
-@@ -1144,9 +1151,10 @@
- </xsl:variable>
- <xsl:element name="li">
- <xsl:choose>
-- <xsl:when test="$isEmptyList">
-+ <xsl:when test="$isEmptyList or $isListHeader">
- <xsl:apply-templates>
- <xsl:with-param name="globalData" select="$globalData"/>
-+ <xsl:with-param name="isNextLevelNumberingReset" select="$isListHeader or $isNextLevelNumberingReset"/>
- <xsl:with-param name="itemLabel" select="$itemLabelNew"/>
- <xsl:with-param name="listLevel" select="$listLevel + 1"/>
- <xsl:with-param name="listStyleName" select="$listStyleName"/>
-@@ -1181,7 +1189,7 @@
- <xsl:apply-templates mode="first-list-child-margin-adaption" select="*[1]">
- <xsl:with-param name="globalData" select="$globalData"/>
- <xsl:with-param name="isEmptyList" select="$isEmptyList"/>
-- <xsl:with-param name="isNextLevelNumberingReset" select="$isNextLevelNumberingReset"/>
-+ <xsl:with-param name="isNextLevelNumberingReset" select="$isListHeader or $isNextLevelNumberingReset"/>
- <!-- The new created label is given to the children -->
- <xsl:with-param name="itemLabel" select="$itemLabelNew"/>
- <xsl:with-param name="listLabelElement" select="$listLabelElement"/>
-@@ -1225,7 +1233,7 @@
-
-
- <!-- The Numbering start value (or offset from regular counteing) is used at the first item of offset,
-- but have to be reused on following item/headers with no text:start-value -->
-+ but have to be reused on following items with no text:start-value -->
- <xsl:template name="getItemNumber">
- <xsl:param name="listLevel"/>
- <xsl:param name="listLevelStyle"/>
-@@ -1261,6 +1269,9 @@
- the level 3 gets a 'pseudoLevel' -->
- <xsl:param name="pseudoLevel" select="0" />
-
-+ <xsl:variable name="isListHeader" select="boolean(self::text:list-header)"/>
-+ <xsl:variable name="isEmptyList" select="not(*[name() = 'text:h' or name() = 'text:p'])"/>
-+
- <!-- set the next of preceding list items. Starting from the current to the next previous text:list-item -->
- <xsl:variable name="precedingListItemOfSameLevelAndStyle" select="$precedingListItemsOfSameLevelAndStyle[$precedingListItemsOfSameLevelAndStyleCount - $IteratorSameLevelAndStyle + 1]"/>
- <xsl:variable name="precedingListItemOfSameStyle" select="$precedingListItemsOfSameStyle[$precedingListItemsOfSameStyleCount - $IteratorSameStyle + 1]"/>
-@@ -1293,7 +1304,7 @@
- <xsl:when test="$currentListLevel < $listLevel">
- <xsl:choose>
- <!-- if it has content the counting is ended -->
-- <xsl:when test="*[name() = 'text:h' or name() = 'text:p']">
-+ <xsl:when test="not($isEmptyList or $isListHeader)">
- <!-- 2DO: Perhaps the children still have to be processed -->
- <xsl:value-of select="$itemNumber + $pseudoLevel"/>
- </xsl:when>
-@@ -1348,7 +1359,7 @@
- <xsl:with-param name="pseudoLevel">
- <xsl:choose>
- <!-- empty list item does not count -->
-- <xsl:when test="not(*[name() = 'text:h' or name() = 'text:p'])">
-+ <xsl:when test="$isEmptyList or $isListHeader">
- <xsl:value-of select="$pseudoLevel"/>
- </xsl:when>
- <xsl:otherwise>1</xsl:otherwise>
-@@ -1381,11 +1392,14 @@
- <xsl:param name="precedingListItemsOfSameStyleCount"/>
- <xsl:param name="pseudoLevel" />
-
-+ <xsl:variable name="isListHeader" select="boolean(self::text:list-header)"/>
-+ <xsl:variable name="isEmptyList" select="not(*[name() = 'text:h' or name() = 'text:p'])"/>
-+
- <xsl:choose>
- <xsl:when test="@text:start-value">
- <xsl:choose>
-- <xsl:when test="not(*[name() = 'text:h' or name() = 'text:p'])">
-- <!-- empty list item does not count -->
-+ <xsl:when test="$isEmptyList or $isListHeader">
-+ <!-- empty list item does not count. neither does list header -->
- <xsl:call-template name="countListItemTillStartValue">
- <xsl:with-param name="IteratorSameLevelAndStyle" select="$IteratorSameLevelAndStyle + 1" />
- <xsl:with-param name="IteratorSameStyle" select="$IteratorSameStyle + 1"/>
-@@ -1407,8 +1421,8 @@
- </xsl:when>
- <xsl:when test="$listLevelStyle/@text:start-value">
- <xsl:choose>
-- <xsl:when test="not(*[name() = 'text:h' or name() = 'text:p'])">
-- <!-- empty list item does not count -->
-+ <xsl:when test="$isEmptyList or $isListHeader">
-+ <!-- empty list item does not count. neither does list header -->
- <xsl:call-template name="countListItemTillStartValue">
- <xsl:with-param name="IteratorSameLevelAndStyle" select="$IteratorSameLevelAndStyle + 1" />
- <xsl:with-param name="IteratorSameStyle" select="$IteratorSameStyle + 1"/>
-@@ -1430,8 +1444,8 @@
- </xsl:when>
- <xsl:otherwise>
- <xsl:choose>
-- <xsl:when test="not(*[name() = 'text:h' or name() = 'text:p'])">
-- <!-- empty list item does not count -->
-+ <xsl:when test="$isEmptyList or $isListHeader">
-+ <!-- empty list item does not count. neither does list header -->
- <xsl:call-template name="countListItemTillStartValue">
- <xsl:with-param name="IteratorSameLevelAndStyle" select="$IteratorSameLevelAndStyle + 1" />
- <xsl:with-param name="IteratorSameStyle" select="$IteratorSameStyle + 1"/>
-@@ -1911,4 +1925,4 @@
-
- <xsl:template match="math:annotation" mode="math"/>
-
+@@ -1735,6 +1735,11 @@
+ <xsl:param name="minLabelWidth"/>
+ <xsl:param name="listIndent" />
+
++ <!-- The text:list-header shall not be labeled. According to ODF specification (sect. 4.3.2):
++ "The <text:list-header> element represents a list header and is a special kind of list item. It
++ contains one or more paragraphs that are displayed before a list. The paragraphs are formatted
++ like list items but they do not have a preceding number or bullet." -->
++ <xsl:variable name="isListHeader" select="boolean(self::text:list-header)"/>
+
+ <xsl:variable name="listIndentNew">
+ <xsl:choose>
+@@ -1753,13 +1758,16 @@
+ <xsl:variable name="itemNumberNew">
+ <xsl:if test="$listStyle/text:list-style/text:list-level-style-number">
+ <xsl:choose>
++ <xsl:when test="$isListHeader">0</xsl:when>
+ <xsl:when test="$isEmptyList">
+ <!-- An empty list item (no text:h/text:p as child), will not count as item and does not increment the count. -->
+ <xsl:variable name="tempItemNumber">
+ <xsl:choose>
+ <!-- siblings will be incremented by one -->
+ <xsl:when test="$itemNumber">
+- <xsl:value-of select="$itemNumber + 1"/>
++ <xsl:if test="not($isListHeader)">
++ <xsl:value-of select="$itemNumber + 1"/>
++ </xsl:if>
+ </xsl:when>
+ <!-- if a higher list level had content the numbering starts with 1 -->
+ <xsl:when test="$isListNumberingReset and $listLevel > 1">
+@@ -1834,6 +1842,7 @@
+ <xsl:when test="$display">
+ <xsl:value-of select="$display"/>
+ </xsl:when>
++ <xsl:when test="$isListHeader">0</xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+ </xsl:choose>
+ </xsl:with-param>
+@@ -1844,9 +1853,10 @@
+ </xsl:variable>
+ <xsl:element name="li">
+ <xsl:choose>
+- <xsl:when test="$isEmptyList">
++ <xsl:when test="$isEmptyList or $isListHeader">
+ <xsl:apply-templates>
+ <xsl:with-param name="globalData" select="$globalData"/>
++ <xsl:with-param name="isNextLevelNumberingReset" select="$isListHeader or $isNextLevelNumberingReset"/>
+ <xsl:with-param name="itemLabel" select="$itemLabelNew"/>
+ <xsl:with-param name="listLevel" select="$listLevel + 1"/>
+ <xsl:with-param name="listStyleName" select="$listStyleName"/>
+@@ -1857,7 +1867,7 @@
+ <xsl:apply-templates mode="list-item-children" select="*[1]">
+ <xsl:with-param name="globalData" select="$globalData"/>
+ <xsl:with-param name="isEmptyList" select="$isEmptyList"/>
+- <xsl:with-param name="isNextLevelNumberingReset" select="$isNextLevelNumberingReset"/>
++ <xsl:with-param name="isNextLevelNumberingReset" select="$isListHeader or $isNextLevelNumberingReset"/>
+ <!-- The new created label is given to the children -->
+ <xsl:with-param name="itemLabel" select="$itemLabelNew"/>
+ <xsl:with-param name="listLabelElement">
+@@ -2056,7 +2066,7 @@
+
+
+ <!-- The Numbering start value (or offset from regular counteing) is used at the first item of offset,
+- but have to be reused on following item/headers with no text:start-value -->
++ but have to be reused on following items with no text:start-value -->
+ <xsl:template name="getItemNumber">
+ <xsl:param name="listLevel"/>
+ <xsl:param name="listLevelStyle"/>
+@@ -2091,6 +2101,9 @@
+ the level 3 gets a 'pseudoLevel' -->
+ <xsl:param name="pseudoLevel" select="0" />
+
++ <xsl:variable name="isListHeader" select="boolean(self::text:list-header)"/>
++ <xsl:variable name="isEmptyList" select="not(*[name() = 'text:h' or name() = 'text:p'])"/>
++
+ <!-- set the next of preceding list items. Starting from the current to the next previous text:list-item -->
+ <xsl:variable name="precedingListItemOfSameLevelAndStyle" select="$precedingListItemsOfSameLevelAndStyle[$precedingListItemsOfSameLevelAndStyleCount - $IteratorSameLevelAndStyle + 1]"/>
+ <xsl:variable name="precedingListItemOfSameStyle" select="$precedingListItemsOfSameStyle[$precedingListItemsOfSameStyleCount - $IteratorSameStyle + 1]"/>
+@@ -2123,7 +2136,7 @@
+ <xsl:when test="$currentListLevel < $listLevel">
+ <xsl:choose>
+ <!-- if it has content the counting is ended -->
+- <xsl:when test="*[name() = 'text:h' or name() = 'text:p']">
++ <xsl:when test="not($isEmptyList or $isListHeader)">
+ <!-- 2DO: Perhaps the children still have to be processed -->
+ <xsl:value-of select="$itemNumber + $pseudoLevel"/>
+ </xsl:when>
+@@ -2178,7 +2191,7 @@
+ <xsl:with-param name="pseudoLevel">
+ <xsl:choose>
+ <!-- empty list item does not count -->
+- <xsl:when test="not(*[name() = 'text:h' or name() = 'text:p'])">
++ <xsl:when test="$isEmptyList or $isListHeader">
+ <xsl:value-of select="$pseudoLevel"/>
+ </xsl:when>
+ <xsl:otherwise>1</xsl:otherwise>
+@@ -2211,11 +2224,14 @@
+ <xsl:param name="precedingListItemsOfSameStyleCount"/>
+ <xsl:param name="pseudoLevel" />
+
++ <xsl:variable name="isListHeader" select="boolean(self::text:list-header)"/>
++ <xsl:variable name="isEmptyList" select="not(*[name() = 'text:h' or name() = 'text:p'])"/>
++
+ <xsl:choose>
+ <xsl:when test="@text:start-value">
+ <xsl:choose>
+- <xsl:when test="not(*[name() = 'text:h' or name() = 'text:p'])">
+- <!-- empty list item does not count -->
++ <xsl:when test="$isEmptyList or $isListHeader">
++ <!-- empty list item does not count. neither does list header -->
+ <xsl:call-template name="countListItemTillStartValue">
+ <xsl:with-param name="IteratorSameLevelAndStyle" select="$IteratorSameLevelAndStyle + 1" />
+ <xsl:with-param name="IteratorSameStyle" select="$IteratorSameStyle + 1"/>
+@@ -2237,8 +2253,8 @@
+ </xsl:when>
+ <xsl:when test="$listLevelStyle/@text:start-value">
+ <xsl:choose>
+- <xsl:when test="not(*[name() = 'text:h' or name() = 'text:p'])">
+- <!-- empty list item does not count -->
++ <xsl:when test="$isEmptyList or $isListHeader">
++ <!-- empty list item does not count. neither does list header -->
+ <xsl:call-template name="countListItemTillStartValue">
+ <xsl:with-param name="IteratorSameLevelAndStyle" select="$IteratorSameLevelAndStyle + 1" />
+ <xsl:with-param name="IteratorSameStyle" select="$IteratorSameStyle + 1"/>
+@@ -2260,8 +2276,8 @@
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:choose>
+- <xsl:when test="not(*[name() = 'text:h' or name() = 'text:p'])">
+- <!-- empty list item does not count -->
++ <xsl:when test="$isEmptyList or $isListHeader">
++ <!-- empty list item does not count. neither does list header -->
+ <xsl:call-template name="countListItemTillStartValue">
+ <xsl:with-param name="IteratorSameLevelAndStyle" select="$IteratorSameLevelAndStyle + 1" />
+ <xsl:with-param name="IteratorSameStyle" select="$IteratorSameStyle + 1"/>
+@@ -2838,4 +2854,4 @@
+ <xsl:template match="math:annotation" mode="math"/>
+
+
-</xsl:stylesheet>
\ No newline at end of file
-+</xsl:stylesheet>
++</xsl:stylesheet>
openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch:
inc/document.hxx | 4
inc/drwlayer.hxx | 11
inc/userdat.hxx | 5
source/core/data/documen3.cxx | 4
source/core/data/drwlayer.cxx | 374 +++++++++++-------------
source/core/data/postit.cxx | 1
source/core/tool/detfunc.cxx | 5
source/filter/xml/XMLExportIterator.hxx | 2
source/filter/xml/XMLTableShapeImportHelper.cxx | 62 ++-
source/filter/xml/XMLTableShapeResizer.cxx | 298 ++-----------------
source/filter/xml/XMLTableShapeResizer.hxx | 37 --
source/filter/xml/xmlexprt.cxx | 60 ---
source/filter/xml/xmlimprt.cxx | 2
source/filter/xml/xmlsubti.cxx | 10
source/filter/xml/xmlsubti.hxx | 13
source/ui/Accessibility/AccessibleDocument.cxx | 32 --
source/ui/drawfunc/drawsh2.cxx | 2
source/ui/drawfunc/drawsh5.cxx | 10
source/ui/inc/drawview.hxx | 5
source/ui/unoobj/shapeuno.cxx | 63 +---
source/ui/view/drawvie3.cxx | 43 ++
source/ui/view/drawview.cxx | 37 --
22 files changed, 382 insertions(+), 698 deletions(-)
Index: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch 5 Jun 2009 11:43:09 -0000 1.1
+++ openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch 10 Oct 2009 15:48:46 -0000 1.2
@@ -15,7 +15,7 @@ diff -ru sc.orig/inc/document.hxx sc/inc
diff -ru sc.orig/inc/drwlayer.hxx sc/inc/drwlayer.hxx
--- sc.orig/inc/drwlayer.hxx 2009-06-04 12:39:49.000000000 +0100
+++ sc/inc/drwlayer.hxx 2009-06-04 12:40:23.000000000 +0100
-@@ -110,13 +110,11 @@
+@@ -110,12 +110,10 @@
BOOL bHyphenatorSet;
private:
@@ -24,13 +24,12 @@ diff -ru sc.orig/inc/drwlayer.hxx sc/inc
void MoveCells( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2,
SCsCOL nDx,SCsROW nDy );
- void RecalcPos( SdrObject* pObj,
-- const ScDrawObjData& rData,
-+ ScDrawObjData& rData,
- const ScAddress& rOldStart,
- const ScAddress& rOldEnd,
- bool bNegativePage );
-@@ -201,8 +199,11 @@
+- void RecalcPos( SdrObject* pObj, const ScDrawObjData& rData, bool bNegativePage );
++ void RecalcPos( SdrObject* pObj, ScDrawObjData& rData, bool bNegativePage );
+
+ public:
+ ScDrawLayer( ScDocument* pDocument, const String& rName );
+@@ -197,8 +195,11 @@
void EnsureGraphicNames();
// Verankerung setzen und ermitteln
@@ -88,7 +87,7 @@ diff -ru sc.orig/source/core/data/docume
diff -ru sc.orig/source/core/data/drwlayer.cxx sc/source/core/data/drwlayer.cxx
--- sc.orig/source/core/data/drwlayer.cxx 2009-06-04 12:39:09.000000000 +0100
+++ sc/source/core/data/drwlayer.cxx 2009-06-05 12:28:12.000000000 +0100
-@@ -69,6 +69,9 @@
+@@ -70,6 +70,9 @@
#include <vcl/svapp.hxx>
#include <unotools/ucbstreamhelper.hxx>
@@ -98,11 +97,11 @@ diff -ru sc.orig/source/core/data/drwlay
#include "drwlayer.hxx"
#include "drawpage.hxx"
#include "global.hxx"
-@@ -526,7 +529,41 @@
+@@ -527,7 +530,41 @@
}
}
--void ScDrawLayer::RecalcPos( SdrObject* pObj, const ScDrawObjData& rData,
+-void ScDrawLayer::RecalcPos( SdrObject* pObj, const ScDrawObjData& rData, bool bNegativePage )
+namespace
+{
+ //Can't have a zero width dimension
@@ -137,11 +136,11 @@ diff -ru sc.orig/source/core/data/drwlay
+ }
+}
+
-+void ScDrawLayer::RecalcPos( SdrObject* pObj, ScDrawObjData& rData,
- const ScAddress& rOldStart, const ScAddress& /*rOldEnd*/, bool bNegativePage )
++void ScDrawLayer::RecalcPos( SdrObject* pObj, ScDrawObjData& rData, bool bNegativePage )
{
DBG_ASSERT( pDoc, "ScDrawLayer::RecalcPos - missing document" );
-@@ -562,6 +599,8 @@
+ if( !pDoc )
+@@ -569,6 +606,8 @@
if( bCircle )
{
@@ -150,7 +149,7 @@ diff -ru sc.orig/source/core/data/drwlay
Point aPos( pDoc->GetColOffset( nCol1, nTab1 ), pDoc->GetRowOffset( nRow1, nTab1 ) );
TwipsToMM( aPos.X() );
TwipsToMM( aPos.Y() );
-@@ -582,11 +621,18 @@
+@@ -589,11 +628,18 @@
{
if (bRecording)
AddCalcUndo( new SdrUndoGeoObj( *pObj ) );
@@ -170,7 +169,7 @@ diff -ru sc.orig/source/core/data/drwlay
//! nicht mehrere Undos fuer ein Objekt erzeugen (hinteres kann dann weggelassen werden)
if( bValid1 )
-@@ -605,6 +651,8 @@
+@@ -612,6 +658,8 @@
{
if (bRecording)
AddCalcUndo( new SdrUndoGeoObj( *pObj ) );
@@ -179,7 +178,7 @@ diff -ru sc.orig/source/core/data/drwlay
pObj->SetPoint( aStartPos, 0 );
}
-@@ -619,6 +667,8 @@
+@@ -626,6 +674,8 @@
{
if (bRecording)
AddCalcUndo( new SdrUndoGeoObj( *pObj ) );
@@ -188,7 +187,7 @@ diff -ru sc.orig/source/core/data/drwlay
pObj->SetPoint( aEndPos, 1 );
}
}
-@@ -639,6 +689,8 @@
+@@ -646,6 +696,8 @@
{
if (bRecording)
AddCalcUndo( new SdrUndoGeoObj( *pObj ) );
@@ -197,7 +196,7 @@ diff -ru sc.orig/source/core/data/drwlay
pObj->SetPoint( aEndPos, 1 );
}
-@@ -655,45 +707,68 @@
+@@ -662,45 +714,68 @@
{
if (bRecording)
AddCalcUndo( new SdrUndoGeoObj( *pObj ) );
@@ -271,7 +270,7 @@ diff -ru sc.orig/source/core/data/drwlay
}
}
-@@ -868,151 +943,6 @@
+@@ -875,151 +950,6 @@
return pRet;
}
@@ -423,7 +422,7 @@ diff -ru sc.orig/source/core/data/drwlay
void ScDrawLayer::MoveArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2,
SCsCOL nDx,SCsROW nDy, BOOL bInsDel )
{
-@@ -1054,11 +984,6 @@
+@@ -1061,11 +991,6 @@
aTopLeft.Y() += aMove.Y();
}
@@ -435,7 +434,7 @@ diff -ru sc.orig/source/core/data/drwlay
//
// Detektiv-Pfeile: Zellpositionen anpassen
//
-@@ -1096,8 +1021,6 @@
+@@ -1103,8 +1028,6 @@
aTopLeft.X() = -aTopLeft.X();
nDifTwips = -nDifTwips;
}
@@ -444,7 +443,7 @@ diff -ru sc.orig/source/core/data/drwlay
}
void ScDrawLayer::HeightChanged( SCTAB nTab, SCROW nRow, long nDifTwips )
-@@ -1128,8 +1051,6 @@
+@@ -1135,8 +1058,6 @@
MirrorRectRTL( aRect );
aTopLeft.X() = -aTopLeft.X();
}
@@ -453,17 +452,13 @@ diff -ru sc.orig/source/core/data/drwlay
}
BOOL ScDrawLayer::HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow )
-@@ -1807,30 +1728,105 @@
+@@ -1814,35 +1735,105 @@
}
}
-void ScDrawLayer::SetAnchor( SdrObject* pObj, ScAnchorType eType )
+namespace
- {
-- // Ein an der Seite verankertes Objekt zeichnet sich durch eine Anker-Pos
-- // von (0,1) aus. Das ist ein shabby Trick, der aber funktioniert!
-- Point aAnchor( 0, eType == SCA_PAGE ? 1 : 0 );
-- pObj->SetAnchorPos( aAnchor );
++{
+ SdrObjUserData* GetFirstUserDataOfType(const SdrObject *pObj, UINT16 nId)
+ {
+ USHORT nCount = pObj ? pObj->GetUserDataCount() : 0;
@@ -527,10 +522,15 @@ diff -ru sc.orig/source/core/data/drwlay
+}
+
+void ScDrawLayer::UpdateCellAnchorFromPositionEnd( SdrObject &rObj, const ScDocument &rDoc, SCTAB nTab )
-+{
+ {
+- ScAnchorType eOldAnchorType = GetAnchor( pObj );
+ Rectangle aObjRect(rObj.GetLogicRect());
+ ScRange aRange = rDoc.GetRange( nTab, aObjRect );
-+
+
+- // Ein an der Seite verankertes Objekt zeichnet sich durch eine Anker-Pos
+- // von (0,1) aus. Das ist ein shabby Trick, der aber funktioniert!
+- Point aAnchor( 0, eType == SCA_PAGE ? 1 : 0 );
+- pObj->SetAnchorPos( aAnchor );
+ ScDrawObjData* pAnchor = GetObjData( &rObj, true );
+ pAnchor->maEnd = aRange.aEnd;
+
@@ -543,7 +543,9 @@ diff -ru sc.orig/source/core/data/drwlay
+ else
+ pAnchor->maEndOffset.X() = aCellRect.Right()-aObjRect.Left();
+}
-+
+
+- if ( eOldAnchorType != eType )
+- pObj->notifyShapePropertyChange( ::svx::eSpreadsheetAnchor );
+void ScDrawLayer::SetPageAnchored( SdrObject &rObj )
+{
+ DeleteFirstUserDataOfType(&rObj, SC_UD_OBJDATA);
@@ -575,7 +577,7 @@ diff -ru sc.orig/source/core/data/drwlay
if( pObj && bCreate )
{
ScDrawObjData* pData = new ScDrawObjData;
-@@ -1867,15 +1863,7 @@
+@@ -1879,15 +1870,7 @@
ScIMapInfo* ScDrawLayer::GetIMapInfo( SdrObject* pObj ) // static
{
@@ -592,7 +594,7 @@ diff -ru sc.orig/source/core/data/drwlay
}
// static:
-@@ -1928,7 +1916,7 @@
+@@ -1940,7 +1923,7 @@
else if ( pObj->ISA( SdrOle2Obj ) ) // OLE-Objekt
{
// TODO/LEAN: working with visual area needs running state
@@ -601,7 +603,7 @@ diff -ru sc.orig/source/core/data/drwlay
bObjSupported = TRUE;
}
-@@ -1946,14 +1934,9 @@
+@@ -1958,14 +1941,9 @@
ScMacroInfo* ScDrawLayer::GetMacroInfo( SdrObject* pObj, BOOL bCreate ) // static
{
@@ -622,14 +624,14 @@ diff -ru sc.orig/source/core/data/drwlay
diff -ru sc.orig/source/core/data/postit.cxx sc/source/core/data/postit.cxx
--- sc.orig/source/core/data/postit.cxx 2009-06-04 12:39:10.000000000 +0100
+++ sc/source/core/data/postit.cxx 2009-06-04 12:40:23.000000000 +0100
-@@ -125,7 +125,6 @@
- mpCaption = new SdrCaptionObj( aTextRect, aTailPos );
+@@ -102,7 +102,6 @@
- // basic settings
-- ScDrawLayer::SetAnchor( mpCaption, SCA_PAGE );
- mpCaption->SetLayer( bShown ? SC_LAYER_INTERN : SC_LAYER_HIDDEN );
- mpCaption->SetFixedTail();
- mpCaption->SetSpecialTextBoxShadow();
+ void ScCaptionUtil::SetBasicCaptionSettings( SdrCaptionObj& rCaption, bool bShown )
+ {
+- ScDrawLayer::SetAnchor( &rCaption, SCA_PAGE );
+ SetCaptionLayer( rCaption, bShown );
+ rCaption.SetFixedTail();
+ rCaption.SetSpecialTextBoxShadow();
diff -ru sc.orig/source/core/tool/detfunc.cxx sc/source/core/tool/detfunc.cxx
--- sc.orig/source/core/tool/detfunc.cxx 2009-06-04 12:39:11.000000000 +0100
+++ sc/source/core/tool/detfunc.cxx 2009-06-04 12:40:23.000000000 +0100
@@ -775,9 +777,9 @@ diff -ru sc.orig/source/filter/xml/xmlex
diff -ru sc.orig/source/filter/xml/xmlimprt.cxx sc/source/filter/xml/xmlimprt.cxx
--- sc.orig/source/filter/xml/xmlimprt.cxx 2009-06-04 12:39:13.000000000 +0100
+++ sc/source/filter/xml/xmlimprt.cxx 2009-06-04 15:23:47.000000000 +0100
-@@ -2772,7 +2772,7 @@
- if (pDoc)
- pDoc->CompileXML();
+@@ -2813,7 +2813,7 @@
+ }
+
aTables.UpdateRowHeights();
- aTables.ResizeShapes();
+ aTables.FixupOLEs();
@@ -787,7 +789,7 @@ diff -ru sc.orig/source/filter/xml/xmlim
diff -ru sc.orig/source/filter/xml/xmlsubti.cxx sc/source/filter/xml/xmlsubti.cxx
--- sc.orig/source/filter/xml/xmlsubti.cxx 2009-06-04 12:39:13.000000000 +0100
+++ sc/source/filter/xml/xmlsubti.cxx 2009-06-04 15:17:25.000000000 +0100
-@@ -145,7 +145,7 @@
+@@ -153,7 +153,7 @@
ScMyTables::ScMyTables(ScXMLImport& rTempImport)
: rImport(rTempImport),
@@ -796,7 +798,7 @@ diff -ru sc.orig/source/filter/xml/xmlsu
nCurrentColStylePos(0),
nCurrentDrawPage( -1 ),
nCurrentXShapes( -1 ),
-@@ -715,12 +715,10 @@
+@@ -757,12 +757,10 @@
return !((nCurrentSheet != nCurrentXShapes) || !xShapes.is());
}
@@ -805,13 +807,13 @@ diff -ru sc.orig/source/filter/xml/xmlsu
- table::CellAddress& rStartAddress, table::CellAddress& rEndAddress,
- sal_Int32 nEndX, sal_Int32 nEndY)
+void ScMyTables::AddOLE(uno::Reference <drawing::XShape>& rShape,
-+ const rtl::OUString &rRangeList)
++ const rtl::OUString &rRangeList)
{
- aResizeShapes.AddShape(rShape, pRangeList, rStartAddress, rEndAddress, nEndX, nEndY);
-+ aFixupOLEs.AddOLE(rShape, rRangeList);
++ aFixupOLEs.AddOLE(rShape, rRangeList);
}
- void ScMyTables::AddMatrixRange(sal_Int32 nStartColumn, sal_Int32 nStartRow, sal_Int32 nEndColumn, sal_Int32 nEndRow, const rtl::OUString& rFormula, const formula::FormulaGrammar::Grammar eGrammar)
+ void ScMyTables::AddMatrixRange(
diff -ru sc.orig/source/filter/xml/xmlsubti.hxx sc/source/filter/xml/xmlsubti.hxx
--- sc.orig/source/filter/xml/xmlsubti.hxx 2009-06-04 12:39:13.000000000 +0100
+++ sc/source/filter/xml/xmlsubti.hxx 2009-06-04 15:23:00.000000000 +0100
@@ -857,10 +859,10 @@ diff -ru sc.orig/source/filter/xml/XMLTa
#include "xmlannoi.hxx"
#include "rangeutl.hxx"
+#include "userdat.hxx"
+ #include "docuno.hxx"
+ #include "sheetdata.hxx"
#include <xmloff/nmspmap.hxx>
- #include <xmloff/xmlnmspe.hxx>
- #include <xmloff/xmluconv.hxx>
-@@ -86,6 +87,11 @@
+@@ -90,6 +91,11 @@
{
if (!pAnnotationContext)
{
@@ -872,7 +874,7 @@ diff -ru sc.orig/source/filter/xml/XMLTa
sal_Int32 nEndX(-1);
sal_Int32 nEndY(-1);
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
-@@ -107,11 +113,18 @@
+@@ -111,11 +117,18 @@
{
sal_Int32 nOffset(0);
ScRangeStringConverter::GetAddressFromString(aEndCell, rValue, static_cast<ScXMLImport&>(mrImporter).GetDocument(), ::formula::FormulaGrammar::CONV_OOO, nOffset);
@@ -891,27 +893,29 @@ diff -ru sc.orig/source/filter/xml/XMLTa
else if (IsXMLToken(aLocalName, XML_TABLE_BACKGROUND))
if (IsXMLToken(rValue, XML_TRUE))
nLayerID = SC_LAYER_BACK;
-@@ -124,39 +137,28 @@
+@@ -128,39 +141,28 @@
}
SetLayer(rShape, nLayerID, rShape->getShapeType());
- if (!bOnTable)
+ if (SvxShape* pShapeImp = SvxShape::getImplementation(rShape))
{
-- static_cast<ScXMLImport&>(mrImporter).GetTables().AddShape(rShape,
+- rTables.AddShape(rShape,
- pRangeList, aStartCell, aEndCell, nEndX, nEndY);
- SvxShape* pShapeImp = SvxShape::getImplementation(rShape);
- if (pShapeImp)
-+ if (SdrObject *pSdrObj = pShapeImp->GetSdrObject())
- {
+- {
- SdrObject *pSdrObj = pShapeImp->GetSdrObject();
- if (pSdrObj)
- ScDrawLayer::SetAnchor(pSdrObj, SCA_CELL);
-+ if (!bOnTable)
-+ ScDrawLayer::SetCellAnchored(*pSdrObj, aAnchor);
-+ else
-+ ScDrawLayer::SetPageAnchored(*pSdrObj);
- }
+- }
++ if (SdrObject *pSdrObj = pShapeImp->GetSdrObject())
++ {
++ if (!bOnTable)
++ ScDrawLayer::SetCellAnchored(*pSdrObj, aAnchor);
++ else
++ ScDrawLayer::SetPageAnchored(*pSdrObj);
++ }
}
- else
- {
@@ -922,7 +926,7 @@ diff -ru sc.orig/source/filter/xml/XMLTa
- // -> call AddShape with invalid cell position (checked in ScMyShapeResizer::ResizeShapes)
-
- table::CellAddress aInvalidPos( -1, -1, -1 );
-- static_cast<ScXMLImport&>(mrImporter).GetTables().AddShape(rShape,
+- rTables.AddShape(rShape,
- pRangeList, aInvalidPos, aInvalidPos, 0, 0);
- }
@@ -938,13 +942,13 @@ diff -ru sc.orig/source/filter/xml/XMLTa
+ {
+ // #i78086# If there are notification ranges, the ChartListener must be created
+ // also when anchored to the sheet
-+ // -> call AddOLE (fixed up in ScMyShapeResizer::FixupOLEs)
++ // -> call AddOLE with invalid cell position (checked in ScMyShapeResizer::ResizeShapes)
+
-+ if (static_cast<ScXMLImport&>(mrImporter).GetTables().IsOLE(rShape))
-+ static_cast<ScXMLImport&>(mrImporter).GetTables().AddOLE(rShape, *pRangeList);
++ if (rTables.IsOLE(rShape))
++ rTables.AddOLE(rShape, *pRangeList);
+ }
+
-+ delete pRangeList;
++ delete pRangeList;
}
else // shape is annotation
{
openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch:
spreadsheetml/formular.xsl | 6 +++---
uof/odf2uof_text.xsl | 8 +-------
2 files changed, 4 insertions(+), 10 deletions(-)
Index: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch 27 Apr 2009 06:24:57 -0000 1.3
+++ openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch 10 Oct 2009 15:48:46 -0000 1.4
@@ -1,32 +1,3 @@
-diff -ru filter.orig/source/xslt/odf2xhtml/export/xhtml/body.xsl filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
---- filter.orig/source/xslt/odf2xhtml/export/xhtml/body.xsl 2009-04-24 09:31:14.000000000 +0100
-+++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl 2009-04-24 09:31:57.000000000 +0100
-@@ -462,7 +462,7 @@
- <xsl:template name="create-heading">
- <xsl:param name="globalData"/>
-
-- <xsl:variable name="headingNumber">
-+ <xsl:variable name="headerNumber">
- <xsl:choose>
- <xsl:when test="@text:outline-level < 6">
- <xsl:value-of select="@text:outline-level"/>
-@@ -470,7 +470,7 @@
- <xsl:otherwise>6</xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
-- <xsl:variable name="headertyp" select="concat('h', $headingNumber)"/>
-+ <xsl:variable name="headertyp" select="concat('h', $headerNumber)"/>
- <xsl:element name="{$headertyp}">
- <!-- outline style 'text:min-label-width' is interpreted as a CSS 'margin-right' attribute
- NOTE: Should be handled as CSS style in style header -->
-@@ -865,7 +865,6 @@
- <xsl:param name="listLevel" select="1"/>
- <xsl:param name="listRestart" select="false()"/>
- <xsl:param name="itemLabel" select="''"/>
-- <xsl:param name="listStyle"/>
- <xsl:param name="listStyleName" select="@text:style-name"/>
-
- <!-- To choose list type - get the list style, with the same 'text:style-name' and same 'text:level' -->
diff -ru filter.orig/source/xslt/export/spreadsheetml/formular.xsl filter/source/xslt/export/spreadsheetml/formular.xsl
--- filter.orig/source/xslt/export/spreadsheetml/formular.xsl 2009-04-24 09:31:14.000000000 +0100
+++ filter/source/xslt/export/spreadsheetml/formular.xsl 2009-04-24 09:31:57.000000000 +0100
openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch:
scriptitems.pm | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
Index: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch 24 Feb 2009 13:02:34 -0000 1.1
+++ openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch 10 Oct 2009 15:48:46 -0000 1.2
@@ -5,13 +5,23 @@ retrieving revision 1.17
diff -u -p -r1.17 scriptitems.pm
--- openoffice.org.orig/solenv/bin/modules/installer/scriptitems.pm 24 Feb 2005 16:21:15 -0000 1.17
+++ openoffice.org/solenv/bin/modules/installer/scriptitems.pm 18 Mar 2005 22:39:42 -0000
-@@ -930,8 +930,7 @@ sub remove_Files_Without_Sourcedirectory
- $infoline = "ERROR: Removing file $filename from file list.\n";
- push( @installer::globals::logfileinfo, $infoline);
+@@ -1378,8 +1378,7 @@
+ $infoline = "ERROR: Removing file $filename from file list.\n";
+ push( @installer::globals::logfileinfo, $infoline);
-- push(@missingfiles, "ERROR: File not found: $filename\n");
-- $error_occured = 1;
-+ push(@missingfiles, "Warning: File not found: $filename\n");
+- push(@missingfiles, "ERROR: File not found: $filename\n");
+- $error_occured = 1;
++ push(@missingfiles, "Warning: File not found: $filename\n");
- next; # removing this file from list, if sourcepath is empty
- }
+ next; # removing this file from list, if sourcepath is empty
+ }
+@@ -1390,8 +1389,7 @@
+ $infoline = "ERROR: Removing file $filename from file list.\n";
+ push( @installer::globals::logfileinfo, $infoline);
+
+- push(@missingfiles, "ERROR: File not found: $filename\n");
+- $error_occured = 1;
++ push(@missingfiles, "Warning: File not found: $filename\n");
+
+ next; # removing this file from list, if sourcepath is empty
+ }
openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch:
canvas/source/cairo/cairo_canvasfont.cxx | 5 +++++
canvas/source/directx/dx_textlayout_drawhelper.cxx | 6 ++++++
canvas/source/vcl/canvasfont.cxx | 5 +++++
cppcanvas/inc/cppcanvas/renderer.hxx | 3 +++
cppcanvas/source/mtfrenderer/implrenderer.cxx | 10 +++++++++-
drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx | 6 +++++-
drawinglayer/source/primitive2d/textlayoutdevice.cxx | 2 ++
drawinglayer/source/primitive2d/textprimitive2d.cxx | 3 ++-
drawinglayer/source/processor2d/canvasprocessor.cxx | 5 +++++
9 files changed, 42 insertions(+), 3 deletions(-)
Index: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch 15 Sep 2009 20:03:32 -0000 1.2
+++ openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch 10 Oct 2009 15:48:46 -0000 1.3
@@ -10,7 +10,7 @@ Index: cppcanvas/source/mtfrenderer/impl
#include <com/sun/star/rendering/ViewState.hpp>
#include <com/sun/star/rendering/RenderState.hpp>
#include <com/sun/star/rendering/XCanvasFont.hpp>
-@@ -955,6 +956,12 @@
+@@ -956,6 +957,12 @@
rParms.mrParms.maFontLetterForm.isValid() ?
rParms.mrParms.maFontLetterForm.getValue() :
(rFont.GetItalic() == ITALIC_NONE) ? 0 : 9;
@@ -21,9 +21,9 @@ Index: cppcanvas/source/mtfrenderer/impl
+ ? rendering::PanoseProportion::MONO_SPACED
+ : rendering::PanoseProportion::ANYTHING;
- // setup state-local text transformation,
- // if the font be rotated
-@@ -3061,7 +3068,8 @@
+ LanguageType aLang = rFont.GetLanguage();
+ aFontRequest.Locale = MsLangId::convertLanguageToLocale(aLang, false);
+@@ -3073,7 +3080,8 @@
if( rParams.maFontName.isValid() ||
rParams.maFontWeight.isValid() ||
rParams.maFontLetterForm.isValid() ||
@@ -51,7 +51,7 @@ Index: canvas/source/directx/dx_textlayo
===================================================================
--- canvas/source/directx/dx_textlayout_drawhelper.cxx (revision 276100)
+++ canvas/source/directx/dx_textlayout_drawhelper.cxx (working copy)
-@@ -134,6 +134,9 @@
+@@ -135,6 +135,9 @@
aFont.SetVertical( (rFontRequest.FontDescription.IsVertical==com::sun::star::util::TriState_YES) ? TRUE : FALSE );
aFont.SetWeight( static_cast<FontWeight>(rFontRequest.FontDescription.FontDescription.Weight) );
aFont.SetItalic( (rFontRequest.FontDescription.FontDescription.Letterform<=8) ? ITALIC_NONE : ITALIC_NORMAL );
@@ -59,9 +59,9 @@ Index: canvas/source/directx/dx_textlayo
+ rFontRequest.FontDescription.FontDescription.Proportion == rendering::PanoseProportion::MONO_SPACED
+ ? PITCH_FIXED : PITCH_VARIABLE);
- // setup font color
- aFont.SetColor( aColor );
-@@ -264,6 +267,9 @@
+ aFont.SetLanguage(MsLangId::convertLocaleToLanguage(rFontRequest.Locale));
+
+@@ -267,6 +270,9 @@
aFont.SetVertical( (rFontRequest.FontDescription.IsVertical==com::sun::star::util::TriState_YES) ? TRUE : FALSE );
aFont.SetWeight( static_cast<FontWeight>(rFontRequest.FontDescription.FontDescription.Weight) );
aFont.SetItalic( (rFontRequest.FontDescription.FontDescription.Letterform<=8) ? ITALIC_NONE : ITALIC_NORMAL );
@@ -75,14 +75,14 @@ Index: canvas/source/vcl/canvasfont.cxx
===================================================================
--- canvas/source/vcl/canvasfont.cxx (revision 276100)
+++ canvas/source/vcl/canvasfont.cxx (working copy)
-@@ -33,6 +33,8 @@
-
- #include <canvas/debug.hxx>
+@@ -38,6 +38,8 @@
+ #include <i18npool/mslangid.hxx>
+ #include <vcl/metric.hxx>
+#include <com/sun/star/rendering/PanoseProportion.hpp>
+
- #include <rtl/math.hxx>
- #include <basegfx/numeric/ftools.hxx>
+ #include "canvasfont.hxx"
+ #include "textlayout.hxx"
@@ -66,6 +68,9 @@
// TODO(F2): improve panose->vclenum conversion
@@ -92,8 +92,8 @@ Index: canvas/source/vcl/canvasfont.cxx
+ rFontRequest.FontDescription.FontDescription.Proportion == rendering::PanoseProportion::MONO_SPACED
+ ? PITCH_FIXED : PITCH_VARIABLE);
- // adjust to stretched/shrinked font
- if( !::rtl::math::approxEqual( rFontMatrix.m00, rFontMatrix.m11) )
+ maFont->SetLanguage(MsLangId::convertLocaleToLanguage(rFontRequest.Locale));
+
Index: canvas/source/cairo/cairo_canvasfont.cxx
===================================================================
--- canvas/source/cairo/cairo_canvasfont.cxx (revision 276100)
@@ -107,7 +107,7 @@ Index: canvas/source/cairo/cairo_canvasf
#include <rtl/math.hxx>
#include <basegfx/numeric/ftools.hxx>
-@@ -85,6 +87,9 @@
+@@ -86,6 +88,9 @@
// TODO(F2): improve panose->vclenum conversion
maFont->SetWeight( static_cast<FontWeight>(rFontRequest.FontDescription.FontDescription.Weight) );
maFont->SetItalic( (rFontRequest.FontDescription.FontDescription.Letterform<=8) ? ITALIC_NONE : ITALIC_NORMAL );
@@ -115,8 +115,8 @@ Index: canvas/source/cairo/cairo_canvasf
+ rFontRequest.FontDescription.FontDescription.Proportion == rendering::PanoseProportion::MONO_SPACED
+ ? PITCH_FIXED : PITCH_VARIABLE);
- // adjust to stretched/shrinked font
- if( !::rtl::math::approxEqual( rFontMatrix.m00, rFontMatrix.m11) )
+ maFont->SetLanguage(MsLangId::convertLocaleToLanguage(rFontRequest.Locale));
+
Index: drawinglayer/source/processor2d/canvasprocessor.cxx
===================================================================
--- drawinglayer/source/processor2d/canvasprocessor.cxx (revision 276100)
@@ -144,15 +144,15 @@ Index: drawinglayer/source/primitive2d/t
===================================================================
--- drawinglayer/source/primitive2d/textlayoutdevice.cxx (revision 276100)
+++ drawinglayer/source/primitive2d/textlayoutdevice.cxx (working copy)
-@@ -346,6 +346,7 @@
+@@ -345,6 +345,7 @@
aRetval.SetWeight(static_cast<FontWeight>(rFontAttributes.getWeight()));
aRetval.SetItalic(rFontAttributes.getItalic() ? ITALIC_NORMAL : ITALIC_NONE);
aRetval.SetOutline(rFontAttributes.getOutline());
+ aRetval.SetPitch(rFontAttributes.getMonospaced() ? PITCH_FIXED : PITCH_VARIABLE);
+ aRetval.SetLanguage(MsLangId::convertLocaleToLanguage(rLocale));
#ifdef WIN32
- // #100424# use higher precision
-@@ -392,6 +393,7 @@
+@@ -384,6 +385,7 @@
RTL_TEXTENCODING_SYMBOL == rFont.GetCharSet(),
rFont.IsVertical(),
ITALIC_NONE != rFont.GetItalic(),
openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch:
fontsubset/gsub.cxx | 10 ++++++++--
glyphs/gcach_ftyp.cxx | 11 +++++++++--
2 files changed, 17 insertions(+), 4 deletions(-)
Index: openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch 30 Sep 2009 14:02:40 -0000 1.1
+++ openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch 10 Oct 2009 15:48:46 -0000 1.2
@@ -21,9 +21,9 @@ diff -ru vcl.orig/source/glyphs/gcach_ft
}
}
break;
-diff -ru psprint.orig/source/fontsubset/gsub.cxx psprint/source/fontsubset/gsub.cxx
---- psprint.orig/source/fontsubset/gsub.cxx 2009-09-30 12:46:58.000000000 +0100
-+++ psprint/source/fontsubset/gsub.cxx 2009-09-30 14:31:17.000000000 +0100
+diff -ru vcl.orig/source/fontsubset/gsub.cxx vcl/source/fontsubset/gsub.cxx
+--- vcl.orig/source/fontsubset/gsub.cxx 2009-09-30 12:46:58.000000000 +0100
++++ vcl/source/fontsubset/gsub.cxx 2009-09-30 14:31:17.000000000 +0100
@@ -282,9 +282,15 @@
{
const USHORT nGlyph0 = NEXT_UShort( pCoverage );
openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch:
signal.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
Index: openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch 15 Sep 2009 08:24:14 -0000 1.1
+++ openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch 10 Oct 2009 15:48:46 -0000 1.2
@@ -19,12 +19,3 @@
#define MAX_PATH_LEN 2048
-@@ -401,7 +405,7 @@
-
- #define REPORTENV_PARAM "-crashreportenv:"
-
--#ifdef LINUX
-+#if defined(LINUX) && defined(SAL_ENABLE_CRASH_REPORT)
-
- typedef struct
- {
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2018
retrieving revision 1.2019
diff -u -p -r1.2018 -r1.2019
--- openoffice.org.spec 8 Oct 2009 12:56:43 -0000 1.2018
+++ openoffice.org.spec 10 Oct 2009 15:48:46 -0000 1.2019
@@ -1,6 +1,6 @@
-%define oootag OOO310
-%define ooomilestone 19
-%define rh_rpm_release 11
+%define oootag OOO320
+%define ooomilestone 1
+%define rh_rpm_release 1
# rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
%define __jar_repack %{nil}
@@ -34,7 +34,7 @@
Summary: OpenOffice.org comprehensive office suite.
Name: openoffice.org
-Version: 3.1.1
+Version: 3.2.0
Release: %{ooomilestone}.%{rh_rpm_release}%{?dist}
Epoch: 1
License: LGPLv3 and LGPLv2+ and MPLv1.1 and BSD
@@ -51,9 +51,6 @@ Source6: redhat-registry.tar.gz
Source7: redhat-langpacks.tar.gz
Source8: redhat-agreement.xsl
Source9: openoffice.org-javafilter.desktop
-Source10: http://www.openoffice.org/nonav/issues/showattachment.cgi/60508/or-IN_DEV300_m40.sdf
-Source11: http://www.openoffice.org/nonav/issues/showattachment.cgi/62822/acor_en-GB.dat
-Source12: http://www.openoffice.org/nonav/issues/showattachment.cgi/62823/acor_en-ZA.dat
BuildRequires: zip, findutils, autoconf, flex, bison, icu, gperf, gcc-c++
BuildRequires: binutils, java-devel, boost-devel, zlib-devel, vigra-devel
BuildRequires: python-devel, expat-devel, libxml2-devel, libxslt-devel, bc
@@ -71,98 +68,54 @@ BuildRequires: jakarta-commons-lang, po
BuildRequires: pentaho-reporting-flow-engine, libXinerama-devel
Patch1: openoffice.org-multiliblauncher.sh
-Patch2: workspace.defaultdoclang.patch
%if %{gtkprintui}
-Patch3: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
+Patch2: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
%endif
-Patch4: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
-Patch5: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
-Patch6: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
-Patch7: openoffice.org-2.0.2.rh188467.printingdefaults.patch
-Patch8: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
-Patch9: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch10: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
+Patch3: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
+Patch4: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch5: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
+Patch6: openoffice.org-2.0.2.rh188467.printingdefaults.patch
+Patch7: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
+Patch8: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
+Patch9: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
%if %{gtkprintui}
-Patch11: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
+Patch10: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
%endif
-Patch12: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
-Patch13: ooo-build.ooo68717.gstreamer.video.patch
-Patch14: workspace.kso32fixes.patch
-Patch15: workspace.sb113.patch
-Patch16: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
-Patch17: openoffice.org-2.3.0.ooo76649.httpencoding.patch
-Patch18: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
-Patch19: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
-Patch20: workspace.impress170.patch
-Patch21: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
-Patch22: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
-Patch23: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
-Patch24: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
-Patch25: workspace.tl66.patch
-Patch26: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
-Patch27: workspace.mhu17.patch
-Patch28: openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch
-Patch29: workspace.gtkmenuimages.patch
-Patch30: workspace.calc50.patch
-Patch31: workspace.mav46.patch
-Patch32: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
-Patch33: workspace.transogl03redux.patch
-Patch34: workspace.cmcfixes63.patch
-Patch35: openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
-Patch36: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
-Patch37: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
-Patch38: workspace.cmcfixes54.patch
-Patch39: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch40: workspace.fwk103.patch
-Patch41: workspace.hb18.patch
-Patch42: openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
-Patch43: workspace.vcl100.patch
-Patch44: workspace.xmergeclean.patch
-Patch45: workspace.mba32issues02.patch
-Patch46: workspace.impress169.patch
-Patch47: workspace.os130.patch
-Patch48: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
-Patch49: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
-Patch50: workspace.cmcfixes57.patch
-Patch51: openoffice.org-3.1.0.ooo100273.fix-utf8-hyphenation.patch
-Patch52: ooo-build.ooo2497.filter.svg.patch
-Patch53: workspace.hb32bugs01.patch
-Patch54: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
-Patch55: workspace.impress171.patch
-Patch56: workspace.vcl101.patch
-Patch57: workspace.slideshow1.patch
-Patch58: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
-Patch59: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
-Patch60: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
-Patch61: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
-Patch62: workspace.vcl104.patch
-Patch63: workspace.evoab2def.patch
-Patch64: workspace.cmcfixes59.patch
-Patch65: workspace.impress174.patch
-Patch66: openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch
-Patch67: workspace.unifypaper01.patch
-Patch68: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
-Patch69: openoffice.org-3.1.0.ooo102142.sd.resleak.patch
-Patch70: workspace.calc51.patch
-Patch71: openoffice.org-2.0.0.ooo46270.svx.search-dialog.no-find-all-in-draw.patch
-Patch72: workspace.locales32.patch
-Patch73: workspace.cmcfixes60.patch
-Patch74: workspace.dr72.patch
-Patch75: workspace.vcl103.patch
-Patch76: workspace.cmcfixes61.patch
-Patch77: workspace.os132.patch
-Patch78: workspace.cmcfixes62.patch
-Patch79: openoffice.org-3.1.0.ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
-Patch80: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
-Patch81: workspace.os131.patch
-Patch82: workspace.vcl102.patch
-Patch83: workspace.dr69.patch
-Patch84: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
-Patch85: openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
-Patch86: workspace.aw073.patch
-Patch87: openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch
-Patch88: workspace.vcl106.patch
-Patch89: openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch
+Patch11: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
+Patch12: ooo-build.ooo68717.gstreamer.video.patch
+Patch13: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
+Patch14: openoffice.org-2.3.0.ooo76649.httpencoding.patch
+Patch15: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
+Patch16: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
+Patch17: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
+Patch18: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
+Patch19: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
+Patch20: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
+Patch21: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
+Patch22: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
+Patch23: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
+Patch24: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch25: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
+Patch26: openoffice.org-3.1.0.ooo100273.fix-utf8-hyphenation.patch
+Patch27: ooo-build.ooo2497.filter.svg.patch
+Patch28: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
+Patch29: workspace.slideshow1.patch
+Patch30: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
+Patch31: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
+Patch32: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
+Patch33: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
+Patch34: openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch
+Patch35: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
+Patch36: openoffice.org-3.1.0.ooo102142.sd.resleak.patch
+Patch37: openoffice.org-2.0.0.ooo46270.svx.search-dialog.no-find-all-in-draw.patch
+Patch38: openoffice.org-3.1.0.ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
+Patch39: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
+Patch40: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
+Patch41: openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
+Patch42: openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch
+Patch43: workspace.vcl106.patch
+Patch44: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
+Patch45: workspace.dba32h.patch
%define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
%define instdir %{_libdir}
@@ -1620,98 +1573,54 @@ Rules for autocorrecting common Chinese
mv -f redhat.soc extras/source/palettes/standard.soc
cp -p %{SOURCE1} extras/source/database/evolocal.odb
cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
-%patch2 -p0 -b .workspace.defaultdoclang.patch
%if %{gtkprintui}
-%patch3 -p1 -b .rh127576.gtkunixprintdialog.patch
+%patch2 -p1 -b .rh127576.gtkunixprintdialog.patch
%endif
-%patch4 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
-%patch5 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
-%patch6 -p1 -b .ooo58606.sw.pre-edit.patch
-%patch7 -p1
-%patch8 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
-%patch9 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
-%patch10 -p1 -b .ooo65491.psprint.enablenups.patch
+%patch3 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
+%patch4 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch5 -p1 -b .ooo58606.sw.pre-edit.patch
+%patch6 -p1
+%patch7 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
+%patch8 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
+%patch9 -p0 -b .ooo65491.psprint.enablenups.patch
%if %{gtkprintui}
-cat %{PATCH11} >> svtools/source/dialogs/localize.sdf
+cat %{PATCH10} >> svtools/source/dialogs/localize.sdf
%endif
-%patch12 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
-%patch13 -p0 -b .ooo68717.gstreamer.video.patch
-%patch14 -p1 -b .workspace.kso32fixes.patch
-%patch15 -p1 -b .workspace.sb113.patch
-%patch16 -p1 -b .ooo7065.sw.titlepagedialog.patch
-%patch17 -p1 -b .ooo76649.httpencoding.patch
-%patch18 -p1 -b .ooo83878.unopkg.enablelinking.patch
-%patch19 -p1 -b .rh133741.alwaysgtk.vcl.patch
-%patch20 -p1 -b .workspace.impress170.patch
-%patch21 -p1 -b .ooo86080.unopkg.bodge.patch
-%patch22 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
-%patch23 -p1 -b .ooo88341.sc.verticalboxes.patch
-%patch24 -p1 -b .ooo87970.vcl.samenamesubs.patch
-%patch25 -p1 -b .workspace.tl66.patch
-%patch26 -p1 -b .ooo91924.svx.consistentordering.patch
-%patch27 -p1 -b .workspace.mhu17.patch
-%patch28 -p1 -b .ooo95018.sal.fdwarnings.patch
-%patch29 -p0 -b .workspace.gtkmenuimages.patch
-%patch30 -p1 -b .workspace.calc50.patch
-%patch31 -p1 -b .workspace.mav46.patch
-%patch32 -p1
-%patch33 -p0 -b .workspace.transogl03redux.patch
-%patch34 -p1 -b .workspace.cmcfixes63.patch
-%patch35 -p1 -b .ooo97488.sw.ww8toc.patch
-%patch36 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
-%patch37 -p0 -b .ooo98137.filter.redeclared-variables.patch
-%patch38 -p1 -b .workspace.cmcfixes54.patch
-%patch39 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch40 -p1 -b .workspace.fwk103.patch
-%patch41 -p0 -b .workspace.hb18.patch
-%patch42 -p1 -b .oooXXXXX.gcc44.buildfixes.patch
-%patch43 -p0 -b .workspace.vcl100.patch
-%patch44 -p0 -b .workspace.xmergeclean.patch
-%patch45 -p0 -b .workspace.mba32issues02.patch
-%patch46 -p0 -b .workspace.impress169.patch
-%patch47 -p0 -b .workspace.os130.patch
-%patch48 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
-%patch49 -p1 -b .oooXXXXX.solenv.allowmissing.patch
-%patch50 -p0 -b .workspace.cmcfixes57.patch
-%patch51 -p0 -b .ooo100273.fix-utf8-hyphenation.patch
-%patch52 -p1 -b .ooo2497.filter.svg.patch
-%patch53 -p0 -b .workspace.hb32bugs01.patch
-%patch54 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
-%patch55 -p1 -b .workspace.impress171.patch
-%patch56 -p1 -b .workspace.vcl101.patch
-%patch57 -p2 -b .workspace.slideshow1.patch
-%patch58 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
-%patch59 -p0 -b .ooo101274.opening-a-directory.patch
-%patch60 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
-%patch61 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
-%patch62 -p0 -b .workspace.vcl104.patch
-%patch63 -p0 -b .workspace.evoab2def.patch
-%patch64 -p0 -b .workspace.cmcfixes59.patch
-%patch65 -p0 -b .workspace.impress174.patch
-%patch66 -p0 -b .ooo101567.i18npool.mailocaledata.patch
-%patch67 -p1
-%patch68 -p0 -b .ooo102061.sc.cellanchoring.patch
-%patch69 -p0 -b .ooo102142.sd.resleak.patch
-%patch70 -p0 -b .workspace.calc51.patch
-%patch71 -p0 -b .ooo46270.svx.search-dialog.no-find-all-in-draw.patch
-%patch72 -p0 -b .workspace.locales32.patch
-%patch73 -p0 -b .workspace.cmcfixes60.patch
-%patch74 -p0 -b .workspace.dr72.patch
-%patch75 -p0 -b .workspace.vcl103.patch
-%patch76 -p0 -b .workspace.cmcfixes61.patch
-%patch77 -p0 -b .workspace.os132.patch
-%patch78 -p0 -b .workspace.cmcfixes62.patch
-%patch79 -p0 -b .ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
-%patch80 -p0 -b .ooo104329.dbaccess.primarykeys.patch
-%patch81 -p0 -b .workspace.os131.patch
-%patch82 -p0 -b .workspace.vcl102.patch
-%patch83 -p0 -b .workspace.dr69.patch
-%patch84 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
-%patch85 -p1 -b .oooXXXXXX.sal.justcoredump.patch
-%patch86 -p0 -b .workspace.aw073.patch
-%patch87 -p0 -b .ooo92671.vcl.coverageformat2.patch
-%patch88 -p0 -b .workspace.vcl106.patch
-%patch89 -p0 -b .oooXXXXXX.vcl.sniffscriptforsubs.patch
+%patch11 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
+%patch12 -p0 -b .ooo68717.gstreamer.video.patch
+%patch13 -p1 -b .ooo7065.sw.titlepagedialog.patch
+%patch14 -p1 -b .ooo76649.httpencoding.patch
+%patch15 -p1 -b .ooo83878.unopkg.enablelinking.patch
+%patch16 -p1 -b .rh133741.alwaysgtk.vcl.patch
+%patch17 -p1 -b .ooo86080.unopkg.bodge.patch
+%patch18 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
+%patch19 -p1 -b .ooo88341.sc.verticalboxes.patch
+%patch20 -p1 -b .ooo87970.vcl.samenamesubs.patch
+%patch21 -p1 -b .ooo91924.svx.consistentordering.patch
+%patch22 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
+%patch23 -p0 -b .ooo98137.filter.redeclared-variables.patch
+%patch24 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch25 -p1 -b .oooXXXXX.solenv.allowmissing.patch
+%patch26 -p0 -b .ooo100273.fix-utf8-hyphenation.patch
+%patch27 -p1 -b .ooo2497.filter.svg.patch
+%patch28 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
+%patch29 -p2 -b .workspace.slideshow1.patch
+%patch30 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
+%patch31 -p0 -b .ooo101274.opening-a-directory.patch
+%patch32 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
+%patch33 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
+%patch34 -p0 -b .ooo101567.i18npool.mailocaledata.patch
+%patch35 -p0 -b .ooo102061.sc.cellanchoring.patch
+%patch36 -p0 -b .ooo102142.sd.resleak.patch
+%patch37 -p0 -b .ooo46270.svx.search-dialog.no-find-all-in-draw.patch
+%patch38 -p0 -b .ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
+%patch39 -p0 -b .ooo104329.dbaccess.primarykeys.patch
+%patch40 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
+%patch41 -p1 -b .oooXXXXXX.sal.justcoredump.patch
+%patch42 -p0 -b .ooo92671.vcl.coverageformat2.patch
+%patch43 -p0 -b .workspace.vcl106.patch
+%patch44 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
+%patch45 -p0 -b .workspace.dba32h.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1720,8 +1629,7 @@ POORHELPS=`grep "Working With %PRODUCTNA
autoconf
%configure \
--with-build-version="Ver: %{version}-%{release}" --with-unix-wrapper=%{name} \
- --with-use-shell=bash \
- --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo \
+ --with-use-shell=bash --disable-ldap --disable-epm --disable-qadevooo \
--disable-fontooo --disable-mathmldtd --disable-Xaw --disable-gnome-vfs \
--enable-gio --enable-gstreamer --enable-symbols --enable-lockdown \
--enable-evolution2 --enable-cairo --enable-dbus --enable-opengl \
@@ -1734,9 +1642,10 @@ autoconf
--with-system-mozilla --with-system-libtextcat --with-system-redland \
--with-system-dicts --with-external-dict-dir=/usr/share/myspell \
--without-myspell-dicts --without-system-mspack --without-fonts \
- --without-gpc --without-agg --without-ppds --without-afms \
+ --without-agg --without-ppds --without-afms \
%{stlflags} --with-lang="%{langpack_langs}" \
- --with-poor-help-localizations="$POORHELPS"
+ --with-poor-help-localizations="$POORHELPS" \
+ --disable-graphite # for now
./bootstrap
source ./Linux*Env.Set.sh
@@ -1780,20 +1689,6 @@ export MAXPROCESSLIMIT=65535
#get core dumps
ulimit -c unlimited
-#build translation tools and apply extra translations, so
-#this can be removed when these translations are upstreamed
-cd transex3/prj
-if ! build --dlv_switch -link --all $BUILD_SMP_MFLAGS -- $DMAKE_SMP_MFLAGS -s; then
- build --dlv_switch -link --all
-fi
-deliver -link
-%if %{langpacks}
-# i99658
-cp %{SOURCE10} .
-localize -m -x -l or-IN -f or-IN_DEV300_m40.sdf
-%endif
-cd ../..
-
pushd solver/%{OFFICEUPD}/unxlng*/bin
ln -s /usr/share/java/commons-logging-1.0.4.jar commons-logging-1.1.1.jar
popd
@@ -2066,10 +1961,6 @@ popd
#Set some aliases to canonical autocorrect language files for locales with matching languages
pushd $RPM_BUILD_ROOT/%{basisinstdir}/share/autocorr
-# i102567
-cp -p %{SOURCE11} acor_en-GB.dat
-cp -p %{SOURCE12} acor_en-ZA.dat
-
#en-ZA exists and has a good autocorrect file with two or three extras that make sense for South Africa
en_GB_aliases="en-AG en-AU en-BS en-BW en-BZ en-CA en-DK en-GH en-HK en-IE en-IN en-JM en-NG en-NZ en-SG en-TT"
for lang in $en_GB_aliases; do
@@ -4245,12 +4136,61 @@ fi
unopkg list --shared > /dev/null 2>&1 || :
%changelog
-* Thu Oct 08 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.11-UNRELEASED
+* Fri Oct 09 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-1.1
+- drop integrated autocorrection files (i102567)
+- drop integrated workspace.defaultdoclang.patch
+- drop integrated workspace.kso32fixes.patch
+- drop integrated workspace.sb113.patch
+- drop integrated workspace.impress170.patch
+- drop integrated workspace.tl66.patch
+- drop integrated workspace.mhu17.patch
+- drop integrated openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch
+- drop integrated workspace.gtkmenuimages.patch
+- drop integrated workspace.calc50.patch
+- drop integrated workspace.mav46.patch
+- drop integrated workspace.transogl03redux.patch
+- drop integrated workspace.cmcfixes63.patch
+- drop integrated workspace.cmcfixes54.patch
+- drop integrated workspace.fwk103.patch
+- drop integrated workspace.hb18.patch
+- drop integrated workspace.vcl100.patch
+- drop integrated workspace.xmergeclean.patch
+- drop integrated workspace.mba32issues02.patch
+- drop integrated workspace.impress169.patch
+- drop integrated workspace.os130.patch
+- drop integrated workspace.cmcfixes57.patch
+- drop integrated workspace.hb32bugs01.patch
+- drop integrated workspace.vcl101.patch
+- drop integrated workspace.impress171.patch
+- drop integrated workspace.vcl104.patch
+- drop integrated workspace.evoab2def.patch
+- drop integrated workspace.cmcfixes59.patch
+- drop integrated workspace.impress174.patch
+- drop integrated workspace.unifypaper01.patch
+- drop integrated workspace.calc51.patch
+- drop integrated workspace.locales32.patch
+- drop integrated workspace.cmcfixes60.patch
+- drop integrated workspace.dr72.patch
+- drop integrated workspace.vcl103.patch
+- drop integrated workspace.cmcfixes61.patch
+- drop integrated workspace.os132.patch
+- drop integrated workspace.cmcfixes62.patch
+- drop integrated workspace.os131.patch
+- drop integrated workspace.vcl102.patch
+- drop integrated workspace.dr69.patch
+- drop integrated workspace.aw073.patch
+- drop integrated openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
+- drop integrated openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
+- drop integrated openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
+- drop unneccessary openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
+- add workspace.dba32h.patch
+
+* Thu Oct 08 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.11
- merge openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch
into accepted workspace (caolanm)
- Resolves: rhbz#527177 add workspace.vcl106.patch (caolanm)
- Resolves: rhbz#527719 add
- openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch (caolanm)
+ openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
* Wed Sep 30 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.10
- Resolves: rhbz#461617 gsub coverage format 2 with greater than 1 ranges (caolanm)
workspace.vcl106.patch:
atkutil.cxx | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
Index: workspace.vcl106.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.vcl106.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspace.vcl106.patch 6 Oct 2009 14:48:52 -0000 1.1
+++ workspace.vcl106.patch 10 Oct 2009 15:48:48 -0000 1.2
@@ -1,6 +1,6 @@
--- vcl.orig/unx/gtk/a11y/atkutil.cxx 2009-10-05 08:06:01.000000000 +0100
+++ vcl/unx/gtk/a11y/atkutil.cxx 2009-10-05 08:10:07.000000000 +0100
-@@ -190,7 +190,7 @@
+@@ -221,7 +221,7 @@
if( accessibility::AccessibleStateType::FOCUSED == nState )
atk_wrapper_focus_tracker_notify_when_idle( getAccessible(aEvent) );
}
@@ -9,7 +9,7 @@
{
g_warning("Focused object has invalid index in parent");
}
-@@ -546,7 +546,14 @@
+@@ -577,7 +577,14 @@
if( g_aWindowList.find(pWindow) == g_aWindowList.end() )
{
g_aWindowList.insert(pWindow);
@@ -25,10 +25,10 @@
}
#ifdef ENABLE_TRACING
else
-@@ -577,7 +584,7 @@
+@@ -608,7 +615,7 @@
}
}
- }
+ }
- catch( uno::Exception e )
+ catch( const uno::Exception &e )
{
--- openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch DELETED ---
--- openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch DELETED ---
--- openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch DELETED ---
--- openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch DELETED ---
--- openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch DELETED ---
--- openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch DELETED ---
--- workspace.aw073.patch DELETED ---
--- workspace.calc50.patch DELETED ---
--- workspace.calc51.patch DELETED ---
--- workspace.cmcfixes54.patch DELETED ---
--- workspace.cmcfixes57.patch DELETED ---
--- workspace.cmcfixes59.patch DELETED ---
--- workspace.cmcfixes60.patch DELETED ---
--- workspace.cmcfixes61.patch DELETED ---
--- workspace.cmcfixes62.patch DELETED ---
--- workspace.cmcfixes63.patch DELETED ---
--- workspace.defaultdoclang.patch DELETED ---
--- workspace.dr69.patch DELETED ---
--- workspace.dr72.patch DELETED ---
--- workspace.evoab2def.patch DELETED ---
--- workspace.fwk103.patch DELETED ---
--- workspace.gtkmenuimages.patch DELETED ---
--- workspace.hb18.patch DELETED ---
--- workspace.hb32bugs01.patch DELETED ---
--- workspace.impress169.patch DELETED ---
--- workspace.impress170.patch DELETED ---
--- workspace.impress171.patch DELETED ---
--- workspace.impress174.patch DELETED ---
--- workspace.kso32fixes.patch DELETED ---
--- workspace.locales32.patch DELETED ---
--- workspace.mav46.patch DELETED ---
--- workspace.mba32issues02.patch DELETED ---
--- workspace.mhu17.patch DELETED ---
--- workspace.os130.patch DELETED ---
--- workspace.os131.patch DELETED ---
--- workspace.os132.patch DELETED ---
--- workspace.sb113.patch DELETED ---
--- workspace.tl66.patch DELETED ---
--- workspace.transogl03redux.patch DELETED ---
--- workspace.unifypaper01.patch DELETED ---
--- workspace.vcl100.patch DELETED ---
--- workspace.vcl101.patch DELETED ---
--- workspace.vcl102.patch DELETED ---
--- workspace.vcl103.patch DELETED ---
--- workspace.vcl104.patch DELETED ---
--- workspace.xmergeclean.patch DELETED ---
- Previous message: rpms/exo/devel .cvsignore, 1.12, 1.13 exo.spec, 1.39, 1.40 sources, 1.12, 1.13 exo-0.3.101-default-mount-options.patch, 1.1, NONE exo-0.3.101-url-quoting.patch, 1.1, NONE
- Next message: rpms/openoffice.org/devel openoffice.org.spec,1.2019,1.2020
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list