rpms/openoffice.org/devel openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch, 1.9, 1.10 openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch, 1.2, 1.3 openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch, 1.3, 1.4 openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch, 1.5, 1.6 openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch, 1.1, 1.2 openoffice.org.spec, 1.2186, 1.2187 workspace.cmcfixes67.patch, 1.5, 1.6 workspace.fchints01.patch, 1.3, 1.4 workspace.srb1.patch, 1.1, 1.2 openoffice.org-3.2.0.ooo109766.dbaccess.catch.patch, 1.1, NONE openoffice.org-3.3.0.ooo109406.sdext.pdfimport.escape-newlines-in-pdf-processor.patch, 1.1, NONE workspace.ause109.patch, 1.2, NONE workspace.impresscomments1.patch, 1.1, NONE workspace.sw321bf01.patch, 1.1, NONE workspace.vcl110.patch, 1.1, NONE workspace.x86_64_bridgefix.patch, 1.2, NONE
Caolan McNamara
caolanm at fedoraproject.org
Thu Apr 22 08:41:29 UTC 2010
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20151
Modified Files:
openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.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.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
openoffice.org.spec workspace.cmcfixes67.patch
workspace.fchints01.patch workspace.srb1.patch
Removed Files:
openoffice.org-3.2.0.ooo109766.dbaccess.catch.patch
openoffice.org-3.3.0.ooo109406.sdext.pdfimport.escape-newlines-in-pdf-processor.patch
workspace.ause109.patch workspace.impresscomments1.patch
workspace.sw321bf01.patch workspace.vcl110.patch
workspace.x86_64_bridgefix.patch
Log Message:
move to 3.2.1 pre-release candidates
openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch:
desktop/source/deployment/manager/dp_manager.cxx | 70 +++++++++-
desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx | 13 +
desktop/source/pkgchk/unopkg/unopkg_shared.h | 1
javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java | 10 +
offapi/com/sun/star/deployment/makefile.mk | 1
openoffice.org.orig/offapi/com/sun/star/deployment/LinkException.idl | 66 +++++++++
source/pkgchk/unopkg/unopkg_app.cxx | 14 +-
7 files changed, 166 insertions(+), 9 deletions(-)
Index: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch 25 Feb 2010 14:47:24 -0000 1.9
+++ openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch 22 Apr 2010 08:41:20 -0000 1.10
@@ -89,7 +89,7 @@ retrieving revision 1.26
diff -u -r1.26 dp_manager.cxx
--- openoffice.org.orig/desktop/source/deployment/manager/dp_manager.cxx 26 Jul 2007 08:54:34 -0000 1.26
+++ openoffice.org/desktop/source/deployment/manager/dp_manager.cxx 22 Nov 2007 14:45:05 -0000
-@@ -64,6 +64,7 @@
+@@ -57,6 +57,7 @@
#include "com/sun/star/ucb/NameClash.hpp"
#include "com/sun/star/deployment/VersionException.hpp"
#include "com/sun/star/deployment/InstallException.hpp"
@@ -97,7 +97,7 @@ diff -u -r1.26 dp_manager.cxx
#include "com/sun/star/task/XInteractionApprove.hpp"
#include "com/sun/star/ucb/UnsupportedCommandException.hpp"
#include "boost/bind.hpp"
-@@ -512,6 +513,40 @@
+@@ -514,6 +515,40 @@
return mediaType;
}
@@ -138,7 +138,7 @@ diff -u -r1.26 dp_manager.cxx
//______________________________________________________________________________
OUString PackageManagerImpl::insertToActivationLayer(
OUString const & mediaType, ::ucbhelper::Content const & sourceContent_,
-@@ -536,11 +571,11 @@
+@@ -538,11 +573,11 @@
destFolder = makeURL( m_activePackages, tempEntry );
}
destFolder += OUSTR("_");
@@ -152,28 +152,14 @@ diff -u -r1.26 dp_manager.cxx
// copy content into activation temp dir:
if (mediaType.matchIgnoreAsciiCaseAsciiL(
RTL_CONSTASCII_STRINGPARAM(
-@@ -552,19 +587,49 @@
- {
- // inflate content:
- ::rtl::OUStringBuffer buf;
-- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.zip://") );
-- buf.append( ::rtl::Uri::encode( sourceContent.getURL(),
-+ if (!sourceContent.isFolder())
-+ {
-+ buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.zip://") );
-+ buf.append( ::rtl::Uri::encode( sourceContent.getURL(),
- rtl_UriCharClassRegName,
- rtl_UriEncodeIgnoreEscapes,
- RTL_TEXTENCODING_UTF8 ) );
-+ }
-+ else
-+ buf.append( sourceContent.getURL() );
-+
- buf.append( static_cast<sal_Unicode>('/') );
-- sourceContent = ::ucbhelper::Content(
-- buf.makeStringAndClear(), xCmdEnv );
-+ sourceContent = ::ucbhelper::Content( buf.makeStringAndClear(), xCmdEnv );
-+ }
+@@ -571,10 +606,33 @@
+ sourceContent = ::ucbhelper::Content(
+ buf.makeStringAndClear(), xCmdEnv );
+ }
+- if (! destFolderContent.transferContent(
+- sourceContent, ::ucbhelper::InsertOperation_COPY,
+- title, NameClash::OVERWRITE ))
+- throw RuntimeException( OUSTR("UCB transferContent() failed!"), 0 );
+
+ bool bLink = false;
+ Any request( (deployment::LinkException()) );
@@ -199,14 +185,8 @@ diff -u -r1.26 dp_manager.cxx
+ if (! destFolderContent.transferContent(
+ sourceContent, ::ucbhelper::InsertOperation_COPY,
+ title, NameClash::OVERWRITE ))
-+ {
+ throw RuntimeException( OUSTR("UCB transferContent() failed!"), 0 );
-+ }
- }
-- if (! destFolderContent.transferContent(
-- sourceContent, ::ucbhelper::InsertOperation_COPY,
-- title, NameClash::OVERWRITE ))
-- throw RuntimeException( OUSTR("UCB transferContent() failed!"), 0 );
++ }
// write to DB:
dbData->temporaryName = tempEntry;
@@ -217,17 +197,17 @@ retrieving revision 1.6.84.1
diff -u -r1.6.84.1 unopkg_app.cxx
--- openoffice.org.orig/desktop/source/pkgchk/unopkg/unopkg_app.cxx 10 Aug 2007 15:03:53 -0000 1.6.84.1
+++ openoffice.org:desktop/source/pkgchk/unopkg/unopkg_app.cxx 10 Aug 2007 15:03:53 -0000 1.6.84.1
-@@ -86,6 +86,9 @@
+@@ -82,6 +82,9 @@
" -V, --version version information\n"
" -v, --verbose verbose output to stdout\n"
" -f, --force force overwriting existing extensions\n"
+#ifdef UNX
+" -l, --link attempt to link to instead of copying extensions\n"
+#endif
+ " -s, --suppress-license prevents showing the license provided that\n"
+ " the extension allows it\n"
" --log-file <file> custom log file; default: <cache-dir>/log.txt\n"
- " --shared expert feature: operate on shared installation\n"
- " deployment context;\n"
-@@ -103,6 +106,9 @@
+@@ -101,6 +104,9 @@
{ RTL_CONSTASCII_STRINGPARAM("version"), 'V', false },
{ RTL_CONSTASCII_STRINGPARAM("verbose"), 'v', false },
{ RTL_CONSTASCII_STRINGPARAM("force"), 'f', false },
@@ -237,15 +217,15 @@ diff -u -r1.6.84.1 unopkg_app.cxx
{ RTL_CONSTASCII_STRINGPARAM("log-file"), '\0', true },
{ RTL_CONSTASCII_STRINGPARAM("shared"), '\0', false },
{ RTL_CONSTASCII_STRINGPARAM("deployment-context"), '\0', true },
-@@ -210,6 +216,7 @@
+@@ -208,6 +214,7 @@
OUString subCommand;
bool option_shared = false;
bool option_force = false;
+ bool option_link = false;
bool option_verbose = false;
bool option_bundled = false;
- bool subcmd_add = false;
-@@ -218,11 +225,13 @@
+ bool option_suppressLicense = false;
+@@ -217,11 +224,13 @@
OUString deploymentContext;
OUString cmdArg;
::std::vector<OUString> cmdPackages;
@@ -260,23 +240,23 @@ diff -u -r1.6.84.1 unopkg_app.cxx
OptionInfo const * info_verbose = getOptionInfo(
s_option_infos, OUSTR("verbose") );
OptionInfo const * info_log = getOptionInfo(
-@@ -276,6 +285,7 @@
+@@ -278,6 +287,7 @@
!readOption( &option_shared, info_shared, &nPos ) &&
!readOption( &option_force, info_force, &nPos ) &&
!readOption( &option_bundled, info_bundled, &nPos ) &&
+ !readOption( &option_link, info_link, &nPos ) &&
+ !readOption( &option_suppressLicense, info_suppressLicense, &nPos ) &&
!readArgument( &deploymentContext, info_context, &nPos ) &&
!isBootstrapVariable(&nPos))
- {
-@@ -346,7 +356,7 @@
+@@ -350,7 +360,7 @@
Reference< ::com::sun::star::ucb::XCommandEnvironment > xCmdEnv(
createCmdEnv( xComponentContext, logFile,
-- option_force, option_verbose, option_bundled) );
-+ option_force, option_link, option_verbose, option_bundled) );
+- option_force, option_verbose, option_bundled,
++ option_force, option_link, option_verbose, option_bundled,
+ option_suppressLicense) );
if (subcmd_add ||
- subCommand.equalsAsciiL(
+++ openoffice.org/desktop/source/pkgchk/unopkg/unopkg_app.cxx 22 Nov 2007 14:46:24 -0000
Index: source/pkgchk/unopkg/unopkg_cmdenv.cxx
===================================================================
@@ -285,7 +265,7 @@ retrieving revision 1.8
diff -u -r1.8 unopkg_cmdenv.cxx
--- openoffice.org.orig/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx 26 Jun 2007 11:13:26 -0000 1.8
+++ openoffice.org/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx 22 Nov 2007 14:46:24 -0000
-@@ -46,6 +46,7 @@
+@@ -43,6 +43,7 @@
#include "com/sun/star/task/XInteractionAbort.hpp"
#include "com/sun/star/task/XInteractionApprove.hpp"
#include "com/sun/star/deployment/InstallException.hpp"
@@ -293,36 +273,37 @@ diff -u -r1.8 unopkg_cmdenv.cxx
#include "com/sun/star/container/ElementExistException.hpp"
#include "com/sun/star/deployment/LicenseException.hpp"
#include "com/sun/star/deployment/VersionException.hpp"
-@@ -98,6 +99,7 @@
+@@ -84,6 +85,7 @@
{
sal_Int32 m_logLevel;
bool m_option_force_overwrite;
+ bool m_option_link;
bool m_option_verbose;
bool m_option_bundled;
- Reference< XComponentContext > m_xComponentContext;
-@@ -112,6 +114,7 @@
+ bool m_option_suppressLicense;
+@@ -99,6 +101,7 @@
Reference<XComponentContext> const & xComponentContext,
OUString const & log_file,
bool option_force_overwrite,
+ bool option_link,
bool option_verbose,
- bool option_bundled);
-
-@@ -137,10 +140,12 @@
+ bool option_bundled,
+ bool option_suppressLicense);
+@@ -125,11 +128,13 @@
Reference<XComponentContext> const & xComponentContext,
OUString const & log_file,
bool option_force_overwrite,
+ bool option_link,
bool option_verbose,
- bool option_bundled)
+ bool option_bundled,
+ bool option_suppressLicense)
: m_logLevel(0),
m_option_force_overwrite( option_force_overwrite ),
+ m_option_link( option_link ),
m_option_verbose( option_verbose ),
m_option_bundled( option_bundled),
- m_xComponentContext(xComponentContext)
-@@ -270,6 +275,7 @@
+ m_option_suppressLicense( option_suppressLicense),
+@@ -246,6 +251,7 @@
lang::WrappedTargetException wtExc;
deployment::LicenseException licExc;
deployment::InstallException instExc;
@@ -330,31 +311,32 @@ diff -u -r1.8 unopkg_cmdenv.cxx
deployment::LicenseIndividualAgreementException licAgreementExc;
deployment::PlatformException platExc;
deployment::VersionException verExc;
-@@ -318,6 +324,10 @@
- bLicenseException = true;
- printLicense(licExc.Text, approve, abort);
+@@ -303,6 +309,10 @@
+ else
+ printLicense(licExc.Text, approve, abort);
}
-+ else if (request >>= linkExc)
-+ {
-+ approve = m_option_link;
-+ }
++ else if (request >>= linkExc)
++ {
++ approve = m_option_link;
++ }
else if (request >>= instExc)
{
//Only if the unopgk was started with gui + extension then we user is asked.
-@@ -457,11 +467,12 @@
+@@ -445,12 +455,13 @@
Reference< XComponentContext > const & xContext,
OUString const & logFile,
bool option_force_overwrite,
+ bool option_link,
bool option_verbose,
- bool option_bundled)
+ bool option_bundled,
+ bool option_suppressLicense)
{
return new CommandEnvironmentImpl(
-- xContext, logFile, option_force_overwrite, option_verbose, option_bundled);
-+ xContext, logFile, option_force_overwrite, option_link, option_verbose, option_bundled);
+- xContext, logFile, option_force_overwrite, option_verbose, option_bundled,
++ xContext, logFile, option_force_overwrite, option_link, option_verbose, option_bundled,
+ option_suppressLicense);
}
- } // unopkg
Index: source/pkgchk/unopkg/unopkg_shared.h
===================================================================
RCS file: /cvs/framework/desktop/source/pkgchk/unopkg/unopkg_shared.h,v
@@ -362,14 +344,14 @@ retrieving revision 1.2.130.1
diff -u -r1.2.130.1 unopkg_shared.h
--- openoffice.org.orig/desktop/source/pkgchk/unopkg/unopkg_shared.h 10 Aug 2007 15:04:16 -0000 1.2.130.1
+++ openoffice.org/desktop/source/pkgchk/unopkg/unopkg_shared.h 22 Nov 2007 14:46:24 -0000
-@@ -131,6 +131,7 @@
+@@ -162,6 +162,7 @@
css::uno::Reference<css::uno::XComponentContext> const & xContext,
::rtl::OUString const & logFile,
bool option_force_overwrite,
+ bool option_link,
bool option_verbose,
- bool option_bundled);
-
+ bool option_bundled,
+ bool option_suppressLicense);
--- openoffice.org.orig/javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java 2010-02-11 13:42:37.000000000 +0000
+++ openoffice.org/javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java 2010-02-22 15:43:34.000000000 +0000
@@ -35,6 +35,7 @@
openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch:
body.xsl | 40 +++++++++++++++++++++++++++-------------
1 file changed, 27 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.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch 10 Oct 2009 15:48:46 -0000 1.2
+++ openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch 22 Apr 2010 08:41:20 -0000 1.3
@@ -2,145 +2,138 @@ 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)
-@@ -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>
+@@ -1731,6 +1731,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>
+@@ -1749,13 +1754,15 @@
+ <xsl:variable name="itemNumberNew">
+ <xsl:if test="$listStyle/text:list-style/text:list-level-style-number">
+ <xsl:choose>
+- <xsl:when test="$isEmptyList">
++ <xsl:when test="$isListHeader">0</xsl:when>
+ <!-- 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">
+@@ -1830,6 +1837,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>
+@@ -1840,9 +1848,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"/>
+@@ -1853,7 +1862,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">
+@@ -2052,7 +2061,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"/>
+@@ -2086,6 +2095,8 @@
+ <!-- E.g.: If a list level 2 number is searched, a level 3 with content found with only a level 1 parent with content,
+ 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]"/>
+@@ -2119,7 +2130,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>
+@@ -2174,7 +2185,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>
+@@ -2206,12 +2217,15 @@
+ <xsl:param name="precedingListItemsOfSameStyle"/>
+ <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"/>
+@@ -2233,8 +2247,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"/>
+@@ -2256,8 +2270,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"/>
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.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch 5 Nov 2009 13:44:35 -0000 1.3
+++ openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch 22 Apr 2010 08:41:21 -0000 1.4
@@ -15,21 +15,21 @@ 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,12 +110,10 @@
+@@ -107,12 +107,10 @@
BOOL bHyphenatorSet;
private:
- void MoveAreaTwips( SCTAB nTab, const Rectangle& rArea, const Point& rMove,
- const Point& rTopLeft );
void MoveCells( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2,
- SCsCOL nDx,SCsROW nDy );
+ SCsCOL nDx,SCsROW nDy, bool bUpdateNoteCaptionPos );
-- void RecalcPos( SdrObject* pObj, const ScDrawObjData& rData, bool bNegativePage );
-+ void RecalcPos( SdrObject* pObj, ScDrawObjData& rData, bool bNegativePage );
+- void RecalcPos( SdrObject* pObj, const ScDrawObjData& rData, bool bNegativePage, bool bUpdateNoteCaptionPos );
++ void RecalcPos( SdrObject* pObj, ScDrawObjData& rData, bool bNegativePage, bool bUpdateNoteCaptionPos );
public:
ScDrawLayer( ScDocument* pDocument, const String& rName );
-@@ -197,8 +195,11 @@
+@@ -194,8 +192,11 @@
void EnsureGraphicNames();
// Verankerung setzen und ermitteln
@@ -87,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
-@@ -70,6 +70,9 @@
+@@ -67,6 +67,9 @@
#include <vcl/svapp.hxx>
#include <unotools/ucbstreamhelper.hxx>
@@ -97,11 +97,11 @@ diff -ru sc.orig/source/core/data/drwlay
#include "drwlayer.hxx"
#include "drawpage.hxx"
#include "global.hxx"
-@@ -527,7 +530,41 @@
+@@ -524,7 +527,41 @@
}
}
--void ScDrawLayer::RecalcPos( SdrObject* pObj, const ScDrawObjData& rData, bool bNegativePage )
+-void ScDrawLayer::RecalcPos( SdrObject* pObj, const ScDrawObjData& rData, bool bNegativePage, bool bUpdateNoteCaptionPos )
+namespace
+{
+ //Can't have a zero width dimension
@@ -136,11 +136,11 @@ diff -ru sc.orig/source/core/data/drwlay
+ }
+}
+
-+void ScDrawLayer::RecalcPos( SdrObject* pObj, ScDrawObjData& rData, bool bNegativePage )
++void ScDrawLayer::RecalcPos( SdrObject* pObj, ScDrawObjData& rData, bool bNegativePage, bool bUpdateNoteCaptionPos )
{
DBG_ASSERT( pDoc, "ScDrawLayer::RecalcPos - missing document" );
if( !pDoc )
-@@ -569,6 +606,8 @@
+@@ -563,6 +600,8 @@
if( bCircle )
{
@@ -149,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() );
-@@ -589,11 +628,18 @@
+@@ -583,11 +622,18 @@
{
if (bRecording)
AddCalcUndo( new SdrUndoGeoObj( *pObj ) );
@@ -169,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 )
-@@ -612,6 +658,8 @@
+@@ -606,6 +652,8 @@
{
if (bRecording)
AddCalcUndo( new SdrUndoGeoObj( *pObj ) );
@@ -178,7 +178,7 @@ diff -ru sc.orig/source/core/data/drwlay
pObj->SetPoint( aStartPos, 0 );
}
-@@ -626,6 +674,8 @@
+@@ -620,6 +668,8 @@
{
if (bRecording)
AddCalcUndo( new SdrUndoGeoObj( *pObj ) );
@@ -187,7 +187,7 @@ diff -ru sc.orig/source/core/data/drwlay
pObj->SetPoint( aEndPos, 1 );
}
}
-@@ -646,6 +696,8 @@
+@@ -640,6 +690,8 @@
{
if (bRecording)
AddCalcUndo( new SdrUndoGeoObj( *pObj ) );
@@ -196,7 +196,7 @@ diff -ru sc.orig/source/core/data/drwlay
pObj->SetPoint( aEndPos, 1 );
}
-@@ -662,45 +714,68 @@
+@@ -656,45 +708,68 @@
{
if (bRecording)
AddCalcUndo( new SdrUndoGeoObj( *pObj ) );
@@ -270,7 +270,7 @@ diff -ru sc.orig/source/core/data/drwlay
}
}
-@@ -875,151 +950,6 @@
+@@ -869,151 +944,6 @@
return pRet;
}
@@ -420,9 +420,9 @@ 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 )
+ SCsCOL nDx,SCsROW nDy, BOOL bInsDel, bool bUpdateNoteCaptionPos )
{
-@@ -1061,11 +991,6 @@
+@@ -1055,11 +985,6 @@
aTopLeft.Y() += aMove.Y();
}
@@ -434,7 +434,7 @@ diff -ru sc.orig/source/core/data/drwlay
//
// Detektiv-Pfeile: Zellpositionen anpassen
//
-@@ -1103,8 +1028,6 @@
+@@ -1097,8 +1022,6 @@
aTopLeft.X() = -aTopLeft.X();
nDifTwips = -nDifTwips;
}
@@ -443,7 +443,7 @@ diff -ru sc.orig/source/core/data/drwlay
}
void ScDrawLayer::HeightChanged( SCTAB nTab, SCROW nRow, long nDifTwips )
-@@ -1135,8 +1058,6 @@
+@@ -1129,8 +1052,6 @@
MirrorRectRTL( aRect );
aTopLeft.X() = -aTopLeft.X();
}
@@ -452,7 +452,7 @@ diff -ru sc.orig/source/core/data/drwlay
}
BOOL ScDrawLayer::HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow )
-@@ -1814,35 +1735,105 @@
+@@ -1808,35 +1729,105 @@
}
}
@@ -577,7 +577,7 @@ diff -ru sc.orig/source/core/data/drwlay
if( pObj && bCreate )
{
ScDrawObjData* pData = new ScDrawObjData;
-@@ -1879,15 +1870,7 @@
+@@ -1873,15 +1864,7 @@
ScIMapInfo* ScDrawLayer::GetIMapInfo( SdrObject* pObj ) // static
{
@@ -594,7 +594,7 @@ diff -ru sc.orig/source/core/data/drwlay
}
// static:
-@@ -1940,7 +1923,7 @@
+@@ -1934,7 +1917,7 @@
else if ( pObj->ISA( SdrOle2Obj ) ) // OLE-Objekt
{
// TODO/LEAN: working with visual area needs running state
@@ -603,7 +603,7 @@ diff -ru sc.orig/source/core/data/drwlay
bObjSupported = TRUE;
}
-@@ -1958,14 +1941,9 @@
+@@ -1952,14 +1935,9 @@
ScMacroInfo* ScDrawLayer::GetMacroInfo( SdrObject* pObj, BOOL bCreate ) // static
{
openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch:
export/spreadsheetml/formular.xsl | 6 +++---
export/uof/odf2uof_text.xsl | 8 +-------
odf2xhtml/export/xhtml/body.xsl | 10 +++++-----
3 files changed, 9 insertions(+), 15 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.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch 12 Oct 2009 12:47:27 -0000 1.5
+++ openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch 22 Apr 2010 08:41:21 -0000 1.6
@@ -2,33 +2,40 @@ Index: filter/source/xslt/odf2xhtml/expo
===================================================================
--- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl (revision 276736)
+++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl (working copy)
-@@ -106,8 +144,8 @@
- </xsl:when>
- <xsl:otherwise>
- <!-- As CSS writing-mode is not implemented by all browsers, a heuristic is done -->
-- <xsl:variable name="writingMode" select="key('writingModeStyles', 'test')"/>
-- <xsl:if test="contains($writingMode, 'rl')">
-+ <xsl:variable name="writingModeTest" select="key('writingModeStyles', 'test')"/>
-+ <xsl:if test="contains($writingModeTest, 'rl')">
- <xsl:attribute name="dir">rtl</xsl:attribute>
- </xsl:if>
- </xsl:otherwise>
-@@ -564,13 +602,13 @@
- </xsl:variable>
- <xsl:choose>
- <xsl:when test="$tabIndent='NaN'">
-- <xsl:variable name="tabPosition">
-+ <xsl:variable name="tabPositionTmp">
- <xsl:call-template name="convert2cm">
- <xsl:with-param name="value" select="$tabStops/style:tab-stop[last()]/@style:position"/>
- </xsl:call-template>
- </xsl:variable>
- <!-- Heuristic: for every tab that is more than specified give a further 1 cm -->
-- <xsl:value-of select="$parentMarginLeft + $tabPosition + count($tabStops/style:tab-stop) - $tabCount"/>
-+ <xsl:value-of select="$parentMarginLeft + $tabPositionTmp + count($tabStops/style:tab-stop) - $tabCount"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$tabIndent"/>
+@@ -102,8 +102,8 @@
+ </xsl:when>
+ <xsl:otherwise>
+ <!-- As CSS writing-mode is not implemented by all browsers, a heuristic is done -->
+- <xsl:variable name="writingMode" select="key('writingModeStyles', 'test')"/>
+- <xsl:if test="contains($writingMode, 'rl')">
++ <xsl:variable name="writingModeTest" select="key('writingModeStyles', 'test')"/>
++ <xsl:if test="contains($writingModeTest, 'rl')">
+ <xsl:attribute name="dir">rtl</xsl:attribute>
+ </xsl:if>
+ </xsl:otherwise>
+@@ -560,13 +560,13 @@
+ </xsl:variable>
+ <xsl:choose>
+ <xsl:when test="$tabIndent='NaN'">
+- <xsl:variable name="tabPosition">
++ <xsl:variable name="tabPositionTmp">
+ <xsl:call-template name="convert2cm">
+ <xsl:with-param name="value" select="$tabStops/style:tab-stop[last()]/@style:position"/>
+ </xsl:call-template>
+ </xsl:variable>
+ <!-- Heuristic: for every tab that is more than specified give a further 1 cm -->
+- <xsl:value-of select="$parentMarginLeft + $tabPosition + count($tabStops/style:tab-stop) - $tabCount"/>
++ <xsl:value-of select="$parentMarginLeft + $tabPositionTmp + count($tabStops/style:tab-stop) - $tabCount"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$tabIndent"/>
+@@ -2834,4 +2834,4 @@
+ <xsl:template match="math:annotation" mode="math"/>
+
+
+-</xsl:stylesheet>
+\ No newline at end of file
++</xsl:stylesheet>
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.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch:
body.xsl | 40 ++++++++++++++++++++++++++++++++++++++--
1 file changed, 38 insertions(+), 2 deletions(-)
Index: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch 12 Oct 2009 13:19:32 -0000 1.1
+++ openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch 22 Apr 2010 08:41:21 -0000 1.2
@@ -2,75 +2,66 @@ Index: filter/source/xslt/odf2xhtml/expo
===================================================================
--- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl (revision 276736)
+++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl (working copy)
-@@ -61,9 +61,17 @@
- <xsl:key match="style:master-page" name="masterPageElements" use="@style:name"/>
- <xsl:key match="style:page-layout" name="pageLayoutElements" use="@style:name"/>
- <xsl:key name="writingModeStyles" match="/*/office:styles/style:style/style:paragraph-properties/@style:writing-mode | /*/office:automatic-styles/style:style/style:paragraph-properties/@style:writing-mode" use="'test'"/>
-+
- <xsl:template name="create-body">
- <xsl:param name="globalData"/>
-+ <xsl:call-template name="create-body.collect-page-properties">
-+ <xsl:with-param name="globalData" select="$globalData"/>
-+ </xsl:call-template>
-+ </xsl:template>
-
-+ <xsl:template name="create-body.collect-page-properties">
-+ <xsl:param name="globalData"/>
-+
- <!-- approximation to find the correct master page style (with page dimensions) -->
- <xsl:variable name="masterPageNames">
- <!-- Loop over every style:style containing a @style:master-page-name attribute -->
-@@ -76,13 +84,13 @@
- </xsl:if>
- </xsl:for-each>
- </xsl:variable>
--
-+
- <!-- Take the first of the masterpage list and get the according style:master-page element and find the @style:page-layout-name -->
- <xsl:variable name="pageLayoutName" select="key('masterPageElements', substring-before($masterPageNames,';'))/@style:page-layout-name"/>
-- <xsl:variable name="pageProperties">
-+ <xsl:variable name="pagePropertiesRTF">
- <xsl:choose>
- <xsl:when test="not($pageLayoutName) or $pageLayoutName = ''">
-- <xsl:copy-of select="$globalData/styles-file/*/office:automatic-styles/style:page-layout[1]/style:page-layout-properties"/>
-+ <xsl:value-of select="$globalData/styles-file/*/office:automatic-styles/style:page-layout[1]/style:page-layout-properties"/>
- </xsl:when>
- <xsl:otherwise>
- <!-- Find the according style:page-layout and store the properties in a variable -->
-@@ -90,6 +98,36 @@
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
-+
-+ <xsl:choose>
-+ <xsl:when test="function-available('common:node-set')">
-+ <xsl:call-template name="create-body.create">
-+ <xsl:with-param name="globalData" select="common:node-set($globalData)"/>
-+ <xsl:with-param name="pageProperties" select="common:node-set($pagePropertiesRTF)"/>
-+ </xsl:call-template>
-+ </xsl:when>
-+ <xsl:when test="function-available('xalan:nodeset')">
-+ <xsl:call-template name="create-body.create">
-+ <xsl:with-param name="globalData" select="xalan:nodeset($globalData)"/>
-+ <xsl:with-param name="pageProperties" select="xalan:nodeset($pagePropertiesRTF)"/>
-+ </xsl:call-template>
-+ </xsl:when>
-+ <xsl:when test="function-available('xt:node-set')">
-+ <xsl:call-template name="create-body.create">
-+ <xsl:with-param name="globalData" select="xt:node-set($globalData)"/>
-+ <xsl:with-param name="pageProperties" select="xt:node-set($pagePropertiesRTF)"/>
-+ </xsl:call-template>
-+ </xsl:when>
-+ <xsl:otherwise>
-+ <xsl:message terminate="yes">The required node-set function was not found!</xsl:message>
-+ </xsl:otherwise>
-+ </xsl:choose>
-+ </xsl:template>
-+
-+ <xsl:template name="create-body.create">
-+ <xsl:param name="globalData"/>
-+ <xsl:param name="pageProperties"/>
-+
- <xsl:element name="body">
- <!-- direction of text flow -->
- <xsl:variable name="writingMode" select="$pageProperties/style:page-layout-properties/@style:writing-mode"/>
+@@ -59,6 +59,13 @@
+ <xsl:key name="writingModeStyles" match="/*/office:styles/style:style/style:paragraph-properties/@style:writing-mode | /*/office:automatic-styles/style:style/style:paragraph-properties/@style:writing-mode" use="'test'"/>
+ <xsl:template name="create-body">
+ <xsl:param name="globalData"/>
++ <xsl:call-template name="create-body.collect-page-properties">
++ <xsl:with-param name="globalData" select="$globalData"/>
++ </xsl:call-template>
++ </xsl:template>
++
++ <xsl:template name="create-body.collect-page-properties">
++ <xsl:param name="globalData"/>
+
+ <!-- approximation to find the correct master page style (with page dimensions) -->
+ <xsl:variable name="masterPageNames">
+@@ -75,10 +82,10 @@
+
+ <!-- Take the first of the masterpage list and get the according style:master-page element and find the @style:page-layout-name -->
+ <xsl:variable name="pageLayoutName" select="key('masterPageElements', substring-before($masterPageNames,';'))/@style:page-layout-name"/>
+- <xsl:variable name="pageProperties">
++ <xsl:variable name="pagePropertiesRTF">
+ <xsl:choose>
+ <xsl:when test="not($pageLayoutName) or $pageLayoutName = ''">
+- <xsl:copy-of select="$globalData/styles-file/*/office:automatic-styles/style:page-layout[1]/style:page-layout-properties"/>
++ <xsl:value-of select="$globalData/styles-file/*/office:automatic-styles/style:page-layout[1]/style:page-layout-properties"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <!-- Find the according style:page-layout and store the properties in a variable -->
+@@ -86,6 +93,35 @@
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
++ <xsl:choose>
++ <xsl:when test="function-available('common:node-set')">
++ <xsl:call-template name="create-body.create">
++ <xsl:with-param name="globalData" select="common:node-set($globalData)"/>
++ <xsl:with-param name="pageProperties" select="common:node-set($pagePropertiesRTF)"/>
++ </xsl:call-template>
++ </xsl:when>
++ <xsl:when test="function-available('xalan:nodeset')">
++ <xsl:call-template name="create-body.create">
++ <xsl:with-param name="globalData" select="xalan:nodeset($globalData)"/>
++ <xsl:with-param name="pageProperties" select="xalan:nodeset($pagePropertiesRTF)"/>
++ </xsl:call-template>
++ </xsl:when>
++ <xsl:when test="function-available('xt:node-set')">
++ <xsl:call-template name="create-body.create">
++ <xsl:with-param name="globalData" select="xt:node-set($globalData)"/>
++ <xsl:with-param name="pageProperties" select="xt:node-set($pagePropertiesRTF)"/>
++ </xsl:call-template>
++ </xsl:when>
++ <xsl:otherwise>
++ <xsl:message terminate="yes">The required node-set function was not found!</xsl:message>
++ </xsl:otherwise>
++ </xsl:choose>
++ </xsl:template>
++
++ <xsl:template name="create-body.create">
++ <xsl:param name="globalData"/>
++ <xsl:param name="pageProperties"/>
++
+ <xsl:element name="body">
+ <!-- direction of text flow -->
+ <xsl:variable name="writingMode" select="$pageProperties/style:page-layout-properties/@style:writing-mode"/>
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2186
retrieving revision 1.2187
diff -u -p -r1.2186 -r1.2187
--- openoffice.org.spec 21 Apr 2010 13:38:27 -0000 1.2186
+++ openoffice.org.spec 22 Apr 2010 08:41:23 -0000 1.2187
@@ -109,40 +109,33 @@ Patch38: openoffice.org-3.2.0.ooo106032.
Patch39: workspace.gsminhibit.patch
Patch40: workspace.vcl107.patch
Patch41: workspace.hb33patches1.patch
-Patch42: workspace.ause109.patch
-Patch43: workspace.cmcfixes67.patch
-Patch44: workspace.srb1.patch
-Patch45: workspace.thbfixes10.patch
-Patch46: workspace.sw321bf01.patch
-Patch47: workspace.vcl108.patch
-Patch48: workspace.pythonssldedux.patch
-Patch49: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
-Patch50: openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
-Patch51: workspace.sw33bf03.patch
-Patch52: workspace.writerfilter07.patch
-Patch53: openoffice.org-3.3.0.ooo108246.svx.hide-sql-group-when-inactive.patch
-Patch54: workspace.sw33bf02.patch
-Patch55: openoffice.org-3.2.0.ooo108330.embeddedobj.outplace.readonly.os.dispatch.patch
-Patch56: openoffice.org-3.2.0.ooo96362.filter.nondeterministic.order.patch
-Patch57: workspace.cmcfixes70.patch
-Patch58: workspace.s390xport02.patch
-Patch59: openoffice.org-3.3.0.ooo108637.sfx2.uisavedir.patch
-Patch60: openoffice.org-3.2.0.ooo108846.sfx2.qstartfixes.patch
-Patch61: workspace.impresscomments1.patch
-Patch62: openoffice.org-3.2.0.ooo109009.sc.tooltipcrash.patch
-Patch63: workspace.x86_64_bridgefix.patch
-Patch64: workspace.impress188.patch
-Patch65: openoffice.org-3.2.0.ooo95369.sw.sortedobjs.patch
-Patch66: openoffice.org-3.3.0.ooo109406.sdext.pdfimport.escape-newlines-in-pdf-processor.patch
-Patch67: workspace.koheicsvimport.patch
-Patch68: workspace.odfmetadata4.patch
-Patch69: workspace.vcl110.patch
-Patch70: openoffice.org-3.2.0.ooo109743.svx.safedragdrop.patch
-Patch71: openoffice.org-3.2.0.ooo109766.dbaccess.catch.patch
-Patch72: openoffice.org-3.2.0.ooo110142.svx.safercolornames.patch
-Patch73: openoffice.org-3.3.0.ooo110523.rdf.resetsecprefs.patch
-Patch74: openoffice.org-3.3.0.rh577812.i18npool.viramacursor.patch
-Patch75: workspace.fwk140.patch
+Patch42: workspace.cmcfixes67.patch
+Patch43: workspace.srb1.patch
+Patch44: workspace.thbfixes10.patch
+Patch45: workspace.vcl108.patch
+Patch46: workspace.pythonssldedux.patch
+Patch47: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
+Patch48: openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
+Patch49: workspace.sw33bf03.patch
+Patch50: workspace.writerfilter07.patch
+Patch51: openoffice.org-3.3.0.ooo108246.svx.hide-sql-group-when-inactive.patch
+Patch52: workspace.sw33bf02.patch
+Patch53: openoffice.org-3.2.0.ooo108330.embeddedobj.outplace.readonly.os.dispatch.patch
+Patch54: openoffice.org-3.2.0.ooo96362.filter.nondeterministic.order.patch
+Patch55: workspace.cmcfixes70.patch
+Patch56: workspace.s390xport02.patch
+Patch57: openoffice.org-3.3.0.ooo108637.sfx2.uisavedir.patch
+Patch58: openoffice.org-3.2.0.ooo108846.sfx2.qstartfixes.patch
+Patch59: openoffice.org-3.2.0.ooo109009.sc.tooltipcrash.patch
+Patch60: workspace.impress188.patch
+Patch61: openoffice.org-3.2.0.ooo95369.sw.sortedobjs.patch
+Patch62: workspace.koheicsvimport.patch
+Patch63: workspace.odfmetadata4.patch
+Patch64: openoffice.org-3.2.0.ooo109743.svx.safedragdrop.patch
+Patch65: openoffice.org-3.2.0.ooo110142.svx.safercolornames.patch
+Patch66: openoffice.org-3.3.0.ooo110523.rdf.resetsecprefs.patch
+Patch67: openoffice.org-3.3.0.rh577812.i18npool.viramacursor.patch
+Patch68: workspace.fwk140.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@@ -1665,40 +1658,33 @@ cp -p %{SOURCE5} external/unowinreg/unow
%patch39 -p1 -b .workspace.gsminhibit.patch
%patch40 -p1 -b .workspace.vcl107.patch
%patch41 -p0 -b .workspace.hb33patches1.patch
-%patch42 -p0 -b .workspace.ause109.patch
-%patch43 -p1 -b .workspace.cmcfixes67.patch
-%patch44 -p1 -b .workspace.srb1.patch
-%patch45 -p0 -b .workspace.thbfixes10.patch
-%patch46 -p0 -b .workspace.sw321bf01.patch
-%patch47 -p0 -b .workspace.vcl108.patch
-%patch48 -p1 -b .workspace.pythonssldedux.patch
-%patch49 -p1 -b .ooo106502.svx.fixspelltimer.patch
-%patch50 -p0 -b .ooo47279.sd.objectsave.safe.patch
-%patch51 -p0 -b .workspace.sw33bf03.patch
-%patch52 -p1 -b .workspace.writerfilter07.patch
-%patch53 -p1 -b .ooo108246.svx.hide-sql-group-when-inactive.patch
-%patch54 -p1 -b .workspace.sw33bf02.patch
-%patch55 -p0 -b .ooo108330.embeddedobj.outplace.readonly.os.dispatch.patch
-%patch56 -p0 -b .ooo96362.filter.nondeterministic.order.patch
-%patch57 -p1 -b .workspace.cmcfixes70.patch
-%patch58 -p1 -b .workspace.s390xport02.patch
-%patch59 -p1 -b .ooo108637.sfx2.uisavedir.patch
-%patch60 -p1 -b .ooo108846.sfx2.qstartfixes.patch
-%patch61 -p0 -b .workspace.impresscomments1.patch
-%patch62 -p0 -b .ooo109009.sc.tooltipcrash.patch
-%patch63 -p0 -b .workspace.x86_64_bridgefix.patch
-%patch64 -p0 -b .workspace.impress188.patch
-%patch65 -p1 -b .ooo95369.sw.sortedobjs.patch
-%patch66 -p1 -b .ooo109406.sdext.pdfimport.escape-newlines-in-pdf-processor.patch
-%patch67 -p1 -b .workspace.koheicsvimport.patch
-%patch68 -p1 -b .workspace.odfmetadata4.patch
-%patch69 -p0 -b .workspace.vcl110.patch
-%patch70 -p0 -b .ooo109743.svx.safedragdrop.patch
-%patch71 -p0 -b .ooo109766.dbaccess.catch.patch
-%patch72 -p0 -b .ooo110142.svx.safercolornames.patch
-%patch73 -p1 -b .ooo110523.rdf.resetsecprefs.patch
-%patch74 -p0 -b .rh577812.i18npool.viramacursor.patch
-%patch75 -p1 -b .workspace.fwk140.patch
+%patch42 -p1 -b .workspace.cmcfixes67.patch
+%patch43 -p1 -b .workspace.srb1.patch
+%patch44 -p0 -b .workspace.thbfixes10.patch
+%patch45 -p0 -b .workspace.vcl108.patch
+%patch46 -p1 -b .workspace.pythonssldedux.patch
+%patch47 -p1 -b .ooo106502.svx.fixspelltimer.patch
+%patch48 -p0 -b .ooo47279.sd.objectsave.safe.patch
+%patch49 -p0 -b .workspace.sw33bf03.patch
+%patch50 -p1 -b .workspace.writerfilter07.patch
+%patch51 -p1 -b .ooo108246.svx.hide-sql-group-when-inactive.patch
+%patch52 -p1 -b .workspace.sw33bf02.patch
+%patch53 -p0 -b .ooo108330.embeddedobj.outplace.readonly.os.dispatch.patch
+%patch54 -p0 -b .ooo96362.filter.nondeterministic.order.patch
+%patch55 -p1 -b .workspace.cmcfixes70.patch
+%patch56 -p1 -b .workspace.s390xport02.patch
+%patch57 -p1 -b .ooo108637.sfx2.uisavedir.patch
+%patch58 -p1 -b .ooo108846.sfx2.qstartfixes.patch
+%patch59 -p0 -b .ooo109009.sc.tooltipcrash.patch
+%patch60 -p0 -b .workspace.impress188.patch
+%patch61 -p1 -b .ooo95369.sw.sortedobjs.patch
+%patch62 -p1 -b .workspace.koheicsvimport.patch
+%patch63 -p1 -b .workspace.odfmetadata4.patch
+%patch64 -p0 -b .ooo109743.svx.safedragdrop.patch
+%patch65 -p0 -b .ooo110142.svx.safercolornames.patch
+%patch66 -p1 -b .ooo110523.rdf.resetsecprefs.patch
+%patch67 -p0 -b .rh577812.i18npool.viramacursor.patch
+%patch68 -p1 -b .workspace.fwk140.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4182,8 +4168,15 @@ fi
%endif
%changelog
-* Wed Apr 21 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.1-15.1
+* Thu Apr 22 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.1-15.1
- move to 3.2.1 pre-release candidates
+- drop integrated workspace.sw321bf01.patch
+- drop integrated workspace.impresscomments1.patch
+- drop integrated workspace.x86_64_bridgefix.patch
+- drop integrated openoffice.org-3.3.0.ooo109406.sdext.pdfimport.escape-newlines-in-pdf-processor.patch
+- drop integrated workspace.vcl110.patch
+- drop integrated openoffice.org-3.2.0.ooo109766.dbaccess.catch.patch
+- drop workspace.ause109.patch
* Sat Apr 10 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.18
- add openoffice.org-3.3.0.ooo110747.plugin.patch
workspace.cmcfixes67.patch:
a/transex3/source/help/MANIFEST.MF | 2
configure.in | 112 ++++++++++++++++-----------
transex3/source/help/makefile.mk | 19 ----
ucb/source/ucp/gio/gio_mount.cxx | 2
xmlhelp/source/com/sun/star/help/MANIFEST.MF | 1
xmlhelp/source/com/sun/star/help/makefile.mk | 15 +--
6 files changed, 77 insertions(+), 74 deletions(-)
Index: workspace.cmcfixes67.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.cmcfixes67.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- workspace.cmcfixes67.patch 16 Apr 2010 14:05:35 -0000 1.5
+++ workspace.cmcfixes67.patch 22 Apr 2010 08:41:26 -0000 1.6
@@ -225,12 +225,30 @@ diff -r dd90334f8680 xmlhelp/source/com/
diff -r dd90334f8680 xmlhelp/source/com/sun/star/help/makefile.mk
--- a/xmlhelp/source/com/sun/star/help/makefile.mk Mon Nov 16 21:01:44 2009 +0100
+++ b/xmlhelp/source/com/sun/star/help/makefile.mk Tue Nov 24 13:21:57 2009 +0000
-@@ -77,14 +73,15 @@
- JARFILES = ridl.jar jurt.jar unoil.jar juh.jar
+@@ -35,11 +35,10 @@
+
+ .INCLUDE : settings.mk
+
+-
+ JAVACLASSFILES = \
+ $(CLASSDIR)$/$(PACKAGE)$/HelpSearch.class \
+ $(CLASSDIR)$/$(PACKAGE)$/HelpComponent.class \
+- $(CLASSDIR)$/$(PACKAGE)$/HelpIndexer.class
++ $(CLASSDIR)$/$(PACKAGE)$/HelpIndexer.class
+
+ TRANSEX3FILES = \
+ $(SOLARBINDIR)$/help$/$(PACKAGE)$/HelpIndexerTool.class \
+@@ -47,32 +46,32 @@
+
+ ADDFILES = $(subst,$(SOLARBINDIR)$/help,$(CLASSDIR) $(TRANSEX3FILES))
+
+-JARFILES = ridl.jar jurt.jar unoil.jar juh.jar HelpIndexerTool.jar
++JARFILES = ridl.jar jurt.jar unoil.jar juh.jar
.IF "$(SYSTEM_LUCENE)" == "YES"
- XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR)
+-XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR)
-COMP=fix_system_lucene
-+JARCLASSPATH = file://$(LUCENE_CORE_JAR) file://$(LUCENE_ANALYZERS_JAR)
++EXTRAJARFILES = $(LUCENE_CORE_JAR) $(LUCENE_ANALYZERS_JAR)
++JARCLASSPATH = $(EXTRAJARFILES)
.ELSE
JARFILES += lucene-core-2.3.jar lucene-analyzers-2.3.jar
+JARCLASSPATH = lucene-core-2.3.jar lucene-analyzers-2.3.jar
@@ -243,8 +261,7 @@ diff -r dd90334f8680 xmlhelp/source/com/
# --- Targets ------------------------------------------------------
-@@ -93,15 +90,14 @@
- ALLTAR : $(ADDFILES)
+ .INCLUDE : target.mk
.IF "$(JARTARGETN)"!=""
+$(JAVATARGET) : $(ADDFILES)
@@ -252,7 +269,7 @@ diff -r dd90334f8680 xmlhelp/source/com/
-$(JARTARGETN) : $(COMP)
.ENDIF
- $(CLASSDIR)$/$(PACKAGE)$/%.class : $(SOLARBINDIR)$/help$/$(PACKAGE)$/%.class
+ $(ADDFILES) : $(SOLARBINDIR)$/help$/$(PACKAGE)$/$$(@:f)
$(MKDIRHIER) $(@:d)
$(COPY) $< $@
workspace.fchints01.patch:
inc/vcl/fontmanager.hxx | 15 -
inc/vcl/glyphcache.hxx | 9
inc/vcl/impfont.hxx | 35 +++
inc/vcl/outdev.hxx | 4
inc/vcl/outfont.hxx | 4
inc/vcl/salgdi.hxx | 3
inc/vcl/settings.hxx | 6
inc/vcl/vclenum.hxx | 21 +
prj/d.lst | 3
source/app/settings.cxx | 2
source/glyphs/gcach_ftyp.cxx | 99 +++++---
source/glyphs/gcach_ftyp.hxx | 9
source/window/winproc.cxx | 6
unx/gtk/gdi/salnativewidgets-gtk.cxx | 18 +
unx/gtk/window/gtkframe.cxx | 3
unx/headless/svpgdi.hxx | 1
unx/headless/svppspgraphics.cxx | 26 --
unx/inc/pspgraphics.h | 2
unx/inc/salgdi.h | 2
unx/source/fontmanager/fontcache.cxx | 13 -
unx/source/fontmanager/fontconfig.cxx | 371 ++++++++++++++++++++++-----------
unx/source/fontmanager/fontmanager.cxx | 8
unx/source/gdi/pspgraphics.cxx | 26 --
unx/source/gdi/salgdi3.cxx | 240 ++++++++++++++++++++-
unx/source/gdi/xlfd_extd.cxx | 3
25 files changed, 650 insertions(+), 279 deletions(-)
Index: workspace.fchints01.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.fchints01.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- workspace.fchints01.patch 15 Feb 2010 20:21:19 -0000 1.3
+++ workspace.fchints01.patch 22 Apr 2010 08:41:26 -0000 1.4
@@ -698,7 +698,7 @@ diff -r 458049042e56 -r c28e2e0d774b vcl
diff -r 458049042e56 -r c28e2e0d774b vcl/unx/source/fontmanager/fontconfig.cxx
--- a/vcl/unx/source/fontmanager/fontconfig.cxx Thu Dec 17 17:08:37 2009 +0100
+++ b/vcl/unx/source/fontmanager/fontconfig.cxx Fri Feb 12 17:12:55 2010 +0100
-@@ -37,33 +36,40 @@
+@@ -34,33 +34,40 @@
using namespace psp;
#ifdef ENABLE_FONTCONFIG
@@ -765,7 +765,7 @@ diff -r 458049042e56 -r c28e2e0d774b vcl
#endif
#include <cstdio>
-@@ -120,6 +126,7 @@
+@@ -117,6 +124,7 @@
FcBool (*m_pFcConfigAppFontAddDir)(FcConfig*, const FcChar8*);
FcBool (*m_pFcConfigSubstitute)(FcConfig*,FcPattern*,FcMatchKind);
FcBool (*m_pFcPatternAddInteger)(FcPattern*,const char*,int);
@@ -773,7 +773,7 @@ diff -r 458049042e56 -r c28e2e0d774b vcl
FcBool (*m_pFcPatternAddBool)(FcPattern*,const char*,FcBool);
FcBool (*m_pFcPatternAddCharSet)(FcPattern*,const char*,const FcCharSet*);
FcBool (*m_pFcPatternAddString)(FcPattern*,const char*,const FcChar8*);
-@@ -223,6 +230,8 @@
+@@ -220,6 +228,8 @@
{ return m_pFcConfigSubstitute( pConfig, pPattern, eKind ); }
FcBool FcPatternAddInteger( FcPattern* pPattern, const char* pObject, int nValue )
{ return m_pFcPatternAddInteger( pPattern, pObject, nValue ); }
@@ -782,7 +782,7 @@ diff -r 458049042e56 -r c28e2e0d774b vcl
FcBool FcPatternAddString( FcPattern* pPattern, const char* pObject, const FcChar8* pString )
{ return m_pFcPatternAddString( pPattern, pObject, pString ); }
FcBool FcPatternAddBool( FcPattern* pPattern, const char* pObject, bool nValue )
-@@ -234,7 +243,9 @@
+@@ -231,7 +241,9 @@
{ return m_pFcFreeTypeCharIndex ? m_pFcFreeTypeCharIndex( face, ucs4 ) : 0; }
public: // TODO: cleanup
@@ -793,7 +793,7 @@ diff -r 458049042e56 -r c28e2e0d774b vcl
};
oslGenericFunction FontCfgWrapper::loadSymbol( const char* pSymbol )
-@@ -324,6 +335,8 @@
+@@ -321,6 +333,8 @@
loadSymbol( "FcConfigSubstitute" );
m_pFcPatternAddInteger = (FcBool(*)(FcPattern*,const char*,int))
loadSymbol( "FcPatternAddInteger" );
@@ -802,7 +802,7 @@ diff -r 458049042e56 -r c28e2e0d774b vcl
m_pFcPatternAddBool = (FcBool(*)(FcPattern*,const char*,FcBool))
loadSymbol( "FcPatternAddBool" );
m_pFcPatternAddCharSet = (FcBool(*)(FcPattern*,const char*,const FcCharSet *))
-@@ -374,6 +387,7 @@
+@@ -371,6 +385,7 @@
m_pFcDefaultSubstitute &&
m_pFcConfigSubstitute &&
m_pFcPatternAddInteger &&
@@ -810,26 +810,44 @@ diff -r 458049042e56 -r c28e2e0d774b vcl
m_pFcPatternAddCharSet &&
m_pFcPatternAddBool &&
m_pFcPatternAddString
-@@ -506,53 +520,52 @@
+@@ -503,54 +518,53 @@
return candidate;
}
--
++}
+
-
- FcResult lcl_FamilyFromPattern(FontCfgWrapper& rWrapper, FcPattern* pPattern, FcChar8 **family,
- std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash > &aFontconfigNameToLocalized)
-- {
++FcResult FontCfgWrapper::FamilyFromPattern(FcPattern* pPattern, FcChar8 **family)
++{
++ FcChar8 *origfamily;
++ FcResult eFamilyRes = FcPatternGetString( pPattern, FC_FAMILY, 0, &origfamily );
++ *family = origfamily;
++
++ if( eFamilyRes == FcResultMatch)
+ {
- FcChar8 *origfamily;
- FcResult eFamilyRes = rWrapper.FcPatternGetString( pPattern, FC_FAMILY, 0, &origfamily );
- *family = origfamily;
-
- if( eFamilyRes == FcResultMatch)
-- {
++ FcChar8* familylang = NULL;
++ if (FcPatternGetString( pPattern, FC_FAMILYLANG, 0, &familylang ) == FcResultMatch)
+ {
- FcChar8* familylang = NULL;
- if (rWrapper.FcPatternGetString( pPattern, FC_FAMILYLANG, 0, &familylang ) == FcResultMatch)
-- {
++ std::vector< lang_and_family > lang_and_families;
++ lang_and_families.push_back(lang_and_family(familylang, *family));
++ int k = 1;
++ while (1)
+ {
- std::vector< lang_and_family > lang_and_families;
-- lang_and_families.push_back(lang_and_family(familylang, *family));
++ if (FcPatternGetString( pPattern, FC_FAMILYLANG, k, &familylang ) != FcResultMatch)
++ break;
++ if (FcPatternGetString( pPattern, FC_FAMILY, k, family ) != FcResultMatch)
++ break;
+ lang_and_families.push_back(lang_and_family(familylang, *family));
- int k = 1;
- while (1)
- {
@@ -854,36 +872,8 @@ diff -r 458049042e56 -r c28e2e0d774b vcl
- if (rtl_str_compare(candidate, (const char*)(*family)) != 0)
- aFontconfigNameToLocalized[OString(candidate)] = OString((const char*)(*family));
- }
-- }
-- }
--
-- return eFamilyRes;
-- }
- }
-
-+FcResult FontCfgWrapper::FamilyFromPattern(FcPattern* pPattern, FcChar8 **family)
-+{
-+ FcChar8 *origfamily;
-+ FcResult eFamilyRes = FcPatternGetString( pPattern, FC_FAMILY, 0, &origfamily );
-+ *family = origfamily;
-+
-+ if( eFamilyRes == FcResultMatch)
-+ {
-+ FcChar8* familylang = NULL;
-+ if (FcPatternGetString( pPattern, FC_FAMILYLANG, 0, &familylang ) == FcResultMatch)
-+ {
-+ std::vector< lang_and_family > lang_and_families;
-+ lang_and_families.push_back(lang_and_family(familylang, *family));
-+ int k = 1;
-+ while (1)
-+ {
-+ if (FcPatternGetString( pPattern, FC_FAMILYLANG, k, &familylang ) != FcResultMatch)
-+ break;
-+ if (FcPatternGetString( pPattern, FC_FAMILY, k, family ) != FcResultMatch)
-+ break;
-+ lang_and_families.push_back(lang_and_family(familylang, *family));
+ ++k;
-+ }
+ }
+
+ //possible to-do, sort by UILocale instead of process locale
+ rtl_Locale* pLoc;
@@ -900,15 +890,19 @@ diff -r 458049042e56 -r c28e2e0d774b vcl
+ }
+ if (rtl_str_compare((const char*)origfamily, (const char*)(*family)) != 0)
+ m_aLocalizedToCanonical[OString((const char*)(*family))] = OString((const char*)origfamily);
-+ }
-+ }
+ }
+-
+- return eFamilyRes;
+ }
+
+ return eFamilyRes;
-+}
+ }
+-
/*
* PrintFontManager::initFontconfig
-@@ -565,6 +578,72 @@
+ */
+@@ -562,6 +576,72 @@
return true;
}
@@ -978,10 +972,10 @@ diff -r 458049042e56 -r c28e2e0d774b vcl
+ }
+}
+
- int PrintFontManager::countFontconfigFonts()
+ int PrintFontManager::countFontconfigFonts( std::hash_map<rtl::OString, int, rtl::OStringHash>& o_rVisitedPaths )
{
int nFonts = 0;
-@@ -588,18 +667,16 @@
+@@ -585,18 +665,16 @@
int weight = 0;
int spacing = 0;
int nCollectionEntry = -1;
@@ -1002,7 +996,7 @@ diff -r 458049042e56 -r c28e2e0d774b vcl
if( eFileRes != FcResultMatch || eFamilyRes != FcResultMatch || eOutRes != FcResultMatch )
continue;
-@@ -694,60 +771,15 @@
+@@ -694,60 +772,15 @@
pUpdate->m_nFamilyName = nFamilyName;
}
if( eWeightRes == FcResultMatch )
@@ -1066,7 +1060,7 @@ diff -r 458049042e56 -r c28e2e0d774b vcl
// update font cache
m_pFontCache->updateFontCacheEntry( pUpdate, false );
-@@ -883,8 +915,8 @@
+@@ -883,8 +916,8 @@
rtl::OUString PrintFontManager::Substitute(const rtl::OUString& rFontName,
rtl::OUString& rMissingCodes, const rtl::OString &rLangAttrib,
@@ -1077,7 +1071,7 @@ diff -r 458049042e56 -r c28e2e0d774b vcl
{
rtl::OUString aName;
FontCfgWrapper& rWrapper = FontCfgWrapper::get();
-@@ -919,7 +951,7 @@
+@@ -919,7 +952,7 @@
rWrapper.FcCharSetDestroy( unicodes );
}
@@ -1086,7 +1080,7 @@ diff -r 458049042e56 -r c28e2e0d774b vcl
// query fontconfig for a substitute
rWrapper.FcConfigSubstitute( rWrapper.FcConfigGetCurrent(), pPattern, FcMatchPattern );
-@@ -952,10 +984,21 @@
+@@ -952,10 +985,21 @@
if( eFileRes == FcResultMatch )
{
OString sFamily((sal_Char*)family);
@@ -1110,7 +1104,7 @@ diff -r 458049042e56 -r c28e2e0d774b vcl
}
// update rMissingCodes by removing resolved unicodes
-@@ -984,6 +1027,89 @@
+@@ -984,6 +1028,89 @@
return aName;
}
workspace.srb1.patch:
InputRepositoryLoader.java | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
Index: workspace.srb1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.srb1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspace.srb1.patch 19 Nov 2009 09:50:19 -0000 1.1
+++ workspace.srb1.patch 22 Apr 2010 08:41:27 -0000 1.2
@@ -29,15 +29,3 @@ diff -r bec9b2b2628f -r 47329487e9cf rep
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
}
-diff -r bec9b2b2628f -r 47329487e9cf reportbuilder/util/makefile.mk
---- a/reportbuilder/util/makefile.mk Mon Nov 09 14:52:58 2009 +0100
-+++ b/reportbuilder/util/makefile.mk Wed Nov 11 10:36:44 2009 +0100
-@@ -32,7 +32,7 @@
- PRJ=..
- PRJNAME=reportbuilder
- TARGET=rpt
--EXTENSION_VERSION_BASE=1.2.0
-+EXTENSION_VERSION_BASE=1.2.1
-
- .IF "$(CWS_WORK_STAMP)" == ""
- EXTENSION_VERSION=$(EXTENSION_VERSION_BASE)
--- openoffice.org-3.2.0.ooo109766.dbaccess.catch.patch DELETED ---
--- openoffice.org-3.3.0.ooo109406.sdext.pdfimport.escape-newlines-in-pdf-processor.patch DELETED ---
--- workspace.ause109.patch DELETED ---
--- workspace.impresscomments1.patch DELETED ---
--- workspace.sw321bf01.patch DELETED ---
--- workspace.vcl110.patch DELETED ---
--- workspace.x86_64_bridgefix.patch DELETED ---
More information about the scm-commits
mailing list